From 311242a6e6065884465e94fc46a36a0747648ed8 Mon Sep 17 00:00:00 2001
From: emoralesb05 <eduardo.morales@teradata.com>
Date: Wed, 16 Aug 2017 15:30:30 -0700
Subject: [PATCH 001/575] feat(select): update the trigger width when select is
 opened

---
 src/cdk/overlay/overlay-directives.spec.ts   | 36 ++++++++++++++++++++
 src/cdk/overlay/overlay-directives.ts        | 34 +++++++++++-------
 src/cdk/overlay/overlay-ref.ts               | 25 ++++++++++++--
 src/lib/autocomplete/autocomplete-trigger.ts |  7 ++--
 src/lib/select/select.spec.ts                | 28 +++++++++++++++
 src/lib/select/select.ts                     |  6 ++--
 6 files changed, 116 insertions(+), 20 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index e0876038d708..8bc2f8e7b027 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -135,6 +135,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.width).toEqual('250px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.width = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.width).toEqual('500px');
     });
 
     it('should set the height', () => {
@@ -144,6 +153,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.height).toEqual('100vh');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.height = '50vh';
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.height).toEqual('50vh');
     });
 
     it('should set the min width', () => {
@@ -153,6 +171,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minWidth).toEqual('250px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.minWidth = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.minWidth).toEqual('500px');
     });
 
     it('should set the min height', () => {
@@ -162,6 +189,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minHeight).toEqual('500px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.minHeight = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.minHeight).toEqual('500px');
     });
 
     it('should create the backdrop if designated', () => {
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 757ae1331fb4..357fedbb4721 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -274,6 +274,23 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
   private _buildConfig(): OverlayState {
     let overlayConfig = new OverlayState();
 
+    this._configureSize(overlayConfig);
+
+    overlayConfig.hasBackdrop = this.hasBackdrop;
+
+    if (this.backdropClass) {
+      overlayConfig.backdropClass = this.backdropClass;
+    }
+
+    this._position = this._createPositionStrategy() as ConnectedPositionStrategy;
+    overlayConfig.positionStrategy = this._position;
+    overlayConfig.scrollStrategy = this.scrollStrategy;
+
+    return overlayConfig;
+  }
+
+  /** Configure the overlay size based on the directive's inputs */
+  private _configureSize(overlayConfig: OverlayState): void {
     if (this.width || this.width === 0) {
       overlayConfig.width = this.width;
     }
@@ -289,18 +306,6 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
     if (this.minHeight || this.minHeight === 0) {
       overlayConfig.minHeight = this.minHeight;
     }
-
-    overlayConfig.hasBackdrop = this.hasBackdrop;
-
-    if (this.backdropClass) {
-      overlayConfig.backdropClass = this.backdropClass;
-    }
-
-    this._position = this._createPositionStrategy() as ConnectedPositionStrategy;
-    overlayConfig.positionStrategy = this._position;
-    overlayConfig.scrollStrategy = this.scrollStrategy;
-
-    return overlayConfig;
   }
 
   /** Returns the position strategy of the overlay to be set on the overlay config */
@@ -335,6 +340,11 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
   private _attachOverlay() {
     if (!this._overlayRef) {
       this._createOverlay();
+    } else {
+      // Update the overlay size, in case the directive's inputs have changed
+      const overlayState = new OverlayState();
+      this._configureSize(overlayState);
+      this._overlayRef.updateSize(overlayState);
     }
 
     this._position.withDirection(this.dir);
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 25bd7a07e4dc..1a7f7697f757 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -47,7 +47,7 @@ export class OverlayRef implements PortalHost {
 
     // Update the pane element with the given state configuration.
     this._updateStackingOrder();
-    this.updateSize();
+    this._setSizeStyles();
     this.updateDirection();
     this.updatePosition();
     this._state.scrollStrategy.enable();
@@ -155,8 +155,29 @@ export class OverlayRef implements PortalHost {
     this._pane.setAttribute('dir', this._state.direction!);
   }
 
+  /** Updates the state size of the overlay */
+  updateSize(state: OverlayState) {
+    if (state.width || state.width === 0) {
+      this._state.width = state.width;
+    }
+
+    if (state.height || state.height === 0) {
+      this._state.height = state.height;
+    }
+
+    if (state.minWidth || state.minWidth === 0) {
+      this._state.minWidth = state.minWidth;
+    }
+
+    if (state.minHeight || state.minHeight === 0) {
+      this._state.minHeight = state.minHeight;
+    }
+
+    this._setSizeStyles();
+  }
+
   /** Updates the size of the overlay based on the overlay config. */
-  updateSize() {
+  private _setSizeStyles() {
     if (this._state.width || this._state.width === 0) {
       this._pane.style.width = formatCssUnit(this._state.width);
     }
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index d0da2c36bc66..92f0ed4ce85d 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -176,9 +176,10 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     if (!this._overlayRef) {
       this._createOverlay();
     } else {
-      /** Update the panel width, in case the host width has changed */
-      this._overlayRef.getState().width = this._getHostWidth();
-      this._overlayRef.updateSize();
+      // Update the panel width, in case the host width has changed
+      const overlayState = new OverlayState();
+      overlayState.width = this._getHostWidth();
+      this._overlayRef.updateSize(overlayState);
     }
 
     if (this._overlayRef && !this._overlayRef.hasAttached()) {
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index ee55075a76fe..ac8c25f821b5 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -2478,6 +2478,34 @@ describe('MdSelect', () => {
       });
     }));
 
+    it('should set the width of the overlay based on the trigger and resize', async(() => {
+      trigger.style.width = '200px';
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        trigger.click();
+        fixture.detectChanges();
+        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+        expect(pane.style.minWidth).toBe('200px',
+            'Expected pane minWidth to be 200px initially');
+
+        const backdrop =
+            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+        backdrop.click();
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+
+          trigger.style.width = '400px';
+          fixture.detectChanges();
+          fixture.whenStable().then(() => {
+            trigger.click();
+            fixture.detectChanges();
+            expect(pane.style.minWidth).toBe('400px',
+                'Expected pane minWidth to be 400px after resize');
+          });
+        });
+      });
+    }));
+
   });
 
   describe('theming', () => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index ee179ceeb55b..59fd76d7f24d 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -466,9 +466,9 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
       return;
     }
 
-    if (!this._triggerWidth) {
-      this._setTriggerWidth();
-    }
+    // Always set the trigger width since we need to
+    // update the panel with its new minWidth when opening it
+    this._setTriggerWidth();
 
     this._calculateOverlayPosition();
     this._placeholderState = this._floatPlaceholderState();

From 87318bc7c83d249036837376609ea099e5aea2d9 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Thu, 31 Aug 2017 15:26:05 -0700
Subject: [PATCH 002/575] feat(stepper): initial version of stepper (#6594)

---
 src/cdk/stepper/index.ts                     |   9 +
 src/cdk/stepper/public_api.ts                |  25 +
 src/cdk/stepper/step-label.ts                |  16 +
 src/cdk/stepper/step.html                    |   1 +
 src/cdk/stepper/stepper-button.ts            |  28 +
 src/cdk/stepper/stepper.ts                   | 263 +++++++
 src/cdk/stepper/tsconfig-build.json          |  13 +
 src/demo-app/demo-app/demo-app.ts            |   1 +
 src/demo-app/demo-app/demo-module.ts         |   2 +
 src/demo-app/demo-app/routes.ts              |   2 +
 src/demo-app/demo-material-module.ts         |   4 +-
 src/demo-app/stepper/stepper-demo.html       | 197 +++++
 src/demo-app/stepper/stepper-demo.ts         |  53 ++
 src/demo-app/system-config.ts                |   1 +
 src/e2e-app/system-config.ts                 |   1 +
 src/lib/core/compatibility/compatibility.ts  |  16 +-
 src/lib/core/theming/_all-theme.scss         |   2 +
 src/lib/core/typography/_all-typography.scss |   2 +
 src/lib/module.ts                            |   4 +-
 src/lib/public_api.ts                        |   1 +
 src/lib/stepper/_stepper-theme.scss          |  53 ++
 src/lib/stepper/index.ts                     |  40 +
 src/lib/stepper/step-header.html             |  17 +
 src/lib/stepper/step-header.scss             |  42 +
 src/lib/stepper/step-header.ts               |  73 ++
 src/lib/stepper/step-label.ts                |  22 +
 src/lib/stepper/step.html                    |   1 +
 src/lib/stepper/stepper-button.ts            |  31 +
 src/lib/stepper/stepper-horizontal.html      |  30 +
 src/lib/stepper/stepper-vertical.html        |  28 +
 src/lib/stepper/stepper.md                   | 132 ++++
 src/lib/stepper/stepper.scss                 | 122 +++
 src/lib/stepper/stepper.spec.ts              | 765 +++++++++++++++++++
 src/lib/stepper/stepper.ts                   | 132 ++++
 test/karma-test-shim.js                      |   1 +
 35 files changed, 2126 insertions(+), 4 deletions(-)
 create mode 100644 src/cdk/stepper/index.ts
 create mode 100644 src/cdk/stepper/public_api.ts
 create mode 100644 src/cdk/stepper/step-label.ts
 create mode 100644 src/cdk/stepper/step.html
 create mode 100644 src/cdk/stepper/stepper-button.ts
 create mode 100644 src/cdk/stepper/stepper.ts
 create mode 100644 src/cdk/stepper/tsconfig-build.json
 create mode 100644 src/demo-app/stepper/stepper-demo.html
 create mode 100644 src/demo-app/stepper/stepper-demo.ts
 create mode 100644 src/lib/stepper/_stepper-theme.scss
 create mode 100644 src/lib/stepper/index.ts
 create mode 100644 src/lib/stepper/step-header.html
 create mode 100644 src/lib/stepper/step-header.scss
 create mode 100644 src/lib/stepper/step-header.ts
 create mode 100644 src/lib/stepper/step-label.ts
 create mode 100644 src/lib/stepper/step.html
 create mode 100644 src/lib/stepper/stepper-button.ts
 create mode 100644 src/lib/stepper/stepper-horizontal.html
 create mode 100644 src/lib/stepper/stepper-vertical.html
 create mode 100644 src/lib/stepper/stepper.md
 create mode 100644 src/lib/stepper/stepper.scss
 create mode 100644 src/lib/stepper/stepper.spec.ts
 create mode 100644 src/lib/stepper/stepper.ts

diff --git a/src/cdk/stepper/index.ts b/src/cdk/stepper/index.ts
new file mode 100644
index 000000000000..f93e7c31d564
--- /dev/null
+++ b/src/cdk/stepper/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @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
+ */
+
+export * from './public_api';
diff --git a/src/cdk/stepper/public_api.ts b/src/cdk/stepper/public_api.ts
new file mode 100644
index 000000000000..2ef3326db218
--- /dev/null
+++ b/src/cdk/stepper/public_api.ts
@@ -0,0 +1,25 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CdkStepper, CdkStep} from './stepper';
+import {CommonModule} from '@angular/common';
+import {CdkStepLabel} from './step-label';
+import {CdkStepperNext, CdkStepperPrevious} from './stepper-button';
+import {BidiModule} from '@angular/cdk/bidi';
+
+@NgModule({
+  imports: [BidiModule, CommonModule],
+  exports: [CdkStep, CdkStepper, CdkStepLabel, CdkStepperNext, CdkStepperPrevious],
+  declarations: [CdkStep, CdkStepper, CdkStepLabel, CdkStepperNext, CdkStepperPrevious]
+})
+export class CdkStepperModule {}
+
+export * from './stepper';
+export * from './step-label';
+export * from './stepper-button';
diff --git a/src/cdk/stepper/step-label.ts b/src/cdk/stepper/step-label.ts
new file mode 100644
index 000000000000..e253b4bfcab5
--- /dev/null
+++ b/src/cdk/stepper/step-label.ts
@@ -0,0 +1,16 @@
+/**
+ * @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, TemplateRef} from '@angular/core';
+
+@Directive({
+  selector: '[cdkStepLabel]',
+})
+export class CdkStepLabel {
+  constructor(public template: TemplateRef<any>) { }
+}
diff --git a/src/cdk/stepper/step.html b/src/cdk/stepper/step.html
new file mode 100644
index 000000000000..cd48c06b9917
--- /dev/null
+++ b/src/cdk/stepper/step.html
@@ -0,0 +1 @@
+<ng-template><ng-content></ng-content></ng-template>
diff --git a/src/cdk/stepper/stepper-button.ts b/src/cdk/stepper/stepper-button.ts
new file mode 100644
index 000000000000..c63d8c822eef
--- /dev/null
+++ b/src/cdk/stepper/stepper-button.ts
@@ -0,0 +1,28 @@
+/**
+ * @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} from '@angular/core';
+import {CdkStepper} from './stepper';
+
+/** Button that moves to the next step in a stepper workflow. */
+@Directive({
+  selector: 'button[cdkStepperNext]',
+  host: {'(click)': '_stepper.next()'}
+})
+export class CdkStepperNext {
+  constructor(public _stepper: CdkStepper) { }
+}
+
+/** Button that moves to the previous step in a stepper workflow. */
+@Directive({
+  selector: 'button[cdkStepperPrevious]',
+  host: {'(click)': '_stepper.previous()'}
+})
+export class CdkStepperPrevious {
+  constructor(public _stepper: CdkStepper) { }
+}
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
new file mode 100644
index 000000000000..24a02dc6545a
--- /dev/null
+++ b/src/cdk/stepper/stepper.ts
@@ -0,0 +1,263 @@
+/**
+ * @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 {
+  ContentChildren,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+  Directive,
+  // This import is only used to define a generic type. The current TypeScript version incorrectly
+  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
+  // tslint:disable-next-line:no-unused-variable
+  ElementRef,
+  Component,
+  ContentChild,
+  ViewChild,
+  TemplateRef,
+  ViewEncapsulation,
+  Optional,
+  Inject,
+  forwardRef
+} from '@angular/core';
+import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
+import {CdkStepLabel} from './step-label';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {AbstractControl} from '@angular/forms';
+import {Directionality} from '@angular/cdk/bidi';
+
+/** Used to generate unique ID for each stepper component. */
+let nextId = 0;
+
+/**
+ * Position state of the content of each step in stepper that is used for transitioning
+ * the content into correct position upon step selection change.
+ */
+export type StepContentPositionState = 'previous' | 'current' | 'next';
+
+/** Change event emitted on selection changes. */
+export class StepperSelectionEvent {
+  /** Index of the step now selected. */
+  selectedIndex: number;
+
+  /** Index of the step previously selected. */
+  previouslySelectedIndex: number;
+
+  /** The step instance now selected. */
+  selectedStep: CdkStep;
+
+  /** The step instance previously selected. */
+  previouslySelectedStep: CdkStep;
+}
+
+@Component({
+  selector: 'cdk-step',
+  templateUrl: 'step.html',
+  encapsulation: ViewEncapsulation.None
+})
+export class CdkStep {
+  /** Template for step label if it exists. */
+  @ContentChild(CdkStepLabel) stepLabel: CdkStepLabel;
+
+  /** Template for step content. */
+  @ViewChild(TemplateRef) content: TemplateRef<any>;
+
+  /** The top level abstract control of the step. */
+  @Input() stepControl: AbstractControl;
+
+  /** Whether user has seen the expanded step content or not . */
+  interacted = false;
+
+  /** Label of the step. */
+  @Input()
+  label: string;
+
+  @Input()
+  get editable() { return this._editable; }
+  set editable(value: any) {
+    this._editable = coerceBooleanProperty(value);
+  }
+  private _editable = true;
+
+  /** Whether the completion of step is optional or not. */
+  @Input()
+  get optional() { return this._optional; }
+  set optional(value: any) {
+    this._optional = coerceBooleanProperty(value);
+  }
+  private _optional = false;
+
+  /** Return whether step is completed or not. */
+  @Input()
+  get completed() {
+    return this._customCompleted == null ? this._defaultCompleted : this._customCompleted;
+  }
+  set completed(value: any) {
+    this._customCompleted = coerceBooleanProperty(value);
+  }
+  private _customCompleted: boolean | null = null;
+
+  private get _defaultCompleted() {
+    return this.stepControl ? this.stepControl.valid && this.interacted : this.interacted;
+  }
+
+  constructor(@Inject(forwardRef(() => CdkStepper)) private _stepper: CdkStepper) { }
+
+  /** Selects this step component. */
+  select(): void {
+    this._stepper.selected = this;
+  }
+}
+
+@Directive({
+  selector: '[cdkStepper]',
+})
+export class CdkStepper {
+  /** The list of step components that the stepper is holding. */
+  @ContentChildren(CdkStep) _steps: QueryList<CdkStep>;
+
+  /** The list of step headers of the steps in the stepper. */
+  _stepHeader: QueryList<ElementRef>;
+
+  /** Whether the validity of previous steps should be checked or not. */
+  @Input()
+  get linear() { return this._linear; }
+  set linear(value: any) { this._linear = coerceBooleanProperty(value); }
+  private _linear = false;
+
+  /** The index of the selected step. */
+  @Input()
+  get selectedIndex() { return this._selectedIndex; }
+  set selectedIndex(index: number) {
+    if (this._anyControlsInvalid(index)
+        || index < this._selectedIndex && !this._steps.toArray()[index].editable) {
+      // remove focus from clicked step header if the step is not able to be selected
+      this._stepHeader.toArray()[index].nativeElement.blur();
+    } else if (this._selectedIndex != index) {
+      this._emitStepperSelectionEvent(index);
+      this._focusIndex = this._selectedIndex;
+    }
+  }
+  private _selectedIndex: number = 0;
+
+  /** The step that is selected. */
+  @Input()
+  get selected() { return this._steps[this.selectedIndex]; }
+  set selected(step: CdkStep) {
+    let index = this._steps.toArray().indexOf(step);
+    this.selectedIndex = index;
+  }
+
+  /** Event emitted when the selected step has changed. */
+  @Output() selectionChange = new EventEmitter<StepperSelectionEvent>();
+
+  /** The index of the step that the focus can be set. */
+  _focusIndex: number = 0;
+
+  /** Used to track unique ID for each stepper component. */
+  _groupId: number;
+
+  constructor(@Optional() private _dir: Directionality) {
+    this._groupId = nextId++;
+  }
+
+  /** Selects and focuses the next step in list. */
+  next(): void {
+    this.selectedIndex = Math.min(this._selectedIndex + 1, this._steps.length - 1);
+  }
+
+  /** Selects and focuses the previous step in list. */
+  previous(): void {
+    this.selectedIndex = Math.max(this._selectedIndex - 1, 0);
+  }
+
+  /** Returns a unique id for each step label element. */
+  _getStepLabelId(i: number): string {
+    return `mat-step-label-${this._groupId}-${i}`;
+  }
+
+  /** Returns unique id for each step content element. */
+  _getStepContentId(i: number): string {
+    return `mat-step-content-${this._groupId}-${i}`;
+  }
+
+  /** Returns position state of the step with the given index. */
+  _getAnimationDirection(index: number): StepContentPositionState {
+    const position = index - this._selectedIndex;
+    if (position < 0) {
+      return 'previous';
+    } else if (position > 0) {
+      return 'next';
+    } else {
+      return 'current';
+    }
+  }
+
+  /** Returns the type of icon to be displayed. */
+  _getIndicatorType(index: number): 'number' | 'edit' | 'done' {
+    const step = this._steps.toArray()[index];
+    if (!step.completed || this._selectedIndex == index) {
+      return 'number';
+    } else {
+      return step.editable ? 'edit' : 'done';
+    }
+  }
+
+  private _emitStepperSelectionEvent(newIndex: number): void {
+    const stepsArray = this._steps.toArray();
+    this.selectionChange.emit({
+      selectedIndex: newIndex,
+      previouslySelectedIndex: this._selectedIndex,
+      selectedStep: stepsArray[newIndex],
+      previouslySelectedStep: stepsArray[this._selectedIndex],
+    });
+    this._selectedIndex = newIndex;
+  }
+
+  _onKeydown(event: KeyboardEvent) {
+    switch (event.keyCode) {
+      case RIGHT_ARROW:
+        if (this._dir && this._dir.value === 'rtl') {
+          this._focusStep((this._focusIndex + this._steps.length - 1) % this._steps.length);
+        } else {
+          this._focusStep((this._focusIndex + 1) % this._steps.length);
+        }
+        break;
+      case LEFT_ARROW:
+        if (this._dir && this._dir.value === 'rtl') {
+          this._focusStep((this._focusIndex + 1) % this._steps.length);
+        } else {
+          this._focusStep((this._focusIndex + this._steps.length - 1) % this._steps.length);
+        }
+        break;
+      case SPACE:
+      case ENTER:
+        this.selectedIndex = this._focusIndex;
+        break;
+      default:
+        // Return to avoid calling preventDefault on keys that are not explicitly handled.
+        return;
+    }
+    event.preventDefault();
+  }
+
+  private _focusStep(index: number) {
+    this._focusIndex = index;
+    this._stepHeader.toArray()[this._focusIndex].nativeElement.focus();
+  }
+
+  private _anyControlsInvalid(index: number): boolean {
+    const stepsArray = this._steps.toArray();
+    stepsArray[this._selectedIndex].interacted = true;
+    if (this._linear) {
+      return stepsArray.slice(0, index).some(step => step.stepControl.invalid);
+    }
+    return false;
+  }
+}
diff --git a/src/cdk/stepper/tsconfig-build.json b/src/cdk/stepper/tsconfig-build.json
new file mode 100644
index 000000000000..4231d46ba702
--- /dev/null
+++ b/src/cdk/stepper/tsconfig-build.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/stepper",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 2938c6fe5400..8d35ac9bb93f 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -72,6 +72,7 @@ export class DemoApp {
     {name: 'Slider', route: '/slider'},
     {name: 'Slide Toggle', route: '/slide-toggle'},
     {name: 'Snack Bar', route: '/snack-bar'},
+    {name: 'Stepper', route: 'stepper'},
     {name: 'Table', route: '/table'},
     {name: 'Tabs', route: '/tabs'},
     {name: 'Toolbar', route: '/toolbar'},
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index 7b5165b3fa35..79de0624a050 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -40,6 +40,7 @@ import {PeopleDatabase} from '../table/people-database';
 import {DatepickerDemo} from '../datepicker/datepicker-demo';
 import {TypographyDemo} from '../typography/typography-demo';
 import {ExpansionDemo} from '../expansion/expansion-demo';
+import {StepperDemo} from '../stepper/stepper-demo';
 import {DemoMaterialModule} from '../demo-material-module';
 import {
   FullscreenOverlayContainer,
@@ -92,6 +93,7 @@ import {TableHeaderDemo} from '../table/table-header-demo';
     SliderDemo,
     SlideToggleDemo,
     SpagettiPanel,
+    StepperDemo,
     StyleDemo,
     TableHeaderDemo,
     ToolbarDemo,
diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts
index ac5d752b0f5f..1a0b5eb5a389 100644
--- a/src/demo-app/demo-app/routes.ts
+++ b/src/demo-app/demo-app/routes.ts
@@ -36,6 +36,7 @@ import {DatepickerDemo} from '../datepicker/datepicker-demo';
 import {TableDemo} from '../table/table-demo';
 import {TypographyDemo} from '../typography/typography-demo';
 import {ExpansionDemo} from '../expansion/expansion-demo';
+import {StepperDemo} from '../stepper/stepper-demo';
 import {DemoApp} from './demo-app';
 import {AccessibilityDemo} from '../a11y/a11y';
 import {ACCESSIBILITY_DEMO_ROUTES} from '../a11y/routes';
@@ -78,6 +79,7 @@ export const DEMO_APP_ROUTES: Routes = [
     {path: 'style', component: StyleDemo},
     {path: 'typography', component: TypographyDemo},
     {path: 'expansion', component: ExpansionDemo},
+    {path: 'stepper', component: StepperDemo}
   ]}
 ];
 
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index 74b1b5ce9e17..bf2ffc8cc2df 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -31,7 +31,8 @@ import {
   MdTabsModule,
   MdToolbarModule,
   MdTooltipModule,
-  StyleModule
+  StyleModule,
+  MdStepperModule,
 } from '@angular/material';
 import {CdkTableModule} from '@angular/cdk/table';
 import {A11yModule} from '@angular/cdk/a11y';
@@ -73,6 +74,7 @@ import {PortalModule} from '@angular/cdk/portal';
     MdSliderModule,
     MdSnackBarModule,
     MdSortModule,
+    MdStepperModule,
     MdTabsModule,
     MdToolbarModule,
     MdTooltipModule,
diff --git a/src/demo-app/stepper/stepper-demo.html b/src/demo-app/stepper/stepper-demo.html
new file mode 100644
index 000000000000..11cda6eaea19
--- /dev/null
+++ b/src/demo-app/stepper/stepper-demo.html
@@ -0,0 +1,197 @@
+<md-checkbox [(ngModel)]="isNonLinear">Disable linear mode</md-checkbox>
+
+<h3>Linear Vertical Stepper Demo using a single form</h3>
+<form [formGroup]="formGroup">
+  <md-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
+    <md-step formGroupName="0" [stepControl]="formArray?.get([0])">
+      <ng-template mdStepLabel>Fill out your name</ng-template>
+      <md-input-container>
+        <input mdInput placeholder="First Name" formControlName="firstNameFormCtrl" required>
+        <md-error>This field is required</md-error>
+      </md-input-container>
+
+      <md-input-container>
+        <input mdInput placeholder="Last Name" formControlName="lastNameFormCtrl" required>
+        <md-error>This field is required</md-error>
+      </md-input-container>
+      <div>
+        <button md-button mdStepperNext type="button">Next</button>
+      </div>
+    </md-step>
+
+    <md-step formGroupName="1" [stepControl]="formArray?.get([1])" optional>
+      <ng-template mdStepLabel>
+        <div>Fill out your email address</div>
+      </ng-template>
+      <md-input-container>
+        <input mdInput placeholder="Email address" formControlName="emailFormCtrl">
+        <md-error>The input is invalid.</md-error>
+      </md-input-container>
+      <div>
+        <button md-button mdStepperPrevious type="button">Back</button>
+        <button md-button mdStepperNext type="button">Next</button>
+      </div>
+    </md-step>
+
+    <md-step>
+      <ng-template mdStepLabel>Confirm your information</ng-template>
+      Everything seems correct.
+      <div>
+        <button md-button>Done</button>
+      </div>
+    </md-step>
+  </md-vertical-stepper>
+</form>
+
+<h3>Linear Horizontal Stepper Demo using a different form for each step</h3>
+<md-horizontal-stepper [linear]="!isNonLinear">
+  <md-step [stepControl]="nameFormGroup">
+    <form [formGroup]="nameFormGroup">
+      <ng-template mdStepLabel>Fill out your name</ng-template>
+      <md-form-field>
+        <input mdInput placeholder="First Name" formControlName="firstNameCtrl" required>
+        <md-error>This field is required</md-error>
+      </md-form-field>
+      <md-form-field>
+        <input mdInput placeholder="Last Name" formControlName="lastNameCtrl" required>
+        <md-error>This field is required</md-error>
+      </md-form-field>
+      <div>
+        <button md-button mdStepperNext>Next</button>
+      </div>
+    </form>
+  </md-step>
+
+  <md-step [stepControl]="emailFormGroup" optional>
+    <form [formGroup]="emailFormGroup">
+      <ng-template mdStepLabel>Fill out your email address</ng-template>
+      <md-form-field>
+        <input mdInput placeholder="Email address" formControlName="emailCtrl">
+        <md-error>The input is invalid</md-error>
+      </md-form-field>
+      <div>
+        <button md-button mdStepperPrevious>Back</button>
+        <button md-button mdStepperNext>Next</button>
+      </div>
+    </form>
+  </md-step>
+
+  <md-step>
+    <form>
+      <ng-template mdStepLabel>Confirm your information</ng-template>
+      Everything seems correct.
+      <div>
+        <button md-button>Done</button>
+      </div>
+    </form>
+  </md-step>
+</md-horizontal-stepper>
+
+<h3>Vertical Stepper Demo</h3>
+<md-checkbox [(ngModel)]="isNonEditable">Make steps non-editable</md-checkbox>
+<md-vertical-stepper>
+  <md-step [editable]="!isNonEditable">
+    <ng-template mdStepLabel>Fill out your name</ng-template>
+    <md-form-field>
+      <input mdInput placeholder="First Name">
+    </md-form-field>
+
+    <md-form-field>
+      <input mdInput placeholder="Last Name">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperNext type="button">Next</button>
+    </div>
+  </md-step>
+
+  <md-step [editable]="!isNonEditable">
+    <ng-template mdStepLabel>
+      <div>Fill out your phone number</div>
+    </ng-template>
+    <md-form-field>
+      <input mdInput placeholder="Phone number">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperPrevious type="button">Back</button>
+      <button md-button mdStepperNext type="button">Next</button>
+    </div>
+  </md-step>
+
+  <md-step [editable]="!isNonEditable">
+    <ng-template mdStepLabel>
+      <div>Fill out your address</div>
+    </ng-template>
+    <md-form-field>
+      <input mdInput placeholder="Address">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperPrevious type="button">Back</button>
+      <button md-button mdStepperNext type="button">Next</button>
+    </div>
+  </md-step>
+
+  <md-step>
+    <ng-template mdStepLabel>Confirm your information</ng-template>
+    Everything seems correct.
+    <div>
+      <button md-button>Done</button>
+    </div>
+  </md-step>
+</md-vertical-stepper>
+
+<h3>Horizontal Stepper Demo with Text Label</h3>
+<md-horizontal-stepper>
+  <md-step label="Fill out your name">
+    <md-form-field>
+      <input mdInput placeholder="First Name">
+    </md-form-field>
+
+    <md-form-field>
+      <input mdInput placeholder="Last Name">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperNext type="button">Next</button>
+    </div>
+  </md-step>
+
+  <md-step label="Fill out your phone number">
+    <md-form-field>
+      <input mdInput placeholder="Phone number">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperPrevious type="button">Back</button>
+      <button md-button mdStepperNext type="button">Next</button>
+    </div>
+  </md-step>
+
+  <md-step label="Fill out your address">
+    <md-form-field>
+      <input mdInput placeholder="Address">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperPrevious type="button">Back</button>
+      <button md-button mdStepperNext type="button">Next</button>
+    </div>
+  </md-step>
+
+  <md-step label="Confirm your information">
+    Everything seems correct.
+    <div>
+      <button md-button>Done</button>
+    </div>
+  </md-step>
+</md-horizontal-stepper>
+
+<h3>Horizontal Stepper Demo with Templated Label</h3>
+<md-horizontal-stepper>
+  <md-step *ngFor="let step of steps">
+    <ng-template mdStepLabel>{{step.label}}</ng-template>
+    <md-form-field>
+      <input mdInput placeholder="Answer" [(ngModel)]="step.content">
+    </md-form-field>
+    <div>
+      <button md-button mdStepperPrevious>Back</button>
+      <button md-button mdStepperNext>Next</button>
+    </div>
+  </md-step>
+</md-horizontal-stepper>
diff --git a/src/demo-app/stepper/stepper-demo.ts b/src/demo-app/stepper/stepper-demo.ts
new file mode 100644
index 000000000000..77cfb3535913
--- /dev/null
+++ b/src/demo-app/stepper/stepper-demo.ts
@@ -0,0 +1,53 @@
+import {Component} from '@angular/core';
+import {AbstractControl, FormBuilder, FormGroup, Validators} from '@angular/forms';
+
+const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+
+@Component({
+  moduleId: module.id,
+  selector: 'stepper-demo',
+  templateUrl: 'stepper-demo.html'
+})
+export class StepperDemo {
+  formGroup: FormGroup;
+  isNonLinear = false;
+  isNonEditable = false;
+
+  nameFormGroup: FormGroup;
+  emailFormGroup: FormGroup;
+
+  steps = [
+    {label: 'Confirm your name', content: 'Last name, First name.'},
+    {label: 'Confirm your contact information', content: '123-456-7890'},
+    {label: 'Confirm your address', content: '1600 Amphitheater Pkwy MTV'},
+    {label: 'You are now done', content: 'Finished!'}
+  ];
+
+  /** Returns a FormArray with the name 'formArray'. */
+  get formArray(): AbstractControl | null { return this.formGroup.get('formArray'); }
+
+  constructor(private _formBuilder: FormBuilder) { }
+
+  ngOnInit() {
+    this.formGroup = this._formBuilder.group({
+      formArray: this._formBuilder.array([
+        this._formBuilder.group({
+          firstNameFormCtrl: ['', Validators.required],
+          lastNameFormCtrl: ['', Validators.required],
+        }),
+        this._formBuilder.group({
+          emailFormCtrl: ['', Validators.pattern(EMAIL_REGEX)]
+        }),
+      ])
+    });
+
+    this.nameFormGroup = this._formBuilder.group({
+      firstNameCtrl: ['', Validators.required],
+      lastNameCtrl: ['', Validators.required],
+    });
+
+    this.emailFormGroup = this._formBuilder.group({
+      emailCtrl: ['', Validators.pattern(EMAIL_REGEX)]
+    });
+  }
+}
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 6965450053b8..38f8de2c2284 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -38,6 +38,7 @@ System.config({
     '@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
     '@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',
     '@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js',
+    '@angular/cdk/stepper': 'dist/bundles/cdk-stepper.umd.js',
     '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
     '@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js',
   },
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 2360a995fe45..75700c38fcfc 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -38,6 +38,7 @@ System.config({
     '@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
     '@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',
     '@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js',
+    '@angular/cdk/stepper': 'dist/bundles/cdk-stepper.umd.js',
     '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
     '@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js',
     '@angular/material-examples': 'dist/bundles/material-examples.umd.js',
diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts
index 53ed876ff3d4..769e23fcb549 100644
--- a/src/lib/core/compatibility/compatibility.ts
+++ b/src/lib/core/compatibility/compatibility.ts
@@ -39,6 +39,9 @@ export const MAT_ELEMENTS_SELECTOR = `
   [matHeaderRowDef],
   [matLine],
   [matRowDef],
+  [matStepLabel],
+  [matStepperNext],
+  [matStepperPrevious],
   [matTabLabel],
   [matTabLink],
   [matTabNav],
@@ -73,6 +76,7 @@ export const MAT_ELEMENTS_SELECTOR = `
   mat-header-cell,
   mat-header-row,
   mat-hint,
+  mat-horizontal-stepper,
   mat-icon,
   mat-input-container,
   mat-form-field,
@@ -92,10 +96,12 @@ export const MAT_ELEMENTS_SELECTOR = `
   mat-sidenav-container,
   mat-slider,
   mat-spinner,
+  mat-step,
   mat-tab,
   mat-table,
   mat-tab-group,
-  mat-toolbar`;
+  mat-toolbar,
+  mat-vertical-stepper`;
 
 /** Selector that matches all elements that may have style collisions with AngularJS Material. */
 export const MD_ELEMENTS_SELECTOR = `
@@ -116,6 +122,9 @@ export const MD_ELEMENTS_SELECTOR = `
   [mdHeaderRowDef],
   [mdLine],
   [mdRowDef],
+  [mdStepLabel],
+  [mdStepperNext],
+  [mdStepperPrevious],
   [mdTabLabel],
   [mdTabLink],
   [mdTabNav],
@@ -150,6 +159,7 @@ export const MD_ELEMENTS_SELECTOR = `
   md-header-cell,
   md-header-row,
   md-hint,
+  md-horizontal-stepper,
   md-icon,
   md-input-container,
   md-form-field,
@@ -169,10 +179,12 @@ export const MD_ELEMENTS_SELECTOR = `
   md-sidenav-container,
   md-slider,
   md-spinner,
+  md-step,
   md-tab,
   md-table,
   md-tab-group,
-  md-toolbar`;
+  md-toolbar,
+  md-vertical-stepper`;
 
 /** Directive that enforces that the `mat-` prefix cannot be used. */
 @Directive({selector: MAT_ELEMENTS_SELECTOR})
diff --git a/src/lib/core/theming/_all-theme.scss b/src/lib/core/theming/_all-theme.scss
index 4f808fca5ef1..a2ed3f9459ba 100644
--- a/src/lib/core/theming/_all-theme.scss
+++ b/src/lib/core/theming/_all-theme.scss
@@ -23,6 +23,7 @@
 @import '../../sidenav/sidenav-theme';
 @import '../../slide-toggle/slide-toggle-theme';
 @import '../../slider/slider-theme';
+@import '../../stepper/stepper-theme';
 @import '../../tabs/tabs-theme';
 @import '../../toolbar/toolbar-theme';
 @import '../../tooltip/tooltip-theme';
@@ -57,6 +58,7 @@
   @include mat-sidenav-theme($theme);
   @include mat-slide-toggle-theme($theme);
   @include mat-slider-theme($theme);
+  @include mat-stepper-theme($theme);
   @include mat-tabs-theme($theme);
   @include mat-toolbar-theme($theme);
   @include mat-tooltip-theme($theme);
diff --git a/src/lib/core/typography/_all-typography.scss b/src/lib/core/typography/_all-typography.scss
index 4935de608bd2..a0766383a781 100644
--- a/src/lib/core/typography/_all-typography.scss
+++ b/src/lib/core/typography/_all-typography.scss
@@ -22,6 +22,7 @@
 @import '../../sidenav/sidenav-theme';
 @import '../../slide-toggle/slide-toggle-theme';
 @import '../../slider/slider-theme';
+@import '../../stepper/stepper-theme';
 @import '../../tabs/tabs-theme';
 @import '../../toolbar/toolbar-theme';
 @import '../../tooltip/tooltip-theme';
@@ -61,6 +62,7 @@
   @include mat-sidenav-typography($config);
   @include mat-slide-toggle-typography($config);
   @include mat-slider-typography($config);
+  @include mat-stepper-typography($config);
   @include mat-tabs-typography($config);
   @include mat-toolbar-typography($config);
   @include mat-tooltip-typography($config);
diff --git a/src/lib/module.ts b/src/lib/module.ts
index 4cec7ca1de0c..66d460334b03 100644
--- a/src/lib/module.ts
+++ b/src/lib/module.ts
@@ -46,6 +46,7 @@ import {MdTableModule} from './table/index';
 import {MdSortModule} from './sort/index';
 import {MdPaginatorModule} from './paginator/index';
 import {MdFormFieldModule} from './form-field/index';
+import {MdStepperModule} from './stepper/index';
 
 const MATERIAL_MODULES = [
   MdAutocompleteModule,
@@ -75,6 +76,7 @@ const MATERIAL_MODULES = [
   MdSlideToggleModule,
   MdSnackBarModule,
   MdSortModule,
+  MdStepperModule,
   MdTabsModule,
   MdToolbarModule,
   MdTooltipModule,
@@ -85,7 +87,7 @@ const MATERIAL_MODULES = [
   A11yModule,
   PlatformModule,
   MdCommonModule,
-  ObserversModule
+  ObserversModule,
 ];
 
 /** @deprecated */
diff --git a/src/lib/public_api.ts b/src/lib/public_api.ts
index 7c4bdffb425a..4156ab5191d0 100644
--- a/src/lib/public_api.ts
+++ b/src/lib/public_api.ts
@@ -46,3 +46,4 @@ export * from './tabs/index';
 export * from './tabs/tab-nav-bar/index';
 export * from './toolbar/index';
 export * from './tooltip/index';
+export * from './stepper/index';
diff --git a/src/lib/stepper/_stepper-theme.scss b/src/lib/stepper/_stepper-theme.scss
new file mode 100644
index 000000000000..fc4e339a49c0
--- /dev/null
+++ b/src/lib/stepper/_stepper-theme.scss
@@ -0,0 +1,53 @@
+@import '../core/theming/palette';
+@import '../core/theming/theming';
+@import '../core/typography/typography-utils';
+
+@mixin mat-stepper-theme($theme) {
+  $foreground: map-get($theme, foreground);
+  $background: map-get($theme, background);
+  $primary: map-get($theme, primary);
+
+  .mat-step-header {
+    &:focus,
+    &:hover {
+      background-color: mat-color($background, hover);
+    }
+
+    .mat-step-label-active {
+      color: mat-color($foreground, text);
+    }
+
+    .mat-step-label-inactive,
+    .mat-step-optional {
+      color: mat-color($foreground, disabled-text);
+    }
+
+    .mat-step-icon {
+      background-color: mat-color($primary);
+      color: mat-color($primary, default-contrast);
+    }
+
+    .mat-step-icon-not-touched {
+      background-color: mat-color($foreground, disabled-text);
+      color: mat-color($primary, default-contrast);
+    }
+  }
+
+  .mat-stepper-horizontal, .mat-stepper-vertical {
+    background-color: mat-color($background, card);
+  }
+
+  .mat-stepper-vertical-line::before {
+    border-left-color: mat-color($foreground, divider);
+  }
+
+  .mat-stepper-horizontal-line {
+    border-top-color: mat-color($foreground, divider);
+  }
+}
+
+@mixin mat-stepper-typography($config) {
+  .mat-stepper-vertical, .mat-stepper-horizontal {
+    font-family: mat-font-family($config);
+  }
+}
diff --git a/src/lib/stepper/index.ts b/src/lib/stepper/index.ts
new file mode 100644
index 000000000000..a574fbc53997
--- /dev/null
+++ b/src/lib/stepper/index.ts
@@ -0,0 +1,40 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {PortalModule} from '@angular/cdk/portal';
+import {MdButtonModule} from '../button/index';
+import {MdStep, MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
+import {CdkStepperModule} from '@angular/cdk/stepper';
+import {MdCommonModule} from '../core';
+import {MdStepLabel} from './step-label';
+import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+import {MdIconModule} from '../icon/index';
+import {MdStepHeader} from './step-header';
+
+@NgModule({
+  imports: [
+    MdCommonModule,
+    CommonModule,
+    PortalModule,
+    MdButtonModule,
+    CdkStepperModule,
+    MdIconModule
+  ],
+  exports: [MdCommonModule, MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
+    MdStepperNext, MdStepperPrevious, MdStepHeader],
+  declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
+    MdStepperNext, MdStepperPrevious, MdStepHeader],
+})
+export class MdStepperModule {}
+
+export * from './step-label';
+export * from './stepper';
+export * from './stepper-button';
+export * from './step-header';
diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
new file mode 100644
index 000000000000..3f2310862f6f
--- /dev/null
+++ b/src/lib/stepper/step-header.html
@@ -0,0 +1,17 @@
+<div [class.mat-step-icon]="icon != 'number' || selected"
+     [class.mat-step-icon-not-touched]="icon == 'number' && !selected">
+  <span *ngIf="icon == 'number'">{{index + 1}}</span>
+  <md-icon *ngIf="icon == 'edit'">create</md-icon>
+  <md-icon *ngIf="icon == 'done'">done</md-icon>
+</div>
+<div [class.mat-step-label-active]="active"
+     [class.mat-step-label-inactive]="!active">
+  <!-- If there is a label template, use it. -->
+  <ng-container *ngIf="_templateLabel" [ngTemplateOutlet]="label.template">
+  </ng-container>
+  <!-- It there is no label template, fall back to the text label. -->
+  <div class="mat-step-text-label" *ngIf="_stringLabel">{{label}}</div>
+
+  <div class="mat-step-optional" *ngIf="optional">Optional</div>
+</div>
+
diff --git a/src/lib/stepper/step-header.scss b/src/lib/stepper/step-header.scss
new file mode 100644
index 000000000000..9313a57e4a48
--- /dev/null
+++ b/src/lib/stepper/step-header.scss
@@ -0,0 +1,42 @@
+$mat-stepper-label-header-height: 24px !default;
+$mat-stepper-label-min-width: 50px !default;
+$mat-stepper-side-gap: 24px !default;
+$mat-vertical-stepper-content-margin: 36px !default;
+$mat-stepper-line-gap: 8px !default;
+$mat-step-optional-font-size: 12px;
+$mat-step-header-icon-size: 16px !default;
+
+.mat-step-optional {
+  font-size: $mat-step-optional-font-size;
+}
+
+.mat-step-icon,
+.mat-step-icon-not-touched {
+  border-radius: 50%;
+  height: $mat-stepper-label-header-height;
+  width: $mat-stepper-label-header-height;
+  align-items: center;
+  justify-content: center;
+  display: flex;
+}
+
+.mat-step-icon .mat-icon {
+  font-size: $mat-step-header-icon-size;
+  height: $mat-step-header-icon-size;
+  width: $mat-step-header-icon-size;
+}
+
+.mat-step-label-active,
+.mat-step-label-inactive {
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  min-width: $mat-stepper-label-min-width;
+  vertical-align: middle;
+}
+
+.mat-step-text-label {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
new file mode 100644
index 000000000000..14901227f698
--- /dev/null
+++ b/src/lib/stepper/step-header.ts
@@ -0,0 +1,73 @@
+/**
+ * @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 {Component, Input, ViewEncapsulation} from '@angular/core';
+import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
+import {MdStepLabel} from './step-label';
+
+@Component({
+  selector: 'md-step-header, mat-step-header',
+  templateUrl: 'step-header.html',
+  styleUrls: ['step-header.css'],
+  host: {
+    'class': 'mat-step-header',
+    'role': 'tab',
+  },
+  encapsulation: ViewEncapsulation.None
+})
+export class MdStepHeader {
+  /** Icon for the given step. */
+  @Input()
+  icon: string;
+
+  /** Label of the given step. */
+  @Input()
+  label: MdStepLabel | string;
+
+  /** Index of the given step. */
+  @Input()
+  get index() { return this._index; }
+  set index(value: any) {
+    this._index = coerceNumberProperty(value);
+  }
+  private _index: number;
+
+  /** Whether the given step is selected. */
+  @Input()
+  get selected() { return this._selected; }
+  set selected(value: any) {
+    this._selected = coerceBooleanProperty(value);
+  }
+  private _selected: boolean;
+
+  /** Whether the given step label is active. */
+  @Input()
+  get active() { return this._active; }
+  set active(value: any) {
+    this._active = coerceBooleanProperty(value);
+  }
+  private _active: boolean;
+
+  /** Whether the given step is optional. */
+  @Input()
+  get optional() { return this._optional; }
+  set optional(value: any) {
+    this._optional = coerceBooleanProperty(value);
+  }
+  private _optional: boolean;
+
+  /** Returns string label of given step if it is a text label. */
+  get _stringLabel(): string | null {
+    return this.label instanceof MdStepLabel ? null : this.label;
+  }
+
+  /** Returns MdStepLabel if the label of given step is a template label. */
+  get _templateLabel(): MdStepLabel | null {
+    return this.label instanceof MdStepLabel ? this.label : null;
+  }
+}
diff --git a/src/lib/stepper/step-label.ts b/src/lib/stepper/step-label.ts
new file mode 100644
index 000000000000..62e1bc7f60e4
--- /dev/null
+++ b/src/lib/stepper/step-label.ts
@@ -0,0 +1,22 @@
+/**
+ * @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, TemplateRef} from '@angular/core';
+import {CdkStepLabel} from '@angular/cdk/stepper';
+
+/** Workaround for https://github.com/angular/angular/issues/17849 */
+export const _MdStepLabel = CdkStepLabel;
+
+@Directive({
+  selector: '[mdStepLabel], [matStepLabel]',
+})
+export class MdStepLabel extends _MdStepLabel {
+  constructor(template: TemplateRef<any>) {
+    super(template);
+  }
+}
diff --git a/src/lib/stepper/step.html b/src/lib/stepper/step.html
new file mode 100644
index 000000000000..cd48c06b9917
--- /dev/null
+++ b/src/lib/stepper/step.html
@@ -0,0 +1 @@
+<ng-template><ng-content></ng-content></ng-template>
diff --git a/src/lib/stepper/stepper-button.ts b/src/lib/stepper/stepper-button.ts
new file mode 100644
index 000000000000..e1d5bb488bef
--- /dev/null
+++ b/src/lib/stepper/stepper-button.ts
@@ -0,0 +1,31 @@
+/**
+ * @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} from '@angular/core';
+import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
+import {MdStepper} from './stepper';
+
+/** Workaround for https://github.com/angular/angular/issues/17849 */
+export const _MdStepperNext = CdkStepperNext;
+export const _MdStepperPrevious = CdkStepperPrevious;
+
+/** Button that moves to the next step in a stepper workflow. */
+@Directive({
+  selector: 'button[mdStepperNext], button[matStepperNext]',
+  host: {'(click)': '_stepper.next()'},
+  providers: [{provide: CdkStepper, useExisting: MdStepper}]
+})
+export class MdStepperNext extends _MdStepperNext { }
+
+/** Button that moves to the previous step in a stepper workflow. */
+@Directive({
+  selector: 'button[mdStepperPrevious], button[matStepperPrevious]',
+  host: {'(click)': '_stepper.previous()'},
+  providers: [{provide: CdkStepper, useExisting: MdStepper}]
+})
+export class MdStepperPrevious extends _MdStepperPrevious { }
diff --git a/src/lib/stepper/stepper-horizontal.html b/src/lib/stepper/stepper-horizontal.html
new file mode 100644
index 000000000000..5e2d2ea80fa7
--- /dev/null
+++ b/src/lib/stepper/stepper-horizontal.html
@@ -0,0 +1,30 @@
+<div class="mat-horizontal-stepper-header-container">
+  <ng-container *ngFor="let step of _steps; let i = index; let isLast = last">
+    <md-step-header  class="mat-horizontal-stepper-header"
+                     (click)="step.select()"
+                     (keydown)="_onKeydown($event)"
+                     [tabIndex]="_focusIndex == i ? 0 : -1"
+                     [id]="_getStepLabelId(i)"
+                     [attr.aria-controls]="_getStepContentId(i)"
+                     [attr.aria-selected]="selectedIndex == i"
+                     [index]="i"
+                     [icon]="_getIndicatorType(i)"
+                     [label]="step.stepLabel || step.label"
+                     [selected]="selectedIndex == i"
+                     [active]="step.completed || selectedIndex == i"
+                     [optional]="step.optional">
+    </md-step-header>
+    <div *ngIf="!isLast" class="mat-stepper-horizontal-line"></div>
+  </ng-container>
+</div>
+
+<div class="mat-horizontal-content-container">
+  <div *ngFor="let step of _steps; let i = index"
+       class="mat-horizontal-stepper-content" role="tabpanel"
+       [@stepTransition]="_getAnimationDirection(i)"
+       [id]="_getStepContentId(i)"
+       [attr.aria-labelledby]="_getStepLabelId(i)"
+       [attr.aria-expanded]="selectedIndex == i">
+    <ng-container [ngTemplateOutlet]="step.content"></ng-container>
+  </div>
+</div>
diff --git a/src/lib/stepper/stepper-vertical.html b/src/lib/stepper/stepper-vertical.html
new file mode 100644
index 000000000000..b73bed61929b
--- /dev/null
+++ b/src/lib/stepper/stepper-vertical.html
@@ -0,0 +1,28 @@
+<div class="mat-step" *ngFor="let step of _steps; let i = index; let isLast = last">
+  <md-step-header  class="mat-vertical-stepper-header"
+                   (click)="step.select()"
+                   (keydown)="_onKeydown($event)"
+                   [tabIndex]="_focusIndex == i ? 0 : -1"
+                   [id]="_getStepLabelId(i)"
+                   [attr.aria-controls]="_getStepContentId(i)"
+                   [attr.aria-selected]="selectedIndex == i"
+                   [index]="i"
+                   [icon]="_getIndicatorType(i)"
+                   [label]="step.stepLabel || step.label"
+                   [selected]="selectedIndex == i"
+                   [active]="step.completed || selectedIndex == i"
+                   [optional]="step.optional">
+  </md-step-header>
+
+  <div class="mat-vertical-content-container" [class.mat-stepper-vertical-line]="!isLast">
+    <div class="mat-vertical-stepper-content" role="tabpanel"
+         [@stepTransition]="_getAnimationDirection(i)"
+         [id]="_getStepContentId(i)"
+         [attr.aria-labelledby]="_getStepLabelId(i)"
+         [attr.aria-expanded]="selectedIndex == i">
+      <div class="mat-vertical-content">
+        <ng-container [ngTemplateOutlet]="step.content"></ng-container>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/lib/stepper/stepper.md b/src/lib/stepper/stepper.md
new file mode 100644
index 000000000000..54e273068cf5
--- /dev/null
+++ b/src/lib/stepper/stepper.md
@@ -0,0 +1,132 @@
+Angular Material's stepper provides a wizard-like workflow by dividing content into logical steps.
+
+Material stepper builds on the foundation of the CDK stepper that is responsible for the logic
+that drives a stepped workflow. Material stepper extends the CDK stepper and has Material Design
+styling.
+
+### Stepper variants
+There are two stepper components: `md-horizontal-stepper` and `md-vertical-stepper`. They 
+can be used the same way. The only difference is the orientation of stepper. 
+`md-horizontal-stepper` selector can be used to create a horizontal stepper, and
+`md-vertical-stepper` can be used to create a vertical stepper. `md-step` components need to be
+placed inside either one of the two stepper components.
+
+### Labels
+If a step's label is only text, then the `label` attribute can be used.
+```html
+<md-vertical-stepper>
+  <md-step label="Step 1">
+    Content 1
+  </md-step>
+  <md-step label="Step 1">
+    Content 2
+  </md-step>
+</md-vertical-stepper>
+```
+
+For more complex labels, add a template with the `mdStepLabel` directive inside the 
+`md-step`.
+```html
+<md-vertical-stepper>
+  <md-step>
+    <ng-template mdStepLabel>...</ng-template>
+    ...
+  </md-step>
+</md-vertical-stepper>
+```
+
+### Stepper buttons
+There are two button directives to support navigation between different steps:
+`mdStepperPrevious` and `mdStepperNext`.
+```html
+<md-horizontal-stepper>
+  <md-step>
+    ...
+    <div>
+      <button md-button mdStepperPrevious>Back</button>
+      <button md-button mdStepperNext>Next</button>
+    </div>
+  </md-step>
+</md-horizontal-stepper>  
+```
+
+### Linear stepper
+The `linear` attribute can be set on `md-horizontal-stepper` and `md-vertical-stepper` to create
+a linear stepper that requires the user to complete previous steps before proceeding
+to following steps. For each `md-step`, the `stepControl` attribute can be set to the top level
+`AbstractControl` that is used to check the validity of the step. 
+
+There are two possible approaches. One is using a single form for stepper, and the other is
+using a different form for each step.
+
+#### Using a single form
+When using a single form for the stepper, `mdStepperPrevious` and `mdStepperNext` have to be
+set to `type="button"` in order to prevent submission of the form before all steps
+are completed. 
+
+```html
+<form [formGroup]="formGroup">
+  <md-horizontal-stepper formArrayName="formArray" linear>
+    <md-step formGroupName="0" [stepControl]="formArray.get([0])">
+      ...
+      <div>
+        <button md-button mdStepperNext type="button">Next</button>
+      </div>
+    </md-step>
+    <md-step formGroupName="1" [stepControl]="formArray.get([1])">
+      ...
+      <div>
+        <button md-button mdStepperPrevious type="button">Back</button>
+        <button md-button mdStepperNext type="button">Next</button>
+      </div>
+    </md-step>
+    ...
+  </md-horizontal-stepper> 
+</form>
+```
+
+#### Using a different form for each step
+```html
+<md-vertical-stepper linear>
+  <md-step [stepControl]="formGroup1">
+    <form [formGroup]="formGroup1">
+      ...
+    </form>
+  </md-step>
+  <md-step [stepControl]="formGroup2">
+    <form [formGroup]="formGroup2">
+      ...
+    </form>
+  </md-step>
+</md-vertical-stepper>
+```
+### Types of steps
+
+#### Optional step
+If completion of a step in linear stepper is not required, then the `optional` attribute can be set
+on `md-step`. 
+
+#### Editable step
+By default, steps are editable, which means users can return to previously completed steps and
+edit their responses. `editable="true"` can be set on `md-step` to change the default. 
+
+#### Completed step
+By default, the `completed` attribute of a step returns `true` if the step is valid (in case of
+linear stepper) and the user has interacted with the step. The user, however, can also override
+this default `completed` behavior by setting the `completed` attribute as needed.
+
+### Keyboard interaction
+- <kbd>LEFT_ARROW</kbd>: Focuses the previous step header
+- <kbd>RIGHT_ARROW</kbd>: Focuses the next step header
+- <kbd>ENTER</kbd>, <kbd>SPACE</kbd>: Selects the step that the focus is currently on
+- <kbd>TAB</kbd>: Focuses the next tabbable element
+- <kbd>TAB</kbd>+<kbd>SHIFT</kbd>: Focuses the previous tabbable element
+
+### Accessibility
+The stepper is treated as a tabbed view for accessibility purposes, so it is given
+`role="tablist"` by default. The header of step that can be clicked to select the step
+is given `role="tab"`, and the content that can be expanded upon selection is given
+`role="tabpanel"`. `aria-selected` attribute of step header and `aria-expanded` attribute of
+step content is automatically set based on step selection change.
+
+The stepper and each step should be given a meaningful label via `aria-label` or `aria-labelledby`.
\ No newline at end of file
diff --git a/src/lib/stepper/stepper.scss b/src/lib/stepper/stepper.scss
new file mode 100644
index 000000000000..b05c8ef8672d
--- /dev/null
+++ b/src/lib/stepper/stepper.scss
@@ -0,0 +1,122 @@
+@import '../core/style/variables';
+
+$mat-horizontal-stepper-header-height: 72px !default;
+$mat-stepper-label-header-height: 24px !default;
+$mat-stepper-side-gap: 24px !default;
+$mat-vertical-stepper-content-margin: 36px !default;
+$mat-stepper-line-width: 1px !default;
+$mat-stepper-line-gap: 8px !default;
+
+.mat-stepper-vertical,
+.mat-stepper-horizontal {
+  display: block;
+}
+
+.mat-step-header {
+  overflow: hidden;
+  outline: none;
+}
+
+.mat-horizontal-stepper-header-container {
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+}
+
+.mat-stepper-horizontal-line {
+  border-top-width: $mat-stepper-line-width;
+  border-top-style: solid;
+  flex: auto;
+  height: 0;
+  margin: 0 $mat-stepper-line-gap - $mat-stepper-side-gap;
+  min-width: $mat-stepper-line-gap + $mat-stepper-side-gap;
+}
+
+.mat-horizontal-stepper-header {
+  display: flex;
+  height: $mat-horizontal-stepper-header-height;
+  overflow: hidden;
+  align-items: center;
+  padding: 0 $mat-stepper-side-gap;
+
+  .mat-step-icon,
+  .mat-step-icon-not-touched {
+    margin-right: $mat-stepper-line-gap;
+    flex: none;
+
+    [dir='rtl'] & {
+      margin-right: 0;
+      margin-left: $mat-stepper-line-gap;
+    }
+  }
+}
+
+.mat-vertical-stepper-header {
+  display: flex;
+  align-items: center;
+  padding: $mat-stepper-side-gap;
+  max-height: $mat-stepper-label-header-height;
+
+  .mat-step-icon,
+  .mat-step-icon-not-touched {
+    margin-right: $mat-vertical-stepper-content-margin - $mat-stepper-side-gap;
+
+    [dir='rtl'] & {
+      margin-right: 0;
+      margin-left: $mat-vertical-stepper-content-margin - $mat-stepper-side-gap;
+    }
+  }
+}
+
+.mat-horizontal-stepper-content {
+  overflow: hidden;
+
+  &[aria-expanded='false'] {
+    height: 0;
+  }
+}
+
+.mat-horizontal-content-container {
+  overflow: hidden;
+  padding: 0 $mat-stepper-side-gap $mat-stepper-side-gap $mat-stepper-side-gap;
+}
+
+.mat-vertical-content-container {
+  margin-left: $mat-vertical-stepper-content-margin;
+  border: 0;
+  position: relative;
+
+  [dir='rtl'] & {
+    margin-left: 0;
+    margin-right: $mat-vertical-stepper-content-margin;
+  }
+}
+
+.mat-stepper-vertical-line::before {
+  content: '';
+  position: absolute;
+  top: $mat-stepper-line-gap - $mat-stepper-side-gap;
+  bottom: $mat-stepper-line-gap - $mat-stepper-side-gap;
+  left: 0;
+  border-left-width: $mat-stepper-line-width;
+  border-left-style: solid;
+
+  [dir='rtl'] & {
+    left: auto;
+    right: 0;
+  }
+}
+
+.mat-vertical-stepper-content {
+  overflow: hidden;
+}
+
+.mat-vertical-content {
+  padding: 0 $mat-stepper-side-gap $mat-stepper-side-gap $mat-stepper-side-gap;
+}
+
+.mat-step:last-child {
+  .mat-vertical-content-container {
+    border: none;
+  }
+}
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
new file mode 100644
index 000000000000..b5965f9d4751
--- /dev/null
+++ b/src/lib/stepper/stepper.spec.ts
@@ -0,0 +1,765 @@
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {Component, DebugElement} from '@angular/core';
+import {MdStepperModule} from './index';
+import {By} from '@angular/platform-browser';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
+import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+import {dispatchKeyboardEvent} from '@angular/cdk/testing';
+import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
+import {MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
+
+const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+
+describe('MdHorizontalStepper', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MdStepperModule, NoopAnimationsModule, ReactiveFormsModule],
+      declarations: [
+        SimpleMdHorizontalStepperApp,
+        LinearMdHorizontalStepperApp
+      ]
+    });
+
+    TestBed.compileComponents();
+  }));
+
+  describe('basic horizontal stepper', () => {
+    let fixture: ComponentFixture<SimpleMdHorizontalStepperApp>;
+    let stepperComponent: MdHorizontalStepper;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SimpleMdHorizontalStepperApp);
+      fixture.detectChanges();
+
+      stepperComponent = fixture.debugElement
+          .query(By.css('md-horizontal-stepper')).componentInstance;
+    });
+
+    it('should default to the first step', () => {
+      expect(stepperComponent.selectedIndex).toBe(0);
+    });
+
+    it('should change selected index on header click', () => {
+      let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-horizontal-stepper-header'));
+      assertSelectionChangeOnHeaderClick(stepperComponent, fixture, stepHeaders);
+    });
+
+    it('should set the "tablist" role on stepper', () => {
+      let stepperEl = fixture.debugElement.query(By.css('md-horizontal-stepper')).nativeElement;
+      expect(stepperEl.getAttribute('role')).toBe('tablist');
+    });
+
+    it('should set aria-expanded of content correctly', () => {
+      let stepContents = fixture.debugElement.queryAll(By.css(`.mat-horizontal-stepper-content`));
+      assertCorrectAriaExpandedAttribute(stepperComponent, fixture, stepContents);
+    });
+
+    it('should display the correct label', () => {
+      assertCorrectStepLabel(stepperComponent, fixture);
+    });
+
+    it('should go to next available step when the next button is clicked', () => {
+      assertNextStepperButtonClick(stepperComponent, fixture);
+    });
+
+    it('should go to previous available step when the previous button is clicked', () => {
+      assertPreviousStepperButtonClick(stepperComponent, fixture);
+    });
+
+    it('should set the correct step position for animation', () => {
+      assertCorrectStepPosition(stepperComponent, fixture);
+    });
+
+    it('should support keyboard events to move and select focus', () => {
+      let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-horizontal-stepper-header'));
+      assertCorrectKeyboardInteraction(stepperComponent, fixture, stepHeaders);
+    });
+
+    it('should not set focus on header of selected step if header is not clicked', () => {
+      assertStepHeaderFocusNotCalled(stepperComponent, fixture);
+    });
+
+    it('should only be able to return to a previous step if it is editable', () => {
+      assertEditableStepChange(stepperComponent, fixture);
+    });
+
+    it('should set create icon if step is editable and completed', () => {
+      assertCorrectStepIcon(stepperComponent, fixture, true, 'edit');
+    });
+
+    it('should set done icon if step is not editable and is completed', () => {
+      assertCorrectStepIcon(stepperComponent, fixture, false, 'done');
+    });
+  });
+
+  describe('linear horizontal stepper', () => {
+    let fixture: ComponentFixture<LinearMdHorizontalStepperApp>;
+    let testComponent: LinearMdHorizontalStepperApp;
+    let stepperComponent: MdHorizontalStepper;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(LinearMdHorizontalStepperApp);
+      fixture.detectChanges();
+
+      testComponent = fixture.componentInstance;
+      stepperComponent = fixture.debugElement
+          .query(By.css('md-horizontal-stepper')).componentInstance;
+    });
+
+    it('should have true linear attribute', () => {
+      expect(stepperComponent.linear).toBe(true);
+    });
+
+    it('should not move to next step if current step is not valid', () => {
+      expect(testComponent.oneGroup.get('oneCtrl')!.value).toBe('');
+      expect(testComponent.oneGroup.get('oneCtrl')!.valid).toBe(false);
+      expect(testComponent.oneGroup.valid).toBe(false);
+      expect(stepperComponent.selectedIndex).toBe(0);
+
+      let stepHeaderEl = fixture.debugElement
+          .queryAll(By.css('.mat-horizontal-stepper-header'))[1].nativeElement;
+      assertLinearStepperValidity(stepHeaderEl, stepperComponent, testComponent, fixture);
+    });
+
+    it('should not focus step header upon click if it is not able to be selected', () => {
+      assertStepHeaderBlurred(fixture);
+    });
+
+    it('should be able to move to next step even when invalid if current step is optional', () => {
+      assertOptionalStepValidity(stepperComponent, testComponent, fixture);
+    });
+  });
+});
+
+describe('MdVerticalStepper', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MdStepperModule, NoopAnimationsModule, ReactiveFormsModule],
+      declarations: [
+        SimpleMdVerticalStepperApp,
+        LinearMdVerticalStepperApp
+      ]
+    });
+
+    TestBed.compileComponents();
+  }));
+
+  describe('basic vertical stepper', () => {
+    let fixture: ComponentFixture<SimpleMdVerticalStepperApp>;
+    let stepperComponent: MdVerticalStepper;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SimpleMdVerticalStepperApp);
+      fixture.detectChanges();
+
+      stepperComponent = fixture.debugElement
+          .query(By.css('md-vertical-stepper')).componentInstance;
+    });
+
+    it('should default to the first step', () => {
+      expect(stepperComponent.selectedIndex).toBe(0);
+    });
+
+    it('should change selected index on header click', () => {
+      let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-vertical-stepper-header'));
+      assertSelectionChangeOnHeaderClick(stepperComponent, fixture, stepHeaders);
+
+    });
+
+    it('should set the "tablist" role on stepper', () => {
+      let stepperEl = fixture.debugElement.query(By.css('md-vertical-stepper')).nativeElement;
+      expect(stepperEl.getAttribute('role')).toBe('tablist');
+    });
+
+    it('should set aria-expanded of content correctly', () => {
+      let stepContents = fixture.debugElement.queryAll(By.css(`.mat-vertical-stepper-content`));
+      assertCorrectAriaExpandedAttribute(stepperComponent, fixture, stepContents);
+    });
+
+    it('should display the correct label', () => {
+      assertCorrectStepLabel(stepperComponent, fixture);
+    });
+
+    it('should go to next available step when the next button is clicked', () => {
+      assertNextStepperButtonClick(stepperComponent, fixture);
+    });
+
+    it('should go to previous available step when the previous button is clicked', () => {
+      assertPreviousStepperButtonClick(stepperComponent, fixture);
+    });
+
+    it('should set the correct step position for animation', () => {
+      assertCorrectStepPosition(stepperComponent, fixture);
+    });
+
+    it('should support keyboard events to move and select focus', () => {
+      let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-vertical-stepper-header'));
+      assertCorrectKeyboardInteraction(stepperComponent, fixture, stepHeaders);
+    });
+
+    it('should not set focus on header of selected step if header is not clicked', () => {
+      assertStepHeaderFocusNotCalled(stepperComponent, fixture);
+    });
+
+    it('should only be able to return to a previous step if it is editable', () => {
+      assertEditableStepChange(stepperComponent, fixture);
+    });
+
+    it('should set create icon if step is editable and completed', () => {
+      assertCorrectStepIcon(stepperComponent, fixture, true, 'edit');
+    });
+
+    it('should set done icon if step is not editable and is completed', () => {
+      assertCorrectStepIcon(stepperComponent, fixture, false, 'done');
+    });
+  });
+
+  describe('linear vertical stepper', () => {
+    let fixture: ComponentFixture<LinearMdVerticalStepperApp>;
+    let testComponent: LinearMdVerticalStepperApp;
+    let stepperComponent: MdVerticalStepper;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(LinearMdVerticalStepperApp);
+      fixture.detectChanges();
+
+      testComponent = fixture.componentInstance;
+      stepperComponent = fixture.debugElement
+          .query(By.css('md-vertical-stepper')).componentInstance;
+    });
+
+    it('should have true linear attribute', () => {
+      expect(stepperComponent.linear).toBe(true);
+    });
+
+    it('should not move to next step if current step is not valid', () => {
+      expect(testComponent.oneGroup.get('oneCtrl')!.value).toBe('');
+      expect(testComponent.oneGroup.get('oneCtrl')!.valid).toBe(false);
+      expect(testComponent.oneGroup.valid).toBe(false);
+      expect(stepperComponent.selectedIndex).toBe(0);
+
+      let stepHeaderEl = fixture.debugElement
+          .queryAll(By.css('.mat-vertical-stepper-header'))[1].nativeElement;
+
+      assertLinearStepperValidity(stepHeaderEl, stepperComponent, testComponent, fixture);
+    });
+
+    it('should not focus step header upon click if it is not able to be selected', () => {
+      assertStepHeaderBlurred(fixture);
+    });
+
+    it('should be able to move to next step even when invalid if current step is optional', () => {
+      assertOptionalStepValidity(stepperComponent, testComponent, fixture);
+    });
+  });
+});
+
+/** Asserts that `selectedIndex` updates correctly when header of another step is clicked. */
+function assertSelectionChangeOnHeaderClick(stepperComponent: MdStepper,
+                                           fixture: ComponentFixture<any>,
+                                           stepHeaders: DebugElement[]) {
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  // select the second step
+  let stepHeaderEl = stepHeaders[1].nativeElement;
+  stepHeaderEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(1);
+
+  // select the third step
+  stepHeaderEl = stepHeaders[2].nativeElement;
+  stepHeaderEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(2);
+}
+
+/** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */
+function assertCorrectAriaExpandedAttribute(stepperComponent: MdStepper,
+                              fixture: ComponentFixture<any>,
+                              stepContents: DebugElement[]) {
+  let firstStepContentEl = stepContents[0].nativeElement;
+  expect(firstStepContentEl.getAttribute('aria-expanded')).toBe('true');
+
+  stepperComponent.selectedIndex = 1;
+  fixture.detectChanges();
+
+  expect(firstStepContentEl.getAttribute('aria-expanded')).toBe('false');
+  let secondStepContentEl = stepContents[1].nativeElement;
+  expect(secondStepContentEl.getAttribute('aria-expanded')).toBe('true');
+}
+
+/** Asserts that step has correct label. */
+function assertCorrectStepLabel(stepperComponent: MdStepper, fixture: ComponentFixture<any>) {
+  let selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]');
+  expect(selectedLabel.textContent).toMatch('Step 1');
+
+  stepperComponent.selectedIndex = 2;
+  fixture.detectChanges();
+
+  selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]');
+  expect(selectedLabel.textContent).toMatch('Step 3');
+
+  fixture.componentInstance.inputLabel = 'New Label';
+  fixture.detectChanges();
+
+  selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]');
+  expect(selectedLabel.textContent).toMatch('New Label');
+}
+
+/** Asserts that clicking on MdStepperNext button updates `selectedIndex` correctly. */
+function assertNextStepperButtonClick(stepperComponent: MdStepper, fixture: ComponentFixture<any>) {
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  let nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(1);
+
+  nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[1].nativeElement;
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(2);
+
+  nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[2].nativeElement;
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(2);
+}
+
+/** Asserts that clicking on MdStepperPrevious button updates `selectedIndex` correctly. */
+function assertPreviousStepperButtonClick(stepperComponent: MdStepper,
+                                          fixture: ComponentFixture<any>) {
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  stepperComponent.selectedIndex = 2;
+  let previousButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperPrevious))[2].nativeElement;
+  previousButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(1);
+
+  previousButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperPrevious))[1].nativeElement;
+  previousButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  previousButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperPrevious))[0].nativeElement;
+  previousButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(0);
+}
+
+/** Asserts that step position is correct for animation. */
+function assertCorrectStepPosition(stepperComponent: MdStepper, fixture: ComponentFixture<any>) {
+  expect(stepperComponent._getAnimationDirection(0)).toBe('current');
+  expect(stepperComponent._getAnimationDirection(1)).toBe('next');
+  expect(stepperComponent._getAnimationDirection(2)).toBe('next');
+
+  stepperComponent.selectedIndex = 1;
+  fixture.detectChanges();
+
+  expect(stepperComponent._getAnimationDirection(0)).toBe('previous');
+  expect(stepperComponent._getAnimationDirection(1)).toBe('current');
+  expect(stepperComponent._getAnimationDirection(2)).toBe('next');
+
+  stepperComponent.selectedIndex = 2;
+  fixture.detectChanges();
+
+  expect(stepperComponent._getAnimationDirection(0)).toBe('previous');
+  expect(stepperComponent._getAnimationDirection(1)).toBe('previous');
+  expect(stepperComponent._getAnimationDirection(2)).toBe('current');
+}
+
+/** Asserts that keyboard interaction works correctly. */
+function assertCorrectKeyboardInteraction(stepperComponent: MdStepper,
+                            fixture: ComponentFixture<any>,
+                            stepHeaders: DebugElement[]) {
+  expect(stepperComponent._focusIndex).toBe(0);
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  let stepHeaderEl = stepHeaders[0].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', RIGHT_ARROW);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex)
+      .toBe(1, 'Expected index of focused step to be increased by 1 after RIGHT_ARROW event.');
+  expect(stepperComponent.selectedIndex)
+      .toBe(0, 'Expected index of selected step to remain unchanged after RIGHT_ARROW event.');
+
+  stepHeaderEl = stepHeaders[1].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', ENTER);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex)
+      .toBe(1, 'Expected index of focused step to remain unchanged after ENTER event.');
+  expect(stepperComponent.selectedIndex)
+      .toBe(1,
+          'Expected index of selected step to change to index of focused step after EVENT event.');
+
+  stepHeaderEl = stepHeaders[1].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', LEFT_ARROW);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex)
+      .toBe(0, 'Expected index of focused step to decrease by 1 after LEFT_ARROW event.');
+  expect(stepperComponent.selectedIndex)
+      .toBe(1, 'Expected index of selected step to remain unchanged after LEFT_ARROW event.');
+
+  // When the focus is on the last step and right arrow key is pressed, the focus should cycle
+  // through to the first step.
+  stepperComponent._focusIndex = 2;
+  stepHeaderEl = stepHeaders[2].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', RIGHT_ARROW);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex)
+      .toBe(0,
+          'Expected index of focused step to cycle through to index 0 after RIGHT_ARROW event.');
+  expect(stepperComponent.selectedIndex)
+      .toBe(1, 'Expected index of selected step to remain unchanged after RIGHT_ARROW event.');
+
+  stepHeaderEl = stepHeaders[0].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', SPACE);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex)
+      .toBe(0, 'Expected index of focused to remain unchanged after SPACE event.');
+  expect(stepperComponent.selectedIndex)
+      .toBe(0,
+          'Expected index of selected step to change to index of focused step after SPACE event.');
+}
+
+/** Asserts that step selection change using stepper buttons does not focus step header. */
+function assertStepHeaderFocusNotCalled(stepperComponent: MdStepper,
+                                        fixture: ComponentFixture<any>) {
+  let stepHeaderEl = fixture.debugElement
+      .queryAll(By.css('md-step-header'))[1].nativeElement;
+  let nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+  spyOn(stepHeaderEl, 'focus');
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(1);
+  expect(stepHeaderEl.focus).not.toHaveBeenCalled();
+}
+
+/**
+ * Asserts that linear stepper does not allow step selection change if current step is not valid.
+ */
+function assertLinearStepperValidity(stepHeaderEl: HTMLElement,
+                                    stepperComponent: MdStepper,
+                                    testComponent:
+                                        LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
+                                    fixture: ComponentFixture<any>) {
+  stepHeaderEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  let nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(0);
+
+  testComponent.oneGroup.get('oneCtrl')!.setValue('answer');
+  stepHeaderEl.click();
+  fixture.detectChanges();
+
+  expect(testComponent.oneGroup.valid).toBe(true);
+  expect(stepperComponent.selectedIndex).toBe(1);
+}
+
+/** Asserts that step header focus is blurred if the step cannot be selected upon header click. */
+function assertStepHeaderBlurred(fixture: ComponentFixture<any>) {
+  let stepHeaderEl = fixture.debugElement
+      .queryAll(By.css('md-step-header'))[1].nativeElement;
+  spyOn(stepHeaderEl, 'blur');
+  stepHeaderEl.click();
+  fixture.detectChanges();
+
+  expect(stepHeaderEl.blur).toHaveBeenCalled();
+}
+
+/** Asserts that it is only possible to go back to a previous step if the step is editable. */
+function assertEditableStepChange(stepperComponent: MdStepper,
+                           fixture: ComponentFixture<any>) {
+  stepperComponent.selectedIndex = 1;
+  stepperComponent._steps.toArray()[0].editable = false;
+  let previousButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperPrevious))[1].nativeElement;
+  previousButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(1);
+
+  stepperComponent._steps.toArray()[0].editable = true;
+  previousButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(0);
+}
+
+/**
+ * Asserts that it is possible to skip an optional step in linear stepper if there is no input
+ * or the input is valid.
+ */
+function assertOptionalStepValidity(stepperComponent: MdStepper,
+                           testComponent: LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
+                           fixture: ComponentFixture<any>) {
+  testComponent.oneGroup.get('oneCtrl')!.setValue('input');
+  testComponent.twoGroup.get('twoCtrl')!.setValue('input');
+  stepperComponent.selectedIndex = 2;
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex).toBe(2);
+  expect(testComponent.threeGroup.get('threeCtrl')!.valid).toBe(true);
+
+  let nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[2].nativeElement;
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent.selectedIndex)
+      .toBe(3, 'Expected selectedIndex to change when optional step input is empty.');
+
+  stepperComponent.selectedIndex = 2;
+  testComponent.threeGroup.get('threeCtrl')!.setValue('input');
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(testComponent.threeGroup.get('threeCtrl')!.valid).toBe(false);
+  expect(stepperComponent.selectedIndex)
+      .toBe(2, 'Expected selectedIndex to remain unchanged when optional step input is invalid.');
+
+  testComponent.threeGroup.get('threeCtrl')!.setValue('123@gmail.com');
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(testComponent.threeGroup.get('threeCtrl')!.valid).toBe(true);
+  expect(stepperComponent.selectedIndex)
+      .toBe(3, 'Expected selectedIndex to change when optional step input is valid.');
+}
+
+/** Asserts that step header set the correct icon depending on the state of step. */
+function assertCorrectStepIcon(stepperComponent: MdStepper,
+                               fixture: ComponentFixture<any>,
+                               isEditable: boolean,
+                               icon: String) {
+  let nextButtonNativeEl = fixture.debugElement
+      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+  expect(stepperComponent._getIndicatorType(0)).toBe('number');
+  stepperComponent._steps.toArray()[0].editable = isEditable;
+  nextButtonNativeEl.click();
+  fixture.detectChanges();
+
+  expect(stepperComponent._getIndicatorType(0)).toBe(icon);
+}
+
+@Component({
+  template: `
+    <md-horizontal-stepper>
+      <md-step>
+        <ng-template mdStepLabel>Step 1</ng-template>
+        Content 1
+        <div>
+          <button md-button mdStepperPrevious>Back</button>
+          <button md-button mdStepperNext>Next</button>
+        </div>
+      </md-step>
+      <md-step>
+        <ng-template mdStepLabel>Step 2</ng-template>
+        Content 2
+        <div>
+          <button md-button mdStepperPrevious>Back</button>
+          <button md-button mdStepperNext>Next</button>
+        </div>
+      </md-step>
+      <md-step [label]="inputLabel">
+        Content 3
+        <div>
+          <button md-button mdStepperPrevious>Back</button>
+          <button md-button mdStepperNext>Next</button>
+        </div>
+      </md-step>
+    </md-horizontal-stepper>
+  `
+})
+class SimpleMdHorizontalStepperApp {
+  inputLabel = 'Step 3';
+}
+
+@Component({
+  template: `
+    <md-horizontal-stepper linear>
+      <md-step [stepControl]="oneGroup">
+        <form [formGroup]="oneGroup">
+          <ng-template mdStepLabel>Step one</ng-template>
+          <md-form-field>
+            <input mdInput formControlName="oneCtrl" required>
+          </md-form-field>
+          <div>
+            <button md-button mdStepperPrevious>Back</button>
+            <button md-button mdStepperNext>Next</button>
+          </div>
+        </form>
+      </md-step>
+      <md-step [stepControl]="twoGroup">
+        <form [formGroup]="twoGroup">
+          <ng-template mdStepLabel>Step two</ng-template>
+          <md-form-field>
+            <input mdInput formControlName="twoCtrl" required>
+          </md-form-field>
+          <div>
+            <button md-button mdStepperPrevious>Back</button>
+            <button md-button mdStepperNext>Next</button>
+          </div>
+        </form>
+      </md-step>
+      <md-step [stepControl]="threeGroup" optional>
+        <form [formGroup]="threeGroup">
+          <ng-template mdStepLabel>Step two</ng-template>
+          <md-form-field>
+            <input mdInput formControlName="threeCtrl">
+          </md-form-field>
+          <div>
+            <button md-button mdStepperPrevious>Back</button>
+            <button md-button mdStepperNext>Next</button>
+          </div>
+        </form>
+      </md-step>
+      <md-step>
+        Done
+      </md-step>
+    </md-horizontal-stepper>
+  `
+})
+class LinearMdHorizontalStepperApp {
+  oneGroup: FormGroup;
+  twoGroup: FormGroup;
+  threeGroup: FormGroup;
+
+  ngOnInit() {
+    this.oneGroup = new FormGroup({
+      oneCtrl: new FormControl('', Validators.required)
+    });
+    this.twoGroup = new FormGroup({
+      twoCtrl: new FormControl('', Validators.required)
+    });
+    this.threeGroup = new FormGroup({
+      threeCtrl: new FormControl('', Validators.pattern(EMAIL_REGEX))
+    });
+  }
+}
+
+@Component({
+  template: `
+    <md-vertical-stepper>
+      <md-step>
+        <ng-template mdStepLabel>Step 1</ng-template>
+        Content 1
+        <div>
+          <button md-button mdStepperPrevious>Back</button>
+          <button md-button mdStepperNext>Next</button>
+        </div>
+      </md-step>
+      <md-step>
+        <ng-template mdStepLabel>Step 2</ng-template>
+        Content 2
+        <div>
+          <button md-button mdStepperPrevious>Back</button>
+          <button md-button mdStepperNext>Next</button>
+        </div>
+      </md-step>
+      <md-step [label]="inputLabel">
+        Content 3
+        <div>
+          <button md-button mdStepperPrevious>Back</button>
+          <button md-button mdStepperNext>Next</button>
+        </div>
+      </md-step>
+    </md-vertical-stepper>
+  `
+})
+class SimpleMdVerticalStepperApp {
+  inputLabel = 'Step 3';
+}
+
+@Component({
+  template: `
+    <md-vertical-stepper linear>
+      <md-step [stepControl]="oneGroup">
+        <form [formGroup]="oneGroup">
+          <ng-template mdStepLabel>Step one</ng-template>
+          <md-form-field>
+            <input mdInput formControlName="oneCtrl" required>
+          </md-form-field>
+          <div>
+            <button md-button mdStepperPrevious>Back</button>
+            <button md-button mdStepperNext>Next</button>
+          </div>
+        </form>
+      </md-step>
+      <md-step [stepControl]="twoGroup">
+        <form [formGroup]="twoGroup">
+          <ng-template mdStepLabel>Step two</ng-template>
+          <md-form-field>
+            <input mdInput formControlName="twoCtrl" required>
+          </md-form-field>
+          <div>
+            <button md-button mdStepperPrevious>Back</button>
+            <button md-button mdStepperNext>Next</button>
+          </div>
+        </form>
+      </md-step>
+      <md-step [stepControl]="threeGroup" optional>
+        <form [formGroup]="threeGroup">
+          <ng-template mdStepLabel>Step two</ng-template>
+          <md-form-field>
+            <input mdInput formControlName="threeCtrl">
+          </md-form-field>
+          <div>
+            <button md-button mdStepperPrevious>Back</button>
+            <button md-button mdStepperNext>Next</button>
+          </div>
+        </form>
+      </md-step>
+      <md-step>
+        Done
+      </md-step>
+    </md-vertical-stepper>
+  `
+})
+class LinearMdVerticalStepperApp {
+  oneGroup: FormGroup;
+  twoGroup: FormGroup;
+  threeGroup: FormGroup;
+
+  ngOnInit() {
+    this.oneGroup = new FormGroup({
+      oneCtrl: new FormControl('', Validators.required)
+    });
+    this.twoGroup = new FormGroup({
+      twoCtrl: new FormControl('', Validators.required)
+    });
+    this.threeGroup = new FormGroup({
+      threeCtrl: new FormControl('', Validators.pattern(EMAIL_REGEX))
+    });
+  }
+}
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
new file mode 100644
index 000000000000..4ec7fd207d29
--- /dev/null
+++ b/src/lib/stepper/stepper.ts
@@ -0,0 +1,132 @@
+/**
+ * @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 {CdkStep, CdkStepper} from '@angular/cdk/stepper';
+import {
+  Component,
+  ContentChild,
+  ContentChildren, Directive,
+  // This import is only used to define a generic type. The current TypeScript version incorrectly
+  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
+  // tslint:disable-next-line:no-unused-variable
+  ElementRef,
+  forwardRef,
+  Inject,
+  Optional,
+  QueryList,
+  SkipSelf,
+  ViewChildren,
+  ViewEncapsulation
+} from '@angular/core';
+import {MdStepLabel} from './step-label';
+import {
+  defaultErrorStateMatcher,
+  ErrorOptions,
+  MD_ERROR_GLOBAL_OPTIONS,
+  ErrorStateMatcher
+} from '../core/error/error-options';
+import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
+import {MdStepHeader} from './step-header';
+import {state, style, transition, trigger, animate} from '@angular/animations';
+
+/** Workaround for https://github.com/angular/angular/issues/17849 */
+export const _MdStep = CdkStep;
+export const _MdStepper = CdkStepper;
+
+@Component({
+  moduleId: module.id,
+  selector: 'md-step, mat-step',
+  templateUrl: 'step.html',
+  providers: [{provide: MD_ERROR_GLOBAL_OPTIONS, useExisting: MdStep}],
+  encapsulation: ViewEncapsulation.None
+})
+export class MdStep extends _MdStep implements ErrorOptions {
+  /** Content for step label given by <ng-template matStepLabel> or <ng-template mdStepLabel>. */
+  @ContentChild(MdStepLabel) stepLabel: MdStepLabel;
+
+  /** Original ErrorStateMatcher that checks the validity of form control. */
+  private _originalErrorStateMatcher: ErrorStateMatcher;
+
+  constructor(@Inject(forwardRef(() => MdStepper)) mdStepper: MdStepper,
+              @Optional() @SkipSelf() @Inject(MD_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
+    super(mdStepper);
+    this._originalErrorStateMatcher =
+        errorOptions ? errorOptions.errorStateMatcher || defaultErrorStateMatcher
+            : defaultErrorStateMatcher;
+  }
+
+  /** Custom error state matcher that additionally checks for validity of interacted form. */
+  errorStateMatcher = (control: FormControl, form: FormGroupDirective | NgForm) => {
+    let originalErrorState = this._originalErrorStateMatcher(control, form);
+
+    // Custom error state checks for the validity of form that is not submitted or touched
+    // since user can trigger a form change by calling for another step without directly
+    // interacting with the current form.
+    let customErrorState =  control.invalid && this.interacted;
+
+    return originalErrorState || customErrorState;
+  }
+}
+
+@Directive({
+  selector: '[mdStepper]'
+})
+export class MdStepper extends _MdStepper {
+  /** The list of step headers of the steps in the stepper. */
+  @ViewChildren(MdStepHeader, {read: ElementRef}) _stepHeader: QueryList<ElementRef>;
+
+  /** Steps that the stepper holds. */
+  @ContentChildren(MdStep) _steps: QueryList<MdStep>;
+}
+
+@Component({
+  moduleId: module.id,
+  selector: 'md-horizontal-stepper, mat-horizontal-stepper',
+  templateUrl: 'stepper-horizontal.html',
+  styleUrls: ['stepper.css'],
+  inputs: ['selectedIndex'],
+  host: {
+    'class': 'mat-stepper-horizontal',
+    'role': 'tablist',
+  },
+  animations: [
+    trigger('stepTransition', [
+      state('previous', style({transform: 'translate3d(-100%, 0, 0)', visibility: 'hidden'})),
+      state('current', style({transform: 'translate3d(0%, 0, 0)', visibility: 'visible'})),
+      state('next', style({transform: 'translate3d(100%, 0, 0)', visibility: 'hidden'})),
+      transition('* => *',
+          animate('500ms cubic-bezier(0.35, 0, 0.25, 1)'))
+    ])
+  ],
+  providers: [{provide: MdStepper, useExisting: MdHorizontalStepper}],
+  encapsulation: ViewEncapsulation.None
+})
+export class MdHorizontalStepper extends MdStepper { }
+
+@Component({
+  moduleId: module.id,
+  selector: 'md-vertical-stepper, mat-vertical-stepper',
+  templateUrl: 'stepper-vertical.html',
+  styleUrls: ['stepper.css'],
+  inputs: ['selectedIndex'],
+  host: {
+    'class': 'mat-stepper-vertical',
+    'role': 'tablist',
+  },
+  animations: [
+    trigger('stepTransition', [
+      state('previous', style({height: '0px', visibility: 'hidden'})),
+      state('next', style({height: '0px', visibility: 'hidden'})),
+      state('current', style({height: '*', visibility: 'visible'})),
+      transition('* <=> current', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
+    ])
+  ],
+  providers: [{provide: MdStepper, useExisting: MdVerticalStepper}],
+  encapsulation: ViewEncapsulation.None
+})
+export class MdVerticalStepper extends MdStepper { }
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 7790a25cd578..3dfeae04facc 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -60,6 +60,7 @@ System.config({
     '@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
     '@angular/cdk/rxjs': 'dist/packages/cdk/rxjs/index.js',
     '@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
+    '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
     '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
     '@angular/cdk/testing': 'dist/packages/cdk/testing/index.js',
   },

From f375f92581b6318219cc225aeafc97124a840b26 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Thu, 31 Aug 2017 18:18:13 -0700
Subject: [PATCH 003/575] feat(stepper): add moduleId to components (#6780)

---
 src/cdk/stepper/stepper.ts          | 1 +
 src/cdk/stepper/tsconfig-build.json | 3 ++-
 src/cdk/tsconfig-build.json         | 3 ++-
 src/cdk/tsconfig-tests.json         | 3 ++-
 src/cdk/typings.d.ts                | 1 +
 src/lib/stepper/step-header.ts      | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/cdk/typings.d.ts

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 24a02dc6545a..089555589f21 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -57,6 +57,7 @@ export class StepperSelectionEvent {
 }
 
 @Component({
+  moduleId: module.id,
   selector: 'cdk-step',
   templateUrl: 'step.html',
   encapsulation: ViewEncapsulation.None
diff --git a/src/cdk/stepper/tsconfig-build.json b/src/cdk/stepper/tsconfig-build.json
index 4231d46ba702..2f9f6e461859 100644
--- a/src/cdk/stepper/tsconfig-build.json
+++ b/src/cdk/stepper/tsconfig-build.json
@@ -1,7 +1,8 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public_api.ts",
+    "../typings.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/tsconfig-build.json b/src/cdk/tsconfig-build.json
index c74fa84aaa3e..2ce5c0ace94e 100644
--- a/src/cdk/tsconfig-build.json
+++ b/src/cdk/tsconfig-build.json
@@ -25,7 +25,8 @@
     }
   },
   "files": [
-    "public_api.ts"
+    "public_api.ts",
+    "typings.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/tsconfig-tests.json b/src/cdk/tsconfig-tests.json
index b834ba802df0..2b24877a7677 100644
--- a/src/cdk/tsconfig-tests.json
+++ b/src/cdk/tsconfig-tests.json
@@ -14,7 +14,8 @@
     }
   },
   "files": [
-    "./testing/index.ts"
+    "./testing/index.ts",
+    "typings.d.ts"
   ],
   "include": [
     // Include the index.ts for each secondary entry-point
diff --git a/src/cdk/typings.d.ts b/src/cdk/typings.d.ts
new file mode 100644
index 000000000000..ce4ae9b66cf0
--- /dev/null
+++ b/src/cdk/typings.d.ts
@@ -0,0 +1 @@
+declare var module: {id: string};
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 14901227f698..b6624e2424c5 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -11,6 +11,7 @@ import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion
 import {MdStepLabel} from './step-label';
 
 @Component({
+  moduleId: module.id,
   selector: 'md-step-header, mat-step-header',
   templateUrl: 'step-header.html',
   styleUrls: ['step-header.css'],

From e318de6cd1e739e4ca284928506a604663ac6f48 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 16:47:47 +0200
Subject: [PATCH 004/575] refactor: initialize to empty subscriptions (#6769)

Initializes most subscriptions to empty ones, avoiding the need to null-check them before unsubscribing.
---
 src/cdk/a11y/list-key-manager.ts            |  6 ++---
 src/cdk/overlay/overlay-directives.ts       | 30 ++++++---------------
 src/lib/chips/chip-list.ts                  |  6 ++---
 src/lib/datepicker/datepicker-input.ts      |  6 ++---
 src/lib/datepicker/datepicker.ts            |  7 +++--
 src/lib/expansion/expansion-panel-header.ts |  8 ++----
 src/lib/list/selection-list.ts              | 13 +++------
 src/lib/menu/menu-directive.ts              |  7 ++---
 src/lib/menu/menu-trigger.ts                | 16 +++++------
 src/lib/select/select.ts                    | 21 +++++----------
 src/lib/tabs/tab-group.ts                   | 18 ++++---------
 src/lib/tabs/tab-header.ts                  |  7 ++---
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts     | 17 +++++-------
 13 files changed, 50 insertions(+), 112 deletions(-)

diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index 47fafcfa1856..cb8a1850518a 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -29,7 +29,7 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
   private _activeItem: T;
   private _wrap = false;
   private _letterKeyStream = new Subject<string>();
-  private _typeaheadSubscription: Subscription;
+  private _typeaheadSubscription = Subscription.EMPTY;
 
   // Buffer for the letters that the user has pressed when the typeahead option is turned on.
   private _pressedLetters: string[] = [];
@@ -60,9 +60,7 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
       throw Error('ListKeyManager items in typeahead mode must implement the `getLabel` method.');
     }
 
-    if (this._typeaheadSubscription) {
-      this._typeaheadSubscription.unsubscribe();
-    }
+    this._typeaheadSubscription.unsubscribe();
 
     // Debounce the presses of non-navigational keys, collect the ones that correspond to letters
     // and convert those letters back into a string. Afterwards find the first item that starts
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 5ab882e57d74..fdceb1dca129 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -95,12 +95,12 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
   private _overlayRef: OverlayRef;
   private _templatePortal: TemplatePortal<any>;
   private _hasBackdrop = false;
-  private _backdropSubscription: Subscription | null;
-  private _positionSubscription: Subscription;
+  private _backdropSubscription = Subscription.EMPTY;
+  private _positionSubscription = Subscription.EMPTY;
   private _offsetX: number = 0;
   private _offsetY: number = 0;
   private _position: ConnectedPositionStrategy;
-  private _escapeListener: Function;
+  private _escapeListener = () => {};
 
   /** Origin for the connected overlay. */
   @Input('cdkConnectedOverlayOrigin') origin: OverlayOrigin;
@@ -360,14 +360,8 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
       this.detach.emit();
     }
 
-    if (this._backdropSubscription) {
-      this._backdropSubscription.unsubscribe();
-      this._backdropSubscription = null;
-    }
-
-    if (this._escapeListener) {
-      this._escapeListener();
-    }
+    this._backdropSubscription.unsubscribe();
+    this._escapeListener();
   }
 
   /** Destroys the overlay created by this directive. */
@@ -376,17 +370,9 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
       this._overlayRef.dispose();
     }
 
-    if (this._backdropSubscription) {
-      this._backdropSubscription.unsubscribe();
-    }
-
-    if (this._positionSubscription) {
-      this._positionSubscription.unsubscribe();
-    }
-
-    if (this._escapeListener) {
-      this._escapeListener();
-    }
+    this._backdropSubscription.unsubscribe();
+    this._positionSubscription.unsubscribe();
+    this._escapeListener();
   }
 
   /** Sets the event listener that closes the overlay when pressing Escape. */
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index a693b3cca20a..de830d015c0b 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -66,7 +66,7 @@ export class MdChipList implements AfterContentInit, OnDestroy {
   protected _chipSet: WeakMap<MdChip, boolean> = new WeakMap();
 
   /** Subscription to tabbing out from the chip list. */
-  private _tabOutSubscription: Subscription;
+  private _tabOutSubscription = Subscription.EMPTY;
 
   /** Whether or not the chip is selectable. */
   protected _selectable: boolean = true;
@@ -126,9 +126,7 @@ export class MdChipList implements AfterContentInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    if (this._tabOutSubscription) {
-      this._tabOutSubscription.unsubscribe();
-    }
+    this._tabOutSubscription.unsubscribe();
   }
 
   /**
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index b3a90125c782..585a5bc8ad6b 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -171,7 +171,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   private _validatorOnChange = () => {};
 
-  private _datepickerSubscription: Subscription;
+  private _datepickerSubscription = Subscription.EMPTY;
 
   /** The form control validator for whether the input parses. */
   private _parseValidator: ValidatorFn = (): ValidationErrors | null => {
@@ -235,9 +235,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   }
 
   ngOnDestroy() {
-    if (this._datepickerSubscription) {
-      this._datepickerSubscription.unsubscribe();
-    }
+    this._datepickerSubscription.unsubscribe();
   }
 
   registerOnValidatorChange(fn: () => void): void {
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index b1e9e3555836..9312ba22e3e4 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -200,7 +200,7 @@ export class MdDatepicker<D> implements OnDestroy {
   /** The element that was focused before the datepicker was opened. */
   private _focusedElementBeforeOpen: HTMLElement | null = null;
 
-  private _inputSubscription: Subscription;
+  private _inputSubscription = Subscription.EMPTY;
 
   constructor(private _dialog: MdDialog,
               private _overlay: Overlay,
@@ -217,12 +217,11 @@ export class MdDatepicker<D> implements OnDestroy {
 
   ngOnDestroy() {
     this.close();
+    this._inputSubscription.unsubscribe();
+
     if (this._popupRef) {
       this._popupRef.dispose();
     }
-    if (this._inputSubscription) {
-      this._inputSubscription.unsubscribe();
-    }
   }
 
   /** Selects the given date */
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 2de7617f3851..56c4b4626156 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -72,7 +72,7 @@ import {Subscription} from 'rxjs/Subscription';
   ],
 })
 export class MdExpansionPanelHeader implements OnDestroy {
-  private _parentChangeSubscription: Subscription | null = null;
+  private _parentChangeSubscription = Subscription.EMPTY;
 
   constructor(
     @Host() public panel: MdExpansionPanel,
@@ -135,11 +135,7 @@ export class MdExpansionPanelHeader implements OnDestroy {
   }
 
   ngOnDestroy() {
-    if (this._parentChangeSubscription) {
-      this._parentChangeSubscription.unsubscribe();
-      this._parentChangeSubscription = null;
-    }
-
+    this._parentChangeSubscription.unsubscribe();
     this._focusOriginMonitor.stopMonitoring(this._element.nativeElement);
   }
 }
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index a1b3f508dda1..a1dd1b778136 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -196,10 +196,10 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   _tabIndex = 0;
 
   /** Subscription to all list options' onFocus events */
-  private _optionFocusSubscription: Subscription;
+  private _optionFocusSubscription = Subscription.EMPTY;
 
   /** Subscription to all list options' destroy events  */
-  private _optionDestroyStream: Subscription;
+  private _optionDestroyStream = Subscription.EMPTY;
 
   /** The FocusKeyManager which handles focus. */
   _keyManager: FocusKeyManager<MdListOption>;
@@ -234,13 +234,8 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   }
 
   ngOnDestroy(): void {
-    if (this._optionDestroyStream) {
-      this._optionDestroyStream.unsubscribe();
-    }
-
-    if (this._optionFocusSubscription) {
-      this._optionFocusSubscription.unsubscribe();
-    }
+    this._optionDestroyStream.unsubscribe();
+    this._optionFocusSubscription.unsubscribe();
   }
 
   focus() {
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index a0344ba141ce..4dc9d57f469c 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -74,7 +74,7 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   private _previousElevation: string;
 
   /** Subscription to tab events on the menu panel */
-  private _tabSubscription: Subscription;
+  private _tabSubscription = Subscription.EMPTY;
 
   /** Config object to be passed into the menu's ngClass */
   _classList: any = {};
@@ -150,10 +150,7 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   }
 
   ngOnDestroy() {
-    if (this._tabSubscription) {
-      this._tabSubscription.unsubscribe();
-    }
-
+    this._tabSubscription.unsubscribe();
     this.close.emit();
     this.close.complete();
   }
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index b2bda1683e12..db95674e750f 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -89,9 +89,9 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   private _portal: TemplatePortal<any>;
   private _overlayRef: OverlayRef | null = null;
   private _menuOpen: boolean = false;
-  private _closeSubscription: Subscription;
-  private _positionSubscription: Subscription;
-  private _hoverSubscription: Subscription;
+  private _closeSubscription = Subscription.EMPTY;
+  private _positionSubscription = Subscription.EMPTY;
+  private _hoverSubscription = Subscription.EMPTY;
 
   // Tracking input type is necessary so it's possible to only auto-focus
   // the first item of the list when the menu is opened via the keyboard
@@ -392,13 +392,9 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
 
   /** Cleans up the active subscriptions. */
   private _cleanUpSubscriptions(): void {
-    [
-      this._closeSubscription,
-      this._positionSubscription,
-      this._hoverSubscription
-    ]
-        .filter(subscription => !!subscription)
-        .forEach(subscription => subscription.unsubscribe());
+    this._closeSubscription.unsubscribe();
+    this._positionSubscription.unsubscribe();
+    this._hoverSubscription.unsubscribe();
   }
 
   /** Returns a stream that emits whenever an action that should close the menu occurs. */
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 6e89d0880289..97730a267f59 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -205,13 +205,13 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   private _panelOpen = false;
 
   /** Subscriptions to option events. */
-  private _optionSubscription: Subscription | null;
+  private _optionSubscription = Subscription.EMPTY;
 
   /** Subscription to changes in the option list. */
-  private _changeSubscription: Subscription;
+  private _changeSubscription = Subscription.EMPTY;
 
   /** Subscription to tab events while overlay is focused. */
-  private _tabSubscription: Subscription;
+  private _tabSubscription = Subscription.EMPTY;
 
   /** Whether filling out the select is required in the form.  */
   private _required: boolean = false;
@@ -466,14 +466,8 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   ngOnDestroy() {
     this._dropSubscriptions();
-
-    if (this._changeSubscription) {
-      this._changeSubscription.unsubscribe();
-    }
-
-    if (this._tabSubscription) {
-      this._tabSubscription.unsubscribe();
-    }
+    this._changeSubscription.unsubscribe();
+    this._tabSubscription.unsubscribe();
   }
 
   /** Toggles the overlay panel open or closed. */
@@ -852,10 +846,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   /** Unsubscribes from all option subscriptions. */
   private _dropSubscriptions(): void {
-    if (this._optionSubscription) {
-      this._optionSubscription.unsubscribe();
-      this._optionSubscription = null;
-    }
+    this._optionSubscription.unsubscribe();
   }
 
   /** Emits change event to set the model value. */
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 8205638fcdee..f3d40a01b0ec 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -89,10 +89,10 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
   private _tabBodyWrapperHeight: number = 0;
 
   /** Subscription to tabs being added/removed. */
-  private _tabsSubscription: Subscription;
+  private _tabsSubscription = Subscription.EMPTY;
 
   /** Subscription to changes in the tab labels. */
-  private _tabLabelSubscription: Subscription;
+  private _tabLabelSubscription = Subscription.EMPTY;
 
   /** Whether the tab group should grow to the size of the active tab. */
   @Input()
@@ -199,13 +199,8 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
   }
 
   ngOnDestroy() {
-    if (this._tabsSubscription) {
-      this._tabsSubscription.unsubscribe();
-    }
-
-    if (this._tabLabelSubscription) {
-      this._tabLabelSubscription.unsubscribe();
-    }
+    this._tabsSubscription.unsubscribe();
+    this._tabLabelSubscription.unsubscribe();
   }
 
   /**
@@ -236,10 +231,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
    * manually.
    */
   private _subscribeToTabLabels() {
-    if (this._tabLabelSubscription) {
-      this._tabLabelSubscription.unsubscribe();
-    }
-
+    this._tabLabelSubscription.unsubscribe();
     this._tabLabelSubscription = merge(...this._tabs.map(tab => tab._labelChange)).subscribe(() => {
       this._changeDetectorRef.markForCheck();
     });
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index e57d9840050e..00f0987bc69e 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -92,7 +92,7 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
   private _selectedIndexChanged = false;
 
   /** Combines listeners that will re-align the ink bar whenever they're invoked. */
-  private _realignInkBar: Subscription | null = null;
+  private _realignInkBar = Subscription.EMPTY;
 
   /** Whether the controls for pagination should be displayed */
   _showPaginationControls = false;
@@ -195,10 +195,7 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
   }
 
   ngOnDestroy() {
-    if (this._realignInkBar) {
-      this._realignInkBar.unsubscribe();
-      this._realignInkBar = null;
-    }
+    this._realignInkBar.unsubscribe();
   }
 
   /**
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 8c51f8eec506..d247017fe418 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -30,7 +30,6 @@ import {Directionality} from '@angular/cdk/bidi';
 import {Platform} from '@angular/cdk/platform';
 import {auditTime, takeUntil} from '@angular/cdk/rxjs';
 import {Subject} from 'rxjs/Subject';
-import {Subscription} from 'rxjs/Subscription';
 import {of as observableOf} from 'rxjs/observable/of';
 import {merge} from 'rxjs/observable/merge';
 import {fromEvent} from 'rxjs/observable/fromEvent';
@@ -78,9 +77,6 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
   @ContentChildren(forwardRef(() => MdTabLink), {descendants: true})
   _tabLinks: QueryList<MdTabLink>;
 
-  /** Subscription for window.resize event **/
-  private _resizeSubscription: Subscription;
-
   /** Background color of the tab nav. */
   @Input()
   get backgroundColor(): ThemePalette { return this._backgroundColor; }
@@ -124,15 +120,17 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
   }
 
   ngAfterContentInit(): void {
-    this._resizeSubscription = this._ngZone.runOutsideAngular(() => {
+    this._ngZone.runOutsideAngular(() => {
       let dirChange = this._dir ? this._dir.change : observableOf(null);
       let resize = typeof window !== 'undefined' ?
           auditTime.call(fromEvent(window, 'resize'), 10) :
           observableOf(null);
 
-      return takeUntil.call(merge(dirChange, resize), this._onDestroy)
-          .subscribe(() => this._alignInkBar());
+      return takeUntil.call(merge(dirChange, resize), this._onDestroy).subscribe(() => {
+        this._alignInkBar();
+      });
     });
+
     this._setLinkDisableRipple();
   }
 
@@ -146,10 +144,7 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
 
   ngOnDestroy() {
     this._onDestroy.next();
-
-    if (this._resizeSubscription) {
-      this._resizeSubscription.unsubscribe();
-    }
+    this._onDestroy.complete();
   }
 
   /** Aligns the ink bar to the active link. */

From 1272f0321590dcfe6d2cbbb08d8ece79f59aca3c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 16:48:18 +0200
Subject: [PATCH 005/575] fix(input): remove resize handle from non-textarea
 inputs (#6768)

Fixes some input types getting a native resize handle, because we were setting the `resize: vertical` explicitly for all `.mat-input-element` instances.

Fixes #6757.
---
 src/lib/input/input.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/input/input.scss b/src/lib/input/input.scss
index b960fa972d02..d357326b973b 100644
--- a/src/lib/input/input.scss
+++ b/src/lib/input/input.scss
@@ -22,7 +22,6 @@
 
   // Prevent textareas from being resized outside the form field.
   max-width: 100%;
-  resize: vertical;
 
   // Needed to make last line of the textarea line up with the baseline.
   vertical-align: bottom;
@@ -45,5 +44,7 @@
 
 // Prevents IE from always adding a scrollbar by default.
 textarea.mat-input-element {
+  // Only allow resizing along the Y axis.
+  resize: vertical;
   overflow: auto;
 }

From 255611b1addb0dbafaf9a1ff1415e91c60562853 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 16:49:13 +0200
Subject: [PATCH 006/575] fix(grid-list): avoid unnecessary calc declarations
 (#6745)

For the cases where a tile's offset is 0, some of the `calc` expressions will always evaluate to 0. These changes make it so calc isn't used at all if it would evaluate to 0.
---
 src/lib/grid-list/grid-list.spec.ts | 12 ++++++++++++
 src/lib/grid-list/tile-styler.ts    |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/lib/grid-list/grid-list.spec.ts b/src/lib/grid-list/grid-list.spec.ts
index d3561a5077ce..6f556b40bbcc 100644
--- a/src/lib/grid-list/grid-list.spec.ts
+++ b/src/lib/grid-list/grid-list.spec.ts
@@ -253,6 +253,18 @@ describe('MdGridList', () => {
     let footer = fixture.debugElement.query(By.directive(MdGridTileText));
     expect(footer.nativeElement.classList.contains('mat-2-line')).toBe(true);
   });
+
+  it('should not use calc() that evaluates to 0', () => {
+    const fixture = TestBed.createComponent(GirdListWithRowHeightRatio);
+
+    fixture.componentInstance.heightRatio = '4:1';
+    fixture.detectChanges();
+
+    const firstTile = fixture.debugElement.query(By.directive(MdGridTile)).nativeElement;
+
+    expect(firstTile.style.marginTop).toBe('0px');
+    expect(firstTile.style.left).toBe('0px');
+  });
 });
 
 
diff --git a/src/lib/grid-list/tile-styler.ts b/src/lib/grid-list/tile-styler.ts
index dff694f9dd1e..6c781e3c7e67 100644
--- a/src/lib/grid-list/tile-styler.ts
+++ b/src/lib/grid-list/tile-styler.ts
@@ -51,7 +51,7 @@ export abstract class TileStyler {
     // edges, each tile only uses a fraction (gutterShare = numGutters / numCells) of the gutter
     // size. (Imagine having one gutter per tile, and then breaking up the extra gutter on the
     // edge evenly among the cells).
-    return `(${sizePercent}% - ( ${this._gutterSize} * ${gutterFraction} ))`;
+    return `(${sizePercent}% - (${this._gutterSize} * ${gutterFraction}))`;
   }
 
 
@@ -64,7 +64,7 @@ export abstract class TileStyler {
   getTilePosition(baseSize: string, offset: number): string {
     // The position comes the size of a 1x1 tile plus gutter for each previous tile in the
     // row/column (offset).
-    return calc(`(${baseSize} + ${this._gutterSize}) * ${offset}`);
+    return offset === 0 ? '0' : calc(`(${baseSize} + ${this._gutterSize}) * ${offset}`);
   }
 
 

From efe483afed1d9d0b80ff37ea79c5af29c10524c9 Mon Sep 17 00:00:00 2001
From: Kristofer Karlsson <karlsson.kristofer@gmail.com>
Date: Fri, 1 Sep 2017 16:50:36 +0200
Subject: [PATCH 007/575] fix(list): subheader margin being overwritten by
 typography (#6735)

---
 src/lib/list/list.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
index 13e1baae8d1e..22db02fa92ee 100644
--- a/src/lib/list/list.scss
+++ b/src/lib/list/list.scss
@@ -118,7 +118,9 @@ $mat-dense-list-icon-size: 20px;
 
   // This needs slightly more specificity, because it
   // can be overwritten by the typography styles.
-  .mat-list & {
+  .mat-list &,
+  .mat-nav-list &,
+  .mat-selection-list & {
     margin: 0;
   }
 }

From 2635cadf4b983546cc4018cf22aa3bb386a850c0 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Fri, 1 Sep 2017 07:51:06 -0700
Subject: [PATCH 008/575] fix(datepicker): Create a new injection token to
 avoid overriding LOCALE_ID (#6708)

---
 src/lib/core/datetime/date-adapter.ts         |  8 +++++
 src/lib/core/datetime/index.ts                |  8 +++--
 .../core/datetime/native-date-adapter.spec.ts | 30 +++++++++++++++++--
 src/lib/core/datetime/native-date-adapter.ts  | 10 +++----
 src/lib/datepicker/datepicker.md              |  7 +++--
 5 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index 407ed09daeec..24172405d036 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -6,6 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {InjectionToken, LOCALE_ID} from '@angular/core';
+
+/** InjectionToken for datepicker that can be used to override default locale code. */
+export const MAT_DATE_LOCALE = new InjectionToken<string>('MAT_DATE_LOCALE');
+
+/** Provider for MAT_DATE_LOCALE injection token. */
+export const MAT_DATE_LOCALE_PROVIDER = {provide: MAT_DATE_LOCALE, useExisting: LOCALE_ID};
+
 /** Adapts type `D` to be usable as a date by cdk-based components that work with dates. */
 export abstract class DateAdapter<D> {
   /** The locale to use for all dates. */
diff --git a/src/lib/core/datetime/index.ts b/src/lib/core/datetime/index.ts
index bdacc4d1f010..e16c8b39b197 100644
--- a/src/lib/core/datetime/index.ts
+++ b/src/lib/core/datetime/index.ts
@@ -7,12 +7,11 @@
  */
 
 import {NgModule} from '@angular/core';
-import {DateAdapter} from './date-adapter';
+import {DateAdapter, MAT_DATE_LOCALE_PROVIDER} from './date-adapter';
 import {NativeDateAdapter} from './native-date-adapter';
 import {MD_DATE_FORMATS} from './date-formats';
 import {MD_NATIVE_DATE_FORMATS} from './native-date-formats';
 
-
 export * from './date-adapter';
 export * from './date-formats';
 export * from './native-date-adapter';
@@ -20,7 +19,10 @@ export * from './native-date-formats';
 
 
 @NgModule({
-  providers: [{provide: DateAdapter, useClass: NativeDateAdapter}],
+  providers: [
+    {provide: DateAdapter, useClass: NativeDateAdapter},
+    MAT_DATE_LOCALE_PROVIDER
+  ],
 })
 export class NativeDateModule {}
 
diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index 7f9931310614..cc03629e724e 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -1,8 +1,8 @@
 import {TestBed, async, inject} from '@angular/core/testing';
-import {LOCALE_ID} from '@angular/core';
-import {NativeDateAdapter, NativeDateModule, DateAdapter} from './index';
+import {NativeDateAdapter, NativeDateModule, DateAdapter, MAT_DATE_LOCALE} from './index';
 import {Platform} from '../platform/index';
 import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
+import {LOCALE_ID} from '@angular/core';
 
 const SUPPORTS_INTL = typeof Intl != 'undefined';
 
@@ -334,6 +334,30 @@ describe('NativeDateAdapter', () => {
 });
 
 
+describe('NativeDateAdapter with MAT_DATE_LOCALE override', () => {
+  let adapter: NativeDateAdapter;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [NativeDateModule],
+      providers: [{provide: MAT_DATE_LOCALE, useValue: 'da-DK'}]
+    }).compileComponents();
+  }));
+
+  beforeEach(inject([DateAdapter], (d: NativeDateAdapter) => {
+    adapter = d;
+  }));
+
+  it('should take the default locale id from the MAT_DATE_LOCALE injection token', () => {
+    const expectedValue = SUPPORTS_INTL ?
+        ['søndag', 'mandag', 'tirsdag', 'onsdag', 'torsdag', 'fredag', 'lørdag'] :
+        ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+
+    expect(adapter.getDayOfWeekNames('long')).toEqual(expectedValue);
+  });
+
+});
+
 describe('NativeDateAdapter with LOCALE_ID override', () => {
   let adapter: NativeDateAdapter;
 
@@ -348,7 +372,7 @@ describe('NativeDateAdapter with LOCALE_ID override', () => {
     adapter = d;
   }));
 
-  it('should take the default locale id from the LOCALE_ID injection token', () => {
+  it('should cascade locale id from the LOCALE_ID injection token to MAT_DATE_LOCALE', () => {
     const expectedValue = SUPPORTS_INTL ?
         ['søndag', 'mandag', 'tirsdag', 'onsdag', 'torsdag', 'fredag', 'lørdag'] :
         ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index ce1a2c77653d..6eb459c17206 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, Optional, LOCALE_ID} from '@angular/core';
-import {DateAdapter} from './date-adapter';
+import {Inject, Injectable, Optional} from '@angular/core';
+import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
 import {extendObject} from '../util/object-extend';
 
-
 // TODO(mmalerba): Remove when we no longer support safari 9.
 /** Whether the browser supports the Intl API. */
 const SUPPORTS_INTL_API = typeof Intl != 'undefined';
@@ -48,13 +47,12 @@ function range<T>(length: number, valueFunction: (index: number) => T): T[] {
   return valuesArray;
 }
 
-
 /** Adapts the native JS Date for use with cdk-based components that work with dates. */
 @Injectable()
 export class NativeDateAdapter extends DateAdapter<Date> {
-  constructor(@Optional() @Inject(LOCALE_ID) localeId: any) {
+  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string) {
     super();
-    super.setLocale(localeId);
+    super.setLocale(matDateLocale);
   }
 
   /**
diff --git a/src/lib/datepicker/datepicker.md b/src/lib/datepicker/datepicker.md
index a0d624f8d01f..b91d40265db4 100644
--- a/src/lib/datepicker/datepicker.md
+++ b/src/lib/datepicker/datepicker.md
@@ -116,13 +116,14 @@ three pieces via injection:
  3. The message strings used in the datepicker's UI.
 
 #### Setting the locale code
-By default the datepicker will use the locale code from the `LOCALE_ID` injection token from
-`@angular/core`. If you want to override it, you can provide a new value for the token:
+By default, the `MAT_DATE_LOCALE` injection token will use the existing `LOCALE_ID` locale code
+from `@angular/core`. If you want to override it, you can provide a new value for the
+`MAT_DATE_LOCALE` token:
 
 ```ts
 @NgModule({
   providers: [
-    {provide: LOCALE_ID, useValue: 'en-GB'},
+    {provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
   ],
 })
 export class MyApp {}

From 8c4942280743b848701bb371af5180d5e508fe19 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Fri, 1 Sep 2017 07:53:20 -0700
Subject: [PATCH 009/575] fix(slider): update styles when focus and dir change
 (#6700)

---
 src/lib/slider/slider.spec.ts | 42 ++++++++++++++++++++++++++++++++++-
 src/lib/slider/slider.ts      | 20 +++++++++++++----
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index 3bdeff346d13..676929861740 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -16,7 +16,7 @@ import {
   UP_ARROW,
   BACKSPACE
 } from '../core/keyboard/keycodes';
-import {dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 
 describe('MdSlider without forms', () => {
   let gestureConfig: TestGestureConfig;
@@ -141,6 +141,28 @@ describe('MdSlider without forms', () => {
       expect(sliderNativeElement.classList).not.toContain('mat-slider-sliding');
     });
 
+    it('should reset active state upon blur', () => {
+      sliderInstance._isActive = true;
+
+      dispatchFakeEvent(sliderNativeElement, 'blur');
+      fixture.detectChanges();
+
+      expect(sliderInstance._isActive).toBe(false);
+    });
+
+    it('should reset thumb gap when blurred on min value', () => {
+      sliderInstance._isActive = true;
+      sliderInstance.value = 0;
+      fixture.detectChanges();
+
+      expect(sliderInstance._thumbGap).toBe(10);
+
+      dispatchFakeEvent(sliderNativeElement, 'blur');
+      fixture.detectChanges();
+
+      expect(sliderInstance._thumbGap).toBe(7);
+    });
+
     it('should have thumb gap when at min value', () => {
       expect(trackFillElement.style.transform).toContain('translateX(-7px)');
     });
@@ -958,6 +980,24 @@ describe('MdSlider without forms', () => {
       expect(sliderInstance.value).toBe(30);
     });
 
+    it('should re-render slider with updated style upon directionality change', () => {
+      testComponent.dir = 'rtl';
+      fixture.detectChanges();
+
+      let initialTrackFillStyles = sliderInstance._trackFillStyles;
+      let initialTicksContainerStyles = sliderInstance._ticksContainerStyles;
+      let initialTicksStyles = sliderInstance._ticksStyles;
+      let initialThumbContainerStyles = sliderInstance._thumbContainerStyles;
+
+      testComponent.dir = 'ltr';
+      fixture.detectChanges();
+
+      expect(initialTrackFillStyles).not.toEqual(sliderInstance._trackFillStyles);
+      expect(initialTicksContainerStyles).not.toEqual(sliderInstance._ticksContainerStyles);
+      expect(initialTicksStyles).not.toEqual(sliderInstance._ticksStyles);
+      expect(initialThumbContainerStyles).not.toEqual(sliderInstance._thumbContainerStyles);
+    });
+
     it('should increment inverted slider by 1 on right arrow pressed', () => {
       testComponent.invert = true;
       fixture.detectChanges();
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 701c08b3396c..e794e1f4575a 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -19,7 +19,7 @@ import {
   Output,
   Renderer2,
   ViewEncapsulation,
-  ViewChild,
+  ViewChild, OnInit,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
@@ -125,7 +125,7 @@ export const _MdSliderMixinBase = mixinColor(mixinDisabled(MdSliderBase), 'accen
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdSlider extends _MdSliderMixinBase
-    implements ControlValueAccessor, OnDestroy, CanDisable, CanColor {
+    implements ControlValueAccessor, OnDestroy, CanDisable, CanColor, OnInit {
   /** Whether the slider is inverted. */
   @Input()
   get invert() { return this._invert; }
@@ -410,13 +410,25 @@ export class MdSlider extends _MdSliderMixinBase
               private _changeDetectorRef: ChangeDetectorRef,
               @Optional() private _dir: Directionality) {
     super(renderer, elementRef);
+  }
+
+  ngOnInit() {
     this._focusOriginMonitor
-        .monitor(this._elementRef.nativeElement, renderer, true)
-        .subscribe((origin: FocusOrigin) => this._isActive = !!origin && origin !== 'keyboard');
+        .monitor(this._elementRef.nativeElement, this._renderer, true)
+        .subscribe((origin: FocusOrigin) => {
+          this._isActive = !!origin && origin !== 'keyboard';
+          this._changeDetectorRef.detectChanges();
+        });
+    if (this._dir) {
+      this._dir.change.subscribe(() => this._changeDetectorRef.markForCheck());
+    }
   }
 
   ngOnDestroy() {
     this._focusOriginMonitor.stopMonitoring(this._elementRef.nativeElement);
+    if (this._dir) {
+      this._dir.change.unsubscribe();
+    }
   }
 
   _onMouseenter() {

From 82e14f8b71edba1abb50bde21fe77e977b142614 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 1 Sep 2017 16:53:49 +0200
Subject: [PATCH 010/575] fix(button-toggle): border radius ignored if option
 is selected (#6699)

As per Material Design specifications, the button-toggle group should always have a border radius.

This behavior has been implemented in the `md-button-toggle-group` component, but does not work properly if an option is selected or disabled. This happens because selected and disabled button-toggles receives a background color, which overflows the clipped button-toggle-group.

Fixes #6689
---
 src/lib/button-toggle/button-toggle.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/button-toggle/button-toggle.scss b/src/lib/button-toggle/button-toggle.scss
index 0ce0a4f18ee8..d77f94181edc 100644
--- a/src/lib/button-toggle/button-toggle.scss
+++ b/src/lib/button-toggle/button-toggle.scss
@@ -18,6 +18,7 @@ $mat-button-toggle-border-radius: 2px !default;
 
   cursor: pointer;
   white-space: nowrap;
+  overflow: hidden;
 }
 
 .mat-button-toggle-vertical {

From fbce67d219aaa6e903aec0d261634d16f5ae7dcc Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 1 Sep 2017 16:54:27 +0200
Subject: [PATCH 011/575] refactor(selection-list): use disable-ripple mixin
 (#6692)

* Switches the `disableRipple` getter/setter with the `disableRipple` mixin from core.
* Prefixes the `isRippleEnabled` method with an underscore to hide it from the API docs.
* Switch `isRippleEnabled` to `_isRippleDisabled`
---
 src/lib/list/list-item.html    |  2 +-
 src/lib/list/list-option.html  |  2 +-
 src/lib/list/list.spec.ts      | 10 ++++----
 src/lib/list/list.ts           |  4 ++--
 src/lib/list/selection-list.ts | 42 +++++++++++++---------------------
 5 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/lib/list/list-item.html b/src/lib/list/list-item.html
index bd0f404f5821..aef6a78c83ee 100644
--- a/src/lib/list/list-item.html
+++ b/src/lib/list/list-item.html
@@ -1,7 +1,7 @@
 <div class="mat-list-item-content">
   <div class="mat-list-item-ripple" md-ripple
        [mdRippleTrigger]="_getHostElement()"
-       [mdRippleDisabled]="!isRippleEnabled()">
+       [mdRippleDisabled]="_isRippleDisabled()">
   </div>
 
   <ng-content
diff --git a/src/lib/list/list-option.html b/src/lib/list/list-option.html
index 638a472d7562..e96faa23f06d 100644
--- a/src/lib/list/list-option.html
+++ b/src/lib/list/list-option.html
@@ -1,7 +1,7 @@
 <div class="mat-list-item-content"  [class.mat-list-item-content-reverse]="checkboxPosition == 'after'" [class.mat-list-item-disabled]="disabled">
   <div class="mat-list-item-ripple" md-ripple
        [mdRippleTrigger]="_getHostElement()"
-       [mdRippleDisabled]="!isRippleEnabled()">
+       [mdRippleDisabled]="_isRippleDisabled()">
   </div>
 
   <md-pseudo-checkbox [state]="selected ? 'checked' : 'unchecked'" #autocheckbox [disabled]="disabled"></md-pseudo-checkbox>
diff --git a/src/lib/list/list.spec.ts b/src/lib/list/list.spec.ts
index 832afc7bf391..d9854cf1dfdf 100644
--- a/src/lib/list/list.spec.ts
+++ b/src/lib/list/list.spec.ts
@@ -125,7 +125,7 @@ describe('MdList', () => {
 
     const items: QueryList<MdListItem> = fixture.debugElement.componentInstance.listItems;
     expect(items.length).toBeGreaterThan(0);
-    items.forEach(item => expect(item.isRippleEnabled()).toBe(false));
+    items.forEach(item => expect(item._isRippleDisabled()).toBe(true));
   });
 
   it('should allow disabling ripples for specific nav-list items', () => {
@@ -136,12 +136,12 @@ describe('MdList', () => {
     expect(items.length).toBeGreaterThan(0);
 
     // Ripples should be enabled by default, and can be disabled with a binding.
-    items.forEach(item => expect(item.isRippleEnabled()).toBe(true));
+    items.forEach(item => expect(item._isRippleDisabled()).toBe(false));
 
     fixture.componentInstance.disableItemRipple = true;
     fixture.detectChanges();
 
-    items.forEach(item => expect(item.isRippleEnabled()).toBe(false));
+    items.forEach(item => expect(item._isRippleDisabled()).toBe(true));
   });
 
   it('should allow disabling ripples for the whole nav-list', () => {
@@ -152,12 +152,12 @@ describe('MdList', () => {
     expect(items.length).toBeGreaterThan(0);
 
     // Ripples should be enabled by default, and can be disabled with a binding.
-    items.forEach(item => expect(item.isRippleEnabled()).toBe(true));
+    items.forEach(item => expect(item._isRippleDisabled()).toBe(false));
 
     fixture.componentInstance.disableListRipple = true;
     fixture.detectChanges();
 
-    items.forEach(item => expect(item.isRippleEnabled()).toBe(false));
+    items.forEach(item => expect(item._isRippleDisabled()).toBe(true));
   });
 });
 
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index a78156d71e34..7762facbc6a5 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -156,8 +156,8 @@ export class MdListItem extends _MdListItemMixinBase implements AfterContentInit
   }
 
   /** Whether this list item should show a ripple effect when clicked.  */
-  isRippleEnabled() {
-    return !this.disableRipple && this._isNavList && !this._list.disableRipple;
+  _isRippleDisabled() {
+    return !this._isNavList || this.disableRipple || this._list.disableRipple;
   }
 
   _handleFocus() {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index a1dd1b778136..1e097ebdde1a 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -32,9 +32,13 @@ import {FocusableOption} from '../core/a11y/focus-key-manager';
 import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
 import {RxChain, switchMap, startWith} from '../core/rxjs/index';
 import {merge} from 'rxjs/observable/merge';
+import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
 
 export class MdSelectionListBase {}
-export const _MdSelectionListMixinBase = mixinDisabled(MdSelectionListBase);
+export const _MdSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MdSelectionListBase));
+
+export class MdListOptionBase {}
+export const _MdListOptionMixinBase = mixinDisableRipple(MdListOptionBase);
 
 
 export interface MdSelectionListOptionEvent {
@@ -51,6 +55,7 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
 @Component({
   moduleId: module.id,
   selector: 'md-list-option, mat-list-option',
+  inputs: ['disableRipple'],
   host: {
     'role': 'option',
     'class': 'mat-list-item mat-list-option',
@@ -65,9 +70,10 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MdListOption implements AfterContentInit, OnDestroy, FocusableOption {
+export class MdListOption extends _MdListOptionMixinBase
+    implements AfterContentInit, OnDestroy, FocusableOption, CanDisableRipple {
+
   private _lineSetter: MdLineSetter;
-  private _disableRipple: boolean = false;
   private _selected: boolean = false;
   /** Whether the checkbox is disabled. */
   private _disabled: boolean = false;
@@ -76,15 +82,6 @@ export class MdListOption implements AfterContentInit, OnDestroy, FocusableOptio
   /** Whether the option has focus. */
   _hasFocus: boolean = false;
 
-  /**
-   * Whether the ripple effect on click should be disabled. This applies only to list items that are
-   * part of a selection list. The value of `disableRipple` on the `md-selection-list` overrides
-   * this flag
-   */
-  @Input()
-  get disableRipple() { return this._disableRipple; }
-  set disableRipple(value: boolean) { this._disableRipple = coerceBooleanProperty(value); }
-
   @ContentChildren(MdLine) _lines: QueryList<MdLine>;
 
   /** Whether the label should appear before or after the checkbox. Defaults to 'after' */
@@ -119,7 +116,9 @@ export class MdListOption implements AfterContentInit, OnDestroy, FocusableOptio
               private _element: ElementRef,
               private _changeDetector: ChangeDetectorRef,
               @Optional() @Inject(forwardRef(() => MdSelectionList))
-                  public selectionList: MdSelectionList) {}
+                  public selectionList: MdSelectionList) {
+    super();
+  }
 
   ngAfterContentInit() {
     this._lineSetter = new MdLineSetter(this._lines, this._renderer, this._element);
@@ -146,8 +145,8 @@ export class MdListOption implements AfterContentInit, OnDestroy, FocusableOptio
   }
 
   /** Whether this list item should show a ripple effect when clicked.  */
-  isRippleEnabled() {
-    return !this.disableRipple && !this.selectionList.disableRipple;
+  _isRippleDisabled() {
+    return this.disableRipple || this.selectionList.disableRipple;
   }
 
   _handleClick() {
@@ -175,7 +174,7 @@ export class MdListOption implements AfterContentInit, OnDestroy, FocusableOptio
 @Component({
   moduleId: module.id,
   selector: 'md-selection-list, mat-selection-list',
-  inputs: ['disabled'],
+  inputs: ['disabled', 'disableRipple'],
   host: {
     'role': 'listbox',
     '[attr.tabindex]': '_tabIndex',
@@ -189,8 +188,7 @@ export class MdListOption implements AfterContentInit, OnDestroy, FocusableOptio
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdSelectionList extends _MdSelectionListMixinBase
-  implements FocusableOption, CanDisable, AfterContentInit, OnDestroy {
-  private _disableRipple: boolean = false;
+    implements FocusableOption, CanDisable, CanDisableRipple, AfterContentInit, OnDestroy {
 
   /** Tab index for the selection-list. */
   _tabIndex = 0;
@@ -210,14 +208,6 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   /** options which are selected. */
   selectedOptions: SelectionModel<MdListOption> = new SelectionModel<MdListOption>(true);
 
-  /**
-   * Whether the ripple effect should be disabled on the list-items or not.
-   * This flag only has an effect for `mat-selection-list` components.
-   */
-  @Input()
-  get disableRipple() { return this._disableRipple; }
-  set disableRipple(value: boolean) { this._disableRipple = coerceBooleanProperty(value); }
-
   constructor(private _element: ElementRef) {
     super();
   }

From 4191b4d66e4dc79fc1dfa446caf48e5d3224d4fa Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 1 Sep 2017 07:54:50 -0700
Subject: [PATCH 012/575] fix(form-field): add aria-owns to label element
 (#6683)

---
 src/lib/form-field/form-field.html |  3 +++
 src/lib/input/input.spec.ts        | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/lib/form-field/form-field.html b/src/lib/form-field/form-field.html
index d34e8b7c40f9..223cb79d0922 100644
--- a/src/lib/form-field/form-field.html
+++ b/src/lib/form-field/form-field.html
@@ -8,8 +8,11 @@
       <ng-content></ng-content>
 
       <span class="mat-input-placeholder-wrapper mat-form-field-placeholder-wrapper">
+        <!-- We add aria-owns as a workaround for an issue in JAWS & NVDA where the label isn't
+             read if it comes before the control in the DOM. -->
         <label class="mat-input-placeholder mat-form-field-placeholder"
                [attr.for]="_control.id"
+               [attr.aria-owns]="_control.id"
                [class.mat-empty]="_control.empty && !_shouldAlwaysFloat"
                [class.mat-form-field-empty]="_control.empty && !_shouldAlwaysFloat"
                [class.mat-float]="_canPlaceholderFloat"
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index ade499ec53d5..1ff06bd7b6eb 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -224,6 +224,18 @@ describe('MdInput without forms', function () {
     expect(inputElement.id).toEqual(labelElement.getAttribute('for'));
   });
 
+  it('should add aria-owns to the label for the associated control', () => {
+    let fixture = TestBed.createComponent(MdInputTextTestController);
+    fixture.detectChanges();
+
+    const inputElement: HTMLInputElement =
+        fixture.debugElement.query(By.css('input')).nativeElement;
+    const labelElement: HTMLInputElement =
+        fixture.debugElement.query(By.css('label')).nativeElement;
+
+    expect(labelElement.getAttribute('aria-owns')).toBe(inputElement.id);
+  });
+
   it('should not overwrite existing id', () => {
     let fixture = TestBed.createComponent(MdInputWithId);
     fixture.detectChanges();

From b678119cad24024023ed0e9a0eea9d87079c6e18 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 1 Sep 2017 09:55:30 -0500
Subject: [PATCH 013/575] fix(tabs): tab spacing on desktop incorrect (#6681)

Fixes #3347
---
 src/lib/tabs/_tabs-common.scss | 2 +-
 src/lib/tabs/tab-group.scss    | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib/tabs/_tabs-common.scss b/src/lib/tabs/_tabs-common.scss
index 579a3939cbe5..990d48789162 100644
--- a/src/lib/tabs/_tabs-common.scss
+++ b/src/lib/tabs/_tabs-common.scss
@@ -6,7 +6,7 @@ $mat-tab-animation-duration: 500ms !default;
 // Mixin styles for labels that are contained within the tab header.
 @mixin tab-label {
   height: $mat-tab-bar-height;
-  padding: 0 12px;
+  padding: 0 24px;
   cursor: pointer;
   box-sizing: border-box;
   opacity: 0.6;
diff --git a/src/lib/tabs/tab-group.scss b/src/lib/tabs/tab-group.scss
index ab3e059cebdb..7fdd9a0d57a8 100644
--- a/src/lib/tabs/tab-group.scss
+++ b/src/lib/tabs/tab-group.scss
@@ -19,7 +19,13 @@
 
 @media ($mat-xsmall) {
   .mat-tab-label {
-    min-width: 72px;
+    padding: 0 12px;
+  }
+}
+
+@media ($mat-small) {
+  .mat-tab-label {
+    padding: 0 12px;
   }
 }
 

From 9acab86871b51fefd00887f5d37abc18c2d2daee Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 1 Sep 2017 16:57:46 +0200
Subject: [PATCH 014/575] fix(checkbox): label content should not wrap (#6674)

* Similar as for the radio component, the checkbox label content should not wrap if it exceeds the boundaries of the parent element. This ensures that we have consistent behavior across all selection controls.
* Fixes that the radio container (circle) shrinks if the label content is exceeding the boundaries and wrapping is enabled (developers may overwrite CSS to enable wrapping)

Closes #6671
---
 src/lib/checkbox/checkbox.scss | 1 +
 src/lib/radio/radio.scss       | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss
index 57752e0ea812..c591b1be75fe 100644
--- a/src/lib/checkbox/checkbox.scss
+++ b/src/lib/checkbox/checkbox.scss
@@ -193,6 +193,7 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
   align-items: baseline;
   vertical-align: middle;
   display: inline-flex;
+  white-space: nowrap;
 }
 
 .mat-checkbox-inner-container {
diff --git a/src/lib/radio/radio.scss b/src/lib/radio/radio.scss
index cffb3b237ce7..9ccd2b679c57 100644
--- a/src/lib/radio/radio.scss
+++ b/src/lib/radio/radio.scss
@@ -24,9 +24,12 @@ $mat-radio-ripple-size: $mat-radio-size * 0.75;
 .mat-radio-container {
   box-sizing: border-box;
   display: inline-block;
-  height: $mat-radio-size;
   position: relative;
   width: $mat-radio-size;
+  height: $mat-radio-size;
+  // The radio container is inside of a inline-flex element and may shrink if the label
+  // is wide and text-wrapping is enabled.
+  flex-shrink: 0;
 }
 
 // The outer circle for the radio, always present.

From 67e02b0483fd4304022b84a30227c7b28e1b4ca6 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 1 Sep 2017 09:58:27 -0500
Subject: [PATCH 015/575] fix(tabs): fix infinite tab loop (#6663)

Fixes #4639
---
 src/lib/tabs/tab-group.spec.ts | 19 +++++++++++++++++++
 src/lib/tabs/tab-group.ts      | 16 ++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index d30a5835a8b6..439367351a20 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -70,6 +70,25 @@ describe('MdTabGroup', () => {
       });
     }));
 
+    it('should set to correct tab on fast change', async(() => {
+      let component = fixture.componentInstance;
+      component.selectedIndex = 0;
+      fixture.detectChanges();
+
+      setTimeout(() => {
+        component.selectedIndex = 1;
+        fixture.detectChanges();
+
+        setTimeout(() => {
+          component.selectedIndex = 0;
+          fixture.detectChanges();
+          fixture.whenStable().then(() => {
+            expect(component.selectedIndex).toBe(0);
+          });
+        }, 1);
+      }, 1);
+    }));
+
     it('should change tabs based on selectedIndex', fakeAsync(() => {
       let component = fixture.componentInstance;
       let tabComponent = fixture.debugElement.query(By.css('md-tab-group')).componentInstance;
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index f3d40a01b0ec..8c3bf330cc40 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -25,8 +25,6 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {map} from '@angular/cdk/rxjs';
-import {Observable} from 'rxjs/Observable';
 import {Subscription} from 'rxjs/Subscription';
 import {MdTab} from './tab';
 import {merge} from 'rxjs/observable/merge';
@@ -131,9 +129,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
   private _backgroundColor: ThemePalette;
 
   /** Output to enable support for two-way binding on `[(selectedIndex)]` */
-  @Output() get selectedIndexChange(): Observable<number> {
-    return map.call(this.selectChange, event => event.index);
-  }
+  @Output() selectedIndexChange: EventEmitter<number> = new EventEmitter();
 
   /** Event emitted when focus has changed within a tab group. */
   @Output() focusChange: EventEmitter<MdTabChangeEvent> = new EventEmitter<MdTabChangeEvent>();
@@ -157,9 +153,10 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
    * a new selected tab should transition in (from the left or right).
    */
   ngAfterContentChecked(): void {
-    // Clamp the next selected index to the bounds of 0 and the tabs length. Note the `|| 0`, which
-    // ensures that values like NaN can't get through and which would otherwise throw the
-    // component into an infinite loop (since Math.max(NaN, 0) === NaN).
+    // Clamp the next selected index to the boundsof 0 and the tabs length.
+    // Note the `|| 0`, which ensures that values like NaN can't get through
+    // and which would otherwise throw the component into an infinite loop
+    // (since Math.max(NaN, 0) === NaN).
     let indexToSelect = this._indexToSelect =
         Math.min(this._tabs.length - 1, Math.max(this._indexToSelect || 0, 0));
 
@@ -167,6 +164,9 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
     // the selected index has not yet been initialized.
     if (this._selectedIndex != indexToSelect && this._selectedIndex != null) {
       this.selectChange.emit(this._createChangeEvent(indexToSelect));
+      // Emitting this value after change detection has run
+      // since the checked content may contain this variable'
+      Promise.resolve().then(() => this.selectedIndexChange.emit(indexToSelect));
     }
 
     // Setup the position for each tab and optionally setup an origin on the next selected tab.

From 89fea5053cbcd521f4d4934c103c1f993961b536 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 16:59:47 +0200
Subject: [PATCH 016/575] fix(autosize): not resizing on programmatic changes
 (#6654)

Fixes the textarea autosize directive not resizing when the value is changed programmatically outside Angular (e.g. `element.value`) or when the form control is swapped out.

Fixes #5247.
---
 src/lib/input/autosize.spec.ts | 19 ++++++++++++++++++-
 src/lib/input/autosize.ts      | 26 +++++++++++---------------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/lib/input/autosize.spec.ts b/src/lib/input/autosize.spec.ts
index e868c7cb63b1..f8fd600f97ae 100644
--- a/src/lib/input/autosize.spec.ts
+++ b/src/lib/input/autosize.spec.ts
@@ -170,7 +170,7 @@ describe('MdTextareaAutosize', () => {
     textarea = fixtureWithForms.nativeElement.querySelector('textarea');
     fixtureWithForms.detectChanges();
 
-    const previousHeight =  textarea.clientHeight;
+    const previousHeight = textarea.clientHeight;
 
     fixtureWithForms.componentInstance.model = `
         And the silken, sad, uncertain rustling of each purple curtain
@@ -181,10 +181,27 @@ describe('MdTextareaAutosize', () => {
                 This it is and nothing more.” `;
     fixtureWithForms.detectChanges();
     flushMicrotasks();
+    fixtureWithForms.detectChanges();
 
     expect(textarea.clientHeight)
         .toBeGreaterThan(previousHeight, 'Expected increased height when ngModel is updated.');
   }));
+
+  it('should resize when the textarea value is changed programmatically', fakeAsync(() => {
+    const previousHeight = textarea.clientHeight;
+
+    textarea.value = `
+      How much wood would a woodchuck chuck
+      if a woodchuck could chuck wood?
+    `;
+
+    fixture.detectChanges();
+    flushMicrotasks();
+    fixture.detectChanges();
+
+    expect(textarea.clientHeight)
+        .toBeGreaterThan(previousHeight, 'Expected the textarea height to have increased.');
+  }));
 });
 
 
diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts
index 3a4e489a3a4d..ecb135b8ce7b 100644
--- a/src/lib/input/autosize.ts
+++ b/src/lib/input/autosize.ts
@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Input, AfterViewInit, Optional, Self} from '@angular/core';
-import {NgControl} from '@angular/forms';
+import {Directive, ElementRef, Input, AfterViewInit, DoCheck} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
 
 
@@ -19,13 +18,12 @@ import {Platform} from '@angular/cdk/platform';
              textarea[mat-autosize], textarea[matTextareaAutosize]`,
   exportAs: 'mdTextareaAutosize',
   host: {
-    '(input)': 'resizeToFitContent()',
     // Textarea elements that have the directive applied should have a single row by default.
     // Browsers normally show two rows by default and therefore this limits the minRows binding.
     'rows': '1',
   },
 })
-export class MdTextareaAutosize implements AfterViewInit {
+export class MdTextareaAutosize implements AfterViewInit, DoCheck {
   /** Keep track of the previous textarea value to avoid resizing when the value hasn't changed. */
   private _previousValue: string;
 
@@ -58,15 +56,7 @@ export class MdTextareaAutosize implements AfterViewInit {
   /** Cached height of a textarea with a single row. */
   private _cachedLineHeight: number;
 
-  constructor(
-    private _elementRef: ElementRef,
-    private _platform: Platform,
-    @Optional() @Self() formControl: NgControl) {
-
-    if (formControl && formControl.valueChanges) {
-      formControl.valueChanges.subscribe(() => this.resizeToFitContent());
-    }
-  }
+  constructor(private _elementRef: ElementRef, private _platform: Platform) {}
 
   /** Sets the minimum height of the textarea as determined by minRows. */
   _setMinHeight(): void {
@@ -142,11 +132,17 @@ export class MdTextareaAutosize implements AfterViewInit {
     this._setMaxHeight();
   }
 
+  ngDoCheck() {
+    this.resizeToFitContent();
+  }
+
   /** Resize the textarea to fit its content. */
   resizeToFitContent() {
     const textarea = this._elementRef.nativeElement as HTMLTextAreaElement;
+    const value = textarea.value;
 
-    if (textarea.value === this._previousValue) {
+    // Only resize of the value changed since these calculations can be expensive.
+    if (value === this._previousValue) {
       return;
     }
 
@@ -159,6 +155,6 @@ export class MdTextareaAutosize implements AfterViewInit {
     textarea.style.height = `${textarea.scrollHeight}px`;
     textarea.style.overflow = '';
 
-    this._previousValue = textarea.value;
+    this._previousValue = value;
   }
 }

From 730e7ae666633688ebd7dfb0878bda348c5f0026 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:00:51 +0200
Subject: [PATCH 017/575] fix(snack-bar): animation not starting for subsequent
 snack bars (#6649)

Since the switch to OnPush change detection, opening a snack bar while another one is open, programmatically isn't guaranteed to actually show the second snack bar, because the user might not hit the zone (e.g. if it's through a timeout). These changes trigger change detection manually on open. I also got rid of a couple of redundant methods on the snack bar container.

Fixes #6222.
---
 src/lib/snack-bar/snack-bar-container.ts | 42 ++++++++++--------------
 src/lib/snack-bar/snack-bar-ref.ts       |  4 +--
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 9ae28dc0cfb0..e0acfc2b1766 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -17,6 +17,7 @@ import {
   ElementRef,
   ChangeDetectionStrategy,
   ViewEncapsulation,
+  ChangeDetectorRef,
 } from '@angular/core';
 import {
   trigger,
@@ -63,24 +64,25 @@ export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
   },
   animations: [
     trigger('state', [
-      state('void', style({transform: 'translateY(100%)'})),
-      state('initial', style({transform: 'translateY(100%)'})),
+      state('void, initial, complete', style({transform: 'translateY(100%)'})),
       state('visible', style({transform: 'translateY(0%)'})),
-      state('complete', style({transform: 'translateY(100%)'})),
       transition('visible => complete', animate(HIDE_ANIMATION)),
       transition('initial => visible, void => visible', animate(SHOW_ANIMATION)),
     ])
   ],
 })
 export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
+  /** Whether the component has been destroyed. */
+  private _destroyed = false;
+
   /** The portal host inside of this container into which the snack bar content will be loaded. */
   @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
 
   /** Subject for notifying that the snack bar has exited from view. */
-  private onExit: Subject<any> = new Subject();
+  _onExit: Subject<any> = new Subject();
 
   /** Subject for notifying that the snack bar has finished entering the view. */
-  private onEnter: Subject<any> = new Subject();
+  _onEnter: Subject<any> = new Subject();
 
   /** The state of the snack bar animations. */
   animationState: SnackBarState = 'initial';
@@ -91,7 +93,8 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
   constructor(
     private _ngZone: NgZone,
     private _renderer: Renderer2,
-    private _elementRef: ElementRef) {
+    private _elementRef: ElementRef,
+    private _changeDetectorRef: ChangeDetectorRef) {
     super();
   }
 
@@ -126,7 +129,7 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
     if (event.toState === 'visible') {
       // Note: we shouldn't use `this` inside the zone callback,
       // because it can cause a memory leak.
-      const onEnter = this.onEnter;
+      const onEnter = this._onEnter;
 
       this._ngZone.run(() => {
         onEnter.next();
@@ -137,30 +140,21 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
 
   /** Begin animation of snack bar entrance into view. */
   enter(): void {
-    this.animationState = 'visible';
-  }
-
-  /** Returns an observable resolving when the enter animation completes.  */
-  _onEnter(): Observable<void> {
-    this.animationState = 'visible';
-    return this.onEnter.asObservable();
+    if (!this._destroyed) {
+      this.animationState = 'visible';
+      this._changeDetectorRef.detectChanges();
+    }
   }
 
   /** Begin animation of the snack bar exiting from view. */
   exit(): Observable<void> {
     this.animationState = 'complete';
-    return this._onExit();
+    return this._onExit;
   }
 
-  /** Returns an observable that completes after the closing animation is done. */
-  _onExit(): Observable<void> {
-    return this.onExit.asObservable();
-  }
-
-  /**
-   * Makes sure the exit callbacks have been invoked when the element is destroyed.
-   */
+  /** Makes sure the exit callbacks have been invoked when the element is destroyed. */
   ngOnDestroy() {
+    this._destroyed = true;
     this._completeExit();
   }
 
@@ -171,7 +165,7 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
   private _completeExit() {
     // Note: we shouldn't use `this` inside the zone callback,
     // because it can cause a memory leak.
-    const onExit = this.onExit;
+    const onExit = this._onExit;
 
     first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => {
       onExit.next();
diff --git a/src/lib/snack-bar/snack-bar-ref.ts b/src/lib/snack-bar/snack-bar-ref.ts
index a2ae2053bba0..b9a5c4dc50ee 100644
--- a/src/lib/snack-bar/snack-bar-ref.ts
+++ b/src/lib/snack-bar/snack-bar-ref.ts
@@ -44,7 +44,7 @@ export class MdSnackBarRef<T> {
     this.containerInstance = containerInstance;
     // Dismiss snackbar on action.
     this.onAction().subscribe(() => this.dismiss());
-    containerInstance._onExit().subscribe(() => this._finishDismiss());
+    containerInstance._onExit.subscribe(() => this._finishDismiss());
   }
 
   /** Dismisses the snack bar. */
@@ -90,7 +90,7 @@ export class MdSnackBarRef<T> {
 
   /** Gets an observable that is notified when the snack bar has opened and appeared. */
   afterOpened(): Observable<void> {
-    return this.containerInstance._onEnter();
+    return this.containerInstance._onEnter;
   }
 
   /** Gets an observable that is notified when the snack bar action is called. */

From 11e2239a868c8070458bc9fe52f3afe8bdea61da Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:03:23 +0200
Subject: [PATCH 018/575] feat(expansion-panel): allow for the panel header
 height to be customized (#6643)

Uses the new Angular animations features, that allow for dynamic values to be passed to an animation, to let consumers customize the `md-expansion-panel-header` height.

Fixes #5641.
---
 src/demo-app/expansion/expansion-demo.html  | 13 +++++++++-
 src/demo-app/expansion/expansion-demo.ts    |  2 ++
 src/lib/expansion/expansion-panel-header.ts | 27 ++++++++++++++++++---
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/demo-app/expansion/expansion-demo.html b/src/demo-app/expansion/expansion-demo.html
index 3b5976712c58..e22b96339de9 100644
--- a/src/demo-app/expansion/expansion-demo.html
+++ b/src/demo-app/expansion/expansion-demo.html
@@ -1,6 +1,7 @@
 <h1>Single Expansion Panel</h1>
+
 <md-expansion-panel class="md-expansion-demo-width" #myPanel>
-  <md-expansion-panel-header>
+  <md-expansion-panel-header [expandedHeight]="expandedHeight" [collapsedHeight]="collapsedHeight">
     <mat-panel-description>This is a panel description.</mat-panel-description>
     <mat-panel-title>Panel Title</mat-panel-title>
   </md-expansion-panel-header>
@@ -10,7 +11,17 @@ <h1>Single Expansion Panel</h1>
     <button md-button>SAVE</button>
   </md-action-row>
 </md-expansion-panel>
+
 <br>
+<md-form-field>
+  <input mdInput [(ngModel)]="collapsedHeight" placeholder="Collapsed height">
+</md-form-field>
+
+<md-form-field>
+  <input mdInput [(ngModel)]="expandedHeight" placeholder="Expanded height">
+</md-form-field>
+<br>
+
 <h1>Accordion</h1>
 <div>
   <p>Accordion Options</p>
diff --git a/src/demo-app/expansion/expansion-demo.ts b/src/demo-app/expansion/expansion-demo.ts
index ac1076b020c0..868c04e564b5 100644
--- a/src/demo-app/expansion/expansion-demo.ts
+++ b/src/demo-app/expansion/expansion-demo.ts
@@ -13,4 +13,6 @@ export class ExpansionDemo {
   hideToggle = false;
   disabled = false;
   showPanel3 = true;
+  expandedHeight: string;
+  collapsedHeight: string;
 }
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 56c4b4626156..818c30a45f8b 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -16,6 +16,7 @@ import {
   OnDestroy,
   Renderer2,
   ElementRef,
+  Input,
 } from '@angular/core';
 import {
   trigger,
@@ -56,7 +57,13 @@ import {Subscription} from 'rxjs/Subscription';
     '[class.mat-expanded]': '_isExpanded()',
     '(click)': '_toggle()',
     '(keyup)': '_keyup($event)',
-    '[@expansionHeight]': '_getExpandedState()',
+    '[@expansionHeight]': `{
+        value: _getExpandedState(),
+        params: {
+          collapsedHeight: collapsedHeight,
+          expandedHeight: expandedHeight
+        }
+    }`,
   },
   animations: [
     trigger('indicatorRotate', [
@@ -65,8 +72,16 @@ import {Subscription} from 'rxjs/Subscription';
       transition('expanded <=> collapsed', animate(EXPANSION_PANEL_ANIMATION_TIMING)),
     ]),
     trigger('expansionHeight', [
-      state('collapsed', style({height: '48px'})),
-      state('expanded', style({height: '64px'})),
+      state('collapsed', style({
+        height: '{{collapsedHeight}}',
+      }), {
+        params: {collapsedHeight: '48px'},
+      }),
+      state('expanded', style({
+        height: '{{expandedHeight}}'
+      }), {
+        params: {expandedHeight: '64px'}
+      }),
       transition('expanded <=> collapsed', animate(EXPANSION_PANEL_ANIMATION_TIMING)),
     ]),
   ],
@@ -93,6 +108,12 @@ export class MdExpansionPanelHeader implements OnDestroy {
     _focusOriginMonitor.monitor(_element.nativeElement, _renderer, false);
   }
 
+  /** Height of the header while the panel is expanded. */
+  @Input() expandedHeight: string;
+
+  /** Height of the header while the panel is collapsed. */
+  @Input() collapsedHeight: string;
+
   /** Toggles the expanded state of the panel. */
   _toggle(): void {
     if (!this.panel.disabled) {

From 8243b1623f68a313b1970441a45b1fa3ced172b4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:04:09 +0200
Subject: [PATCH 019/575] fix(slider): thumb disappearing on disabled element
 with thumb label (#6641)

Fixes the slider thumb becoming hidden when a disabled slider with a thumb label is focused.

Fixes #6631.
---
 src/lib/slider/slider.scss | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/lib/slider/slider.scss b/src/lib/slider/slider.scss
index 1a2b36e59b47..f27f052bd1b2 100644
--- a/src/lib/slider/slider.scss
+++ b/src/lib/slider/slider.scss
@@ -214,26 +214,28 @@ $mat-slider-focus-ring-size: 30px !default;
 
 
 // Active slider.
-.cdk-focused {
-  &.mat-slider-thumb-label-showing .mat-slider-thumb {
-    transform: scale(0);
-  }
+.mat-slider:not(.mat-slider-disabled) {
+  &.cdk-focused {
+    &.mat-slider-thumb-label-showing .mat-slider-thumb {
+      transform: scale(0);
+    }
 
-  .mat-slider-thumb-label {
-    border-radius: 50% 50% 0;
-  }
+    .mat-slider-thumb-label {
+      border-radius: 50% 50% 0;
+    }
 
-  .mat-slider-thumb-label-text {
-    opacity: 1;
+    .mat-slider-thumb-label-text {
+      opacity: 1;
+    }
   }
-}
 
-.cdk-mouse-focused,
-.cdk-touch-focused,
-.cdk-program-focused {
-  .mat-slider-thumb {
-    border-width: $mat-slider-thumb-border-width-active;
-    transform: scale($mat-slider-thumb-focus-scale);
+  &.cdk-mouse-focused,
+  &.cdk-touch-focused,
+  &.cdk-program-focused {
+    .mat-slider-thumb {
+      border-width: $mat-slider-thumb-border-width-active;
+      transform: scale($mat-slider-thumb-focus-scale);
+    }
   }
 }
 

From 454781d49479c0c869b4a6bcc4c43d1673e18e2a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:05:05 +0200
Subject: [PATCH 020/575] fix(autocomplete,select): inconsistent disabled
 option coloring (#6640)

* Fixes a selected and disabled option in the autocomplete not showing as disabled until it is hovered.
* Fixes the disabled and selected options in `md-select` using the theme color, instead of the disabled color.
* Fixes the disabled state of an option not being passed down to its checkbox.

Fixes #6638.
---
 src/lib/autocomplete/_autocomplete-theme.scss | 17 +++++++++--------
 src/lib/core/option/_option-theme.scss        | 11 ++++++-----
 src/lib/core/option/option.html               |  4 ++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/lib/autocomplete/_autocomplete-theme.scss b/src/lib/autocomplete/_autocomplete-theme.scss
index 7daf6f3b81fc..0572a6600ed5 100644
--- a/src/lib/autocomplete/_autocomplete-theme.scss
+++ b/src/lib/autocomplete/_autocomplete-theme.scss
@@ -8,14 +8,15 @@
     background: mat-color($background, card);
     color: mat-color($foreground, text);
 
-    .mat-option {
-      // Selected options in autocompletes should not be gray, but we
-      // only want to override the background for selected options if
-      // they are *not* in hover or focus state. This change has to be
-      // made here because base option styles are shared between the
-      // autocomplete and the select.
-      &.mat-selected:not(.mat-active):not(:hover) {
-        background: mat-color($background, card);
+    // Selected options in autocompletes should not be gray, but we
+    // only want to override the background for selected options if
+    // they are *not* in hover or focus state. This change has to be
+    // made here because base option styles are shared between the
+    // autocomplete and the select.
+    .mat-option.mat-selected:not(.mat-active):not(:hover) {
+      background: mat-color($background, card);
+
+      &:not(.mat-option-disabled) {
         color: mat-color($foreground, text);
       }
     }
diff --git a/src/lib/core/option/_option-theme.scss b/src/lib/core/option/_option-theme.scss
index 6a2a0fdb2587..0c423048b005 100644
--- a/src/lib/core/option/_option-theme.scss
+++ b/src/lib/core/option/_option-theme.scss
@@ -12,24 +12,25 @@
   .mat-option {
     color: mat-color($foreground, text);
 
-    &:hover:not(.mat-option-disabled), &:focus:not(.mat-option-disabled) {
+    &:hover:not(.mat-option-disabled),
+    &:focus:not(.mat-option-disabled) {
       background: mat-color($background, hover);
     }
 
-    .mat-primary &.mat-selected {
+    .mat-primary &.mat-selected:not(.mat-option-disabled) {
       color: mat-color($primary);
     }
 
-    .mat-accent &.mat-selected {
+    .mat-accent &.mat-selected:not(.mat-option-disabled) {
       color: mat-color($accent);
     }
 
-    .mat-warn &.mat-selected {
+    .mat-warn &.mat-selected:not(.mat-option-disabled) {
       color: mat-color($warn);
     }
 
     // In multiple mode there is a checkbox to show that the option is selected.
-    &.mat-selected:not(.mat-option-multiple) {
+    &.mat-selected:not(.mat-option-multiple):not(.mat-option-disabled) {
       background: mat-color($background, hover);
     }
 
diff --git a/src/lib/core/option/option.html b/src/lib/core/option/option.html
index 4ed75942756d..9b5b23e354b2 100644
--- a/src/lib/core/option/option.html
+++ b/src/lib/core/option/option.html
@@ -1,8 +1,8 @@
 <span [ngSwitch]="_isCompatibilityMode" *ngIf="multiple">
   <mat-pseudo-checkbox class="mat-option-pseudo-checkbox" *ngSwitchCase="true"
-      [state]="selected ? 'checked' : ''"></mat-pseudo-checkbox>
+      [state]="selected ? 'checked' : ''" [disabled]="disabled"></mat-pseudo-checkbox>
   <md-pseudo-checkbox class="mat-option-pseudo-checkbox" *ngSwitchDefault
-      [state]="selected ? 'checked' : ''"></md-pseudo-checkbox>
+      [state]="selected ? 'checked' : ''" [disabled]="disabled"></md-pseudo-checkbox>
 </span>
 
 <ng-content></ng-content>

From 28ede304fb82d8589ccb375fd656a9dd7ced7008 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 1 Sep 2017 17:05:46 +0200
Subject: [PATCH 021/575] build: stricter unused variable checking (#6633)

Currently only variables that don't start with an underscore will be checked by TSLint.

This doesn't make sense, because variables get prefixed with an underscore to indicate that they are not part of the public API, but still need to be public in favor of AOT compilation for example. This means that those properties are having the public modifier set (explicitly or automatically) and therefore won't be treated as unused anyway.

**TL;DR**: With this change, prefixed variables will be checked by the `no-unused-variable` TSLint rule and those which are marked as `private` and are unused will be catched by TSLint.
---
 src/cdk/overlay/position/connected-position-strategy.ts  | 6 +++---
 src/cdk/overlay/position/overlay-position-builder.ts     | 2 +-
 src/cdk/rxjs/rx-operators.ts                             | 3 ++-
 src/lib/dialog/dialog-container.ts                       | 2 --
 src/lib/dialog/dialog.ts                                 | 6 +++---
 src/lib/expansion/expansion-panel-header.ts              | 4 ++--
 src/lib/paginator/paginator.spec.ts                      | 4 +---
 src/lib/select/select.ts                                 | 1 -
 src/lib/slide-toggle/slide-toggle.ts                     | 6 +++---
 src/lib/tabs/tab-header.spec.ts                          | 4 ++--
 src/lib/tooltip/tooltip.ts                               | 6 +++---
 tools/screenshot-test/src/app/viewer/viewer.component.ts | 6 +++---
 tslint.json                                              | 2 +-
 13 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 101e8c23bdf3..19dc0c761597 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -72,12 +72,12 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   }
 
   constructor(
+      originPos: OriginConnectionPosition,
+      overlayPos: OverlayConnectionPosition,
       private _connectedTo: ElementRef,
-      private _originPos: OriginConnectionPosition,
-      private _overlayPos: OverlayConnectionPosition,
       private _viewportRuler: ViewportRuler) {
     this._origin = this._connectedTo.nativeElement;
-    this.withFallbackPosition(_originPos, _overlayPos);
+    this.withFallbackPosition(originPos, overlayPos);
   }
 
   /** Ordered list of preferred positions, from most to least desirable. */
diff --git a/src/cdk/overlay/position/overlay-position-builder.ts b/src/cdk/overlay/position/overlay-position-builder.ts
index 1ce90297093d..58e2d44dc2e4 100644
--- a/src/cdk/overlay/position/overlay-position-builder.ts
+++ b/src/cdk/overlay/position/overlay-position-builder.ts
@@ -36,6 +36,6 @@ export class OverlayPositionBuilder {
       elementRef: ElementRef,
       originPos: OriginConnectionPosition,
       overlayPos: OverlayConnectionPosition): ConnectedPositionStrategy {
-    return new ConnectedPositionStrategy(elementRef, originPos, overlayPos, this._viewportRuler);
+    return new ConnectedPositionStrategy(originPos, overlayPos, elementRef, this._viewportRuler);
   }
 }
diff --git a/src/cdk/rxjs/rx-operators.ts b/src/cdk/rxjs/rx-operators.ts
index a404ac2a47a1..ba0c07f96e03 100644
--- a/src/cdk/rxjs/rx-operators.ts
+++ b/src/cdk/rxjs/rx-operators.ts
@@ -76,7 +76,7 @@ export interface StrictRxChain<T> {
   result(): Observable<T>;
 }
 
-
+/* tslint:disable:no-unused-variable */
 export class FinallyBrand { private _; }
 export class CatchBrand { private _; }
 export class DoBrand { private _; }
@@ -89,6 +89,7 @@ export class StartWithBrand { private _; }
 export class DebounceTimeBrand { private _; }
 export class AuditTimeBrand { private _; }
 export class TakeUntilBrand { private _; }
+/* tslint:enable:no-unused-variable */
 
 
 export type finallyOperatorType<T> = typeof _finallyOperator & FinallyBrand;
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 83bc4a1d8c73..40e48f3c4e05 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -13,7 +13,6 @@ import {
   EmbeddedViewRef,
   EventEmitter,
   Inject,
-  NgZone,
   Optional,
   ChangeDetectorRef,
   ViewChild,
@@ -100,7 +99,6 @@ export class MdDialogContainer extends BasePortalHost {
   _isAnimating = false;
 
   constructor(
-    private _ngZone: NgZone,
     private _elementRef: ElementRef,
     private _focusTrapFactory: FocusTrapFactory,
     private _changeDetectorRef: ChangeDetectorRef,
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 1d920f0072f2..784459779bb8 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -96,15 +96,15 @@ export class MdDialog {
   constructor(
       private _overlay: Overlay,
       private _injector: Injector,
+      @Optional() location: Location,
       @Inject(MD_DIALOG_SCROLL_STRATEGY) private _scrollStrategy,
-      @Optional() private _location: Location,
       @Optional() @SkipSelf() private _parentDialog: MdDialog) {
 
     // Close all of the dialogs when the user goes forwards/backwards in history or when the
     // location hash changes. Note that this usually doesn't include clicking on links (unless
     // the user is using the `HashLocationStrategy`).
-    if (!_parentDialog && _location) {
-      _location.subscribe(() => this.closeAll());
+    if (!_parentDialog && location) {
+      location.subscribe(() => this.closeAll());
     }
   }
 
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 818c30a45f8b..05cc1a2d71b2 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -90,8 +90,8 @@ export class MdExpansionPanelHeader implements OnDestroy {
   private _parentChangeSubscription = Subscription.EMPTY;
 
   constructor(
+    renderer: Renderer2,
     @Host() public panel: MdExpansionPanel,
-    private _renderer: Renderer2,
     private _element: ElementRef,
     private _focusOriginMonitor: FocusOriginMonitor,
     private _changeDetectorRef: ChangeDetectorRef) {
@@ -105,7 +105,7 @@ export class MdExpansionPanelHeader implements OnDestroy {
     )
     .subscribe(() => this._changeDetectorRef.markForCheck());
 
-    _focusOriginMonitor.monitor(_element.nativeElement, _renderer, false);
+    _focusOriginMonitor.monitor(_element.nativeElement, renderer, false);
   }
 
   /** Height of the header while the panel is expanded. */
diff --git a/src/lib/paginator/paginator.spec.ts b/src/lib/paginator/paginator.spec.ts
index 7686df86a0c5..bf3d9cd96ef0 100644
--- a/src/lib/paginator/paginator.spec.ts
+++ b/src/lib/paginator/paginator.spec.ts
@@ -1,7 +1,7 @@
 import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {MdPaginatorModule} from './index';
 import {MdPaginator, PageEvent} from './paginator';
-import {Component, ElementRef, ViewChild} from '@angular/core';
+import {Component, ViewChild} from '@angular/core';
 import {MdPaginatorIntl} from './paginator-intl';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {dispatchMouseEvent} from '@angular/cdk/testing';
@@ -281,8 +281,6 @@ class MdPaginatorApp {
 
   @ViewChild(MdPaginator) mdPaginator: MdPaginator;
 
-  constructor(private _elementRef: ElementRef) { }
-
   goToLastPage() {
     this.pageIndex = Math.ceil(this.length / this.pageSize);
   }
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 97730a267f59..26b825faf491 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -428,7 +428,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   constructor(
     private _viewportRuler: ViewportRuler,
     private _changeDetectorRef: ChangeDetectorRef,
-    private _overlay: Overlay,
     private _platform: Platform,
     renderer: Renderer2,
     elementRef: ElementRef,
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 07b4e69bf613..28c4eaf07424 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -301,12 +301,12 @@ class SlideToggleRenderer {
   /** Whether the thumb is currently being dragged. */
   dragging: boolean = false;
 
-  constructor(private _elementRef: ElementRef, platform: Platform) {
+  constructor(elementRef: ElementRef, platform: Platform) {
     // We only need to interact with these elements when we're on the browser, so only grab
     // the reference in that case.
     if (platform.isBrowser) {
-      this._thumbEl = _elementRef.nativeElement.querySelector('.mat-slide-toggle-thumb-container');
-      this._thumbBarEl = _elementRef.nativeElement.querySelector('.mat-slide-toggle-bar');
+      this._thumbEl = elementRef.nativeElement.querySelector('.mat-slide-toggle-thumb-container');
+      this._thumbBarEl = elementRef.nativeElement.querySelector('.mat-slide-toggle-bar');
     }
   }
 
diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index 7d9ff9443073..64239dfc60a2 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -1,7 +1,7 @@
 import {
   async, ComponentFixture, TestBed, fakeAsync, tick, discardPeriodicTasks
 } from '@angular/core/testing';
-import {Component, ViewChild, ViewContainerRef} from '@angular/core';
+import {Component, ViewChild} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {By} from '@angular/platform-browser';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
@@ -328,7 +328,7 @@ class SimpleTabHeaderApp {
 
   @ViewChild(MdTabHeader) mdTabHeader: MdTabHeader;
 
-  constructor(private _viewContainerRef: ViewContainerRef) {
+  constructor() {
     this.tabs[this.disabledTabIndex].disabled = true;
   }
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 1a4f1d699afe..0defc0add497 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -197,12 +197,12 @@ export class MdTooltip implements OnDestroy {
   private _leaveListener: Function;
 
   constructor(
+    renderer: Renderer2,
     private _overlay: Overlay,
     private _elementRef: ElementRef,
     private _scrollDispatcher: ScrollDispatcher,
     private _viewContainerRef: ViewContainerRef,
     private _ngZone: NgZone,
-    private _renderer: Renderer2,
     private _platform: Platform,
     @Inject(MD_TOOLTIP_SCROLL_STRATEGY) private _scrollStrategy,
     @Optional() private _dir: Directionality) {
@@ -211,9 +211,9 @@ export class MdTooltip implements OnDestroy {
     // they can prevent the first tap from firing its click event.
     if (!_platform.IOS) {
       this._enterListener =
-        _renderer.listen(_elementRef.nativeElement, 'mouseenter', () => this.show());
+        renderer.listen(_elementRef.nativeElement, 'mouseenter', () => this.show());
       this._leaveListener =
-        _renderer.listen(_elementRef.nativeElement, 'mouseleave', () => this.hide());
+        renderer.listen(_elementRef.nativeElement, 'mouseleave', () => this.hide());
     }
   }
 
diff --git a/tools/screenshot-test/src/app/viewer/viewer.component.ts b/tools/screenshot-test/src/app/viewer/viewer.component.ts
index 71ce327bd180..68f159aceac4 100644
--- a/tools/screenshot-test/src/app/viewer/viewer.component.ts
+++ b/tools/screenshot-test/src/app/viewer/viewer.component.ts
@@ -38,9 +38,9 @@ export class ViewerComponent {
   }
 
   constructor(private _service: FirebaseService,
-              private _route: ActivatedRoute,
-              public snackBar: MdSnackBar) {
-    _route.params.subscribe(p => {
+              public snackBar: MdSnackBar,
+              activatedRoute: ActivatedRoute) {
+    activatedRoute.params.subscribe(p => {
       this._service.prNumber = p['id'];
     });
   }
diff --git a/tslint.json b/tslint.json
index a1907e04ecb0..911ffe3cf7a6 100644
--- a/tslint.json
+++ b/tslint.json
@@ -29,7 +29,7 @@
     "no-var-keyword": true,
     "member-access": [true, "no-public"],
     "no-debugger": true,
-    "no-unused-variable": [true, {"ignore-pattern": "^_"}],
+    "no-unused-variable": true,
     "one-line": [
       true,
       "check-catch",

From 21c68ad95e4186a2b34b3e943daa693b74a19027 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:07:05 +0200
Subject: [PATCH 022/575] fix(expansion-panel): dark theme header hover color
 (#6616)

Fixes the expansion panel header hover effect not being disabled for dark themes.
---
 src/lib/expansion/_expansion-theme.scss | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lib/expansion/_expansion-theme.scss b/src/lib/expansion/_expansion-theme.scss
index 75e2b528bc3b..0a0a713444bf 100644
--- a/src/lib/expansion/_expansion-theme.scss
+++ b/src/lib/expansion/_expansion-theme.scss
@@ -15,11 +15,13 @@
     border-top-color: mat-color($foreground, divider);
   }
 
-  .mat-expansion-panel-header:not([aria-disabled='true']) {
-    &.cdk-keyboard-focused,
-    &.cdk-program-focused,
-    &:hover {
-      background: mat-color($background, hover);
+  .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header {
+    &:not([aria-disabled='true']) {
+      &.cdk-keyboard-focused,
+      &.cdk-program-focused,
+      &:hover {
+        background: mat-color($background, hover);
+      }
     }
   }
 

From fe37cb2551929844d5467e1b9bf45032df35981f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:07:35 +0200
Subject: [PATCH 023/575] refactor(overlay): allow for object to be passed to
 the OverlayState constructor (#6615)

Allows for a config object to be passed to the `OverlayState` constructor. This makes the longer configurations a bit more convenient to use.
---
 src/cdk/overlay/overlay-directives.ts         | 13 ++++++------
 src/cdk/overlay/overlay-ref.ts                | 19 +++++++++++++----
 src/cdk/overlay/overlay-state.ts              | 10 +++++++--
 src/cdk/overlay/overlay.spec.ts               | 18 ++++++----------
 .../scroll/block-scroll-strategy.spec.ts      |  3 +--
 .../scroll/close-scroll-strategy.spec.ts      |  3 +--
 .../scroll/reposition-scroll-strategy.spec.ts |  3 +--
 src/cdk/overlay/scroll/scroll-strategy.md     |  5 +++--
 src/demo-app/overlay/overlay-demo.ts          | 21 +++++++------------
 src/lib/autocomplete/autocomplete-trigger.ts  | 12 +++++------
 src/lib/datepicker/datepicker.ts              | 13 ++++++------
 src/lib/dialog/dialog.ts                      | 18 +++++++++-------
 src/lib/menu/menu-trigger.ts                  | 14 ++++++-------
 src/lib/snack-bar/snack-bar.ts                |  8 ++++---
 src/lib/tooltip/tooltip.ts                    | 18 ++++++++--------
 15 files changed, 93 insertions(+), 85 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index fdceb1dca129..76bfe87d841c 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -272,7 +272,12 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
 
   /** Builds the overlay config based on the directive's inputs */
   private _buildConfig(): OverlayState {
-    let overlayConfig = new OverlayState();
+    const positionStrategy = this._position = this._createPositionStrategy();
+    const overlayConfig = new OverlayState({
+      positionStrategy,
+      scrollStrategy: this.scrollStrategy,
+      hasBackdrop: this.hasBackdrop
+    });
 
     if (this.width || this.width === 0) {
       overlayConfig.width = this.width;
@@ -290,16 +295,10 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
       overlayConfig.minHeight = this.minHeight;
     }
 
-    overlayConfig.hasBackdrop = this.hasBackdrop;
-
     if (this.backdropClass) {
       overlayConfig.backdropClass = this.backdropClass;
     }
 
-    this._position = this._createPositionStrategy() as ConnectedPositionStrategy;
-    overlayConfig.positionStrategy = this._position;
-    overlayConfig.scrollStrategy = this.scrollStrategy;
-
     return overlayConfig;
   }
 
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 765187848ec4..352485df4203 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -29,7 +29,9 @@ export class OverlayRef implements PortalHost {
       private _state: OverlayState,
       private _ngZone: NgZone) {
 
-    _state.scrollStrategy.attach(this);
+    if (_state.scrollStrategy) {
+      _state.scrollStrategy.attach(this);
+    }
   }
 
   /** The overlay's HTML element */
@@ -54,7 +56,10 @@ export class OverlayRef implements PortalHost {
     this.updateSize();
     this.updateDirection();
     this.updatePosition();
-    this._state.scrollStrategy.enable();
+
+    if (this._state.scrollStrategy) {
+      this._state.scrollStrategy.enable();
+    }
 
     // Enable pointer events for the overlay pane element.
     this._togglePointerEvents(true);
@@ -89,7 +94,10 @@ export class OverlayRef implements PortalHost {
     // This is necessary because otherwise the pane element will cover the page and disable
     // pointer events therefore. Depends on the position strategy and the applied pane boundaries.
     this._togglePointerEvents(false);
-    this._state.scrollStrategy.disable();
+
+    if (this._state.scrollStrategy) {
+      this._state.scrollStrategy.disable();
+    }
 
     let detachmentResult = this._portalHost.detach();
 
@@ -107,7 +115,10 @@ export class OverlayRef implements PortalHost {
       this._state.positionStrategy.dispose();
     }
 
-    this._state.scrollStrategy.disable();
+    if (this._state.scrollStrategy) {
+      this._state.scrollStrategy.disable();
+    }
+
     this.detachBackdrop();
     this._portalHost.dispose();
     this._attachments.complete();
diff --git a/src/cdk/overlay/overlay-state.ts b/src/cdk/overlay/overlay-state.ts
index faba40d05881..702468b90315 100644
--- a/src/cdk/overlay/overlay-state.ts
+++ b/src/cdk/overlay/overlay-state.ts
@@ -18,10 +18,10 @@ import {NoopScrollStrategy} from './scroll/noop-scroll-strategy';
  */
 export class OverlayState {
   /** Strategy with which to position the overlay. */
-  positionStrategy: PositionStrategy;
+  positionStrategy?: PositionStrategy;
 
   /** Strategy to be used when handling scroll events while the overlay is open. */
-  scrollStrategy: ScrollStrategy = new NoopScrollStrategy();
+  scrollStrategy?: ScrollStrategy = new NoopScrollStrategy();
 
   /** Custom class to add to the overlay pane. */
   panelClass?: string | string[] = '';
@@ -53,6 +53,12 @@ export class OverlayState {
   /** The direction of the text in the overlay panel. */
   direction?: Direction = 'ltr';
 
+  constructor(state?: OverlayState) {
+    if (state) {
+      Object.keys(state).forEach(key => this[key] = state[key]);
+    }
+  }
+
   // TODO(jelbourn): configuration still to add
   // - focus trap
   // - disable pointer events
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index f5551047e967..8b1e3c4e2120 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -133,8 +133,7 @@ describe('Overlay', () => {
   });
 
   it('should set the direction', () => {
-    const state = new OverlayState();
-    state.direction = 'rtl';
+    const state = new OverlayState({direction: 'rtl'});
 
     overlay.create(state).attach(componentPortal);
 
@@ -153,10 +152,7 @@ describe('Overlay', () => {
   });
 
   it('should emit the attachment event after everything is added to the DOM', () => {
-    let state = new OverlayState();
-
-    state.hasBackdrop = true;
-
+    let state = new OverlayState({hasBackdrop: true});
     let overlayRef = overlay.create(state);
 
     overlayRef.attachments().subscribe(() => {
@@ -415,9 +411,8 @@ describe('Overlay', () => {
 
   describe('panelClass', () => {
     it('should apply a custom overlay pane class', () => {
-      const config = new OverlayState();
+      const config = new OverlayState({panelClass: 'custom-panel-class'});
 
-      config.panelClass = 'custom-panel-class';
       overlay.create(config).attach(componentPortal);
       viewContainerFixture.detectChanges();
 
@@ -426,9 +421,8 @@ describe('Overlay', () => {
     });
 
     it('should be able to apply multiple classes', () => {
-      const config = new OverlayState();
+      const config = new OverlayState({panelClass: ['custom-class-one', 'custom-class-two']});
 
-      config.panelClass = ['custom-class-one', 'custom-class-two'];
       overlay.create(config).attach(componentPortal);
       viewContainerFixture.detectChanges();
 
@@ -445,8 +439,8 @@ describe('Overlay', () => {
     let overlayRef: OverlayRef;
 
     beforeEach(() => {
-      config = new OverlayState();
-      fakeScrollStrategy = config.scrollStrategy = new FakeScrollStrategy();
+      fakeScrollStrategy = new FakeScrollStrategy();
+      config = new OverlayState({scrollStrategy: fakeScrollStrategy});
       overlayRef = overlay.create(config);
     });
 
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
index 2be0acd12f7a..b7eefac45c2e 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
@@ -23,9 +23,8 @@ describe('BlockScrollStrategy', () => {
   }));
 
   beforeEach(inject([Overlay, ViewportRuler], (overlay: Overlay, viewportRuler: ViewportRuler) => {
-    let overlayState = new OverlayState();
+    let overlayState = new OverlayState({scrollStrategy: overlay.scrollStrategies.block()});
 
-    overlayState.scrollStrategy = overlay.scrollStrategies.block();
     overlayRef = overlay.create(overlayState);
     componentPortal = new ComponentPortal(FocacciaMsg);
 
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
index 2fc805efe390..d2b686eb4e95 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
@@ -33,8 +33,7 @@ describe('CloseScrollStrategy', () => {
   }));
 
   beforeEach(inject([Overlay], (overlay: Overlay) => {
-    let overlayState = new OverlayState();
-    overlayState.scrollStrategy = overlay.scrollStrategies.close();
+    let overlayState = new OverlayState({scrollStrategy: overlay.scrollStrategies.close()});
     overlayRef = overlay.create(overlayState);
     componentPortal = new ComponentPortal(MozarellaMsg);
   }));
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
index 01e60314262c..9405f3752855 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
@@ -33,8 +33,7 @@ describe('RepositionScrollStrategy', () => {
   }));
 
   beforeEach(inject([Overlay], (overlay: Overlay) => {
-    let overlayState = new OverlayState();
-    overlayState.scrollStrategy = overlay.scrollStrategies.reposition();
+    let overlayState = new OverlayState({scrollStrategy: overlay.scrollStrategies.reposition()});
     overlayRef = overlay.create(overlayState);
     componentPortal = new ComponentPortal(PastaMsg);
   }));
diff --git a/src/cdk/overlay/scroll/scroll-strategy.md b/src/cdk/overlay/scroll/scroll-strategy.md
index b39772b0b431..72d912d1cec2 100644
--- a/src/cdk/overlay/scroll/scroll-strategy.md
+++ b/src/cdk/overlay/scroll/scroll-strategy.md
@@ -11,9 +11,10 @@ scroll strategy, to the `OverlayState`. By default, all overlays will use the `n
 doesn't do anything. The other available strategies are `reposition`, `block` and `close`:
 
 ```ts
-let overlayState = new OverlayState();
+let overlayState = new OverlayState({
+  scrollStrategy: overlay.scrollStrategies.block()
+});
 
-overlayState.scrollStrategy = overlay.scrollStrategies.block();
 this._overlay.create(overlayState).attach(yourPortal);
 ```
 
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index d084959cd9cc..bc925ee82757 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -74,10 +74,9 @@ export class OverlayDemo {
             {originX: 'start', originY: 'bottom'},
             {overlayX: 'start', overlayY: 'top'} );
 
-    let config = new OverlayState();
-    config.positionStrategy = strategy;
-
+    let config = new OverlayState({positionStrategy: strategy});
     let overlayRef = this.overlay.create(config);
+
     overlayRef.attach(new ComponentPortal(SpagettiPanel, this.viewContainerRef));
   }
 
@@ -88,22 +87,18 @@ export class OverlayDemo {
             {originX: 'start', originY: 'bottom'},
             {overlayX: 'end', overlayY: 'top'} );
 
-    let config = new OverlayState();
-    config.positionStrategy = strategy;
-
+    let config = new OverlayState({positionStrategy: strategy});
     let overlayRef = this.overlay.create(config);
 
     overlayRef.attach(this.tortelliniTemplate);
   }
 
   openPanelWithBackdrop() {
-    let config = new OverlayState();
-
-    config.positionStrategy = this.overlay.position()
-      .global()
-      .centerHorizontally();
-    config.hasBackdrop = true;
-    config.backdropClass = 'cdk-overlay-transparent-backdrop';
+    let config = new OverlayState({
+      hasBackdrop: true,
+      backdropClass: 'cdk-overlay-transparent-backdrop',
+      positionStrategy: this.overlay.position().global().centerHorizontally()
+    });
 
     let overlayRef = this.overlay.create(config);
     overlayRef.attach(this.templatePortals.first);
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index ade59b533b37..bbc97e958339 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -468,12 +468,12 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   }
 
   private _getOverlayConfig(): OverlayState {
-    const overlayState = new OverlayState();
-    overlayState.positionStrategy = this._getOverlayPosition();
-    overlayState.width = this._getHostWidth();
-    overlayState.direction = this._dir ? this._dir.value : 'ltr';
-    overlayState.scrollStrategy = this._scrollStrategy();
-    return overlayState;
+    return new OverlayState({
+      positionStrategy: this._getOverlayPosition(),
+      scrollStrategy: this._scrollStrategy(),
+      width: this._getHostWidth(),
+      direction: this._dir ? this._dir.value : 'ltr'
+    });
   }
 
   private _getOverlayPosition(): PositionStrategy {
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 9312ba22e3e4..7f8ed7d49bf6 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -321,12 +321,13 @@ export class MdDatepicker<D> implements OnDestroy {
 
   /** Create the popup. */
   private _createPopup(): void {
-    const overlayState = new OverlayState();
-    overlayState.positionStrategy = this._createPopupPositionStrategy();
-    overlayState.hasBackdrop = true;
-    overlayState.backdropClass = 'md-overlay-transparent-backdrop';
-    overlayState.direction = this._dir ? this._dir.value : 'ltr';
-    overlayState.scrollStrategy = this._scrollStrategy();
+    const overlayState = new OverlayState({
+      positionStrategy: this._createPopupPositionStrategy(),
+      hasBackdrop: true,
+      backdropClass: 'md-overlay-transparent-backdrop',
+      direction: this._dir ? this._dir.value : 'ltr',
+      scrollStrategy: this._scrollStrategy()
+    });
 
     this._popupRef = this._overlay.create(overlayState);
   }
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 784459779bb8..a398f3dde736 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -186,17 +186,19 @@ export class MdDialog {
    * @returns The overlay configuration.
    */
   private _getOverlayState(dialogConfig: MdDialogConfig): OverlayState {
-    const overlayState = new OverlayState();
-    overlayState.panelClass = dialogConfig.panelClass;
-    overlayState.hasBackdrop = dialogConfig.hasBackdrop;
-    overlayState.scrollStrategy = this._scrollStrategy();
-    overlayState.direction = dialogConfig.direction;
+    const state = new OverlayState({
+      positionStrategy: this._overlay.position().global(),
+      scrollStrategy: this._scrollStrategy(),
+      panelClass: dialogConfig.panelClass,
+      hasBackdrop: dialogConfig.hasBackdrop,
+      direction: dialogConfig.direction
+    });
+
     if (dialogConfig.backdropClass) {
-      overlayState.backdropClass = dialogConfig.backdropClass;
+      state.backdropClass = dialogConfig.backdropClass;
     }
-    overlayState.positionStrategy = this._overlay.position().global();
 
-    return overlayState;
+    return state;
   }
 
   /**
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index db95674e750f..045b872296e6 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -322,13 +322,13 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
    * @returns OverlayState
    */
   private _getOverlayConfig(): OverlayState {
-    const overlayState = new OverlayState();
-    overlayState.positionStrategy = this._getPosition();
-    overlayState.hasBackdrop = !this.triggersSubmenu();
-    overlayState.backdropClass = 'cdk-overlay-transparent-backdrop';
-    overlayState.direction = this.dir;
-    overlayState.scrollStrategy = this._scrollStrategy();
-    return overlayState;
+    return new OverlayState({
+      positionStrategy: this._getPosition(),
+      hasBackdrop: !this.triggersSubmenu(),
+      backdropClass: 'cdk-overlay-transparent-backdrop',
+      direction: this.dir,
+      scrollStrategy: this._scrollStrategy()
+    });
   }
 
   /**
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 6f182f8f5d8a..8c2b89799024 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -153,9 +153,11 @@ export class MdSnackBar {
    * @param config The user-specified snack bar config.
    */
   private _createOverlay(config: MdSnackBarConfig): OverlayRef {
-    const state = new OverlayState();
-    state.direction = config.direction;
-    state.positionStrategy = this._overlay.position().global().centerHorizontally().bottom('0');
+    const state = new OverlayState({
+      direction: config.direction,
+      positionStrategy: this._overlay.position().global().centerHorizontally().bottom('0')
+    });
+
     return this._overlay.create(state);
   }
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 0defc0add497..29a89a81c880 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -279,13 +279,13 @@ export class MdTooltip implements OnDestroy {
 
   /** Create the overlay config and position strategy */
   private _createOverlay(): OverlayRef {
-    let origin = this._getOrigin();
-    let position = this._getOverlayPosition();
+    const origin = this._getOrigin();
+    const position = this._getOverlayPosition();
 
     // Create connected position strategy that listens for scroll events to reposition.
     // After position changes occur and the overlay is clipped by a parent scrollable then
     // close the tooltip.
-    let strategy = this._overlay.position().connectedTo(this._elementRef, origin, position);
+    const strategy = this._overlay.position().connectedTo(this._elementRef, origin, position);
     strategy.withScrollableContainers(this._scrollDispatcher.getScrollContainers(this._elementRef));
     strategy.onPositionChange.subscribe(change => {
       if (change.scrollableViewProperties.isOverlayClipped &&
@@ -294,12 +294,12 @@ export class MdTooltip implements OnDestroy {
       }
     });
 
-    let config = new OverlayState();
-
-    config.direction = this._dir ? this._dir.value : 'ltr';
-    config.positionStrategy = strategy;
-    config.panelClass = TOOLTIP_PANEL_CLASS;
-    config.scrollStrategy = this._scrollStrategy();
+    const config = new OverlayState({
+      direction: this._dir ? this._dir.value : 'ltr',
+      positionStrategy: strategy,
+      panelClass: TOOLTIP_PANEL_CLASS,
+      scrollStrategy: this._scrollStrategy()
+    });
 
     this._overlayRef = this._overlay.create(config);
 

From 8f9f3c8fca2c7e046186772de848de693729c0d4 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 1 Sep 2017 17:08:02 +0200
Subject: [PATCH 024/575] fix(slide-toggle): support native tabindex attribute
 (#6613)

Currently the slide-toggle only allows changing the tabIndex using the `tabIndex` binding. Using the native `tabindex` attribute doesn't have any affect. With this change the native tabindex property will be respected.

References #6465
---
 .../core/common-behaviors/tabindex.spec.ts    | 48 +++++++++++++++++++
 src/lib/core/common-behaviors/tabindex.ts     | 34 +++++++++++++
 src/lib/select/select.ts                      | 22 +++------
 src/lib/slide-toggle/slide-toggle.spec.ts     | 19 +++++++-
 src/lib/slide-toggle/slide-toggle.ts          | 16 ++++---
 5 files changed, 115 insertions(+), 24 deletions(-)
 create mode 100644 src/lib/core/common-behaviors/tabindex.spec.ts
 create mode 100644 src/lib/core/common-behaviors/tabindex.ts

diff --git a/src/lib/core/common-behaviors/tabindex.spec.ts b/src/lib/core/common-behaviors/tabindex.spec.ts
new file mode 100644
index 000000000000..d796d1670bd1
--- /dev/null
+++ b/src/lib/core/common-behaviors/tabindex.spec.ts
@@ -0,0 +1,48 @@
+import {mixinTabIndex} from './tabindex';
+
+describe('mixinTabIndex', () => {
+
+  it('should augment an existing class with a tabIndex property', () => {
+    const classWithMixin = mixinTabIndex(TestClass);
+    const instance = new classWithMixin();
+
+    expect(instance.tabIndex)
+      .toBe(0, 'Expected the mixed-into class to have a tabIndex property');
+
+    instance.tabIndex = 4;
+
+    expect(instance.tabIndex)
+      .toBe(4, 'Expected the mixed-into class to have an updated tabIndex property');
+  });
+
+  it('should set tabIndex to `-1` if the disabled property is set to true', () => {
+    const classWithMixin = mixinTabIndex(TestClass);
+    const instance = new classWithMixin();
+
+    expect(instance.tabIndex)
+      .toBe(0, 'Expected tabIndex to be set to 0 initially');
+
+    instance.disabled = true;
+
+    expect(instance.tabIndex)
+      .toBe(-1, 'Expected tabIndex to be set to -1 if the disabled property is set to true');
+  });
+
+  it('should allow having a custom default tabIndex value', () => {
+    const classWithMixin = mixinTabIndex(TestClass, 20);
+    const instance = new classWithMixin();
+
+    expect(instance.tabIndex)
+      .toBe(20, 'Expected tabIndex to be set to 20 initially');
+
+    instance.tabIndex = 0;
+
+    expect(instance.tabIndex)
+      .toBe(0, 'Expected tabIndex to still support 0 as value');
+  });
+
+});
+
+class TestClass {
+  disabled = false;
+}
diff --git a/src/lib/core/common-behaviors/tabindex.ts b/src/lib/core/common-behaviors/tabindex.ts
new file mode 100644
index 000000000000..a2efb44b3994
--- /dev/null
+++ b/src/lib/core/common-behaviors/tabindex.ts
@@ -0,0 +1,34 @@
+/**
+ * @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 {Constructor} from './constructor';
+import {CanDisable} from './disabled';
+
+/** @docs-private */
+export interface HasTabIndex {
+  tabIndex: number;
+}
+
+/** Mixin to augment a directive with a `tabIndex` property. */
+export function mixinTabIndex<T extends Constructor<CanDisable>>(base: T, defaultTabIndex = 0)
+    : Constructor<HasTabIndex> & T {
+  return class extends base {
+    private _tabIndex: number = defaultTabIndex;
+
+    get tabIndex(): number { return this.disabled ? -1 : this._tabIndex; }
+    set tabIndex(value: number) {
+      // If the specified tabIndex value is null or undefined, fall back to the default value.
+      this._tabIndex = value != null ? value : defaultTabIndex;
+    }
+
+    constructor(...args: any[]) {
+      super(...args);
+    }
+  };
+}
+
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 26b825faf491..8e6f4695ffe7 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -66,6 +66,7 @@ import {
   PlaceholderOptions
 } from '../core/placeholder/placeholder-options';
 import {Platform} from '@angular/cdk/platform';
+import {HasTabIndex, mixinTabIndex} from '../core/common-behaviors/tabindex';
 
 /**
  * The following style constants are necessary to save here in order
@@ -155,7 +156,8 @@ export class MdSelectChange {
 export class MdSelectBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdSelectMixinBase = mixinColor(mixinDisabled(MdSelectBase), 'primary');
+export const _MdSelectMixinBase =
+  mixinTabIndex(mixinColor(mixinDisabled(MdSelectBase), 'primary'));
 
 
 /**
@@ -172,7 +174,7 @@ export class MdSelectTrigger {}
   selector: 'md-select, mat-select',
   templateUrl: 'select.html',
   styleUrls: ['select.css'],
-  inputs: ['color', 'disabled'],
+  inputs: ['color', 'disabled', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
@@ -200,7 +202,7 @@ export class MdSelectTrigger {}
   exportAs: 'mdSelect',
 })
 export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
-    ControlValueAccessor, CanColor, CanDisable {
+    ControlValueAccessor, CanColor, CanDisable, HasTabIndex {
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
@@ -234,9 +236,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   /** The animation state of the placeholder. */
   private _placeholderState = '';
 
-  /** Tab index for the element. */
-  private _tabIndex: number;
-
   /** Deals with configuring placeholder options */
   private _placeholderOptions: PlaceholderOptions;
 
@@ -371,15 +370,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   }
   private _floatPlaceholder: FloatPlaceholderType;
 
-  /** Tab index for the select element. */
-  @Input()
-  get tabIndex(): number { return this.disabled ? -1 : this._tabIndex; }
-  set tabIndex(value: number) {
-    if (typeof value !== 'undefined') {
-      this._tabIndex = value;
-    }
-  }
-
   /** Value of the select control. */
   @Input()
   get value() { return this._value; }
@@ -445,7 +435,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
       this._control.valueAccessor = this;
     }
 
-    this._tabIndex = parseInt(tabIndex) || 0;
+    this.tabIndex = parseInt(tabIndex) || 0;
     this._placeholderOptions = placeholderOptions ? placeholderOptions : {};
     this.floatPlaceholder = this._placeholderOptions.float || 'auto';
   }
diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index eda08374dc12..d8bb973f8b0f 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -16,7 +16,7 @@ describe('MdSlideToggle without forms', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MdSlideToggleModule],
-      declarations: [SlideToggleBasic],
+      declarations: [SlideToggleBasic, SlideToggleWithTabindexAttr],
       providers: [
         {provide: HAMMER_GESTURE_CONFIG, useFactory: () => gestureConfig = new TestGestureConfig()}
       ]
@@ -333,6 +333,18 @@ describe('MdSlideToggle without forms', () => {
 
       expect(fixture.componentInstance.lastEvent).toBeFalsy();
     }));
+
+    it('should be able to set the tabindex via the native attribute', async(() => {
+      const fixture = TestBed.createComponent(SlideToggleWithTabindexAttr);
+
+      fixture.detectChanges();
+
+      const slideToggle = fixture.debugElement
+        .query(By.directive(MdSlideToggle)).componentInstance as MdSlideToggle;
+
+      expect(slideToggle.tabIndex)
+        .toBe(5, 'Expected tabIndex property to have been set based on the native attribute');
+    }));
   });
 
   describe('with dragging', () => {
@@ -789,3 +801,8 @@ class SlideToggleWithModel {
 class SlideToggleWithFormControl {
   formControl = new FormControl();
 }
+
+@Component({
+  template: `<md-slide-toggle tabindex="5"></md-slide-toggle>`
+})
+class SlideToggleWithTabindexAttr {}
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 28c4eaf07424..6de28f90c39f 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -8,6 +8,7 @@
 
 import {
   AfterContentInit,
+  Attribute,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -35,6 +36,7 @@ import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
 import {CanColor, mixinColor} from '../core/common-behaviors/color';
 import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {HasTabIndex, mixinTabIndex} from '../core/common-behaviors/tabindex';
 
 // Increasing integer for generating unique ids for slide-toggle components.
 let nextUniqueId = 0;
@@ -57,7 +59,7 @@ export class MdSlideToggleBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
 export const _MdSlideToggleMixinBase =
-  mixinColor(mixinDisableRipple(mixinDisabled(MdSlideToggleBase)), 'accent');
+  mixinTabIndex(mixinColor(mixinDisableRipple(mixinDisabled(MdSlideToggleBase)), 'accent'));
 
 /** Represents a slidable "switch" toggle that can be moved between on and off. */
 @Component({
@@ -73,12 +75,12 @@ export const _MdSlideToggleMixinBase =
   templateUrl: 'slide-toggle.html',
   styleUrls: ['slide-toggle.css'],
   providers: [MD_SLIDE_TOGGLE_VALUE_ACCESSOR],
-  inputs: ['disabled', 'disableRipple', 'color'],
+  inputs: ['disabled', 'disableRipple', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy, AfterContentInit,
-    ControlValueAccessor, CanDisable, CanColor, CanDisableRipple {
+    ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple {
 
   private onChange = (_: any) => {};
   private onTouched = () => {};
@@ -97,9 +99,6 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
   /** A unique id for the slide-toggle input. If none is supplied, it will be auto-generated. */
   @Input() id: string = this._uniqueId;
 
-  /** Used to specify the tabIndex value for the underlying input element. */
-  @Input() tabIndex: number = 0;
-
   /** Whether the label should appear after or before the slide-toggle. Defaults to 'after' */
   @Input() labelPosition: 'before' | 'after' = 'after';
 
@@ -139,8 +138,11 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
               renderer: Renderer2,
               private _platform: Platform,
               private _focusOriginMonitor: FocusOriginMonitor,
-              private _changeDetectorRef: ChangeDetectorRef) {
+              private _changeDetectorRef: ChangeDetectorRef,
+              @Attribute('tabindex') tabIndex: string) {
     super(renderer, elementRef);
+
+    this.tabIndex = parseInt(tabIndex) || 0;
   }
 
   ngAfterContentInit() {

From ed735a174a402c637aa416a8f5b5cd38caa84bcd Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 1 Sep 2017 08:08:24 -0700
Subject: [PATCH 025/575] chore: add skip navigation link for a11y demo (#6423)

---
 src/demo-app/a11y/a11y.html | 5 ++++-
 src/demo-app/a11y/a11y.ts   | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/demo-app/a11y/a11y.html b/src/demo-app/a11y/a11y.html
index 065ddcc8381a..fefa22fecac3 100644
--- a/src/demo-app/a11y/a11y.html
+++ b/src/demo-app/a11y/a11y.html
@@ -1,9 +1,12 @@
 <h1>Accessibility Demo</h1>
 
 <nav>
+  <a (click)="skipNavigation()" href="javascript:void(0)">Skip navigation</a>
   <a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]">
     {{navItem.name}}
   </a>
 </nav>
 
-<router-outlet></router-outlet>
+<div #maincontent tabindex="0">
+  <router-outlet></router-outlet>
+</div>
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 22c8916bebd3..b70ea21504fc 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from '@angular/core';
+import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
 
 @Component({
   moduleId: module.id,
@@ -15,6 +15,8 @@ export class AccessibilityHome {}
   encapsulation: ViewEncapsulation.None,
 })
 export class AccessibilityDemo {
+  @ViewChild('maincontent') mainContent: ElementRef;
+
   navItems = [
     {name: 'Home', route: '.'},
     {name: 'Autocomplete', route: 'autocomplete'},
@@ -37,4 +39,9 @@ export class AccessibilityDemo {
     {name: 'Select', route: 'select'},
     {name: 'Toolbar', route: 'toolbar'},
   ];
+
+  skipNavigation() {
+    this.mainContent.nativeElement.scrollIntoView();
+    this.mainContent.nativeElement.focus();
+  }
 }

From 4353a4c584431f52b5a2f74e4ddcdab181d9085f Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 1 Sep 2017 08:09:29 -0700
Subject: [PATCH 026/575] demo(progress-bar): Add progress bar accessibility
 demo page (#6339)

---
 src/demo-app/a11y/a11y-module.ts              |  2 ++
 src/demo-app/a11y/a11y.ts                     |  1 +
 .../a11y/progress-bar/progress-bar-a11y.html  | 24 +++++++++++++++++++
 .../a11y/progress-bar/progress-bar-a11y.ts    | 13 ++++++++++
 src/demo-app/a11y/routes.ts                   |  2 ++
 5 files changed, 42 insertions(+)
 create mode 100644 src/demo-app/a11y/progress-bar/progress-bar-a11y.html
 create mode 100644 src/demo-app/a11y/progress-bar/progress-bar-a11y.ts

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index fec683d71a01..67ed60627621 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -27,6 +27,7 @@ import {DatepickerAccessibilityDemo} from './datepicker/datepicker-a11y';
 import {IconAccessibilityDemo} from './icon/icon-a11y';
 import {InputAccessibilityDemo} from './input/input-a11y';
 import {MenuAccessibilityDemo} from './menu/menu-a11y';
+import {ProgressBarAccessibilityDemo} from './progress-bar/progress-bar-a11y';
 import {ProgressSpinnerAccessibilityDemo} from './progress-spinner/progress-spinner-a11y';
 import {SliderAccessibilityDemo} from './slider/slider-a11y';
 import {SlideToggleAccessibilityDemo} from './slide-toggle/slide-toggle-a11y';
@@ -72,6 +73,7 @@ export class AccessibilityRoutingModule {}
     IconAccessibilityDemo,
     InputAccessibilityDemo,
     MenuAccessibilityDemo,
+    ProgressBarAccessibilityDemo,
     ProgressSpinnerAccessibilityDemo,
     RadioAccessibilityDemo,
     ToolbarAccessibilityDemo,
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index b70ea21504fc..7a26c450a2ae 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -31,6 +31,7 @@ export class AccessibilityDemo {
     {name: 'Icon', route: 'icon'},
     {name: 'Input', route: 'input'},
     {name: 'Menu', route: 'menu'},
+    {name: 'Progress bar', route: 'progress-bar'},
     {name: 'Progress spinner', route: 'progress-spinner'},
     {name: 'Radio buttons', route: 'radio'},
     {name: 'Slider', route: 'slider'},
diff --git a/src/demo-app/a11y/progress-bar/progress-bar-a11y.html b/src/demo-app/a11y/progress-bar/progress-bar-a11y.html
new file mode 100644
index 000000000000..60c14531c45d
--- /dev/null
+++ b/src/demo-app/a11y/progress-bar/progress-bar-a11y.html
@@ -0,0 +1,24 @@
+<section>
+  <h2>Survey progress (Determinate progress bar)</h2>
+  <md-progress-bar mode="determinate" [value]="surveyProgress" color="primary"
+                   aria-label="Survey progress">
+  </md-progress-bar>
+</section>
+
+<section>
+  <h2>Video progress (Progress bar with buffer) </h2>
+  <md-progress-bar [value]="videoPlayValue" [bufferValue]="videoBufferValue" mode="buffer"
+                   color="primary" aria-label="Video progress">
+  </md-progress-bar>
+</section>
+
+<section>
+  <h2>Loading content progress (Indeterminate progress bar)</h2>
+    <md-progress-bar mode="indeterminate" color="warn" aria-label="Loading content">
+    </md-progress-bar>
+</section>
+
+<section>
+  <h2>Search progress (Query progress bar)</h2>
+  <md-progress-bar mode="query" color="accent" aria-label="Searching"></md-progress-bar>
+</section>
diff --git a/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts b/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts
new file mode 100644
index 000000000000..38251b9f030a
--- /dev/null
+++ b/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts
@@ -0,0 +1,13 @@
+import {Component} from '@angular/core';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'progress-bar-a11y',
+  templateUrl: 'progress-bar-a11y.html',
+})
+export class ProgressBarAccessibilityDemo {
+  surveyProgress: number = 30;
+  videoPlayValue: number = 20;
+  videoBufferValue: number = 60;
+}
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index 1d40d0cca555..7b011ad2e214 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -14,6 +14,7 @@ import {DatepickerAccessibilityDemo} from './datepicker/datepicker-a11y';
 import {IconAccessibilityDemo} from './icon/icon-a11y';
 import {InputAccessibilityDemo} from './input/input-a11y';
 import {MenuAccessibilityDemo} from './menu/menu-a11y';
+import {ProgressBarAccessibilityDemo} from './progress-bar/progress-bar-a11y';
 import {ProgressSpinnerAccessibilityDemo} from './progress-spinner/progress-spinner-a11y';
 import {SliderAccessibilityDemo} from './slider/slider-a11y';
 import {SlideToggleAccessibilityDemo} from './slide-toggle/slide-toggle-a11y';
@@ -34,6 +35,7 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'icon', component: IconAccessibilityDemo},
   {path: 'input', component: InputAccessibilityDemo},
   {path: 'menu', component: MenuAccessibilityDemo},
+  {path: 'progress-bar', component: ProgressBarAccessibilityDemo},
   {path: 'progress-spinner', component: ProgressSpinnerAccessibilityDemo},
   {path: 'radio', component: RadioAccessibilityDemo},
   {path: 'slider', component: SliderAccessibilityDemo},

From 0f27e5ab6ec926a07ead5ec09a6efeb28dc35ac1 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 1 Sep 2017 08:09:53 -0700
Subject: [PATCH 027/575] demo(button): display snackbar when button is clicked
 (#6327)

---
 src/demo-app/a11y/button/button-a11y.html |  6 +++---
 src/demo-app/a11y/button/button-a11y.ts   | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/demo-app/a11y/button/button-a11y.html b/src/demo-app/a11y/button/button-a11y.html
index 875f983c2175..999a9c1e7b44 100644
--- a/src/demo-app/a11y/button/button-a11y.html
+++ b/src/demo-app/a11y/button/button-a11y.html
@@ -39,9 +39,9 @@ <h2>Anchor elements</h2>
 
   <section>
     <h2>Buttons in different colors</h2>
-    <button md-button color="primary">Primary</button>
-    <button md-button color="accent">Accent</button>
-    <button md-button color="warn">Warn</button>
+    <button md-button color="primary" (click)="openSnackBar('Color is primary.')">Primary</button>
+    <button md-button color="accent" (click)="openSnackBar('Color is accent.')">Accent</button>
+    <button md-button color="warn" (click)="openSnackBar('Color is warn.')">Warn</button>
   </section>
 
   <section>
diff --git a/src/demo-app/a11y/button/button-a11y.ts b/src/demo-app/a11y/button/button-a11y.ts
index 616e8252d548..aab2e3858c75 100644
--- a/src/demo-app/a11y/button/button-a11y.ts
+++ b/src/demo-app/a11y/button/button-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-
+import {MdSnackBar} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -10,7 +10,16 @@ import {Component} from '@angular/core';
 export class ButtonAccessibilityDemo {
   counter: number = 0;
 
+  constructor(public snackBar: MdSnackBar) {}
+
+  openSnackBar(message: string) {
+    this.snackBar.open(message,  '',  {
+      duration: 2000,
+    });
+  }
+
   increase() {
     this.counter++;
+    this.openSnackBar(`Click counter is set to ${this.counter}`);
   }
 }

From cd16ec634ff22e22a3c141515f9283ac44b411a7 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Sep 2017 17:11:24 +0200
Subject: [PATCH 028/575] docs(typography): add note about font-family quotes
 (#6742)

Adds a note to the typography guide about the font-family having to be quoted. It seems like we can't handle this gracefull within the mixin using the built-in `is-string` function from SASS.

Fixes #6668.
---
 guides/typography.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guides/typography.md b/guides/typography.md
index 89ca28cacb72..98263e2d5b6b 100644
--- a/guides/typography.md
+++ b/guides/typography.md
@@ -58,7 +58,7 @@ creating a custom theme, you can create a custom **typography configuration**.
 // Define a custom typography config that overrides the font-family as well as the
 // `headlines` and `body-1` levels.
 $custom-typography: mat-typography-config(
-  $font-family: monospace,
+  $font-family: 'Roboto, monospace',
   $headline: mat-typography-level(32px, 48px, 700),
   $body-1: mat-typography-level(16px, 24px, 500)
 );
@@ -67,7 +67,8 @@ $custom-typography: mat-typography-config(
 As the above example demonstrates, a typography configuration is created by using the
 `mat-typography-config` function, which is given both the font-family and the set of typographic
 levels described earlier. Each typographic level is defined by the `mat-typography-level` function,
-which requires a `font-size`, `line-height`, and `font-weight`.
+which requires a `font-size`, `line-height`, and `font-weight`. **Note** that the `font-family`
+has to be in quotes.
 
 
 Once the custom typography definition is created, it can be consumed to generate styles via

From 1b6b27055168d6b93ad614054f3797eb845fad55 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 1 Sep 2017 08:11:46 -0700
Subject: [PATCH 029/575] =?UTF-8?q?docs(a11y):=20add=20accessibility=20sec?=
 =?UTF-8?q?tions=20to=20datepicker,=20menu,=20slide=20=E2=80=A6=20(#6710)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/datepicker/datepicker.md     | 49 ++++++++++++++++++++++++++++
 src/lib/menu/menu.md                 |  4 +++
 src/lib/slide-toggle/slide-toggle.md |  8 +++++
 src/lib/slider/slider.md             |  4 +++
 src/lib/snack-bar/snack-bar.md       |  5 +++
 src/lib/toolbar/toolbar.md           | 10 ++++++
 6 files changed, 80 insertions(+)

diff --git a/src/lib/datepicker/datepicker.md b/src/lib/datepicker/datepicker.md
index b91d40265db4..47f5a0f22b3b 100644
--- a/src/lib/datepicker/datepicker.md
+++ b/src/lib/datepicker/datepicker.md
@@ -229,3 +229,52 @@ application root module.
 })
 export class MyApp {}
 ```
+### Accessibility
+The `MdDatepickerInput` directive adds `aria-haspopup` attribute to the native input element, and it
+triggers a calendar dialog with `role="dialog"`.
+
+`MdDatepickerIntl` includes strings that are used for `aria-label`s. The datepicker input
+should have a placeholder or be given a meaningful label via `aria-label`, `aria-labelledby` or
+`MdDatepickerIntl`.
+
+#### Keyboard shortcuts
+The keyboard shortcuts to handle datepicker are:
+
+| Shortcut             | Action                              |
+|----------------------|-------------------------------------|
+| `ALT` + `DOWN_ARROW` | Open the calendar pop-up            |
+| `ESCAPE`             | Close the calendar pop-up           |
+
+
+In month view:
+
+| Shortcut             | Action                              |
+|----------------------|-------------------------------------|
+| `LEFT_ARROW`         | Go to previous day                  |
+| `RIGHT_ARROW`        | Go to next day                      |
+| `UP_ARROW`           | Go to same day in the previous week |
+| `DOWN_ARROW`         | Go to same day in the next week     |
+| `HOME`               | Go to the first day of the month    |
+| `END`                | Go to the last day of the month     |
+| `PAGE_UP`            | Go to previous month                |
+| `ALT` + `PAGE_UP`    | Go to previous year                 |
+| `PAGE_DOWN`          | Go to next month                    |
+| `ALT` + `PAGE_DOWN`  | Go to next year                     |
+| `ENTER`              | Select current date                 |
+
+
+In year view:
+
+| Shortcut             | Action                              |
+|----------------------|-------------------------------------|
+| `LEFT_ARROW`         | Go to previous month                |
+| `RIGHT_ARROW`        | Go to next month                    |
+| `UP_ARROW`           | Go to previous 6 months             |
+| `DOWN_ARROW`         | Go to next 6 months                 |
+| `HOME`               | Go to the first month of the year   |
+| `END`                | Go to the last month of the year    |
+| `PAGE_UP`            | Go to previous year                 |
+| `ALT` + `PAGE_UP`    | Go to previous 10 years             |
+| `PAGE_DOWN`          | Go to next year                     |
+| `ALT` + `PAGE_DOWN`  | Go to next 10 years                 |
+| `ENTER`              | Select current month                |
diff --git a/src/lib/menu/menu.md b/src/lib/menu/menu.md
index ff082c83cc75..8a3969a1ed57 100644
--- a/src/lib/menu/menu.md
+++ b/src/lib/menu/menu.md
@@ -98,3 +98,7 @@ that should trigger the sub-menu:
 - <kbd>RIGHT_ARROW</kbd>: Opens the menu item's sub-menu
 - <kbd>LEFT_ARROW</kbd>: Closes the current menu, if it is a sub-menu.
 - <kbd>ENTER</kbd>: Activates the focused menu item
+
+### Accessibility
+Menu triggers or menu items without text or labels should be given a meaningful label via
+`aria-label` or `aria-labelledby`.
diff --git a/src/lib/slide-toggle/slide-toggle.md b/src/lib/slide-toggle/slide-toggle.md
index 8364d85c96df..7f0ffc79fb52 100644
--- a/src/lib/slide-toggle/slide-toggle.md
+++ b/src/lib/slide-toggle/slide-toggle.md
@@ -22,3 +22,11 @@ and `ReactiveFormsModule`.
 ### Theming
 The color of a `<md-slide-toggle>` can be changed by using the `color` property. By default, 
 slide-toggles use the theme's accent color. This can be changed to `'primary'` or `'warn'`.  
+
+### Accessibility
+The `<md-slide-toggle>` uses an internal `<input type="checkbox">` to provide an accessible
+experience. This internal checkbox receives focus and is automatically labelled by the text content
+of the `<md-slide-toggle>` element.
+
+Slide toggles without text or labels should be given a meaningful label via `aria-label` or
+`aria-labelledby`.
diff --git a/src/lib/slider/slider.md b/src/lib/slider/slider.md
index b2b06ab4272b..d64fb7daf111 100644
--- a/src/lib/slider/slider.md
+++ b/src/lib/slider/slider.md
@@ -85,3 +85,7 @@ The slider has the following keyboard bindings:
 | Page down   | Decrement the slider value by 10 steps.                                            |
 | End         | Set the value to the maximum possible.                                             |
 | Home        | Set the value to the minimum possible.                                             |
+
+### Accessibility
+Sliders without text or labels should be given a meaningful label via `aria-label` or
+`aria-labelledby`.
diff --git a/src/lib/snack-bar/snack-bar.md b/src/lib/snack-bar/snack-bar.md
index 5e2ac1b1fa2c..a468dfa3718a 100644
--- a/src/lib/snack-bar/snack-bar.md
+++ b/src/lib/snack-bar/snack-bar.md
@@ -72,3 +72,8 @@ export class MessageArchivedComponent {
   constructor(@Inject(MD_SNACK_BAR_DATA) public data: any) { }
 }
 ```
+### Accessibility
+Snack-bar messages are announced via an `aria-live` region. Focus is not moved to
+the snack-bar element, as this would be disruptive to a user in the middle of a
+workflow. For any action offered in the snack-bar, the application should offer the
+user an alternative way to perform the action (typically via keyboard shortcut).
diff --git a/src/lib/toolbar/toolbar.md b/src/lib/toolbar/toolbar.md
index eb7189923d0f..cfc2879b0c17 100644
--- a/src/lib/toolbar/toolbar.md
+++ b/src/lib/toolbar/toolbar.md
@@ -49,3 +49,13 @@ easily accomplished with `display: flex`:
 The color of a `<md-toolbar>` can be changed by using the `color` property. By default, toolbars
 use a neutral background color based on the current theme (light or dark). This can be changed to 
 `'primary'`, `'accent'`, or `'warn'`.  
+
+### Accessibility
+By default, the toolbar assumes that it will be used in a purely decorative fashion and thus sets
+no roles, ARIA attributes, or keyboard shortcuts. This is equivalent to having a sequence of `<div>`
+elements on the page.
+
+Generally, the toolbar is used as a header where `role="header"` would be appropriate.
+
+Only if the use-case of the toolbar match that of role="toolbar", the user should add the role and
+an appropriate label via `aria-label` or `aria-labelledby`.

From ffa4d9dcff882ca0cbbc26f930330c2ab308fc3c Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Wed, 6 Sep 2017 10:10:29 -0700
Subject: [PATCH 030/575] Create missing markdown files for cdk items. (#6770)

---
 src/cdk/a11y/focus-key-manager.md  |  2 ++
 src/cdk/coercion/coercion.md       |  3 +++
 src/cdk/collections/collections.md |  3 +++
 src/cdk/keycodes/keycodes.md       | 26 ++++++++++++++++++++++++++
 src/cdk/observers/observers.md     | 12 ++++++++++++
 src/cdk/overlay/overlay.md         |  3 +++
 src/cdk/platform/platform.md       |  3 +++
 src/cdk/rxjs/rxjs.md               | 27 +++++++++++++++++++++++++++
 src/cdk/scrolling/scrolling.md     |  3 +++
 src/cdk/scrolling/viewport.md      |  3 +++
 10 files changed, 85 insertions(+)
 create mode 100644 src/cdk/a11y/focus-key-manager.md
 create mode 100644 src/cdk/coercion/coercion.md
 create mode 100644 src/cdk/collections/collections.md
 create mode 100644 src/cdk/keycodes/keycodes.md
 create mode 100644 src/cdk/observers/observers.md
 create mode 100644 src/cdk/overlay/overlay.md
 create mode 100644 src/cdk/platform/platform.md
 create mode 100644 src/cdk/rxjs/rxjs.md
 create mode 100644 src/cdk/scrolling/scrolling.md
 create mode 100644 src/cdk/scrolling/viewport.md

diff --git a/src/cdk/a11y/focus-key-manager.md b/src/cdk/a11y/focus-key-manager.md
new file mode 100644
index 000000000000..9cbe16f0a7ee
--- /dev/null
+++ b/src/cdk/a11y/focus-key-manager.md
@@ -0,0 +1,2 @@
+### FocusKeyManager
+`ListKeyManager` manages the focus of an item based on keyboard interaction.
\ No newline at end of file
diff --git a/src/cdk/coercion/coercion.md b/src/cdk/coercion/coercion.md
new file mode 100644
index 000000000000..e050b542f3ad
--- /dev/null
+++ b/src/cdk/coercion/coercion.md
@@ -0,0 +1,3 @@
+### Coercion
+
+Utility functions for coercing `@Input`s into specific types.
diff --git a/src/cdk/collections/collections.md b/src/cdk/collections/collections.md
new file mode 100644
index 000000000000..1306b8f8df89
--- /dev/null
+++ b/src/cdk/collections/collections.md
@@ -0,0 +1,3 @@
+### Collections
+
+A set of utilities for managing collections.
\ No newline at end of file
diff --git a/src/cdk/keycodes/keycodes.md b/src/cdk/keycodes/keycodes.md
new file mode 100644
index 000000000000..68c4cd393a45
--- /dev/null
+++ b/src/cdk/keycodes/keycodes.md
@@ -0,0 +1,26 @@
+### KeyCodes
+ 
+Commonly used keycode constants.
+
+#### Example
+```ts
+import {Directive} from '@angular/core';
+import {UP_ARROW, DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
+
+@Directive({
+  selector: '[count-arrows]'
+  host: {
+    (keypress): 'handleKeyPress($event)'
+  }
+})
+export class ArrowCounterDirective {
+  arrowPressCount = 0;
+
+  handleKeyPress(event: KeyboardEvent) {
+    if ([UP_ARROW, DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW].includes(event.keyCode)) {
+      this.arrowPresscount++;
+    }
+  }
+}
+```
+
diff --git a/src/cdk/observers/observers.md b/src/cdk/observers/observers.md
new file mode 100644
index 000000000000..b5d2495a11b2
--- /dev/null
+++ b/src/cdk/observers/observers.md
@@ -0,0 +1,12 @@
+### Observers
+
+A directive for observing when the content of the host element changes. An event is emitted when a
+mutation to the content is observed.
+
+#### Example
+
+```html
+<div class="projected-content-wrapper" (cdkObserveContent)="projectContentChanged()">
+  <ng-content></ng-content>
+</div>
+```
diff --git a/src/cdk/overlay/overlay.md b/src/cdk/overlay/overlay.md
new file mode 100644
index 000000000000..f5c4fd2cdfac
--- /dev/null
+++ b/src/cdk/overlay/overlay.md
@@ -0,0 +1,3 @@
+### Overlay
+
+A service used to manage overlays.
\ No newline at end of file
diff --git a/src/cdk/platform/platform.md b/src/cdk/platform/platform.md
new file mode 100644
index 000000000000..0ad007d9982d
--- /dev/null
+++ b/src/cdk/platform/platform.md
@@ -0,0 +1,3 @@
+### Platform
+
+A service for determing the current platform.
\ No newline at end of file
diff --git a/src/cdk/rxjs/rxjs.md b/src/cdk/rxjs/rxjs.md
new file mode 100644
index 000000000000..c4c1718e238c
--- /dev/null
+++ b/src/cdk/rxjs/rxjs.md
@@ -0,0 +1,27 @@
+### RxJS Usage
+When dealing with RxJS operators it is important to be aware that using the "patch" imports will
+pollute the global Observable object (e.g. `import "rxjs/add/operator/map"`).  When creating a
+component library, it is highly recommended to import the operator functions directly (e.g.
+`import "rxjs/operator/map"`):
+
+```ts
+// NO
+import 'rxjs/add/operator/map';
+someObservable.map(...).subscribe(...);
+
+// YES
+import {map} from 'rxjs/operator/map';
+map.call(someObservable, ...).subscribe(...);
+```
+
+#### RxChain
+Because this approach can be inflexible when dealing with long chains of operators. You should use
+the `RxChain` class to help with it:
+
+```ts
+// Before
+someObservable.filter(...).map(...).do(...);
+
+// After
+RxChain.from(someObservable).call(filter, ...).call(map, ...).subscribe(...);
+```
diff --git a/src/cdk/scrolling/scrolling.md b/src/cdk/scrolling/scrolling.md
new file mode 100644
index 000000000000..7db6c4e046aa
--- /dev/null
+++ b/src/cdk/scrolling/scrolling.md
@@ -0,0 +1,3 @@
+### Scrolling
+
+Some things to help with scrollling.
\ No newline at end of file
diff --git a/src/cdk/scrolling/viewport.md b/src/cdk/scrolling/viewport.md
new file mode 100644
index 000000000000..023088a5552a
--- /dev/null
+++ b/src/cdk/scrolling/viewport.md
@@ -0,0 +1,3 @@
+### Viewport
+
+A utility for getting the bounds of the browser viewport.
\ No newline at end of file

From 0786518d5ac387e0cdb44b6fac758468def55ace Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:10:42 +0200
Subject: [PATCH 031/575] chore: wrong link to stepper in demo app (#6790)

Fixes the stepper link not pointing to the correct page.
---
 src/demo-app/demo-app/demo-app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 8d35ac9bb93f..08a4fae98e8a 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -72,7 +72,7 @@ export class DemoApp {
     {name: 'Slider', route: '/slider'},
     {name: 'Slide Toggle', route: '/slide-toggle'},
     {name: 'Snack Bar', route: '/snack-bar'},
-    {name: 'Stepper', route: 'stepper'},
+    {name: 'Stepper', route: '/stepper'},
     {name: 'Table', route: '/table'},
     {name: 'Tabs', route: '/tabs'},
     {name: 'Toolbar', route: '/toolbar'},

From 398915339b5ae8d21baa5492af65359b1a1b4ab7 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 6 Sep 2017 10:11:20 -0700
Subject: [PATCH 032/575] docs(table): fix overflow issue on ie11 site (#6792)

---
 src/material-examples/table-basic/table-basic-example.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/material-examples/table-basic/table-basic-example.css b/src/material-examples/table-basic/table-basic-example.css
index 31bd3b658d8b..8b311e6d3638 100644
--- a/src/material-examples/table-basic/table-basic-example.css
+++ b/src/material-examples/table-basic/table-basic-example.css
@@ -7,4 +7,5 @@
 
 .mat-table {
   overflow: auto;
+  max-height: 500px;
 }

From 5527e22decfb83507b611c93cbd5cb79043e6319 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Wed, 6 Sep 2017 10:11:48 -0700
Subject: [PATCH 033/575] =?UTF-8?q?docs(a11y):=20Add=20a11y=20docs=20for?=
 =?UTF-8?q?=20table,=20expansion=20panel,=20dialog,=20chips,=20autocomplet?=
 =?UTF-8?q?e=E2=80=A6=20(#6751)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add a11y docs for table, expansion panel, dialog, chips, autocomplete, and select

* address comments
---
 src/lib/autocomplete/autocomplete.md |  7 +++++++
 src/lib/chips/chips.md               |  4 ++++
 src/lib/dialog/dialog.md             | 19 +++++++++++++++++++
 src/lib/expansion/expansion.md       |  9 +++++++++
 src/lib/input/input.md               | 10 ++++++++++
 src/lib/paginator/paginator.md       |  3 +++
 src/lib/select/select.md             |  6 ++++++
 src/lib/sort/sort.md                 |  5 ++++-
 src/lib/table/table.md               |  9 +++++++++
 src/lib/tabs/tabs.md                 | 13 +++++++++++++
 10 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/src/lib/autocomplete/autocomplete.md b/src/lib/autocomplete/autocomplete.md
index b3e7e4ece279..cee71e488c8d 100644
--- a/src/lib/autocomplete/autocomplete.md
+++ b/src/lib/autocomplete/autocomplete.md
@@ -95,3 +95,10 @@ desired display value. Then bind it to the autocomplete's `displayWith` property
   </md-optgroup>
 </md-autocomplete>
 ```
+
+### Accessibility
+The input for autocomplete without text or labels should be given a meaningful label via
+`aria-label` or `aria-labelledby`.
+
+Autocomplete trigger is given `role="combobox"`. The trigger sets `aria-owns` to the autocomplete's
+id, and sets `aria-activedescendant` to the active option's id.
diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 58727d319162..7ae60fe5523c 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -38,3 +38,7 @@ also gain focus when clicked, ensuring keyboard navigation starts at the appropr
 The selected color of an `<md-chip>` can be changed by using the `color` property. By default, chips
 use a neutral background color based on the current theme (light or dark). This can be changed to 
 `'primary'`, `'accent'`, or `'warn'`.
+
+### Accessibility
+A chip-list behaves as a `role="listbox"`, with each chip being a `role="option"`. The chip input
+should have a placeholder or be given a meaningful label via `aria-label` or `aria-labelledby`.
diff --git a/src/lib/dialog/dialog.md b/src/lib/dialog/dialog.md
index 0df81ac0ec1a..f2d42df5f1cd 100644
--- a/src/lib/dialog/dialog.md
+++ b/src/lib/dialog/dialog.md
@@ -126,3 +126,22 @@ that the AOT compiler knows to create the `ComponentFactory` for it.
 })
 export class AppModule() {}
 ```
+
+### Accessibility
+By default, each dialog has `role="dialog"` on the root element. The role can be changed to
+`alertdialog` via the `MdDialogConfig` when opening.
+
+The `aria-label`, `aria-labelledby`, and `aria-describedby` attributes can all be set to the
+dialog element via the `MdDialogConfig` as well. Each dialog should typically have a label
+set via `aria-label` or `aria-labelledby`.
+
+#### Focus management
+By default, the first tabbable element within the dialog will receive focus upon open.
+
+Tabbing through the elements of the dialog will keep focus inside of the dialog element,
+wrapping back to the first tabbable element when reaching the end of the tab sequence.
+
+#### Keyboard interaction
+By default pressing the escape key will close the dialog. While this behavior can
+be turned off via the `disableClose` option, users should generally avoid doing so
+as it breaks the expected interaction pattern for screen-reader users.
diff --git a/src/lib/expansion/expansion.md b/src/lib/expansion/expansion.md
index c228a9784b36..14ad08aaacee 100644
--- a/src/lib/expansion/expansion.md
+++ b/src/lib/expansion/expansion.md
@@ -98,3 +98,12 @@ panel can be expanded at a given time:
 
 </md-accordion>
 ```
+
+### Accessibility
+The expansion-panel aims to mimic the experience of the native `<details>` and `<summary>` elements.
+The expansion panel header has `role="button"`. The expansion panel header has attribute
+`aria-controls` with the expansion panel's id as value.
+
+The expansion panel headers are buttons. Users can use the keyboard to activate the expansion panel
+header to switch between expanded state and collapsed state. Because the header acts as a button,
+additional interactive elements should not be put inside of the header.
diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index d131cfb760b2..e3626c1fa6d4 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -150,3 +150,13 @@ Here are the available global options:
 | Name              | Type     | Description |
 | ----------------- | -------- | ----------- |
 | errorStateMatcher | Function | Returns a boolean specifying if the error should be shown |
+
+### Accessibility
+The `mdInput` directive works with native `<input>` to provide an accessible experience.
+
+If a placeholder attribute is added to the input, or a `md-placeholder` element is added
+in the form field, the placeholder text will automatically be used as the label for the input.
+If there's no placeholder specified, `aria-label`, `aria-labelledby` or `<label for=...>` should be
+added.
+
+Any `md-error` and `md-hint` are automatically added to the input's `aria-describedby`.
diff --git a/src/lib/paginator/paginator.md b/src/lib/paginator/paginator.md
index 087e4b2ae35b..a744fb95002d 100644
--- a/src/lib/paginator/paginator.md
+++ b/src/lib/paginator/paginator.md
@@ -24,3 +24,6 @@ This will allow you to change the following:
  1. The label for the length of each page.
  2. The range text displayed to the user.
  3. The tooltip messages on the navigation buttons.
+
+### Accessibility
+The `aria-label`s for next page and previous page buttons can be set in `MdPaginatorIntl`.
diff --git a/src/lib/select/select.md b/src/lib/select/select.md
index 46f60b95a22f..787c97235e3b 100644
--- a/src/lib/select/select.md
+++ b/src/lib/select/select.md
@@ -92,3 +92,9 @@ Here are the available global options:
 - <kbd>DOWN_ARROW</kbd>: Focus next option
 - <kbd>UP_ARROW</kbd>: Focus previous option
 - <kbd>ENTER</kbd> or <kbd>SPACE</kbd>: Select focused item
+
+### Accessibility
+The select component without text or label should be given a meaningful label via
+`aria-label` or `aria-labelledby`.
+
+The select component has `role="listbox"` and options inside select have `role="option"`.
diff --git a/src/lib/sort/sort.md b/src/lib/sort/sort.md
index 684d39b0cd29..fb228e645821 100644
--- a/src/lib/sort/sort.md
+++ b/src/lib/sort/sort.md
@@ -32,4 +32,7 @@ To prevent the user from clearing the sort sort state from an already sorted col
 When used on an `md-table` header, it is not required to set an `md-sort-header` id on because
 by default it will use the id of the column.
 
-<!-- example(table-sorting) -->
\ No newline at end of file
+<!-- example(table-sorting) -->
+
+### Accessibility
+The `aria-label` for the sort button can be set in `MdSortHeaderIntl`.
diff --git a/src/lib/table/table.md b/src/lib/table/table.md
index eeb520aa5a0c..8b4a89d4de27 100644
--- a/src/lib/table/table.md
+++ b/src/lib/table/table.md
@@ -45,3 +45,12 @@ an update via the table's data source.
 In the near future, we will provide a simplified version of the data-table with an easy-to-use
 interface, material styling, array input, and more out-of-the-box features (sorting, pagination,
 and selection).
+
+### Accessibility
+Tables without text or labels should be given a meaningful label via `aria-label` or
+`aria-labelledby`. The `aria-readonly` defaults to `true` if it's not set.
+
+Table's default role is `grid`, and it can be changed to `treegrid` through `role` attribute.
+
+`md-table` does not manage any focus/keyboard interaction on its own. Users can add desired
+focus/keyboard interactions in their application.
diff --git a/src/lib/tabs/tabs.md b/src/lib/tabs/tabs.md
index e24e7a1b0a30..06070051fe68 100644
--- a/src/lib/tabs/tabs.md
+++ b/src/lib/tabs/tabs.md
@@ -79,3 +79,16 @@ provides a tab-like UI for navigating between routes.
 The tab-nav-bar is not tied to any particular router; it works with normal `<a>` elements and uses
 the `active` property to determine which tab is currently active. The corresponding
 `<router-outlet>` can be placed anywhere in the view.
+
+### Accessibility
+Tabs without text or labels should be given a meaningful label via `aria-label` or
+`aria-labelledby`. For `MdTabNav`, the `<nav>` element should have a label as well.
+
+
+#### Keyboard shortcuts
+
+| Shortcut             | Action                     |
+|----------------------|----------------------------|
+| `LEFT_ARROW`         | Move focus to previous tab |
+| `RIGHT_ARROW`        | Move focus to next tab     |
+| `SPACE` or 'ENTER'   | Switch to focused tab      |

From 001001cb3725720a2b700254db34827d42ca8ef0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:12:13 +0200
Subject: [PATCH 034/575] build: custom tslint rules not executing in IDEs
 (#6817)

Fixes our custom tslint rules not executing IDEs, because they're written in TypeScript. This is the preferred option over switching them back to ES6, because some rules require access to TS files from other parts of the build (e.g. the Rollup globals rule).
---
 tools/gulp/tasks/lint.ts                      | 15 ++-------------
 tools/tslint-rules/noViewEncapsulationRule.ts |  6 +++---
 tools/tslint-rules/tsLoaderRule.js            | 13 +++++++++++++
 tslint.json                                   |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 tools/tslint-rules/tsLoaderRule.js

diff --git a/tools/gulp/tasks/lint.ts b/tools/gulp/tasks/lint.ts
index b81ce409387d..b51b84ba654f 100644
--- a/tools/gulp/tasks/lint.ts
+++ b/tools/gulp/tasks/lint.ts
@@ -6,7 +6,6 @@ import {red} from 'chalk';
 
 // These types lack of type definitions
 const madge = require('madge');
-const resolveBin = require('resolve-bin');
 
 /** Glob that matches all SCSS or CSS files that should be linted. */
 const stylesGlob = '+(tools|src)/**/!(*.bundle).+(css|scss)';
@@ -28,10 +27,10 @@ task('stylelint', execNodeTask(
 ));
 
 /** Task to run TSLint against the e2e/ and src/ directories. */
-task('tslint', execTsLintTask());
+task('tslint', execNodeTask('tslint', tsLintBaseFlags));
 
 /** Task that automatically fixes TSLint warnings. */
-task('tslint:fix', execTsLintTask('--fix'));
+task('tslint:fix', execNodeTask('tslint', [...tsLintBaseFlags, '--fix']));
 
 /** Task that runs madge to detect circular dependencies. */
 task('madge', ['material:clean-build'], () => {
@@ -51,13 +50,3 @@ task('madge', ['material:clean-build'], () => {
 function formatMadgeCircularModules(circularModules: string[][]): string {
   return circularModules.map((modulePaths: string[]) => `\n - ${modulePaths.join(' > ')}`).join('');
 }
-
-/** Creates a gulp task function that will run TSLint together with ts-node. */
-function execTsLintTask(...flags: string[]) {
-  const tslintBinPath = resolveBin.sync('tslint');
-  const tsNodeOptions = ['-O', '{"module": "commonjs"}'];
-
-  // TS-Node needs the module compiler option to be set to `commonjs` because the transpiled
-  // TypeScript files will be running inside of NodeJS.
-  return execNodeTask('ts-node', [...tsNodeOptions, tslintBinPath, ...tsLintBaseFlags, ...flags]);
-}
diff --git a/tools/tslint-rules/noViewEncapsulationRule.ts b/tools/tslint-rules/noViewEncapsulationRule.ts
index 9b130174d504..196aa37ae34b 100644
--- a/tools/tslint-rules/noViewEncapsulationRule.ts
+++ b/tools/tslint-rules/noViewEncapsulationRule.ts
@@ -35,17 +35,17 @@ class Walker extends Lint.RuleWalker {
     this._enabled = fileGlobs.some(p => minimatch(relativeFilePath, p));
   }
 
-  visitClassDeclaration(node) {
+  visitClassDeclaration(node: ts.ClassDeclaration) {
     if (!this._enabled || !node.decorators) {
       return;
     }
 
     node.decorators
-      .map(decorator => decorator.expression)
+      .map(decorator => decorator.expression as any)
       .filter(expression => expression.expression.getText() === 'Component')
       .filter(expression => expression.arguments.length && expression.arguments[0].properties)
       .forEach(expression => {
-        const hasTurnedOffEncapsulation = expression.arguments[0].properties.some(prop => {
+        const hasTurnedOffEncapsulation = expression.arguments[0].properties.some((prop: any) => {
           const value = prop.initializer.getText();
           return prop.name.getText() === 'encapsulation' && value.endsWith('.None');
         });
diff --git a/tools/tslint-rules/tsLoaderRule.js b/tools/tslint-rules/tsLoaderRule.js
new file mode 100644
index 000000000000..4ba565f1b9de
--- /dev/null
+++ b/tools/tslint-rules/tsLoaderRule.js
@@ -0,0 +1,13 @@
+const path = require('path');
+const Lint = require('tslint');
+
+// Custom rule that registers all of the custom rules, written in TypeScript, with ts-node.
+// This is necessary, because `tslint` and IDEs won't execute any rules that aren't in a .js file.
+require('ts-node').register({
+  project: path.join(__dirname, '../gulp/tsconfig.json')
+});
+
+// Add a noop rule so tslint doesn't complain.
+exports.Rule = class Rule extends Lint.Rules.AbstractRule {
+  apply() {}
+}
diff --git a/tslint.json b/tslint.json
index 911ffe3cf7a6..af2c655674aa 100644
--- a/tslint.json
+++ b/tslint.json
@@ -85,7 +85,7 @@
     "linebreak-style": [true, "LF"],
 
     // Custom Rules
-
+    "ts-loader": true,
     "no-exposed-todo": true,
     "no-view-encapsulation": [
       true,

From 835014a709a249f7c61fcefbb96ff6d55a32a40b Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 6 Sep 2017 19:12:40 +0200
Subject: [PATCH 035/575] build: missing minified umd bundles in releases
 (#6809)

With the recent change of the CDK entry points the copy glob in `build-release.ts` has been updated accidentally to no longer include the ".umd.min.js" files.

Fixes #6796
---
 tools/package-tools/build-release.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/package-tools/build-release.ts b/tools/package-tools/build-release.ts
index c9a3c9fdb521..d9e8b08110ae 100644
--- a/tools/package-tools/build-release.ts
+++ b/tools/package-tools/build-release.ts
@@ -27,7 +27,7 @@ export function composeRelease(buildPackage: BuildPackage) {
   inlinePackageMetadataFiles(packageOut);
 
   copyFiles(packageOut, '**/*.+(d.ts|metadata.json)', join(releasePath, 'typings'));
-  copyFiles(bundlesDir, `${packageName}?(-*).umd.js?(.map)`, join(releasePath, 'bundles'));
+  copyFiles(bundlesDir, `${packageName}?(-*).umd?(.min).js?(.map)`, join(releasePath, 'bundles'));
   copyFiles(bundlesDir, `${packageName}?(.es5).js?(.map)`, join(releasePath, '@angular'));
   copyFiles(join(bundlesDir, packageName), '**', join(releasePath, '@angular', packageName));
   copyFiles(projectDir, 'LICENSE', releasePath);

From c3965963854729535a8297c894b95c4af2f7ae3f Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Wed, 6 Sep 2017 10:28:18 -0700
Subject: [PATCH 036/575] feat(stepper): Address previous comments + add
 directionality support (#6775)

* code cleanup + rtl support

* Fix based on review

* modify code for unit tests
---
 src/cdk/stepper/stepper.ts              |  43 +++--
 src/demo-app/stepper/stepper-demo.ts    |   6 +-
 src/lib/stepper/_stepper-theme.scss     |  10 +-
 src/lib/stepper/index.ts                |  13 +-
 src/lib/stepper/step-header.html        |  19 +-
 src/lib/stepper/step-header.scss        |   3 +-
 src/lib/stepper/step-header.ts          |  10 +-
 src/lib/stepper/stepper-horizontal.html |   8 +-
 src/lib/stepper/stepper-vertical.html   |   8 +-
 src/lib/stepper/stepper.spec.ts         | 241 ++++++++++++++++--------
 src/lib/stepper/stepper.ts              |   8 +-
 11 files changed, 238 insertions(+), 131 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 089555589f21..eb0b5b9b4449 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -30,7 +30,7 @@ import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
 import {CdkStepLabel} from './step-label';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {AbstractControl} from '@angular/forms';
-import {Directionality} from '@angular/cdk/bidi';
+import {Direction, Directionality} from '@angular/cdk/bidi';
 
 /** Used to generate unique ID for each stepper component. */
 let nextId = 0;
@@ -151,8 +151,7 @@ export class CdkStepper {
   @Input()
   get selected() { return this._steps[this.selectedIndex]; }
   set selected(step: CdkStep) {
-    let index = this._steps.toArray().indexOf(step);
-    this.selectedIndex = index;
+    this.selectedIndex = this._steps.toArray().indexOf(step);
   }
 
   /** Event emitted when the selected step has changed. */
@@ -192,12 +191,11 @@ export class CdkStepper {
   _getAnimationDirection(index: number): StepContentPositionState {
     const position = index - this._selectedIndex;
     if (position < 0) {
-      return 'previous';
+      return this._layoutDirection() === 'rtl' ? 'next' : 'previous';
     } else if (position > 0) {
-      return 'next';
-    } else {
-      return 'current';
+      return this._layoutDirection() === 'rtl' ? 'previous' : 'next';
     }
+    return 'current';
   }
 
   /** Returns the type of icon to be displayed. */
@@ -224,17 +222,17 @@ export class CdkStepper {
   _onKeydown(event: KeyboardEvent) {
     switch (event.keyCode) {
       case RIGHT_ARROW:
-        if (this._dir && this._dir.value === 'rtl') {
-          this._focusStep((this._focusIndex + this._steps.length - 1) % this._steps.length);
+        if (this._layoutDirection() === 'rtl') {
+          this._focusPreviousStep();
         } else {
-          this._focusStep((this._focusIndex + 1) % this._steps.length);
+          this._focusNextStep();
         }
         break;
       case LEFT_ARROW:
-        if (this._dir && this._dir.value === 'rtl') {
-          this._focusStep((this._focusIndex + 1) % this._steps.length);
+        if (this._layoutDirection() === 'rtl') {
+          this._focusNextStep();
         } else {
-          this._focusStep((this._focusIndex + this._steps.length - 1) % this._steps.length);
+          this._focusPreviousStep();
         }
         break;
       case SPACE:
@@ -248,17 +246,28 @@ export class CdkStepper {
     event.preventDefault();
   }
 
+  private _focusNextStep() {
+    this._focusStep((this._focusIndex + 1) % this._steps.length);
+  }
+
+  private _focusPreviousStep() {
+    this._focusStep((this._focusIndex + this._steps.length - 1) % this._steps.length);
+  }
+
   private _focusStep(index: number) {
     this._focusIndex = index;
     this._stepHeader.toArray()[this._focusIndex].nativeElement.focus();
   }
 
   private _anyControlsInvalid(index: number): boolean {
-    const stepsArray = this._steps.toArray();
-    stepsArray[this._selectedIndex].interacted = true;
-    if (this._linear) {
-      return stepsArray.slice(0, index).some(step => step.stepControl.invalid);
+    this._steps.toArray()[this._selectedIndex].interacted = true;
+    if (this._linear && index >= 0) {
+      return this._steps.toArray().slice(0, index).some(step => step.stepControl.invalid);
     }
     return false;
   }
+
+  private _layoutDirection(): Direction {
+    return this._dir && this._dir.value === 'rtl' ? 'rtl' : 'ltr';
+  }
 }
diff --git a/src/demo-app/stepper/stepper-demo.ts b/src/demo-app/stepper/stepper-demo.ts
index 77cfb3535913..373c298c5fd4 100644
--- a/src/demo-app/stepper/stepper-demo.ts
+++ b/src/demo-app/stepper/stepper-demo.ts
@@ -1,8 +1,6 @@
 import {Component} from '@angular/core';
 import {AbstractControl, FormBuilder, FormGroup, Validators} from '@angular/forms';
 
-const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
-
 @Component({
   moduleId: module.id,
   selector: 'stepper-demo',
@@ -36,7 +34,7 @@ export class StepperDemo {
           lastNameFormCtrl: ['', Validators.required],
         }),
         this._formBuilder.group({
-          emailFormCtrl: ['', Validators.pattern(EMAIL_REGEX)]
+          emailFormCtrl: ['', Validators.email]
         }),
       ])
     });
@@ -47,7 +45,7 @@ export class StepperDemo {
     });
 
     this.emailFormGroup = this._formBuilder.group({
-      emailCtrl: ['', Validators.pattern(EMAIL_REGEX)]
+      emailCtrl: ['', Validators.email]
     });
   }
 }
diff --git a/src/lib/stepper/_stepper-theme.scss b/src/lib/stepper/_stepper-theme.scss
index fc4e339a49c0..c7b17278a122 100644
--- a/src/lib/stepper/_stepper-theme.scss
+++ b/src/lib/stepper/_stepper-theme.scss
@@ -13,11 +13,7 @@
       background-color: mat-color($background, hover);
     }
 
-    .mat-step-label-active {
-      color: mat-color($foreground, text);
-    }
-
-    .mat-step-label-inactive,
+    .mat-step-label,
     .mat-step-optional {
       color: mat-color($foreground, disabled-text);
     }
@@ -31,6 +27,10 @@
       background-color: mat-color($foreground, disabled-text);
       color: mat-color($primary, default-contrast);
     }
+
+    .mat-step-label.mat-step-label-active {
+      color: mat-color($foreground, text);
+    }
   }
 
   .mat-stepper-horizontal, .mat-stepper-vertical {
diff --git a/src/lib/stepper/index.ts b/src/lib/stepper/index.ts
index a574fbc53997..46ba69495ace 100644
--- a/src/lib/stepper/index.ts
+++ b/src/lib/stepper/index.ts
@@ -27,8 +27,17 @@ import {MdStepHeader} from './step-header';
     CdkStepperModule,
     MdIconModule
   ],
-  exports: [MdCommonModule, MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
-    MdStepperNext, MdStepperPrevious, MdStepHeader],
+  exports: [
+    MdCommonModule,
+    MdHorizontalStepper,
+    MdVerticalStepper,
+    MdStep,
+    MdStepLabel,
+    MdStepper,
+    MdStepperNext,
+    MdStepperPrevious,
+    MdStepHeader
+  ],
   declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
     MdStepperNext, MdStepperPrevious, MdStepHeader],
 })
diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index 3f2310862f6f..b385c5b43974 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -1,16 +1,17 @@
-<div [class.mat-step-icon]="icon != 'number' || selected"
-     [class.mat-step-icon-not-touched]="icon == 'number' && !selected">
-  <span *ngIf="icon == 'number'">{{index + 1}}</span>
-  <md-icon *ngIf="icon == 'edit'">create</md-icon>
-  <md-icon *ngIf="icon == 'done'">done</md-icon>
+<div [class.mat-step-icon]="icon !== 'number' || selected"
+     [class.mat-step-icon-not-touched]="icon == 'number' && !selected"
+     [ngSwitch]="icon">
+  <span *ngSwitchCase="'number'">{{index + 1}}</span>
+  <md-icon *ngSwitchCase="'edit'">create</md-icon>
+  <md-icon *ngSwitchCase="'done'">done</md-icon>
 </div>
-<div [class.mat-step-label-active]="active"
-     [class.mat-step-label-inactive]="!active">
+<div class="mat-step-label"
+     [class.mat-step-label-active]="active">
   <!-- If there is a label template, use it. -->
-  <ng-container *ngIf="_templateLabel" [ngTemplateOutlet]="label.template">
+  <ng-container *ngIf="_templateLabel()" [ngTemplateOutlet]="label.template">
   </ng-container>
   <!-- It there is no label template, fall back to the text label. -->
-  <div class="mat-step-text-label" *ngIf="_stringLabel">{{label}}</div>
+  <div class="mat-step-text-label" *ngIf="_stringLabel()">{{label}}</div>
 
   <div class="mat-step-optional" *ngIf="optional">Optional</div>
 </div>
diff --git a/src/lib/stepper/step-header.scss b/src/lib/stepper/step-header.scss
index 9313a57e4a48..33cb813902ac 100644
--- a/src/lib/stepper/step-header.scss
+++ b/src/lib/stepper/step-header.scss
@@ -26,8 +26,7 @@ $mat-step-header-icon-size: 16px !default;
   width: $mat-step-header-icon-size;
 }
 
-.mat-step-label-active,
-.mat-step-label-inactive {
+.mat-step-label {
   display: inline-block;
   white-space: nowrap;
   overflow: hidden;
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index b6624e2424c5..ae79e5cdf70e 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -23,12 +23,10 @@ import {MdStepLabel} from './step-label';
 })
 export class MdStepHeader {
   /** Icon for the given step. */
-  @Input()
-  icon: string;
+  @Input() icon: string;
 
   /** Label of the given step. */
-  @Input()
-  label: MdStepLabel | string;
+  @Input() label: MdStepLabel | string;
 
   /** Index of the given step. */
   @Input()
@@ -63,12 +61,12 @@ export class MdStepHeader {
   private _optional: boolean;
 
   /** Returns string label of given step if it is a text label. */
-  get _stringLabel(): string | null {
+  _stringLabel(): string | null {
     return this.label instanceof MdStepLabel ? null : this.label;
   }
 
   /** Returns MdStepLabel if the label of given step is a template label. */
-  get _templateLabel(): MdStepLabel | null {
+  _templateLabel(): MdStepLabel | null {
     return this.label instanceof MdStepLabel ? this.label : null;
   }
 }
diff --git a/src/lib/stepper/stepper-horizontal.html b/src/lib/stepper/stepper-horizontal.html
index 5e2d2ea80fa7..8b32e92e93a3 100644
--- a/src/lib/stepper/stepper-horizontal.html
+++ b/src/lib/stepper/stepper-horizontal.html
@@ -3,15 +3,15 @@
     <md-step-header  class="mat-horizontal-stepper-header"
                      (click)="step.select()"
                      (keydown)="_onKeydown($event)"
-                     [tabIndex]="_focusIndex == i ? 0 : -1"
+                     [tabIndex]="_focusIndex === i ? 0 : -1"
                      [id]="_getStepLabelId(i)"
                      [attr.aria-controls]="_getStepContentId(i)"
                      [attr.aria-selected]="selectedIndex == i"
                      [index]="i"
                      [icon]="_getIndicatorType(i)"
                      [label]="step.stepLabel || step.label"
-                     [selected]="selectedIndex == i"
-                     [active]="step.completed || selectedIndex == i"
+                     [selected]="selectedIndex === i"
+                     [active]="step.completed || selectedIndex === i"
                      [optional]="step.optional">
     </md-step-header>
     <div *ngIf="!isLast" class="mat-stepper-horizontal-line"></div>
@@ -24,7 +24,7 @@
        [@stepTransition]="_getAnimationDirection(i)"
        [id]="_getStepContentId(i)"
        [attr.aria-labelledby]="_getStepLabelId(i)"
-       [attr.aria-expanded]="selectedIndex == i">
+       [attr.aria-expanded]="selectedIndex === i">
     <ng-container [ngTemplateOutlet]="step.content"></ng-container>
   </div>
 </div>
diff --git a/src/lib/stepper/stepper-vertical.html b/src/lib/stepper/stepper-vertical.html
index b73bed61929b..bccd9bf5f4df 100644
--- a/src/lib/stepper/stepper-vertical.html
+++ b/src/lib/stepper/stepper-vertical.html
@@ -5,12 +5,12 @@
                    [tabIndex]="_focusIndex == i ? 0 : -1"
                    [id]="_getStepLabelId(i)"
                    [attr.aria-controls]="_getStepContentId(i)"
-                   [attr.aria-selected]="selectedIndex == i"
+                   [attr.aria-selected]="selectedIndex === i"
                    [index]="i"
                    [icon]="_getIndicatorType(i)"
                    [label]="step.stepLabel || step.label"
-                   [selected]="selectedIndex == i"
-                   [active]="step.completed || selectedIndex == i"
+                   [selected]="selectedIndex === i"
+                   [active]="step.completed || selectedIndex === i"
                    [optional]="step.optional">
   </md-step-header>
 
@@ -19,7 +19,7 @@
          [@stepTransition]="_getAnimationDirection(i)"
          [id]="_getStepContentId(i)"
          [attr.aria-labelledby]="_getStepLabelId(i)"
-         [attr.aria-expanded]="selectedIndex == i">
+         [attr.aria-expanded]="selectedIndex === i">
       <div class="mat-vertical-content">
         <ng-container [ngTemplateOutlet]="step.content"></ng-container>
       </div>
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index b5965f9d4751..13c357d80b62 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -8,16 +8,22 @@ import {MdStepperNext, MdStepperPrevious} from './stepper-button';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
 import {MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
+import {Directionality} from '../core';
 
-const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+const VALID_REGEX = /valid/;
 
 describe('MdHorizontalStepper', () => {
+  let dir = 'ltr';
+
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MdStepperModule, NoopAnimationsModule, ReactiveFormsModule],
       declarations: [
         SimpleMdHorizontalStepperApp,
         LinearMdHorizontalStepperApp
+      ],
+      providers: [
+        {provide: Directionality, useFactory: () => ({value: dir})}
       ]
     });
 
@@ -26,23 +32,21 @@ describe('MdHorizontalStepper', () => {
 
   describe('basic horizontal stepper', () => {
     let fixture: ComponentFixture<SimpleMdHorizontalStepperApp>;
-    let stepperComponent: MdHorizontalStepper;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(SimpleMdHorizontalStepperApp);
       fixture.detectChanges();
-
-      stepperComponent = fixture.debugElement
-          .query(By.css('md-horizontal-stepper')).componentInstance;
     });
 
     it('should default to the first step', () => {
+      let stepperComponent = fixture.debugElement
+          .query(By.css('md-horizontal-stepper')).componentInstance;
       expect(stepperComponent.selectedIndex).toBe(0);
     });
 
     it('should change selected index on header click', () => {
       let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-horizontal-stepper-header'));
-      assertSelectionChangeOnHeaderClick(stepperComponent, fixture, stepHeaders);
+      assertSelectionChangeOnHeaderClick(fixture, stepHeaders);
     });
 
     it('should set the "tablist" role on stepper', () => {
@@ -52,44 +56,63 @@ describe('MdHorizontalStepper', () => {
 
     it('should set aria-expanded of content correctly', () => {
       let stepContents = fixture.debugElement.queryAll(By.css(`.mat-horizontal-stepper-content`));
-      assertCorrectAriaExpandedAttribute(stepperComponent, fixture, stepContents);
+      assertCorrectAriaExpandedAttribute(fixture, stepContents);
     });
 
     it('should display the correct label', () => {
-      assertCorrectStepLabel(stepperComponent, fixture);
+      assertCorrectStepLabel(fixture);
     });
 
     it('should go to next available step when the next button is clicked', () => {
-      assertNextStepperButtonClick(stepperComponent, fixture);
+      assertNextStepperButtonClick(fixture);
     });
 
     it('should go to previous available step when the previous button is clicked', () => {
-      assertPreviousStepperButtonClick(stepperComponent, fixture);
+      assertPreviousStepperButtonClick(fixture);
     });
 
     it('should set the correct step position for animation', () => {
-      assertCorrectStepPosition(stepperComponent, fixture);
+      assertCorrectStepAnimationDirection(fixture);
     });
 
     it('should support keyboard events to move and select focus', () => {
       let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-horizontal-stepper-header'));
-      assertCorrectKeyboardInteraction(stepperComponent, fixture, stepHeaders);
+      assertCorrectKeyboardInteraction(fixture, stepHeaders);
     });
 
     it('should not set focus on header of selected step if header is not clicked', () => {
-      assertStepHeaderFocusNotCalled(stepperComponent, fixture);
+      assertStepHeaderFocusNotCalled(fixture);
     });
 
     it('should only be able to return to a previous step if it is editable', () => {
-      assertEditableStepChange(stepperComponent, fixture);
+      assertEditableStepChange(fixture);
     });
 
     it('should set create icon if step is editable and completed', () => {
-      assertCorrectStepIcon(stepperComponent, fixture, true, 'edit');
+      assertCorrectStepIcon(fixture, true, 'edit');
     });
 
     it('should set done icon if step is not editable and is completed', () => {
-      assertCorrectStepIcon(stepperComponent, fixture, false, 'done');
+      assertCorrectStepIcon(fixture, false, 'done');
+    });
+  });
+
+  describe('RTL', () => {
+    let fixture: ComponentFixture<SimpleMdHorizontalStepperApp>;
+
+    beforeEach(() => {
+      dir = 'rtl';
+      fixture = TestBed.createComponent(SimpleMdHorizontalStepperApp);
+      fixture.detectChanges();
+    });
+
+    it('should reverse arrow key focus in RTL mode', () => {
+      let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-horizontal-stepper-header'));
+      assertArrowKeyInteractionInRtl(fixture, stepHeaders);
+    });
+
+    it('should reverse animation in RTL mode', () => {
+      assertCorrectStepAnimationDirection(fixture, 'rtl');
     });
   });
 
@@ -119,7 +142,7 @@ describe('MdHorizontalStepper', () => {
 
       let stepHeaderEl = fixture.debugElement
           .queryAll(By.css('.mat-horizontal-stepper-header'))[1].nativeElement;
-      assertLinearStepperValidity(stepHeaderEl, stepperComponent, testComponent, fixture);
+      assertLinearStepperValidity(stepHeaderEl, testComponent, fixture);
     });
 
     it('should not focus step header upon click if it is not able to be selected', () => {
@@ -127,18 +150,23 @@ describe('MdHorizontalStepper', () => {
     });
 
     it('should be able to move to next step even when invalid if current step is optional', () => {
-      assertOptionalStepValidity(stepperComponent, testComponent, fixture);
+      assertOptionalStepValidity(testComponent, fixture);
     });
   });
 });
 
 describe('MdVerticalStepper', () => {
+  let dir = 'ltr';
+
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MdStepperModule, NoopAnimationsModule, ReactiveFormsModule],
       declarations: [
         SimpleMdVerticalStepperApp,
         LinearMdVerticalStepperApp
+      ],
+      providers: [
+        {provide: Directionality, useFactory: () => ({value: dir})}
       ]
     });
 
@@ -147,23 +175,21 @@ describe('MdVerticalStepper', () => {
 
   describe('basic vertical stepper', () => {
     let fixture: ComponentFixture<SimpleMdVerticalStepperApp>;
-    let stepperComponent: MdVerticalStepper;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(SimpleMdVerticalStepperApp);
       fixture.detectChanges();
-
-      stepperComponent = fixture.debugElement
-          .query(By.css('md-vertical-stepper')).componentInstance;
     });
 
     it('should default to the first step', () => {
+      let stepperComponent = fixture.debugElement
+          .query(By.css('md-vertical-stepper')).componentInstance;
       expect(stepperComponent.selectedIndex).toBe(0);
     });
 
     it('should change selected index on header click', () => {
       let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-vertical-stepper-header'));
-      assertSelectionChangeOnHeaderClick(stepperComponent, fixture, stepHeaders);
+      assertSelectionChangeOnHeaderClick(fixture, stepHeaders);
 
     });
 
@@ -174,44 +200,63 @@ describe('MdVerticalStepper', () => {
 
     it('should set aria-expanded of content correctly', () => {
       let stepContents = fixture.debugElement.queryAll(By.css(`.mat-vertical-stepper-content`));
-      assertCorrectAriaExpandedAttribute(stepperComponent, fixture, stepContents);
+      assertCorrectAriaExpandedAttribute(fixture, stepContents);
     });
 
     it('should display the correct label', () => {
-      assertCorrectStepLabel(stepperComponent, fixture);
+      assertCorrectStepLabel(fixture);
     });
 
     it('should go to next available step when the next button is clicked', () => {
-      assertNextStepperButtonClick(stepperComponent, fixture);
+      assertNextStepperButtonClick(fixture);
     });
 
     it('should go to previous available step when the previous button is clicked', () => {
-      assertPreviousStepperButtonClick(stepperComponent, fixture);
+      assertPreviousStepperButtonClick(fixture);
     });
 
     it('should set the correct step position for animation', () => {
-      assertCorrectStepPosition(stepperComponent, fixture);
+      assertCorrectStepAnimationDirection(fixture);
     });
 
     it('should support keyboard events to move and select focus', () => {
       let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-vertical-stepper-header'));
-      assertCorrectKeyboardInteraction(stepperComponent, fixture, stepHeaders);
+      assertCorrectKeyboardInteraction(fixture, stepHeaders);
     });
 
     it('should not set focus on header of selected step if header is not clicked', () => {
-      assertStepHeaderFocusNotCalled(stepperComponent, fixture);
+      assertStepHeaderFocusNotCalled(fixture);
     });
 
     it('should only be able to return to a previous step if it is editable', () => {
-      assertEditableStepChange(stepperComponent, fixture);
+      assertEditableStepChange(fixture);
     });
 
     it('should set create icon if step is editable and completed', () => {
-      assertCorrectStepIcon(stepperComponent, fixture, true, 'edit');
+      assertCorrectStepIcon(fixture, true, 'edit');
     });
 
     it('should set done icon if step is not editable and is completed', () => {
-      assertCorrectStepIcon(stepperComponent, fixture, false, 'done');
+      assertCorrectStepIcon(fixture, false, 'done');
+    });
+  });
+
+  describe('RTL', () => {
+    let fixture: ComponentFixture<SimpleMdVerticalStepperApp>;
+
+    beforeEach(() => {
+      dir = 'rtl';
+      fixture = TestBed.createComponent(SimpleMdVerticalStepperApp);
+      fixture.detectChanges();
+    });
+
+    it('should reverse arrow key focus in RTL mode', () => {
+      let stepHeaders = fixture.debugElement.queryAll(By.css('.mat-vertical-stepper-header'));
+      assertArrowKeyInteractionInRtl(fixture, stepHeaders);
+    });
+
+    it('should reverse animation in RTL mode', () => {
+      assertCorrectStepAnimationDirection(fixture, 'rtl');
     });
   });
 
@@ -242,7 +287,7 @@ describe('MdVerticalStepper', () => {
       let stepHeaderEl = fixture.debugElement
           .queryAll(By.css('.mat-vertical-stepper-header'))[1].nativeElement;
 
-      assertLinearStepperValidity(stepHeaderEl, stepperComponent, testComponent, fixture);
+      assertLinearStepperValidity(stepHeaderEl, testComponent, fixture);
     });
 
     it('should not focus step header upon click if it is not able to be selected', () => {
@@ -250,15 +295,16 @@ describe('MdVerticalStepper', () => {
     });
 
     it('should be able to move to next step even when invalid if current step is optional', () => {
-      assertOptionalStepValidity(stepperComponent, testComponent, fixture);
+      assertOptionalStepValidity(testComponent, fixture);
     });
   });
 });
 
 /** Asserts that `selectedIndex` updates correctly when header of another step is clicked. */
-function assertSelectionChangeOnHeaderClick(stepperComponent: MdStepper,
-                                           fixture: ComponentFixture<any>,
-                                           stepHeaders: DebugElement[]) {
+function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
+                                            stepHeaders: DebugElement[]) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   expect(stepperComponent.selectedIndex).toBe(0);
 
   // select the second step
@@ -277,9 +323,9 @@ function assertSelectionChangeOnHeaderClick(stepperComponent: MdStepper,
 }
 
 /** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */
-function assertCorrectAriaExpandedAttribute(stepperComponent: MdStepper,
-                              fixture: ComponentFixture<any>,
-                              stepContents: DebugElement[]) {
+function assertCorrectAriaExpandedAttribute(fixture: ComponentFixture<any>,
+                                            stepContents: DebugElement[]) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
   let firstStepContentEl = stepContents[0].nativeElement;
   expect(firstStepContentEl.getAttribute('aria-expanded')).toBe('true');
 
@@ -292,7 +338,8 @@ function assertCorrectAriaExpandedAttribute(stepperComponent: MdStepper,
 }
 
 /** Asserts that step has correct label. */
-function assertCorrectStepLabel(stepperComponent: MdStepper, fixture: ComponentFixture<any>) {
+function assertCorrectStepLabel(fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
   let selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]');
   expect(selectedLabel.textContent).toMatch('Step 1');
 
@@ -310,7 +357,9 @@ function assertCorrectStepLabel(stepperComponent: MdStepper, fixture: ComponentF
 }
 
 /** Asserts that clicking on MdStepperNext button updates `selectedIndex` correctly. */
-function assertNextStepperButtonClick(stepperComponent: MdStepper, fixture: ComponentFixture<any>) {
+function assertNextStepperButtonClick(fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   expect(stepperComponent.selectedIndex).toBe(0);
 
   let nextButtonNativeEl = fixture.debugElement
@@ -336,8 +385,9 @@ function assertNextStepperButtonClick(stepperComponent: MdStepper, fixture: Comp
 }
 
 /** Asserts that clicking on MdStepperPrevious button updates `selectedIndex` correctly. */
-function assertPreviousStepperButtonClick(stepperComponent: MdStepper,
-                                          fixture: ComponentFixture<any>) {
+function assertPreviousStepperButtonClick(fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   expect(stepperComponent.selectedIndex).toBe(0);
 
   stepperComponent.selectedIndex = 2;
@@ -364,30 +414,48 @@ function assertPreviousStepperButtonClick(stepperComponent: MdStepper,
 }
 
 /** Asserts that step position is correct for animation. */
-function assertCorrectStepPosition(stepperComponent: MdStepper, fixture: ComponentFixture<any>) {
+function assertCorrectStepAnimationDirection(fixture: ComponentFixture<any>, rtl?: 'rtl') {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   expect(stepperComponent._getAnimationDirection(0)).toBe('current');
-  expect(stepperComponent._getAnimationDirection(1)).toBe('next');
-  expect(stepperComponent._getAnimationDirection(2)).toBe('next');
+  if (rtl === 'rtl') {
+    expect(stepperComponent._getAnimationDirection(1)).toBe('previous');
+    expect(stepperComponent._getAnimationDirection(2)).toBe('previous');
+  } else {
+    expect(stepperComponent._getAnimationDirection(1)).toBe('next');
+    expect(stepperComponent._getAnimationDirection(2)).toBe('next');
+  }
 
   stepperComponent.selectedIndex = 1;
   fixture.detectChanges();
 
-  expect(stepperComponent._getAnimationDirection(0)).toBe('previous');
+  if (rtl === 'rtl') {
+    expect(stepperComponent._getAnimationDirection(0)).toBe('next');
+    expect(stepperComponent._getAnimationDirection(2)).toBe('previous');
+  } else {
+    expect(stepperComponent._getAnimationDirection(0)).toBe('previous');
+    expect(stepperComponent._getAnimationDirection(2)).toBe('next');
+  }
   expect(stepperComponent._getAnimationDirection(1)).toBe('current');
-  expect(stepperComponent._getAnimationDirection(2)).toBe('next');
 
   stepperComponent.selectedIndex = 2;
   fixture.detectChanges();
 
-  expect(stepperComponent._getAnimationDirection(0)).toBe('previous');
-  expect(stepperComponent._getAnimationDirection(1)).toBe('previous');
+  if (rtl === 'rtl') {
+    expect(stepperComponent._getAnimationDirection(0)).toBe('next');
+    expect(stepperComponent._getAnimationDirection(1)).toBe('next');
+  } else {
+    expect(stepperComponent._getAnimationDirection(0)).toBe('previous');
+    expect(stepperComponent._getAnimationDirection(1)).toBe('previous');
+  }
   expect(stepperComponent._getAnimationDirection(2)).toBe('current');
 }
 
 /** Asserts that keyboard interaction works correctly. */
-function assertCorrectKeyboardInteraction(stepperComponent: MdStepper,
-                            fixture: ComponentFixture<any>,
-                            stepHeaders: DebugElement[]) {
+function assertCorrectKeyboardInteraction(fixture: ComponentFixture<any>,
+                                          stepHeaders: DebugElement[]) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   expect(stepperComponent._focusIndex).toBe(0);
   expect(stepperComponent.selectedIndex).toBe(0);
 
@@ -396,7 +464,7 @@ function assertCorrectKeyboardInteraction(stepperComponent: MdStepper,
   fixture.detectChanges();
 
   expect(stepperComponent._focusIndex)
-      .toBe(1, 'Expected index of focused step to be increased by 1 after RIGHT_ARROW event.');
+      .toBe(1, 'Expected index of focused step to increase by 1 after RIGHT_ARROW event.');
   expect(stepperComponent.selectedIndex)
       .toBe(0, 'Expected index of selected step to remain unchanged after RIGHT_ARROW event.');
 
@@ -408,7 +476,7 @@ function assertCorrectKeyboardInteraction(stepperComponent: MdStepper,
       .toBe(1, 'Expected index of focused step to remain unchanged after ENTER event.');
   expect(stepperComponent.selectedIndex)
       .toBe(1,
-          'Expected index of selected step to change to index of focused step after EVENT event.');
+          'Expected index of selected step to change to index of focused step after ENTER event.');
 
   stepHeaderEl = stepHeaders[1].nativeElement;
   dispatchKeyboardEvent(stepHeaderEl, 'keydown', LEFT_ARROW);
@@ -444,10 +512,9 @@ function assertCorrectKeyboardInteraction(stepperComponent: MdStepper,
 }
 
 /** Asserts that step selection change using stepper buttons does not focus step header. */
-function assertStepHeaderFocusNotCalled(stepperComponent: MdStepper,
-                                        fixture: ComponentFixture<any>) {
-  let stepHeaderEl = fixture.debugElement
-      .queryAll(By.css('md-step-header'))[1].nativeElement;
+function assertStepHeaderFocusNotCalled(fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepHeaderEl = fixture.debugElement.queryAll(By.css('md-step-header'))[1].nativeElement;
   let nextButtonNativeEl = fixture.debugElement
       .queryAll(By.directive(MdStepperNext))[0].nativeElement;
   spyOn(stepHeaderEl, 'focus');
@@ -458,14 +525,35 @@ function assertStepHeaderFocusNotCalled(stepperComponent: MdStepper,
   expect(stepHeaderEl.focus).not.toHaveBeenCalled();
 }
 
+/** Asserts that arrow key direction works correctly in RTL mode. */
+function assertArrowKeyInteractionInRtl(fixture: ComponentFixture<any>,
+                                        stepHeaders: DebugElement[]) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
+  expect(stepperComponent._focusIndex).toBe(0);
+
+  let stepHeaderEl = stepHeaders[0].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', LEFT_ARROW);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex).toBe(1);
+
+  stepHeaderEl = stepHeaders[1].nativeElement;
+  dispatchKeyboardEvent(stepHeaderEl, 'keydown', RIGHT_ARROW);
+  fixture.detectChanges();
+
+  expect(stepperComponent._focusIndex).toBe(0);
+}
+
 /**
  * Asserts that linear stepper does not allow step selection change if current step is not valid.
  */
 function assertLinearStepperValidity(stepHeaderEl: HTMLElement,
-                                    stepperComponent: MdStepper,
-                                    testComponent:
-                                        LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
-                                    fixture: ComponentFixture<any>) {
+                                     testComponent:
+                                         LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
+                                     fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   stepHeaderEl.click();
   fixture.detectChanges();
 
@@ -498,8 +586,9 @@ function assertStepHeaderBlurred(fixture: ComponentFixture<any>) {
 }
 
 /** Asserts that it is only possible to go back to a previous step if the step is editable. */
-function assertEditableStepChange(stepperComponent: MdStepper,
-                           fixture: ComponentFixture<any>) {
+function assertEditableStepChange(fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   stepperComponent.selectedIndex = 1;
   stepperComponent._steps.toArray()[0].editable = false;
   let previousButtonNativeEl = fixture.debugElement
@@ -520,9 +609,11 @@ function assertEditableStepChange(stepperComponent: MdStepper,
  * Asserts that it is possible to skip an optional step in linear stepper if there is no input
  * or the input is valid.
  */
-function assertOptionalStepValidity(stepperComponent: MdStepper,
-                           testComponent: LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
-                           fixture: ComponentFixture<any>) {
+function assertOptionalStepValidity(testComponent:
+                                        LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
+                                    fixture: ComponentFixture<any>) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+
   testComponent.oneGroup.get('oneCtrl')!.setValue('input');
   testComponent.twoGroup.get('twoCtrl')!.setValue('input');
   stepperComponent.selectedIndex = 2;
@@ -548,7 +639,7 @@ function assertOptionalStepValidity(stepperComponent: MdStepper,
   expect(stepperComponent.selectedIndex)
       .toBe(2, 'Expected selectedIndex to remain unchanged when optional step input is invalid.');
 
-  testComponent.threeGroup.get('threeCtrl')!.setValue('123@gmail.com');
+  testComponent.threeGroup.get('threeCtrl')!.setValue('valid');
   nextButtonNativeEl.click();
   fixture.detectChanges();
 
@@ -558,10 +649,10 @@ function assertOptionalStepValidity(stepperComponent: MdStepper,
 }
 
 /** Asserts that step header set the correct icon depending on the state of step. */
-function assertCorrectStepIcon(stepperComponent: MdStepper,
-                               fixture: ComponentFixture<any>,
+function assertCorrectStepIcon(fixture: ComponentFixture<any>,
                                isEditable: boolean,
                                icon: String) {
+  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
   let nextButtonNativeEl = fixture.debugElement
       .queryAll(By.directive(MdStepperNext))[0].nativeElement;
   expect(stepperComponent._getIndicatorType(0)).toBe('number');
@@ -663,7 +754,7 @@ class LinearMdHorizontalStepperApp {
       twoCtrl: new FormControl('', Validators.required)
     });
     this.threeGroup = new FormGroup({
-      threeCtrl: new FormControl('', Validators.pattern(EMAIL_REGEX))
+      threeCtrl: new FormControl('', Validators.pattern(VALID_REGEX))
     });
   }
 }
@@ -759,7 +850,7 @@ class LinearMdVerticalStepperApp {
       twoCtrl: new FormControl('', Validators.required)
     });
     this.threeGroup = new FormGroup({
-      threeCtrl: new FormControl('', Validators.pattern(EMAIL_REGEX))
+      threeCtrl: new FormControl('', Validators.pattern(VALID_REGEX))
     });
   }
 }
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 4ec7fd207d29..6f40496d2cef 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -55,9 +55,11 @@ export class MdStep extends _MdStep implements ErrorOptions {
   constructor(@Inject(forwardRef(() => MdStepper)) mdStepper: MdStepper,
               @Optional() @SkipSelf() @Inject(MD_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
     super(mdStepper);
-    this._originalErrorStateMatcher =
-        errorOptions ? errorOptions.errorStateMatcher || defaultErrorStateMatcher
-            : defaultErrorStateMatcher;
+    if (errorOptions && errorOptions.errorStateMatcher) {
+      this._originalErrorStateMatcher = errorOptions.errorStateMatcher;
+    } else {
+      this._originalErrorStateMatcher = defaultErrorStateMatcher;
+    }
   }
 
   /** Custom error state matcher that additionally checks for validity of interacted form. */

From d0eef620fe7f092f47cfe43db868e48d2669a626 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Wed, 6 Sep 2017 12:29:28 -0500
Subject: [PATCH 037/575] bug(tabs): tabs not disabled on change #6447 (#6644)

* bug(tabs): tabs not disabled on change #6447

* tests(tab): add better tests
---
 src/lib/tabs/tab-group.spec.ts | 36 ++++++++++++++++++++++++++++++++--
 src/lib/tabs/tab-group.ts      |  9 +++++++--
 src/lib/tabs/tab.ts            | 14 ++++++++++---
 3 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index 439367351a20..a82befc61f89 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -207,6 +207,35 @@ describe('MdTabGroup', () => {
     });
   });
 
+  describe('disable tabs', () => {
+    let fixture: ComponentFixture<DisabledTabsTestApp>;
+    beforeEach(() => {
+      fixture = TestBed.createComponent(DisabledTabsTestApp);
+    });
+
+    it('should have one disabled tab', () => {
+      fixture.detectChanges();
+      const labels = fixture.debugElement.queryAll(By.css('.mat-tab-disabled'));
+      expect(labels.length).toBe(1);
+    });
+
+    it('should set the disabled flag on tab', () => {
+      fixture.detectChanges();
+
+      const tabs = fixture.componentInstance.tabs.toArray();
+      let labels = fixture.debugElement.queryAll(By.css('.mat-tab-disabled'));
+      expect(tabs[2].disabled).toBe(false);
+      expect(labels.length).toBe(1);
+
+      fixture.componentInstance.isDisabled = true;
+      fixture.detectChanges();
+
+      expect(tabs[2].disabled).toBe(true);
+      labels = fixture.debugElement.queryAll(By.css('.mat-tab-disabled'));
+      expect(labels.length).toBe(2);
+    });
+  });
+
   describe('dynamic binding tabs', () => {
     let fixture: ComponentFixture<SimpleDynamicTabsTestApp>;
 
@@ -481,14 +510,17 @@ class BindedTabsTestApp {
         <ng-template md-tab-label>Tab Two</ng-template>
         Tab two content
       </md-tab>
-      <md-tab>
+      <md-tab [disabled]="isDisabled">
         <ng-template md-tab-label>Tab Three</ng-template>
         Tab three content
       </md-tab>
     </md-tab-group>
   `,
 })
-class DisabledTabsTestApp {}
+class DisabledTabsTestApp {
+  @ViewChildren(MdTab) tabs: QueryList<MdTab>;
+  isDisabled = false;
+}
 
 @Component({
   template: `
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 8c3bf330cc40..749e9d6c661c 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -231,8 +231,13 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
    * manually.
    */
   private _subscribeToTabLabels() {
-    this._tabLabelSubscription.unsubscribe();
-    this._tabLabelSubscription = merge(...this._tabs.map(tab => tab._labelChange)).subscribe(() => {
+    if (this._tabLabelSubscription) {
+      this._tabLabelSubscription.unsubscribe();
+    }
+
+    this._tabLabelSubscription = merge(
+        ...this._tabs.map(tab => tab._disableChange),
+        ...this._tabs.map(tab => tab._labelChange)).subscribe(() => {
       this._changeDetectorRef.markForCheck();
     });
   }
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index 37778064e09d..306593ae0b71 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -56,6 +56,9 @@ export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChan
   /** Emits whenever the label changes. */
   _labelChange = new Subject<void>();
 
+  /** Emits whenevfer the disable changes */
+  _disableChange = new Subject<void>();
+
   /**
    * The relatively indexed position where 0 represents the center, negative is left, and positive
    * represents the right.
@@ -77,17 +80,22 @@ export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChan
     super();
   }
 
-  ngOnChanges(changes: SimpleChanges) {
+  ngOnChanges(changes: SimpleChanges): void {
     if (changes.hasOwnProperty('textLabel')) {
       this._labelChange.next();
     }
+
+    if (changes.hasOwnProperty('disabled')) {
+      this._disableChange.next();
+    }
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
+    this._disableChange.complete();
     this._labelChange.complete();
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     this._contentPortal = new TemplatePortal(this._content, this._viewContainerRef);
   }
 }

From 87d607e71926750ed52310eed9dd902272a91222 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:30:14 +0200
Subject: [PATCH 038/575] fix(grid-list): styles not cleared when switching to
 a different styling mode (#6660)

Fixes the old styles not being cleared when switching between styling modes in the grid list (e.g. going for proportions to a fixed height).

Fixes #4047.
---
 src/lib/grid-list/grid-list.spec.ts | 32 ++++++++++++++++++++++-----
 src/lib/grid-list/grid-list.ts      | 34 ++++++++++++++++++-----------
 src/lib/grid-list/grid-tile.ts      |  2 +-
 src/lib/grid-list/tile-styler.ts    | 34 ++++++++++++++++++++++++++++-
 4 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/src/lib/grid-list/grid-list.spec.ts b/src/lib/grid-list/grid-list.spec.ts
index 6f556b40bbcc..048d430d8545 100644
--- a/src/lib/grid-list/grid-list.spec.ts
+++ b/src/lib/grid-list/grid-list.spec.ts
@@ -64,13 +64,13 @@ describe('MdGridList', () => {
   it('should use a ratio row height if passed in', () => {
     let fixture = TestBed.createComponent(GirdListWithRowHeightRatio);
 
-    fixture.componentInstance.heightRatio = '4:1';
+    fixture.componentInstance.rowHeight = '4:1';
     fixture.detectChanges();
 
     let tile = fixture.debugElement.query(By.directive(MdGridTile));
     expect(getStyle(tile, 'padding-top')).toBe('100px');
 
-    fixture.componentInstance.heightRatio = '2:1';
+    fixture.componentInstance.rowHeight = '2:1';
     fixture.detectChanges();
 
     expect(getStyle(tile, 'padding-top')).toBe('200px');
@@ -257,7 +257,7 @@ describe('MdGridList', () => {
   it('should not use calc() that evaluates to 0', () => {
     const fixture = TestBed.createComponent(GirdListWithRowHeightRatio);
 
-    fixture.componentInstance.heightRatio = '4:1';
+    fixture.componentInstance.rowHeight = '4:1';
     fixture.detectChanges();
 
     const firstTile = fixture.debugElement.query(By.directive(MdGridTile)).nativeElement;
@@ -265,6 +265,28 @@ describe('MdGridList', () => {
     expect(firstTile.style.marginTop).toBe('0px');
     expect(firstTile.style.left).toBe('0px');
   });
+
+  it('should reset the old styles when switching to a new tile styler', () => {
+    const fixture = TestBed.createComponent(GirdListWithRowHeightRatio);
+
+    fixture.componentInstance.rowHeight = '4:1';
+    fixture.detectChanges();
+
+    const list = fixture.debugElement.query(By.directive(MdGridList));
+    const tile = fixture.debugElement.query(By.directive(MdGridTile));
+
+    expect(getStyle(tile, 'padding-top')).toBe('100px');
+    expect(getStyle(list, 'padding-bottom')).toBe('100px');
+
+    fixture.componentInstance.rowHeight = '400px';
+    fixture.detectChanges();
+
+    expect(getStyle(tile, 'padding-top')).toBe('0px', 'Expected tile padding to be reset.');
+    expect(getStyle(list, 'padding-bottom')).toBe('0px', 'Expected list padding to be reset.');
+    expect(getStyle(tile, 'top')).toBe('0px');
+    expect(getStyle(tile, 'height')).toBe('400px');
+  });
+
 });
 
 
@@ -306,12 +328,12 @@ class GridListWithUnspecifiedRowHeight { }
 
 @Component({template: `
     <div style="width:400px">
-      <md-grid-list cols="1" [rowHeight]="heightRatio">
+      <md-grid-list cols="1" [rowHeight]="rowHeight">
         <md-grid-tile></md-grid-tile>
       </md-grid-list>
     </div>`})
 class GirdListWithRowHeightRatio {
-  heightRatio: string;
+  rowHeight: string;
 }
 
 @Component({template: `
diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
index 20cc6befd653..5a5581995835 100644
--- a/src/lib/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -85,8 +85,12 @@ export class MdGridList implements OnInit, AfterContentChecked {
   /** Set internal representation of row height from the user-provided value. */
   @Input()
   set rowHeight(value: string | number) {
-    this._rowHeight = coerceToString(value);
-    this._setTileStyler();
+    const newValue = coerceToString(value);
+
+    if (newValue !== this._rowHeight) {
+      this._rowHeight = newValue;
+      this._setTileStyler(this._rowHeight);
+    }
   }
 
   ngOnInit() {
@@ -106,36 +110,40 @@ export class MdGridList implements OnInit, AfterContentChecked {
   private _checkCols() {
     if (!this.cols) {
       throw Error(`md-grid-list: must pass in number of columns. ` +
-                      `Example: <md-grid-list cols="3">`);
+                  `Example: <md-grid-list cols="3">`);
     }
   }
 
   /** Default to equal width:height if rowHeight property is missing */
   private _checkRowHeight(): void {
     if (!this._rowHeight) {
-      this._tileStyler = new RatioTileStyler('1:1');
+      this._setTileStyler('1:1');
     }
   }
 
   /** Creates correct Tile Styler subtype based on rowHeight passed in by user */
-  private _setTileStyler(): void {
-    if (this._rowHeight === MD_FIT_MODE) {
+  private _setTileStyler(rowHeight: string): void {
+    if (this._tileStyler) {
+      this._tileStyler.reset(this);
+    }
+
+    if (rowHeight === MD_FIT_MODE) {
       this._tileStyler = new FitTileStyler();
-    } else if (this._rowHeight && this._rowHeight.indexOf(':') > -1) {
-      this._tileStyler = new RatioTileStyler(this._rowHeight);
+    } else if (rowHeight && rowHeight.indexOf(':') > -1) {
+      this._tileStyler = new RatioTileStyler(rowHeight);
     } else {
-      this._tileStyler = new FixedTileStyler(this._rowHeight);
+      this._tileStyler = new FixedTileStyler(rowHeight);
     }
   }
 
   /** Computes and applies the size and position for all children grid tiles. */
   private _layoutTiles(): void {
-    let tracker = new TileCoordinator(this.cols, this._tiles);
-    let direction = this._dir ? this._dir.value : 'ltr';
+    const tracker = new TileCoordinator(this.cols, this._tiles);
+    const direction = this._dir ? this._dir.value : 'ltr';
     this._tileStyler.init(this.gutterSize, tracker, this.cols, direction);
 
     this._tiles.forEach((tile, index) => {
-      let pos = tracker.positions[index];
+      const pos = tracker.positions[index];
       this._tileStyler.setStyle(tile, pos.row, pos.col);
     });
 
@@ -143,7 +151,7 @@ export class MdGridList implements OnInit, AfterContentChecked {
   }
 
   /** Sets style on the main grid-list element, given the style name and value. */
-  _setListStyle(style: [string, string] | null): void {
+  _setListStyle(style: [string, string | null] | null): void {
     if (style) {
       this._renderer.setStyle(this._element.nativeElement, style[0], style[1]);
     }
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index 24a9dc21c78d..d2f57a9ef46a 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -52,7 +52,7 @@ export class MdGridTile {
    * Sets the style of the grid-tile element.  Needs to be set manually to avoid
    * "Changed after checked" errors that would occur with HostBinding.
    */
-  _setStyle(property: string, value: string): void {
+  _setStyle(property: string, value: any): void {
     this._renderer.setStyle(this._element.nativeElement, property, value);
   }
 }
diff --git a/src/lib/grid-list/tile-styler.ts b/src/lib/grid-list/tile-styler.ts
index 6c781e3c7e67..36a897e1d583 100644
--- a/src/lib/grid-list/tile-styler.ts
+++ b/src/lib/grid-list/tile-styler.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {MdGridList} from './grid-list';
 import {MdGridTile} from './grid-tile';
 import {TileCoordinator} from './tile-coordinator';
 
@@ -139,6 +140,13 @@ export abstract class TileStyler {
    * @docs-private
    */
   getComputedHeight(): [string, string] | null { return null; }
+
+  /**
+   * Called when the tile styler is swapped out with a different one. To be used for cleanup.
+   * @param list Grid list that the styler was attached to.
+   * @docs-private
+   */
+  abstract reset(list: MdGridList);
 }
 
 
@@ -166,6 +174,15 @@ export class FixedTileStyler extends TileStyler {
       'height', calc(`${this.getTileSpan(this.fixedRowHeight)} + ${this.getGutterSpan()}`)
     ];
   }
+
+  reset(list: MdGridList) {
+    list._setListStyle(['height', null]);
+
+    list._tiles.forEach(tile => {
+      tile._setStyle('top', null);
+      tile._setStyle('height', null);
+    });
+  }
 }
 
 
@@ -203,8 +220,17 @@ export class RatioTileStyler extends TileStyler {
     ];
   }
 
+  reset(list: MdGridList) {
+    list._setListStyle(['padding-bottom', null]);
+
+    list._tiles.forEach(tile => {
+      tile._setStyle('margin-top', null);
+      tile._setStyle('padding-top', null);
+    });
+  }
+
   private _parseRatio(value: string): void {
-    let ratioParts = value.split(':');
+    const ratioParts = value.split(':');
 
     if (ratioParts.length !== 2) {
       throw Error(`md-grid-list: invalid ratio given for row-height: "${value}"`);
@@ -237,6 +263,12 @@ export class FitTileStyler extends TileStyler {
     tile._setStyle('height', calc(this.getTileSize(baseTileHeight, tile.rowspan)));
   }
 
+  reset(list: MdGridList) {
+    list._tiles.forEach(tile => {
+      tile._setStyle('top', null);
+      tile._setStyle('height', null);
+    });
+  }
 }
 
 

From f1b78d4c5f70f4168e86d72a9efb1a1eb60d222b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:34:09 +0200
Subject: [PATCH 039/575] compat: selection list not working in compatibility
 mode (#6801)

Fixes the selection list not working in M1 compatibility mode.

Fixes #6746.
---
 src/lib/list/list-option.html  | 18 ++++++++++++------
 src/lib/list/selection-list.ts |  6 ++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/lib/list/list-option.html b/src/lib/list/list-option.html
index e96faa23f06d..be563650414c 100644
--- a/src/lib/list/list-option.html
+++ b/src/lib/list/list-option.html
@@ -1,10 +1,16 @@
-<div class="mat-list-item-content"  [class.mat-list-item-content-reverse]="checkboxPosition == 'after'" [class.mat-list-item-disabled]="disabled">
-  <div class="mat-list-item-ripple" md-ripple
-       [mdRippleTrigger]="_getHostElement()"
-       [mdRippleDisabled]="_isRippleDisabled()">
-  </div>
+<div class="mat-list-item-content"
+  [class.mat-list-item-content-reverse]="checkboxPosition == 'after'"
+  [class.mat-list-item-disabled]="disabled">
+
+  <div md-ripple
+    class="mat-list-item-ripple"
+    [mdRippleTrigger]="_getHostElement()"
+    [mdRippleDisabled]="_isRippleDisabled()"></div>
+
+  <md-pseudo-checkbox #autocheckbox
+    [state]="selected ? 'checked' : 'unchecked'"
+    [disabled]="disabled"></md-pseudo-checkbox>
 
-  <md-pseudo-checkbox [state]="selected ? 'checked' : 'unchecked'" #autocheckbox [disabled]="disabled"></md-pseudo-checkbox>
   <div class="mat-list-text"><ng-content></ng-content></div>
 
 </div>
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 1e097ebdde1a..beaf0ede3759 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -33,6 +33,8 @@ import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
 import {RxChain, switchMap, startWith} from '../core/rxjs/index';
 import {merge} from 'rxjs/observable/merge';
 import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {MATERIAL_COMPATIBILITY_MODE} from '../core/compatibility/compatibility';
+
 
 export class MdSelectionListBase {}
 export const _MdSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MdSelectionListBase));
@@ -68,14 +70,14 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   },
   templateUrl: 'list-option.html',
   encapsulation: ViewEncapsulation.None,
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
 })
 export class MdListOption extends _MdListOptionMixinBase
     implements AfterContentInit, OnDestroy, FocusableOption, CanDisableRipple {
 
   private _lineSetter: MdLineSetter;
   private _selected: boolean = false;
-  /** Whether the checkbox is disabled. */
   private _disabled: boolean = false;
   private _value: any;
 

From cf1ece0f40f015e79cf4cc724459378f7b34f695 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Wed, 6 Sep 2017 10:36:08 -0700
Subject: [PATCH 040/575] Remove MaterialModule. (#6803)

BREAKING CHANGE: MaterialModule has been removed and is no longer available.  As noted in the changelog for beta.3, an aggregate module like MaterialModule prevents tools from being able to treeshake unused components and modules.
---
 src/lib/module.ts     | 98 -------------------------------------------
 src/lib/public_api.ts |  1 -
 2 files changed, 99 deletions(-)
 delete mode 100644 src/lib/module.ts

diff --git a/src/lib/module.ts b/src/lib/module.ts
deleted file mode 100644
index 66d460334b03..000000000000
--- a/src/lib/module.ts
+++ /dev/null
@@ -1,98 +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 {NgModule} from '@angular/core';
-
-import {OverlayModule} from '@angular/cdk/overlay';
-import {A11yModule} from '@angular/cdk/a11y';
-import {BidiModule} from '@angular/cdk/bidi';
-import {ObserversModule} from '@angular/cdk/observers';
-import {PortalModule} from '@angular/cdk/portal';
-
-import {MdCommonModule, MdRippleModule} from './core';
-import {MdButtonToggleModule} from './button-toggle/index';
-import {MdButtonModule} from './button/index';
-import {MdCheckboxModule} from './checkbox/index';
-import {MdRadioModule} from './radio/index';
-import {MdSelectModule} from './select/index';
-import {MdSlideToggleModule} from './slide-toggle/index';
-import {MdSliderModule} from './slider/index';
-import {MdSidenavModule} from './sidenav/index';
-import {MdListModule} from './list/index';
-import {MdGridListModule} from './grid-list/index';
-import {MdCardModule} from './card/index';
-import {MdChipsModule} from './chips/index';
-import {MdIconModule} from './icon/index';
-import {MdProgressSpinnerModule} from './progress-spinner/index';
-import {MdProgressBarModule} from './progress-bar/index';
-import {MdInputModule} from './input/index';
-import {MdSnackBarModule} from './snack-bar/index';
-import {MdTabsModule} from './tabs/index';
-import {MdToolbarModule} from './toolbar/index';
-import {MdTooltipModule} from './tooltip/index';
-import {MdMenuModule} from './menu/index';
-import {MdDialogModule} from './dialog/index';
-import {PlatformModule} from './core/platform/index';
-import {MdAutocompleteModule} from './autocomplete/index';
-import {StyleModule} from './core/style/index';
-import {MdDatepickerModule} from './datepicker/index';
-import {MdExpansionModule} from './expansion/index';
-import {MdTableModule} from './table/index';
-import {MdSortModule} from './sort/index';
-import {MdPaginatorModule} from './paginator/index';
-import {MdFormFieldModule} from './form-field/index';
-import {MdStepperModule} from './stepper/index';
-
-const MATERIAL_MODULES = [
-  MdAutocompleteModule,
-  MdButtonModule,
-  MdButtonToggleModule,
-  MdCardModule,
-  MdChipsModule,
-  MdCheckboxModule,
-  MdDatepickerModule,
-  MdTableModule,
-  MdDialogModule,
-  MdExpansionModule,
-  MdFormFieldModule,
-  MdGridListModule,
-  MdIconModule,
-  MdInputModule,
-  MdListModule,
-  MdMenuModule,
-  MdPaginatorModule,
-  MdProgressBarModule,
-  MdProgressSpinnerModule,
-  MdRadioModule,
-  MdRippleModule,
-  MdSelectModule,
-  MdSidenavModule,
-  MdSliderModule,
-  MdSlideToggleModule,
-  MdSnackBarModule,
-  MdSortModule,
-  MdStepperModule,
-  MdTabsModule,
-  MdToolbarModule,
-  MdTooltipModule,
-  OverlayModule,
-  PortalModule,
-  BidiModule,
-  StyleModule,
-  A11yModule,
-  PlatformModule,
-  MdCommonModule,
-  ObserversModule,
-];
-
-/** @deprecated */
-@NgModule({
-  imports: MATERIAL_MODULES,
-  exports: MATERIAL_MODULES,
-})
-export class MaterialModule {}
diff --git a/src/lib/public_api.ts b/src/lib/public_api.ts
index 4156ab5191d0..84a7802d0425 100644
--- a/src/lib/public_api.ts
+++ b/src/lib/public_api.ts
@@ -14,7 +14,6 @@
 
 export * from './version';
 export * from './core';
-export * from './module';
 
 export * from './autocomplete/index';
 export * from './button/index';

From 6b5100bec3c41c7d35c6c3dd4a48a1a4bf1c2443 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:36:46 +0200
Subject: [PATCH 041/575] fix(menu): nested menu hover not working when trigger
 is added lazily (#6807)

Fixes not being able to open a sub-menu if its trigger is added after initialization.

Fixes #6731.
---
 src/lib/menu/menu-directive.ts |  6 +++++-
 src/lib/menu/menu.spec.ts      | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 4dc9d57f469c..adfa8565bfac 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -35,6 +35,7 @@ import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '../core/keyboard/keycodes';
 import {merge} from 'rxjs/observable/merge';
 import {Observable} from 'rxjs/Observable';
 import {Direction} from '@angular/cdk/bidi';
+import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
 
 /** Default `md-menu` options that can be overridden. */
 export interface MdMenuDefaultOptions {
@@ -157,7 +158,10 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
 
   /** Stream that emits whenever the hovered menu item changes. */
   hover(): Observable<MdMenuItem> {
-    return merge(...this.items.map(item => item.hover));
+    return RxChain.from(this.items.changes)
+      .call(startWith, this.items)
+      .call(switchMap, (items: MdMenuItem[]) => merge(...items.map(item => item.hover)))
+      .result();
   }
 
   /** Handle a keyboard event from the menu, delegating to the appropriate action. */
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 7b77a6940f44..6006dcab4f6b 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -996,6 +996,23 @@ describe('MdMenu', () => {
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(0, 'Expected no open menus');
     }));
 
+    it('should toggle a nested menu when its trigger is added after init', fakeAsync(() => {
+      compileTestComponent();
+      instance.rootTriggerEl.nativeElement.click();
+      fixture.detectChanges();
+      expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(1, 'Expected one open menu');
+
+      instance.showLazy = true;
+      fixture.detectChanges();
+
+      const lazyTrigger = overlay.querySelector('#lazy-trigger')!;
+
+      dispatchMouseEvent(lazyTrigger, 'mouseenter');
+      fixture.detectChanges();
+      expect(lazyTrigger.classList)
+          .toContain('mat-menu-item-highlighted', 'Expected the trigger to be highlighted');
+      expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(2, 'Expected two open menus');
+    }));
 
   });
 
@@ -1126,7 +1143,11 @@ class CustomMenu {
         [mdMenuTriggerFor]="levelOne"
         #levelOneTrigger="mdMenuTrigger">One</button>
       <button md-menu-item>Two</button>
-      <button md-menu-item>Three</button>
+      <button md-menu-item
+        *ngIf="showLazy"
+        id="lazy-trigger"
+        [mdMenuTriggerFor]="lazy"
+        #lazyTrigger="mdMenuTrigger">Three</button>
     </md-menu>
 
     <md-menu #levelOne="mdMenu">
@@ -1143,6 +1164,12 @@ class CustomMenu {
       <button md-menu-item>Eight</button>
       <button md-menu-item>Nine</button>
     </md-menu>
+
+    <md-menu #lazy="mdMenu">
+      <button md-menu-item>Ten</button>
+      <button md-menu-item>Eleven</button>
+      <button md-menu-item>Twelve</button>
+    </md-menu>
   `
 })
 class NestedMenu {
@@ -1156,6 +1183,10 @@ class NestedMenu {
 
   @ViewChild('levelTwo') levelTwoMenu: MdMenu;
   @ViewChild('levelTwoTrigger') levelTwoTrigger: MdMenuTrigger;
+
+  @ViewChild('lazy') lazyMenu: MdMenu;
+  @ViewChild('lazyTrigger') lazyTrigger: MdMenuTrigger;
+  showLazy = false;
 }
 
 @Component({

From c564df61f48ff9c40eea237c394a15adac19cfdb Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 6 Sep 2017 10:37:18 -0700
Subject: [PATCH 042/575] chore: add try-catch section to coding standards
 (#6879)

---
 CODING_STANDARDS.md | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
index 1e37d6f3558f..aff6f30f3c25 100644
--- a/CODING_STANDARDS.md
+++ b/CODING_STANDARDS.md
@@ -43,6 +43,8 @@ use `//` style comments for everything else (explanations, background info, etc.
 
 In SCSS code, always use `//` style comments.
 
+In HTML code, use `<!-- ... -->` comments, which will be stripped when packaging a build.
+
 #### Prefer more focused, granular components vs. complex, configurable components.
 
 For example, rather than doing this:
@@ -198,6 +200,13 @@ Boolean properties and return values should use "Whether..." as opposed to "True
   disabled: boolean = false;
 ```
 
+#### Try-Catch
+
+Avoid `try-catch` blocks, instead preferring to prevent an error from being thrown in the first
+place. When impossible to avoid, the `try-catch` block must include a comment that explains the
+specific error being caught and why it cannot be prevented.
+
+
 #### Naming
 
 ##### General
@@ -221,7 +230,8 @@ Avoid suffixing a class with "Service", as it communicates nothing about what th
 think of the class name as a person's job title.
 
 Classes that correspond to a directive with an `md-` prefix should also be prefixed with `Md`.
-CDK classes should not have a prefix.
+CDK classes should only have a `Cdk` prefix when the class is a directive with a `cdk` selector
+prefix.
 
 ##### Methods
 The name of a method should capture the action that is performed *by* that method rather than
@@ -242,7 +252,8 @@ activateRipple() {
 #### Inheritance
 
 Avoid using inheritance to apply reusable behaviors to multiple components. This limits how many
-behaviors can be composed.
+behaviors can be composed. Instead, [TypeScript mixins][ts-mixins] can be used to compose multiple
+common behaviors into a single component.
 
 ### Angular
 
@@ -346,3 +357,5 @@ When it is not super obvious, include a brief description of what a class repres
 // Portion of the floating panel that sits, invisibly, on top of the input.
 .mat-datepicker-input-mask { }
 ```
+
+[ts-mixins]: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html#support-for-mix-in-classes

From 547d11f870274f10e7de23ec134c748e7eaf272a Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 6 Sep 2017 19:38:19 +0200
Subject: [PATCH 043/575] fix(selection-list): proper style for disabled
 options (#6829)

* No longer shows ripples if md-list-option is disabled
* Properly shows disabled style for disabled md-list-option (the `mat-list-item-disabled` class has been already added as part of the selection list PR)
---
 src/lib/list/selection-list.spec.ts | 55 +++++++++++++++++++++++++++++
 src/lib/list/selection-list.ts      |  3 +-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 926913c6e3c7..6b87ea7d4504 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -232,6 +232,52 @@ describe('MdSelectionList', () => {
     });
   });
 
+  describe('with option disabled', () => {
+    let fixture: ComponentFixture<SelectionListWithDisabledOption>;
+    let listOptionEl: HTMLElement;
+    let listOption: MdListOption;
+
+    beforeEach(async(() => {
+      TestBed.configureTestingModule({
+        imports: [MdListModule],
+        declarations: [SelectionListWithDisabledOption]
+      });
+
+      TestBed.compileComponents();
+    }));
+
+    beforeEach(async(() => {
+      fixture = TestBed.createComponent(SelectionListWithDisabledOption);
+
+      const listOptionDebug = fixture.debugElement.query(By.directive(MdListOption));
+
+      listOption = listOptionDebug.componentInstance;
+      listOptionEl = listOptionDebug.nativeElement;
+
+      fixture.detectChanges();
+    }));
+
+    it('should disable ripples for disabled option', () => {
+      expect(listOption._isRippleDisabled())
+        .toBe(false, 'Expected ripples to be enabled by default');
+
+      fixture.componentInstance.disableItem = true;
+      fixture.detectChanges();
+
+      expect(listOption._isRippleDisabled())
+        .toBe(true, 'Expected ripples to be disabled if option is disabled');
+    });
+
+    it('should apply the "mat-list-item-disabled" class properly', () => {
+      expect(listOptionEl.classList).not.toContain('mat-list-item-disabled');
+
+      fixture.componentInstance.disableItem = true;
+      fixture.detectChanges();
+
+      expect(listOptionEl.classList).toContain('mat-list-item-disabled');
+    });
+  });
+
   describe('with list disabled', () => {
     let fixture: ComponentFixture<SelectionListWithListDisabled>;
     let listOption: DebugElement[];
@@ -363,6 +409,15 @@ class SelectionListWithCheckboxPositionAfter {
 class SelectionListWithListDisabled {
 }
 
+@Component({template: `
+  <mat-selection-list>
+    <md-list-option [disabled]="disableItem">Item</md-list-option>
+  </mat-selection-list>
+  `})
+class SelectionListWithDisabledOption {
+  disableItem: boolean = false;
+}
+
 @Component({template: `
   <mat-selection-list id = "selection-list-4">
     <md-list-option checkboxPosition = "after" class="test-focus" id="123">
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index beaf0ede3759..753a6acbf370 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -65,6 +65,7 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
     '(blur)': '_handleBlur()',
     '(click)': '_handleClick()',
     'tabindex': '-1',
+    '[class.mat-list-item-disabled]': 'disabled',
     '[attr.aria-selected]': 'selected.toString()',
     '[attr.aria-disabled]': 'disabled.toString()',
   },
@@ -148,7 +149,7 @@ export class MdListOption extends _MdListOptionMixinBase
 
   /** Whether this list item should show a ripple effect when clicked.  */
   _isRippleDisabled() {
-    return this.disableRipple || this.selectionList.disableRipple;
+    return this.disabled || this.disableRipple || this.selectionList.disableRipple;
   }
 
   _handleClick() {

From d3abd726e2c847a54838b15234883006af1e0bb0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 20:13:01 +0200
Subject: [PATCH 044/575] build: add tslint rule for validating decorators
 (#6800)

* Reworks the `noViewEncapsulationRule` to turn into a more generic rule that allows us to validate multiple properties and decorators.
* Fixes a few components that were caught without a `moduleId` after implementing the new rule.
* Adds validation that all components have a `moduleId`.

Fixes #6778.
---
 src/cdk/table/row.ts                         |   2 +
 src/cdk/table/table.ts                       |   1 +
 src/cdk/table/tsconfig-build.json            |   3 +-
 src/lib/table/row.ts                         |   2 +
 tools/tslint-rules/validateDecoratorsRule.ts | 119 +++++++++++++++++++
 tslint.json                                  |  10 +-
 6 files changed, 132 insertions(+), 5 deletions(-)
 create mode 100644 tools/tslint-rules/validateDecoratorsRule.ts

diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 1c521e64846e..037cdeae5e5e 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -141,6 +141,7 @@ export class CdkCellOutlet {
 
 /** Header template container that contains the cell outlet. Adds the right class and role. */
 @Component({
+  moduleId: module.id,
   selector: 'cdk-header-row',
   template: CDK_ROW_TEMPLATE,
   host: {
@@ -154,6 +155,7 @@ export class CdkHeaderRow { }
 
 /** Data row template container that contains the cell outlet. Adds the right class and role. */
 @Component({
+  moduleId: module.id,
   selector: 'cdk-row',
   template: CDK_ROW_TEMPLATE,
   host: {
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 4bf1760e917e..791fc39a483a 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -69,6 +69,7 @@ export const CDK_TABLE_TEMPLATE = `
  * a header row and data rows. Updates the rows when new data is provided by the data source.
  */
 @Component({
+  moduleId: module.id,
   selector: 'cdk-table',
   template: CDK_TABLE_TEMPLATE,
   host: {
diff --git a/src/cdk/table/tsconfig-build.json b/src/cdk/table/tsconfig-build.json
index dfad616c974d..cacbba393c91 100644
--- a/src/cdk/table/tsconfig-build.json
+++ b/src/cdk/table/tsconfig-build.json
@@ -1,7 +1,8 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public_api.ts",
+    "../typings.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/lib/table/row.ts b/src/lib/table/row.ts
index 2549e440339d..48fbf4cb8d6d 100644
--- a/src/lib/table/row.ts
+++ b/src/lib/table/row.ts
@@ -61,6 +61,7 @@ export class MatRowDef extends _MdCdkRowDef { }
 
 /** Header template container that contains the cell outlet. Adds the right class and role. */
 @Component({
+  moduleId: module.id,
   selector: 'md-header-row, mat-header-row',
   template: CDK_ROW_TEMPLATE,
   host: {
@@ -74,6 +75,7 @@ export class MdHeaderRow extends _MdHeaderRow { }
 
 /** Data row template container that contains the cell outlet. Adds the right class and role. */
 @Component({
+  moduleId: module.id,
   selector: 'md-row, mat-row',
   template: CDK_ROW_TEMPLATE,
   host: {
diff --git a/tools/tslint-rules/validateDecoratorsRule.ts b/tools/tslint-rules/validateDecoratorsRule.ts
new file mode 100644
index 000000000000..55536dacf78a
--- /dev/null
+++ b/tools/tslint-rules/validateDecoratorsRule.ts
@@ -0,0 +1,119 @@
+import * as path from 'path';
+import * as ts from 'typescript';
+import * as Lint from 'tslint';
+import * as minimatch from 'minimatch';
+
+/**
+ * Rule that enforces certain decorator properties to be defined and to match a pattern.
+ * Supports whitelisting via the third argument. E.g.
+ *
+ * ```
+ * "validate-decorators": [true, {
+ *   "Component": {
+ *     "encapsulation": "\\.None$"
+ *   }
+ * }, "src/lib"]
+ * ```
+ */
+export class Rule extends Lint.Rules.AbstractRule {
+  apply(sourceFile: ts.SourceFile) {
+    return this.applyWithWalker(new Walker(sourceFile, this.getOptions()));
+  }
+}
+
+/** Rules that can be used to validate the decorators in a file. */
+type DecoratorRules = {[key: string]: {[key: string]: RegExp}};
+
+class Walker extends Lint.RuleWalker {
+  // Whether the file should be checked at all.
+  private _enabled: boolean;
+
+  // Rules that will be used to validate the decorators.
+  private _rules: DecoratorRules;
+
+  constructor(sourceFile: ts.SourceFile, options: Lint.IOptions) {
+    super(sourceFile, options);
+
+    // Globs that are used to determine which files to lint.
+    const fileGlobs = options.ruleArguments.slice(1) || [];
+
+    // Relative path for the current TypeScript source file.
+    const relativeFilePath = path.relative(process.cwd(), sourceFile.fileName);
+
+    this._rules = this._generateRules(options.ruleArguments[0]);
+    this._enabled = Object.keys(this._rules).length > 0 &&
+                    fileGlobs.some(p => minimatch(relativeFilePath, p));
+  }
+
+  visitClassDeclaration(node: ts.ClassDeclaration) {
+    if (this._enabled && node.decorators) {
+      node.decorators
+        .map(decorator => decorator.expression as any)
+        .filter(expression => expression.arguments.length && expression.arguments[0].properties)
+        .forEach(expression => this._validatedDecorator(expression));
+    }
+
+    super.visitClassDeclaration(node);
+  }
+
+  /**
+   * Validates that a decorator matches all of the defined rules.
+   * @param decorator Decorator to be checked.
+   */
+  private _validatedDecorator(decorator: any) {
+    // Get the rules that are relevant for the current decorator.
+    const rules = this._rules[decorator.expression.getText()];
+
+    // Don't do anything if there are no rules.
+    if (!rules) {
+      return;
+    }
+
+    // Extract the property names and values.
+    const props = decorator.arguments[0].properties.map((node: ts.PropertyAssignment) => ({
+      name: node.name.getText(),
+      value: node.initializer.getText(),
+      node
+    }));
+
+    // Find all of the rule properties that are missing from the decorator.
+    const missing = Object.keys(rules).filter(key => !props.find((prop: any) => prop.name === key));
+
+    if (missing.length) {
+      // Exit early if any of the properties are missing.
+      this.addFailureAtNode(decorator.parent, 'Missing required properties: ' + missing.join(', '));
+    } else {
+      // If all the necessary properties are defined, ensure that they match the pattern.
+      props
+        .filter((prop: any) => rules[prop.name])
+        .filter((prop: any) => !rules[prop.name].test(prop.value))
+        .forEach((prop: any) => {
+          this.addFailureAtNode(prop.node,
+              `Invalid value for property. Expected value to match "${rules[prop.name]}".`);
+        });
+    }
+  }
+
+  /**
+   * Cleans out the blank rules that are passed through the tslint.json
+   * and converts the string patterns into regular expressions.
+   * @param config Config object passed in via the tslint.json.
+   * @returns Sanitized rules.
+   */
+  private _generateRules(config: {[key: string]: {[key: string]: string}}): DecoratorRules {
+    const output: DecoratorRules = {};
+
+    if (config) {
+      Object.keys(config)
+        .filter(decoratorName => Object.keys(config[decoratorName]).length > 0)
+        .forEach(decoratorName => {
+          output[decoratorName] = Object.keys(config[decoratorName]).reduce((accumulator, prop) => {
+            accumulator[prop] = new RegExp(config[decoratorName][prop]);
+            return accumulator;
+          }, {} as {[key: string]: RegExp});
+        });
+    }
+
+    return output;
+  }
+}
diff --git a/tslint.json b/tslint.json
index af2c655674aa..527240dfd8ef 100644
--- a/tslint.json
+++ b/tslint.json
@@ -87,10 +87,12 @@
     // Custom Rules
     "ts-loader": true,
     "no-exposed-todo": true,
-    "no-view-encapsulation": [
-      true,
-      "src/+(lib|cdk)/**/!(*.spec).ts"
-    ],
+    "validate-decorators": [true, {
+      "Component": {
+        "encapsulation": "\\.None$",
+        "moduleId": "^module\\.id$"
+      }
+    }, "src/+(lib|cdk)/**/!(*.spec).ts"],
     "require-license-banner": [
       true,
       "src/+(lib|cdk)/**/!(*.spec).ts"

From 5f4c44ebb11d40e28981a87664891ff80e0c1c01 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 6 Sep 2017 22:11:30 +0200
Subject: [PATCH 045/575] build: infinite loop when determining dependencies on
 windows (#6884)

Fixes the `findstr` command going into an infinite loop on Windows due to it not being scoped to TS files.
---
 tools/package-tools/secondary-entry-points.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/package-tools/secondary-entry-points.ts b/tools/package-tools/secondary-entry-points.ts
index d646ad9709b5..935877d12eec 100644
--- a/tools/package-tools/secondary-entry-points.ts
+++ b/tools/package-tools/secondary-entry-points.ts
@@ -92,7 +92,7 @@ function buildPackageImportStatementFindCommand(searchDirectory: string, package
   if (platform() === 'win32') {
     return {
       binary: 'findstr',
-      args: ['/r', `from.'@angular/${packageName}/.*'`, `${searchDirectory}\\*`]
+      args: ['/r', `from.'@angular/${packageName}/.*'`, `${searchDirectory}\\*.ts`]
     };
   } else {
     return {

From bef6271c617f6904cc360454805ea080e2212f2a Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Wed, 6 Sep 2017 13:36:07 -0700
Subject: [PATCH 046/575] feat(stepper): Add e2e test (#6776)

* add e2e test for stepper

* create material example to run e2e tests

* Modifiy example
---
 e2e/components/stepper-e2e.spec.ts            | 84 +++++++++++++++++++
 src/e2e-app/e2e-app-module.ts                 |  4 +
 src/e2e-app/e2e-app/e2e-app.html              |  1 +
 src/e2e-app/e2e-app/routes.ts                 |  4 +-
 src/lib/stepper/stepper.md                    |  2 +
 src/material-examples/example-module.ts       |  8 ++
 src/material-examples/material-module.ts      |  3 +-
 src/material-examples/public_api.ts           |  1 +
 .../stepper-overview-example.css              |  1 +
 .../stepper-overview-example.html             | 33 ++++++++
 .../stepper-overview-example.ts               | 27 ++++++
 11 files changed, 166 insertions(+), 2 deletions(-)
 create mode 100644 e2e/components/stepper-e2e.spec.ts
 create mode 100644 src/material-examples/stepper-overview/stepper-overview-example.css
 create mode 100644 src/material-examples/stepper-overview/stepper-overview-example.html
 create mode 100644 src/material-examples/stepper-overview/stepper-overview-example.ts

diff --git a/e2e/components/stepper-e2e.spec.ts b/e2e/components/stepper-e2e.spec.ts
new file mode 100644
index 000000000000..cd9b4b3d8211
--- /dev/null
+++ b/e2e/components/stepper-e2e.spec.ts
@@ -0,0 +1,84 @@
+import {
+  browser, by, element, ElementFinder, ExpectedConditions
+} from 'protractor';
+import {expectFocusOn, expectToExist} from '../util/asserts';
+import {pressKeys} from '../util/actions';
+import {Key} from 'selenium-webdriver';
+import {screenshot} from '../screenshot';
+
+describe('stepper', () => {
+  beforeEach(() => browser.get('/stepper'));
+
+  it('should render a stepper', () => {
+    expectToExist('md-horizontal-stepper');
+    screenshot('md-horizontal-stepper');
+  });
+
+  describe('basic behavior', () => {
+    it('should change steps correctly when stepper button is clicked', async () => {
+      const previousButton = element.all(by.buttonText('Back'));
+      const nextButton = element.all(by.buttonText('Next'));
+
+      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+          .toBe('1\nFill out your name');
+
+      screenshot('start');
+      nextButton.get(0).click();
+
+      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+          .toBe('2\nFill out your address');
+
+      await browser.wait(ExpectedConditions.not(
+          ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
+      screenshot('click next');
+
+      previousButton.get(0).click();
+
+      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+          .toBe('1\nFill out your name');
+
+      await browser.wait(ExpectedConditions.not(
+          ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
+      screenshot('click back');
+    });
+
+    it('should change focus with keyboard interaction', () => {
+      let stepHeaders = element.all(by.css('md-step-header'));
+      stepHeaders.get(0).click();
+
+      expectFocusOn(stepHeaders.get(0));
+
+      pressKeys(Key.RIGHT);
+      expectFocusOn(stepHeaders.get(1));
+
+      pressKeys(Key.RIGHT);
+      expectFocusOn(stepHeaders.get(2));
+
+      pressKeys(Key.RIGHT);
+      expectFocusOn(stepHeaders.get(0));
+
+      pressKeys(Key.LEFT);
+      expectFocusOn(stepHeaders.get(2));
+
+      pressKeys(Key.SPACE, Key.ENTER);
+      expectFocusOn(stepHeaders.get(2));
+    });
+  });
+
+  describe('linear stepper', () => {
+    let linearButton: ElementFinder;
+
+    beforeEach(() => {
+      linearButton = element(by.id('toggle-linear'));
+      linearButton.click();
+    });
+
+    it('should not move to next step when stepper button is clicked', () => {
+      let nextButton = element.all(by.buttonText('Next'));
+      nextButton.get(0).click();
+
+      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+          .toBe('1\nFill out your name');
+    });
+  });
+});
diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts
index 8367ba4b7d38..e80b8c0a7817 100644
--- a/src/e2e-app/e2e-app-module.ts
+++ b/src/e2e-app/e2e-app-module.ts
@@ -35,10 +35,12 @@ import {
   MdRadioModule,
   MdSidenavModule,
   MdSlideToggleModule,
+  MdStepperModule,
   MdTabsModule,
 } from '@angular/material';
 import {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
 import {ExampleModule} from '@angular/material-examples';
+import {ReactiveFormsModule} from '@angular/forms';
 
 /**
  * NgModule that contains all Material modules that are required to serve the e2e-app.
@@ -59,6 +61,7 @@ import {ExampleModule} from '@angular/material-examples';
     MdRadioModule,
     MdSidenavModule,
     MdSlideToggleModule,
+    MdStepperModule,
     MdTabsModule,
     MdNativeDateModule,
   ]
@@ -72,6 +75,7 @@ export class E2eMaterialModule {}
     E2eMaterialModule,
     NoopAnimationsModule,
     ExampleModule,
+    ReactiveFormsModule
   ],
   declarations: [
     BasicTabs,
diff --git a/src/e2e-app/e2e-app/e2e-app.html b/src/e2e-app/e2e-app/e2e-app.html
index f21e43020247..e3631595618d 100644
--- a/src/e2e-app/e2e-app/e2e-app.html
+++ b/src/e2e-app/e2e-app/e2e-app.html
@@ -18,6 +18,7 @@
   <a md-list-item [routerLink]="['radio']">Radios</a>
   <a md-list-item [routerLink]="['sidenav']">Sidenav</a>
   <a md-list-item [routerLink]="['slide-toggle']">Slide Toggle</a>
+  <a md-list-item [routerLink]="['stepper']">Stepper</a>
   <a md-list-item [routerLink]="['tabs']">Tabs</a>
   <a md-list-item [routerLink]="['cards']">Cards</a>
   <a md-list-item [routerLink]="['toolbar']">Toolbar</a>
diff --git a/src/e2e-app/e2e-app/routes.ts b/src/e2e-app/e2e-app/routes.ts
index 938564eccdc2..db20eb234048 100644
--- a/src/e2e-app/e2e-app/routes.ts
+++ b/src/e2e-app/e2e-app/routes.ts
@@ -20,7 +20,8 @@ import {
   ListOverviewExample,
   ToolbarMultirowExample,
   ButtonToggleOverviewExample,
-  ExpansionOverviewExample
+  ExpansionOverviewExample,
+  StepperOverviewExample
 } from '@angular/material-examples';
 
 export const E2E_APP_ROUTES: Routes = [
@@ -42,6 +43,7 @@ export const E2E_APP_ROUTES: Routes = [
   {path: 'radio', component: SimpleRadioButtons},
   {path: 'sidenav', component: SidenavE2E},
   {path: 'slide-toggle', component: SlideToggleE2E},
+  {path: 'stepper', component: StepperOverviewExample},
   {path: 'tabs', component: BasicTabs},
   {path: 'cards', component: CardFancyExample},
   {path: 'toolbar', component: ToolbarMultirowExample},
diff --git a/src/lib/stepper/stepper.md b/src/lib/stepper/stepper.md
index 54e273068cf5..cf3381330478 100644
--- a/src/lib/stepper/stepper.md
+++ b/src/lib/stepper/stepper.md
@@ -1,5 +1,7 @@
 Angular Material's stepper provides a wizard-like workflow by dividing content into logical steps.
 
+<!-- example(stepper-overview) -->
+
 Material stepper builds on the foundation of the CDK stepper that is responsible for the logic
 that drives a stepped workflow. Material stepper extends the CDK stepper and has Material Design
 styling.
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 8d417f5a9ca3..0c6bdad9b549 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -74,6 +74,7 @@ import {SliderOverviewExample} from './slider-overview/slider-overview-example';
 import {PizzaPartyComponent,SnackBarComponentExample} from './snack-bar-component/snack-bar-component-example';
 import {SnackBarOverviewExample} from './snack-bar-overview/snack-bar-overview-example';
 import {SortOverviewExample} from './sort-overview/sort-overview-example';
+import {StepperOverviewExample} from './stepper-overview/stepper-overview-example';
 import {TableBasicExample} from './table-basic/table-basic-example';
 import {TableFilteringExample} from './table-filtering/table-filtering-example';
 import {TableHttpExample} from './table-http/table-http-example';
@@ -454,6 +455,12 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'stepper-overview': {
+    title: 'Stepper overview',
+    component: StepperOverviewExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'table-basic': {
     title: 'Basic table',
     component: TableBasicExample,
@@ -590,6 +597,7 @@ export const EXAMPLE_LIST = [
   PizzaPartyComponent,SnackBarComponentExample,
   SnackBarOverviewExample,
   SortOverviewExample,
+  StepperOverviewExample,
   TableBasicExample,
   TableFilteringExample,
   TableHttpExample,
diff --git a/src/material-examples/material-module.ts b/src/material-examples/material-module.ts
index 1b7bca44a486..34309d98dbbd 100644
--- a/src/material-examples/material-module.ts
+++ b/src/material-examples/material-module.ts
@@ -8,7 +8,7 @@ import {
   MdListModule, MdMenuModule, MdProgressBarModule, MdProgressSpinnerModule,
   MdRadioModule, MdSelectModule, MdSidenavModule, MdSliderModule, MdSortModule,
   MdSlideToggleModule, MdSnackBarModule, MdTableModule, MdTabsModule, MdToolbarModule,
-  MdTooltipModule, MdFormFieldModule, MdExpansionModule
+  MdTooltipModule, MdFormFieldModule, MdExpansionModule, MdStepperModule
 } from '@angular/material';
 
 @NgModule({
@@ -37,6 +37,7 @@ import {
     MdSliderModule,
     MdSidenavModule,
     MdSnackBarModule,
+    MdStepperModule,
     MdTabsModule,
     MdToolbarModule,
     MdTooltipModule,
diff --git a/src/material-examples/public_api.ts b/src/material-examples/public_api.ts
index 44e209b7b5a3..570355e84a88 100644
--- a/src/material-examples/public_api.ts
+++ b/src/material-examples/public_api.ts
@@ -7,3 +7,4 @@ export * from './card-fancy/card-fancy-example';
 export * from './toolbar-multirow/toolbar-multirow-example';
 export * from './button-toggle-overview/button-toggle-overview-example';
 export * from './expansion-overview/expansion-overview-example';
+export * from './stepper-overview/stepper-overview-example';
diff --git a/src/material-examples/stepper-overview/stepper-overview-example.css b/src/material-examples/stepper-overview/stepper-overview-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/stepper-overview/stepper-overview-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/stepper-overview/stepper-overview-example.html b/src/material-examples/stepper-overview/stepper-overview-example.html
new file mode 100644
index 000000000000..4e4408a1bec0
--- /dev/null
+++ b/src/material-examples/stepper-overview/stepper-overview-example.html
@@ -0,0 +1,33 @@
+<button (click)="isLinear=!isLinear" id="toggle-linear">Enable linear</button>
+<md-horizontal-stepper [linear]="isLinear">
+  <md-step [stepControl]="firstFormGroup">
+    <form [formGroup]="firstFormGroup">
+      <ng-template mdStepLabel>Fill out your name</ng-template>
+      <md-form-field>
+        <input mdInput placeholder="Last name, First name" formControlName="firstCtrl" required>
+      </md-form-field>
+      <div>
+        <button md-button mdStepperNext>Next</button>
+      </div>
+    </form>
+  </md-step>
+  <md-step [stepControl]="secondFormGroup">
+    <form [formGroup]="secondFormGroup">
+      <ng-template mdStepLabel>Fill out your address</ng-template>
+      <md-form-field>
+        <input mdInput placeholder="Address" formControlName="secondCtrl" required>
+      </md-form-field>
+      <div>
+        <button md-button mdStepperPrevious>Back</button>
+        <button md-button mdStepperNext>Next</button>
+      </div>
+    </form>
+  </md-step>
+  <md-step>
+    <ng-template mdStepLabel>Done</ng-template>
+    You are now done.
+    <div>
+      <button md-button mdStepperPrevious>Back</button>
+    </div>
+  </md-step>
+</md-horizontal-stepper>
diff --git a/src/material-examples/stepper-overview/stepper-overview-example.ts b/src/material-examples/stepper-overview/stepper-overview-example.ts
new file mode 100644
index 000000000000..717dcb5d0a99
--- /dev/null
+++ b/src/material-examples/stepper-overview/stepper-overview-example.ts
@@ -0,0 +1,27 @@
+import {Component} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+
+/**
+ * @title Stepper overview
+ */
+@Component({
+  selector: 'stepper-overview-example',
+  templateUrl: 'stepper-overview-example.html',
+  styleUrls: ['stepper-overview-example.css']
+})
+export class StepperOverviewExample {
+  isLinear = false;
+  firstFormGroup: FormGroup;
+  secondFormGroup: FormGroup;
+
+  constructor(private _formBuilder: FormBuilder) { }
+
+  ngOnInit() {
+    this.firstFormGroup = this._formBuilder.group({
+      firstCtrl: ['', Validators.required]
+    });
+    this.secondFormGroup = this._formBuilder.group({
+      secondCtrl: ['', Validators.required]
+    });
+  }
+}

From a7ce31e60da9a3cabd8d98fb1c7ef3919697dabb Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 8 Sep 2017 22:32:51 +0200
Subject: [PATCH 047/575] fix(slider, drawer): unsubscribe from directionaly
 change subject (#6907)

If a slider component will be destroyed, the `ngOnDestroy` hook calls `_directionality.change.unsubscribe()`, which means that the `unsubscribe` method is called on the `EventEmitter` instead of the actual `Subscription`. This causes the `EventEmitter` to be kind of "completed", which then means that there will be errors if `emit()` is called again (https://github.com/ReactiveX/rxjs/blob/master/src/Subject.ts#L96).

Also fixes that the drawer never unsubscribes from the `_dir.change` `EventEmitter`. This means that even if the component is destroyed, whenever the directionality changes, the drawer calls `validateDrawers()`.

Fixes #6892. Fixes #6903.
---
 src/cdk/bidi/bidi.md      | 13 +++++++++++--
 src/lib/sidenav/drawer.ts | 12 ++++++++++--
 src/lib/slider/slider.ts  | 13 ++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/cdk/bidi/bidi.md b/src/cdk/bidi/bidi.md
index 5627d9d16bae..d9b92efb5e8c 100644
--- a/src/cdk/bidi/bidi.md
+++ b/src/cdk/bidi/bidi.md
@@ -6,16 +6,25 @@ text direction (RTL or LTR);
 #### Example
 ```ts
 @Component({ ... }) 
-export class MyWidget {
+export class MyWidget implements OnDestroy {
+
+  /** Whether the widget is in RTL mode or not. */
   private isRtl: boolean;
   
+  /** Subscription to the Directionality change EventEmitter. */
+  private _dirChangeSubscription = Subscription.EMPTY;  
+  
   constructor(dir: Directionality) {
     this.isRtl = dir.value === 'rtl';
     
-    dir.change.subscribe(() => {
+    _dirChangeSubscription = dir.change.subscribe(() => {
       this.flipDirection();
     });
   }
+  
+  ngOnDestroy() {
+    this._dirChangeSubscription.unsubscribe();
+  }
 }  
 ```
 
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 4a00b86a035f..51e447b709b4 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -31,6 +31,7 @@ import {ESCAPE} from '../core/keyboard/keycodes';
 import {first, takeUntil, startWith} from '../core/rxjs/index';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
+import {Subscription} from 'rxjs/Subscription';
 
 
 /** Throws an exception when two MdDrawer are matching the same position. */
@@ -313,7 +314,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
 })
-export class MdDrawerContainer implements AfterContentInit {
+export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   @ContentChildren(MdDrawer) _drawers: QueryList<MdDrawer>;
 
   /** The drawer child with the `start` position. */
@@ -338,6 +339,9 @@ export class MdDrawerContainer implements AfterContentInit {
   private _left: MdDrawer | null;
   private _right: MdDrawer | null;
 
+  /** Subscription to the Directionality change EventEmitter. */
+  private _dirChangeSubscription = Subscription.EMPTY;
+
   /** Inline styles to be applied to the container. */
   _styles: { marginLeft: string; marginRight: string; transform: string; };
 
@@ -347,7 +351,7 @@ export class MdDrawerContainer implements AfterContentInit {
     // If a `Dir` directive exists up the tree, listen direction changes and update the left/right
     // properties to point to the proper start/end.
     if (_dir != null) {
-      _dir.change.subscribe(() => this._validateDrawers());
+      this._dirChangeSubscription = _dir.change.subscribe(() => this._validateDrawers());
     }
   }
 
@@ -361,6 +365,10 @@ export class MdDrawerContainer implements AfterContentInit {
     });
   }
 
+  ngOnDestroy() {
+    this._dirChangeSubscription.unsubscribe();
+  }
+
   /** Calls `open` of both start and end drawers */
   open(): void {
     this._drawers.forEach(drawer => drawer.open());
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index e794e1f4575a..3bcb41ac02d0 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -38,7 +38,7 @@ import {HammerInput} from '../core';
 import {FocusOrigin, FocusOriginMonitor} from '../core/style/focus-origin-monitor';
 import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
 import {CanColor, mixinColor} from '../core/common-behaviors/color';
-
+import {Subscription} from 'rxjs/Subscription';
 
 /**
  * Visually, a 30px separation between tick marks looks best. This is very subjective but it is
@@ -385,6 +385,9 @@ export class MdSlider extends _MdSliderMixinBase
   /** Decimal places to round to, based on the step amount. */
   private _roundLabelTo: number;
 
+  /** Subscription to the Directionality change EventEmitter. */
+  private _dirChangeSubscription = Subscription.EMPTY;
+
   /** The value of the slider when the slide start event fires. */
   private _valueOnSlideStart: number | null;
 
@@ -420,15 +423,15 @@ export class MdSlider extends _MdSliderMixinBase
           this._changeDetectorRef.detectChanges();
         });
     if (this._dir) {
-      this._dir.change.subscribe(() => this._changeDetectorRef.markForCheck());
+      this._dirChangeSubscription = this._dir.change.subscribe(() => {
+        this._changeDetectorRef.markForCheck();
+      });
     }
   }
 
   ngOnDestroy() {
     this._focusOriginMonitor.stopMonitoring(this._elementRef.nativeElement);
-    if (this._dir) {
-      this._dir.change.unsubscribe();
-    }
+    this._dirChangeSubscription.unsubscribe();
   }
 
   _onMouseenter() {

From dd37acffb6f35eead9ffcc89348466e7df3fdd6c Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 8 Sep 2017 16:27:45 -0500
Subject: [PATCH 048/575] Add complex tabs example (#6295)

* demos(tabs): add advanced demo for tabs

* demo(tabs): update example module
---
 src/material-examples/example-module.ts       |  7 ++-
 .../tabs-template-label-example.css           |  8 ++-
 .../tabs-template-label-example.html          | 49 ++++++++++++++++++-
 .../tabs-template-label-example.ts            |  3 +-
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 0c6bdad9b549..1a67aed7c9fe 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -455,6 +455,11 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  {
+    'table-basic': {
+    title: 'Basic table',
+    component: TableBasicExample,
+  },
   'stepper-overview': {
     title: 'Stepper overview',
     component: StepperOverviewExample,
@@ -504,7 +509,7 @@ export const EXAMPLE_COMPONENTS = {
     selectorName: null
   },
   'tabs-template-label': {
-    title: 'Coming soon!',
+    title: 'Complex Example',
     component: TabsTemplateLabelExample,
     additionalFiles: null,
     selectorName: null
diff --git a/src/material-examples/tabs-template-label/tabs-template-label-example.css b/src/material-examples/tabs-template-label/tabs-template-label-example.css
index 7432308753e6..804a0949ef80 100644
--- a/src/material-examples/tabs-template-label/tabs-template-label-example.css
+++ b/src/material-examples/tabs-template-label/tabs-template-label-example.css
@@ -1 +1,7 @@
-/** No CSS for this example */
+.demo-tab-group {
+  border: 1px solid #e8e8e8;
+}
+
+.demo-tab-content {
+  padding: 16px;
+}
\ No newline at end of file
diff --git a/src/material-examples/tabs-template-label/tabs-template-label-example.html b/src/material-examples/tabs-template-label/tabs-template-label-example.html
index bde67b8e9138..75b5b19dafa0 100644
--- a/src/material-examples/tabs-template-label/tabs-template-label-example.html
+++ b/src/material-examples/tabs-template-label/tabs-template-label-example.html
@@ -1 +1,48 @@
-More examples coming soon!
+<md-tab-group class="demo-tab-group">
+  <md-tab label="Tab 1">
+    <div class="demo-tab-content">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
+      Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
+      In sodales pretium ultrices. Maecenas lectus est, sollicitudin consectetur felis nec,
+      feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
+      orci enim rutrum enim, vel tempor sapien arcu a tellus.
+    </div>
+  </md-tab>
+  <md-tab label="Tab 2">
+    <ng-template md-tab-label>
+      ⭐
+    </ng-template>
+    <div class="demo-tab-content">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
+      Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
+      In sodales pretium ultrices. Maecenas lectus est, sollicitudin consectetur felis nec,
+      feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
+      orci enim rutrum enim, vel tempor sapien arcu a tellus.
+    </div>  
+  </md-tab>
+  <md-tab label="Tab 3" disabled>
+    No content  
+  </md-tab>
+  <md-tab label="Tab 4">
+   <div class="demo-tab-content">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
+      Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
+      In sodales pretium ultrices. Maecenas lectus est, sollicitudin consectetur felis nec,
+      feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
+      orci enim rutrum enim, vel tempor sapien arcu a tellus.
+      <br />
+      <br />
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
+      Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
+      In sodales pretium ultrices. Maecenas lectus est, sollicitudin consectetur felis nec,
+      feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
+      orci enim rutrum enim, vel tempor sapien arcu a tellus.
+    </div>  
+  </md-tab>
+  <md-tab label="Tab 5">
+    No content  
+  </md-tab>
+  <md-tab label="Tab 6">
+    No content  
+  </md-tab>
+</md-tab-group>
\ No newline at end of file
diff --git a/src/material-examples/tabs-template-label/tabs-template-label-example.ts b/src/material-examples/tabs-template-label/tabs-template-label-example.ts
index fe7d79d68874..0f103327b9ac 100644
--- a/src/material-examples/tabs-template-label/tabs-template-label-example.ts
+++ b/src/material-examples/tabs-template-label/tabs-template-label-example.ts
@@ -1,10 +1,11 @@
 import {Component} from '@angular/core';
 
 /**
- * @title Coming soon!
+ * @title Complex Example
  */
 @Component({
   selector: 'tabs-template-label-example',
   templateUrl: 'tabs-template-label-example.html',
+  styleUrls: ['./tabs-template-label-example.css']
 })
 export class TabsTemplateLabelExample {}

From ab20ffd9964ffadc5adec875380568414ba444b4 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 8 Sep 2017 14:28:11 -0700
Subject: [PATCH 049/575] docs(list): add example and missing JsDoc for
 selection-list (#6899)

---
 src/lib/list/list.md                          |  9 ++++++++
 src/lib/list/list.ts                          |  3 +++
 src/lib/list/selection-list.ts                | 21 ++++++++++++-------
 src/material-examples/example-module.ts       |  8 +++++++
 .../list-selection/list-selection-example.css |  1 +
 .../list-selection-example.html               |  9 ++++++++
 .../list-selection/list-selection-example.ts  | 13 ++++++++++++
 7 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 src/material-examples/list-selection/list-selection-example.css
 create mode 100644 src/material-examples/list-selection/list-selection-example.html
 create mode 100644 src/material-examples/list-selection/list-selection-example.ts

diff --git a/src/lib/list/list.md b/src/lib/list/list.md
index a46f75f071d6..f9ad2ae169dd 100644
--- a/src/lib/list/list.md
+++ b/src/lib/list/list.md
@@ -42,6 +42,15 @@ element in an `<md-list-item>`.
 </md-nav-list>
 ```
 
+### Selection lists
+A selection list provides an interface for selecting values, where each list item is an option.
+
+<!-- example(list-selection) -->
+
+The options within a selection-list should not contain further interactive controls, such
+as buttons and anchors.
+
+
 ### Multi-line lists
 For lists that require multiple lines per item, annotate each line with an `mdLine` attribute.
 Whichever heading tag is appropriate for your DOM hierarchy should be used (not necessarily `<h3>`
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 7762facbc6a5..3b9205e74211 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -33,6 +33,7 @@ export class MdListItemBase {}
 export const _MdListItemMixinBase = mixinDisableRipple(MdListItemBase);
 
 
+/** Divider between items within a list. */
 @Directive({
   selector: 'md-divider, mat-divider',
   host: {
@@ -42,6 +43,7 @@ export const _MdListItemMixinBase = mixinDisableRipple(MdListItemBase);
 })
 export class MdListDivider {}
 
+/** A Material Design list component. */
 @Component({
   moduleId: module.id,
   selector: 'md-list, mat-list, md-nav-list, mat-nav-list',
@@ -114,6 +116,7 @@ export class MdListIconCssMatStyler {}
 })
 export class MdListSubheaderCssMatStyler {}
 
+/** An item within a Material Design list. */
 @Component({
   moduleId: module.id,
   selector: 'md-list-item, mat-list-item, a[md-list-item], a[mat-list-item]',
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 753a6acbf370..a239b0e81d90 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -36,13 +36,15 @@ import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/dis
 import {MATERIAL_COMPATIBILITY_MODE} from '../core/compatibility/compatibility';
 
 
+/** @docs-private */
 export class MdSelectionListBase {}
 export const _MdSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MdSelectionListBase));
 
+/** @docs-private */
 export class MdListOptionBase {}
 export const _MdListOptionMixinBase = mixinDisableRipple(MdListOptionBase);
 
-
+/** Event emitted by a selection-list whenever the state of an option is changed. */
 export interface MdSelectionListOptionEvent {
   option: MdListOption;
 }
@@ -95,10 +97,12 @@ export class MdListOption extends _MdListOptionMixinBase
   get disabled() { return (this.selectionList && this.selectionList.disabled) || this._disabled; }
   set disabled(value: any) { this._disabled = coerceBooleanProperty(value); }
 
+  /** Value of the option */
   @Input()
   get value() { return this._value; }
   set value( val: any) { this._value = coerceBooleanProperty(val); }
 
+  /** Whether the option is selected. */
   @Input()
   get selected() { return this._selected; }
   set selected( val: boolean) { this._selected = coerceBooleanProperty(val); }
@@ -135,6 +139,7 @@ export class MdListOption extends _MdListOptionMixinBase
     this.destroyed.emit({option: this});
   }
 
+  /** Toggles the selection state of the option. */
   toggle(): void {
     this.selected = !this.selected;
     this.selectionList.selectedOptions.toggle(this);
@@ -174,6 +179,9 @@ export class MdListOption extends _MdListOptionMixinBase
 }
 
 
+/**
+ * Material Design list component where each item is a selectable option. Behaves as a listbox.
+ */
 @Component({
   moduleId: module.id,
   selector: 'md-selection-list, mat-selection-list',
@@ -208,7 +216,7 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   /** The option components contained within this selection-list. */
   @ContentChildren(MdListOption) options: QueryList<MdListOption>;
 
-  /** options which are selected. */
+  /** The currently selected options. */
   selectedOptions: SelectionModel<MdListOption> = new SelectionModel<MdListOption>(true);
 
   constructor(private _element: ElementRef) {
@@ -231,13 +239,12 @@ export class MdSelectionList extends _MdSelectionListMixinBase
     this._optionFocusSubscription.unsubscribe();
   }
 
+  /** Focus the selection-list. */
   focus() {
     this._element.nativeElement.focus();
   }
 
-  /**
-   * Map all the options' destroy event subscriptions and merge them into one stream.
-   */
+  /** Map all the options' destroy event subscriptions and merge them into one stream. */
   private _onDestroySubscription(): Subscription {
     return RxChain.from(this.options.changes)
       .call(startWith, this.options)
@@ -257,9 +264,7 @@ export class MdSelectionList extends _MdSelectionListMixinBase
       });
   }
 
-  /**
-   * Map all the options' onFocus event subscriptions and merge them into one stream.
-   */
+  /** Map all the options' onFocus event subscriptions and merge them into one stream. */
   private _onFocusSubscription(): Subscription {
     return RxChain.from(this.options.changes)
       .call(startWith, this.options)
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 1a67aed7c9fe..4b3396e8c992 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -52,6 +52,7 @@ import {InputOverviewExample} from './input-overview/input-overview-example';
 import {InputPrefixSuffixExample} from './input-prefix-suffix/input-prefix-suffix-example';
 import {ListOverviewExample} from './list-overview/list-overview-example';
 import {ListSectionsExample} from './list-sections/list-sections-example';
+import {ListSelectionExample} from './list-selection/list-selection-example';
 import {MenuIconsExample} from './menu-icons/menu-icons-example';
 import {MenuOverviewExample} from './menu-overview/menu-overview-example';
 import {PaginatorConfigurableExample} from './paginator-configurable/paginator-configurable-example';
@@ -323,6 +324,12 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'list-selection': {
+    title: 'List with selection',
+    component: ListSelectionExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'menu-icons': {
     title: 'Menu with icons',
     component: MenuIconsExample,
@@ -580,6 +587,7 @@ export const EXAMPLE_LIST = [
   InputPrefixSuffixExample,
   ListOverviewExample,
   ListSectionsExample,
+  ListSelectionExample,
   MenuIconsExample,
   MenuOverviewExample,
   PaginatorConfigurableExample,
diff --git a/src/material-examples/list-selection/list-selection-example.css b/src/material-examples/list-selection/list-selection-example.css
new file mode 100644
index 000000000000..7949471cec95
--- /dev/null
+++ b/src/material-examples/list-selection/list-selection-example.css
@@ -0,0 +1 @@
+/** No styles for this example. */
diff --git a/src/material-examples/list-selection/list-selection-example.html b/src/material-examples/list-selection/list-selection-example.html
new file mode 100644
index 000000000000..cd1d9f07353c
--- /dev/null
+++ b/src/material-examples/list-selection/list-selection-example.html
@@ -0,0 +1,9 @@
+<md-selection-list #shoes>
+  <md-list-option *ngFor="let shoe of typesOfShoes">
+    {{shoe}}
+  </md-list-option>
+</md-selection-list>
+
+<p>
+  Options selected: {{shoes.selectedOptions.selected.length}}
+</p>
diff --git a/src/material-examples/list-selection/list-selection-example.ts b/src/material-examples/list-selection/list-selection-example.ts
new file mode 100644
index 000000000000..644d3d8a5707
--- /dev/null
+++ b/src/material-examples/list-selection/list-selection-example.ts
@@ -0,0 +1,13 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title List with selection
+ */
+@Component({
+  selector: 'list-selection-example',
+  styleUrls: ['list-selection-example.css'],
+  templateUrl: 'list-selection-example.html',
+})
+export class ListSelectionExample {
+  typesOfShoes = ['Boots', 'Clogs', 'Loafers', 'Moccasins', 'Sneakers'];
+}

From 9f2fd477f24cda4e634209510162d171572ccaa0 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Fri, 8 Sep 2017 17:28:26 -0400
Subject: [PATCH 050/575] docs: sort class properties and methods (#6893)

* docs: sort class properties and methods

- Properties are sorted in the order of [Inputs, Outputs, neither]. Secondary sorting done alphabetically.
- Methods are sorted alphabetically.
- All deprecated members are sorted to the end.

* Use the same sort for methods and properties
---
 tools/dgeni/processors/categorizer.js | 38 +++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tools/dgeni/processors/categorizer.js b/tools/dgeni/processors/categorizer.js
index e5139c3020e6..d10a92f9d00d 100644
--- a/tools/dgeni/processors/categorizer.js
+++ b/tools/dgeni/processors/categorizer.js
@@ -43,6 +43,10 @@ module.exports = function categorizer() {
 
     decoratePublicDoc(classDoc);
 
+    // Sort members
+    classDoc.methods.sort(sortMembers);
+    classDoc.properties.sort(sortMembers);
+
     // Categorize the current visited classDoc into its Angular type.
     if (isDirective(classDoc)) {
       classDoc.isDirective = true;
@@ -95,6 +99,40 @@ function filterDuplicateMembers(item, _index, array) {
   return array.filter((memberDoc, i) => memberDoc.name === item.name)[0] === item;
 }
 
+/** Sorts members by deprecated status, member decorator, and name. */
+function sortMembers(docA, docB) {
+  // Sort deprecated docs to the end
+  if (!docA.isDeprecated && docB.isDeprecated) {
+    return -1;
+  }
+
+  if (docA.isDeprecated && !docB.isDeprecated) {
+    return 1;
+  }
+
+  // Sort in the order of: Inputs, Outputs, neither
+  if ((isDirectiveInput(docA) && !isDirectiveInput(docB)) ||
+      (isDirectiveOutput(docA) && !isDirectiveInput(docB) && !isDirectiveOutput(docB))) {
+    return -1;
+  }
+
+  if ((isDirectiveInput(docB) && !isDirectiveInput(docA)) ||
+      (isDirectiveOutput(docB) && !isDirectiveInput(docA) && !isDirectiveOutput(docA))) {
+    return 1;
+  }
+
+  // Break ties by sorting alphabetically on the name
+  if (docA.name < docB.name) {
+    return -1;
+  }
+
+  if (docA.name > docB.name) {
+    return 1;
+  }
+
+  return 0;
+}
+
 /**
  * The `parameters` property are the parameters extracted from TypeScript and are strings
  * of the form "propertyName: propertyType" (literally what's written in the source).

From 4f4c48c6e0bef720482a1cac144da14b37c1071f Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Fri, 8 Sep 2017 14:31:06 -0700
Subject: [PATCH 051/575] docs(drawer): Add additional documentation for
 disableClose (#6750)

* create event for ESCAPE keydown

* revert changes and update doc instead

* address comments

* minor modification

* remove mention of drawer
---
 src/lib/sidenav/drawer.ts  |  2 +-
 src/lib/sidenav/sidenav.md | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 51e447b709b4..672727ddba62 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -119,7 +119,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   /** Mode of the drawer; one of 'over', 'push' or 'side'. */
   @Input() mode: 'over' | 'push' | 'side' = 'over';
 
-  /** Whether the drawer can be closed with the escape key or not. */
+  /** Whether the drawer can be closed with the escape key or by clicking on the backdrop. */
   @Input()
   get disableClose(): boolean { return this._disableClose; }
   set disableClose(value: boolean) { this._disableClose = coerceBooleanProperty(value); }
diff --git a/src/lib/sidenav/sidenav.md b/src/lib/sidenav/sidenav.md
index e58f54c3faee..ab3a2527c32d 100644
--- a/src/lib/sidenav/sidenav.md
+++ b/src/lib/sidenav/sidenav.md
@@ -70,3 +70,15 @@ html, body, material-app, md-sidenav-container, .my-content {
 ### FABs inside sidenav
 For a sidenav with a FAB (Floating Action Button) or other floating element, the recommended approach is to place the FAB
 outside of the scrollable region and absolutely position it.
+
+
+### Disabling closing of sidenav
+By default, sidenav can be closed either by clicking on the backdrop or by pressing <kbd>ESCAPE</kbd>.
+The `disableClose` attribute can be set on `md-sidenav` to disable automatic closing when the backdrop
+is clicked or <kbd>ESCAPE</kbd> is pressed. To add custom logic on backdrop click, add a `(backdropClick)` listener to
+`md-sidenav-container`. For custom <kbd>ESCAPE</kbd> logic, a standard `(keydown)` listener will suffice.
+```html
+<md-sidenav-container (backdropClick)="customBackdropClickHandler()">
+  <md-sidenav disableClose (keydown)="customKeydownHandler($event)"></md-sidenav>
+</md-sidenav-container>
+```
\ No newline at end of file

From f2cae6e8141c90fa0b62dc8a928f217bc085667b Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 8 Sep 2017 14:33:43 -0700
Subject: [PATCH 052/575] demo(tabs): Add accessibility demo page for tabs
 (#6610)

* Add accessibility demo page for tabs

* fix lint;

* .
---
 src/demo-app/a11y/a11y-module.ts      | 13 ++++++
 src/demo-app/a11y/a11y.ts             |  1 +
 src/demo-app/a11y/routes.ts           |  3 ++
 src/demo-app/a11y/tabs/routes.ts      | 10 +++++
 src/demo-app/a11y/tabs/tabs-a11y.html | 63 ++++++++++++++++++++++++++
 src/demo-app/a11y/tabs/tabs-a11y.scss |  0
 src/demo-app/a11y/tabs/tabs-a11y.ts   | 65 +++++++++++++++++++++++++++
 7 files changed, 155 insertions(+)
 create mode 100644 src/demo-app/a11y/tabs/routes.ts
 create mode 100644 src/demo-app/a11y/tabs/tabs-a11y.html
 create mode 100644 src/demo-app/a11y/tabs/tabs-a11y.scss
 create mode 100644 src/demo-app/a11y/tabs/tabs-a11y.ts

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index 67ed60627621..79835975bcde 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -33,6 +33,12 @@ import {SliderAccessibilityDemo} from './slider/slider-a11y';
 import {SlideToggleAccessibilityDemo} from './slide-toggle/slide-toggle-a11y';
 import {SnackBarAccessibilityDemo} from './snack-bar/snack-bar-a11y';
 import {SelectAccessibilityDemo} from './select/select-a11y';
+import {
+  TabsAccessibilityDemo,
+  SunnyTabContent,
+  RainyTabContent,
+  FoggyTabContent,
+} from './tabs/tabs-a11y';
 
 
 @NgModule({
@@ -81,6 +87,10 @@ export class AccessibilityRoutingModule {}
     SlideToggleAccessibilityDemo,
     SnackBarAccessibilityDemo,
     SelectAccessibilityDemo,
+    TabsAccessibilityDemo,
+    SunnyTabContent,
+    RainyTabContent,
+    FoggyTabContent,
   ],
   entryComponents: [
     DialogAccessibilityDemo,
@@ -89,6 +99,9 @@ export class AccessibilityRoutingModule {}
     DialogNeptuneExampleDialog,
     DialogNeptuneIFrameDialog,
     DialogWelcomeExampleDialog,
+    SunnyTabContent,
+    RainyTabContent,
+    FoggyTabContent,
   ]
 })
 export class AccessibilityDemoModule {}
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 7a26c450a2ae..214d77fddbb9 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -38,6 +38,7 @@ export class AccessibilityDemo {
     {name: 'Slide toggle', route: 'slide-toggle'},
     {name: 'Snack bar', route: 'snack-bar'},
     {name: 'Select', route: 'select'},
+    {name: 'Tabs', route: 'tabs'},
     {name: 'Toolbar', route: 'toolbar'},
   ];
 
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index 7b011ad2e214..3220a0a8a0f3 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -20,6 +20,8 @@ import {SliderAccessibilityDemo} from './slider/slider-a11y';
 import {SlideToggleAccessibilityDemo} from './slide-toggle/slide-toggle-a11y';
 import {SnackBarAccessibilityDemo} from './snack-bar/snack-bar-a11y';
 import {SelectAccessibilityDemo} from './select/select-a11y';
+import {TabsAccessibilityDemo} from './tabs/tabs-a11y';
+import {TABS_DEMO_ROUTES} from './tabs/routes';
 
 export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: '', component: AccessibilityHome},
@@ -42,5 +44,6 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'slide-toggle', component: SlideToggleAccessibilityDemo},
   {path: 'snack-bar', component: SnackBarAccessibilityDemo},
   {path: 'select', component: SelectAccessibilityDemo},
+  {path: 'tabs', component: TabsAccessibilityDemo, children: TABS_DEMO_ROUTES},
   {path: 'toolbar', component: ToolbarAccessibilityDemo},
 ];
diff --git a/src/demo-app/a11y/tabs/routes.ts b/src/demo-app/a11y/tabs/routes.ts
new file mode 100644
index 000000000000..9071cf76be1a
--- /dev/null
+++ b/src/demo-app/a11y/tabs/routes.ts
@@ -0,0 +1,10 @@
+import {Routes} from '@angular/router';
+
+import {SunnyTabContent, RainyTabContent, FoggyTabContent} from './tabs-a11y';
+
+export const TABS_DEMO_ROUTES: Routes = [
+  {path: '', redirectTo: 'sunny-tab', pathMatch: 'full'},
+  {path: 'sunny-tab', component: SunnyTabContent},
+  {path: 'rainy-tab', component: RainyTabContent},
+  {path: 'foggy-tab', component: FoggyTabContent},
+];
diff --git a/src/demo-app/a11y/tabs/tabs-a11y.html b/src/demo-app/a11y/tabs/tabs-a11y.html
new file mode 100644
index 000000000000..af66c3b2889e
--- /dev/null
+++ b/src/demo-app/a11y/tabs/tabs-a11y.html
@@ -0,0 +1,63 @@
+<section>
+  <h2>Weather</h2>
+  <p>Switch tabs to navigate</p>
+
+  <nav md-tab-nav-bar aria-label="weather navigation links">
+    <a md-tab-link
+       *ngFor="let tabLink of tabLinks; let i = index"
+       [routerLink]="tabLink.link"
+       routerLinkActive #rla="routerLinkActive"
+       [active]="rla.isActive">
+      {{tabLink.label}}
+    </a>
+  </nav>
+  <router-outlet></router-outlet>
+</section>
+
+<section>
+  <h2>Dog breeds</h2>
+  <p>Dynamic height tabs</p>
+
+  <md-tab-group class="demo-tab-group" dynamicHeight>
+    <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
+      <ng-template md-tab-label>{{tab.label}}</ng-template>
+      <div class="tab-content">
+        {{tab.content}}
+        <br>
+        <br>
+        <div *ngIf="tab.extraContent">
+          The Labrador Retriever, also Labrador, is a type of retriever-gun dog. The Labrador is
+          one of the most popular breeds of dog in the United Kingdom and the United States.
+          <br>
+          <br>
+          A favourite disability assistance breed in many countries, Labradors are frequently 
+          trained to aid the blind, those who have autism, to act as a therapy dog and perform
+          screening and detection work for law enforcement and other official agencies. They are
+          prized as sporting and hunting dogs.
+          <br>
+          <br>
+          A few kennels breeding their ancestors, the St. John's water dog, were in England. 
+          At the same time, a combination of the sheep protection policy in Newfoundland and rabies
+          quarantine in the United Kingdom, led to the gradual demise of the St. John's water dog 
+          in Canada.
+          <br>
+          <br>
+          In the 1830s, the 10th Earl of Home and his nephews the 5th Duke of Buccleuch and Lord 
+          John Scott, had imported progenitors of the breed from Newfoundland to Europe for 
+          use as gundogs. Another early advocate of these Newfoundland dogs, or Labrador Retrievers 
+          as they later became known, was the 2nd Earl of Malmesbury who bred them for their 
+          expertise in waterfowling.
+
+          During the 1880s, the 3rd Earl of Malmesbury, the 6th Duke of Buccleuch and the 12th Earl 
+          of Home collaborated to develop and establish the modern Labrador breed. The dogs 
+          Buccleuch Avon and Buccleuch Ned, given by Malmesbury to Buccleuch, were mated with 
+          bitches carrying blood from those originally imported by the 5th Duke and the 10th Earl 
+          of Home. The offspring are considered to be the ancestors of modern Labradors.
+          <br>
+          <br>
+        </div>
+      </div>
+    </md-tab>
+  </md-tab-group>
+</section>
+
diff --git a/src/demo-app/a11y/tabs/tabs-a11y.scss b/src/demo-app/a11y/tabs/tabs-a11y.scss
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/demo-app/a11y/tabs/tabs-a11y.ts b/src/demo-app/a11y/tabs/tabs-a11y.ts
new file mode 100644
index 000000000000..6d6905ed1b7b
--- /dev/null
+++ b/src/demo-app/a11y/tabs/tabs-a11y.ts
@@ -0,0 +1,65 @@
+import {Component} from '@angular/core';
+
+@Component({
+  moduleId: module.id,
+  selector: 'tabs-a11y',
+  templateUrl: 'tabs-a11y.html',
+  styleUrls: ['tabs-a11y.css'],
+})
+export class TabsAccessibilityDemo {
+  // Nav bar demo
+  tabLinks = [
+    {label: 'Sun', link: 'sunny-tab'},
+    {label: 'Rain', link: 'rainy-tab'},
+    {label: 'Fog', link: 'foggy-tab'},
+  ];
+
+  // Standard tabs demo
+  tabs = [
+    {
+      label: 'German Shepherd',
+      content: `The German Shepherd is a breed of medium to large-sized working dog that originated
+          in Germany. The breed's officially recognized name is German Shepherd Dog in the
+          English language. The breed is also known as the Alsatian in Britain and Ireland.`
+    }, {
+      label: 'Labrador Retriever',
+      extraContent: true,
+      content: `The Labrador Retriever, also Labrador, is a type of retriever-gun dog. The Labrador
+          is one of the most popular breeds of dog in the United Kingdom and the United States.`
+    }, {
+      label: 'Rottweiler',
+      disabled: true,
+      content: `The Rottweiler is a breed of domestic dog, regarded as medium-to-large or large.
+          The dogs were known in German as Rottweiler Metzgerhund, meaning Rottweil butchers' dogs,
+          because their main use was to ...`
+    }, {
+      label: 'Beagle',
+      content: `The Beagle is a breed of small hound, similar in appearance to the much larger
+          foxhound. The beagle is a scent hound, developed primarily for hunting hare.`
+    },
+  ];
+}
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'sunny-routed-content',
+  template: 'Having a lot of light from the sun.',
+})
+export class SunnyTabContent {}
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'rainy-routed-content',
+  template: 'A rainy period of time is one when it rains a lot',
+})
+export class RainyTabContent {}
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'foggy-routed-content',
+  template: 'If the weather is foggy, there is fog',
+})
+export class FoggyTabContent {}

From 79a2567702216f05f79b85e92a9bd5773559a496 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 11 Sep 2017 20:32:12 +0200
Subject: [PATCH 053/575] chore: fix ts and lint error (#6956)

Fixes a TS compilation error and a lint error that somehow got into master.
---
 src/material-examples/example-module.ts                      | 5 -----
 .../tabs-template-label/tabs-template-label-example.css      | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 4b3396e8c992..7085e3abfcc8 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -462,11 +462,6 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
-  {
-    'table-basic': {
-    title: 'Basic table',
-    component: TableBasicExample,
-  },
   'stepper-overview': {
     title: 'Stepper overview',
     component: StepperOverviewExample,
diff --git a/src/material-examples/tabs-template-label/tabs-template-label-example.css b/src/material-examples/tabs-template-label/tabs-template-label-example.css
index 804a0949ef80..71d3d8b26349 100644
--- a/src/material-examples/tabs-template-label/tabs-template-label-example.css
+++ b/src/material-examples/tabs-template-label/tabs-template-label-example.css
@@ -4,4 +4,4 @@
 
 .demo-tab-content {
   padding: 16px;
-}
\ No newline at end of file
+}

From 426324b2524af01f964757bb75747863e819ec90 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 11 Sep 2017 16:00:11 -0700
Subject: [PATCH 054/575] Allow snackbar position on the screen. (#4045)

---
 src/demo-app/snack-bar/snack-bar-demo.html |  15 +-
 src/demo-app/snack-bar/snack-bar-demo.ts   |  15 +-
 src/lib/snack-bar/snack-bar-config.ts      |  12 +
 src/lib/snack-bar/snack-bar-container.scss |  20 +-
 src/lib/snack-bar/snack-bar-container.ts   |  45 +++-
 src/lib/snack-bar/snack-bar.spec.ts        | 284 +++++++++++++++++++--
 src/lib/snack-bar/snack-bar.ts             |  29 ++-
 7 files changed, 379 insertions(+), 41 deletions(-)

diff --git a/src/demo-app/snack-bar/snack-bar-demo.html b/src/demo-app/snack-bar/snack-bar-demo.html
index 7e1a56e0e35f..4d0634e59b74 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.html
+++ b/src/demo-app/snack-bar/snack-bar-demo.html
@@ -3,6 +3,20 @@ <h1>SnackBar demo</h1>
   <div>
     Message: <md-form-field><input mdInput type="text" [(ngModel)]="message"></md-form-field>
   </div>
+  <div>
+    <div>Position in page: </div>
+    <md-select [(ngModel)]="horizontalPosition">
+      <md-option value="start">Start</md-option>
+      <md-option value="end">End</md-option>
+      <md-option value="left">Left</md-option>
+      <md-option value="right">Right</md-option>
+      <md-option value="center">Center</md-option>
+    </md-select>
+    <md-select [(ngModel)]="verticalPosition">
+      <md-option value="top">Top</md-option>
+      <md-option value="bottom">Bottom</md-option>
+    </md-select>
+  </div>
   <div>
     <md-checkbox [(ngModel)]="action">
       <p *ngIf="!action">Show button on snack bar</p>
@@ -27,7 +41,6 @@ <h1>SnackBar demo</h1>
       </md-form-field>
     </md-checkbox>
   </div>
-
   <p>
     <md-checkbox [(ngModel)]="addExtraClass">Add extra class to container</md-checkbox>
   </p>
diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index d61bed273a58..6f905ce052ba 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -1,5 +1,11 @@
 import {Component, ViewEncapsulation} from '@angular/core';
-import {MdSnackBar, MdSnackBarConfig} from '@angular/material';
+import {
+  MdSnackBar,
+  MdSnackBarConfig,
+  MdSnackBarHorizontalPosition,
+  MdSnackBarVerticalPosition,
+  Dir,
+} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -15,13 +21,18 @@ export class SnackBarDemo {
   setAutoHide: boolean = true;
   autoHide: number = 10000;
   addExtraClass: boolean = false;
+  horizontalPosition: MdSnackBarHorizontalPosition = 'center';
+  verticalPosition: MdSnackBarVerticalPosition = 'bottom';
 
-  constructor(public snackBar: MdSnackBar) { }
+  constructor(public snackBar: MdSnackBar, private dir: Dir) { }
 
   open() {
     let config = new MdSnackBarConfig();
+    config.verticalPosition = this.verticalPosition;
+    config.horizontalPosition = this.horizontalPosition;
     config.duration = this.autoHide;
     config.extraClasses = this.addExtraClass ? ['party'] : undefined;
+    config.direction = this.dir.value;
     this.snackBar.open(this.message, this.action ? this.actionButtonLabel : undefined, config);
   }
 }
diff --git a/src/lib/snack-bar/snack-bar-config.ts b/src/lib/snack-bar/snack-bar-config.ts
index 85f02041e42e..4f0f2c1fa9cc 100644
--- a/src/lib/snack-bar/snack-bar-config.ts
+++ b/src/lib/snack-bar/snack-bar-config.ts
@@ -12,6 +12,12 @@ import {Direction} from '@angular/cdk/bidi';
 
 export const MD_SNACK_BAR_DATA = new InjectionToken<any>('MdSnackBarData');
 
+/** Possible values for horizontalPosition on MdSnackBarConfig. */
+export type MdSnackBarHorizontalPosition = 'start' | 'center' | 'end' | 'left' | 'right';
+
+/** Possible values for verticalPosition on MdSnackBarConfig. */
+export type MdSnackBarVerticalPosition = 'top' | 'bottom';
+
 /**
  * Configuration used when opening a snack-bar.
  */
@@ -36,4 +42,10 @@ export class MdSnackBarConfig {
 
   /** Data being injected into the child component. */
   data?: any = null;
+
+  /** The horizontal position to place the snack bar. */
+  horizontalPosition?: MdSnackBarHorizontalPosition = 'center';
+
+  /** The vertical position to place the snack bar. */
+  verticalPosition?: MdSnackBarVerticalPosition = 'bottom';
 }
diff --git a/src/lib/snack-bar/snack-bar-container.scss b/src/lib/snack-bar/snack-bar-container.scss
index 0ffe0b93b791..164040d9b079 100644
--- a/src/lib/snack-bar/snack-bar-container.scss
+++ b/src/lib/snack-bar/snack-bar-container.scss
@@ -3,18 +3,36 @@
 $mat-snack-bar-padding: 14px 24px !default;
 $mat-snack-bar-min-width: 288px !default;
 $mat-snack-bar-max-width: 568px !default;
+$mat-snack-bar-spacing-margin: 24px !default;
 
 
 .mat-snack-bar-container {
   border-radius: 2px;
   box-sizing: content-box;
   display: block;
+  margin: $mat-snack-bar-spacing-margin;
   max-width: $mat-snack-bar-max-width;
   min-width: $mat-snack-bar-min-width;
   padding: $mat-snack-bar-padding;
-  // Initial transformation is applied to start snack bar out of view.
+  // Initial transformation is applied to start snack bar out of view, below its target position.
   transform: translateY(100%);
 
+  /** 
+   * Removes margin of snack bars which are center positioned horizontally.  This
+   * is done to align snack bars to the edge of the view vertically to match spec.
+   */
+  &.mat-snack-bar-center {
+    margin: 0;
+  }
+
+  /**
+   * To allow for animations from a 'top' vertical position to animate in a downward
+   * direction, set the translation to start the snack bar above the target position.
+   */
+  &.mat-snack-bar-top {
+    transform: translateY(-100%);
+  }
+
   @include cdk-high-contrast {
     border: solid 1px;
   }
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index e0acfc2b1766..1c8c1f884006 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -38,7 +38,7 @@ import {Subject} from 'rxjs/Subject';
 import {MdSnackBarConfig} from './snack-bar-config';
 
 
-export type SnackBarState = 'initial' | 'visible' | 'complete' | 'void';
+export type SnackBarState = 'visible' | 'hidden' | 'void';
 
 // TODO(jelbourn): we can't use constants from animation.ts here because you can't use
 // a text interpolation in anything that is analyzed statically with ngc (for AoT compile).
@@ -59,15 +59,22 @@ export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
   host: {
     'role': 'alert',
     'class': 'mat-snack-bar-container',
-    '[@state]': 'animationState',
+    '[@state]': 'getAnimationState()',
     '(@state.done)': 'onAnimationEnd($event)'
   },
   animations: [
     trigger('state', [
-      state('void, initial, complete', style({transform: 'translateY(100%)'})),
-      state('visible', style({transform: 'translateY(0%)'})),
-      transition('visible => complete', animate(HIDE_ANIMATION)),
-      transition('initial => visible, void => visible', animate(SHOW_ANIMATION)),
+      // Animation from top.
+      state('visible-top', style({transform: 'translateY(0%)'})),
+      state('hidden-top', style({transform: 'translateY(-100%)'})),
+      transition('visible-top => hidden-top', animate(HIDE_ANIMATION)),
+      transition('void => visible-top', animate(SHOW_ANIMATION)),
+      // Animation from bottom.
+      state('visible-bottom', style({transform: 'translateY(0%)'})),
+      state('hidden-bottom', style({transform: 'translateY(100%)'})),
+      transition('visible-bottom => hidden-bottom', animate(HIDE_ANIMATION)),
+      transition('void => visible-bottom',
+        animate(SHOW_ANIMATION)),
     ])
   ],
 })
@@ -85,7 +92,7 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
   _onEnter: Subject<any> = new Subject();
 
   /** The state of the snack bar animations. */
-  animationState: SnackBarState = 'initial';
+  private _animationState: SnackBarState;
 
   /** The snack bar configuration. */
   snackBarConfig: MdSnackBarConfig;
@@ -98,6 +105,14 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
     super();
   }
 
+  /**
+   * Gets the current animation state both combining one of the possibilities from
+   * SnackBarState and the vertical location.
+   */
+  getAnimationState(): string {
+    return `${this._animationState}-${this.snackBarConfig.verticalPosition}`;
+  }
+
   /** Attach a component portal as content to this snack bar container. */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
     if (this._portalHost.hasAttached()) {
@@ -112,6 +127,14 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
       }
     }
 
+    if (this.snackBarConfig.horizontalPosition === 'center') {
+      this._renderer.addClass(this._elementRef.nativeElement, 'mat-snack-bar-center');
+    }
+
+    if (this.snackBarConfig.verticalPosition === 'top') {
+      this._renderer.addClass(this._elementRef.nativeElement, 'mat-snack-bar-top');
+    }
+
     return this._portalHost.attachComponentPortal(portal);
   }
 
@@ -122,11 +145,11 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
 
   /** Handle end of animations, updating the state of the snackbar. */
   onAnimationEnd(event: AnimationEvent) {
-    if (event.toState === 'void' || event.toState === 'complete') {
+    if (event.toState === 'void' || event.toState.startsWith('hidden')) {
       this._completeExit();
     }
 
-    if (event.toState === 'visible') {
+    if (event.toState.startsWith('visible')) {
       // Note: we shouldn't use `this` inside the zone callback,
       // because it can cause a memory leak.
       const onEnter = this._onEnter;
@@ -141,14 +164,14 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
   /** Begin animation of snack bar entrance into view. */
   enter(): void {
     if (!this._destroyed) {
-      this.animationState = 'visible';
+      this._animationState = 'visible';
       this._changeDetectorRef.detectChanges();
     }
   }
 
   /** Begin animation of the snack bar exiting from view. */
   exit(): Observable<void> {
-    this.animationState = 'complete';
+    this._animationState = 'hidden';
     return this._onExit;
   }
 
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 2d57d390f381..fdd1da844e82 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -22,8 +22,6 @@ import {
 } from './index';
 
 
-// TODO(josephperrott): Update tests to mock waiting for time to complete for animations.
-
 describe('MdSnackBar', () => {
   let snackBar: MdSnackBar;
   let liveAnnouncer: LiveAnnouncer;
@@ -66,7 +64,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should have the role of alert', () => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     snackBar.open(simpleMessage, simpleActionLabel, config);
 
     let containerElement = overlayContainerElement.querySelector('snack-bar-container')!;
@@ -92,7 +90,7 @@ describe('MdSnackBar', () => {
    }));
 
   it('should open a simple message with a button', () => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, simpleActionLabel, config);
 
     viewContainerFixture.detectChanges();
@@ -100,7 +98,8 @@ describe('MdSnackBar', () => {
     expect(snackBarRef.instance instanceof SimpleSnackBar)
       .toBe(true, 'Expected the snack bar content component to be SimpleSnackBar');
     expect(snackBarRef.instance.snackBarRef)
-      .toBe(snackBarRef, 'Expected the snack bar reference to be placed in the component instance');
+      .toBe(snackBarRef,
+            'Expected the snack bar reference to be placed in the component instance');
 
     let messageElement = overlayContainerElement.querySelector('snack-bar-container')!;
     expect(messageElement.textContent)
@@ -115,7 +114,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should open a simple message with no button', () => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
 
     viewContainerFixture.detectChanges();
@@ -133,7 +132,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should dismiss the snack bar and remove itself from the view', async(() => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let dismissObservableCompleted = false;
 
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
@@ -183,33 +182,38 @@ describe('MdSnackBar', () => {
   }));
 
   it('should set the animation state to visible on entry', () => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.animationState)
-        .toBe('visible', `Expected the animation state would be 'visible'.`);
+    expect(snackBarRef.containerInstance.getAnimationState())
+        .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
+    snackBarRef.dismiss();
+
+    viewContainerFixture.detectChanges();
+    expect(snackBarRef.containerInstance.getAnimationState())
+        .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
   });
 
   it('should set the animation state to complete on exit', () => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
     snackBarRef.dismiss();
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.animationState)
-        .toBe('complete', `Expected the animation state would be 'complete'.`);
+    expect(snackBarRef.containerInstance.getAnimationState())
+        .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
   });
 
   it(`should set the old snack bar animation state to complete and the new snack bar animation
       state to visible on entry of new snack bar`, async(() => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
     let dismissObservableCompleted = false;
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.animationState)
-        .toBe('visible', `Expected the animation state would be 'visible'.`);
+    expect(snackBarRef.containerInstance.getAnimationState())
+        .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
 
     let config2 = {viewContainerRef: testViewContainerRef};
     let snackBarRef2 = snackBar.open(simpleMessage, undefined, config2);
@@ -221,16 +225,17 @@ describe('MdSnackBar', () => {
 
     viewContainerFixture.whenStable().then(() => {
       expect(dismissObservableCompleted).toBe(true);
-      expect(snackBarRef.containerInstance.animationState)
-          .toBe('complete', `Expected the animation state would be 'complete'.`);
-      expect(snackBarRef2.containerInstance.animationState)
-          .toBe('visible', `Expected the animation state would be 'visible'.`);
+      expect(snackBarRef.containerInstance.getAnimationState())
+          .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
+      expect(snackBarRef2.containerInstance.getAnimationState())
+          .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
     });
   }));
 
   it('should open a new snackbar after dismissing a previous snackbar', async(() => {
-    let config = {viewContainerRef: testViewContainerRef};
+    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, 'Dismiss', config);
+
     viewContainerFixture.detectChanges();
 
     snackBarRef.dismiss();
@@ -243,7 +248,8 @@ describe('MdSnackBar', () => {
 
       // Wait for the snackbar open animation to finish.
       viewContainerFixture.whenStable().then(() => {
-        expect(snackBarRef.containerInstance.animationState).toBe('visible');
+        expect(snackBarRef.containerInstance.getAnimationState())
+            .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
       });
     });
   }));
@@ -506,6 +512,240 @@ describe('MdSnackBar with parent MdSnackBar', () => {
   }));
 });
 
+
+describe('MdSnackBar Positioning', () => {
+  let snackBar: MdSnackBar;
+  let liveAnnouncer: LiveAnnouncer;
+  let overlayContainerEl: HTMLElement;
+
+  let testViewContainerRef: ViewContainerRef;
+  let viewContainerFixture: ComponentFixture<ComponentWithChildViewContainer>;
+
+  let simpleMessage = 'Burritos are here!';
+  let simpleActionLabel = 'pickup';
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MdSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
+      providers: [
+        {provide: OverlayContainer, useFactory: () => {
+          overlayContainerEl = document.createElement('div');
+          return {getContainerElement: () => overlayContainerEl};
+        }}
+      ],
+    });
+    TestBed.compileComponents();
+  }));
+
+  beforeEach(inject([MdSnackBar, LiveAnnouncer], (sb: MdSnackBar, la: LiveAnnouncer) => {
+    snackBar = sb;
+    liveAnnouncer = la;
+  }));
+
+  afterEach(() => {
+    overlayContainerEl.innerHTML = '';
+    liveAnnouncer.ngOnDestroy();
+  });
+
+  beforeEach(() => {
+    viewContainerFixture = TestBed.createComponent(ComponentWithChildViewContainer);
+
+    viewContainerFixture.detectChanges();
+    testViewContainerRef = viewContainerFixture.componentInstance.childViewContainer;
+  });
+
+  it('should default to bottom center', () => {
+    let config: MdSnackBarConfig = {};
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+   });
+
+  it('should be in the bottom left corner', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'bottom',
+      horizontalPosition: 'left'
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+   });
+
+   it('should be in the bottom right corner', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'bottom',
+      horizontalPosition: 'right'
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+   });
+
+   it('should be in the bottom center', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'bottom',
+      horizontalPosition: 'center'
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+   });
+
+   it('should be in the top left corner', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'left'
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+   });
+
+   it('should be in the top right corner', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'right'
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+   });
+
+   it('should be in the top center', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'center'
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+   });
+
+   it('should handle start based on direction (rtl)', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'start',
+      direction: 'rtl',
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+  });
+
+  it('should handle start based on direction (ltr)', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'start',
+      direction: 'ltr',
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+  });
+
+
+  it('should handle end based on direction (rtl)', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'end',
+      direction: 'rtl',
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+  });
+
+  it('should handle end based on direction (ltr)', () => {
+    let config: MdSnackBarConfig = {
+      verticalPosition: 'top',
+      horizontalPosition: 'end',
+      direction: 'ltr',
+    };
+    snackBar.open(simpleMessage, simpleActionLabel, config);
+    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+  });
+
+});
+
+
 @Directive({selector: 'dir-with-view-container'})
 class DirectiveWithViewContainer {
   constructor(public viewContainerRef: ViewContainerRef) { }
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 8c2b89799024..8696895c04ad 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -153,11 +153,32 @@ export class MdSnackBar {
    * @param config The user-specified snack bar config.
    */
   private _createOverlay(config: MdSnackBarConfig): OverlayRef {
-    const state = new OverlayState({
-      direction: config.direction,
-      positionStrategy: this._overlay.position().global().centerHorizontally().bottom('0')
-    });
+    const state = new OverlayState();
+    state.direction = config.direction;
+
+    let positionStrategy = this._overlay.position().global();
+    // Set horizontal position.
+    const isRtl = config.direction === 'rtl';
+    const isLeft = (
+      config.horizontalPosition === 'left' ||
+      (config.horizontalPosition === 'start' && !isRtl) ||
+      (config.horizontalPosition === 'end' && isRtl));
+    const isRight = !isLeft && config.horizontalPosition !== 'center';
+    if (isLeft) {
+      positionStrategy.left('0');
+    } else if (isRight) {
+      positionStrategy.right('0');
+    } else {
+      positionStrategy.centerHorizontally();
+    }
+    // Set horizontal position.
+    if (config.verticalPosition === 'top') {
+      positionStrategy.top('0');
+    } else {
+      positionStrategy.bottom('0');
+    }
 
+    state.positionStrategy = positionStrategy;
     return this._overlay.create(state);
   }
 

From 3be4da69a015f5313edf27ab5f1b60f1c4a2acaf Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 11 Sep 2017 16:22:38 -0700
Subject: [PATCH 055/575] a11y: add service to add aria-describedby labels
 (#6168)

* checkin

* changes

* a11y(tooltip): add message element for tooltip a11y

* comments

* remove extra line

* add test for tooltip message as number

* remove fit

* use renderer

* always decrement

* add aria-describer

* add test

* tests

* md to cdk

* Add aria-hidden to container

* fix aot

* comments

* comments

* rebase

* fix prerender; add a11y docs
---
 src/cdk/a11y/aria-describer.spec.ts    | 173 +++++++++++++++++++++
 src/cdk/a11y/aria-describer.ts         | 199 +++++++++++++++++++++++++
 src/cdk/a11y/aria-reference.spec.ts    |  67 +++++++++
 src/cdk/a11y/aria-reference.ts         |  42 ++++++
 src/cdk/a11y/public_api.ts             |  18 ++-
 src/demo-app/tooltip/tooltip-demo.html |   6 +-
 src/demo-app/tooltip/tooltip-demo.ts   |   1 +
 src/lib/tooltip/index.ts               |   6 +-
 src/lib/tooltip/tooltip.md             |   6 +
 src/lib/tooltip/tooltip.spec.ts        |  58 ++++++-
 src/lib/tooltip/tooltip.ts             |  39 +++--
 11 files changed, 595 insertions(+), 20 deletions(-)
 create mode 100644 src/cdk/a11y/aria-describer.spec.ts
 create mode 100644 src/cdk/a11y/aria-describer.ts
 create mode 100644 src/cdk/a11y/aria-reference.spec.ts
 create mode 100644 src/cdk/a11y/aria-reference.ts

diff --git a/src/cdk/a11y/aria-describer.spec.ts b/src/cdk/a11y/aria-describer.spec.ts
new file mode 100644
index 000000000000..93164d3a518c
--- /dev/null
+++ b/src/cdk/a11y/aria-describer.spec.ts
@@ -0,0 +1,173 @@
+import {A11yModule, CDK_DESCRIBEDBY_HOST_ATTRIBUTE} from './index';
+import {AriaDescriber, MESSAGES_CONTAINER_ID} from './aria-describer';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {Component, ElementRef, ViewChild} from '@angular/core';
+
+describe('AriaDescriber', () => {
+  let ariaDescriber: AriaDescriber;
+  let component: TestApp;
+  let fixture: ComponentFixture<TestApp>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [A11yModule],
+      declarations: [TestApp],
+      providers: [AriaDescriber],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TestApp);
+    component = fixture.componentInstance;
+    ariaDescriber = component.ariaDescriber;
+  });
+
+  afterEach(() => {
+    ariaDescriber.ngOnDestroy();
+  });
+
+  it('should initialize without the message container', () => {
+    expect(getMessagesContainer()).toBeNull();
+  });
+
+  it('should be able to create a message element', () => {
+    ariaDescriber.describe(component.element1, 'My Message');
+    expectMessages(['My Message']);
+  });
+
+  it('should not register empty strings', () => {
+    ariaDescriber.describe(component.element1, '');
+    expect(getMessageElements()).toBe(null);
+  });
+
+  it('should de-dupe a message registered multiple times', () => {
+    ariaDescriber.describe(component.element1, 'My Message');
+    ariaDescriber.describe(component.element2, 'My Message');
+    ariaDescriber.describe(component.element3, 'My Message');
+    expectMessages(['My Message']);
+    expectMessage(component.element1, 'My Message');
+    expectMessage(component.element2, 'My Message');
+    expectMessage(component.element3, 'My Message');
+  });
+
+  it('should be able to register multiple messages', () => {
+    ariaDescriber.describe(component.element1, 'First Message');
+    ariaDescriber.describe(component.element2, 'Second Message');
+    expectMessages(['First Message', 'Second Message']);
+    expectMessage(component.element1, 'First Message');
+    expectMessage(component.element2, 'Second Message');
+  });
+
+  it('should be able to unregister messages', () => {
+    ariaDescriber.describe(component.element1, 'My Message');
+    expectMessages(['My Message']);
+
+    // Register again to check dedupe
+    ariaDescriber.describe(component.element2, 'My Message');
+    expectMessages(['My Message']);
+
+    // Unregister one message and make sure the message is still present in the container
+    ariaDescriber.removeDescription(component.element1, 'My Message');
+    expect(component.element1.hasAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE)).toBeFalsy();
+    expectMessages(['My Message']);
+
+    // Unregister the second message, message container should be gone
+    ariaDescriber.removeDescription(component.element2, 'My Message');
+    expect(component.element2.hasAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE)).toBeFalsy();
+    expect(getMessagesContainer()).toBeNull();
+  });
+
+  it('should be able to unregister messages while having others registered', () => {
+    ariaDescriber.describe(component.element1, 'Persistent Message');
+    ariaDescriber.describe(component.element2, 'My Message');
+    expectMessages(['Persistent Message', 'My Message']);
+
+    // Register again to check dedupe
+    ariaDescriber.describe(component.element3, 'My Message');
+    expectMessages(['Persistent Message', 'My Message']);
+
+    // Unregister one message and make sure the message is still present in the container
+    ariaDescriber.removeDescription(component.element2, 'My Message');
+    expectMessages(['Persistent Message', 'My Message']);
+
+    // Unregister the second message, message container should be gone
+    ariaDescriber.removeDescription(component.element3, 'My Message');
+    expectMessages(['Persistent Message']);
+  });
+
+  it('should be able to append to an existing list of aria describedby', () => {
+    ariaDescriber.describe(component.element4, 'My Message');
+    expectMessages(['My Message']);
+    expectMessage(component.element4, 'My Message');
+  });
+
+  it('should be able to handle multiple regisitrations of the same message to an element', () => {
+    ariaDescriber.describe(component.element1, 'My Message');
+    ariaDescriber.describe(component.element1, 'My Message');
+    expectMessages(['My Message']);
+    expectMessage(component.element1, 'My Message');
+  });
+});
+
+function getMessagesContainer() {
+  return document.querySelector(`#${MESSAGES_CONTAINER_ID}`);
+}
+
+function getMessageElements(): Node[] | null {
+  const messagesContainer = getMessagesContainer();
+  if (!messagesContainer) { return null; }
+
+  return messagesContainer ?  Array.prototype.slice.call(messagesContainer.children) : null;
+}
+
+/** Checks that the messages array matches the existing created message elements. */
+function expectMessages(messages: string[]) {
+  const messageElements = getMessageElements();
+  expect(messageElements).toBeDefined();
+
+  expect(messages.length).toBe(messageElements!.length);
+  messages.forEach((message, i) => {
+    expect(messageElements![i].textContent).toBe(message);
+  });
+}
+
+/** Checks that an element points to a message element that contains the message. */
+function expectMessage(el: Element, message: string) {
+  const ariaDescribedBy = el.getAttribute('aria-describedby');
+  expect(ariaDescribedBy).toBeDefined();
+
+  const cdkDescribedBy = el.getAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE);
+  expect(cdkDescribedBy).toBeDefined();
+
+  const messages = ariaDescribedBy!.split(' ').map(referenceId => {
+    const messageElement = document.querySelector(`#${referenceId}`);
+    return messageElement ? messageElement.textContent : '';
+  });
+
+  expect(messages).toContain(message);
+}
+
+@Component({
+  template: `
+    <div #element1></div>
+    <div #element2></div>
+    <div #element3></div>
+    <div #element4 aria-describedby="existing-aria-describedby1 existing-aria-describedby2"></div>
+  `,
+})
+class TestApp {
+  @ViewChild('element1') _element1: ElementRef;
+  get element1(): Element { return this._element1.nativeElement; }
+
+  @ViewChild('element2') _element2: ElementRef;
+  get element2(): Element { return this._element2.nativeElement; }
+
+  @ViewChild('element3') _element3: ElementRef;
+  get element3(): Element { return this._element3.nativeElement; }
+
+  @ViewChild('element4') _element4: ElementRef;
+  get element4(): Element { return this._element4.nativeElement; }
+
+
+  constructor(public ariaDescriber: AriaDescriber) { }
+}
diff --git a/src/cdk/a11y/aria-describer.ts b/src/cdk/a11y/aria-describer.ts
new file mode 100644
index 000000000000..cf8e7df13aa5
--- /dev/null
+++ b/src/cdk/a11y/aria-describer.ts
@@ -0,0 +1,199 @@
+/**
+ * @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 {Injectable, Optional, SkipSelf} from '@angular/core';
+import {Platform} from '@angular/cdk/platform';
+import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from './aria-reference';
+
+/**
+ * Interface used to register message elements and keep a count of how many registrations have
+ * the same message and the reference to the message element used for the aria-describedby.
+ */
+export interface RegisteredMessage {
+  messageElement: Element;
+  referenceCount: number;
+}
+
+/** ID used for the body container where all messages are appended. */
+export const MESSAGES_CONTAINER_ID = 'cdk-describedby-message-container';
+
+/** ID prefix used for each created message element. */
+export const CDK_DESCRIBEDBY_ID_PREFIX = 'cdk-describedby-message';
+
+/** Attribute given to each host element that is described by a message element. */
+export const CDK_DESCRIBEDBY_HOST_ATTRIBUTE = 'cdk-describedby-host';
+
+/** Global incremental identifier for each registered message element. */
+let nextId = 0;
+
+/** Global map of all registered message elements that have been placed into the document. */
+const messageRegistry = new Map<string, RegisteredMessage>();
+
+/** Container for all registered messages. */
+let messagesContainer: HTMLElement | null = null;
+
+/**
+ * Utility that creates visually hidden elements with a message content. Useful for elements that
+ * want to use aria-describedby to further describe themselves without adding additional visual
+ * content.
+ * @docs-private
+ */
+@Injectable()
+export class AriaDescriber {
+  constructor(private _platform: Platform) { }
+
+  /**
+   * Adds to the host element an aria-describedby reference to a hidden element that contains
+   * the message. If the same message has already been registered, then it will reuse the created
+   * message element.
+   */
+  describe(hostElement: Element, message: string) {
+    if (!this._platform.isBrowser || !`${message}`.trim()) { return; }
+
+    if (!messageRegistry.has(message)) {
+      createMessageElement(message);
+    }
+
+    if (!isElementDescribedByMessage(hostElement, message)) {
+      addMessageReference(hostElement, message);
+    }
+  }
+
+  /** Removes the host element's aria-describedby reference to the message element. */
+  removeDescription(hostElement: Element, message: string) {
+    if (!this._platform.isBrowser || !`${message}`.trim()) {
+      return;
+    }
+
+    if (isElementDescribedByMessage(hostElement, message)) {
+      removeMessageReference(hostElement, message);
+    }
+
+    if (messageRegistry.get(message)!.referenceCount === 0) {
+      deleteMessageElement(message);
+    }
+
+    if (messagesContainer!.childNodes.length === 0) {
+      deleteMessagesContainer();
+    }
+  }
+
+  /** Unregisters all created message elements and removes the message container. */
+  ngOnDestroy() {
+    if (!this._platform.isBrowser) { return; }
+
+    const describedElements = document.querySelectorAll(`[${CDK_DESCRIBEDBY_HOST_ATTRIBUTE}]`);
+    for (let i = 0; i < describedElements.length; i++) {
+      removeCdkDescribedByReferenceIds(describedElements[i]);
+      describedElements[i].removeAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE);
+    }
+
+    if (messagesContainer) {
+      deleteMessagesContainer();
+    }
+
+    messageRegistry.clear();
+  }
+}
+
+/**
+ * Creates a new element in the visually hidden message container element with the message
+ * as its content and adds it to the message registry.
+ */
+function createMessageElement(message: string) {
+  const messageElement = document.createElement('div');
+  messageElement.setAttribute('id', `${CDK_DESCRIBEDBY_ID_PREFIX}-${nextId++}`);
+  messageElement.appendChild(document.createTextNode(message)!);
+
+  if (!messagesContainer) { createMessagesContainer(); }
+  messagesContainer!.appendChild(messageElement);
+
+  messageRegistry.set(message, {messageElement, referenceCount: 0});
+}
+
+/** Deletes the message element from the global messages container. */
+function deleteMessageElement(message: string) {
+  const messageElement = messageRegistry.get(message)!.messageElement;
+  messagesContainer!.removeChild(messageElement);
+  messageRegistry.delete(message);
+}
+
+/** Creates the global container for all aria-describedby messages. */
+function createMessagesContainer() {
+  messagesContainer = document.createElement('div');
+
+  messagesContainer.setAttribute('id', MESSAGES_CONTAINER_ID);
+  messagesContainer.setAttribute('aria-hidden', 'true');
+  messagesContainer.style.display = 'none';
+  document.body.appendChild(messagesContainer);
+}
+
+/** Deletes the global messages container. */
+function deleteMessagesContainer() {
+  document.body.removeChild(messagesContainer!);
+  messagesContainer = null;
+}
+
+/** Removes all cdk-describedby messages that are hosted through the element. */
+function removeCdkDescribedByReferenceIds(element: Element) {
+  // Remove all aria-describedby reference IDs that are prefixed by CDK_DESCRIBEDBY_ID_PREFIX
+  const originalReferenceIds = getAriaReferenceIds(element, 'aria-describedby')
+      .filter(id => id.indexOf(CDK_DESCRIBEDBY_ID_PREFIX) != 0);
+  element.setAttribute('aria-describedby', originalReferenceIds.join(' '));
+}
+
+/**
+ * Adds a message reference to the element using aria-describedby and increments the registered
+ * message's reference count.
+ */
+function addMessageReference(element: Element, message: string) {
+  const registeredMessage = messageRegistry.get(message)!;
+
+  // Add the aria-describedby reference and set the describedby_host attribute to mark the element.
+  addAriaReferencedId(element, 'aria-describedby', registeredMessage.messageElement.id);
+  element.setAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE, '');
+
+  registeredMessage.referenceCount++;
+}
+
+/**
+ * Removes a message reference from the element using aria-describedby and decrements the registered
+ * message's reference count.
+ */
+function removeMessageReference(element: Element, message: string) {
+  const registeredMessage = messageRegistry.get(message)!;
+  registeredMessage.referenceCount--;
+
+  removeAriaReferencedId(element, 'aria-describedby', registeredMessage.messageElement.id);
+  element.removeAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE);
+}
+
+/** Returns true if the element has been described by the provided message ID. */
+function isElementDescribedByMessage(element: Element, message: string) {
+  const referenceIds = getAriaReferenceIds(element, 'aria-describedby');
+  const messageId = messageRegistry.get(message)!.messageElement.id;
+
+  return referenceIds.indexOf(messageId) != -1;
+}
+
+/** @docs-private */
+export function ARIA_DESCRIBER_PROVIDER_FACTORY(
+    parentDispatcher: AriaDescriber, platform: Platform) {
+  return parentDispatcher || new AriaDescriber(platform);
+}
+
+/** @docs-private */
+export const ARIA_DESCRIBER_PROVIDER = {
+  // If there is already an AriaDescriber available, use that. Otherwise, provide a new one.
+  provide: AriaDescriber,
+  deps: [
+    [new Optional(), new SkipSelf(), AriaDescriber],
+    Platform
+  ],
+  useFactory: ARIA_DESCRIBER_PROVIDER_FACTORY
+};
diff --git a/src/cdk/a11y/aria-reference.spec.ts b/src/cdk/a11y/aria-reference.spec.ts
new file mode 100644
index 000000000000..849bafb561e3
--- /dev/null
+++ b/src/cdk/a11y/aria-reference.spec.ts
@@ -0,0 +1,67 @@
+import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from './aria-reference';
+
+describe('AriaReference', () => {
+  let testElement: HTMLElement | null;
+
+  beforeEach(() => {
+    testElement = document.createElement('div');
+    document.body.appendChild(testElement);
+  });
+
+  afterEach(() => {
+    document.body.removeChild(testElement!);
+  });
+
+  it('should be able to append/remove aria reference IDs', () => {
+    addAriaReferencedId(testElement!, 'aria-describedby', 'reference_1');
+    expectIds('aria-describedby', ['reference_1']);
+
+    addAriaReferencedId(testElement!, 'aria-describedby', 'reference_2');
+    expectIds('aria-describedby', ['reference_1', 'reference_2']);
+
+    removeAriaReferencedId(testElement!, 'aria-describedby', 'reference_1');
+    expectIds('aria-describedby', ['reference_2']);
+
+    removeAriaReferencedId(testElement!, 'aria-describedby', 'reference_2');
+    expectIds('aria-describedby', []);
+  });
+
+  it('should trim whitespace when adding/removing reference IDs', () => {
+    addAriaReferencedId(testElement!, 'aria-describedby', '    reference_1   ');
+    addAriaReferencedId(testElement!, 'aria-describedby', '    reference_2   ');
+    expectIds('aria-describedby', ['reference_1', 'reference_2']);
+
+    removeAriaReferencedId(testElement!, 'aria-describedby', '   reference_1   ');
+    expectIds('aria-describedby', ['reference_2']);
+
+    removeAriaReferencedId(testElement!, 'aria-describedby', '   reference_2   ');
+    expectIds('aria-describedby', []);
+  });
+
+  it('should ignore empty string', () => {
+    addAriaReferencedId(testElement!, 'aria-describedby', '  ');
+    expectIds('aria-describedby', []);
+  });
+
+  it('should not add the same reference id if it already exists', () => {
+    addAriaReferencedId(testElement!, 'aria-describedby', 'reference_1');
+    addAriaReferencedId(testElement!, 'aria-describedby', 'reference_1');
+    expect(['reference_1']);
+  });
+
+  it('should retrieve ids that are deliminated by extra whitespace', () => {
+    testElement!.setAttribute('aria-describedby', 'reference_1      reference_2');
+    expect(getAriaReferenceIds(testElement!, 'aria-describedby'))
+        .toEqual(['reference_1', 'reference_2']);
+  });
+
+  /**
+   * Expects the equal array from getAriaReferenceIds and a space-deliminated list from
+   * the actual element attribute. If ids is empty, assumes the element should not have any
+   * value
+   */
+  function expectIds(attr: string, ids: string[]) {
+    expect(getAriaReferenceIds(testElement!, attr)).toEqual(ids);
+    expect(testElement!.getAttribute(attr)).toBe(ids.length ? ids.join(' ') : '');
+  }
+});
diff --git a/src/cdk/a11y/aria-reference.ts b/src/cdk/a11y/aria-reference.ts
new file mode 100644
index 000000000000..4202890a95bf
--- /dev/null
+++ b/src/cdk/a11y/aria-reference.ts
@@ -0,0 +1,42 @@
+/**
+ * @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
+ */
+
+/** IDs are deliminated by an empty space, as per the spec. */
+const ID_DELIMINATOR = ' ';
+
+/**
+ * Adds the given ID to the specified ARIA attribute on an element.
+ * Used for attributes such as aria-labelledby, aria-owns, etc.
+ */
+export function addAriaReferencedId(el: Element, attr: string, id: string) {
+  const ids = getAriaReferenceIds(el, attr);
+  if (ids.some(existingId => existingId.trim() == id.trim())) { return; }
+  ids.push(id.trim());
+
+  el.setAttribute(attr, ids.join(ID_DELIMINATOR));
+}
+
+/**
+ * Removes the given ID from the specified ARIA attribute on an element.
+ * Used for attributes such as aria-labelledby, aria-owns, etc.
+ */
+export function removeAriaReferencedId(el: Element, attr: string, id: string) {
+  const ids = getAriaReferenceIds(el, attr);
+  const filteredIds = ids.filter(val => val != id.trim());
+
+  el.setAttribute(attr, filteredIds.join(ID_DELIMINATOR));
+}
+
+/**
+ * Gets the list of IDs referenced by the given ARIA attribute on an element.
+ * Used for attributes such as aria-labelledby, aria-owns, etc.
+ */
+export function getAriaReferenceIds(el: Element, attr: string): string[] {
+  // Get string array of all individual ids (whitespace deliminated) in the attribute value
+  return (el.getAttribute(attr) || '').match(/\S+/g) || [];
+}
diff --git a/src/cdk/a11y/public_api.ts b/src/cdk/a11y/public_api.ts
index 2d327ccc0a20..588e73a804c4 100644
--- a/src/cdk/a11y/public_api.ts
+++ b/src/cdk/a11y/public_api.ts
@@ -7,24 +7,32 @@
  */
 
 import {NgModule} from '@angular/core';
-import {FocusTrapDirective, FocusTrapDeprecatedDirective, FocusTrapFactory} from './focus-trap';
+import {FocusTrapDeprecatedDirective, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
 import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer';
 import {InteractivityChecker} from './interactivity-checker';
 import {CommonModule} from '@angular/common';
 import {PlatformModule} from '@angular/cdk/platform';
+import {AriaDescriber, ARIA_DESCRIBER_PROVIDER} from './aria-describer';
 
 @NgModule({
   imports: [CommonModule, PlatformModule],
   declarations: [FocusTrapDirective, FocusTrapDeprecatedDirective],
   exports: [FocusTrapDirective, FocusTrapDeprecatedDirective],
-  providers: [InteractivityChecker, FocusTrapFactory, LIVE_ANNOUNCER_PROVIDER]
+  providers: [
+    InteractivityChecker,
+    FocusTrapFactory,
+    AriaDescriber,
+    LIVE_ANNOUNCER_PROVIDER,
+    ARIA_DESCRIBER_PROVIDER
+  ]
 })
 export class A11yModule {}
 
-export * from './live-announcer';
+export * from './activedescendant-key-manager';
+export * from './aria-describer';
 export * from './fake-mousedown';
+export * from './focus-key-manager';
 export * from './focus-trap';
 export * from './interactivity-checker';
 export * from './list-key-manager';
-export * from './activedescendant-key-manager';
-export * from './focus-key-manager';
+export * from './live-announcer';
diff --git a/src/demo-app/tooltip/tooltip-demo.html b/src/demo-app/tooltip/tooltip-demo.html
index b53bcb4ffa08..32845a31bf0f 100644
--- a/src/demo-app/tooltip/tooltip-demo.html
+++ b/src/demo-app/tooltip/tooltip-demo.html
@@ -1,3 +1,7 @@
+<button *ngFor="let tooltip of tooltips" mdTooltip="Tooltip message">Tooltip Button</button>
+<button (click)="tooltips.push(null)">Add tooltip</button>
+<button (click)="tooltips.shift()" [disabled]="tooltips.length == 0">Remove tooltip</button>
+
 <div class="demo-tooltip">
   <h1>Tooltip Demo</h1>
 
@@ -29,7 +33,7 @@ <h1>Tooltip Demo</h1>
   </p>
   <p>
     <strong>Message: </strong>
-    <md-form-field><input mdInput type="text" [(ngModel)]="message"></md-form-field>
+    <md-form-field><input mdInput [(ngModel)]="message"></md-form-field>
   </p>
 
   <p>
diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts
index 44801dd490f3..95b79d9f49b9 100644
--- a/src/demo-app/tooltip/tooltip-demo.ts
+++ b/src/demo-app/tooltip/tooltip-demo.ts
@@ -12,6 +12,7 @@ import {TooltipPosition} from '@angular/material';
 export class TooltipDemo {
   position: TooltipPosition = 'below';
   message: string = 'Here is the tooltip';
+  tooltips: string[] = [];
   disabled = false;
   showDelay = 0;
   hideDelay = 1000;
diff --git a/src/lib/tooltip/index.ts b/src/lib/tooltip/index.ts
index 1fa88320c3e2..f16ad06caff9 100644
--- a/src/lib/tooltip/index.ts
+++ b/src/lib/tooltip/index.ts
@@ -12,6 +12,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
 import {PlatformModule} from '@angular/cdk/platform';
 import {MdCommonModule} from '../core';
 import {MdTooltip, TooltipComponent, MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER} from './tooltip';
+import {A11yModule, ARIA_DESCRIBER_PROVIDER} from '@angular/cdk/a11y';
 
 
 @NgModule({
@@ -19,12 +20,13 @@ import {MdTooltip, TooltipComponent, MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER} from '
     CommonModule,
     OverlayModule,
     MdCommonModule,
-    PlatformModule
+    PlatformModule,
+    A11yModule,
   ],
   exports: [MdTooltip, TooltipComponent, MdCommonModule],
   declarations: [MdTooltip, TooltipComponent],
   entryComponents: [TooltipComponent],
-  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER],
+  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
 })
 export class MdTooltipModule {}
 
diff --git a/src/lib/tooltip/tooltip.md b/src/lib/tooltip/tooltip.md
index 56bf51ceab75..5359617aebcd 100644
--- a/src/lib/tooltip/tooltip.md
+++ b/src/lib/tooltip/tooltip.md
@@ -35,3 +35,9 @@ which both accept a number in milliseconds to delay before applying the display
 
 To turn off the tooltip and prevent it from showing to the user, use the `mdTooltipDisabled` input flag.
 
+### Accessibility
+
+Elements with the `mdTooltip` will add an `aria-describedby` label that provides a reference
+to a visually hidden element containing the tooltip's message. This provides screenreaders the
+information needed to read out the tooltip's contents when the end-user focuses on the element
+triggering the tooltip.
\ No newline at end of file
diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index cb451e3807e6..a251597ddc52 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -6,7 +6,13 @@ import {
   TestBed,
   tick
 } from '@angular/core/testing';
-import {ChangeDetectionStrategy, Component, DebugElement, ViewChild} from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  DebugElement,
+  ElementRef,
+  ViewChild
+} from '@angular/core';
 import {AnimationEvent} from '@angular/animations';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -32,7 +38,12 @@ describe('MdTooltip', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MdTooltipModule, OverlayModule, NoopAnimationsModule],
-      declarations: [BasicTooltipDemo, ScrollableTooltipDemo, OnPushTooltipDemo],
+      declarations: [
+        BasicTooltipDemo,
+        ScrollableTooltipDemo,
+        OnPushTooltipDemo,
+        DynamicTooltipsDemo
+      ],
       providers: [
         {provide: Platform, useValue: {IOS: false, isBrowser: true}},
         {provide: OverlayContainer, useFactory: () => {
@@ -287,6 +298,21 @@ describe('MdTooltip', () => {
       expect(overlayContainerElement.textContent).toBe('');
     }));
 
+    it('should have an aria-described element with the tooltip message', () => {
+      const dynamicTooltipsDemoFixture = TestBed.createComponent(DynamicTooltipsDemo);
+      const dynamicTooltipsComponent = dynamicTooltipsDemoFixture.componentInstance;
+
+      dynamicTooltipsComponent.tooltips = ['Tooltip One', 'Tooltip Two'];
+      dynamicTooltipsDemoFixture.detectChanges();
+
+      const buttons = dynamicTooltipsComponent.getButtons();
+      const firstButtonAria = buttons[0].getAttribute('aria-describedby');
+      expect(document.querySelector(`#${firstButtonAria}`)!.textContent).toBe('Tooltip One');
+
+      const secondButtonAria = buttons[1].getAttribute('aria-describedby');
+      expect(document.querySelector(`#${secondButtonAria}`)!.textContent).toBe('Tooltip Two');
+    });
+
     it('should not try to dispose the tooltip when destroyed and done hiding', fakeAsync(() => {
       tooltipDirective.show();
       fixture.detectChanges();
@@ -403,6 +429,13 @@ describe('MdTooltip', () => {
       expect(tooltipWrapper).toBeTruthy('Expected tooltip to be shown.');
       expect(tooltipWrapper.getAttribute('dir')).toBe('rtl', 'Expected tooltip to be in RTL mode.');
     }));
+
+    it('should be able to set the tooltip message as a number', fakeAsync(() => {
+      fixture.componentInstance.message = 100;
+      fixture.detectChanges();
+
+      expect(tooltipDirective.message).toBe('100');
+    }));
   });
 
   describe('scrollable usage', () => {
@@ -516,7 +549,7 @@ describe('MdTooltip', () => {
 })
 class BasicTooltipDemo {
   position: string = 'below';
-  message: string = initialTooltipMessage;
+  message: any = initialTooltipMessage;
   showButton: boolean = true;
   showTooltipClass = false;
   @ViewChild(MdTooltip) tooltip: MdTooltip;
@@ -565,3 +598,22 @@ class OnPushTooltipDemo {
   position: string = 'below';
   message: string = initialTooltipMessage;
 }
+
+
+@Component({
+  selector: 'app',
+  template: `
+    <button *ngFor="let tooltip of tooltips"
+            [mdTooltip]="tooltip">
+      Button {{tooltip}}
+    </button>`,
+})
+class DynamicTooltipsDemo {
+  tooltips: Array<string> = [];
+
+  constructor(private _elementRef: ElementRef) {}
+
+  getButtons() {
+    return this._elementRef.nativeElement.querySelectorAll('button');
+  }
+}
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 29a89a81c880..c12ab8951118 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -43,6 +43,8 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {AriaDescriber} from '@angular/cdk/a11y';
 
 
 export type TooltipPosition = 'left' | 'right' | 'above' | 'below' | 'before' | 'after';
@@ -77,8 +79,6 @@ export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
   deps: [Overlay],
   useFactory: MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY
 };
-
-
 /**
  * Directive that attaches a material design tooltip to the host element. Animates the showing and
  * hiding of a tooltip provided position (defaults to below the element).
@@ -89,6 +89,9 @@ export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
   selector: '[md-tooltip], [mdTooltip], [mat-tooltip], [matTooltip]',
   host: {
     '(longpress)': 'show()',
+    '(focus)': 'show()',
+    '(blur)': 'hide(0)',
+    '(keydown)': '_handleKeydown($event)',
     '(touchend)': 'hide(' + TOUCHEND_HIDE_DELAY + ')',
   },
   exportAs: 'mdTooltip',
@@ -144,8 +147,14 @@ export class MdTooltip implements OnDestroy {
   /** The message to be displayed in the tooltip */
   @Input('mdTooltip') get message() { return this._message; }
   set message(value: string) {
-    this._message = value;
-    this._setTooltipMessage(this._message);
+    if (this._message) {
+      this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message);
+    }
+
+    // If the message is not a string (e.g. number), convert it to a string and trim it.
+    this._message = value ? `${value}`.trim() : '';
+    this._updateTooltipMessage();
+    this._ariaDescriber.describe(this._elementRef.nativeElement, this.message);
   }
 
   /** Classes to be passed to the tooltip. Supports the same syntax as `ngClass`. */
@@ -204,6 +213,7 @@ export class MdTooltip implements OnDestroy {
     private _viewContainerRef: ViewContainerRef,
     private _ngZone: NgZone,
     private _platform: Platform,
+    private _ariaDescriber: AriaDescriber,
     @Inject(MD_TOOLTIP_SCROLL_STRATEGY) private _scrollStrategy,
     @Optional() private _dir: Directionality) {
 
@@ -229,18 +239,20 @@ export class MdTooltip implements OnDestroy {
       this._enterListener();
       this._leaveListener();
     }
+
+    this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this.message);
   }
 
   /** Shows the tooltip after the delay in ms, defaults to tooltip-delay-show or 0ms if no input */
   show(delay: number = this.showDelay): void {
-    if (this.disabled || !this._message || !this._message.trim()) { return; }
+    if (this.disabled || !this.message) { return; }
 
     if (!this._tooltipInstance) {
       this._createTooltip();
     }
 
     this._setTooltipClass(this._tooltipClass);
-    this._setTooltipMessage(this._message);
+    this._updateTooltipMessage();
     this._tooltipInstance!.show(this._position, delay);
   }
 
@@ -261,6 +273,14 @@ export class MdTooltip implements OnDestroy {
     return !!this._tooltipInstance && this._tooltipInstance.isVisible();
   }
 
+  /** Handles the keydown events on the host element. */
+  _handleKeydown(e: KeyboardEvent) {
+    if (this._tooltipInstance!.isVisible() && e.keyCode === ESCAPE) {
+      e.stopPropagation();
+      this.hide(0);
+    }
+  }
+
   /** Create the tooltip to display */
   private _createTooltip(): void {
     let overlayRef = this._createOverlay();
@@ -365,11 +385,11 @@ export class MdTooltip implements OnDestroy {
   }
 
   /** Updates the tooltip message and repositions the overlay according to the new message length */
-  private _setTooltipMessage(message: string) {
+  private _updateTooltipMessage() {
     // Must wait for the message to be painted to the tooltip so that the overlay can properly
     // calculate the correct positioning based on the size of the text.
     if (this._tooltipInstance) {
-      this._tooltipInstance.message = message;
+      this._tooltipInstance.message = this.message;
       this._tooltipInstance._markForCheck();
 
       first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => {
@@ -416,7 +436,8 @@ export type TooltipVisibility = 'initial' | 'visible' | 'hidden';
     // Forces the element to have a layout in IE and Edge. This fixes issues where the element
     // won't be rendered if the animations are disabled or there is no web animations polyfill.
     '[style.zoom]': '_visibility === "visible" ? 1 : null',
-    '(body:click)': 'this._handleBodyInteraction()'
+    '(body:click)': 'this._handleBodyInteraction()',
+    'aria-hidden': 'true',
   }
 })
 export class TooltipComponent {

From ba2f498cef60ad23321f42e19c038f7e1d832350 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 11 Sep 2017 16:23:37 -0700
Subject: [PATCH 056/575] update version and change log to beta-11 (#6363)

---
 CHANGELOG.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e330f4ecb0c..088ccc5a1f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,48 @@
+<a name="2.0.0-beta.11"></a>
+# [2.0.0-beta.11](https://github.com/angular/material2/compare/2.0.0-beta.10...2.0.0-beta.11) (2017-09-07)
+
+### Highlights
+Stepper component
+
+### Breaking changes
+* Remove MaterialModule. (#6803) ([cf1ece0](https://github.com/angular/material2/commit/cf1ece0))
+MaterialModule has been removed and is no longer available.  As noted in the changelog for beta.3, an aggregate module like MaterialModule prevents tools from being able to treeshake unused components and modules.
+
+
+### Features
+
+* **expansion-panel:** allow for the panel header height to be customized ([#6643](https://github.com/angular/material2/issues/6643)) ([11e2239](https://github.com/angular/material2/commit/11e2239)), closes [#5641](https://github.com/angular/material2/issues/5641)
+* **sort:** add sorting indicator animation ([#5831](https://github.com/angular/material2/issues/5831)) ([70bd5fc](https://github.com/angular/material2/commit/70bd5fc))
+* **stepper:** Add e2e test ([#6776](https://github.com/angular/material2/issues/6776)) ([bef6271](https://github.com/angular/material2/commit/bef6271))
+* **stepper:** add moduleId to components ([#6780](https://github.com/angular/material2/issues/6780)) ([f375f92](https://github.com/angular/material2/commit/f375f92))
+* **stepper:** Address previous comments + add directionality support ([#6775](https://github.com/angular/material2/issues/6775)) ([c396596](https://github.com/angular/material2/commit/c396596))
+* **stepper:** initial version of stepper ([#6594](https://github.com/angular/material2/issues/6594)) ([87318bc](https://github.com/angular/material2/commit/87318bc))
+
+
+### Bug Fixes
+
+* **autocomplete,select:** inconsistent disabled option coloring ([#6640](https://github.com/angular/material2/issues/6640)) ([454781d](https://github.com/angular/material2/commit/454781d)), closes [#6638](https://github.com/angular/material2/issues/6638)
+* **autosize:** not resizing on programmatic changes ([#6654](https://github.com/angular/material2/issues/6654)) ([89fea50](https://github.com/angular/material2/commit/89fea50)), closes [#5247](https://github.com/angular/material2/issues/5247)
+* **button-toggle:** border radius ignored if option is selected ([#6699](https://github.com/angular/material2/issues/6699)) ([82e14f8](https://github.com/angular/material2/commit/82e14f8)), closes [#6689](https://github.com/angular/material2/issues/6689)
+* **checkbox:** label content should not wrap ([#6674](https://github.com/angular/material2/issues/6674)) ([9acab86](https://github.com/angular/material2/commit/9acab86)), closes [#6671](https://github.com/angular/material2/issues/6671)
+* **datepicker:** Create a new injection token to avoid overriding LOCALE_ID ([#6708](https://github.com/angular/material2/issues/6708)) ([2635cad](https://github.com/angular/material2/commit/2635cad))
+* **expansion-panel:** dark theme header hover color ([#6616](https://github.com/angular/material2/issues/6616)) ([21c68ad](https://github.com/angular/material2/commit/21c68ad))
+* **form-field:** add aria-owns to label element ([#6683](https://github.com/angular/material2/issues/6683)) ([4191b4d](https://github.com/angular/material2/commit/4191b4d))
+* **grid-list:** avoid unnecessary calc declarations ([#6745](https://github.com/angular/material2/issues/6745)) ([255611b](https://github.com/angular/material2/commit/255611b))
+* **grid-list:** styles not cleared when switching to a different styling mode ([#6660](https://github.com/angular/material2/issues/6660)) ([87d607e](https://github.com/angular/material2/commit/87d607e)), closes [#4047](https://github.com/angular/material2/issues/4047)
+* **input:** remove resize handle from non-textarea inputs ([#6768](https://github.com/angular/material2/issues/6768)) ([1272f03](https://github.com/angular/material2/commit/1272f03)), closes [#6757](https://github.com/angular/material2/issues/6757)
+* **list:** subheader margin being overwritten by typography ([#6735](https://github.com/angular/material2/issues/6735)) ([efe483a](https://github.com/angular/material2/commit/efe483a))
+* **menu:** nested menu hover not working when trigger is added lazily ([#6807](https://github.com/angular/material2/issues/6807)) ([6b5100b](https://github.com/angular/material2/commit/6b5100b)), closes [#6731](https://github.com/angular/material2/issues/6731)
+* **selection-list:** proper style for disabled options ([#6829](https://github.com/angular/material2/issues/6829)) ([547d11f](https://github.com/angular/material2/commit/547d11f))
+* **slide-toggle:** support native tabindex attribute ([#6613](https://github.com/angular/material2/issues/6613)) ([8f9f3c8](https://github.com/angular/material2/commit/8f9f3c8))
+* **slider:** thumb disappearing on disabled element with thumb label ([#6641](https://github.com/angular/material2/issues/6641)) ([8243b16](https://github.com/angular/material2/commit/8243b16)), closes [#6631](https://github.com/angular/material2/issues/6631)
+* **slider:** update styles when focus and dir change ([#6700](https://github.com/angular/material2/issues/6700)) ([8c49422](https://github.com/angular/material2/commit/8c49422))
+* **snack-bar:** animation not starting for subsequent snack bars ([#6649](https://github.com/angular/material2/issues/6649)) ([730e7ae](https://github.com/angular/material2/commit/730e7ae)), closes [#6222](https://github.com/angular/material2/issues/6222)
+* **tabs:** fix infinite tab loop ([#6663](https://github.com/angular/material2/issues/6663)) ([67e02b0](https://github.com/angular/material2/commit/67e02b0)), closes [#4639](https://github.com/angular/material2/issues/4639)
+* **tabs:** tab spacing on desktop incorrect ([#6681](https://github.com/angular/material2/issues/6681)) ([b678119](https://github.com/angular/material2/commit/b678119)), closes [#3347](https://github.com/angular/material2/issues/3347)
+
+
+
 <a name="2.0.0-beta.10"></a>
 # [2.0.0-beta.10 découpage-panjandrum](https://github.com/angular/material2/compare/2.0.0-beta.8...2.0.0-beta.10) (2017-08-29)
 
diff --git a/package.json b/package.json
index 64d6f1a0de56..c0410f53ab5a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "docs": "gulp docs",
     "api": "gulp api-docs"
   },
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "license": "MIT",
   "engines": {
     "node": ">= 5.4.1"

From a37aa6a62c78d720fdc8418c2b2a271bbf9c66e8 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 01:24:49 +0200
Subject: [PATCH 057/575] fix(chips): set appropriate aria-orientation (#6464)

Based on the [accessibility guidelines](https://www.w3.org/TR/wai-aria-practices-1.1/#Listbox), the `listbox` role has a default `aria-orientation` of `vertical`, however the chips in a chip list are horizontal.
---
 src/demo-app/chips/chips-demo.html |  2 +-
 src/lib/chips/chip-list.ts         |  4 ++++
 src/lib/chips/chips.md             | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/demo-app/chips/chips-demo.html b/src/demo-app/chips/chips-demo.html
index 860caedb0c2b..b55c55954aea 100644
--- a/src/demo-app/chips/chips-demo.html
+++ b/src/demo-app/chips/chips-demo.html
@@ -102,7 +102,7 @@ <h4>Stacked Chips</h4>
         <code>(focus)</code> event to run custom code.
       </p>
 
-      <md-chip-list class="mat-chip-list-stacked" [tabIndex]="-1">
+      <md-chip-list class="mat-chip-list-stacked" aria-orientation="vertical" [tabIndex]="-1">
         <md-chip *ngFor="let aColor of availableColors"
                  (focus)="color = aColor.color" color="{{aColor.color}}" selected="true">
           {{aColor.name}}
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index de830d015c0b..078fc1cd8e5d 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -45,6 +45,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
   host: {
     '[attr.tabindex]': '_tabIndex',
     'role': 'listbox',
+    '[attr.aria-orientation]': 'ariaOrientation',
     'class': 'mat-chip-list',
 
     '(focus)': 'focus()',
@@ -88,6 +89,9 @@ export class MdChipList implements AfterContentInit, OnDestroy {
   /** The chip components contained within this chip list. */
   chips: QueryList<MdChip>;
 
+  /** Orientation of the chip list. */
+  @Input('aria-orientation') ariaOrientation: 'horizontal' | 'vertical' = 'horizontal';
+
   constructor(protected _renderer: Renderer2, protected _elementRef: ElementRef,
               @Optional() private _dir: Directionality) {
   }
diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 7ae60fe5523c..1e26923b5b79 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -33,10 +33,21 @@ chips are neither selectable nor focusable. Currently, disabled chips receive no
 Users can move through the chips using the arrow keys and select/deselect them with the space. Chips
 also gain focus when clicked, ensuring keyboard navigation starts at the appropriate chip.
 
+### Orientation
+If you want the chips in the list to be stacked vertically, instead of horizontally, you can apply
+the `mat-chip-list-stacked` class, as well as the `aria-orientation="vertical"` attribute:
+
+```html
+<md-chip-list class="mat-chip-list-stacked" aria-orientation="vertical">
+  <md-chip>Papadum</md-chip>
+  <md-chip>Naan</md-chip>
+  <md-chip>Dal</md-chip>
+</md-chip-list>
+```
 
 ### Theming
 The selected color of an `<md-chip>` can be changed by using the `color` property. By default, chips
-use a neutral background color based on the current theme (light or dark). This can be changed to 
+use a neutral background color based on the current theme (light or dark). This can be changed to
 `'primary'`, `'accent'`, or `'warn'`.
 
 ### Accessibility

From a727f970cdfd6621bf4b97be77f21c0572ae1d3f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 12 Sep 2017 01:27:46 +0200
Subject: [PATCH 058/575] build: snapshot builds for moment-adapter (#6823)

* Publishes the artifacts of the material-moment-adapter on a per-commit basis.
---
 scripts/deploy/publish-build-artifacts.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/deploy/publish-build-artifacts.sh b/scripts/deploy/publish-build-artifacts.sh
index c6151f259eb3..3dbbb6570326 100755
--- a/scripts/deploy/publish-build-artifacts.sh
+++ b/scripts/deploy/publish-build-artifacts.sh
@@ -16,8 +16,8 @@ if [ -z ${MATERIAL2_BUILDS_TOKEN} ]; then
 fi
 
 # Material packages that need to published.
-PACKAGES=(cdk material)
-REPOSITORIES=(cdk-builds material2-builds)
+PACKAGES=(cdk material material-moment-adapter)
+REPOSITORIES=(cdk-builds material2-builds material2-moment-adapter-builds)
 
 # Command line arguments.
 COMMAND_ARGS=${*}

From 29399b8ee0210836112b7f267256f373132e19c1 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Mon, 11 Sep 2017 16:53:15 -0700
Subject: [PATCH 059/575] fix(datepicker): fix wrong datepicker-input value for
 non MM/DD/YYYY locales (#6798)

* fix date change value for internationalization

* change value setting logic + add test
---
 src/lib/datepicker/datepicker-input.ts |  6 ++-
 src/lib/datepicker/datepicker.spec.ts  | 55 +++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 585a5bc8ad6b..8c0571d27f72 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -112,8 +112,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   /** The value of the input. */
   @Input()
   get value(): D | null {
-    return this._getValidDateOrNull(this._dateAdapter.parse(
-        this._elementRef.nativeElement.value, this._dateFormats.parse.dateInput));
+    return this._value;
   }
   set value(value: D | null) {
     if (value != null && !this._dateAdapter.isDateInstance(value)) {
@@ -123,12 +122,14 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     value = this._getValidDateOrNull(value);
 
     let oldDate = this.value;
+    this._value = value;
     this._renderer.setProperty(this._elementRef.nativeElement, 'value',
         value ? this._dateAdapter.format(value, this._dateFormats.display.dateInput) : '');
     if (!this._dateAdapter.sameDate(oldDate, value)) {
       this._valueChange.emit(value);
     }
   }
+  private _value: D | null;
 
   /** The minimum valid date. */
   @Input()
@@ -285,6 +286,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     let date = this._dateAdapter.parse(value, this._dateFormats.parse.dateInput);
     this._lastValueValid = !date || this._dateAdapter.isValid(date);
     date = this._getValidDateOrNull(date);
+    this._value = date;
     this._cvaOnChange(date);
     this._valueChange.emit(date);
     this.dateInput.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 9b608bd72e62..631adefbb194 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -11,9 +11,11 @@ import {MdDatepicker} from './datepicker';
 import {MdDatepickerInput} from './datepicker-input';
 import {MdInputModule} from '../input/index';
 import {MdNativeDateModule} from '../core/datetime/index';
-import {DEC, JAN} from '../core/testing/month-constants';
+import {DEC, JAN, SEP} from '../core/testing/month-constants';
 import {createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
 import {MdFormFieldModule} from '../form-field/index';
+import {MAT_DATE_LOCALE} from '../core/datetime/date-adapter';
+import {NativeDateModule} from '../core/datetime/index';
 
 describe('MdDatepicker', () => {
   afterEach(inject([OverlayContainer], (container: OverlayContainer) => {
@@ -943,6 +945,45 @@ describe('MdDatepicker', () => {
     });
 
   });
+
+  describe('internationalization', () => {
+    let fixture: ComponentFixture<DatepickerWithi18n>;
+    let testComponent: DatepickerWithi18n;
+    let input: HTMLInputElement;
+
+    beforeEach(async(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          MdDatepickerModule,
+          MdFormFieldModule,
+          MdInputModule,
+          MdNativeDateModule,
+          NoopAnimationsModule,
+          NativeDateModule,
+          FormsModule
+        ],
+        providers: [{provide: MAT_DATE_LOCALE, useValue: 'de-DE'}],
+        declarations: [DatepickerWithi18n],
+      }).compileComponents();
+
+      fixture = TestBed.createComponent(DatepickerWithi18n);
+      fixture.detectChanges();
+      testComponent = fixture.componentInstance;
+      input = fixture.nativeElement.querySelector('input') as HTMLInputElement;
+    }));
+
+    it('should have the correct input value even when inverted date format', () => {
+      let selected = new Date(2017, SEP, 1);
+      testComponent.date = selected;
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        fixture.detectChanges();
+        expect(input.value).toBe('01.09.2017');
+        expect(testComponent.datepickerInput.value).toBe(selected);
+      });
+    });
+  });
 });
 
 
@@ -1099,3 +1140,15 @@ class DatepickerWithChangeAndInputEvents {
 
   onDateInput() {}
 }
+
+@Component({
+  template: `
+    <input [mdDatepicker]="d" [(ngModel)]="date">
+    <md-datepicker #d></md-datepicker>
+  `
+})
+class DatepickerWithi18n {
+  date: Date | null = new Date(2010, JAN, 1);
+  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+}

From 27cbe47839a9ff4ad23ce6758e16153da59f3115 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Mon, 11 Sep 2017 20:12:09 -0400
Subject: [PATCH 060/575] feat(dialog): add afterOpen to MdDialogRef (#6887)

* feat(dialog): add afterOpen to MdDialogRef

Provides a hook for initializing component after animation is
complete.

* Complete afterOpen observable
---
 src/lib/dialog/dialog-ref.ts  | 25 ++++++++++++++++++++++---
 src/lib/dialog/dialog.spec.ts | 15 +++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 5d44899981e2..d4839bb486d0 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -15,7 +15,6 @@ import {MdDialogContainer} from './dialog-container';
 
 
 // TODO(jelbourn): resizing
-// TODO(jelbourn): afterOpen
 
 // Counter for unique dialog ids.
 let uniqueId = 0;
@@ -30,11 +29,14 @@ export class MdDialogRef<T> {
   /** Whether the user is allowed to close the dialog. */
   disableClose = this._containerInstance._config.disableClose;
 
+  /** Subject for notifying the user that the dialog has finished opening. */
+  private _afterOpen = new Subject<void>();
+
   /** Subject for notifying the user that the dialog has finished closing. */
-  private _afterClosed: Subject<any> = new Subject();
+  private _afterClosed = new Subject<any>();
 
   /** Subject for notifying the user that the dialog has started closing. */
-  private _beforeClose: Subject<any> = new Subject();
+  private _beforeClose = new Subject<any>();
 
   /** Result to be passed to afterClosed. */
   private _result: any;
@@ -44,6 +46,16 @@ export class MdDialogRef<T> {
     private _containerInstance: MdDialogContainer,
     public readonly id: string = `md-dialog-${uniqueId++}`) {
 
+    // Emit when opening animation completes
+    RxChain.from(_containerInstance._animationStateChanged)
+      .call(filter, event => event.phaseName === 'done' && event.toState === 'enter')
+      .call(first)
+      .subscribe(() => {
+        this._afterOpen.next();
+        this._afterOpen.complete();
+      });
+
+    // Dispose overlay when closing animation is complete
     RxChain.from(_containerInstance._animationStateChanged)
       .call(filter, event => event.phaseName === 'done' && event.toState === 'exit')
       .call(first)
@@ -75,6 +87,13 @@ export class MdDialogRef<T> {
     this._containerInstance._startExitAnimation();
   }
 
+  /**
+   * Gets an observable that is notified when the dialog is finished opening.
+   */
+  afterOpen(): Observable<void> {
+    return this._afterOpen.asObservable();
+  }
+
   /**
    * Gets an observable that is notified when the dialog is finished closing.
    */
diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 845297a09242..70c09652081d 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -102,6 +102,21 @@ describe('MdDialog', () => {
     dialogRef.close();
   });
 
+  it('should emit when dialog opening animation is complete', fakeAsync(() => {
+    const dialogRef = dialog.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
+    const spy = jasmine.createSpy('afterOpen spy');
+
+    dialogRef.afterOpen().subscribe(spy);
+
+    viewContainerFixture.detectChanges();
+
+    // callback should not be called before animation is complete
+    expect(spy).not.toHaveBeenCalled();
+
+    flushMicrotasks();
+    expect(spy).toHaveBeenCalled();
+  }));
+
   it('should use injector from viewContainerRef for DialogInjector', () => {
     let dialogRef = dialog.open(PizzaMsg, {
       viewContainerRef: testViewContainerRef

From 51396d027f4e11aacf33769e91220451bcec5da9 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:13:12 +0200
Subject: [PATCH 061/575] perf(dialog): avoid repaintin dialog content element
 on scroll (#6890)

Fixes the `<md-dialog-content>` element being repainted on scroll.

Fixes #6878.
---
 src/lib/core/style/_vendor-prefixes.scss | 5 +++++
 src/lib/dialog/dialog.scss               | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/lib/core/style/_vendor-prefixes.scss b/src/lib/core/style/_vendor-prefixes.scss
index d49e9af4f485..0eaf254033ec 100644
--- a/src/lib/core/style/_vendor-prefixes.scss
+++ b/src/lib/core/style/_vendor-prefixes.scss
@@ -33,4 +33,9 @@
   cursor: -webkit-grabbing;
   cursor: grabbing;
 }
+
+@mixin backface-visibility($value) {
+  -webkit-backface-visibility: $value;
+  backface-visibility: $value;
+}
 /* stylelint-enable */
diff --git a/src/lib/dialog/dialog.scss b/src/lib/dialog/dialog.scss
index ab09312d4aeb..8ef8eea9df4c 100644
--- a/src/lib/dialog/dialog.scss
+++ b/src/lib/dialog/dialog.scss
@@ -1,4 +1,5 @@
 @import '../core/style/elevation';
+@import '../core/style/vendor-prefixes';
 @import '../core/a11y/a11y';
 
 
@@ -35,6 +36,9 @@ $mat-dialog-button-margin: 8px !default;
   max-height: $mat-dialog-max-height;
   overflow: auto;
   -webkit-overflow-scrolling: touch;
+
+  // Promote the content to a new GPU layer to avoid repaints on scroll.
+  @include backface-visibility(hidden);
 }
 
 .mat-dialog-title {

From 8a21881fe38e7644dea545499aaef2b6d97ccf03 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:14:48 +0200
Subject: [PATCH 062/575] fix(progress-bar): query mode not reversing direction
 in rtl (#6922)

Fixes the progressbar in query mode not reversing its direction in RTL.
---
 src/lib/progress-bar/progress-bar.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lib/progress-bar/progress-bar.scss b/src/lib/progress-bar/progress-bar.scss
index 5542ce4142f9..cf537f16bcde 100644
--- a/src/lib/progress-bar/progress-bar.scss
+++ b/src/lib/progress-bar/progress-bar.scss
@@ -67,6 +67,11 @@ $mat-progress-bar-piece-animation-duration: 250ms !default;
 
   &[mode='query'] {
     transform: rotateZ(180deg);
+
+    &[dir='rtl'],
+    [dir='rtl'] & {
+      transform: rotateZ(180deg) rotateY(180deg);
+    }
   }
 
   &[mode='indeterminate'],

From 5d2ca2aaf7e24bbbe653003ad4fa13077850406a Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 11 Sep 2017 17:15:35 -0700
Subject: [PATCH 063/575] Move CanDisable mixin to MdExpansionPanel. (#6926)

---
 src/lib/expansion/accordion-item.ts  | 21 ++++++---------------
 src/lib/expansion/expansion-panel.ts | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/lib/expansion/accordion-item.ts b/src/lib/expansion/accordion-item.ts
index bf4d6d042722..9354782b7b38 100644
--- a/src/lib/expansion/accordion-item.ts
+++ b/src/lib/expansion/accordion-item.ts
@@ -17,32 +17,26 @@ import {
 } from '@angular/core';
 import {UniqueSelectionDispatcher} from '../core';
 import {CdkAccordion} from './accordion';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
 
 /** Used to generate unique ID for each expansion panel. */
 let nextId = 0;
 
-// Boilerplate for applying mixins to MdSlider.
-/** @docs-private */
-export class AccordionItemBase { }
-export const _AccordionItemMixinBase = mixinDisabled(AccordionItemBase);
-
 /**
  * An abstract class to be extended and decorated as a component.  Sets up all
  * events and attributes needed to be managed by a CdkAccordion parent.
  */
 @Injectable()
-export class AccordionItem extends _AccordionItemMixinBase implements OnDestroy, CanDisable {
-  /** Event emitted every time the MdAccordionChild is closed. */
+export class AccordionItem implements OnDestroy {
+  /** Event emitted every time the AccordionItem is closed. */
   @Output() closed = new EventEmitter<void>();
-  /** Event emitted every time the MdAccordionChild is opened. */
+  /** Event emitted every time the AccordionItem is opened. */
   @Output() opened = new EventEmitter<void>();
-  /** Event emitted when the MdAccordionChild is destroyed. */
+  /** Event emitted when the AccordionItem is destroyed. */
   @Output() destroyed = new EventEmitter<void>();
-  /** The unique MdAccordionChild id. */
+  /** The unique AccordionItem id. */
   readonly id = `cdk-accordion-child-${nextId++}`;
 
-  /** Whether the MdAccordionChild is expanded. */
+  /** Whether the AccordionItem is expanded. */
   @Input()
   get expanded(): boolean { return this._expanded; }
   set expanded(expanded: boolean) {
@@ -74,9 +68,6 @@ export class AccordionItem extends _AccordionItemMixinBase implements OnDestroy,
   constructor(@Optional() public accordion: CdkAccordion,
               private _changeDetectorRef: ChangeDetectorRef,
               protected _expansionDispatcher: UniqueSelectionDispatcher) {
-
-    super();
-
     this._removeUniqueSelectionListener =
       _expansionDispatcher.listen((id: string, accordionId: string) => {
         if (this.accordion && !this.accordion.multi &&
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index d545e99f3d9e..7ca383bc3f49 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -30,8 +30,19 @@ import {
 import {MdAccordion} from './accordion';
 import {AccordionItem} from './accordion-item';
 import {UniqueSelectionDispatcher} from '../core';
+import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
 import {Subject} from 'rxjs/Subject';
 
+// Boilerplate for applying mixins to MdExpansionPanel.
+/** @docs-private */
+export class MdExpansionPanelBase extends AccordionItem {
+  constructor(accordion: MdAccordion,
+              _changeDetectorRef: ChangeDetectorRef,
+              _uniqueSelectionDispatcher: UniqueSelectionDispatcher) {
+    super(accordion, _changeDetectorRef, _uniqueSelectionDispatcher);
+  }
+}
+export const _MdExpansionPanelMixinBase = mixinDisabled(MdExpansionPanelBase);
 
 /** MdExpansionPanel's states. */
 export type MdExpansionPanelState = 'expanded' | 'collapsed';
@@ -54,7 +65,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
   templateUrl: './expansion-panel.html',
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  inputs: ['disabled'],
+  inputs: ['disabled', 'expanded'],
   host: {
     'class': 'mat-expansion-panel',
     '[class.mat-expanded]': 'expanded',
@@ -71,7 +82,8 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
     ]),
   ],
 })
-export class MdExpansionPanel extends AccordionItem implements OnChanges, OnDestroy {
+export class MdExpansionPanel extends _MdExpansionPanelMixinBase
+    implements CanDisable, OnChanges, OnDestroy {
   /** Whether the toggle indicator should be hidden. */
   @Input() hideToggle: boolean = false;
 
@@ -98,7 +110,6 @@ export class MdExpansionPanel extends AccordionItem implements OnChanges, OnDest
     if (this.accordion) {
       return (this.expanded ? this.accordion.displayMode : this._getExpandedState()) === 'default';
     }
-
     return false;
   }
 

From 841e88f947534da79384bc84a649421732f4bf41 Mon Sep 17 00:00:00 2001
From: Terry <zhangwenlp@vip.qq.com>
Date: Tue, 12 Sep 2017 08:16:39 +0800
Subject: [PATCH 064/575] docs(table): remove duplicate css in the
 table-filtering-example (#6935)

---
 .../table-filtering/table-filtering-example.css           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/material-examples/table-filtering/table-filtering-example.css b/src/material-examples/table-filtering/table-filtering-example.css
index 5d643e27561d..51287a0891d6 100644
--- a/src/material-examples/table-filtering/table-filtering-example.css
+++ b/src/material-examples/table-filtering/table-filtering-example.css
@@ -5,14 +5,6 @@
   min-width: 300px;
 }
 
-.example-header {
-  min-height: 64px;
-  display: flex;
-  align-items: center;
-  padding-left: 24px;
-  font-size: 20px;
-}
-
 .example-header {
   min-height: 64px;
   display: flex;

From 9fe6386eecba2dd8676b56b62893efcb27e9c187 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:19:22 +0200
Subject: [PATCH 065/575] fix(select): extra whitespace around placeholder
 (#6955)

Fixes some extra whitespace being added around the placeholder.

Fixes #6923.
---
 src/lib/select/select.html | 2 +-
 src/lib/select/select.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index 86a090bcca31..e3c5823eea05 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -10,7 +10,7 @@
     [class.mat-floating-placeholder]="_hasValue()"
     [@transformPlaceholder]="_getPlaceholderAnimationState()"
     [style.opacity]="_getPlaceholderOpacity()"
-    [style.width.px]="_selectedValueWidth"> {{ placeholder }} </span>
+    [style.width.px]="_selectedValueWidth">{{ placeholder }}</span>
 
   <span class="mat-select-value" *ngIf="_hasValue()">
     <span class="mat-select-value-text" [ngSwitch]="!!customTrigger">
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 4a5ae8726dae..9b57b49d63ea 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -76,7 +76,7 @@ $mat-select-trigger-underline-height: 1px !default;
 
   // TODO: Double-check accessibility of this style
   .mat-select-required &::after {
-    content: '*';
+    content: ' *';
   }
 }
 

From 85993d3a96150a57ddfc5d87d0e28fe463de615e Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:20:30 +0200
Subject: [PATCH 066/575] fix(datepicker): toggle not reacting to disabled
 state changes in datepicker or input (#6964)

Fixes the datepicker toggle not reacting to changes in the disabled state of the associated datepicker and datepicker input.
---
 src/demo-app/datepicker/datepicker-demo.html | 14 +++++++---
 src/lib/datepicker/datepicker-input.ts       | 12 ++++++++-
 src/lib/datepicker/datepicker-toggle.ts      | 28 ++++++++++++++++----
 src/lib/datepicker/datepicker.spec.ts        | 22 +++++++++++++--
 src/lib/datepicker/datepicker.ts             | 18 ++++++++++---
 5 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/src/demo-app/datepicker/datepicker-demo.html b/src/demo-app/datepicker/datepicker-demo.html
index 3cdf0a807e16..9f55b0820c61 100644
--- a/src/demo-app/datepicker/datepicker-demo.html
+++ b/src/demo-app/datepicker/datepicker-demo.html
@@ -4,22 +4,26 @@ <h2>Options</h2>
   <md-checkbox [(ngModel)]="filterOdd">Filter odd months and dates</md-checkbox>
   <md-checkbox [(ngModel)]="yearView">Start in year view</md-checkbox>
   <md-checkbox [(ngModel)]="datepickerDisabled">Disable datepicker</md-checkbox>
+  <md-checkbox [(ngModel)]="inputDisabled">Disable input</md-checkbox>
 </p>
 <p>
   <md-form-field>
-    <input mdInput [mdDatepicker]="minDatePicker" [(ngModel)]="minDate" placeholder="Min date">
+    <input mdInput [mdDatepicker]="minDatePicker" [(ngModel)]="minDate" placeholder="Min date"
+        [disabled]="inputDisabled">
     <md-datepicker-toggle mdSuffix [for]="minDatePicker"></md-datepicker-toggle>
     <md-datepicker #minDatePicker [touchUi]="touch" [disabled]="datepickerDisabled"></md-datepicker>
   </md-form-field>
   <md-form-field>
-    <input mdInput [mdDatepicker]="maxDatePicker" [(ngModel)]="maxDate" placeholder="Max date">
+    <input mdInput [mdDatepicker]="maxDatePicker" [(ngModel)]="maxDate" placeholder="Max date"
+        [disabled]="inputDisabled">
     <md-datepicker-toggle mdSuffix [for]="maxDatePicker"></md-datepicker-toggle>
     <md-datepicker #maxDatePicker [touchUi]="touch" [disabled]="datepickerDisabled"></md-datepicker>
   </md-form-field>
 </p>
 <p>
   <md-form-field>
-    <input mdInput [mdDatepicker]="startAtPicker" [(ngModel)]="startAt" placeholder="Start at date">
+    <input mdInput [mdDatepicker]="startAtPicker" [(ngModel)]="startAt" placeholder="Start at date"
+        [disabled]="inputDisabled">
     <md-datepicker-toggle mdSuffix [for]="startAtPicker"></md-datepicker-toggle>
     <md-datepicker #startAtPicker [touchUi]="touch" [disabled]="datepickerDisabled"></md-datepicker>
   </md-form-field>
@@ -37,6 +41,7 @@ <h2>Result</h2>
            [min]="minDate"
            [max]="maxDate"
            [mdDatepickerFilter]="filterOdd ? dateFilter : null"
+           [disabled]="inputDisabled"
            placeholder="Pick a date"
            (dateInput)="onDateInput($event)"
            (dateChange)="onDateChange($event)">
@@ -64,6 +69,7 @@ <h2>Result</h2>
          [(ngModel)]="date"
          [min]="minDate"
          [max]="maxDate"
+         [disabled]="inputDisabled"
          [mdDatepickerFilter]="filterOdd ? dateFilter : null"
          placeholder="Pick a date">
   <md-datepicker-toggle [for]="resultPicker2"></md-datepicker-toggle>
@@ -81,7 +87,7 @@ <h2>Input disabled datepicker</h2>
   <md-datepicker-toggle [for]="datePicker1"></md-datepicker-toggle>
   <md-form-field>
     <input mdInput [mdDatepicker]="datePicker1" [(ngModel)]="date" [min]="minDate" [max]="maxDate"
-           [mdDatepickerFilter]="filterOdd ? dateFilter : null" [disabled]="true"
+           [mdDatepickerFilter]="filterOdd ? dateFilter : null" disabled
            placeholder="Input disabled">
     <md-datepicker #datePicker1 [touchUi]="touch" [startAt]="startAt"
                    [startView]="yearView ? 'year' : 'month'"></md-datepicker>
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 8c0571d27f72..7847a51b0bb4 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -153,7 +153,12 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   @Input()
   get disabled() { return this._disabled; }
   set disabled(value: any) {
-    this._disabled = coerceBooleanProperty(value);
+    const newValue = coerceBooleanProperty(value);
+
+    if (this._disabled !== newValue) {
+      this._disabled = newValue;
+      this._disabledChange.emit(newValue);
+    }
   }
   private _disabled: boolean;
 
@@ -166,6 +171,9 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   /** Emits when the value changes (either due to user input or programmatic change). */
   _valueChange = new EventEmitter<D|null>();
 
+  /** Emits when the disabled state has changed */
+  _disabledChange = new EventEmitter<boolean>();
+
   _onTouched = () => {};
 
   private _cvaOnChange: (value: any) => void = () => {};
@@ -237,6 +245,8 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   ngOnDestroy() {
     this._datepickerSubscription.unsubscribe();
+    this._valueChange.complete();
+    this._disabledChange.complete();
   }
 
   registerOnValidatorChange(fn: () => void): void {
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index 78c19ec890e2..44698e2fbd10 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -12,12 +12,16 @@ import {
   Input,
   ViewEncapsulation,
   OnDestroy,
+  OnChanges,
+  SimpleChanges,
   ChangeDetectorRef,
 } from '@angular/core';
 import {MdDatepicker} from './datepicker';
 import {MdDatepickerIntl} from './datepicker-intl';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
+import {merge} from 'rxjs/observable/merge';
+import {of as observableOf} from 'rxjs/observable/of';
 
 
 @Component({
@@ -30,8 +34,8 @@ import {Subscription} from 'rxjs/Subscription';
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdDatepickerToggle<D> implements OnDestroy {
-  private _intlChanges: Subscription;
+export class MdDatepickerToggle<D> implements OnChanges, OnDestroy {
+  private _stateChanges = Subscription.EMPTY;
 
   /** Datepicker instance that the button will toggle. */
   @Input('for') datepicker: MdDatepicker<D>;
@@ -46,12 +50,26 @@ export class MdDatepickerToggle<D> implements OnDestroy {
   }
   private _disabled: boolean;
 
-  constructor(public _intl: MdDatepickerIntl, changeDetectorRef: ChangeDetectorRef) {
-    this._intlChanges = _intl.changes.subscribe(() => changeDetectorRef.markForCheck());
+  constructor(
+    public _intl: MdDatepickerIntl,
+    private _changeDetectorRef: ChangeDetectorRef) {}
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes.datepicker) {
+      const datepicker: MdDatepicker<D> = changes.datepicker.currentValue;
+      const datepickerDisabled = datepicker ? datepicker._disabledChange : observableOf();
+      const inputDisabled = datepicker && datepicker._datepickerInput ?
+        datepicker._datepickerInput._disabledChange :
+        observableOf();
+
+      this._stateChanges.unsubscribe();
+      this._stateChanges = merge(this._intl.changes, datepickerDisabled, inputDisabled)
+        .subscribe(() => this._changeDetectorRef.markForCheck());
+    }
   }
 
   ngOnDestroy() {
-    this._intlChanges.unsubscribe();
+    this._stateChanges.unsubscribe();
   }
 
   _open(event: Event): void {
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 631adefbb194..02158c0bbc6c 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -552,11 +552,28 @@ describe('MdDatepicker', () => {
       it('should not open calendar when toggle clicked if datepicker is disabled', () => {
         testComponent.datepicker.disabled = true;
         fixture.detectChanges();
+        const toggle = fixture.debugElement.query(By.css('button')).nativeElement;
 
+        expect(toggle.hasAttribute('disabled')).toBe(true);
         expect(document.querySelector('md-dialog-container')).toBeNull();
 
-        let toggle = fixture.debugElement.query(By.css('button'));
-        dispatchMouseEvent(toggle.nativeElement, 'click');
+        dispatchMouseEvent(toggle, 'click');
+        fixture.detectChanges();
+
+        expect(document.querySelector('md-dialog-container')).toBeNull();
+      });
+
+      it('should not open calendar when toggle clicked if input is disabled', () => {
+        expect(testComponent.datepicker.disabled).toBeUndefined();
+
+        testComponent.input.disabled = true;
+        fixture.detectChanges();
+        const toggle = fixture.debugElement.query(By.css('button')).nativeElement;
+
+        expect(toggle.hasAttribute('disabled')).toBe(true);
+        expect(document.querySelector('md-dialog-container')).toBeNull();
+
+        dispatchMouseEvent(toggle, 'click');
         fixture.detectChanges();
 
         expect(document.querySelector('md-dialog-container')).toBeNull();
@@ -1075,6 +1092,7 @@ class DatepickerWithFormControl {
 })
 class DatepickerWithToggle {
   @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild(MdDatepickerInput) input: MdDatepickerInput<Date>;
   touchUI = true;
 }
 
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 7f8ed7d49bf6..6e87b996dee3 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -44,6 +44,7 @@ import {MdDialog} from '../dialog/dialog';
 import {MdDialogRef} from '../dialog/dialog-ref';
 import {MdDatepickerInput} from './datepicker-input';
 import {Subscription} from 'rxjs/Subscription';
+import {Subject} from 'rxjs/Subject';
 import {DateAdapter} from '../core/datetime/index';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MdCalendar} from './calendar';
@@ -150,7 +151,12 @@ export class MdDatepicker<D> implements OnDestroy {
     return this._disabled === undefined ? this._datepickerInput.disabled : this._disabled;
   }
   set disabled(value: any) {
-    this._disabled = coerceBooleanProperty(value);
+    const newValue = coerceBooleanProperty(value);
+
+    if (newValue !== this._disabled) {
+      this._disabled = newValue;
+      this._disabledChange.next(newValue);
+    }
   }
   private _disabled: boolean;
 
@@ -194,14 +200,17 @@ export class MdDatepicker<D> implements OnDestroy {
   /** A portal containing the calendar for this datepicker. */
   private _calendarPortal: ComponentPortal<MdDatepickerContent<D>>;
 
-  /** The input element this datepicker is associated with. */
-  private _datepickerInput: MdDatepickerInput<D>;
-
   /** The element that was focused before the datepicker was opened. */
   private _focusedElementBeforeOpen: HTMLElement | null = null;
 
   private _inputSubscription = Subscription.EMPTY;
 
+  /** The input element this datepicker is associated with. */
+  _datepickerInput: MdDatepickerInput<D>;
+
+  /** Emits when the datepicker is disabled. */
+  _disabledChange = new Subject<boolean>();
+
   constructor(private _dialog: MdDialog,
               private _overlay: Overlay,
               private _ngZone: NgZone,
@@ -218,6 +227,7 @@ export class MdDatepicker<D> implements OnDestroy {
   ngOnDestroy() {
     this.close();
     this._inputSubscription.unsubscribe();
+    this._disabledChange.complete();
 
     if (this._popupRef) {
       this._popupRef.dispose();

From 2cefe67c776e3c12f9d5a5be70804edb59664b7b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:21:37 +0200
Subject: [PATCH 067/575] docs: add live example of nested menu (#6977)

Adds a live example for the nested menu functionality.

Fixes #6920.
---
 src/lib/menu/menu.md                          |  1 +
 src/material-examples/example-module.ts       |  8 ++++
 .../menu-icons/menu-icons-example.ts          |  1 +
 .../menu-overview/menu-overview-example.ts    |  1 +
 .../nested-menu/nested-menu-example.css       |  1 +
 .../nested-menu/nested-menu-example.html      | 47 +++++++++++++++++++
 .../nested-menu/nested-menu-example.ts        | 11 +++++
 7 files changed, 70 insertions(+)
 create mode 100644 src/material-examples/nested-menu/nested-menu-example.css
 create mode 100644 src/material-examples/nested-menu/nested-menu-example.html
 create mode 100644 src/material-examples/nested-menu/nested-menu-example.ts

diff --git a/src/lib/menu/menu.md b/src/lib/menu/menu.md
index 8a3969a1ed57..70529834470e 100644
--- a/src/lib/menu/menu.md
+++ b/src/lib/menu/menu.md
@@ -1,6 +1,7 @@
 `<md-menu>` is a floating panel containing list of options.
 
 <!-- example(menu-overview) -->
+<!-- example(nested-menu) -->
 
 By itself, the `<md-menu>` element does not render anything. The menu is attached to and opened
 via application of the `mdMenuTriggerFor` directive:
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 7085e3abfcc8..95b9ca85a27d 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -54,6 +54,7 @@ import {ListOverviewExample} from './list-overview/list-overview-example';
 import {ListSectionsExample} from './list-sections/list-sections-example';
 import {ListSelectionExample} from './list-selection/list-selection-example';
 import {MenuIconsExample} from './menu-icons/menu-icons-example';
+import {NestedMenuExample} from './nested-menu/nested-menu-example';
 import {MenuOverviewExample} from './menu-overview/menu-overview-example';
 import {PaginatorConfigurableExample} from './paginator-configurable/paginator-configurable-example';
 import {PaginatorOverviewExample} from './paginator-overview/paginator-overview-example';
@@ -336,6 +337,12 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'nested-menu': {
+    title: 'Nested menu',
+    component: NestedMenuExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'menu-overview': {
     title: 'Basic menu',
     component: MenuOverviewExample,
@@ -584,6 +591,7 @@ export const EXAMPLE_LIST = [
   ListSectionsExample,
   ListSelectionExample,
   MenuIconsExample,
+  NestedMenuExample,
   MenuOverviewExample,
   PaginatorConfigurableExample,
   PaginatorOverviewExample,
diff --git a/src/material-examples/menu-icons/menu-icons-example.ts b/src/material-examples/menu-icons/menu-icons-example.ts
index bf9c15d30ab3..6c474a57f53b 100644
--- a/src/material-examples/menu-icons/menu-icons-example.ts
+++ b/src/material-examples/menu-icons/menu-icons-example.ts
@@ -6,5 +6,6 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'menu-icons-example',
   templateUrl: 'menu-icons-example.html',
+  styleUrls: ['menu-icons-example.css'],
 })
 export class MenuIconsExample {}
diff --git a/src/material-examples/menu-overview/menu-overview-example.ts b/src/material-examples/menu-overview/menu-overview-example.ts
index 83ee676b3179..2858d3e74167 100644
--- a/src/material-examples/menu-overview/menu-overview-example.ts
+++ b/src/material-examples/menu-overview/menu-overview-example.ts
@@ -6,5 +6,6 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'menu-overview-example',
   templateUrl: 'menu-overview-example.html',
+  styleUrls: ['menu-overview-example.css'],
 })
 export class MenuOverviewExample {}
diff --git a/src/material-examples/nested-menu/nested-menu-example.css b/src/material-examples/nested-menu/nested-menu-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/nested-menu/nested-menu-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/nested-menu/nested-menu-example.html b/src/material-examples/nested-menu/nested-menu-example.html
new file mode 100644
index 000000000000..bd972629fb54
--- /dev/null
+++ b/src/material-examples/nested-menu/nested-menu-example.html
@@ -0,0 +1,47 @@
+<button md-button [mdMenuTriggerFor]="animals">Animal index</button>
+
+<md-menu #animals="mdMenu">
+  <button md-menu-item [mdMenuTriggerFor]="vertebrates">Vertebrates</button>
+  <button md-menu-item [mdMenuTriggerFor]="invertebrates">Invertebrates</button>
+</md-menu>
+
+<md-menu #vertebrates="mdMenu">
+  <button md-menu-item [mdMenuTriggerFor]="fish">Fishes</button>
+  <button md-menu-item [mdMenuTriggerFor]="amphibians">Amphibians</button>
+  <button md-menu-item [mdMenuTriggerFor]="reptiles">Reptiles</button>
+  <button md-menu-item>Birds</button>
+  <button md-menu-item>Mammals</button>
+</md-menu>
+
+<md-menu #invertebrates="mdMenu">
+  <button md-menu-item>Insects</button>
+  <button md-menu-item>Molluscs</button>
+  <button md-menu-item>Crustaceans</button>
+  <button md-menu-item>Corals</button>
+  <button md-menu-item>Arachnids</button>
+  <button md-menu-item>Velvet worms</button>
+  <button md-menu-item>Horseshoe crabs</button>
+</md-menu>
+
+<md-menu #fish="mdMenu">
+  <button md-menu-item>Baikal oilfish</button>
+  <button md-menu-item>Bala shark</button>
+  <button md-menu-item>Ballan wrasse</button>
+  <button md-menu-item>Bamboo shark</button>
+  <button md-menu-item>Banded killifish</button>
+</md-menu>
+
+<md-menu #amphibians="mdMenu">
+  <button md-menu-item>Sonoran desert toad</button>
+  <button md-menu-item>Western toad</button>
+  <button md-menu-item>Arroyo toad</button>
+  <button md-menu-item>Yosemite toad</button>
+</md-menu>
+
+<md-menu #reptiles="mdMenu">
+  <button md-menu-item>Banded Day Gecko</button>
+  <button md-menu-item>Banded Gila Monster</button>
+  <button md-menu-item>Black Tree Monitor</button>
+  <button md-menu-item>Blue Spiny Lizard</button>
+  <button md-menu-item disabled>Velociraptor</button>
+</md-menu>
diff --git a/src/material-examples/nested-menu/nested-menu-example.ts b/src/material-examples/nested-menu/nested-menu-example.ts
new file mode 100644
index 000000000000..d9d7b81eb316
--- /dev/null
+++ b/src/material-examples/nested-menu/nested-menu-example.ts
@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title Nested menu
+ */
+@Component({
+  selector: 'nested-menu-example',
+  templateUrl: 'nested-menu-example.html',
+  styleUrls: ['nested-menu-example.css']
+})
+export class NestedMenuExample {}

From 2239e7daf063690b70cbcef098173fdf038e9760 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:23:37 +0200
Subject: [PATCH 068/575] compat(stepper): error in compatibility mode (#6989)

Fixes an error thrown by the stepper in compatibility mode.

Fixes #6988.
---
 src/lib/stepper/step-header.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index ae79e5cdf70e..e25369d35c87 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -9,6 +9,7 @@
 import {Component, Input, ViewEncapsulation} from '@angular/core';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 import {MdStepLabel} from './step-label';
+import {MATERIAL_COMPATIBILITY_MODE} from '../core/compatibility/compatibility';
 
 @Component({
   moduleId: module.id,
@@ -19,7 +20,8 @@ import {MdStepLabel} from './step-label';
     'class': 'mat-step-header',
     'role': 'tab',
   },
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
 })
 export class MdStepHeader {
   /** Icon for the given step. */

From a1ec81ab697c2ea07357dcc6927e99918f7cfcef Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 12 Sep 2017 02:30:07 +0200
Subject: [PATCH 069/575] fix(slide-toggle): remove side-margin if slide-toggle
 label is empty (#6881)

* Removes the side-margin of the actual indicator of the slide-toggle if the user label is empty (similar as in #4730)

Fixes #6868
---
 src/lib/slide-toggle/index.ts             |  3 +-
 src/lib/slide-toggle/slide-toggle.html    |  5 +-
 src/lib/slide-toggle/slide-toggle.scss    |  5 ++
 src/lib/slide-toggle/slide-toggle.spec.ts | 69 ++++++++++++++++++++++-
 src/lib/slide-toggle/slide-toggle.ts      |  7 +++
 5 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/src/lib/slide-toggle/index.ts b/src/lib/slide-toggle/index.ts
index 6220ea1fee2e..6c81e7460d4e 100644
--- a/src/lib/slide-toggle/index.ts
+++ b/src/lib/slide-toggle/index.ts
@@ -9,6 +9,7 @@
 import {NgModule} from '@angular/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
 import {PlatformModule} from '@angular/cdk/platform';
+import {ObserversModule} from '@angular/cdk/observers';
 import {MdSlideToggle} from './slide-toggle';
 import {
   FOCUS_ORIGIN_MONITOR_PROVIDER,
@@ -19,7 +20,7 @@ import {
 
 
 @NgModule({
-  imports: [MdRippleModule, MdCommonModule, PlatformModule],
+  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule],
   exports: [MdSlideToggle, MdCommonModule],
   declarations: [MdSlideToggle],
   providers: [
diff --git a/src/lib/slide-toggle/slide-toggle.html b/src/lib/slide-toggle/slide-toggle.html
index e1001c880499..b5125b3e90b3 100644
--- a/src/lib/slide-toggle/slide-toggle.html
+++ b/src/lib/slide-toggle/slide-toggle.html
@@ -1,6 +1,7 @@
 <label class="mat-slide-toggle-label" #label>
 
-  <div class="mat-slide-toggle-bar">
+  <div class="mat-slide-toggle-bar"
+       [class.mat-slide-toggle-bar-no-side-margin]="!labelContent.textContent || !labelContent.textContent.trim()">
 
     <input #input class="mat-slide-toggle-input cdk-visually-hidden" type="checkbox"
            [id]="inputId"
@@ -32,7 +33,7 @@
 
   </div>
 
-  <span class="mat-slide-toggle-content">
+  <span class="mat-slide-toggle-content" #labelContent (cdkObserveContent)="_onLabelTextChange()">
     <ng-content></ng-content>
   </span>
 </label>
diff --git a/src/lib/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss
index 9a89c6ded37d..62f3298d78a4 100644
--- a/src/lib/slide-toggle/slide-toggle.scss
+++ b/src/lib/slide-toggle/slide-toggle.scss
@@ -74,6 +74,11 @@ $mat-slide-toggle-bar-track-width: $mat-slide-toggle-bar-width - $mat-slide-togg
   }
 }
 
+.mat-slide-toggle-bar-no-side-margin {
+  margin-left: 0;
+  margin-right: 0;
+}
+
 // The thumb container is responsible for the dragging functionality.
 // The container includes the visual thumb and the ripple container element.
 .mat-slide-toggle-thumb-container {
diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index d8bb973f8b0f..345dcb5e418c 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -16,7 +16,11 @@ describe('MdSlideToggle without forms', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MdSlideToggleModule],
-      declarations: [SlideToggleBasic, SlideToggleWithTabindexAttr],
+      declarations: [
+        SlideToggleBasic,
+        SlideToggleWithTabindexAttr,
+        SlideToggleWithoutLabel
+      ],
       providers: [
         {provide: HAMMER_GESTURE_CONFIG, useFactory: () => gestureConfig = new TestGestureConfig()}
       ]
@@ -493,6 +497,62 @@ describe('MdSlideToggle without forms', () => {
       expect(slideThumbContainer.classList).not.toContain('mat-dragging');
     }));
   });
+
+  describe('without label', () => {
+    let fixture: ComponentFixture<SlideToggleWithoutLabel>;
+    let testComponent: SlideToggleWithoutLabel;
+    let slideToggleElement: HTMLElement;
+    let slideToggleBarElement: HTMLElement;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SlideToggleWithoutLabel);
+
+      const slideToggleDebugEl = fixture.debugElement.query(By.directive(MdSlideToggle));
+
+      testComponent = fixture.componentInstance;
+      slideToggleElement = slideToggleDebugEl.nativeElement;
+      slideToggleBarElement = slideToggleDebugEl
+          .query(By.css('.mat-slide-toggle-bar')).nativeElement;
+    });
+
+    it('should remove margin for slide-toggle without a label', () => {
+      fixture.detectChanges();
+
+      expect(slideToggleBarElement.classList)
+        .toContain('mat-slide-toggle-bar-no-side-margin');
+    });
+
+    it('should not remove margin if initial label is set through binding', async(() => {
+      testComponent.label = 'Some content';
+      fixture.detectChanges();
+
+      expect(slideToggleBarElement.classList)
+        .not.toContain('mat-slide-toggle-bar-no-side-margin');
+    }));
+
+    it('should re-add margin if label is added asynchronously', async(() => {
+      fixture.detectChanges();
+
+      expect(slideToggleBarElement.classList)
+        .toContain('mat-slide-toggle-bar-no-side-margin');
+
+      testComponent.label = 'Some content';
+      fixture.detectChanges();
+
+      // Wait for the MutationObserver to detect the content change and for the cdkObserveContent
+      // to emit the change event to the slide-toggle.
+      setTimeout(() => {
+        // The MutationObserver from the cdkObserveContent directive detected the content change
+        // and notified the slide-toggle component. The slide-toggle then marks the component as
+        // dirty by calling `markForCheck()`. This needs to be reflected by the component template
+        // then.
+        fixture.detectChanges();
+
+        expect(slideToggleElement.classList)
+          .not.toContain('mat-slide-toggle-bar-no-side-margin');
+      }, 1);
+    }));
+  });
 });
 
 describe('MdSlideToggle with forms', () => {
@@ -806,3 +866,10 @@ class SlideToggleWithFormControl {
   template: `<md-slide-toggle tabindex="5"></md-slide-toggle>`
 })
 class SlideToggleWithTabindexAttr {}
+
+@Component({
+  template: `<md-slide-toggle>{{label}}</md-slide-toggle>`
+})
+class SlideToggleWithoutLabel {
+  label: string;
+}
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 6de28f90c39f..8b5d13de0d04 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -278,6 +278,13 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
     }
   }
 
+  /** Method being called whenever the label text changes. */
+  _onLabelTextChange() {
+    // This method is getting called whenever the label of the slide-toggle changes.
+    // Since the slide-toggle uses the OnPush strategy we need to notify it about the change
+    // that has been recognized by the cdkObserveContent directive.
+    this._changeDetectorRef.markForCheck();
+  }
 }
 
 /**

From f6c9172afef682ca3f9e294904e988868013beba Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:33:56 +0200
Subject: [PATCH 070/575] perf: memory leak when subscribing to zone events
 (#6918)

Fixes a few memory leaks that were caused by subscribing to `NgZone.onMicrotaskEmpty` or `NgZone.onStable`. Because the two streams are `EventEmitters`, the subscription doesn't get GC-ed correctly. These changes switch to converting the emitters to observables before subscribing to them.

Fixes #6905.
---
 src/cdk/a11y/focus-trap.ts                   |  2 +-
 src/lib/autocomplete/autocomplete-trigger.ts |  2 +-
 src/lib/datepicker/calendar.ts               |  8 +++++---
 src/lib/datepicker/datepicker.ts             |  4 +++-
 src/lib/sidenav/drawer.ts                    |  7 +++++--
 src/lib/snack-bar/snack-bar-container.ts     | 10 +++-------
 src/lib/tooltip/tooltip.ts                   |  2 +-
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index cb09557accba..d726b8309560 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -265,7 +265,7 @@ export class FocusTrap {
     if (this._ngZone.isStable) {
       fn();
     } else {
-      first.call(this._ngZone.onStable).subscribe(fn);
+      first.call(this._ngZone.onStable.asObservable()).subscribe(fn);
     }
   }
 }
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index bbc97e958339..7d3aca8621fa 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -372,7 +372,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    * stream every time the option list changes.
    */
   private _subscribeToClosingActions(): Subscription {
-    const firstStable = first.call(this._zone.onStable);
+    const firstStable = first.call(this._zone.onStable.asObservable());
     const optionChanges = map.call(this.autocomplete.options.changes, () =>
       this._positionStrategy.recalculateLastPosition());
 
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index af1e203c7838..a434e9c0b52d 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -218,9 +218,11 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
 
   /** Focuses the active cell after the microtask queue is empty. */
   _focusActiveCell() {
-    this._ngZone.runOutsideAngular(() => first.call(this._ngZone.onStable).subscribe(() => {
-      this._elementRef.nativeElement.querySelector('.mat-calendar-body-active').focus();
-    }));
+    this._ngZone.runOutsideAngular(() => {
+      first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+        this._elementRef.nativeElement.querySelector('.mat-calendar-body-active').focus();
+      });
+    });
   }
 
   /** Whether the two dates represent the same view in the current view mode (month or year). */
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 6e87b996dee3..594b5e7bd6bf 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -323,7 +323,9 @@ export class MdDatepicker<D> implements OnDestroy {
       componentRef.instance.datepicker = this;
 
       // Update the position once the calendar has rendered.
-      first.call(this._ngZone.onStable).subscribe(() => this._popupRef.updatePosition());
+      first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+        this._popupRef.updatePosition();
+      });
     }
 
     this._popupRef.backdropClick().subscribe(() => this.close());
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 672727ddba62..909fe6a0a38f 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -409,8 +409,11 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
     }
     // NOTE: We need to wait for the microtask queue to be empty before validating,
     // since both drawers may be swapping positions at the same time.
-    takeUntil.call(drawer.onPositionChanged, this._drawers.changes).subscribe(() =>
-        first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => this._validateDrawers()));
+    takeUntil.call(drawer.onPositionChanged, this._drawers.changes).subscribe(() => {
+      first.call(this._ngZone.onMicrotaskEmpty.asObservable()).subscribe(() => {
+        this._validateDrawers();
+      });
+    });
   }
 
   /** Toggles the 'mat-drawer-opened' class on the main 'md-drawer-container' element. */
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 1c8c1f884006..0828b73cd12d 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -186,13 +186,9 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
    * errors where we end up removing an element which is in the middle of an animation.
    */
   private _completeExit() {
-    // Note: we shouldn't use `this` inside the zone callback,
-    // because it can cause a memory leak.
-    const onExit = this._onExit;
-
-    first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => {
-      onExit.next();
-      onExit.complete();
+    first.call(this._ngZone.onMicrotaskEmpty.asObservable()).subscribe(() => {
+      this._onExit.next();
+      this._onExit.complete();
     });
   }
 }
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index c12ab8951118..d5a7c14169a6 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -392,7 +392,7 @@ export class MdTooltip implements OnDestroy {
       this._tooltipInstance.message = this.message;
       this._tooltipInstance._markForCheck();
 
-      first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => {
+      first.call(this._ngZone.onMicrotaskEmpty.asObservable()).subscribe(() => {
         if (this._tooltipInstance) {
           this._overlayRef!.updatePosition();
         }

From dc9679da4f7d0caab9f3a8814789cf89332ac957 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 02:35:43 +0200
Subject: [PATCH 071/575] feat(selection-list): add selectAll and deselectAll
 functions (#6971)

* Adds the ability to select and deselect all options at once.
* Adds a demo of the selection list to the demo app.
* Fixes an issue that caused the checkbox inside the selection list to collapse.
* Sets the proper cursor on the list items.

Fixes #6969.
---
 src/demo-app/list/list-demo.html              | 18 +++++++++++++++
 src/demo-app/list/list-demo.scss              |  2 +-
 .../pseudo-checkbox/pseudo-checkbox.scss      |  1 +
 src/lib/list/list.scss                        |  6 +++++
 src/lib/list/selection-list.spec.ts           | 23 +++++++++++++++++++
 src/lib/list/selection-list.ts                | 18 +++++++++++++++
 6 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/demo-app/list/list-demo.html b/src/demo-app/list/list-demo.html
index 5cb977fb51e9..5109f4cd2647 100644
--- a/src/demo-app/list/list-demo.html
+++ b/src/demo-app/list/list-demo.html
@@ -101,4 +101,22 @@ <h2>Nav lists</h2>
       </md-list-item>
     </md-nav-list>
   </div>
+
+  <div>
+    <h2>Selection list</h2>
+
+    <md-selection-list #groceries>
+      <h3 md-subheader>Groceries</h3>
+
+      <md-list-option *ngFor="let item of items" [value]="item">
+        {{item}}
+      </md-list-option>
+    </md-selection-list>
+
+    <p>Selected: {{groceries.selectedOptions.selected.length}}</p>
+    <p>
+      <button md-raised-button (click)="groceries.selectAll()">Select all</button>
+      <button md-raised-button (click)="groceries.deselectAll()">Deselect all</button>
+    </p>
+  </div>
 </div>
diff --git a/src/demo-app/list/list-demo.scss b/src/demo-app/list/list-demo.scss
index bcf8a770c381..ed71dbf909d3 100644
--- a/src/demo-app/list/list-demo.scss
+++ b/src/demo-app/list/list-demo.scss
@@ -3,7 +3,7 @@
   display: flex;
   flex-flow: row wrap;
 
-  .mat-list, .mat-nav-list {
+  .mat-list, .mat-nav-list, .mat-selection-list {
     border: 1px solid rgba(0, 0, 0, 0.12);
     width: 350px;
     margin: 20px 20px 0 0;
diff --git a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.scss b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.scss
index 4bf82038dde2..bd7dcc5481c3 100644
--- a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.scss
+++ b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.scss
@@ -17,6 +17,7 @@ $_mat-pseudo-checkmark-size: $mat-checkbox-size - (2 * $_mat-pseudo-checkbox-pad
   vertical-align: middle;
   box-sizing: border-box;
   position: relative;
+  flex-shrink: 0;
   transition:
       border-color $mat-checkbox-transition-duration $mat-linear-out-slow-in-timing-function,
       background-color $mat-checkbox-transition-duration $mat-linear-out-slow-in-timing-function;
diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
index 22db02fa92ee..bda2a254af52 100644
--- a/src/lib/list/list.scss
+++ b/src/lib/list/list.scss
@@ -216,3 +216,9 @@ $mat-dense-list-icon-size: 20px;
     }
   }
 }
+
+.mat-list-option {
+  &:not([disabled]) {
+    cursor: pointer;
+  }
+}
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 6b87ea7d4504..d95f3e68efbf 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -181,6 +181,29 @@ describe('MdSelectionList', () => {
 
       expect(manager.activeItemIndex).toEqual(3);
     });
+
+    it('should be able to select all options', () => {
+      const list: MdSelectionList = selectionList.componentInstance;
+
+      expect(list.options.toArray().every(option => option.selected)).toBe(false);
+
+      list.selectAll();
+      fixture.detectChanges();
+
+      expect(list.options.toArray().every(option => option.selected)).toBe(true);
+    });
+
+    it('should be able to deselect all options', () => {
+      const list: MdSelectionList = selectionList.componentInstance;
+
+      list.options.forEach(option => option.toggle());
+      expect(list.options.toArray().every(option => option.selected)).toBe(true);
+
+      list.deselectAll();
+      fixture.detectChanges();
+
+      expect(list.options.toArray().every(option => option.selected)).toBe(false);
+    });
   });
 
   describe('with single option', () => {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index a239b0e81d90..3d30a58c3e28 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -244,6 +244,24 @@ export class MdSelectionList extends _MdSelectionListMixinBase
     this._element.nativeElement.focus();
   }
 
+  /** Selects all of the options. */
+  selectAll() {
+    this.options.forEach(option => {
+      if (!option.selected) {
+        option.toggle();
+      }
+    });
+  }
+
+  /** Deselects all of the options. */
+  deselectAll() {
+    this.options.forEach(option => {
+      if (option.selected) {
+        option.toggle();
+      }
+    });
+  }
+
   /** Map all the options' destroy event subscriptions and merge them into one stream. */
   private _onDestroySubscription(): Subscription {
     return RxChain.from(this.options.changes)

From dfe01f2d5fcc03025e976b1a9439498c19cd9d71 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 12 Sep 2017 02:36:53 +0200
Subject: [PATCH 072/575] fix(selection-list): do not coerece option value to
 boolean (#6983)

Currently the value of a `MdListOption` is coerced to a boolean. This is not the correct behavior because it would mean that there could be only two values (true/false).

Needed for #6896
---
 src/lib/list/selection-list.spec.ts | 19 ++++++++++++++-----
 src/lib/list/selection-list.ts      | 13 +++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index d95f3e68efbf..ed0103933eb4 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -48,6 +48,14 @@ describe('MdSelectionList', () => {
       expect(listItemEl.nativeElement.className).not.toContain('mat-list-item-focus');
     });
 
+    it('should be able to set a value on a list option', () => {
+      const optionValues = ['inbox', 'starred', 'sent-mail', 'drafts'];
+
+      optionValues.forEach((optionValue, index) => {
+        expect(listOption[index].componentInstance.value).toBe(optionValue);
+      });
+    });
+
     it('should be able to dispatch one selected item', () => {
       let testListItem = listOption[2].injector.get<MdListOption>(MdListOption);
       let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
@@ -379,17 +387,18 @@ describe('MdSelectionList', () => {
 
 
 @Component({template: `
-  <mat-selection-list id = "selection-list-1">
-    <md-list-option checkboxPosition = "before" disabled = "true">
+  <mat-selection-list id="selection-list-1">
+    <md-list-option checkboxPosition="before" disabled="true" value="inbox">
       Inbox (disabled selection-option)
     </md-list-option>
-    <md-list-option id = "testSelect" checkboxPosition = "before" class="test-native-focus">
+    <md-list-option id="testSelect" checkboxPosition="before" class="test-native-focus"
+                    value="starred">
       Starred
     </md-list-option>
-    <md-list-option checkboxPosition = "before">
+    <md-list-option checkboxPosition="before" value="sent-mail">
       Sent Mail
     </md-list-option>
-    <md-list-option checkboxPosition = "before">
+    <md-list-option checkboxPosition="before" value="drafts">
       Drafts
     </md-list-option>
   </mat-selection-list>`})
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 3d30a58c3e28..c2381d635d37 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -82,7 +82,6 @@ export class MdListOption extends _MdListOptionMixinBase
   private _lineSetter: MdLineSetter;
   private _selected: boolean = false;
   private _disabled: boolean = false;
-  private _value: any;
 
   /** Whether the option has focus. */
   _hasFocus: boolean = false;
@@ -92,20 +91,18 @@ export class MdListOption extends _MdListOptionMixinBase
   /** Whether the label should appear before or after the checkbox. Defaults to 'after' */
   @Input() checkboxPosition: 'before' | 'after' = 'after';
 
+  /** Value of the option */
+  @Input() value: any;
+
   /** Whether the option is disabled. */
   @Input()
   get disabled() { return (this.selectionList && this.selectionList.disabled) || this._disabled; }
   set disabled(value: any) { this._disabled = coerceBooleanProperty(value); }
 
-  /** Value of the option */
-  @Input()
-  get value() { return this._value; }
-  set value( val: any) { this._value = coerceBooleanProperty(val); }
-
   /** Whether the option is selected. */
   @Input()
   get selected() { return this._selected; }
-  set selected( val: boolean) { this._selected = coerceBooleanProperty(val); }
+  set selected(value: boolean) { this._selected = coerceBooleanProperty(value); }
 
   /** Emitted when the option is focused. */
   onFocus = new EventEmitter<MdSelectionListOptionEvent>();
@@ -123,7 +120,7 @@ export class MdListOption extends _MdListOptionMixinBase
               private _element: ElementRef,
               private _changeDetector: ChangeDetectorRef,
               @Optional() @Inject(forwardRef(() => MdSelectionList))
-                  public selectionList: MdSelectionList) {
+              public selectionList: MdSelectionList) {
     super();
   }
 

From 50a6bb77967201733680a157c9aadb82caf967a3 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 12 Sep 2017 10:21:29 -0700
Subject: [PATCH 073/575] fix(aria-describer): remove unsafe !.s in
 aria-describer (#7011)

---
 src/cdk/a11y/aria-describer.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/cdk/a11y/aria-describer.ts b/src/cdk/a11y/aria-describer.ts
index cf8e7df13aa5..ca6a57d6477f 100644
--- a/src/cdk/a11y/aria-describer.ts
+++ b/src/cdk/a11y/aria-describer.ts
@@ -53,7 +53,7 @@ export class AriaDescriber {
    * message element.
    */
   describe(hostElement: Element, message: string) {
-    if (!this._platform.isBrowser || !`${message}`.trim()) { return; }
+    if (!this._platform.isBrowser || !message.trim()) { return; }
 
     if (!messageRegistry.has(message)) {
       createMessageElement(message);
@@ -66,7 +66,7 @@ export class AriaDescriber {
 
   /** Removes the host element's aria-describedby reference to the message element. */
   removeDescription(hostElement: Element, message: string) {
-    if (!this._platform.isBrowser || !`${message}`.trim()) {
+    if (!this._platform.isBrowser || !message.trim()) {
       return;
     }
 
@@ -74,11 +74,12 @@ export class AriaDescriber {
       removeMessageReference(hostElement, message);
     }
 
-    if (messageRegistry.get(message)!.referenceCount === 0) {
+    const registeredMessage = messageRegistry.get(message);
+    if (registeredMessage && registeredMessage.referenceCount === 0) {
       deleteMessageElement(message);
     }
 
-    if (messagesContainer!.childNodes.length === 0) {
+    if (messagesContainer && messagesContainer.childNodes.length === 0) {
       deleteMessagesContainer();
     }
   }
@@ -118,8 +119,11 @@ function createMessageElement(message: string) {
 
 /** Deletes the message element from the global messages container. */
 function deleteMessageElement(message: string) {
-  const messageElement = messageRegistry.get(message)!.messageElement;
-  messagesContainer!.removeChild(messageElement);
+  const registeredMessage = messageRegistry.get(message);
+  const messageElement = registeredMessage && registeredMessage.messageElement;
+  if (messagesContainer && messageElement) {
+    messagesContainer.removeChild(messageElement);
+  }
   messageRegistry.delete(message);
 }
 
@@ -174,11 +178,12 @@ function removeMessageReference(element: Element, message: string) {
 }
 
 /** Returns true if the element has been described by the provided message ID. */
-function isElementDescribedByMessage(element: Element, message: string) {
+function isElementDescribedByMessage(element: Element, message: string): boolean {
   const referenceIds = getAriaReferenceIds(element, 'aria-describedby');
-  const messageId = messageRegistry.get(message)!.messageElement.id;
+  const registeredMessage = messageRegistry.get(message);
+  const messageId = registeredMessage && registeredMessage.messageElement.id;
 
-  return referenceIds.indexOf(messageId) != -1;
+  return !!messageId && referenceIds.indexOf(messageId) != -1;
 }
 
 /** @docs-private */

From f6d1078e5440531a57fd8e187ccb6720b725a6f6 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 12 Sep 2017 10:58:14 -0700
Subject: [PATCH 074/575] fix(tooltip): ensure tooltip never passes undefined
 message to (#7018)

AriaDescriber
---
 src/lib/tooltip/tooltip.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index d5a7c14169a6..a941be0a3416 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -142,17 +142,15 @@ export class MdTooltip implements OnDestroy {
   /** The default delay in ms before hiding the tooltip after hide is called */
   @Input('mdTooltipHideDelay') hideDelay = 0;
 
-  private _message: string;
+  private _message = '';
 
   /** The message to be displayed in the tooltip */
   @Input('mdTooltip') get message() { return this._message; }
   set message(value: string) {
-    if (this._message) {
-      this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message);
-    }
+    this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message);
 
     // If the message is not a string (e.g. number), convert it to a string and trim it.
-    this._message = value ? `${value}`.trim() : '';
+    this._message = value ? value.trim() : '';
     this._updateTooltipMessage();
     this._ariaDescriber.describe(this._elementRef.nativeElement, this.message);
   }

From acbb1d42f311b362028f79e5f0ba2c9e4186076a Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 12 Sep 2017 10:59:04 -0700
Subject: [PATCH 075/575] chore: remove accidental premature changelog (#7019)

---
 CHANGELOG.md | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 088ccc5a1f9e..4e330f4ecb0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,48 +1,3 @@
-<a name="2.0.0-beta.11"></a>
-# [2.0.0-beta.11](https://github.com/angular/material2/compare/2.0.0-beta.10...2.0.0-beta.11) (2017-09-07)
-
-### Highlights
-Stepper component
-
-### Breaking changes
-* Remove MaterialModule. (#6803) ([cf1ece0](https://github.com/angular/material2/commit/cf1ece0))
-MaterialModule has been removed and is no longer available.  As noted in the changelog for beta.3, an aggregate module like MaterialModule prevents tools from being able to treeshake unused components and modules.
-
-
-### Features
-
-* **expansion-panel:** allow for the panel header height to be customized ([#6643](https://github.com/angular/material2/issues/6643)) ([11e2239](https://github.com/angular/material2/commit/11e2239)), closes [#5641](https://github.com/angular/material2/issues/5641)
-* **sort:** add sorting indicator animation ([#5831](https://github.com/angular/material2/issues/5831)) ([70bd5fc](https://github.com/angular/material2/commit/70bd5fc))
-* **stepper:** Add e2e test ([#6776](https://github.com/angular/material2/issues/6776)) ([bef6271](https://github.com/angular/material2/commit/bef6271))
-* **stepper:** add moduleId to components ([#6780](https://github.com/angular/material2/issues/6780)) ([f375f92](https://github.com/angular/material2/commit/f375f92))
-* **stepper:** Address previous comments + add directionality support ([#6775](https://github.com/angular/material2/issues/6775)) ([c396596](https://github.com/angular/material2/commit/c396596))
-* **stepper:** initial version of stepper ([#6594](https://github.com/angular/material2/issues/6594)) ([87318bc](https://github.com/angular/material2/commit/87318bc))
-
-
-### Bug Fixes
-
-* **autocomplete,select:** inconsistent disabled option coloring ([#6640](https://github.com/angular/material2/issues/6640)) ([454781d](https://github.com/angular/material2/commit/454781d)), closes [#6638](https://github.com/angular/material2/issues/6638)
-* **autosize:** not resizing on programmatic changes ([#6654](https://github.com/angular/material2/issues/6654)) ([89fea50](https://github.com/angular/material2/commit/89fea50)), closes [#5247](https://github.com/angular/material2/issues/5247)
-* **button-toggle:** border radius ignored if option is selected ([#6699](https://github.com/angular/material2/issues/6699)) ([82e14f8](https://github.com/angular/material2/commit/82e14f8)), closes [#6689](https://github.com/angular/material2/issues/6689)
-* **checkbox:** label content should not wrap ([#6674](https://github.com/angular/material2/issues/6674)) ([9acab86](https://github.com/angular/material2/commit/9acab86)), closes [#6671](https://github.com/angular/material2/issues/6671)
-* **datepicker:** Create a new injection token to avoid overriding LOCALE_ID ([#6708](https://github.com/angular/material2/issues/6708)) ([2635cad](https://github.com/angular/material2/commit/2635cad))
-* **expansion-panel:** dark theme header hover color ([#6616](https://github.com/angular/material2/issues/6616)) ([21c68ad](https://github.com/angular/material2/commit/21c68ad))
-* **form-field:** add aria-owns to label element ([#6683](https://github.com/angular/material2/issues/6683)) ([4191b4d](https://github.com/angular/material2/commit/4191b4d))
-* **grid-list:** avoid unnecessary calc declarations ([#6745](https://github.com/angular/material2/issues/6745)) ([255611b](https://github.com/angular/material2/commit/255611b))
-* **grid-list:** styles not cleared when switching to a different styling mode ([#6660](https://github.com/angular/material2/issues/6660)) ([87d607e](https://github.com/angular/material2/commit/87d607e)), closes [#4047](https://github.com/angular/material2/issues/4047)
-* **input:** remove resize handle from non-textarea inputs ([#6768](https://github.com/angular/material2/issues/6768)) ([1272f03](https://github.com/angular/material2/commit/1272f03)), closes [#6757](https://github.com/angular/material2/issues/6757)
-* **list:** subheader margin being overwritten by typography ([#6735](https://github.com/angular/material2/issues/6735)) ([efe483a](https://github.com/angular/material2/commit/efe483a))
-* **menu:** nested menu hover not working when trigger is added lazily ([#6807](https://github.com/angular/material2/issues/6807)) ([6b5100b](https://github.com/angular/material2/commit/6b5100b)), closes [#6731](https://github.com/angular/material2/issues/6731)
-* **selection-list:** proper style for disabled options ([#6829](https://github.com/angular/material2/issues/6829)) ([547d11f](https://github.com/angular/material2/commit/547d11f))
-* **slide-toggle:** support native tabindex attribute ([#6613](https://github.com/angular/material2/issues/6613)) ([8f9f3c8](https://github.com/angular/material2/commit/8f9f3c8))
-* **slider:** thumb disappearing on disabled element with thumb label ([#6641](https://github.com/angular/material2/issues/6641)) ([8243b16](https://github.com/angular/material2/commit/8243b16)), closes [#6631](https://github.com/angular/material2/issues/6631)
-* **slider:** update styles when focus and dir change ([#6700](https://github.com/angular/material2/issues/6700)) ([8c49422](https://github.com/angular/material2/commit/8c49422))
-* **snack-bar:** animation not starting for subsequent snack bars ([#6649](https://github.com/angular/material2/issues/6649)) ([730e7ae](https://github.com/angular/material2/commit/730e7ae)), closes [#6222](https://github.com/angular/material2/issues/6222)
-* **tabs:** fix infinite tab loop ([#6663](https://github.com/angular/material2/issues/6663)) ([67e02b0](https://github.com/angular/material2/commit/67e02b0)), closes [#4639](https://github.com/angular/material2/issues/4639)
-* **tabs:** tab spacing on desktop incorrect ([#6681](https://github.com/angular/material2/issues/6681)) ([b678119](https://github.com/angular/material2/commit/b678119)), closes [#3347](https://github.com/angular/material2/issues/3347)
-
-
-
 <a name="2.0.0-beta.10"></a>
 # [2.0.0-beta.10 découpage-panjandrum](https://github.com/angular/material2/compare/2.0.0-beta.8...2.0.0-beta.10) (2017-08-29)
 

From 0257f4824b065c8fcb8a454a24a33def970ac09b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 22:06:08 +0200
Subject: [PATCH 076/575] chore(tooltip): regression when trimming non-string
 messages (#7024)

Fixes a regression from f6d1078e5440531a57fd8e187ccb6720b725a6f6.
---
 src/lib/tooltip/tooltip.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index a941be0a3416..3fa8f937ace4 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -150,7 +150,7 @@ export class MdTooltip implements OnDestroy {
     this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message);
 
     // If the message is not a string (e.g. number), convert it to a string and trim it.
-    this._message = value ? value.trim() : '';
+    this._message = value != null ? `${value}`.trim() : '';
     this._updateTooltipMessage();
     this._ariaDescriber.describe(this._elementRef.nativeElement, this.message);
   }

From bcd026f457c151e27cf8b5bda803a4ccae619172 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 22:18:55 +0200
Subject: [PATCH 077/575] fix(tooltip): closing immediately when triggered on
 click (#6590)

Fixes the tooltip being closed immediately if it is opened as a result of a click. It seems like the logic that was supposed to handle this in master fires before the event has had the chance to bubble up to the body. These changes switch to relying on Angular's animation events to disable the body click.

Relates to #6552.
---
 src/lib/tooltip/tooltip.html    |  3 ++-
 src/lib/tooltip/tooltip.spec.ts | 39 ++++++++++++++++++++++++++++++---
 src/lib/tooltip/tooltip.ts      | 32 ++++++++++++++-------------
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/src/lib/tooltip/tooltip.html b/src/lib/tooltip/tooltip.html
index 1da0d330d3ea..8f9981cf2e24 100644
--- a/src/lib/tooltip/tooltip.html
+++ b/src/lib/tooltip/tooltip.html
@@ -2,4 +2,5 @@
      [ngClass]="tooltipClass"
      [style.transform-origin]="_transformOrigin"
      [@state]="_visibility"
-     (@state.done)="_afterVisibilityAnimation($event)">{{message}}</div>
+     (@state.start)="_animationStart()"
+     (@state.done)="_animationDone($event)">{{message}}</div>
diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index a251597ddc52..d05fd3e983e4 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -328,14 +328,14 @@ describe('MdTooltip', () => {
       fixture.detectChanges();
 
       // At this point the animation should be able to complete itself and trigger the
-      // _afterVisibilityAnimation function, but for unknown reasons in the test infrastructure,
+      // _animationDone function, but for unknown reasons in the test infrastructure,
       // this does not occur. Manually call this and verify that doing so does not
       // throw an error.
-      tooltipInstance._afterVisibilityAnimation({
+      tooltipInstance._animationDone({
         fromState: 'visible',
         toState: 'hidden',
         totalTime: 150,
-        phaseName: '',
+        phaseName: 'done',
       } as AnimationEvent);
     }));
 
@@ -436,6 +436,39 @@ describe('MdTooltip', () => {
 
       expect(tooltipDirective.message).toBe('100');
     }));
+
+    it('should hide when clicking away', fakeAsync(() => {
+      tooltipDirective.show();
+      tick(0);
+      fixture.detectChanges();
+      tick(500);
+
+      expect(tooltipDirective._isTooltipVisible()).toBe(true);
+      expect(overlayContainerElement.textContent).toContain(initialTooltipMessage);
+
+      document.body.click();
+      tick(0);
+      fixture.detectChanges();
+      tick(500);
+
+      expect(tooltipDirective._isTooltipVisible()).toBe(false);
+      expect(overlayContainerElement.textContent).toBe('');
+    }));
+
+    it('should not hide immediately if a click fires while animating', fakeAsync(() => {
+      tooltipDirective.show();
+      tick(0);
+      fixture.detectChanges();
+
+      document.body.click();
+      fixture.detectChanges();
+
+      tick(500);
+
+      expect(tooltipDirective._isTooltipVisible()).toBe(true);
+      expect(overlayContainerElement.textContent).toContain(initialTooltipMessage);
+    }));
+
   });
 
   describe('scrollable usage', () => {
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 3fa8f937ace4..9dddf7387c6d 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -422,10 +422,8 @@ export type TooltipVisibility = 'initial' | 'visible' | 'hidden';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     trigger('state', [
-      state('void', style({transform: 'scale(0)'})),
-      state('initial', style({transform: 'scale(0)'})),
+      state('initial, void, hidden', style({transform: 'scale(0)'})),
       state('visible', style({transform: 'scale(1)'})),
-      state('hidden', style({transform: 'scale(0)'})),
       transition('* => visible', animate('150ms cubic-bezier(0.0, 0.0, 0.2, 1)')),
       transition('* => hidden', animate('150ms cubic-bezier(0.4, 0.0, 1, 1)')),
     ])
@@ -455,7 +453,7 @@ export class TooltipComponent {
   _visibility: TooltipVisibility = 'initial';
 
   /** Whether interactions on the page should close the tooltip */
-  _closeOnInteraction: boolean = false;
+  private _closeOnInteraction: boolean = false;
 
   /** The transform origin used in the animation for showing and hiding the tooltip */
   _transformOrigin: string = 'bottom';
@@ -477,21 +475,13 @@ export class TooltipComponent {
       clearTimeout(this._hideTimeoutId);
     }
 
-    // Body interactions should cancel the tooltip if there is a delay in showing.
-    this._closeOnInteraction = true;
-
     this._setTransformOrigin(position);
     this._showTimeoutId = setTimeout(() => {
       this._visibility = 'visible';
 
-      // If this was set to true immediately, then a body click that triggers show() would
-      // trigger interaction and close the tooltip right after it was displayed.
-      this._closeOnInteraction = false;
-
       // Mark for check so if any parent component has set the
       // ChangeDetectionStrategy to OnPush it will be checked anyways
       this._markForCheck();
-      setTimeout(() => this._closeOnInteraction = true, 0);
     }, delay);
   }
 
@@ -507,7 +497,6 @@ export class TooltipComponent {
 
     this._hideTimeoutId = setTimeout(() => {
       this._visibility = 'hidden';
-      this._closeOnInteraction = false;
 
       // Mark for check so if any parent component has set the
       // ChangeDetectionStrategy to OnPush it will be checked anyways
@@ -543,10 +532,23 @@ export class TooltipComponent {
     }
   }
 
-  _afterVisibilityAnimation(e: AnimationEvent): void {
-    if (e.toState === 'hidden' && !this.isVisible()) {
+  _animationStart() {
+    this._closeOnInteraction = false;
+  }
+
+  _animationDone(event: AnimationEvent): void {
+    const toState = event.toState as TooltipVisibility;
+
+    if (toState === 'hidden' && !this.isVisible()) {
       this._onHide.next();
     }
+
+    if (toState === 'visible' || toState === 'hidden') {
+      // Note: as of Angular 4.3, the animations module seems to fire the `start` callback before
+      // the end if animations are disabled. Make this call async to ensure that it still fires
+      // at the appropriate time.
+      Promise.resolve().then(() => this._closeOnInteraction = true);
+    }
   }
 
   /**

From 881630f31d2ebf55ce5c9d8d8cfc1ed59333743c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 22:20:56 +0200
Subject: [PATCH 078/575] feat(viewport-ruler): add common window resize
 handler (#6680)

Adds the `change` method to the `ViewportRuler`, allowing for components to hook up to a common window resize handler.

BREAKING CHANGE: Previously the `ScrollDispatcher.scrolled` subscription would react both on scroll events and on window resize events. Now it only reacts to scroll events. To react to resize events, subscribe to the `ViewportRuler.change()` stream.
---
 src/cdk/scrolling/scroll-dispatcher.spec.ts  |  1 -
 src/cdk/scrolling/scroll-dispatcher.ts       |  6 +--
 src/cdk/scrolling/viewport-ruler.spec.ts     | 40 ++++++++++++++-
 src/cdk/scrolling/viewport-ruler.ts          | 52 ++++++++++++++++----
 src/lib/tabs/tab-group.spec.ts               |  6 +--
 src/lib/tabs/tab-header.spec.ts              |  4 +-
 src/lib/tabs/tab-header.ts                   |  9 ++--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts |  8 ++-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts      | 18 +++----
 9 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index d08dc5f8cf4c..5f10625f990a 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -72,7 +72,6 @@ describe('Scroll Dispatcher', () => {
 
       scroll.scrolled(0, () => {});
       dispatchFakeEvent(document, 'scroll');
-      dispatchFakeEvent(window, 'resize');
 
       expect(spy).not.toHaveBeenCalled();
       subscription.unsubscribe();
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 177f830ac2c0..0e0e5b6aa1d1 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -11,7 +11,6 @@ import {Platform} from '@angular/cdk/platform';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {fromEvent} from 'rxjs/observable/fromEvent';
-import {merge} from 'rxjs/observable/merge';
 import {auditTime} from 'rxjs/operator/auditTime';
 import {Scrollable} from './scrollable';
 
@@ -87,10 +86,7 @@ export class ScrollDispatcher {
 
     if (!this._globalSubscription) {
       this._globalSubscription = this._ngZone.runOutsideAngular(() => {
-        return merge(
-          fromEvent(window.document, 'scroll'),
-          fromEvent(window, 'resize')
-        ).subscribe(() => this._notify());
+        return fromEvent(window.document, 'scroll').subscribe(() => this._notify());
       });
     }
 
diff --git a/src/cdk/scrolling/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts
index 349b00efb186..3eab7427d48d 100644
--- a/src/cdk/scrolling/viewport-ruler.spec.ts
+++ b/src/cdk/scrolling/viewport-ruler.spec.ts
@@ -1,6 +1,7 @@
-import {TestBed, inject} from '@angular/core/testing';
+import {TestBed, inject, fakeAsync, tick} from '@angular/core/testing';
 import {ScrollDispatchModule} from './public_api';
 import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
+import {dispatchFakeEvent} from '@angular/cdk/testing';
 
 
 // For all tests, we assume the browser window is 1024x786 (outerWidth x outerHeight).
@@ -32,6 +33,10 @@ describe('ViewportRuler', () => {
     scrollTo(0, 0);
   }));
 
+  afterEach(() => {
+    ruler.ngOnDestroy();
+  });
+
   it('should get the viewport bounds when the page is not scrolled', () => {
     let bounds = ruler.getViewportRect();
     expect(bounds.top).toBe(0);
@@ -101,4 +106,37 @@ describe('ViewportRuler', () => {
 
     document.body.removeChild(veryLargeElement);
   });
+
+  describe('changed event', () => {
+    it('should dispatch an event when the window is resized', () => {
+      const spy = jasmine.createSpy('viewport changed spy');
+      const subscription = ruler.change(0).subscribe(spy);
+
+      dispatchFakeEvent(window, 'resize');
+      expect(spy).toHaveBeenCalled();
+      subscription.unsubscribe();
+    });
+
+    it('should dispatch an event when the orientation is changed', () => {
+      const spy = jasmine.createSpy('viewport changed spy');
+      const subscription = ruler.change(0).subscribe(spy);
+
+      dispatchFakeEvent(window, 'orientationchange');
+      expect(spy).toHaveBeenCalled();
+      subscription.unsubscribe();
+    });
+
+    it('should be able to throttle the callback', fakeAsync(() => {
+      const spy = jasmine.createSpy('viewport changed spy');
+      const subscription = ruler.change(1337).subscribe(spy);
+
+      dispatchFakeEvent(window, 'resize');
+      expect(spy).not.toHaveBeenCalled();
+
+      tick(1337);
+
+      expect(spy).toHaveBeenCalledTimes(1);
+      subscription.unsubscribe();
+    }));
+  });
 });
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index fbd55ad9e2d6..1643cf687da0 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -6,23 +6,49 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional, SkipSelf} from '@angular/core';
+import {Injectable, Optional, SkipSelf, NgZone, OnDestroy} from '@angular/core';
+import {Platform} from '@angular/cdk/platform';
 import {ScrollDispatcher} from './scroll-dispatcher';
+import {Observable} from 'rxjs/Observable';
+import {fromEvent} from 'rxjs/observable/fromEvent';
+import {merge} from 'rxjs/observable/merge';
+import {auditTime} from 'rxjs/operator/auditTime';
+import {Subscription} from 'rxjs/Subscription';
+import {of as observableOf} from 'rxjs/observable/of';
 
+/** Time in ms to throttle the resize events by default. */
+export const DEFAULT_RESIZE_TIME = 20;
 
 /**
  * Simple utility for getting the bounds of the browser viewport.
  * @docs-private
  */
 @Injectable()
-export class ViewportRuler {
+export class ViewportRuler implements OnDestroy {
 
   /** Cached document client rectangle. */
   private _documentRect?: ClientRect;
 
-  constructor(scrollDispatcher: ScrollDispatcher) {
+  /** Stream of viewport change events. */
+  private _change: Observable<Event>;
+
+  /** Subscriptions to streams that invalidate the cached viewport dimensions. */
+  private _invalidateCacheSubscriptions: Subscription[];
+
+  constructor(platform: Platform, ngZone: NgZone, scrollDispatcher: ScrollDispatcher) {
+    this._change = platform.isBrowser ? ngZone.runOutsideAngular(() => {
+      return merge<Event>(fromEvent(window, 'resize'), fromEvent(window, 'orientationchange'));
+    }) : observableOf();
+
     // Subscribe to scroll and resize events and update the document rectangle on changes.
-    scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry());
+    this._invalidateCacheSubscriptions = [
+      scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry()),
+      this.change().subscribe(() => this._cacheViewportGeometry())
+    ];
+  }
+
+  ngOnDestroy() {
+    this._invalidateCacheSubscriptions.forEach(subscription => subscription.unsubscribe());
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
@@ -56,7 +82,6 @@ export class ViewportRuler {
     };
   }
 
-
   /**
    * Gets the (top, left) scroll position of the viewport.
    * @param documentRect
@@ -75,7 +100,7 @@ export class ViewportRuler {
     // `document.documentElement` works consistently, where the `top` and `left` values will
     // equal negative the scroll position.
     const top = -documentRect!.top || document.body.scrollTop || window.scrollY ||
-                  document.documentElement.scrollTop || 0;
+                 document.documentElement.scrollTop || 0;
 
     const left = -documentRect!.left || document.body.scrollLeft || window.scrollX ||
                   document.documentElement.scrollLeft || 0;
@@ -83,23 +108,32 @@ export class ViewportRuler {
     return {top, left};
   }
 
+  /**
+   * Returns a stream that emits whenever the size of the viewport changes.
+   * @param throttle Time in milliseconds to throttle the stream.
+   */
+  change(throttleTime: number = DEFAULT_RESIZE_TIME): Observable<string> {
+    return throttleTime > 0 ? auditTime.call(this._change, throttleTime) : this._change;
+  }
+
   /** Caches the latest client rectangle of the document element. */
   _cacheViewportGeometry() {
     this._documentRect = document.documentElement.getBoundingClientRect();
   }
-
 }
 
 /** @docs-private */
 export function VIEWPORT_RULER_PROVIDER_FACTORY(parentRuler: ViewportRuler,
+                                                platform: Platform,
+                                                ngZone: NgZone,
                                                 scrollDispatcher: ScrollDispatcher) {
-  return parentRuler || new ViewportRuler(scrollDispatcher);
+  return parentRuler || new ViewportRuler(platform, ngZone, scrollDispatcher);
 }
 
 /** @docs-private */
 export const VIEWPORT_RULER_PROVIDER = {
   // If there is already a ViewportRuler available, use that. Otherwise, provide a new one.
   provide: ViewportRuler,
-  deps: [[new Optional(), new SkipSelf(), ViewportRuler], ScrollDispatcher],
+  deps: [[new Optional(), new SkipSelf(), ViewportRuler], Platform, NgZone, ScrollDispatcher],
   useFactory: VIEWPORT_RULER_PROVIDER_FACTORY
 };
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index a82befc61f89..0718faa6c7ad 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -2,8 +2,7 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/t
 import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {By} from '@angular/platform-browser';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent} from '@angular/cdk/testing';
 import {Observable} from 'rxjs/Observable';
 import {MdTab, MdTabGroup, MdTabHeaderPosition, MdTabsModule} from './index';
 
@@ -19,9 +18,6 @@ describe('MdTabGroup', () => {
         AsyncTabsTestApp,
         DisabledTabsTestApp,
         TabGroupWithSimpleApi,
-      ],
-      providers: [
-        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index 64239dfc60a2..564f6fe53cc9 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -6,9 +6,8 @@ import {CommonModule} from '@angular/common';
 import {By} from '@angular/platform-browser';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
 import {PortalModule} from '@angular/cdk/portal';
-import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Direction, Directionality} from '@angular/cdk/bidi';
-import {dispatchFakeEvent, dispatchKeyboardEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {MdTabHeader} from './tab-header';
 import {MdRippleModule} from '../core/ripple/index';
 import {MdInkBar} from './ink-bar';
@@ -35,7 +34,6 @@ describe('MdTabHeader', () => {
       ],
       providers: [
         {provide: Directionality, useFactory: () => ({value: dir, change: change.asObservable()})},
-        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 00f0987bc69e..17ceb10e02e6 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -26,14 +26,14 @@ import {
 } from '@angular/core';
 import {Directionality, Direction} from '@angular/cdk/bidi';
 import {RIGHT_ARROW, LEFT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
-import {auditTime, startWith} from '@angular/cdk/rxjs';
+import {startWith} from '@angular/cdk/rxjs';
 import {Subscription} from 'rxjs/Subscription';
 import {of as observableOf} from 'rxjs/observable/of';
 import {merge} from 'rxjs/observable/merge';
-import {fromEvent} from 'rxjs/observable/fromEvent';
 import {MdTabLabelWrapper} from './tab-label-wrapper';
 import {MdInkBar} from './ink-bar';
 import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {ViewportRuler} from '@angular/cdk/scrolling';
 
 /**
  * The directions that scrolling can go in when the header's tabs exceed the header width. 'After'
@@ -132,6 +132,7 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
   constructor(private _elementRef: ElementRef,
               private _renderer: Renderer2,
               private _changeDetectorRef: ChangeDetectorRef,
+              private _viewportRuler: ViewportRuler,
               @Optional() private _dir: Directionality) {
     super();
   }
@@ -184,9 +185,7 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
    */
   ngAfterContentInit() {
     const dirChange = this._dir ? this._dir.change : observableOf(null);
-    const resize = typeof window !== 'undefined' ?
-        auditTime.call(fromEvent(window, 'resize'), 150) :
-        observableOf(null);
+    const resize = this._viewportRuler.change(150);
 
     this._realignInkBar = startWith.call(merge(dirChange, resize), null).subscribe(() => {
       this._updatePagination();
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index e38e006ad6a0..6328fc651918 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -1,8 +1,7 @@
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchFakeEvent, dispatchMouseEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {Subject} from 'rxjs/Subject';
 import {MdTabNav, MdTabsModule, MdTabLink} from '../index';
@@ -23,8 +22,7 @@ describe('MdTabNavBar', () => {
         {provide: Directionality, useFactory: () => ({
           value: dir,
           change: dirChange.asObservable()
-        })},
-        {provide: ViewportRuler, useClass: FakeViewportRuler},
+        })}
       ]
     });
 
@@ -173,7 +171,7 @@ describe('MdTabNavBar', () => {
       spyOn(inkBar, 'alignToElement');
 
       dispatchFakeEvent(window, 'resize');
-      tick(10);
+      tick(150);
       fixture.detectChanges();
 
       expect(inkBar.alignToElement).toHaveBeenCalled();
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index d247017fe418..3e5e961d0f27 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -28,11 +28,10 @@ import {
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Directionality} from '@angular/cdk/bidi';
 import {Platform} from '@angular/cdk/platform';
-import {auditTime, takeUntil} from '@angular/cdk/rxjs';
+import {takeUntil} from '@angular/cdk/rxjs';
 import {Subject} from 'rxjs/Subject';
 import {of as observableOf} from 'rxjs/observable/of';
 import {merge} from 'rxjs/observable/merge';
-import {fromEvent} from 'rxjs/observable/fromEvent';
 import {CanDisableRipple, mixinDisableRipple} from '../../core/common-behaviors/disable-ripple';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {CanDisable, mixinDisabled} from '../../core/common-behaviors/disabled';
@@ -105,7 +104,8 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
               elementRef: ElementRef,
               @Optional() private _dir: Directionality,
               private _ngZone: NgZone,
-              private _changeDetectorRef: ChangeDetectorRef) {
+              private _changeDetectorRef: ChangeDetectorRef,
+              private _viewportRuler: ViewportRuler) {
     super(renderer, elementRef);
   }
 
@@ -121,14 +121,10 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
 
   ngAfterContentInit(): void {
     this._ngZone.runOutsideAngular(() => {
-      let dirChange = this._dir ? this._dir.change : observableOf(null);
-      let resize = typeof window !== 'undefined' ?
-          auditTime.call(fromEvent(window, 'resize'), 10) :
-          observableOf(null);
-
-      return takeUntil.call(merge(dirChange, resize), this._onDestroy).subscribe(() => {
-        this._alignInkBar();
-      });
+      const dirChange = this._dir ? this._dir.change : observableOf(null);
+
+      return takeUntil.call(merge(dirChange, this._viewportRuler.change(10)), this._onDestroy)
+          .subscribe(() => this._alignInkBar());
     });
 
     this._setLinkDisableRipple();

From 04bf3d1fd54402a5582f6043e2db02fde4598516 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 12 Sep 2017 22:21:28 +0200
Subject: [PATCH 079/575] fix(menu): nested trigger staying highlighted after
 click (#6853)

* fix(menu): nested trigger staying highlighted after click

Prevents the sub-menu trigger from staying highlighted if the user clicks on it and moves away to another menu item.

Fixes #6838.

* fix: firefox tests crashing
---
 src/cdk/testing/dispatch-events.ts |  5 +++--
 src/cdk/testing/event-objects.ts   |  2 +-
 src/lib/menu/menu-trigger.ts       |  7 +++++++
 src/lib/menu/menu.spec.ts          | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/cdk/testing/dispatch-events.ts b/src/cdk/testing/dispatch-events.ts
index 6e7739c22454..f815fce1a4b9 100644
--- a/src/cdk/testing/dispatch-events.ts
+++ b/src/cdk/testing/dispatch-events.ts
@@ -25,6 +25,7 @@ export function dispatchKeyboardEvent(node: Node, type: string, keyCode: number)
 }
 
 /** Shorthand to dispatch a mouse event on the specified coordinates. */
-export function dispatchMouseEvent(node: Node, type: string, x = 0, y = 0): MouseEvent {
-  return dispatchEvent(node, createMouseEvent(type, x, y)) as MouseEvent;
+export function dispatchMouseEvent(node: Node, type: string, x = 0, y = 0,
+  event = createMouseEvent(type, x, y)): MouseEvent {
+  return dispatchEvent(node, event) as MouseEvent;
 }
diff --git a/src/cdk/testing/event-objects.ts b/src/cdk/testing/event-objects.ts
index 1d88d7996df2..856aad2f09f4 100644
--- a/src/cdk/testing/event-objects.ts
+++ b/src/cdk/testing/event-objects.ts
@@ -57,7 +57,7 @@ export function createKeyboardEvent(type: string, keyCode: number, target?: Elem
 
 /** Creates a fake event object with any desired event type. */
 export function createFakeEvent(type: string) {
-  let event = document.createEvent('Event');
+  const event = document.createEvent('Event');
   event.initEvent(type, true, true);
   return event;
 }
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 045b872296e6..9bceb8282e80 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -413,6 +413,13 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   _handleMousedown(event: MouseEvent): void {
     if (!isFakeMousedownFromScreenReader(event)) {
       this._openedByMouse = true;
+
+      // Since clicking on the trigger won't close the menu if it opens a sub-menu,
+      // we should prevent focus from moving onto it via click to avoid the
+      // highlight from lingering on the menu item.
+      if (this.triggersSubmenu) {
+        event.preventDefault();
+      }
     }
   }
 
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 6006dcab4f6b..a9e8086aaa5f 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -29,6 +29,7 @@ import {
   dispatchMouseEvent,
   dispatchEvent,
   createKeyboardEvent,
+  createMouseEvent,
 } from '@angular/cdk/testing';
 
 
@@ -1014,6 +1015,20 @@ describe('MdMenu', () => {
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(2, 'Expected two open menus');
     }));
 
+    it('should prevent the default mousedown action if the menu item opens a sub-menu', () => {
+      compileTestComponent();
+      instance.rootTrigger.openMenu();
+      fixture.detectChanges();
+
+      const event = createMouseEvent('mousedown');
+
+      Object.defineProperty(event, 'buttons', {get: () => 1});
+      event.preventDefault = jasmine.createSpy('preventDefault spy');
+
+      dispatchMouseEvent(overlay.querySelector('[md-menu-item]')!, 'mousedown', 0, 0, event);
+      expect(event.preventDefault).toHaveBeenCalled();
+    });
+
   });
 
 });

From 1cccd4bda6aa6dbe366d4510f92630fcdd525c92 Mon Sep 17 00:00:00 2001
From: Philip Pham <phillypham@google.com>
Date: Tue, 12 Sep 2017 13:22:00 -0700
Subject: [PATCH 080/575] fix(menu): multiple close events for a single close
 (#6961)

* fix(menu): multiple close events for a single close

Don't emit a closed event when another event will be emitted. Previously, if one clicked on a menu item, one would get two events: `undefined` and `click` in that order. One would see similar behavior for `keydown` or clicking the backdrop. Unit tests were updated to prevent a regression.

* Responding to review comments from @crisbeto

* Observable.empty() -> Observable.of()
_closeMenu -> _destroyMenu
---
 src/lib/menu/menu-trigger.ts | 28 ++++++++++++++----------
 src/lib/menu/menu.spec.ts    | 42 ++++++++++++++++++++++++++----------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 9bceb8282e80..c06485356677 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -43,8 +43,8 @@ import {MdMenuItem} from './menu-item';
 import {MdMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 import {throwMdMenuMissingError} from './menu-errors';
-import {of as observableOf} from 'rxjs/observable/of';
 import {merge} from 'rxjs/observable/merge';
+import {of as observableOf} from 'rxjs/observable/of';
 import {Subscription} from 'rxjs/Subscription';
 
 /** Injection token that determines the scroll handling while the menu is open. */
@@ -153,7 +153,7 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
     this._checkMenu();
 
     this.menu.close.subscribe(reason => {
-      this.closeMenu();
+      this._destroyMenu();
 
       // If a click closed the menu, we should close the entire chain of nested menus.
       if (reason === 'click' && this._parentMenu) {
@@ -205,7 +205,9 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   openMenu(): void {
     if (!this._menuOpen) {
       this._createOverlay().attach(this._portal);
-      this._closeSubscription = this._menuClosingActions().subscribe(() => this.menu.close.emit());
+      this._closeSubscription = this._menuClosingActions().subscribe(() => {
+        this.menu.close.emit();
+      });
       this._initMenu();
 
       if (this.menu instanceof MdMenu) {
@@ -216,11 +218,20 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
 
   /** Closes the menu. */
   closeMenu(): void {
+    this.menu.close.emit();
+  }
+
+  /** Focuses the menu trigger. */
+  focus() {
+    this._element.nativeElement.focus();
+  }
+
+  /** Closes the menu and does the necessary cleanup. */
+  private _destroyMenu() {
     if (this._overlayRef && this.menuOpen) {
       this._resetMenu();
       this._overlayRef.detach();
       this._closeSubscription.unsubscribe();
-      this.menu.close.emit();
 
       if (this.menu instanceof MdMenu) {
         this.menu._resetAnimation();
@@ -228,11 +239,6 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
     }
   }
 
-  /** Focuses the menu trigger. */
-  focus() {
-    this._element.nativeElement.focus();
-  }
-
   /**
    * This method sets the menu state to open and focuses the first item if
    * the menu was opened via the keyboard.
@@ -400,11 +406,11 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   /** Returns a stream that emits whenever an action that should close the menu occurs. */
   private _menuClosingActions() {
     const backdrop = this._overlayRef!.backdropClick();
-    const parentClose = this._parentMenu ? this._parentMenu.close : observableOf(null);
+    const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
     const hover = this._parentMenu ? RxChain.from(this._parentMenu.hover())
         .call(filter, active => active !== this._menuItemInstance)
         .call(filter, () => this._menuOpen)
-        .result() : observableOf(null);
+        .result() : observableOf();
 
     return merge(backdrop, parentClose, hover);
   }
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index a9e8086aaa5f..d92db276b1cc 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -98,7 +98,7 @@ describe('MdMenu', () => {
     expect(overlayContainerElement.textContent).toBe('');
   }));
 
-  it('should close the menu when pressing escape', fakeAsync(() => {
+  it('should close the menu when pressing ESCAPE', fakeAsync(() => {
     const fixture = TestBed.createComponent(SimpleMenu);
     fixture.detectChanges();
     fixture.componentInstance.trigger.openMenu();
@@ -494,26 +494,40 @@ describe('MdMenu', () => {
       menuItem.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalled();
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith('click');
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
     });
 
     it('should emit a close event when the backdrop is clicked', () => {
-      const backdrop = <HTMLElement>overlayContainerElement.querySelector('.cdk-overlay-backdrop');
+      const backdrop = overlayContainerElement
+          .querySelector('.cdk-overlay-backdrop') as HTMLElement;
 
       backdrop.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalled();
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith(undefined);
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
+    });
+
+    it('should emit an event when pressing ESCAPE', () => {
+      const menu = overlayContainerElement.querySelector('.mat-menu-panel') as HTMLElement;
+
+      dispatchKeyboardEvent(menu, 'keydown', ESCAPE);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith('keydown');
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
     });
 
     it('should complete the callback when the menu is destroyed', () => {
-      let emitCallback = jasmine.createSpy('emit callback');
-      let completeCallback = jasmine.createSpy('complete callback');
+      const emitCallback = jasmine.createSpy('emit callback');
+      const completeCallback = jasmine.createSpy('complete callback');
 
       fixture.componentInstance.menu.close.subscribe(emitCallback, null, completeCallback);
       fixture.destroy();
 
-      expect(emitCallback).toHaveBeenCalled();
+      expect(emitCallback).toHaveBeenCalledWith(undefined);
+      expect(emitCallback).toHaveBeenCalledTimes(1);
       expect(completeCallback).toHaveBeenCalled();
     });
   });
@@ -995,6 +1009,9 @@ describe('MdMenu', () => {
       tick(500);
 
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(0, 'Expected no open menus');
+      expect(instance.rootCloseCallback).toHaveBeenCalledTimes(1);
+      expect(instance.levelOneCloseCallback).toHaveBeenCalledTimes(1);
+      expect(instance.levelTwoCloseCallback).toHaveBeenCalledTimes(1);
     }));
 
     it('should toggle a nested menu when its trigger is added after init', fakeAsync(() => {
@@ -1059,7 +1076,7 @@ describe('MdMenu default overrides', () => {
 @Component({
   template: `
     <button [mdMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <md-menu class="custom-one custom-two" #menu="mdMenu" (close)="closeCallback()">
+    <md-menu class="custom-one custom-two" #menu="mdMenu" (close)="closeCallback($event)">
       <button md-menu-item> Item </button>
       <button md-menu-item disabled> Disabled </button>
     </md-menu>
@@ -1152,7 +1169,7 @@ class CustomMenu {
       [mdMenuTriggerFor]="levelTwo"
       #alternateTrigger="mdMenuTrigger">Toggle alternate menu</button>
 
-    <md-menu #root="mdMenu">
+    <md-menu #root="mdMenu" (close)="rootCloseCallback($event)">
       <button md-menu-item
         id="level-one-trigger"
         [mdMenuTriggerFor]="levelOne"
@@ -1165,7 +1182,7 @@ class CustomMenu {
         #lazyTrigger="mdMenuTrigger">Three</button>
     </md-menu>
 
-    <md-menu #levelOne="mdMenu">
+    <md-menu #levelOne="mdMenu" (close)="levelOneCloseCallback($event)">
       <button md-menu-item>Four</button>
       <button md-menu-item
         id="level-two-trigger"
@@ -1174,7 +1191,7 @@ class CustomMenu {
       <button md-menu-item>Six</button>
     </md-menu>
 
-    <md-menu #levelTwo="mdMenu">
+    <md-menu #levelTwo="mdMenu" (close)="levelTwoCloseCallback($event)">
       <button md-menu-item>Seven</button>
       <button md-menu-item>Eight</button>
       <button md-menu-item>Nine</button>
@@ -1192,12 +1209,15 @@ class NestedMenu {
   @ViewChild('rootTrigger') rootTrigger: MdMenuTrigger;
   @ViewChild('rootTriggerEl') rootTriggerEl: ElementRef;
   @ViewChild('alternateTrigger') alternateTrigger: MdMenuTrigger;
+  readonly rootCloseCallback = jasmine.createSpy('root menu closed callback');
 
   @ViewChild('levelOne') levelOneMenu: MdMenu;
   @ViewChild('levelOneTrigger') levelOneTrigger: MdMenuTrigger;
+  readonly levelOneCloseCallback = jasmine.createSpy('level one menu closed callback');
 
   @ViewChild('levelTwo') levelTwoMenu: MdMenu;
   @ViewChild('levelTwoTrigger') levelTwoTrigger: MdMenuTrigger;
+  readonly levelTwoCloseCallback = jasmine.createSpy('level one menu closed callback');
 
   @ViewChild('lazy') lazyMenu: MdMenu;
   @ViewChild('lazyTrigger') lazyTrigger: MdMenuTrigger;

From 9545427c73627f0cf91b5086efd5d727459fc44f Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 12 Sep 2017 13:24:23 -0700
Subject: [PATCH 081/575] feat(datepicker): Add Moment.js adapter (#6860)

* create moment adapter

* add Moment to karma.conf.js

* use MAT_DATE_LOCALE

* tests are now running

* add in tests

* WIP: demo

* add synthetic default imports for moment

* add locale switching to demo

* fix moment import issues with tests

* fix aot

* address comments

* fix closure issue

* add additional explanation of rollup issue

* remove moment adapter demo since it is preventing sync into g3 (will add
back as a docs example in future PR).

* fix bad rebase
---
 package.json                                  |   1 +
 .../closure-compiler/build-devapp-bundle.sh   |   9 +-
 src/demo-app/system-config.ts                 |   2 +
 src/demo-app/tsconfig-aot.json                |   3 +-
 src/demo-app/tsconfig-build.json              |   3 +-
 src/lib/core/datetime/date-adapter.ts         |   8 +
 src/lib/datepicker/datepicker-input.ts        |   8 +
 src/material-moment-adapter/adapter/index.ts  |  36 ++
 .../adapter/moment-date-adapter.spec.ts       | 388 ++++++++++++++++++
 .../adapter/moment-date-adapter.ts            | 184 +++++++++
 .../adapter/moment-date-formats.ts            |  22 +
 src/material-moment-adapter/index.spec.ts     |   9 -
 src/material-moment-adapter/package.json      |   3 +-
 src/material-moment-adapter/public_api.ts     |   2 +-
 .../tsconfig-build.json                       |   2 +
 test/karma-test-shim.js                       |   1 +
 test/karma.conf.js                            |   1 +
 tools/gulp/tasks/aot.ts                       |   4 +-
 tools/gulp/tasks/development.ts               |   2 +-
 tools/gulp/util/task_helpers.ts               |   4 +-
 tools/package-tools/rollup-globals.ts         |   1 +
 tsconfig.json                                 |   3 +
 22 files changed, 678 insertions(+), 18 deletions(-)
 create mode 100644 src/material-moment-adapter/adapter/index.ts
 create mode 100644 src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
 create mode 100644 src/material-moment-adapter/adapter/moment-date-adapter.ts
 create mode 100644 src/material-moment-adapter/adapter/moment-date-formats.ts
 delete mode 100644 src/material-moment-adapter/index.spec.ts

diff --git a/package.json b/package.json
index c0410f53ab5a..d7be6be388fb 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
     "magic-string": "^0.21.3",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
+    "moment": "^2.18.1",
     "node-sass": "^4.5.3",
     "protractor": "^5.1.2",
     "request": "^2.81.0",
diff --git a/scripts/closure-compiler/build-devapp-bundle.sh b/scripts/closure-compiler/build-devapp-bundle.sh
index 3d3b1607cdf8..8e483922b3fc 100755
--- a/scripts/closure-compiler/build-devapp-bundle.sh
+++ b/scripts/closure-compiler/build-devapp-bundle.sh
@@ -8,9 +8,10 @@ set -e -o pipefail
 # Go to the project root directory
 cd $(dirname $0)/../..
 
-# Build a release of material and of the CDK package.
+# Build a release of material, material-moment-adapter, and cdk packages.
 $(npm bin)/gulp material:build-release:clean
 $(npm bin)/gulp cdk:build-release
+$(npm bin)/gulp material-moment-adapter:build-release
 
 # Build demo-app with ES2015 modules. Closure compiler is then able to parse imports.
 $(npm bin)/gulp :build:devapp:assets :build:devapp:scss
@@ -38,6 +39,7 @@ OPTS=(
   "--js_module_root=dist/packages"
   "--js_module_root=dist/releases/material"
   "--js_module_root=dist/releases/cdk"
+  "--js_module_root=dist/releases/material-moment-adapter"
   "--js_module_root=node_modules/@angular/core"
   "--js_module_root=node_modules/@angular/common"
   "--js_module_root=node_modules/@angular/compiler"
@@ -49,6 +51,7 @@ OPTS=(
   "--js_module_root=node_modules/@angular/platform-browser-dynamic"
   "--js_module_root=node_modules/@angular/animations"
   "--js_module_root=node_modules/@angular/animations/browser"
+  "--js_module_root=node_modules/moment"
 
   # Flags to simplify debugging.
   "--formatting=PRETTY_PRINT"
@@ -57,6 +60,7 @@ OPTS=(
   # Include the Material and CDK FESM bundles
   dist/releases/material/@angular/material.js
   dist/releases/cdk/@angular/cdk.js
+  dist/releases/material-moment-adapter/@angular/material-moment-adapter.js
 
   # Include all Angular FESM bundles.
   node_modules/@angular/core/@angular/core.js
@@ -71,8 +75,9 @@ OPTS=(
   node_modules/@angular/animations/@angular/animations.js
   node_modules/@angular/animations/@angular/animations/browser.js
 
-  # Include other dependencies like Zone.js and RxJS
+  # Include other dependencies like Zone.js, Moment.js, and RxJS
   node_modules/zone.js/dist/zone.js
+  node_modules/moment/moment.js
   $rxjsSourceFiles
 
   # Include all files from the demo-app package.
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 38f8de2c2284..96b0a3d3e9e3 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -9,6 +9,7 @@ System.config({
   map: {
     'rxjs': 'node:rxjs',
     'main': 'main.js',
+    'moment': 'node:moment/min/moment-with-locales.min.js',
 
     // Angular specific mappings.
     '@angular/core': 'node:@angular/core/bundles/core.umd.js',
@@ -26,6 +27,7 @@ System.config({
       'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
 
     '@angular/material': 'dist/bundles/material.umd.js',
+    '@angular/material-moment-adapter': 'dist/bundles/material-moment-adapter.umd.js',
     '@angular/cdk': 'dist/bundles/cdk.umd.js',
     '@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
     '@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
diff --git a/src/demo-app/tsconfig-aot.json b/src/demo-app/tsconfig-aot.json
index 2240063c7bce..f868fe1c2677 100644
--- a/src/demo-app/tsconfig-aot.json
+++ b/src/demo-app/tsconfig-aot.json
@@ -11,7 +11,8 @@
     "outDir": ".",
     "paths": {
       "@angular/material": ["./material"],
-      "@angular/cdk/*": ["./cdk/*"]
+      "@angular/cdk/*": ["./cdk/*"],
+      "@angular/material-moment-adapter": ["./material-moment-adapter"]
     }
   },
   "files": [
diff --git a/src/demo-app/tsconfig-build.json b/src/demo-app/tsconfig-build.json
index ff3196c1261d..98e6b789b1d1 100644
--- a/src/demo-app/tsconfig-build.json
+++ b/src/demo-app/tsconfig-build.json
@@ -22,7 +22,8 @@
     "baseUrl": ".",
     "paths": {
       "@angular/material": ["../../dist/packages/material/public_api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"],
+      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"]
     }
   },
   "files": [
diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index 24172405d036..86369f8c85bf 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -7,6 +7,9 @@
  */
 
 import {InjectionToken, LOCALE_ID} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
+
 
 /** InjectionToken for datepicker that can be used to override default locale code. */
 export const MAT_DATE_LOCALE = new InjectionToken<string>('MAT_DATE_LOCALE');
@@ -19,6 +22,10 @@ export abstract class DateAdapter<D> {
   /** The locale to use for all dates. */
   protected locale: any;
 
+  /** A stream that emits when the locale changes. */
+  get localeChanges(): Observable<void> { return this._localeChanges; }
+  protected _localeChanges= new Subject<void>();
+
   /**
    * Gets the year component of the given date.
    * @param date The date to extract the year from.
@@ -184,6 +191,7 @@ export abstract class DateAdapter<D> {
    */
   setLocale(locale: any) {
     this.locale = locale;
+    this._localeChanges.next();
   }
 
   /**
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 7847a51b0bb4..aa09ae366812 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -182,6 +182,8 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   private _datepickerSubscription = Subscription.EMPTY;
 
+  private _localeSubscription = Subscription.EMPTY;
+
   /** The form control validator for whether the input parses. */
   private _parseValidator: ValidatorFn = (): ValidationErrors | null => {
     return this._lastValueValid ?
@@ -228,6 +230,11 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     if (!this._dateFormats) {
       throw createMissingDateImplError('MD_DATE_FORMATS');
     }
+
+    // Update the displayed date when the locale changes.
+    this._localeSubscription = _dateAdapter.localeChanges.subscribe(() => {
+      this.value = this.value;
+    });
   }
 
   ngAfterContentInit() {
@@ -245,6 +252,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   ngOnDestroy() {
     this._datepickerSubscription.unsubscribe();
+    this._localeSubscription.unsubscribe();
     this._valueChange.complete();
     this._disabledChange.complete();
   }
diff --git a/src/material-moment-adapter/adapter/index.ts b/src/material-moment-adapter/adapter/index.ts
new file mode 100644
index 000000000000..df84c7dabace
--- /dev/null
+++ b/src/material-moment-adapter/adapter/index.ts
@@ -0,0 +1,36 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {
+  DateAdapter,
+  MAT_DATE_LOCALE,
+  MAT_DATE_LOCALE_PROVIDER,
+  MD_DATE_FORMATS
+} from '@angular/material';
+import {MomentDateAdapter} from './moment-date-adapter';
+import {MD_MOMENT_DATE_FORMATS} from './moment-date-formats';
+
+export * from './moment-date-adapter';
+export * from './moment-date-formats';
+
+
+@NgModule({
+  providers: [
+    MAT_DATE_LOCALE_PROVIDER,
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}
+  ],
+})
+export class MomentDateModule {}
+
+
+@NgModule({
+  imports: [MomentDateModule],
+  providers: [{provide: MD_DATE_FORMATS, useValue: MD_MOMENT_DATE_FORMATS}],
+})
+export class MdMomentDateModule {}
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
new file mode 100644
index 000000000000..c8330e8f1eaf
--- /dev/null
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
@@ -0,0 +1,388 @@
+/**
+ * @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 {MomentDateAdapter} from './moment-date-adapter';
+import {async, inject, TestBed} from '@angular/core/testing';
+import {MomentDateModule} from './index';
+import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material';
+import {LOCALE_ID} from '@angular/core';
+import * as moment from 'moment';
+
+
+// Month constants for more readable tests.
+const JAN = 0, FEB = 1, MAR = 2, DEC = 11;
+
+
+describe('MomentDateAdapter', () => {
+  let adapter: MomentDateAdapter;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MomentDateModule]
+    }).compileComponents();
+  }));
+
+  beforeEach(inject([DateAdapter], (d: MomentDateAdapter) => {
+    moment.locale('en');
+    adapter = d;
+    adapter.setLocale('en');
+  }));
+
+  it('should get year', () => {
+    expect(adapter.getYear(moment([2017,  JAN,  1]))).toBe(2017);
+  });
+
+  it('should get month', () => {
+    expect(adapter.getMonth(moment([2017,  JAN,  1]))).toBe(0);
+  });
+
+  it('should get date', () => {
+    expect(adapter.getDate(moment([2017,  JAN,  1]))).toBe(1);
+  });
+
+  it('should get day of week', () => {
+    expect(adapter.getDayOfWeek(moment([2017,  JAN,  1]))).toBe(0);
+  });
+
+  it('should get same day of week in a locale with a different first day of the week', () => {
+    adapter.setLocale('fr');
+    expect(adapter.getDayOfWeek(moment([2017,  JAN,  1]))).toBe(0);
+  });
+
+  it('should get long month names', () => {
+    expect(adapter.getMonthNames('long')).toEqual([
+      'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September',
+      'October', 'November', 'December'
+    ]);
+  });
+
+  it('should get long month names', () => {
+    expect(adapter.getMonthNames('short')).toEqual([
+      'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+    ]);
+  });
+
+  it('should get narrow month names', () => {
+    expect(adapter.getMonthNames('narrow')).toEqual([
+      'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+    ]);
+  });
+
+  it('should get month names in a different locale', () => {
+    adapter.setLocale('ja-JP');
+    expect(adapter.getMonthNames('long')).toEqual([
+      '1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'
+    ]);
+  });
+
+  it('should get date names', () => {
+    expect(adapter.getDateNames()).toEqual([
+      '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17',
+      '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'
+    ]);
+  });
+
+  it('should get date names in a different locale', () => {
+    adapter.setLocale('ja-JP');
+    expect(adapter.getDateNames()).toEqual([
+      '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17',
+      '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'
+    ]);
+  });
+
+  it('should get long day of week names', () => {
+    expect(adapter.getDayOfWeekNames('long')).toEqual([
+      'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'
+    ]);
+  });
+
+  it('should get short day of week names', () => {
+    expect(adapter.getDayOfWeekNames('short')).toEqual([
+      'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
+    ]);
+  });
+
+  it('should get narrow day of week names', () => {
+    expect(adapter.getDayOfWeekNames('narrow')).toEqual([
+      'Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'
+    ]);
+  });
+
+  it('should get day of week names in a different locale', () => {
+    adapter.setLocale('ja-JP');
+    expect(adapter.getDayOfWeekNames('long')).toEqual([
+      '日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'
+    ]);
+  });
+
+  it('should get year name', () => {
+    expect(adapter.getYearName(moment([2017,  JAN,  1]))).toBe('2017');
+  });
+
+  it('should get year name in a different locale', () => {
+    adapter.setLocale('ja-JP');
+    expect(adapter.getYearName(moment([2017,  JAN,  1]))).toBe('2017');
+  });
+
+  it('should get first day of week', () => {
+    expect(adapter.getFirstDayOfWeek()).toBe(0);
+  });
+
+  it('should get first day of week in a different locale', () => {
+    adapter.setLocale('fr');
+    expect(adapter.getFirstDayOfWeek()).toBe(1);
+  });
+
+  it('should create Moment date', () => {
+    expect(adapter.createDate(2017, JAN, 1).format()).toEqual(moment([2017,  JAN,  1]).format());
+  });
+
+  it('should not create Moment date with month over/under-flow', () => {
+    expect(() => adapter.createDate(2017, DEC + 1, 1)).toThrow();
+    expect(() => adapter.createDate(2017, JAN - 1, 1)).toThrow();
+  });
+
+  it('should not create Moment date with date over/under-flow', () => {
+    expect(() => adapter.createDate(2017, JAN, 32)).toThrow();
+    expect(() => adapter.createDate(2017, JAN, 0)).toThrow();
+  });
+
+  it('should create Moment date with low year number', () => {
+    expect(adapter.createDate(-1, JAN, 1).year()).toBe(-1);
+    expect(adapter.createDate(0, JAN, 1).year()).toBe(0);
+    expect(adapter.createDate(50, JAN, 1).year()).toBe(50);
+    expect(adapter.createDate(99, JAN, 1).year()).toBe(99);
+    expect(adapter.createDate(100, JAN, 1).year()).toBe(100);
+  });
+
+  it("should get today's date", () => {
+    expect(adapter.sameDate(adapter.today(), moment()))
+        .toBe(true, "should be equal to today's date");
+  });
+
+  it('should parse string according to given format', () => {
+    expect(adapter.parse('1/2/2017', 'MM/DD/YYYY')!.format())
+        .toEqual(moment([2017,  JAN,  2]).format());
+    expect(adapter.parse('1/2/2017', 'DD/MM/YYYY')!.format())
+        .toEqual(moment([2017,  FEB,  1]).format());
+  });
+
+  it('should parse number', () => {
+    let timestamp = new Date().getTime();
+    expect(adapter.parse(timestamp, 'MM/DD/YYYY')!.format()).toEqual(moment(timestamp).format());
+  });
+
+  it ('should parse Date', () => {
+    let date = new Date(2017, JAN, 1);
+    expect(adapter.parse(date, 'MM/DD/YYYY')!.format()).toEqual(moment(date).format());
+  });
+
+  it ('should parse Moment date', () => {
+    let date = moment([2017,  JAN,  1]);
+    let parsedDate = adapter.parse(date, 'MM/DD/YYYY');
+    expect(parsedDate!.format()).toEqual(date.format());
+    expect(parsedDate).not.toBe(date);
+  });
+
+  it('should parse empty string as null', () => {
+    expect(adapter.parse('', 'MM/DD/YYYY')).toBeNull();
+  });
+
+  it('should parse invalid value as invalid', () => {
+    let d = adapter.parse('hello', 'MM/DD/YYYY');
+    expect(d).not.toBeNull();
+    expect(adapter.isDateInstance(d))
+        .toBe(true, 'Expected string to have been fed through Date.parse');
+    expect(adapter.isValid(d as moment.Moment))
+        .toBe(false, 'Expected to parse as "invalid date" object');
+  });
+
+  it('should format date according to given format', () => {
+    expect(adapter.format(moment([2017,  JAN,  2]), 'MM/DD/YYYY')).toEqual('01/02/2017');
+    expect(adapter.format(moment([2017,  JAN,  2]), 'DD/MM/YYYY')).toEqual('02/01/2017');
+  });
+
+  it('should format with a different locale', () => {
+    expect(adapter.format(moment([2017,  JAN,  2]), 'll')).toEqual('Jan 2, 2017');
+    adapter.setLocale('ja-JP');
+    expect(adapter.format(moment([2017,  JAN,  2]), 'll')).toEqual('2017年1月2日');
+  });
+
+  it('should throw when attempting to format invalid date', () => {
+    expect(() => adapter.format(moment(NaN), 'MM/DD/YYYY'))
+        .toThrowError(/MomentDateAdapter: Cannot format invalid date\./);
+  });
+
+  it('should add years', () => {
+    expect(adapter.addCalendarYears(moment([2017, JAN, 1]), 1).format())
+        .toEqual(moment([2018, JAN, 1]).format());
+    expect(adapter.addCalendarYears(moment([2017, JAN, 1]), -1).format())
+        .toEqual(moment([2016, JAN, 1]).format());
+  });
+
+  it('should respect leap years when adding years', () => {
+    expect(adapter.addCalendarYears(moment([2016, FEB, 29]), 1).format())
+        .toEqual(moment([2017, FEB, 28]).format());
+    expect(adapter.addCalendarYears(moment([2016, FEB, 29]), -1).format())
+        .toEqual(moment([2015, FEB, 28]).format());
+  });
+
+  it('should add months', () => {
+    expect(adapter.addCalendarMonths(moment([2017, JAN, 1]), 1).format())
+        .toEqual(moment([2017, FEB, 1]).format());
+    expect(adapter.addCalendarMonths(moment([2017, JAN, 1]), -1).format())
+        .toEqual(moment([2016, DEC, 1]).format());
+  });
+
+  it('should respect month length differences when adding months', () => {
+    expect(adapter.addCalendarMonths(moment([2017, JAN, 31]), 1).format())
+        .toEqual(moment([2017, FEB, 28]).format());
+    expect(adapter.addCalendarMonths(moment([2017, MAR, 31]), -1).format())
+        .toEqual(moment([2017, FEB, 28]).format());
+  });
+
+  it('should add days', () => {
+    expect(adapter.addCalendarDays(moment([2017, JAN, 1]), 1).format())
+        .toEqual(moment([2017, JAN, 2]).format());
+    expect(adapter.addCalendarDays(moment([2017, JAN, 1]), -1).format())
+        .toEqual(moment([2016, DEC, 31]).format());
+  });
+
+  it('should clone', () => {
+    let date = moment([2017, JAN, 1]);
+    expect(adapter.clone(date).format()).toEqual(date.format());
+    expect(adapter.clone(date)).not.toBe(date);
+  });
+
+  it('should compare dates', () => {
+    expect(adapter.compareDate(moment([2017, JAN, 1]), moment([2017, JAN, 2]))).toBeLessThan(0);
+    expect(adapter.compareDate(moment([2017, JAN, 1]), moment([2017, FEB, 1]))).toBeLessThan(0);
+    expect(adapter.compareDate(moment([2017, JAN, 1]), moment([2018, JAN, 1]))).toBeLessThan(0);
+    expect(adapter.compareDate(moment([2017, JAN, 1]), moment([2017, JAN, 1]))).toBe(0);
+    expect(adapter.compareDate(moment([2018, JAN, 1]), moment([2017, JAN, 1]))).toBeGreaterThan(0);
+    expect(adapter.compareDate(moment([2017, FEB, 1]), moment([2017, JAN, 1]))).toBeGreaterThan(0);
+    expect(adapter.compareDate(moment([2017, JAN, 2]), moment([2017, JAN, 1]))).toBeGreaterThan(0);
+  });
+
+  it('should clamp date at lower bound', () => {
+    expect(adapter.clampDate(
+        moment([2017, JAN, 1]), moment([2018, JAN, 1]), moment([2019, JAN, 1])))
+        .toEqual(moment([2018, JAN, 1]));
+  });
+
+  it('should clamp date at upper bound', () => {
+    expect(adapter.clampDate(
+        moment([2020, JAN, 1]), moment([2018, JAN, 1]), moment([2019, JAN, 1])))
+        .toEqual(moment([2019, JAN, 1]));
+  });
+
+  it('should clamp date already within bounds', () => {
+    expect(adapter.clampDate(
+        moment([2018, FEB, 1]), moment([2018, JAN, 1]), moment([2019, JAN, 1])))
+        .toEqual(moment([2018, FEB, 1]));
+  });
+
+  it('should count today as a valid date instance', () => {
+    let d = moment();
+    expect(adapter.isValid(d)).toBe(true);
+    expect(adapter.isDateInstance(d)).toBe(true);
+  });
+
+  it('should count an invalid date as an invalid date instance', () => {
+    let d = moment(NaN);
+    expect(adapter.isValid(d)).toBe(false);
+    expect(adapter.isDateInstance(d)).toBe(true);
+  });
+
+  it('should count a string as not a date instance', () => {
+    let d = '1/1/2017';
+    expect(adapter.isDateInstance(d)).toBe(false);
+  });
+
+  it('should count a Date as not a date instance', () => {
+    let d = new Date();
+    expect(adapter.isDateInstance(d)).toBe(false);
+  });
+
+  it('setLocale should not modify global moment locale', () => {
+    expect(moment.locale()).toBe('en');
+    adapter.setLocale('ja-JP');
+    expect(moment.locale()).toBe('en');
+  });
+
+  it('returned Moments should have correct locale', () => {
+    adapter.setLocale('ja-JP');
+    expect(adapter.createDate(2017, JAN, 1).locale()).toBe('ja');
+    expect(adapter.today().locale()).toBe('ja');
+    expect(adapter.clone(moment()).locale()).toBe('ja');
+    expect(adapter.parse('1/1/2017', 'MM/DD/YYYY')!.locale()).toBe('ja');
+    expect(adapter.addCalendarDays(moment(), 1).locale()).toBe('ja');
+    expect(adapter.addCalendarMonths(moment(), 1).locale()).toBe('ja');
+    expect(adapter.addCalendarYears(moment(), 1).locale()).toBe('ja');
+  });
+
+  it('should not change locale of Moments passed as params', () => {
+    let date = moment();
+    expect(date.locale()).toBe('en');
+    adapter.setLocale('ja-JP');
+    adapter.getYear(date);
+    adapter.getMonth(date);
+    adapter.getDate(date);
+    adapter.getDayOfWeek(date);
+    adapter.getYearName(date);
+    adapter.getNumDaysInMonth(date);
+    adapter.clone(date);
+    adapter.parse(date, 'MM/DD/YYYY');
+    adapter.format(date, 'MM/DD/YYYY');
+    adapter.addCalendarDays(date, 1);
+    adapter.addCalendarMonths(date, 1);
+    adapter.addCalendarYears(date, 1);
+    adapter.getISODateString(date);
+    adapter.isDateInstance(date);
+    adapter.isValid(date);
+    expect(date.locale()).toBe('en');
+  });
+});
+
+describe('MomentDateAdapter with MAT_DATE_LOCALE override', () => {
+  let adapter: MomentDateAdapter;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MomentDateModule],
+      providers: [{provide: MAT_DATE_LOCALE, useValue: 'ja-JP'}]
+    }).compileComponents();
+  }));
+
+  beforeEach(inject([DateAdapter], (d: MomentDateAdapter) => {
+    adapter = d;
+  }));
+
+  it('should take the default locale id from the MAT_DATE_LOCALE injection token', () => {
+    expect(adapter.format(moment([2017,  JAN,  2]), 'll')).toEqual('2017年1月2日');
+  });
+});
+
+describe('MomentDateAdapter with LOCALE_ID override', () => {
+  let adapter: MomentDateAdapter;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MomentDateModule],
+      providers: [{provide: LOCALE_ID, useValue: 'fr'}]
+    }).compileComponents();
+  }));
+
+  beforeEach(inject([DateAdapter], (d: MomentDateAdapter) => {
+    adapter = d;
+  }));
+
+  it('should take the default locale id from the LOCALE_ID injection token', () => {
+    expect(adapter.format(moment([2017,  JAN,  2]), 'll')).toEqual('2 janv. 2017');
+  });
+});
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.ts b/src/material-moment-adapter/adapter/moment-date-adapter.ts
new file mode 100644
index 000000000000..a941eec54354
--- /dev/null
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.ts
@@ -0,0 +1,184 @@
+/**
+ * @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 {Inject, Injectable, Optional} from '@angular/core';
+import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material';
+
+// Depending on whether rollup is used, moment needs to be imported differently.
+// Since Moment.js doesn't have a default export, we normally need to import using the `* as`
+// syntax. However, rollup creates a synthetic default module and we thus need to import it using
+// the `default as` syntax.
+// TODO(mmalerba): See if we can clean this up at some point.
+import {default as _rollupMoment, Moment} from 'moment';
+import * as _moment from 'moment';
+const moment = _rollupMoment || _moment;
+
+
+/** Creates an array and fills it with values. */
+function range<T>(length: number, valueFunction: (index: number) => T): T[] {
+  const valuesArray = Array(length);
+  for (let i = 0; i < length; i++) {
+    valuesArray[i] = valueFunction(i);
+  }
+  return valuesArray;
+}
+
+
+/** Adapts Moment.js Dates for use with Angular Material. */
+@Injectable()
+export class MomentDateAdapter extends DateAdapter<Moment> {
+  // Note: all of the methods that accept a `Moment` input parameter immediately call `this.clone`
+  // on it. This is to ensure that we're working with a `Moment` that has the correct locale setting
+  // while avoiding mutating the original object passed to us. Just calling `.locale(...)` on the
+  // input would mutate the object.
+
+  private _localeData: {
+    firstDayOfWeek: number,
+    longMonths: string[],
+    shortMonths: string[],
+    dates: string[],
+    longDaysOfWeek: string[],
+    shortDaysOfWeek: string[],
+    narrowDaysOfWeek: string[]
+  };
+
+  constructor(@Optional() @Inject(MAT_DATE_LOCALE) dateLocale: string) {
+    super();
+    this.setLocale(dateLocale || moment.locale());
+  }
+
+  setLocale(locale: string) {
+    super.setLocale(locale);
+
+    let momentLocaleData = moment.localeData(locale);
+    this._localeData = {
+      firstDayOfWeek: momentLocaleData.firstDayOfWeek(),
+      longMonths: momentLocaleData.months(),
+      shortMonths: momentLocaleData.monthsShort(),
+      dates: range(31, (i) => this.createDate(2017, 0, i + 1).format('D')),
+      longDaysOfWeek: momentLocaleData.weekdays(),
+      shortDaysOfWeek: momentLocaleData.weekdaysShort(),
+      narrowDaysOfWeek: momentLocaleData.weekdaysMin(),
+    };
+  }
+
+  getYear(date: Moment): number {
+    return this.clone(date).year();
+  }
+
+  getMonth(date: Moment): number {
+    return this.clone(date).month();
+  }
+
+  getDate(date: Moment): number {
+    return this.clone(date).date();
+  }
+
+  getDayOfWeek(date: Moment): number {
+    return this.clone(date).day();
+  }
+
+  getMonthNames(style: 'long' | 'short' | 'narrow'): string[] {
+    // Moment.js doesn't support narrow month names, so we just use short if narrow is requested.
+    return style == 'long' ? this._localeData.longMonths : this._localeData.shortMonths;
+  }
+
+  getDateNames(): string[] {
+    return this._localeData.dates;
+  }
+
+  getDayOfWeekNames(style: 'long' | 'short' | 'narrow'): string[] {
+    if (style == 'long') {
+      return this._localeData.longDaysOfWeek;
+    }
+    if (style == 'short') {
+      return this._localeData.shortDaysOfWeek;
+    }
+    return this._localeData.narrowDaysOfWeek;
+  }
+
+  getYearName(date: Moment): string {
+    return this.clone(date).format('YYYY');
+  }
+
+  getFirstDayOfWeek(): number {
+    return this._localeData.firstDayOfWeek;
+  }
+
+  getNumDaysInMonth(date: Moment): number {
+    return this.clone(date).daysInMonth();
+  }
+
+  clone(date: Moment): Moment {
+    return date.clone().locale(this.locale);
+  }
+
+  createDate(year: number, month: number, date: number): Moment {
+    // Moment.js will create an invalid date if any of the components are out of bounds, but we
+    // explicitly check each case so we can throw more descriptive errors.
+    if (month < 0 || month > 11) {
+      throw Error(`Invalid month index "${month}". Month index has to be between 0 and 11.`);
+    }
+
+    if (date < 1) {
+      throw Error(`Invalid date "${date}". Date has to be greater than 0.`);
+    }
+
+    let result = moment({year, month, date}).locale(this.locale);
+
+    // If the result isn't valid, the date must have been out of bounds for this month.
+    if (!result.isValid()) {
+      throw Error(`Invalid date "${date}" for month with index "${month}".`);
+    }
+
+    return result;
+  }
+
+  today(): Moment {
+    return moment().locale(this.locale);
+  }
+
+  parse(value: any, parseFormat: string | string[]): Moment | null {
+    if (value && typeof value == 'string') {
+      return moment(value, parseFormat, this.locale);
+    }
+    return value ? moment(value).locale(this.locale) : null;
+  }
+
+  format(date: Moment, displayFormat: string): string {
+    date = this.clone(date);
+    if (!this.isValid(date)) {
+      throw Error('MomentDateAdapter: Cannot format invalid date.');
+    }
+    return date.format(displayFormat);
+  }
+
+  addCalendarYears(date: Moment, years: number): Moment {
+    return this.clone(date).add({years});
+  }
+
+  addCalendarMonths(date: Moment, months: number): Moment {
+    return this.clone(date).add({months});
+  }
+
+  addCalendarDays(date: Moment, days: number): Moment {
+    return this.clone(date).add({days});
+  }
+
+  getISODateString(date: Moment): string {
+    return this.clone(date).format();
+  }
+
+  isDateInstance(obj: any): boolean {
+    return moment.isMoment(obj);
+  }
+
+  isValid(date: Moment): boolean {
+    return this.clone(date).isValid();
+  }
+}
diff --git a/src/material-moment-adapter/adapter/moment-date-formats.ts b/src/material-moment-adapter/adapter/moment-date-formats.ts
new file mode 100644
index 000000000000..6f4747f0493c
--- /dev/null
+++ b/src/material-moment-adapter/adapter/moment-date-formats.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {MdDateFormats} from '@angular/material';
+
+
+export const MD_MOMENT_DATE_FORMATS: MdDateFormats = {
+  parse: {
+    dateInput: 'l',
+  },
+  display: {
+    dateInput: 'l',
+    monthYearLabel: 'MMM YYYY',
+    dateA11yLabel: 'LL',
+    monthYearA11yLabel: 'MMMM YYYY',
+  },
+};
diff --git a/src/material-moment-adapter/index.spec.ts b/src/material-moment-adapter/index.spec.ts
deleted file mode 100644
index a1ef3b6c1707..000000000000
--- a/src/material-moment-adapter/index.spec.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {_momentAdapter} from './public_api';
-
-describe('moment-adapter', () => {
-
-  it('should be tested when running the tests', () => {
-    expect(_momentAdapter).toBe(0);
-  });
-
-});
diff --git a/src/material-moment-adapter/package.json b/src/material-moment-adapter/package.json
index 116617becbc5..8e50eeac9aa7 100644
--- a/src/material-moment-adapter/package.json
+++ b/src/material-moment-adapter/package.json
@@ -17,7 +17,8 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/material": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.0.0"
+    "@angular/core": "^4.0.0",
+    "moment": "^2.18.1"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/material-moment-adapter/public_api.ts b/src/material-moment-adapter/public_api.ts
index 5f61ef654dcc..8d50b96839d7 100644
--- a/src/material-moment-adapter/public_api.ts
+++ b/src/material-moment-adapter/public_api.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export const _momentAdapter = 0;
+export * from './adapter';
diff --git a/src/material-moment-adapter/tsconfig-build.json b/src/material-moment-adapter/tsconfig-build.json
index de8b8dab6d0f..e964dd29752b 100644
--- a/src/material-moment-adapter/tsconfig-build.json
+++ b/src/material-moment-adapter/tsconfig-build.json
@@ -2,6 +2,8 @@
 // needs to be ES2015 since the build process will create FESM bundles using rollup.
 {
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "baseUrl": ".",
     "declaration": true,
     "stripInternal": false,
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 3dfeae04facc..51fb7450022c 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -20,6 +20,7 @@ System.config({
   map: {
     'rxjs': 'node:rxjs',
     'main': 'main.js',
+    'moment': 'node:moment/min/moment-with-locales.min.js',
 
     // Angular specific mappings.
     '@angular/core': 'node:@angular/core/bundles/core.umd.js',
diff --git a/test/karma.conf.js b/test/karma.conf.js
index c120d8a918e9..b2b39d0c7185 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -26,6 +26,7 @@ module.exports = (config) => {
       {pattern: 'node_modules/zone.js/dist/fake-async-test.js', included: true, watched: false},
       {pattern: 'node_modules/hammerjs/hammer.min.js', included: true, watched: false},
       {pattern: 'node_modules/hammerjs/hammer.min.js.map', included: false, watched: false},
+      {pattern: 'node_modules/moment/min/moment-with-locales.min.js', included: true, watched: false},
 
       // Include all Angular dependencies
       {pattern: 'node_modules/@angular/**/*', included: false, watched: false},
diff --git a/tools/gulp/tasks/aot.ts b/tools/gulp/tasks/aot.ts
index 9c7d35ba5baa..425e95bebccd 100644
--- a/tools/gulp/tasks/aot.ts
+++ b/tools/gulp/tasks/aot.ts
@@ -18,7 +18,7 @@ const tsconfigFile = join(demoAppOut, 'tsconfig-aot.json');
 /** Builds the demo-app and material. To be able to run NGC, apply the metadata workaround. */
 task('aot:deps', sequenceTask(
   'build:devapp',
-  ['material:build-release', 'cdk:build-release'],
+  ['material:build-release', 'cdk:build-release', 'material-moment-adapter:build-release'],
   'aot:copy-release'
 ));
 
@@ -27,6 +27,8 @@ task('aot:deps', sequenceTask(
 task('aot:copy-release', () => {
   copySync(join(releasesDir, 'material'), join(demoAppOut, 'material'));
   copySync(join(releasesDir, 'cdk'), join(demoAppOut, 'cdk'));
+  copySync(
+      join(releasesDir, 'material-moment-adapter'), join(demoAppOut, 'material-moment-adapter'));
 });
 
 /** Build the demo-app and a release to confirm that the library is AOT-compatible. */
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index 5d8174a1c4d4..313a74239129 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -21,7 +21,7 @@ const materialOutPath = join(outputDir, 'packages', 'material');
 
 /** Array of vendors that are required to serve the demo-app. */
 const appVendors = [
-  '@angular', 'systemjs', 'zone.js', 'rxjs', 'hammerjs', 'core-js', 'web-animations-js'
+  '@angular', 'systemjs', 'zone.js', 'rxjs', 'hammerjs', 'core-js', 'web-animations-js', 'moment',
 ];
 
 /** Glob that matches all required vendors for the demo-app. */
diff --git a/tools/gulp/util/task_helpers.ts b/tools/gulp/util/task_helpers.ts
index b9d6edbc5b79..8a109e8ae27b 100644
--- a/tools/gulp/util/task_helpers.ts
+++ b/tools/gulp/util/task_helpers.ts
@@ -130,7 +130,9 @@ export function buildAppTask(appName: string) {
     .filter(taskName => gulp.hasTask(taskName));
 
   return sequenceTask(
-    'material:clean-build',
+    // Build all required packages for serving the devapp by just building the moment-adapter
+    // package. All dependencies of that package (material, cdk) will be built automatically.
+    'material-moment-adapter:clean-build',
     [...buildTasks]
   );
 }
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 55e513bb9537..7800d3530c51 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -17,6 +17,7 @@ const rollupCdkEntryPoints = cdkSecondaryEntryPoints.reduce((globals: any, entry
 /** Map of globals that are used inside of the different packages. */
 export const rollupGlobals = {
   'tslib': 'tslib',
+  'moment': 'moment',
 
   '@angular/animations': 'ng.animations',
   '@angular/core': 'ng.core',
diff --git a/tsconfig.json b/tsconfig.json
index 6df0c68296f1..e06d166854ce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,8 @@
 // IDEs and TSLint. For IDEs it ensures that `experimentalDecorator` warnings are not showing up.
 {
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "rootDir": ".",
     "experimentalDecorators": true,
     "module": "es2015",
@@ -17,6 +19,7 @@
     "paths": {
       "@angular/material": ["./src/lib/public_api.ts"],
       "@angular/cdk/*": ["./src/cdk/*"],
+      "@angular/material-moment-adapter": ["./src/material-moment-adapter"],
       "@angular/material-examples": ["./src/material-examples"],
       "material2-build-tools": ["./tools/package-tools"]
     }

From dcfe515f6ba866e87320ee4bd5c1ffcaa128dbf5 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 12 Sep 2017 20:09:51 -0700
Subject: [PATCH 082/575] Revert "fix(menu): multiple close events for a single
 close" (#7036)

* Revert "feat(datepicker): Add Moment.js adapter (#6860)"

This reverts commit 9545427c73627f0cf91b5086efd5d727459fc44f.

* Revert "fix(menu): multiple close events for a single close (#6961)"

This reverts commit 1cccd4bda6aa6dbe366d4510f92630fcdd525c92.
---
 src/lib/menu/menu-trigger.ts | 28 ++++++++++--------------
 src/lib/menu/menu.spec.ts    | 42 ++++++++++--------------------------
 2 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index c06485356677..9bceb8282e80 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -43,8 +43,8 @@ import {MdMenuItem} from './menu-item';
 import {MdMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 import {throwMdMenuMissingError} from './menu-errors';
-import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
+import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
 
 /** Injection token that determines the scroll handling while the menu is open. */
@@ -153,7 +153,7 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
     this._checkMenu();
 
     this.menu.close.subscribe(reason => {
-      this._destroyMenu();
+      this.closeMenu();
 
       // If a click closed the menu, we should close the entire chain of nested menus.
       if (reason === 'click' && this._parentMenu) {
@@ -205,9 +205,7 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   openMenu(): void {
     if (!this._menuOpen) {
       this._createOverlay().attach(this._portal);
-      this._closeSubscription = this._menuClosingActions().subscribe(() => {
-        this.menu.close.emit();
-      });
+      this._closeSubscription = this._menuClosingActions().subscribe(() => this.menu.close.emit());
       this._initMenu();
 
       if (this.menu instanceof MdMenu) {
@@ -218,20 +216,11 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
 
   /** Closes the menu. */
   closeMenu(): void {
-    this.menu.close.emit();
-  }
-
-  /** Focuses the menu trigger. */
-  focus() {
-    this._element.nativeElement.focus();
-  }
-
-  /** Closes the menu and does the necessary cleanup. */
-  private _destroyMenu() {
     if (this._overlayRef && this.menuOpen) {
       this._resetMenu();
       this._overlayRef.detach();
       this._closeSubscription.unsubscribe();
+      this.menu.close.emit();
 
       if (this.menu instanceof MdMenu) {
         this.menu._resetAnimation();
@@ -239,6 +228,11 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
     }
   }
 
+  /** Focuses the menu trigger. */
+  focus() {
+    this._element.nativeElement.focus();
+  }
+
   /**
    * This method sets the menu state to open and focuses the first item if
    * the menu was opened via the keyboard.
@@ -406,11 +400,11 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   /** Returns a stream that emits whenever an action that should close the menu occurs. */
   private _menuClosingActions() {
     const backdrop = this._overlayRef!.backdropClick();
-    const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
+    const parentClose = this._parentMenu ? this._parentMenu.close : observableOf(null);
     const hover = this._parentMenu ? RxChain.from(this._parentMenu.hover())
         .call(filter, active => active !== this._menuItemInstance)
         .call(filter, () => this._menuOpen)
-        .result() : observableOf();
+        .result() : observableOf(null);
 
     return merge(backdrop, parentClose, hover);
   }
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index d92db276b1cc..a9e8086aaa5f 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -98,7 +98,7 @@ describe('MdMenu', () => {
     expect(overlayContainerElement.textContent).toBe('');
   }));
 
-  it('should close the menu when pressing ESCAPE', fakeAsync(() => {
+  it('should close the menu when pressing escape', fakeAsync(() => {
     const fixture = TestBed.createComponent(SimpleMenu);
     fixture.detectChanges();
     fixture.componentInstance.trigger.openMenu();
@@ -494,40 +494,26 @@ describe('MdMenu', () => {
       menuItem.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith('click');
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalled();
     });
 
     it('should emit a close event when the backdrop is clicked', () => {
-      const backdrop = overlayContainerElement
-          .querySelector('.cdk-overlay-backdrop') as HTMLElement;
+      const backdrop = <HTMLElement>overlayContainerElement.querySelector('.cdk-overlay-backdrop');
 
       backdrop.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith(undefined);
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
-    });
-
-    it('should emit an event when pressing ESCAPE', () => {
-      const menu = overlayContainerElement.querySelector('.mat-menu-panel') as HTMLElement;
-
-      dispatchKeyboardEvent(menu, 'keydown', ESCAPE);
-      fixture.detectChanges();
-
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith('keydown');
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalled();
     });
 
     it('should complete the callback when the menu is destroyed', () => {
-      const emitCallback = jasmine.createSpy('emit callback');
-      const completeCallback = jasmine.createSpy('complete callback');
+      let emitCallback = jasmine.createSpy('emit callback');
+      let completeCallback = jasmine.createSpy('complete callback');
 
       fixture.componentInstance.menu.close.subscribe(emitCallback, null, completeCallback);
       fixture.destroy();
 
-      expect(emitCallback).toHaveBeenCalledWith(undefined);
-      expect(emitCallback).toHaveBeenCalledTimes(1);
+      expect(emitCallback).toHaveBeenCalled();
       expect(completeCallback).toHaveBeenCalled();
     });
   });
@@ -1009,9 +995,6 @@ describe('MdMenu', () => {
       tick(500);
 
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(0, 'Expected no open menus');
-      expect(instance.rootCloseCallback).toHaveBeenCalledTimes(1);
-      expect(instance.levelOneCloseCallback).toHaveBeenCalledTimes(1);
-      expect(instance.levelTwoCloseCallback).toHaveBeenCalledTimes(1);
     }));
 
     it('should toggle a nested menu when its trigger is added after init', fakeAsync(() => {
@@ -1076,7 +1059,7 @@ describe('MdMenu default overrides', () => {
 @Component({
   template: `
     <button [mdMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <md-menu class="custom-one custom-two" #menu="mdMenu" (close)="closeCallback($event)">
+    <md-menu class="custom-one custom-two" #menu="mdMenu" (close)="closeCallback()">
       <button md-menu-item> Item </button>
       <button md-menu-item disabled> Disabled </button>
     </md-menu>
@@ -1169,7 +1152,7 @@ class CustomMenu {
       [mdMenuTriggerFor]="levelTwo"
       #alternateTrigger="mdMenuTrigger">Toggle alternate menu</button>
 
-    <md-menu #root="mdMenu" (close)="rootCloseCallback($event)">
+    <md-menu #root="mdMenu">
       <button md-menu-item
         id="level-one-trigger"
         [mdMenuTriggerFor]="levelOne"
@@ -1182,7 +1165,7 @@ class CustomMenu {
         #lazyTrigger="mdMenuTrigger">Three</button>
     </md-menu>
 
-    <md-menu #levelOne="mdMenu" (close)="levelOneCloseCallback($event)">
+    <md-menu #levelOne="mdMenu">
       <button md-menu-item>Four</button>
       <button md-menu-item
         id="level-two-trigger"
@@ -1191,7 +1174,7 @@ class CustomMenu {
       <button md-menu-item>Six</button>
     </md-menu>
 
-    <md-menu #levelTwo="mdMenu" (close)="levelTwoCloseCallback($event)">
+    <md-menu #levelTwo="mdMenu">
       <button md-menu-item>Seven</button>
       <button md-menu-item>Eight</button>
       <button md-menu-item>Nine</button>
@@ -1209,15 +1192,12 @@ class NestedMenu {
   @ViewChild('rootTrigger') rootTrigger: MdMenuTrigger;
   @ViewChild('rootTriggerEl') rootTriggerEl: ElementRef;
   @ViewChild('alternateTrigger') alternateTrigger: MdMenuTrigger;
-  readonly rootCloseCallback = jasmine.createSpy('root menu closed callback');
 
   @ViewChild('levelOne') levelOneMenu: MdMenu;
   @ViewChild('levelOneTrigger') levelOneTrigger: MdMenuTrigger;
-  readonly levelOneCloseCallback = jasmine.createSpy('level one menu closed callback');
 
   @ViewChild('levelTwo') levelTwoMenu: MdMenu;
   @ViewChild('levelTwoTrigger') levelTwoTrigger: MdMenuTrigger;
-  readonly levelTwoCloseCallback = jasmine.createSpy('level one menu closed callback');
 
   @ViewChild('lazy') lazyMenu: MdMenu;
   @ViewChild('lazyTrigger') lazyTrigger: MdMenuTrigger;

From 259cc7537c9bccd5e52d0f3049ab82d5d299be99 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 13 Sep 2017 09:30:44 -0700
Subject: [PATCH 083/575] Revert "feat(viewport-ruler): add common window
 resize handler" (#7054)

* Revert "Revert "fix(menu): multiple close events for a single close" (#7036)"

This reverts commit dcfe515f6ba866e87320ee4bd5c1ffcaa128dbf5.

* Revert "feat(datepicker): Add Moment.js adapter (#6860)"

This reverts commit 9545427c73627f0cf91b5086efd5d727459fc44f.

* Revert "fix(menu): multiple close events for a single close (#6961)"

This reverts commit 1cccd4bda6aa6dbe366d4510f92630fcdd525c92.

* Revert "fix(menu): nested trigger staying highlighted after click (#6853)"

This reverts commit 04bf3d1fd54402a5582f6043e2db02fde4598516.

* Revert "feat(viewport-ruler): add common window resize handler (#6680)"

This reverts commit 881630f31d2ebf55ce5c9d8d8cfc1ed59333743c.
---
 src/cdk/scrolling/scroll-dispatcher.spec.ts  |  1 +
 src/cdk/scrolling/scroll-dispatcher.ts       |  6 ++-
 src/cdk/scrolling/viewport-ruler.spec.ts     | 40 +--------------
 src/cdk/scrolling/viewport-ruler.ts          | 52 ++++----------------
 src/lib/tabs/tab-group.spec.ts               |  6 ++-
 src/lib/tabs/tab-header.spec.ts              |  4 +-
 src/lib/tabs/tab-header.ts                   |  9 ++--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts |  8 +--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts      | 18 ++++---
 9 files changed, 45 insertions(+), 99 deletions(-)

diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index 5f10625f990a..d08dc5f8cf4c 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -72,6 +72,7 @@ describe('Scroll Dispatcher', () => {
 
       scroll.scrolled(0, () => {});
       dispatchFakeEvent(document, 'scroll');
+      dispatchFakeEvent(window, 'resize');
 
       expect(spy).not.toHaveBeenCalled();
       subscription.unsubscribe();
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 0e0e5b6aa1d1..177f830ac2c0 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -11,6 +11,7 @@ import {Platform} from '@angular/cdk/platform';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {fromEvent} from 'rxjs/observable/fromEvent';
+import {merge} from 'rxjs/observable/merge';
 import {auditTime} from 'rxjs/operator/auditTime';
 import {Scrollable} from './scrollable';
 
@@ -86,7 +87,10 @@ export class ScrollDispatcher {
 
     if (!this._globalSubscription) {
       this._globalSubscription = this._ngZone.runOutsideAngular(() => {
-        return fromEvent(window.document, 'scroll').subscribe(() => this._notify());
+        return merge(
+          fromEvent(window.document, 'scroll'),
+          fromEvent(window, 'resize')
+        ).subscribe(() => this._notify());
       });
     }
 
diff --git a/src/cdk/scrolling/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts
index 3eab7427d48d..349b00efb186 100644
--- a/src/cdk/scrolling/viewport-ruler.spec.ts
+++ b/src/cdk/scrolling/viewport-ruler.spec.ts
@@ -1,7 +1,6 @@
-import {TestBed, inject, fakeAsync, tick} from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 import {ScrollDispatchModule} from './public_api';
 import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
-import {dispatchFakeEvent} from '@angular/cdk/testing';
 
 
 // For all tests, we assume the browser window is 1024x786 (outerWidth x outerHeight).
@@ -33,10 +32,6 @@ describe('ViewportRuler', () => {
     scrollTo(0, 0);
   }));
 
-  afterEach(() => {
-    ruler.ngOnDestroy();
-  });
-
   it('should get the viewport bounds when the page is not scrolled', () => {
     let bounds = ruler.getViewportRect();
     expect(bounds.top).toBe(0);
@@ -106,37 +101,4 @@ describe('ViewportRuler', () => {
 
     document.body.removeChild(veryLargeElement);
   });
-
-  describe('changed event', () => {
-    it('should dispatch an event when the window is resized', () => {
-      const spy = jasmine.createSpy('viewport changed spy');
-      const subscription = ruler.change(0).subscribe(spy);
-
-      dispatchFakeEvent(window, 'resize');
-      expect(spy).toHaveBeenCalled();
-      subscription.unsubscribe();
-    });
-
-    it('should dispatch an event when the orientation is changed', () => {
-      const spy = jasmine.createSpy('viewport changed spy');
-      const subscription = ruler.change(0).subscribe(spy);
-
-      dispatchFakeEvent(window, 'orientationchange');
-      expect(spy).toHaveBeenCalled();
-      subscription.unsubscribe();
-    });
-
-    it('should be able to throttle the callback', fakeAsync(() => {
-      const spy = jasmine.createSpy('viewport changed spy');
-      const subscription = ruler.change(1337).subscribe(spy);
-
-      dispatchFakeEvent(window, 'resize');
-      expect(spy).not.toHaveBeenCalled();
-
-      tick(1337);
-
-      expect(spy).toHaveBeenCalledTimes(1);
-      subscription.unsubscribe();
-    }));
-  });
 });
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index 1643cf687da0..fbd55ad9e2d6 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -6,49 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional, SkipSelf, NgZone, OnDestroy} from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
+import {Injectable, Optional, SkipSelf} from '@angular/core';
 import {ScrollDispatcher} from './scroll-dispatcher';
-import {Observable} from 'rxjs/Observable';
-import {fromEvent} from 'rxjs/observable/fromEvent';
-import {merge} from 'rxjs/observable/merge';
-import {auditTime} from 'rxjs/operator/auditTime';
-import {Subscription} from 'rxjs/Subscription';
-import {of as observableOf} from 'rxjs/observable/of';
 
-/** Time in ms to throttle the resize events by default. */
-export const DEFAULT_RESIZE_TIME = 20;
 
 /**
  * Simple utility for getting the bounds of the browser viewport.
  * @docs-private
  */
 @Injectable()
-export class ViewportRuler implements OnDestroy {
+export class ViewportRuler {
 
   /** Cached document client rectangle. */
   private _documentRect?: ClientRect;
 
-  /** Stream of viewport change events. */
-  private _change: Observable<Event>;
-
-  /** Subscriptions to streams that invalidate the cached viewport dimensions. */
-  private _invalidateCacheSubscriptions: Subscription[];
-
-  constructor(platform: Platform, ngZone: NgZone, scrollDispatcher: ScrollDispatcher) {
-    this._change = platform.isBrowser ? ngZone.runOutsideAngular(() => {
-      return merge<Event>(fromEvent(window, 'resize'), fromEvent(window, 'orientationchange'));
-    }) : observableOf();
-
+  constructor(scrollDispatcher: ScrollDispatcher) {
     // Subscribe to scroll and resize events and update the document rectangle on changes.
-    this._invalidateCacheSubscriptions = [
-      scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry()),
-      this.change().subscribe(() => this._cacheViewportGeometry())
-    ];
-  }
-
-  ngOnDestroy() {
-    this._invalidateCacheSubscriptions.forEach(subscription => subscription.unsubscribe());
+    scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry());
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
@@ -82,6 +56,7 @@ export class ViewportRuler implements OnDestroy {
     };
   }
 
+
   /**
    * Gets the (top, left) scroll position of the viewport.
    * @param documentRect
@@ -100,7 +75,7 @@ export class ViewportRuler implements OnDestroy {
     // `document.documentElement` works consistently, where the `top` and `left` values will
     // equal negative the scroll position.
     const top = -documentRect!.top || document.body.scrollTop || window.scrollY ||
-                 document.documentElement.scrollTop || 0;
+                  document.documentElement.scrollTop || 0;
 
     const left = -documentRect!.left || document.body.scrollLeft || window.scrollX ||
                   document.documentElement.scrollLeft || 0;
@@ -108,32 +83,23 @@ export class ViewportRuler implements OnDestroy {
     return {top, left};
   }
 
-  /**
-   * Returns a stream that emits whenever the size of the viewport changes.
-   * @param throttle Time in milliseconds to throttle the stream.
-   */
-  change(throttleTime: number = DEFAULT_RESIZE_TIME): Observable<string> {
-    return throttleTime > 0 ? auditTime.call(this._change, throttleTime) : this._change;
-  }
-
   /** Caches the latest client rectangle of the document element. */
   _cacheViewportGeometry() {
     this._documentRect = document.documentElement.getBoundingClientRect();
   }
+
 }
 
 /** @docs-private */
 export function VIEWPORT_RULER_PROVIDER_FACTORY(parentRuler: ViewportRuler,
-                                                platform: Platform,
-                                                ngZone: NgZone,
                                                 scrollDispatcher: ScrollDispatcher) {
-  return parentRuler || new ViewportRuler(platform, ngZone, scrollDispatcher);
+  return parentRuler || new ViewportRuler(scrollDispatcher);
 }
 
 /** @docs-private */
 export const VIEWPORT_RULER_PROVIDER = {
   // If there is already a ViewportRuler available, use that. Otherwise, provide a new one.
   provide: ViewportRuler,
-  deps: [[new Optional(), new SkipSelf(), ViewportRuler], Platform, NgZone, ScrollDispatcher],
+  deps: [[new Optional(), new SkipSelf(), ViewportRuler], ScrollDispatcher],
   useFactory: VIEWPORT_RULER_PROVIDER_FACTORY
 };
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index 0718faa6c7ad..a82befc61f89 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -2,7 +2,8 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/t
 import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {By} from '@angular/platform-browser';
-import {dispatchFakeEvent} from '@angular/cdk/testing';
+import {ViewportRuler} from '@angular/cdk/scrolling';
+import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {Observable} from 'rxjs/Observable';
 import {MdTab, MdTabGroup, MdTabHeaderPosition, MdTabsModule} from './index';
 
@@ -18,6 +19,9 @@ describe('MdTabGroup', () => {
         AsyncTabsTestApp,
         DisabledTabsTestApp,
         TabGroupWithSimpleApi,
+      ],
+      providers: [
+        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index 564f6fe53cc9..64239dfc60a2 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -6,8 +6,9 @@ import {CommonModule} from '@angular/common';
 import {By} from '@angular/platform-browser';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
 import {PortalModule} from '@angular/cdk/portal';
+import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Direction, Directionality} from '@angular/cdk/bidi';
-import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchKeyboardEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {MdTabHeader} from './tab-header';
 import {MdRippleModule} from '../core/ripple/index';
 import {MdInkBar} from './ink-bar';
@@ -34,6 +35,7 @@ describe('MdTabHeader', () => {
       ],
       providers: [
         {provide: Directionality, useFactory: () => ({value: dir, change: change.asObservable()})},
+        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 17ceb10e02e6..00f0987bc69e 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -26,14 +26,14 @@ import {
 } from '@angular/core';
 import {Directionality, Direction} from '@angular/cdk/bidi';
 import {RIGHT_ARROW, LEFT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
-import {startWith} from '@angular/cdk/rxjs';
+import {auditTime, startWith} from '@angular/cdk/rxjs';
 import {Subscription} from 'rxjs/Subscription';
 import {of as observableOf} from 'rxjs/observable/of';
 import {merge} from 'rxjs/observable/merge';
+import {fromEvent} from 'rxjs/observable/fromEvent';
 import {MdTabLabelWrapper} from './tab-label-wrapper';
 import {MdInkBar} from './ink-bar';
 import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
-import {ViewportRuler} from '@angular/cdk/scrolling';
 
 /**
  * The directions that scrolling can go in when the header's tabs exceed the header width. 'After'
@@ -132,7 +132,6 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
   constructor(private _elementRef: ElementRef,
               private _renderer: Renderer2,
               private _changeDetectorRef: ChangeDetectorRef,
-              private _viewportRuler: ViewportRuler,
               @Optional() private _dir: Directionality) {
     super();
   }
@@ -185,7 +184,9 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
    */
   ngAfterContentInit() {
     const dirChange = this._dir ? this._dir.change : observableOf(null);
-    const resize = this._viewportRuler.change(150);
+    const resize = typeof window !== 'undefined' ?
+        auditTime.call(fromEvent(window, 'resize'), 150) :
+        observableOf(null);
 
     this._realignInkBar = startWith.call(merge(dirChange, resize), null).subscribe(() => {
       this._updatePagination();
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index 6328fc651918..e38e006ad6a0 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -1,7 +1,8 @@
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {dispatchFakeEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {ViewportRuler} from '@angular/cdk/scrolling';
+import {dispatchFakeEvent, dispatchMouseEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {Subject} from 'rxjs/Subject';
 import {MdTabNav, MdTabsModule, MdTabLink} from '../index';
@@ -22,7 +23,8 @@ describe('MdTabNavBar', () => {
         {provide: Directionality, useFactory: () => ({
           value: dir,
           change: dirChange.asObservable()
-        })}
+        })},
+        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
@@ -171,7 +173,7 @@ describe('MdTabNavBar', () => {
       spyOn(inkBar, 'alignToElement');
 
       dispatchFakeEvent(window, 'resize');
-      tick(150);
+      tick(10);
       fixture.detectChanges();
 
       expect(inkBar.alignToElement).toHaveBeenCalled();
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 3e5e961d0f27..d247017fe418 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -28,10 +28,11 @@ import {
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Directionality} from '@angular/cdk/bidi';
 import {Platform} from '@angular/cdk/platform';
-import {takeUntil} from '@angular/cdk/rxjs';
+import {auditTime, takeUntil} from '@angular/cdk/rxjs';
 import {Subject} from 'rxjs/Subject';
 import {of as observableOf} from 'rxjs/observable/of';
 import {merge} from 'rxjs/observable/merge';
+import {fromEvent} from 'rxjs/observable/fromEvent';
 import {CanDisableRipple, mixinDisableRipple} from '../../core/common-behaviors/disable-ripple';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {CanDisable, mixinDisabled} from '../../core/common-behaviors/disabled';
@@ -104,8 +105,7 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
               elementRef: ElementRef,
               @Optional() private _dir: Directionality,
               private _ngZone: NgZone,
-              private _changeDetectorRef: ChangeDetectorRef,
-              private _viewportRuler: ViewportRuler) {
+              private _changeDetectorRef: ChangeDetectorRef) {
     super(renderer, elementRef);
   }
 
@@ -121,10 +121,14 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
 
   ngAfterContentInit(): void {
     this._ngZone.runOutsideAngular(() => {
-      const dirChange = this._dir ? this._dir.change : observableOf(null);
-
-      return takeUntil.call(merge(dirChange, this._viewportRuler.change(10)), this._onDestroy)
-          .subscribe(() => this._alignInkBar());
+      let dirChange = this._dir ? this._dir.change : observableOf(null);
+      let resize = typeof window !== 'undefined' ?
+          auditTime.call(fromEvent(window, 'resize'), 10) :
+          observableOf(null);
+
+      return takeUntil.call(merge(dirChange, resize), this._onDestroy).subscribe(() => {
+        this._alignInkBar();
+      });
     });
 
     this._setLinkDisableRipple();

From e4d48d709ac82f8eb91e43724a35d2abe142a1ac Mon Sep 17 00:00:00 2001
From: Rose Perrone <rose0x4@gmail.com>
Date: Wed, 13 Sep 2017 09:31:30 -0700
Subject: [PATCH 084/575] fix(datepicker): makes sure the datepickerInput is
 registered (#7049)

---
 src/lib/datepicker/datepicker-input.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index aa09ae366812..f44fac9d8f90 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -90,14 +90,22 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   /** The datepicker that this input is associated with. */
   @Input()
   set mdDatepicker(value: MdDatepicker<D>) {
+    this.registerDatepicker(value);
+  }
+  _datepicker: MdDatepicker<D>;
+
+  private registerDatepicker(value: MdDatepicker<D>) {
     if (value) {
       this._datepicker = value;
       this._datepicker._registerInput(this);
     }
   }
-  _datepicker: MdDatepicker<D>;
 
-  @Input() set matDatepicker(value: MdDatepicker<D>) { this.mdDatepicker = value; }
+  @Input() set matDatepicker(value: MdDatepicker<D>) {
+    // Note that we don't set `this.mdDatepicker = value` here,
+    // because that line gets stripped by the JS compiler.
+    this.registerDatepicker(value);
+  }
 
   @Input() set mdDatepickerFilter(filter: (date: D | null) => boolean) {
     this._dateFilter = filter;

From 2f1f0fd0b6dd34d2eb036bbee024c4af1b83fe3e Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:27:02 +0200
Subject: [PATCH 085/575] chore(menu): missing method call (#7065)

Fixes a method not being called, causing the check to always evaluate to true.
---
 src/lib/menu/menu-trigger.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 9bceb8282e80..e3493c707ac5 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -417,7 +417,7 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
       // Since clicking on the trigger won't close the menu if it opens a sub-menu,
       // we should prevent focus from moving onto it via click to avoid the
       // highlight from lingering on the menu item.
-      if (this.triggersSubmenu) {
+      if (this.triggersSubmenu()) {
         event.preventDefault();
       }
     }

From 1cb8907a664dd0b4b56505a3eac2b219150a6395 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 14 Sep 2017 15:15:17 -0700
Subject: [PATCH 086/575] build: create JS bundles for each component (#6998)

Before this change, all of `@angular/material` was bundled into a
single, flat JS file.

After this change, each top-level component (i.e., each directory under
`src/lib`) will be have its own JS file (and d.ts and metadata.json).

The benefit of this change is that current versions of webpack will be
able to do a much better job of only including the code an app is using.

It also allows (but does not require) people to explicitly import from specific components,
e.g.
```
import {MdButtonModule} from '@angular/material/button';
``

For development _within Angular Material itself_ we have to use these
deeper imports because the root `@angular/material` doesn't exist until
we build the relase package.

Additionally, this PR adds a `tsconfig.json` for each dir under `src/`
with the correct path mappings for that directory, so that IDEs will
correctly generate imports.

Closure Compiler CI check is also disabled by this PR; it cannot work
with the new package structure until a release with
https://github.com/google/closure-compiler/pull/2600 is made available.
---
 .travis.yml                                   |   4 +-
 package-lock.json                             |  87 ++++---
 package.json                                  |   3 +-
 .../closure-compiler/build-devapp-bundle.sh   |   8 +-
 src/cdk/package.json                          |   4 +-
 src/cdk/tsconfig.json                         |  12 +
 src/demo-app/chips/chips-demo.ts              |   3 +-
 src/demo-app/demo-app/demo-app.ts             |   2 +-
 src/demo-app/demo-app/demo-module.ts          |   2 +-
 src/demo-app/demo-material-module.ts          |   4 +-
 .../live-announcer/live-announcer-demo.ts     |   5 +-
 src/demo-app/overlay/overlay-demo.ts          |  32 ++-
 src/demo-app/platform/platform-demo.ts        |   2 +-
 src/demo-app/portal/portal-demo.ts            |   8 +-
 src/demo-app/tsconfig-aot.json                |   3 +-
 src/demo-app/tsconfig-build.json              |   2 +
 src/demo-app/tsconfig.json                    |  14 +
 src/e2e-app/system-config.ts                  |  32 +++
 src/e2e-app/tsconfig-build.json               |   3 +-
 src/e2e-app/tsconfig.json                     |  15 ++
 src/lib/autocomplete/autocomplete-trigger.ts  |  37 ++-
 src/lib/autocomplete/autocomplete.spec.ts     |   6 +-
 src/lib/autocomplete/autocomplete.ts          |   2 +-
 src/lib/autocomplete/index.ts                 |  22 +-
 src/lib/autocomplete/public_api.ts            |  29 +++
 src/lib/autocomplete/tsconfig-build.json      |  14 +
 src/lib/button-toggle/button-toggle.ts        |   4 +-
 src/lib/button-toggle/index.ts                |  25 +-
 src/lib/button-toggle/public_api.ts           |  32 +++
 src/lib/button-toggle/tsconfig-build.json     |  14 +
 src/lib/button/button.spec.ts                 |   2 +-
 src/lib/button/button.ts                      |  15 +-
 src/lib/button/index.ts                       |  46 +---
 src/lib/button/public_api.ts                  |  53 ++++
 src/lib/button/tsconfig-build.json            |  14 +
 src/lib/card/index.ts                         |  50 +---
 src/lib/card/public_api.ts                    |  57 ++++
 src/lib/card/tsconfig-build.json              |  14 +
 src/lib/checkbox/checkbox.spec.ts             |   2 +-
 src/lib/checkbox/checkbox.ts                  |  19 +-
 src/lib/checkbox/index.ts                     |  19 +-
 src/lib/checkbox/public_api.ts                |  26 ++
 src/lib/checkbox/tsconfig-build.json          |  14 +
 src/lib/chips/chip-input.spec.ts              |   4 +-
 src/lib/chips/chip-input.ts                   |   2 +-
 src/lib/chips/chip-list.spec.ts               |  21 +-
 src/lib/chips/chip-list.ts                    |   2 +-
 src/lib/chips/chip.spec.ts                    |   4 +-
 src/lib/chips/chip.ts                         |  20 +-
 src/lib/chips/index.ts                        |  16 +-
 src/lib/chips/public_api.ts                   |  23 ++
 src/lib/chips/tsconfig-build.json             |  14 +
 src/lib/core.ts                               |   9 -
 src/lib/core/common-behaviors/index.ts        |   4 +
 src/lib/core/core.ts                          | 157 -----------
 src/lib/core/index.ts                         |   2 +-
 src/lib/core/option/option.ts                 |   2 +-
 src/lib/core/public_api.ts                    |  36 +++
 src/lib/core/tsconfig-build.json              |  14 +
 src/lib/datepicker/calendar.spec.ts           |   8 +-
 src/lib/datepicker/calendar.ts                |  39 +--
 src/lib/datepicker/datepicker-input.ts        |  15 +-
 src/lib/datepicker/datepicker.spec.ts         |  35 ++-
 src/lib/datepicker/datepicker.ts              |  40 ++-
 src/lib/datepicker/index.ts                   |  72 +----
 src/lib/datepicker/month-view.spec.ts         |   4 +-
 src/lib/datepicker/month-view.ts              |   5 +-
 src/lib/datepicker/public_api.ts              |  79 ++++++
 src/lib/datepicker/tsconfig-build.json        |  14 +
 src/lib/datepicker/year-view.spec.ts          |   4 +-
 src/lib/datepicker/year-view.ts               |   5 +-
 src/lib/dialog/dialog.ts                      |  32 +--
 src/lib/dialog/index.ts                       |  53 +---
 src/lib/dialog/public_api.ts                  |  60 +++++
 src/lib/dialog/tsconfig-build.json            |  14 +
 src/lib/expansion/accordion-item.ts           |   2 +-
 src/lib/expansion/expansion-panel-header.ts   |   6 +-
 src/lib/expansion/expansion-panel.ts          |  26 +-
 src/lib/expansion/index.ts                    |  58 +----
 src/lib/expansion/public_api.ts               |  65 +++++
 src/lib/expansion/tsconfig-build.json         |  14 +
 src/lib/form-field/form-field.ts              |  22 +-
 src/lib/form-field/index.ts                   |  46 +---
 src/lib/form-field/public_api.ts              |  53 ++++
 src/lib/form-field/tsconfig-build.json        |  14 +
 src/lib/grid-list/grid-tile.ts                |   2 +-
 src/lib/grid-list/index.ts                    |  36 +--
 src/lib/grid-list/public_api.ts               |  43 +++
 src/lib/grid-list/tsconfig-build.json         |  14 +
 src/lib/icon/icon-registry.ts                 |  19 +-
 src/lib/icon/icon.ts                          |   4 +-
 src/lib/icon/index.ts                         |  18 +-
 src/lib/icon/public_api.ts                    |  25 ++
 src/lib/icon/tsconfig-build.json              |  14 +
 src/lib/input/index.ts                        |  34 +--
 src/lib/input/input.spec.ts                   |  10 +-
 src/lib/input/input.ts                        |   4 +-
 src/lib/input/public_api.ts                   |  41 +++
 src/lib/input/tsconfig-build.json             |  14 +
 src/lib/list/index.ts                         |  54 +---
 src/lib/list/list.ts                          |   4 +-
 src/lib/list/public_api.ts                    |  67 +++++
 src/lib/list/selection-list.spec.ts           |   4 +-
 src/lib/list/selection-list.ts                |  44 ++--
 src/lib/list/tsconfig-build.json              |  14 +
 src/lib/menu/index.ts                         |  37 +--
 src/lib/menu/menu-directive.ts                |   2 +-
 src/lib/menu/menu-item.ts                     |   6 +-
 src/lib/menu/menu-trigger.ts                  |  42 ++-
 src/lib/menu/menu.spec.ts                     |   2 +-
 src/lib/menu/public_api.ts                    |  45 ++++
 src/lib/menu/tsconfig-build.json              |  14 +
 src/lib/package.json                          |   4 +-
 src/lib/paginator/index.ts                    |  26 +-
 src/lib/paginator/paginator.ts                |   6 +-
 src/lib/paginator/public_api.ts               |  33 +++
 src/lib/paginator/tsconfig-build.json         |  14 +
 src/lib/progress-bar/index.ts                 |  16 +-
 src/lib/progress-bar/public_api.ts            |  23 ++
 src/lib/progress-bar/tsconfig-build.json      |  14 +
 src/lib/progress-spinner/index.ts             |  28 +-
 src/lib/progress-spinner/progress-spinner.ts  |   2 +-
 src/lib/progress-spinner/public_api.ts        |  35 +++
 src/lib/progress-spinner/tsconfig-build.json  |  14 +
 src/lib/public_api.ts                         |  64 ++---
 src/lib/radio/index.ts                        |  23 +-
 src/lib/radio/public_api.ts                   |  30 +++
 src/lib/radio/radio.spec.ts                   |   2 +-
 src/lib/radio/radio.ts                        |   8 +-
 src/lib/radio/tsconfig-build.json             |  14 +
 src/lib/select/index.ts                       |  24 +-
 src/lib/select/public_api.ts                  |  31 +++
 src/lib/select/select.spec.ts                 |   6 +-
 src/lib/select/select.ts                      |  60 ++---
 src/lib/select/tsconfig-build.json            |  14 +
 src/lib/sidenav/drawer.ts                     |  22 +-
 src/lib/sidenav/index.ts                      |  20 +-
 src/lib/sidenav/public_api.ts                 |  27 ++
 src/lib/sidenav/tsconfig-build.json           |  14 +
 src/lib/slide-toggle/index.ts                 |  27 +-
 src/lib/slide-toggle/public_api.ts            |  34 +++
 src/lib/slide-toggle/slide-toggle.spec.ts     |   2 +-
 src/lib/slide-toggle/slide-toggle.ts          |  10 +-
 src/lib/slide-toggle/tsconfig-build.json      |  14 +
 src/lib/slider/index.ts                       |  19 +-
 src/lib/slider/public_api.ts                  |  26 ++
 src/lib/slider/slider.spec.ts                 |   4 +-
 src/lib/slider/slider.ts                      |  38 +--
 src/lib/slider/test-gesture-config.ts         |   2 +-
 src/lib/slider/tsconfig-build.json            |  14 +
 src/lib/snack-bar/index.ts                    |  32 +--
 src/lib/snack-bar/public_api.ts               |  39 +++
 src/lib/snack-bar/snack-bar.ts                |   4 +-
 src/lib/snack-bar/tsconfig-build.json         |  14 +
 src/lib/sort/index.ts                         |  19 +-
 src/lib/sort/public_api.ts                    |  26 ++
 src/lib/sort/sort.spec.ts                     |   2 +-
 src/lib/sort/tsconfig-build.json              |  14 +
 src/lib/stepper/index.ts                      |  42 +--
 src/lib/stepper/public_api.ts                 |  50 ++++
 src/lib/stepper/step-header.ts                |   5 +-
 src/lib/stepper/stepper.spec.ts               |   2 +-
 src/lib/stepper/stepper.ts                    |  18 +-
 src/lib/stepper/tsconfig-build.json           |  14 +
 src/lib/table/index.ts                        |  25 +-
 src/lib/table/public_api.ts                   |  32 +++
 src/lib/table/tsconfig-build.json             |  14 +
 src/lib/tabs/index.ts                         |  59 +----
 src/lib/tabs/public_api.ts                    |  67 +++++
 src/lib/tabs/tab-body.spec.ts                 |   6 +-
 src/lib/tabs/tab-group.ts                     |   4 +-
 src/lib/tabs/tab-header.spec.ts               |   2 +-
 src/lib/tabs/tab-header.ts                    |  39 +--
 src/lib/tabs/tab-label-wrapper.ts             |   2 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts       |  38 +--
 src/lib/tabs/tab.ts                           |   4 +-
 src/lib/tabs/tsconfig-build.json              |  14 +
 src/lib/toolbar/index.ts                      |  15 +-
 src/lib/toolbar/public_api.ts                 |  22 ++
 src/lib/toolbar/toolbar.ts                    |   2 +-
 src/lib/toolbar/tsconfig-build.json           |  14 +
 src/lib/tooltip/index.ts                      |  27 +-
 src/lib/tooltip/public_api.ts                 |  34 +++
 src/lib/tooltip/tooltip.ts                    |  39 ++-
 src/lib/tooltip/tsconfig-build.json           |  14 +
 src/lib/tsconfig-build.json                   |   3 +-
 src/lib/tsconfig-tests.json                   |   6 +-
 src/lib/tsconfig.json                         |  13 +
 src/material-examples/package.json            |   4 +-
 .../table-http/table-http-example.ts          |   2 +-
 src/material-examples/tsconfig-build.json     |   1 +
 src/material-examples/tsconfig.json           |  14 +
 src/material-examples/typings.d.ts            |   1 +
 src/material-moment-adapter/package.json      |   4 +-
 .../tsconfig-build.json                       |   4 +-
 src/material-moment-adapter/tsconfig.json     |  14 +
 src/universal-app/tsconfig-build.json         |   3 +-
 src/universal-app/tsconfig-prerender.json     |   3 +-
 test/karma-test-shim.js                       |  32 +++
 tools/gulp/packages.ts                        |   6 +-
 tools/gulp/tasks/development.ts               |   2 +-
 tools/gulp/tasks/material-release.ts          |  12 +-
 tools/package-tools/build-bundles.ts          | 245 +++++++++++++-----
 tools/package-tools/build-package.ts          |  74 ++++--
 tools/package-tools/build-release.ts          |  64 +++--
 .../package-tools/entry-point-package-json.ts |   4 +-
 tools/package-tools/gulp/build-tasks-gulp.ts  |  21 +-
 tools/package-tools/metadata-reexport.ts      |   6 +-
 tools/package-tools/rollup-globals.ts         |  16 +-
 tools/package-tools/rollup-helpers.ts         |  47 ----
 tools/package-tools/secondary-entry-points.ts |   4 +-
 tools/package-tools/typescript-transpile.ts   |   2 +-
 tsconfig.json                                 |  13 +-
 213 files changed, 2776 insertions(+), 1851 deletions(-)
 create mode 100644 src/cdk/tsconfig.json
 create mode 100644 src/demo-app/tsconfig.json
 create mode 100644 src/e2e-app/tsconfig.json
 create mode 100644 src/lib/autocomplete/public_api.ts
 create mode 100644 src/lib/autocomplete/tsconfig-build.json
 create mode 100644 src/lib/button-toggle/public_api.ts
 create mode 100644 src/lib/button-toggle/tsconfig-build.json
 create mode 100644 src/lib/button/public_api.ts
 create mode 100644 src/lib/button/tsconfig-build.json
 create mode 100644 src/lib/card/public_api.ts
 create mode 100644 src/lib/card/tsconfig-build.json
 create mode 100644 src/lib/checkbox/public_api.ts
 create mode 100644 src/lib/checkbox/tsconfig-build.json
 create mode 100644 src/lib/chips/public_api.ts
 create mode 100644 src/lib/chips/tsconfig-build.json
 delete mode 100644 src/lib/core.ts
 delete mode 100644 src/lib/core/core.ts
 create mode 100644 src/lib/core/public_api.ts
 create mode 100644 src/lib/core/tsconfig-build.json
 create mode 100644 src/lib/datepicker/public_api.ts
 create mode 100644 src/lib/datepicker/tsconfig-build.json
 create mode 100644 src/lib/dialog/public_api.ts
 create mode 100644 src/lib/dialog/tsconfig-build.json
 create mode 100644 src/lib/expansion/public_api.ts
 create mode 100644 src/lib/expansion/tsconfig-build.json
 create mode 100644 src/lib/form-field/public_api.ts
 create mode 100644 src/lib/form-field/tsconfig-build.json
 create mode 100644 src/lib/grid-list/public_api.ts
 create mode 100644 src/lib/grid-list/tsconfig-build.json
 create mode 100644 src/lib/icon/public_api.ts
 create mode 100644 src/lib/icon/tsconfig-build.json
 create mode 100644 src/lib/input/public_api.ts
 create mode 100644 src/lib/input/tsconfig-build.json
 create mode 100644 src/lib/list/public_api.ts
 create mode 100644 src/lib/list/tsconfig-build.json
 create mode 100644 src/lib/menu/public_api.ts
 create mode 100644 src/lib/menu/tsconfig-build.json
 create mode 100644 src/lib/paginator/public_api.ts
 create mode 100644 src/lib/paginator/tsconfig-build.json
 create mode 100644 src/lib/progress-bar/public_api.ts
 create mode 100644 src/lib/progress-bar/tsconfig-build.json
 create mode 100644 src/lib/progress-spinner/public_api.ts
 create mode 100644 src/lib/progress-spinner/tsconfig-build.json
 create mode 100644 src/lib/radio/public_api.ts
 create mode 100644 src/lib/radio/tsconfig-build.json
 create mode 100644 src/lib/select/public_api.ts
 create mode 100644 src/lib/select/tsconfig-build.json
 create mode 100644 src/lib/sidenav/public_api.ts
 create mode 100644 src/lib/sidenav/tsconfig-build.json
 create mode 100644 src/lib/slide-toggle/public_api.ts
 create mode 100644 src/lib/slide-toggle/tsconfig-build.json
 create mode 100644 src/lib/slider/public_api.ts
 create mode 100644 src/lib/slider/tsconfig-build.json
 create mode 100644 src/lib/snack-bar/public_api.ts
 create mode 100644 src/lib/snack-bar/tsconfig-build.json
 create mode 100644 src/lib/sort/public_api.ts
 create mode 100644 src/lib/sort/tsconfig-build.json
 create mode 100644 src/lib/stepper/public_api.ts
 create mode 100644 src/lib/stepper/tsconfig-build.json
 create mode 100644 src/lib/table/public_api.ts
 create mode 100644 src/lib/table/tsconfig-build.json
 create mode 100644 src/lib/tabs/public_api.ts
 create mode 100644 src/lib/tabs/tsconfig-build.json
 create mode 100644 src/lib/toolbar/public_api.ts
 create mode 100644 src/lib/toolbar/tsconfig-build.json
 create mode 100644 src/lib/tooltip/public_api.ts
 create mode 100644 src/lib/tooltip/tsconfig-build.json
 create mode 100644 src/lib/tsconfig.json
 create mode 100644 src/material-examples/tsconfig.json
 create mode 100644 src/material-examples/typings.d.ts
 create mode 100644 src/material-moment-adapter/tsconfig.json
 delete mode 100644 tools/package-tools/rollup-helpers.ts

diff --git a/.travis.yml b/.travis.yml
index e88eac92a861..7544dea8bd2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,9 @@ jobs:
     - env: "MODE=aot"
     - env: "MODE=payload"
     - env: "MODE=prerender"
-    - env: "MODE=closure-compiler"
+    # Closure Compiler CI check is temporarily disabled until a new version of
+    # the tool is released with https://github.com/google/closure-compiler/pull/2600
+    # - env: "MODE=closure-compiler"
     - env: "MODE=e2e"
     - env: "MODE=saucelabs_required"
     - env: "MODE=browserstack_required"
diff --git a/package-lock.json b/package-lock.json
index 18d9ce7ecbe6..4d90745db73c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "material2-srcs",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -675,6 +675,16 @@
         "@types/node": "7.0.34"
       }
     },
+    "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"
+      }
+    },
     "abab": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
@@ -2286,8 +2296,8 @@
       "integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=",
       "dev": true,
       "requires": {
-        "is-text-path": "1.0.1",
         "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.1.1",
@@ -3079,7 +3089,7 @@
         "shelljs": "0.7.8",
         "spdx-license-list": "2.1.0",
         "stringmap": "0.2.2",
-        "typescript": "2.2.2"
+        "typescript": "2.4.2"
       }
     },
     "di": {
@@ -4555,6 +4565,7 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.21",
+        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -4572,7 +4583,6 @@
         "fstream-ignore": "1.0.5",
         "inquirer": "0.12.0",
         "jsonschema": "1.1.1",
-        "JSONStream": "1.3.1",
         "jsonwebtoken": "5.7.0",
         "lodash": "4.17.4",
         "open": "0.0.5",
@@ -9170,6 +9180,16 @@
         "through2": "0.6.5"
       },
       "dependencies": {
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -9182,16 +9202,6 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -9256,16 +9266,6 @@
       "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk=",
       "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"
-      }
-    },
     "jsonwebtoken": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
@@ -12551,6 +12551,15 @@
         "source-map-support": "0.4.15"
       }
     },
+    "rollup-plugin-alias": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.3.1.tgz",
+      "integrity": "sha1-qRUv7EtqZRDa6TmJUXynhTwypvo=",
+      "dev": true,
+      "requires": {
+        "slash": "1.0.0"
+      }
+    },
     "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",
@@ -13127,6 +13136,12 @@
       "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
+    },
     "slice-ansi": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
@@ -13551,15 +13566,6 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -13593,6 +13599,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "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"
+      }
+    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -14703,9 +14718,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.2.2.tgz",
-      "integrity": "sha1-YGAiUIR5tV/6NotY/uljoD39eww=",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
       "dev": true
     },
     "uglify-js": {
diff --git a/package.json b/package.json
index d7be6be388fb..7c36a280c74c 100644
--- a/package.json
+++ b/package.json
@@ -107,6 +107,7 @@
     "request": "^2.81.0",
     "resolve-bin": "^0.4.0",
     "rollup": "^0.41.6",
+    "rollup-plugin-alias": "^1.3.1",
     "rollup-plugin-node-resolve": "^3.0.0",
     "run-sequence": "^1.2.2",
     "scss-bundle": "^2.0.1-beta.7",
@@ -117,7 +118,7 @@
     "tsconfig-paths": "^2.2.0",
     "tslint": "^5.7.0",
     "tsutils": "^2.6.0",
-    "typescript": "~2.2.1",
+    "typescript": "~2.4.2",
     "uglify-js": "^2.8.14",
     "web-animations-js": "^2.2.5"
   }
diff --git a/scripts/closure-compiler/build-devapp-bundle.sh b/scripts/closure-compiler/build-devapp-bundle.sh
index 8e483922b3fc..f0efff42b318 100755
--- a/scripts/closure-compiler/build-devapp-bundle.sh
+++ b/scripts/closure-compiler/build-devapp-bundle.sh
@@ -58,9 +58,9 @@ OPTS=(
   "--debug"
 
   # Include the Material and CDK FESM bundles
-  dist/releases/material/@angular/material.js
-  dist/releases/cdk/@angular/cdk.js
-  dist/releases/material-moment-adapter/@angular/material-moment-adapter.js
+  dist/releases/material/esm2015/material.js
+  dist/releases/cdk/esm2015/cdk.js
+  dist/releases/material-moment-adapter/esm2015/material-moment-adapter.js
 
   # Include all Angular FESM bundles.
   node_modules/@angular/core/@angular/core.js
@@ -90,7 +90,7 @@ OPTS=(
 # Walk through every entry-point of the CDK and add it to closure options.
 for i in "${cdkEntryPoints[@]}"; do
   OPTS+=("--js_module_root=dist/releases/cdk/${i}")
-  OPTS+=("dist/releases/cdk/@angular/cdk/${i}.js")
+  OPTS+=("dist/releases/cdk/esm2015/${i}.js")
 done
 
 # Write closure flags to a closure flagfile.
diff --git a/src/cdk/package.json b/src/cdk/package.json
index 3b1a28634a4e..0109d456cd20 100644
--- a/src/cdk/package.json
+++ b/src/cdk/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular Material Component Development Kit",
   "main": "./bundles/cdk.umd.js",
-  "module": "./@angular/cdk.es5.js",
-  "es2015": "./@angular/cdk.js",
+  "module": "./esm5/cdk.es5.js",
+  "es2015": "./esm2015/cdk.js",
   "typings": "./cdk.d.ts",
   "repository": {
     "type": "git",
diff --git a/src/cdk/tsconfig.json b/src/cdk/tsconfig.json
new file mode 100644
index 000000000000..db5560801237
--- /dev/null
+++ b/src/cdk/tsconfig.json
@@ -0,0 +1,12 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["./*"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/demo-app/chips/chips-demo.ts b/src/demo-app/chips/chips-demo.ts
index d58217352256..ce46def82be2 100644
--- a/src/demo-app/chips/chips-demo.ts
+++ b/src/demo-app/chips/chips-demo.ts
@@ -1,5 +1,6 @@
+import {ENTER} from '@angular/cdk/keycodes';
 import {Component} from '@angular/core';
-import {MdChipInputEvent, ENTER} from '@angular/material';
+import {MdChipInputEvent} from '@angular/material';
 
 const COMMA = 188;
 
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 08a4fae98e8a..6f8341a5d88e 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -4,7 +4,7 @@ import {
   ElementRef,
   Renderer2,
 } from '@angular/core';
-import {OverlayContainer} from '@angular/material';
+import {OverlayContainer} from '@angular/cdk/overlay';
 
 /**
  * The entry app for demo site. Routes under `accessibility` will use AccessibilityDemo component,
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index 79de0624a050..3d98a8f0efc8 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -45,7 +45,7 @@ import {DemoMaterialModule} from '../demo-material-module';
 import {
   FullscreenOverlayContainer,
   OverlayContainer,
-} from '@angular/material';
+} from '@angular/cdk/overlay';
 import {TableHeaderDemo} from '../table/table-header-demo';
 
 @NgModule({
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index bf2ffc8cc2df..58617586afec 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -15,12 +15,10 @@ import {
   MdInputModule,
   MdListModule,
   MdMenuModule,
-  MdNativeDateModule,
   MdPaginatorModule,
   MdProgressBarModule,
   MdProgressSpinnerModule,
   MdRadioModule,
-  MdRippleModule,
   MdSelectModule,
   MdSidenavModule,
   MdSliderModule,
@@ -31,9 +29,9 @@ import {
   MdTabsModule,
   MdToolbarModule,
   MdTooltipModule,
-  StyleModule,
   MdStepperModule,
 } from '@angular/material';
+import {StyleModule, MdNativeDateModule, MdRippleModule} from '@angular/material';
 import {CdkTableModule} from '@angular/cdk/table';
 import {A11yModule} from '@angular/cdk/a11y';
 import {BidiModule} from '@angular/cdk/bidi';
diff --git a/src/demo-app/live-announcer/live-announcer-demo.ts b/src/demo-app/live-announcer/live-announcer-demo.ts
index bc43d069fcd2..45988580e121 100644
--- a/src/demo-app/live-announcer/live-announcer-demo.ts
+++ b/src/demo-app/live-announcer/live-announcer-demo.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {LiveAnnouncer} from '@angular/material';
+import {LiveAnnouncer} from '@angular/cdk/a11y';
+
 
 @Component({
   moduleId: module.id,
@@ -7,11 +8,9 @@ import {LiveAnnouncer} from '@angular/material';
   templateUrl: 'live-announcer-demo.html',
 })
 export class LiveAnnouncerDemo {
-
   constructor(private live: LiveAnnouncer) {}
 
   announceText(message: string) {
     this.live.announce(message);
   }
-
 }
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index bc925ee82757..1cf11b4796aa 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -1,22 +1,20 @@
+import {Overlay, OverlayOrigin, OverlayState} from '@angular/cdk/overlay';
 import {
-    Component,
-    ViewChildren,
-    QueryList,
-    ViewEncapsulation,
-    ViewChild,
-    ViewContainerRef,
-} from '@angular/core';
+  ComponentPortal,
+  // This import is only used to define a generic type. The current TypeScript version incorrectly
+  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
+  // tslint:disable-next-line:no-unused-variable
+  Portal,
+  TemplatePortalDirective
+} from '@angular/cdk/portal';
 import {
-    Overlay,
-    OverlayState,
-    OverlayOrigin,
-    ComponentPortal,
-    // This import is only used to define a generic type. The current TypeScript version incorrectly
-    // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-    // tslint:disable-next-line:no-unused-variable
-    Portal,
-    TemplatePortalDirective,
-} from '@angular/material';
+  Component,
+  QueryList,
+  ViewChild,
+  ViewChildren,
+  ViewContainerRef,
+  ViewEncapsulation,
+} from '@angular/core';
 
 
 @Component({
diff --git a/src/demo-app/platform/platform-demo.ts b/src/demo-app/platform/platform-demo.ts
index d96230627e95..d80dfd6c70d8 100644
--- a/src/demo-app/platform/platform-demo.ts
+++ b/src/demo-app/platform/platform-demo.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {Platform, getSupportedInputTypes} from '@angular/material';
+import {Platform, getSupportedInputTypes} from '@angular/cdk/platform';
 
 
 @Component({
diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts
index b00a1789ff86..f780d2f71a6c 100644
--- a/src/demo-app/portal/portal-demo.ts
+++ b/src/demo-app/portal/portal-demo.ts
@@ -1,9 +1,5 @@
-import {Component, ViewChildren, QueryList} from '@angular/core';
-import {
-    Portal,
-    ComponentPortal,
-    TemplatePortalDirective,
-} from '@angular/material';
+import {ComponentPortal, Portal, TemplatePortalDirective} from '@angular/cdk/portal';
+import {Component, QueryList, ViewChildren} from '@angular/core';
 
 
 @Component({
diff --git a/src/demo-app/tsconfig-aot.json b/src/demo-app/tsconfig-aot.json
index f868fe1c2677..fb9cc74893ed 100644
--- a/src/demo-app/tsconfig-aot.json
+++ b/src/demo-app/tsconfig-aot.json
@@ -10,8 +10,9 @@
     "strictNullChecks": true,
     "outDir": ".",
     "paths": {
-      "@angular/material": ["./material"],
       "@angular/cdk/*": ["./cdk/*"],
+      "@angular/material": ["./material"],
+      "@angular/material/*": ["./material/*"],
       "@angular/material-moment-adapter": ["./material-moment-adapter"]
     }
   },
diff --git a/src/demo-app/tsconfig-build.json b/src/demo-app/tsconfig-build.json
index 98e6b789b1d1..c3169ecece30 100644
--- a/src/demo-app/tsconfig-build.json
+++ b/src/demo-app/tsconfig-build.json
@@ -8,6 +8,7 @@
     "noUnusedParameters": true,
     "strictNullChecks": true,
     "lib": ["es6", "es2015", "dom"],
+    "skipLibCheck": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
@@ -23,6 +24,7 @@
     "paths": {
       "@angular/material": ["../../dist/packages/material/public_api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*"],
+      "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"]
     }
   },
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
new file mode 100644
index 000000000000..3e4fa9c6417d
--- /dev/null
+++ b/src/demo-app/tsconfig.json
@@ -0,0 +1,14 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/material/*": ["../lib/*"],
+      "@angular/material": ["../lib/public_api.ts"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 75700c38fcfc..25d051d19fa5 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -42,6 +42,38 @@ System.config({
     '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
     '@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js',
     '@angular/material-examples': 'dist/bundles/material-examples.umd.js',
+
+    '@angular/material/autocomplete': 'dist/bundles/material-autocomplete.umd.js',
+    '@angular/material/button': 'dist/bundles/material-button.umd.js',
+    '@angular/material/button-toggle': 'dist/bundles/material-button-toggle.umd.js',
+    '@angular/material/card': 'dist/bundles/material-card.umd.js',
+    '@angular/material/checkbox': 'dist/bundles/material-checkbox.umd.js',
+    '@angular/material/chips': 'dist/bundles/material-chips.umd.js',
+    '@angular/material/core': 'dist/bundles/material-core.umd.js',
+    '@angular/material/datepicker': 'dist/bundles/material-datepicker.umd.js',
+    '@angular/material/dialog': 'dist/bundles/material-dialog.umd.js',
+    '@angular/material/expansion': 'dist/bundles/material-expansion.umd.js',
+    '@angular/material/form-field': 'dist/bundles/material-form-field.umd.js',
+    '@angular/material/grid-list': 'dist/bundles/material-grid-list.umd.js',
+    '@angular/material/icon': 'dist/bundles/material-icon.umd.js',
+    '@angular/material/input': 'dist/bundles/material-input.umd.js',
+    '@angular/material/list': 'dist/bundles/material-list.umd.js',
+    '@angular/material/menu': 'dist/bundles/material-menu.umd.js',
+    '@angular/material/paginator': 'dist/bundles/material-paginator.umd.js',
+    '@angular/material/progress-bar': 'dist/bundles/material-progress-bar.umd.js',
+    '@angular/material/progress-spinner': 'dist/bundles/material-progress-spinner.umd.js',
+    '@angular/material/radio': 'dist/bundles/material-radio.umd.js',
+    '@angular/material/select': 'dist/bundles/material-select.umd.js',
+    '@angular/material/sidenav': 'dist/bundles/material-sidenav.umd.js',
+    '@angular/material/slide-toggle': 'dist/bundles/material-slide-toggle.umd.js',
+    '@angular/material/slider': 'dist/bundles/material-slider.umd.js',
+    '@angular/material/snack-bar': 'dist/bundles/material-snack-bar.umd.js',
+    '@angular/material/sort': 'dist/bundles/material-sort.umd.js',
+    '@angular/material/stepper': 'dist/bundles/material-stepper.umd.js',
+    '@angular/material/table': 'dist/bundles/material-table.umd.js',
+    '@angular/material/tabs': 'dist/bundles/material-tabs.umd.js',
+    '@angular/material/toolbar': 'dist/bundles/material-toolbar.umd.js',
+    '@angular/material/tooltip': 'dist/bundles/material-tooltip.umd.js',
   },
   packages: {
     // Thirdparty barrels.
diff --git a/src/e2e-app/tsconfig-build.json b/src/e2e-app/tsconfig-build.json
index 8219cdac58c9..b7d368a5e3ea 100644
--- a/src/e2e-app/tsconfig-build.json
+++ b/src/e2e-app/tsconfig-build.json
@@ -24,8 +24,9 @@
     ],
     "baseUrl": ".",
     "paths": {
-      "@angular/material": ["./material"],
       "@angular/cdk/*": ["./cdk/*"],
+      "@angular/material": ["./material"],
+      "@angular/material/*": ["./material/*"],
       "@angular/material-examples": ["./material-examples"]
     }
   },
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
new file mode 100644
index 000000000000..ab108ba3a8f0
--- /dev/null
+++ b/src/e2e-app/tsconfig.json
@@ -0,0 +1,15 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/material/*": ["../lib/*"],
+      "@angular/material": ["../lib/public_api.ts"],
+      "@angular/material-examples": ["../material-examples/public_api.ts"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 7d3aca8621fa..972b78fe9823 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -6,6 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Directionality} from '@angular/cdk/bidi';
+import {DOWN_ARROW, ENTER, ESCAPE, UP_ARROW} from '@angular/cdk/keycodes';
+import {
+  ConnectedPositionStrategy,
+  Overlay,
+  OverlayRef,
+  OverlayState,
+  PositionStrategy,
+  RepositionScrollStrategy,
+  ScrollStrategy,
+} from '@angular/cdk/overlay';
+import {TemplatePortal} from '@angular/cdk/portal';
+import {filter, first, map, RxChain, switchMap} from '@angular/cdk/rxjs';
 import {
   ChangeDetectorRef,
   Directive,
@@ -21,30 +34,14 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
+import {MdOption, MdOptionSelectionChange} from '@angular/material/core';
+import {MdFormField} from '@angular/material/form-field';
 import {DOCUMENT} from '@angular/platform-browser';
-import {Directionality} from '@angular/cdk/bidi';
-import {filter, first, map, RxChain, switchMap} from '@angular/cdk/rxjs';
-import {
-  ConnectedPositionStrategy,
-  Overlay,
-  OverlayRef,
-  OverlayState,
-  PositionStrategy,
-  RepositionScrollStrategy,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  ScrollStrategy,
-} from '@angular/cdk/overlay';
-import {TemplatePortal} from '@angular/cdk/portal';
-import {DOWN_ARROW, ENTER, ESCAPE, UP_ARROW} from '@angular/cdk/keycodes';
 import {Observable} from 'rxjs/Observable';
-import {MdFormField} from '../form-field/index';
-import {Subscription} from 'rxjs/Subscription';
-import {merge} from 'rxjs/observable/merge';
 import {fromEvent} from 'rxjs/observable/fromEvent';
+import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
-import {MdOption, MdOptionSelectionChange} from '../core/option/option';
+import {Subscription} from 'rxjs/Subscription';
 import {MdAutocomplete} from './autocomplete';
 
 
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 01e940027f05..308382a9c0f9 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -25,9 +25,9 @@ import {
 } from './index';
 import {MdInputModule} from '../input/index';
 import {Subscription} from 'rxjs/Subscription';
-import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '../core/keyboard/keycodes';
-import {MdOption} from '../core/option/option';
-import {MdFormField, MdFormFieldModule} from '../form-field/index';
+import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/material/core';
+import {MdOption} from '@angular/material/core';
+import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index 3126485ea6e5..b8c7885d1b1c 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -21,7 +21,7 @@ import {
   EventEmitter,
   Output,
 } from '@angular/core';
-import {MdOption, MdOptgroup} from '../core';
+import {MdOption, MdOptgroup} from '@angular/material/core';
 import {ActiveDescendantKeyManager} from '@angular/cdk/a11y';
 
 
diff --git a/src/lib/autocomplete/index.ts b/src/lib/autocomplete/index.ts
index c5f09f6b83ac..f93e7c31d564 100644
--- a/src/lib/autocomplete/index.ts
+++ b/src/lib/autocomplete/index.ts
@@ -6,24 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {MdOptionModule, MdCommonModule} from '../core';
-import {MdAutocomplete} from './autocomplete';
-import {
-  MdAutocompleteTrigger,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
-} from './autocomplete-trigger';
-
-@NgModule({
-  imports: [MdOptionModule, OverlayModule, MdCommonModule, CommonModule],
-  exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
-  declarations: [MdAutocomplete, MdAutocompleteTrigger],
-  providers: [MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
-})
-export class MdAutocompleteModule {}
-
-
-export * from './autocomplete';
-export * from './autocomplete-trigger';
+export * from './public_api';
diff --git a/src/lib/autocomplete/public_api.ts b/src/lib/autocomplete/public_api.ts
new file mode 100644
index 000000000000..0f672a71b641
--- /dev/null
+++ b/src/lib/autocomplete/public_api.ts
@@ -0,0 +1,29 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {MdOptionModule, MdCommonModule} from '@angular/material/core';
+import {MdAutocomplete} from './autocomplete';
+import {
+  MdAutocompleteTrigger,
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
+} from './autocomplete-trigger';
+
+@NgModule({
+  imports: [MdOptionModule, OverlayModule, MdCommonModule, CommonModule],
+  exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
+  declarations: [MdAutocomplete, MdAutocompleteTrigger],
+  providers: [MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
+})
+export class MdAutocompleteModule {}
+
+
+export * from './autocomplete';
+export * from './autocomplete-trigger';
diff --git a/src/lib/autocomplete/tsconfig-build.json b/src/lib/autocomplete/tsconfig-build.json
new file mode 100644
index 000000000000..363a0a4837d6
--- /dev/null
+++ b/src/lib/autocomplete/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/autocomplete",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index f2fc081c5110..daa882984084 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -27,8 +27,8 @@ import {
 } from '@angular/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {UniqueSelectionDispatcher, FocusOriginMonitor} from '../core';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
+import {UniqueSelectionDispatcher, FocusOriginMonitor} from '@angular/material/core';
+import {CanDisable, mixinDisabled} from '@angular/material/core';
 
 /** Acceptable types for a button toggle. */
 export type ToggleType = 'checkbox' | 'radio';
diff --git a/src/lib/button-toggle/index.ts b/src/lib/button-toggle/index.ts
index adf987daf8b0..f93e7c31d564 100644
--- a/src/lib/button-toggle/index.ts
+++ b/src/lib/button-toggle/index.ts
@@ -6,27 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
-import {
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-  MdCommonModule,
-  StyleModule,
-} from '../core';
-
-
-@NgModule({
-  imports: [MdCommonModule, StyleModule],
-  exports: [
-    MdButtonToggleGroup,
-    MdButtonToggleGroupMultiple,
-    MdButtonToggle,
-    MdCommonModule,
-  ],
-  declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
-})
-export class MdButtonToggleModule {}
-
-
-export * from './button-toggle';
+export * from './public_api';
diff --git a/src/lib/button-toggle/public_api.ts b/src/lib/button-toggle/public_api.ts
new file mode 100644
index 000000000000..3b4ad6857692
--- /dev/null
+++ b/src/lib/button-toggle/public_api.ts
@@ -0,0 +1,32 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
+import {
+  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
+  MdCommonModule,
+  StyleModule,
+} from '@angular/material/core';
+
+
+@NgModule({
+  imports: [MdCommonModule, StyleModule],
+  exports: [
+    MdButtonToggleGroup,
+    MdButtonToggleGroupMultiple,
+    MdButtonToggle,
+    MdCommonModule,
+  ],
+  declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
+})
+export class MdButtonToggleModule {}
+
+
+export * from './button-toggle';
diff --git a/src/lib/button-toggle/tsconfig-build.json b/src/lib/button-toggle/tsconfig-build.json
new file mode 100644
index 000000000000..fadd13eed97c
--- /dev/null
+++ b/src/lib/button-toggle/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/button-toggle",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/button/button.spec.ts b/src/lib/button/button.spec.ts
index e1d7dc74e675..a7707a08d207 100644
--- a/src/lib/button/button.spec.ts
+++ b/src/lib/button/button.spec.ts
@@ -4,7 +4,7 @@ import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {FakeViewportRuler} from '@angular/cdk/testing';
 import {MdButtonModule} from './index';
-import {MdRipple} from '../core/ripple/index';
+import {MdRipple} from '@angular/material/core';
 
 
 describe('MdButton', () => {
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index e863c5e0fca0..1b69aa9f99f2 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -12,18 +12,23 @@ import {
   Directive,
   ElementRef,
   forwardRef,
+  Inject,
   OnDestroy,
   Optional,
   Renderer2,
   Self,
   ViewEncapsulation,
-  Inject,
 } from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {FocusOriginMonitor} from '../core';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {
+  CanColor,
+  CanDisable,
+  CanDisableRipple,
+  FocusOriginMonitor,
+  mixinColor,
+  mixinDisabled,
+  mixinDisableRipple
+} from '@angular/material/core';
 
 
 // TODO(kara): Convert attribute selectors to classes when attr maps become available
diff --git a/src/lib/button/index.ts b/src/lib/button/index.ts
index 07311f39bb7d..f93e7c31d564 100644
--- a/src/lib/button/index.ts
+++ b/src/lib/button/index.ts
@@ -6,48 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule, MdRippleModule, StyleModule} from '../core';
-import {
-  MdAnchor,
-  MdButton,
-  MdMiniFab,
-  MdButtonCssMatStyler,
-  MdFab,
-  MdIconButtonCssMatStyler,
-  MdRaisedButtonCssMatStyler
-} from './button';
-
-
-export * from './button';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdRippleModule,
-    MdCommonModule,
-    StyleModule,
-  ],
-  exports: [
-    MdButton,
-    MdAnchor,
-    MdMiniFab,
-    MdFab,
-    MdCommonModule,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
-  ],
-  declarations: [
-    MdButton,
-    MdAnchor,
-    MdMiniFab,
-    MdFab,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
-  ],
-})
-export class MdButtonModule {}
+export * from './public_api';
diff --git a/src/lib/button/public_api.ts b/src/lib/button/public_api.ts
new file mode 100644
index 000000000000..3cec824cd095
--- /dev/null
+++ b/src/lib/button/public_api.ts
@@ -0,0 +1,53 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule, MdRippleModule, StyleModule} from '@angular/material/core';
+import {
+  MdAnchor,
+  MdButton,
+  MdMiniFab,
+  MdButtonCssMatStyler,
+  MdFab,
+  MdIconButtonCssMatStyler,
+  MdRaisedButtonCssMatStyler
+} from './button';
+
+
+export * from './button';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdRippleModule,
+    MdCommonModule,
+    StyleModule,
+  ],
+  exports: [
+    MdButton,
+    MdAnchor,
+    MdMiniFab,
+    MdFab,
+    MdCommonModule,
+    MdButtonCssMatStyler,
+    MdRaisedButtonCssMatStyler,
+    MdIconButtonCssMatStyler,
+  ],
+  declarations: [
+    MdButton,
+    MdAnchor,
+    MdMiniFab,
+    MdFab,
+    MdButtonCssMatStyler,
+    MdRaisedButtonCssMatStyler,
+    MdIconButtonCssMatStyler,
+  ],
+})
+export class MdButtonModule {}
diff --git a/src/lib/button/tsconfig-build.json b/src/lib/button/tsconfig-build.json
new file mode 100644
index 000000000000..aa81fe018b36
--- /dev/null
+++ b/src/lib/button/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/button",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/card/index.ts b/src/lib/card/index.ts
index b6441d8bd9a9..f93e7c31d564 100644
--- a/src/lib/card/index.ts
+++ b/src/lib/card/index.ts
@@ -6,52 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '../core';
-import {
-  MdCard,
-  MdCardHeader,
-  MdCardTitleGroup,
-  MdCardContent,
-  MdCardTitle,
-  MdCardSubtitle,
-  MdCardActions,
-  MdCardFooter,
-  MdCardSmImage,
-  MdCardMdImage,
-  MdCardLgImage,
-  MdCardImage,
-  MdCardXlImage,
-  MdCardAvatar,
-} from './card';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [
-    MdCard,
-    MdCardHeader,
-    MdCardTitleGroup,
-    MdCardContent,
-    MdCardTitle,
-    MdCardSubtitle,
-    MdCardActions,
-    MdCardFooter,
-    MdCardSmImage,
-    MdCardMdImage,
-    MdCardLgImage,
-    MdCardImage,
-    MdCardXlImage,
-    MdCardAvatar,
-    MdCommonModule,
-  ],
-  declarations: [
-    MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
-    MdCardActions, MdCardFooter, MdCardSmImage, MdCardMdImage, MdCardLgImage, MdCardImage,
-    MdCardXlImage, MdCardAvatar,
-  ],
-})
-export class MdCardModule {}
-
-
-export * from './card';
+export * from './public_api';
diff --git a/src/lib/card/public_api.ts b/src/lib/card/public_api.ts
new file mode 100644
index 000000000000..986e21c4b3b0
--- /dev/null
+++ b/src/lib/card/public_api.ts
@@ -0,0 +1,57 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {
+  MdCard,
+  MdCardHeader,
+  MdCardTitleGroup,
+  MdCardContent,
+  MdCardTitle,
+  MdCardSubtitle,
+  MdCardActions,
+  MdCardFooter,
+  MdCardSmImage,
+  MdCardMdImage,
+  MdCardLgImage,
+  MdCardImage,
+  MdCardXlImage,
+  MdCardAvatar,
+} from './card';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [
+    MdCard,
+    MdCardHeader,
+    MdCardTitleGroup,
+    MdCardContent,
+    MdCardTitle,
+    MdCardSubtitle,
+    MdCardActions,
+    MdCardFooter,
+    MdCardSmImage,
+    MdCardMdImage,
+    MdCardLgImage,
+    MdCardImage,
+    MdCardXlImage,
+    MdCardAvatar,
+    MdCommonModule,
+  ],
+  declarations: [
+    MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
+    MdCardActions, MdCardFooter, MdCardSmImage, MdCardMdImage, MdCardLgImage, MdCardImage,
+    MdCardXlImage, MdCardAvatar,
+  ],
+})
+export class MdCardModule {}
+
+
+export * from './card';
diff --git a/src/lib/card/tsconfig-build.json b/src/lib/card/tsconfig-build.json
new file mode 100644
index 000000000000..c53fd82c5200
--- /dev/null
+++ b/src/lib/card/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/card",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
index 6abe20c65605..d6d829f37c0f 100644
--- a/src/lib/checkbox/checkbox.spec.ts
+++ b/src/lib/checkbox/checkbox.spec.ts
@@ -12,7 +12,7 @@ import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {MdCheckbox, MdCheckboxChange, MdCheckboxModule} from './index';
-import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
+import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
 
 
 describe('MdCheckbox', () => {
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index a243fc40e629..3ad31b7abdae 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -22,11 +23,19 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {FocusOrigin, FocusOriginMonitor, MdRipple, RippleRef} from '../core';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {
+  CanColor,
+  CanDisable,
+  CanDisableRipple,
+  FocusOrigin,
+  FocusOriginMonitor,
+  MdRipple,
+  mixinColor,
+  mixinDisabled,
+  mixinDisableRipple,
+  RippleRef,
+} from '@angular/material/core';
+
 
 // Increasing integer for generating unique ids for checkbox components.
 let nextUniqueId = 0;
diff --git a/src/lib/checkbox/index.ts b/src/lib/checkbox/index.ts
index 103b58e112df..f93e7c31d564 100644
--- a/src/lib/checkbox/index.ts
+++ b/src/lib/checkbox/index.ts
@@ -6,21 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {ObserversModule} from '@angular/cdk/observers';
-import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '../core';
-import {MdCheckbox} from './checkbox';
-import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
-
-@NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule],
-  exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
-  declarations: [MdCheckbox, MdCheckboxRequiredValidator],
-  providers: [FocusOriginMonitor]
-})
-export class MdCheckboxModule {}
-
-
-export * from './checkbox';
-export * from './checkbox-required-validator';
+export * from './public_api';
diff --git a/src/lib/checkbox/public_api.ts b/src/lib/checkbox/public_api.ts
new file mode 100644
index 000000000000..0b7668432b5c
--- /dev/null
+++ b/src/lib/checkbox/public_api.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {ObserversModule} from '@angular/cdk/observers';
+import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '@angular/material/core';
+import {MdCheckbox} from './checkbox';
+import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
+
+@NgModule({
+  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule],
+  exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
+  declarations: [MdCheckbox, MdCheckboxRequiredValidator],
+  providers: [FocusOriginMonitor]
+})
+export class MdCheckboxModule {}
+
+
+export * from './checkbox';
+export * from './checkbox-required-validator';
diff --git a/src/lib/checkbox/tsconfig-build.json b/src/lib/checkbox/tsconfig-build.json
new file mode 100644
index 000000000000..41f11c4177b9
--- /dev/null
+++ b/src/lib/checkbox/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/checkbox",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/chips/chip-input.spec.ts b/src/lib/chips/chip-input.spec.ts
index 513d7eaf5e5a..827edb24ffd1 100644
--- a/src/lib/chips/chip-input.spec.ts
+++ b/src/lib/chips/chip-input.spec.ts
@@ -3,10 +3,10 @@ import {MdChipsModule} from './index';
 import {Component, DebugElement} from '@angular/core';
 import {MdChipInput, MdChipInputEvent} from './chip-input';
 import {By} from '@angular/platform-browser';
-import {Directionality} from '../core';
+import {Directionality} from '@angular/material/core';
 import {createKeyboardEvent} from '@angular/cdk/testing';
 
-import {ENTER} from '../core/keyboard/keycodes';
+import {ENTER} from '@angular/material/core';
 
 const COMMA = 188;
 
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index a42f5e72d275..ed7ac8470e99 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -8,7 +8,7 @@
 
 import {Directive, Output, EventEmitter, ElementRef, Input} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {ENTER} from '../core/keyboard/keycodes';
+import {ENTER} from '@angular/material/core';
 import {MdChipList} from './chip-list';
 
 export interface MdChipInputEvent {
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index c069178ca499..1a080fb4f708 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -1,16 +1,23 @@
-import {async, ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing';
+import {FocusKeyManager} from '@angular/cdk/a11y';
+import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement, QueryList} from '@angular/core';
+import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {
+  BACKSPACE,
+  DELETE,
+  Directionality,
+  LEFT_ARROW,
+  RIGHT_ARROW,
+  TAB,
+} from '@angular/material/core';
+import {MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdChipList, MdChipsModule} from './index';
-import {FocusKeyManager} from '@angular/cdk/a11y';
-import {createKeyboardEvent} from '@angular/cdk/testing';
 
 import {MdInputModule} from '../input/index';
-import {LEFT_ARROW, RIGHT_ARROW, BACKSPACE, DELETE, TAB} from '../core/keyboard/keycodes';
-import {Directionality} from '../core';
-import {MdFormFieldModule} from '../form-field/index';
 import {MdChip} from './chip';
+import {MdChipList, MdChipsModule} from './index';
+
 
 describe('MdChipList', () => {
   let fixture: ComponentFixture<any>;
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 078fc1cd8e5d..2ce4e3e35043 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -22,7 +22,7 @@ import {
 
 import {MdChip} from './chip';
 import {FocusKeyManager} from '@angular/cdk/a11y';
-import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW} from '../core/keyboard/keycodes';
+import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW} from '@angular/material/core';
 import {Directionality} from '@angular/cdk/bidi';
 import {Subscription} from 'rxjs/Subscription';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
index 9565c178c56a..90c3bdfa873f 100644
--- a/src/lib/chips/chip.spec.ts
+++ b/src/lib/chips/chip.spec.ts
@@ -3,8 +3,8 @@ import {Component, DebugElement}  from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {createKeyboardEvent} from '@angular/cdk/testing';
 import {MdChipList, MdChip, MdChipEvent, MdChipsModule} from './index';
-import {SPACE, DELETE, BACKSPACE} from '../core/keyboard/keycodes';
-import {Directionality} from '../core';
+import {SPACE, DELETE, BACKSPACE} from '@angular/material/core';
+import {Directionality} from '@angular/material/core';
 
 describe('Chips', () => {
   let fixture: ComponentFixture<any>;
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index a0ec3bc28c5f..3a88bd516064 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -6,23 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusableOption} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
-  Directive,
   ContentChild,
+  Directive,
   ElementRef,
   EventEmitter,
+  forwardRef,
   Input,
   OnDestroy,
   Output,
   Renderer2,
-  forwardRef,
 } from '@angular/core';
+import {
+  BACKSPACE,
+  CanColor,
+  CanDisable,
+  DELETE,
+  mixinColor,
+  mixinDisabled,
+  SPACE,
+} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
-import {FocusableOption} from '../core/a11y/focus-key-manager';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
-import {SPACE, BACKSPACE, DELETE} from '../core/keyboard/keycodes';
 
 export interface MdChipEvent {
   chip: MdChip;
diff --git a/src/lib/chips/index.ts b/src/lib/chips/index.ts
index 7a3485835088..f93e7c31d564 100644
--- a/src/lib/chips/index.ts
+++ b/src/lib/chips/index.ts
@@ -6,18 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdChipList} from './chip-list';
-import {MdBasicChip, MdChip, MdChipRemove} from './chip';
-import {MdChipInput} from './chip-input';
-
-export * from './chip-list';
-export * from './chip';
-export * from './chip-input';
-
-@NgModule({
-  imports: [],
-  exports: [MdChipList, MdChip, MdChipInput, MdChipRemove, MdChipRemove, MdBasicChip],
-  declarations: [MdChipList, MdChip, MdChipInput, MdChipRemove,  MdChipRemove, MdBasicChip]
-})
-export class MdChipsModule {}
+export * from './public_api';
diff --git a/src/lib/chips/public_api.ts b/src/lib/chips/public_api.ts
new file mode 100644
index 000000000000..7a3485835088
--- /dev/null
+++ b/src/lib/chips/public_api.ts
@@ -0,0 +1,23 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdChipList} from './chip-list';
+import {MdBasicChip, MdChip, MdChipRemove} from './chip';
+import {MdChipInput} from './chip-input';
+
+export * from './chip-list';
+export * from './chip';
+export * from './chip-input';
+
+@NgModule({
+  imports: [],
+  exports: [MdChipList, MdChip, MdChipInput, MdChipRemove, MdChipRemove, MdBasicChip],
+  declarations: [MdChipList, MdChip, MdChipInput, MdChipRemove,  MdChipRemove, MdBasicChip]
+})
+export class MdChipsModule {}
diff --git a/src/lib/chips/tsconfig-build.json b/src/lib/chips/tsconfig-build.json
new file mode 100644
index 000000000000..1db61d5c0404
--- /dev/null
+++ b/src/lib/chips/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/chips",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/core.ts b/src/lib/core.ts
deleted file mode 100644
index 442e5925d59d..000000000000
--- a/src/lib/core.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export * from './core/index';
diff --git a/src/lib/core/common-behaviors/index.ts b/src/lib/core/common-behaviors/index.ts
index 93bd48368c36..80e6e0c694d1 100644
--- a/src/lib/core/common-behaviors/index.ts
+++ b/src/lib/core/common-behaviors/index.ts
@@ -6,4 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+export {MdCommonModule, MATERIAL_SANITY_CHECKS} from './common-module';
 export {CanDisable, mixinDisabled} from './disabled';
+export {CanColor, mixinColor, ThemePalette} from './color';
+export {CanDisableRipple, mixinDisableRipple} from './disable-ripple';
+export {HasTabIndex, mixinTabIndex} from './tabindex';
diff --git a/src/lib/core/core.ts b/src/lib/core/core.ts
deleted file mode 100644
index 4e480a79ca16..000000000000
--- a/src/lib/core/core.ts
+++ /dev/null
@@ -1,157 +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 {NgModule} from '@angular/core';
-import {A11yModule} from '@angular/cdk/a11y';
-import {BidiModule} from '@angular/cdk/bidi';
-import {ObserversModule} from '@angular/cdk/observers';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
-import {MdLineModule} from './line/line';
-import {MdOptionModule} from './option/index';
-import {MdPseudoCheckboxModule} from './selection/index';
-import {MdRippleModule} from './ripple/index';
-
-// Re-exports of the CDK to avoid breaking changes.
-export {
-  coerceBooleanProperty,
-  coerceNumberProperty,
-} from '@angular/cdk/coercion';
-
-export {
-  ObserversModule,
-  ObserveContent,
-} from '@angular/cdk/observers';
-
-export {
-  SelectionModel
-} from '@angular/cdk/collections';
-
-// RTL
-export {Dir, Direction, Directionality, BidiModule} from './bidi/index';
-
-export * from './option/index';
-
-// Portals
-export {
-  Portal,
-  PortalHost,
-  BasePortalHost,
-  ComponentPortal,
-  TemplatePortal
-} from './portal/portal';
-export {
-  PortalHostDirective,
-  TemplatePortalDirective,
-  PortalModule,
-} from './portal/portal-directives';
-export {DomPortalHost} from './portal/dom-portal-host';
-
-// Platform
-export * from '@angular/cdk/platform';
-
-// Overlay
-export * from '@angular/cdk/overlay';
-
-// Gestures
-export {GestureConfig} from './gestures/gesture-config';
-// Explicitly specify the interfaces which should be re-exported, because if everything
-// is re-exported, module bundlers may run into issues with treeshaking.
-export {HammerInput, HammerManager} from './gestures/gesture-annotations';
-
-// Ripple
-export * from './ripple/index';
-
-// a11y
-export {
-  AriaLivePoliteness,
-  LiveAnnouncer,
-  LIVE_ANNOUNCER_ELEMENT_TOKEN,
-  LIVE_ANNOUNCER_PROVIDER,
-  InteractivityChecker,
-  FocusTrap,
-  FocusTrapFactory,
-  FocusTrapDeprecatedDirective,
-  FocusTrapDirective,
-  isFakeMousedownFromScreenReader,
-  A11yModule,
-} from '@angular/cdk/a11y';
-
-export {
-  UniqueSelectionDispatcher,
-  UniqueSelectionDispatcherListener,
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-} from './coordination/unique-selection-dispatcher';
-
-export {MdLineModule, MdLine, MdLineSetter} from './line/line';
-
-// Style
-export * from './style/index';
-
-// Keybindings
-export * from './keyboard/keycodes';
-
-export * from './compatibility/compatibility';
-
-// Animation
-export * from './animation/animation';
-
-// Selection
-export * from './selection/index';
-
-// Compatibility
-export {CompatibilityModule, NoConflictStyleCompatibilityMode} from './compatibility/compatibility';
-
-// Common material module
-export {MdCommonModule, MATERIAL_SANITY_CHECKS} from './common-behaviors/common-module';
-
-// Datetime
-export * from './datetime/index';
-
-// Placeholder
-export {
-  FloatPlaceholderType,
-  PlaceholderOptions,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS
-} from './placeholder/placeholder-options';
-
-// Error
-export {
-  ErrorStateMatcher,
-  ErrorOptions,
-  MD_ERROR_GLOBAL_OPTIONS,
-  defaultErrorStateMatcher,
-  showOnDirtyErrorStateMatcher
-} from './error/error-options';
-
-/** @deprecated */
-@NgModule({
-  imports: [
-    MdLineModule,
-    BidiModule,
-    MdRippleModule,
-    ObserversModule,
-    PortalModule,
-    OverlayModule,
-    A11yModule,
-    MdOptionModule,
-    MdPseudoCheckboxModule,
-  ],
-  exports: [
-    MdLineModule,
-    BidiModule,
-    MdRippleModule,
-    ObserversModule,
-    PortalModule,
-    OverlayModule,
-    A11yModule,
-    MdOptionModule,
-    MdPseudoCheckboxModule,
-  ],
-})
-export class MdCoreModule {}
diff --git a/src/lib/core/index.ts b/src/lib/core/index.ts
index 60d0a63c1f2e..f93e7c31d564 100644
--- a/src/lib/core/index.ts
+++ b/src/lib/core/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './core';
+export * from './public_api';
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index e675ab468615..09730a275466 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -21,7 +21,7 @@ import {
 } from '@angular/core';
 import {ENTER, SPACE} from '../keyboard/keycodes';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {MATERIAL_COMPATIBILITY_MODE} from '../../core/compatibility/compatibility';
+import {MATERIAL_COMPATIBILITY_MODE} from '../compatibility/compatibility';
 import {MdOptgroup} from './optgroup';
 
 /**
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public_api.ts
new file mode 100644
index 000000000000..b13cbd5df890
--- /dev/null
+++ b/src/lib/core/public_api.ts
@@ -0,0 +1,36 @@
+/**
+ * @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
+ */
+
+export * from './a11y/index';
+export * from './animation/animation';
+export * from './bidi/index';
+export * from './common-behaviors/index';
+export * from './compatibility/compatibility';
+export * from './coordination/unique-selection-dispatcher';
+export * from './datetime/index';
+export * from './error/error-options';
+export * from './gestures/gesture-annotations';
+export * from './gestures/gesture-config';
+export * from './keyboard/keycodes';
+export * from './line/line';
+export * from './option/index';
+export * from './overlay/index';
+export * from './placeholder/placeholder-options';
+export * from './platform/index';
+export * from './portal/portal';
+export * from './portal/dom-portal-host';
+export * from './portal/portal-directives';
+export * from './portal/portal-injector';
+export * from './ripple/index';
+export * from './rxjs/index';
+export * from './selection/index';
+export * from './style/index';
+export * from './util/object-extend';
+
+// TODO: don't have this
+export * from './testing/month-constants';
diff --git a/src/lib/core/tsconfig-build.json b/src/lib/core/tsconfig-build.json
new file mode 100644
index 000000000000..e053dfc9fea7
--- /dev/null
+++ b/src/lib/core/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/core",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/datepicker/calendar.spec.ts b/src/lib/datepicker/calendar.spec.ts
index 72ac3cd423a9..867a44c7616a 100644
--- a/src/lib/datepicker/calendar.spec.ts
+++ b/src/lib/datepicker/calendar.spec.ts
@@ -16,12 +16,12 @@ import {
   PAGE_UP,
   RIGHT_ARROW,
   UP_ARROW
-} from '../core/keyboard/keycodes';
+} from '@angular/material/core';
 import {MdDatepickerIntl} from './datepicker-intl';
-import {MdNativeDateModule} from '../core/datetime/index';
-import {NoConflictStyleCompatibilityMode} from '../core';
+import {MdNativeDateModule} from '@angular/material/core';
+import {NoConflictStyleCompatibilityMode} from '@angular/material/core';
 import {MdButtonModule} from '../button/index';
-import {AUG, DEC, FEB, JAN, JUL, NOV, MAR, MAY, JUN, SEP} from '../core/testing/month-constants';
+import {AUG, DEC, FEB, JAN, JUL, NOV, MAR, MAY, JUN, SEP} from '@angular/material/core';
 
 describe('MdCalendar', () => {
   beforeEach(async(() => {
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index a434e9c0b52d..fd4cb3f5fa1f 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -6,39 +6,42 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {
+  DOWN_ARROW,
+  END,
+  ENTER,
+  HOME,
+  LEFT_ARROW,
+  PAGE_DOWN,
+  PAGE_UP,
+  RIGHT_ARROW,
+  UP_ARROW,
+} from '@angular/cdk/keycodes';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ElementRef,
   EventEmitter,
   Inject,
   Input,
   NgZone,
+  OnDestroy,
   Optional,
   Output,
   ViewEncapsulation,
-  ChangeDetectorRef,
-  OnDestroy,
 } from '@angular/core';
 import {
-  DOWN_ARROW,
-  END,
-  ENTER,
-  HOME,
-  LEFT_ARROW,
-  PAGE_DOWN,
-  PAGE_UP,
-  RIGHT_ARROW,
-  UP_ARROW
-} from '../core/keyboard/keycodes';
-import {DateAdapter} from '../core/datetime/index';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {createMissingDateImplError} from './datepicker-errors';
-import {MD_DATE_FORMATS, MdDateFormats} from '../core/datetime/date-formats';
-import {MATERIAL_COMPATIBILITY_MODE} from '../core';
-import {first} from '../core/rxjs/index';
+  DateAdapter,
+  MATERIAL_COMPATIBILITY_MODE,
+  MD_DATE_FORMATS,
+  MdDateFormats,
+} from '@angular/material/core';
+import {first} from 'rxjs/operator/first';
 import {Subscription} from 'rxjs/Subscription';
+import {createMissingDateImplError} from './datepicker-errors';
+import {MdDatepickerIntl} from './datepicker-intl';
 
 
 /**
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index f44fac9d8f90..ab16cdf850b4 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {DOWN_ARROW} from '@angular/cdk/keycodes';
 import {
   AfterContentInit,
   Directive,
@@ -17,9 +19,8 @@ import {
   OnDestroy,
   Optional,
   Output,
-  Renderer2
+  Renderer2,
 } from '@angular/core';
-import {MdDatepicker} from './datepicker';
 import {
   AbstractControl,
   ControlValueAccessor,
@@ -28,15 +29,13 @@ import {
   ValidationErrors,
   Validator,
   ValidatorFn,
-  Validators
+  Validators,
 } from '@angular/forms';
+import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
+import {MdFormField} from '@angular/material/form-field';
 import {Subscription} from 'rxjs/Subscription';
-import {MdFormField} from '../form-field/index';
-import {DOWN_ARROW} from '../core/keyboard/keycodes';
-import {DateAdapter} from '../core/datetime/index';
+import {MdDatepicker} from './datepicker';
 import {createMissingDateImplError} from './datepicker-errors';
-import {MD_DATE_FORMATS, MdDateFormats} from '../core/datetime/date-formats';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
 
 export const MD_DATEPICKER_VALUE_ACCESSOR: any = {
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 02158c0bbc6c..c488d6492710 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -1,21 +1,30 @@
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {OverlayContainer} from '@angular/cdk/overlay';
+import {
+  createKeyboardEvent,
+  dispatchEvent,
+  dispatchFakeEvent,
+  dispatchMouseEvent,
+} from '@angular/cdk/testing';
 import {Component, ViewChild} from '@angular/core';
-import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
-import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {
+  DEC,
+  JAN,
+  MAT_DATE_LOCALE,
+  MdNativeDateModule,
+  NativeDateModule,
+  SEP,
+} from '@angular/material/core';
+import {MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
-import {OverlayContainer} from '@angular/cdk/overlay';
-import {ESCAPE} from '@angular/cdk/keycodes';
-import {dispatchFakeEvent, dispatchMouseEvent} from '@angular/cdk/testing';
-import {MdDatepickerModule, MdDatepickerIntl} from './index';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {MdInputModule} from '../input/index';
 import {MdDatepicker} from './datepicker';
 import {MdDatepickerInput} from './datepicker-input';
-import {MdInputModule} from '../input/index';
-import {MdNativeDateModule} from '../core/datetime/index';
-import {DEC, JAN, SEP} from '../core/testing/month-constants';
-import {createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
-import {MdFormFieldModule} from '../form-field/index';
-import {MAT_DATE_LOCALE} from '../core/datetime/date-adapter';
-import {NativeDateModule} from '../core/datetime/index';
+import {MdDatepickerIntl, MdDatepickerModule} from './index';
+
 
 describe('MdDatepicker', () => {
   afterEach(inject([OverlayContainer], (container: OverlayContainer) => {
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 594b5e7bd6bf..df5c6190499e 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -6,6 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {
+  Overlay,
+  OverlayRef,
+  OverlayState,
+  PositionStrategy,
+  RepositionScrollStrategy,
+  ScrollStrategy,
+} from '@angular/cdk/overlay';
+import {ComponentPortal} from '@angular/cdk/portal';
+import {first} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -23,31 +36,14 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
+import {DateAdapter} from '@angular/material/core';
+import {MdDialog, MdDialogRef} from '@angular/material/dialog';
 import {DOCUMENT} from '@angular/platform-browser';
-import {first} from '@angular/cdk/rxjs';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {
-  Overlay,
-  OverlayRef,
-  OverlayState,
-  PositionStrategy,
-  RepositionScrollStrategy,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  ScrollStrategy,
-} from '@angular/cdk/overlay';
-import {ComponentPortal} from '@angular/cdk/portal';
-import {Directionality} from '@angular/cdk/bidi';
-import {ESCAPE} from '@angular/cdk/keycodes';
-import {MdDialog} from '../dialog/dialog';
-import {MdDialogRef} from '../dialog/dialog-ref';
-import {MdDatepickerInput} from './datepicker-input';
-import {Subscription} from 'rxjs/Subscription';
 import {Subject} from 'rxjs/Subject';
-import {DateAdapter} from '../core/datetime/index';
-import {createMissingDateImplError} from './datepicker-errors';
+import {Subscription} from 'rxjs/Subscription';
 import {MdCalendar} from './calendar';
+import {createMissingDateImplError} from './datepicker-errors';
+import {MdDatepickerInput} from './datepicker-input';
 
 
 /** Used to generate a unique ID for each datepicker instance. */
diff --git a/src/lib/datepicker/index.ts b/src/lib/datepicker/index.ts
index e66a1a81b7c6..f93e7c31d564 100644
--- a/src/lib/datepicker/index.ts
+++ b/src/lib/datepicker/index.ts
@@ -6,74 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdMonthView} from './month-view';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {A11yModule} from '@angular/cdk/a11y';
-import {StyleModule} from '../core';
-import {MdCalendarBody} from './calendar-body';
-import {MdYearView} from './year-view';
-import {
-  MdDatepicker,
-  MdDatepickerContent,
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-} from './datepicker';
-import {MdDatepickerInput} from './datepicker-input';
-import {MdDialogModule} from '../dialog/index';
-import {MdCalendar} from './calendar';
-import {MdDatepickerToggle} from './datepicker-toggle';
-import {MdButtonModule} from '../button/index';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdIconModule} from '../icon/index';
-
-
-export * from './calendar';
-export * from './calendar-body';
-export * from './datepicker';
-export * from './datepicker-input';
-export * from './datepicker-intl';
-export * from './datepicker-toggle';
-export * from './month-view';
-export * from './year-view';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdButtonModule,
-    MdDialogModule,
-    MdIconModule,
-    OverlayModule,
-    StyleModule,
-    A11yModule,
-  ],
-  exports: [
-    MdCalendar,
-    MdCalendarBody,
-    MdDatepicker,
-    MdDatepickerContent,
-    MdDatepickerInput,
-    MdDatepickerToggle,
-    MdMonthView,
-    MdYearView,
-  ],
-  declarations: [
-    MdCalendar,
-    MdCalendarBody,
-    MdDatepicker,
-    MdDatepickerContent,
-    MdDatepickerInput,
-    MdDatepickerToggle,
-    MdMonthView,
-    MdYearView,
-  ],
-  providers: [
-    MdDatepickerIntl,
-    MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-  ],
-  entryComponents: [
-    MdDatepickerContent,
-  ]
-})
-export class MdDatepickerModule {}
+export * from './public_api';
diff --git a/src/lib/datepicker/month-view.spec.ts b/src/lib/datepicker/month-view.spec.ts
index 224dd0ce0b8b..8b97849a85e8 100644
--- a/src/lib/datepicker/month-view.spec.ts
+++ b/src/lib/datepicker/month-view.spec.ts
@@ -3,8 +3,8 @@ import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {MdMonthView} from './month-view';
 import {MdCalendarBody} from './calendar-body';
-import {MdNativeDateModule} from '../core/datetime/index';
-import {JAN, MAR} from '../core/testing/month-constants';
+import {MdNativeDateModule} from '@angular/material/core';
+import {JAN, MAR} from '@angular/material/core';
 
 describe('MdMonthView', () => {
   beforeEach(async(() => {
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index dcae6a54f400..379d2edc1c18 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -15,12 +15,11 @@ import {
   Input,
   Optional,
   Output,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
 import {MdCalendarCell} from './calendar-body';
-import {DateAdapter} from '../core/datetime/index';
 import {createMissingDateImplError} from './datepicker-errors';
-import {MD_DATE_FORMATS, MdDateFormats} from '../core/datetime/date-formats';
 
 
 const DAYS_PER_WEEK = 7;
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public_api.ts
new file mode 100644
index 000000000000..825e9a14e1cd
--- /dev/null
+++ b/src/lib/datepicker/public_api.ts
@@ -0,0 +1,79 @@
+/**
+ * @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 {A11yModule} from '@angular/cdk/a11y';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdButtonModule} from '@angular/material/button';
+import {StyleModule} from '@angular/material/core';
+import {MdDialogModule} from '@angular/material/dialog';
+import {MdIconModule} from '@angular/material/icon';
+import {MdCalendar} from './calendar';
+import {MdCalendarBody} from './calendar-body';
+import {
+  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  MdDatepicker,
+  MdDatepickerContent,
+} from './datepicker';
+import {MdDatepickerInput} from './datepicker-input';
+import {MdDatepickerIntl} from './datepicker-intl';
+import {MdDatepickerToggle} from './datepicker-toggle';
+import {MdMonthView} from './month-view';
+import {MdYearView} from './year-view';
+
+
+export * from './calendar';
+export * from './calendar-body';
+export * from './datepicker';
+export * from './datepicker-input';
+export * from './datepicker-intl';
+export * from './datepicker-toggle';
+export * from './month-view';
+export * from './year-view';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdButtonModule,
+    MdDialogModule,
+    MdIconModule,
+    OverlayModule,
+    StyleModule,
+    A11yModule,
+  ],
+  exports: [
+    MdCalendar,
+    MdCalendarBody,
+    MdDatepicker,
+    MdDatepickerContent,
+    MdDatepickerInput,
+    MdDatepickerToggle,
+    MdMonthView,
+    MdYearView,
+  ],
+  declarations: [
+    MdCalendar,
+    MdCalendarBody,
+    MdDatepicker,
+    MdDatepickerContent,
+    MdDatepickerInput,
+    MdDatepickerToggle,
+    MdMonthView,
+    MdYearView,
+  ],
+  providers: [
+    MdDatepickerIntl,
+    MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  ],
+  entryComponents: [
+    MdDatepickerContent,
+  ]
+})
+export class MdDatepickerModule {}
diff --git a/src/lib/datepicker/tsconfig-build.json b/src/lib/datepicker/tsconfig-build.json
new file mode 100644
index 000000000000..97ca0946f88a
--- /dev/null
+++ b/src/lib/datepicker/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/datepicker",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/datepicker/year-view.spec.ts b/src/lib/datepicker/year-view.spec.ts
index f44ec3ac9f91..ee68a91e7134 100644
--- a/src/lib/datepicker/year-view.spec.ts
+++ b/src/lib/datepicker/year-view.spec.ts
@@ -3,8 +3,8 @@ import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {MdYearView} from './year-view';
 import {MdCalendarBody} from './calendar-body';
-import {MdNativeDateModule} from '../core/datetime/index';
-import {FEB, JAN, JUL, JUN, MAR} from '../core/testing/month-constants';
+import {MdNativeDateModule} from '@angular/material/core';
+import {FEB, JAN, JUL, JUN, MAR} from '@angular/material/core';
 
 describe('MdYearView', () => {
   beforeEach(async(() => {
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index e382b1a17d65..81560fbf93ee 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -15,12 +15,11 @@ import {
   Input,
   Optional,
   Output,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
 import {MdCalendarCell} from './calendar-body';
-import {DateAdapter} from '../core/datetime/index';
 import {createMissingDateImplError} from './datepicker-errors';
-import {MD_DATE_FORMATS, MdDateFormats} from '../core/datetime/date-formats';
 
 
 /**
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index a398f3dde736..86865578919c 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -6,6 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {
+  BlockScrollStrategy,
+  Overlay,
+  OverlayRef,
+  OverlayState,
+  ScrollStrategy,
+} from '@angular/cdk/overlay';
+import {ComponentPortal, ComponentType, TemplatePortal} from '@angular/cdk/portal';
+import {startWith} from '@angular/cdk/rxjs';
+import {Location} from '@angular/common';
 import {
   ComponentRef,
   Inject,
@@ -16,28 +27,13 @@ import {
   SkipSelf,
   TemplateRef,
 } from '@angular/core';
-import {Location} from '@angular/common';
-import {ComponentPortal, ComponentType, TemplatePortal} from '@angular/cdk/portal';
-import {
-  BlockScrollStrategy,
-  Overlay,
-  OverlayRef,
-  OverlayState,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  ScrollStrategy,
-} from '@angular/cdk/overlay';
-import {ESCAPE} from '@angular/cdk/keycodes';
-import {startWith} from '@angular/cdk/rxjs';
+import {extendObject, PortalInjector} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
 import {defer} from 'rxjs/observable/defer';
-import {PortalInjector} from '../core/portal/portal-injector';
-import {extendObject} from '../core/util/object-extend';
+import {Subject} from 'rxjs/Subject';
 import {MdDialogConfig} from './dialog-config';
-import {MdDialogRef} from './dialog-ref';
 import {MdDialogContainer} from './dialog-container';
+import {MdDialogRef} from './dialog-ref';
 
 export const MD_DIALOG_DATA = new InjectionToken<any>('MdDialogData');
 
diff --git a/src/lib/dialog/index.ts b/src/lib/dialog/index.ts
index ea9468cb3ae7..f93e7c31d564 100644
--- a/src/lib/dialog/index.ts
+++ b/src/lib/dialog/index.ts
@@ -6,55 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
-import {A11yModule} from '@angular/cdk/a11y';
-import {MdCommonModule} from '../core';
-import {MdDialog, MD_DIALOG_SCROLL_STRATEGY_PROVIDER} from './dialog';
-import {MdDialogContainer} from './dialog-container';
-import {
-  MdDialogClose,
-  MdDialogContent,
-  MdDialogTitle,
-  MdDialogActions
-} from './dialog-content-directives';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    OverlayModule,
-    PortalModule,
-    A11yModule,
-    MdCommonModule,
-  ],
-  exports: [
-    MdDialogContainer,
-    MdDialogClose,
-    MdDialogTitle,
-    MdDialogContent,
-    MdDialogActions,
-    MdCommonModule,
-  ],
-  declarations: [
-    MdDialogContainer,
-    MdDialogClose,
-    MdDialogTitle,
-    MdDialogActions,
-    MdDialogContent,
-  ],
-  providers: [
-    MdDialog,
-    MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
-  ],
-  entryComponents: [MdDialogContainer],
-})
-export class MdDialogModule {}
-
-export * from './dialog';
-export * from './dialog-container';
-export * from './dialog-content-directives';
-export * from './dialog-config';
-export * from './dialog-ref';
+export * from './public_api';
diff --git a/src/lib/dialog/public_api.ts b/src/lib/dialog/public_api.ts
new file mode 100644
index 000000000000..39b5352d1ae2
--- /dev/null
+++ b/src/lib/dialog/public_api.ts
@@ -0,0 +1,60 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {PortalModule} from '@angular/cdk/portal';
+import {A11yModule} from '@angular/cdk/a11y';
+import {MdCommonModule} from '@angular/material/core';
+import {MdDialog, MD_DIALOG_SCROLL_STRATEGY_PROVIDER} from './dialog';
+import {MdDialogContainer} from './dialog-container';
+import {
+  MdDialogClose,
+  MdDialogContent,
+  MdDialogTitle,
+  MdDialogActions
+} from './dialog-content-directives';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    OverlayModule,
+    PortalModule,
+    A11yModule,
+    MdCommonModule,
+  ],
+  exports: [
+    MdDialogContainer,
+    MdDialogClose,
+    MdDialogTitle,
+    MdDialogContent,
+    MdDialogActions,
+    MdCommonModule,
+  ],
+  declarations: [
+    MdDialogContainer,
+    MdDialogClose,
+    MdDialogTitle,
+    MdDialogActions,
+    MdDialogContent,
+  ],
+  providers: [
+    MdDialog,
+    MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
+  ],
+  entryComponents: [MdDialogContainer],
+})
+export class MdDialogModule {}
+
+export * from './dialog';
+export * from './dialog-container';
+export * from './dialog-content-directives';
+export * from './dialog-config';
+export * from './dialog-ref';
diff --git a/src/lib/dialog/tsconfig-build.json b/src/lib/dialog/tsconfig-build.json
new file mode 100644
index 000000000000..09c13c1babf8
--- /dev/null
+++ b/src/lib/dialog/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/dialog",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/expansion/accordion-item.ts b/src/lib/expansion/accordion-item.ts
index 9354782b7b38..a1a83054aa29 100644
--- a/src/lib/expansion/accordion-item.ts
+++ b/src/lib/expansion/accordion-item.ts
@@ -15,7 +15,7 @@ import {
   Optional,
   ChangeDetectorRef,
 } from '@angular/core';
-import {UniqueSelectionDispatcher} from '../core';
+import {UniqueSelectionDispatcher} from '@angular/material/core';
 import {CdkAccordion} from './accordion';
 
 /** Used to generate unique ID for each expansion panel. */
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 05cc1a2d71b2..d6657d751331 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -25,10 +25,10 @@ import {
   transition,
   animate,
 } from '@angular/animations';
-import {SPACE, ENTER} from '../core/keyboard/keycodes';
+import {SPACE, ENTER} from '@angular/material/core';
 import {MdExpansionPanel, EXPANSION_PANEL_ANIMATION_TIMING} from './expansion-panel';
-import {filter} from '../core/rxjs/index';
-import {FocusOriginMonitor} from '../core/style/index';
+import {filter} from '@angular/material/core';
+import {FocusOriginMonitor} from '@angular/material/core';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
 
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 7ca383bc3f49..8b76f72970ec 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -6,32 +6,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, state, style, transition, trigger} from '@angular/animations';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   Directive,
+  forwardRef,
   Host,
   Input,
-  ViewEncapsulation,
-  Optional,
-  forwardRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  SimpleChanges,
   OnChanges,
   OnDestroy,
+  Optional,
+  SimpleChanges,
+  ViewEncapsulation,
 } from '@angular/core';
-import {
-  trigger,
-  state,
-  style,
-  transition,
-  animate,
-} from '@angular/animations';
+import {CanDisable, mixinDisabled, UniqueSelectionDispatcher} from '@angular/material/core';
+import {Subject} from 'rxjs/Subject';
 import {MdAccordion} from './accordion';
 import {AccordionItem} from './accordion-item';
-import {UniqueSelectionDispatcher} from '../core';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
-import {Subject} from 'rxjs/Subject';
+
 
 // Boilerplate for applying mixins to MdExpansionPanel.
 /** @docs-private */
diff --git a/src/lib/expansion/index.ts b/src/lib/expansion/index.ts
index 0f6b43b2a946..f93e7c31d564 100644
--- a/src/lib/expansion/index.ts
+++ b/src/lib/expansion/index.ts
@@ -6,60 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {CompatibilityModule, StyleModule, UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '../core';
-import {
-  MdExpansionPanelHeader,
-  MdExpansionPanelDescription,
-  MdExpansionPanelTitle
-} from './expansion-panel-header';
-import {
-  MdExpansionPanel,
-  MdExpansionPanelActionRow,
-} from './expansion-panel';
-import {
-  CdkAccordion,
-  MdAccordion,
-} from './accordion';
-
-@NgModule({
-  imports: [CompatibilityModule, CommonModule, StyleModule],
-  exports: [
-    CdkAccordion,
-    MdAccordion,
-    MdExpansionPanel,
-    MdExpansionPanelActionRow,
-    MdExpansionPanelHeader,
-    MdExpansionPanelTitle,
-    MdExpansionPanelDescription
-  ],
-  declarations: [
-    CdkAccordion,
-    MdAccordion,
-    MdExpansionPanel,
-    MdExpansionPanelActionRow,
-    MdExpansionPanelHeader,
-    MdExpansionPanelTitle,
-    MdExpansionPanelDescription
-  ],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
-})
-export class MdExpansionModule {}
-
-export {
-  CdkAccordion,
-  MdAccordion,
-  MdAccordionDisplayMode
-} from './accordion';
-export {AccordionItem} from './accordion-item';
-export {
-  MdExpansionPanel,
-  MdExpansionPanelState,
-  MdExpansionPanelActionRow
-} from './expansion-panel';
-export {
-  MdExpansionPanelHeader,
-  MdExpansionPanelDescription,
-  MdExpansionPanelTitle
-} from './expansion-panel-header';
+export * from './public_api';
diff --git a/src/lib/expansion/public_api.ts b/src/lib/expansion/public_api.ts
new file mode 100644
index 000000000000..aea8a512c2f0
--- /dev/null
+++ b/src/lib/expansion/public_api.ts
@@ -0,0 +1,65 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {
+  CompatibilityModule,
+  StyleModule,
+  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
+} from '@angular/material/core';
+import {CdkAccordion, MdAccordion} from './accordion';
+import {MdExpansionPanel, MdExpansionPanelActionRow} from './expansion-panel';
+import {
+  MdExpansionPanelDescription,
+  MdExpansionPanelHeader,
+  MdExpansionPanelTitle,
+} from './expansion-panel-header';
+
+
+@NgModule({
+  imports: [CompatibilityModule, CommonModule, StyleModule],
+  exports: [
+    CdkAccordion,
+    MdAccordion,
+    MdExpansionPanel,
+    MdExpansionPanelActionRow,
+    MdExpansionPanelHeader,
+    MdExpansionPanelTitle,
+    MdExpansionPanelDescription
+  ],
+  declarations: [
+    CdkAccordion,
+    MdAccordion,
+    MdExpansionPanel,
+    MdExpansionPanelActionRow,
+    MdExpansionPanelHeader,
+    MdExpansionPanelTitle,
+    MdExpansionPanelDescription
+  ],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
+})
+export class MdExpansionModule {}
+
+export {
+  CdkAccordion,
+  MdAccordion,
+  MdAccordionDisplayMode
+} from './accordion';
+export {AccordionItem} from './accordion-item';
+export {
+  MdExpansionPanel,
+  MdExpansionPanelState,
+  MdExpansionPanelActionRow
+} from './expansion-panel';
+export {
+  MdExpansionPanelHeader,
+  MdExpansionPanelDescription,
+  MdExpansionPanelTitle
+} from './expansion-panel-header';
+
diff --git a/src/lib/expansion/tsconfig-build.json b/src/lib/expansion/tsconfig-build.json
new file mode 100644
index 000000000000..e8334a21f70b
--- /dev/null
+++ b/src/lib/expansion/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/expansion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index bf545b58453d..e986fd30d8b2 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -6,6 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, state, style, transition, trigger} from '@angular/animations';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {first, startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentChecked,
   AfterContentInit,
@@ -23,26 +26,23 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {animate, state, style, transition, trigger} from '@angular/animations';
-import {coerceBooleanProperty} from '../core';
-import {
-  getMdFormFieldDuplicatedHintError,
-  getMdFormFieldMissingControlError,
-  getMdFormFieldPlaceholderConflictError,
-} from './form-field-errors';
 import {
   FloatPlaceholderType,
   MD_PLACEHOLDER_GLOBAL_OPTIONS,
-  PlaceholderOptions
-} from '../core/placeholder/placeholder-options';
-import {startWith, first} from '@angular/cdk/rxjs';
+  PlaceholderOptions,
+} from '@angular/material/core';
+import {fromEvent} from 'rxjs/observable/fromEvent';
 import {MdError} from './error';
 import {MdFormFieldControl} from './form-field-control';
+import {
+  getMdFormFieldDuplicatedHintError,
+  getMdFormFieldMissingControlError,
+  getMdFormFieldPlaceholderConflictError,
+} from './form-field-errors';
 import {MdHint} from './hint';
 import {MdPlaceholder} from './placeholder';
 import {MdPrefix} from './prefix';
 import {MdSuffix} from './suffix';
-import {fromEvent} from 'rxjs/observable/fromEvent';
 
 
 let nextUniqueId = 0;
diff --git a/src/lib/form-field/index.ts b/src/lib/form-field/index.ts
index 71d8b6164677..f93e7c31d564 100644
--- a/src/lib/form-field/index.ts
+++ b/src/lib/form-field/index.ts
@@ -6,48 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdError} from './error';
-import {MdFormField} from './form-field';
-import {MdHint} from './hint';
-import {MdPlaceholder} from './placeholder';
-import {MdPrefix} from './prefix';
-import {MdSuffix} from './suffix';
-import {CommonModule} from '@angular/common';
-import {PlatformModule} from '../core/platform/index';
-
-
-@NgModule({
-  declarations: [
-    MdError,
-    MdHint,
-    MdFormField,
-    MdPlaceholder,
-    MdPrefix,
-    MdSuffix,
-  ],
-  imports: [
-    CommonModule,
-    PlatformModule,
-  ],
-  exports: [
-    MdError,
-    MdHint,
-    MdFormField,
-    MdPlaceholder,
-    MdPrefix,
-    MdSuffix,
-  ],
-})
-export class MdFormFieldModule {}
-
-
-export * from './error';
-export * from './form-field';
-export * from './form-field-control';
-export * from './form-field-errors';
-export * from './hint';
-export * from './placeholder';
-export * from './prefix';
-export * from './suffix';
-
+export * from './public_api';
diff --git a/src/lib/form-field/public_api.ts b/src/lib/form-field/public_api.ts
new file mode 100644
index 000000000000..eb3047954a48
--- /dev/null
+++ b/src/lib/form-field/public_api.ts
@@ -0,0 +1,53 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdError} from './error';
+import {MdFormField} from './form-field';
+import {MdHint} from './hint';
+import {MdPlaceholder} from './placeholder';
+import {MdPrefix} from './prefix';
+import {MdSuffix} from './suffix';
+import {CommonModule} from '@angular/common';
+import {PlatformModule} from '@angular/material/core';
+
+
+@NgModule({
+  declarations: [
+    MdError,
+    MdHint,
+    MdFormField,
+    MdPlaceholder,
+    MdPrefix,
+    MdSuffix,
+  ],
+  imports: [
+    CommonModule,
+    PlatformModule,
+  ],
+  exports: [
+    MdError,
+    MdHint,
+    MdFormField,
+    MdPlaceholder,
+    MdPrefix,
+    MdSuffix,
+  ],
+})
+export class MdFormFieldModule {}
+
+
+export * from './error';
+export * from './form-field';
+export * from './form-field-control';
+export * from './form-field-errors';
+export * from './hint';
+export * from './placeholder';
+export * from './prefix';
+export * from './suffix';
+
diff --git a/src/lib/form-field/tsconfig-build.json b/src/lib/form-field/tsconfig-build.json
new file mode 100644
index 000000000000..b140fb2b357e
--- /dev/null
+++ b/src/lib/form-field/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/form-field",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index d2f57a9ef46a..72b1d9427ca6 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -18,7 +18,7 @@ import {
   Directive,
   ChangeDetectionStrategy,
 } from '@angular/core';
-import {MdLine, MdLineSetter} from '../core';
+import {MdLine, MdLineSetter} from '@angular/material/core';
 import {coerceToNumber} from './grid-list-measure';
 
 @Component({
diff --git a/src/lib/grid-list/index.ts b/src/lib/grid-list/index.ts
index 66e84f2b73cb..f93e7c31d564 100644
--- a/src/lib/grid-list/index.ts
+++ b/src/lib/grid-list/index.ts
@@ -6,38 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdLineModule, MdCommonModule} from '../core';
-import {
-  MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
-  MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
-} from './grid-tile';
-import {MdGridList} from './grid-list';
-
-
-@NgModule({
-  imports: [MdLineModule, MdCommonModule],
-  exports: [
-    MdGridList,
-    MdGridTile,
-    MdGridTileText,
-    MdLineModule,
-    MdCommonModule,
-    MdGridTileHeaderCssMatStyler,
-    MdGridTileFooterCssMatStyler,
-    MdGridAvatarCssMatStyler
-  ],
-  declarations: [
-    MdGridList,
-    MdGridTile,
-    MdGridTileText,
-    MdGridTileHeaderCssMatStyler,
-    MdGridTileFooterCssMatStyler,
-    MdGridAvatarCssMatStyler
-  ],
-})
-export class MdGridListModule {}
-
-
-export * from './grid-list';
-export {MdGridTile} from './grid-tile';
+export * from './public_api';
diff --git a/src/lib/grid-list/public_api.ts b/src/lib/grid-list/public_api.ts
new file mode 100644
index 000000000000..78917c713df4
--- /dev/null
+++ b/src/lib/grid-list/public_api.ts
@@ -0,0 +1,43 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdLineModule, MdCommonModule} from '@angular/material/core';
+import {
+  MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
+  MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
+} from './grid-tile';
+import {MdGridList} from './grid-list';
+
+
+@NgModule({
+  imports: [MdLineModule, MdCommonModule],
+  exports: [
+    MdGridList,
+    MdGridTile,
+    MdGridTileText,
+    MdLineModule,
+    MdCommonModule,
+    MdGridTileHeaderCssMatStyler,
+    MdGridTileFooterCssMatStyler,
+    MdGridAvatarCssMatStyler
+  ],
+  declarations: [
+    MdGridList,
+    MdGridTile,
+    MdGridTileText,
+    MdGridTileHeaderCssMatStyler,
+    MdGridTileFooterCssMatStyler,
+    MdGridAvatarCssMatStyler
+  ],
+})
+export class MdGridListModule {}
+
+
+export * from './grid-list';
+export {MdGridTile} from './grid-tile';
diff --git a/src/lib/grid-list/tsconfig-build.json b/src/lib/grid-list/tsconfig-build.json
new file mode 100644
index 000000000000..16701dc99e35
--- /dev/null
+++ b/src/lib/grid-list/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/grid-list",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index ccc46cb09148..3507ef0f30f0 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -6,14 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, SecurityContext, Optional, SkipSelf} from '@angular/core';
-import {SafeResourceUrl, DomSanitizer} from '@angular/platform-browser';
+import {Injectable, Optional, SecurityContext, SkipSelf} from '@angular/core';
 import {Http} from '@angular/http';
+import {
+  catchOperator,
+  doOperator,
+  finallyOperator,
+  map,
+  RxChain,
+  share,
+} from '@angular/material/core';
+import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
-import {_throw as observableThrow} from 'rxjs/observable/throw';
-import {of as observableOf} from 'rxjs/observable/of';
 import {forkJoin} from 'rxjs/observable/forkJoin';
-import {RxChain, map, doOperator, catchOperator, finallyOperator, share} from '../core/rxjs/index';
+import {of as observableOf} from 'rxjs/observable/of';
+import {_throw as observableThrow} from 'rxjs/observable/throw';
 
 /**
  * Returns an exception to be thrown in the case when attempting to
@@ -272,7 +279,7 @@ export class MdIconRegistry {
 
     // Not found in any cached icon sets. If there are icon sets with URLs that we haven't
     // fetched, fetch them now and look for iconName in the results.
-    const iconSetFetchRequests: Observable<SVGElement>[] = iconSetConfigs
+    const iconSetFetchRequests: Observable<SVGElement | null>[] = iconSetConfigs
       .filter(iconSetConfig => !iconSetConfig.svgElement)
       .map(iconSetConfig => {
         return RxChain.from(this._loadSvgIconSetFromConfig(iconSetConfig))
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index b959b434a2a9..b10ddcf96953 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -19,8 +19,8 @@ import {
   Attribute,
 } from '@angular/core';
 import {MdIconRegistry} from './icon-registry';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {first} from '../core/rxjs/index';
+import {CanColor, mixinColor} from '@angular/material/core';
+import {first} from '@angular/material/core';
 
 
 // Boilerplate for applying mixins to MdIcon.
diff --git a/src/lib/icon/index.ts b/src/lib/icon/index.ts
index 12c584996da7..f93e7c31d564 100644
--- a/src/lib/icon/index.ts
+++ b/src/lib/icon/index.ts
@@ -6,20 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '../core';
-import {MdIcon} from './icon';
-import {ICON_REGISTRY_PROVIDER} from './icon-registry';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [MdIcon, MdCommonModule],
-  declarations: [MdIcon],
-  providers: [ICON_REGISTRY_PROVIDER],
-})
-export class MdIconModule {}
-
-
-export * from './icon';
-export * from './icon-registry';
+export * from './public_api';
diff --git a/src/lib/icon/public_api.ts b/src/lib/icon/public_api.ts
new file mode 100644
index 000000000000..94a2329bd913
--- /dev/null
+++ b/src/lib/icon/public_api.ts
@@ -0,0 +1,25 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {MdIcon} from './icon';
+import {ICON_REGISTRY_PROVIDER} from './icon-registry';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [MdIcon, MdCommonModule],
+  declarations: [MdIcon],
+  providers: [ICON_REGISTRY_PROVIDER],
+})
+export class MdIconModule {}
+
+
+export * from './icon';
+export * from './icon-registry';
diff --git a/src/lib/icon/tsconfig-build.json b/src/lib/icon/tsconfig-build.json
new file mode 100644
index 000000000000..34954d67357d
--- /dev/null
+++ b/src/lib/icon/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/icon",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/input/index.ts b/src/lib/input/index.ts
index 495d4e8c37f7..f93e7c31d564 100644
--- a/src/lib/input/index.ts
+++ b/src/lib/input/index.ts
@@ -6,36 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdInput} from './input';
-import {MdTextareaAutosize} from './autosize';
-import {CommonModule} from '@angular/common';
-import {PlatformModule} from '../core/platform/index';
-import {MdFormFieldModule} from '../form-field/index';
-
-
-@NgModule({
-  declarations: [
-    MdInput,
-    MdTextareaAutosize,
-  ],
-  imports: [
-    CommonModule,
-    MdFormFieldModule,
-    PlatformModule,
-  ],
-  exports: [
-    // We re-export the `MdFormFieldModule` since `MdInput` will almost always be used together with
-    // `MdFormField`.
-    MdFormFieldModule,
-    MdInput,
-    MdTextareaAutosize,
-  ],
-})
-export class MdInputModule {}
-
-
-export * from './autosize';
-export * from './input';
-export * from './input-errors';
-
+export * from './public_api';
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 1ff06bd7b6eb..a960c88017e3 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -13,8 +13,8 @@ import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MdInputModule} from './index';
 import {MdInput} from './input';
-import {Platform} from '../core/platform/platform';
-import {PlatformModule} from '../core/platform/index';
+import {Platform} from '@angular/material/core';
+import {PlatformModule} from '@angular/material/core';
 import {wrappedErrorMessage, dispatchFakeEvent, createFakeEvent} from '@angular/cdk/testing';
 import {
   MdFormField,
@@ -22,9 +22,9 @@ import {
   getMdFormFieldDuplicatedHintError,
   getMdFormFieldMissingControlError,
   getMdFormFieldPlaceholderConflictError,
-} from '../form-field/index';
-import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from '../core/placeholder/placeholder-options';
-import {MD_ERROR_GLOBAL_OPTIONS, showOnDirtyErrorStateMatcher} from '../core/error/error-options';
+} from '@angular/material/form-field';
+import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from '@angular/material/core';
+import {MD_ERROR_GLOBAL_OPTIONS, showOnDirtyErrorStateMatcher} from '@angular/material/core';
 
 describe('MdInput without forms', function () {
   beforeEach(async(() => {
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index ff23a0e4520b..8a3df761e601 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -27,9 +27,9 @@ import {
   ErrorOptions,
   ErrorStateMatcher,
   MD_ERROR_GLOBAL_OPTIONS
-} from '../core/error/error-options';
+} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
-import {MdFormFieldControl} from '../form-field/index';
+import {MdFormFieldControl} from '@angular/material/form-field';
 
 // Invalid input type. Using one of these will throw an MdInputUnsupportedTypeError.
 const MD_INPUT_INVALID_TYPES = [
diff --git a/src/lib/input/public_api.ts b/src/lib/input/public_api.ts
new file mode 100644
index 000000000000..eafbd183b27b
--- /dev/null
+++ b/src/lib/input/public_api.ts
@@ -0,0 +1,41 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdInput} from './input';
+import {MdTextareaAutosize} from './autosize';
+import {CommonModule} from '@angular/common';
+import {PlatformModule} from '@angular/material/core';
+import {MdFormFieldModule} from '@angular/material/form-field';
+
+
+@NgModule({
+  declarations: [
+    MdInput,
+    MdTextareaAutosize,
+  ],
+  imports: [
+    CommonModule,
+    MdFormFieldModule,
+    PlatformModule,
+  ],
+  exports: [
+    // We re-export the `MdFormFieldModule` since `MdInput` will almost always be used together with
+    // `MdFormField`.
+    MdFormFieldModule,
+    MdInput,
+    MdTextareaAutosize,
+  ],
+})
+export class MdInputModule {}
+
+
+export * from './autosize';
+export * from './input';
+export * from './input-errors';
+
diff --git a/src/lib/input/tsconfig-build.json b/src/lib/input/tsconfig-build.json
new file mode 100644
index 000000000000..22083bcdbe92
--- /dev/null
+++ b/src/lib/input/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/input",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/list/index.ts b/src/lib/list/index.ts
index ad7ed22da623..f93e7c31d564 100644
--- a/src/lib/list/index.ts
+++ b/src/lib/list/index.ts
@@ -6,56 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule, MdLineModule, MdPseudoCheckboxModule, MdRippleModule} from '../core';
-import {CommonModule} from '@angular/common';
-import {
-  MdDividerCssMatStyler,
-  MdList,
-  MdListAvatarCssMatStyler,
-  MdListCssMatStyler,
-  MdListDivider,
-  MdListIconCssMatStyler,
-  MdListItem,
-  MdListSubheaderCssMatStyler,
-  MdNavListCssMatStyler
-} from './list';
-import {MdListOption, MdSelectionList} from './selection-list';
-
-@NgModule({
-  imports: [MdLineModule, MdRippleModule, MdCommonModule, MdPseudoCheckboxModule, CommonModule],
-  exports: [
-    MdList,
-    MdListItem,
-    MdListDivider,
-    MdListAvatarCssMatStyler,
-    MdLineModule,
-    MdCommonModule,
-    MdListIconCssMatStyler,
-    MdListCssMatStyler,
-    MdNavListCssMatStyler,
-    MdDividerCssMatStyler,
-    MdListSubheaderCssMatStyler,
-    MdPseudoCheckboxModule,
-    MdSelectionList,
-    MdListOption
-  ],
-  declarations: [
-    MdList,
-    MdListItem,
-    MdListDivider,
-    MdListAvatarCssMatStyler,
-    MdListIconCssMatStyler,
-    MdListCssMatStyler,
-    MdNavListCssMatStyler,
-    MdDividerCssMatStyler,
-    MdListSubheaderCssMatStyler,
-    MdSelectionList,
-    MdListOption
-  ],
-})
-export class MdListModule {}
-
-
-export * from './list';
-export * from './selection-list';
+export * from './public_api';
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 3b9205e74211..ef345319f1f2 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -19,8 +19,8 @@ import {
   ViewEncapsulation,
   ChangeDetectionStrategy,
 } from '@angular/core';
-import {MdLine, MdLineSetter} from '../core';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {MdLine, MdLineSetter} from '@angular/material/core';
+import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 
 // Boilerplate for applying mixins to MdList.
 /** @docs-private */
diff --git a/src/lib/list/public_api.ts b/src/lib/list/public_api.ts
new file mode 100644
index 000000000000..4f88dea8fccd
--- /dev/null
+++ b/src/lib/list/public_api.ts
@@ -0,0 +1,67 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {
+  MdCommonModule,
+  MdLineModule,
+  MdPseudoCheckboxModule,
+  MdRippleModule,
+} from '@angular/material/core';
+import {
+  MdDividerCssMatStyler,
+  MdList,
+  MdListAvatarCssMatStyler,
+  MdListCssMatStyler,
+  MdListDivider,
+  MdListIconCssMatStyler,
+  MdListItem,
+  MdListSubheaderCssMatStyler,
+  MdNavListCssMatStyler,
+} from './list';
+import {MdListOption, MdSelectionList} from './selection-list';
+
+
+@NgModule({
+  imports: [MdLineModule, MdRippleModule, MdCommonModule, MdPseudoCheckboxModule, CommonModule],
+  exports: [
+    MdList,
+    MdListItem,
+    MdListDivider,
+    MdListAvatarCssMatStyler,
+    MdLineModule,
+    MdCommonModule,
+    MdListIconCssMatStyler,
+    MdListCssMatStyler,
+    MdNavListCssMatStyler,
+    MdDividerCssMatStyler,
+    MdListSubheaderCssMatStyler,
+    MdPseudoCheckboxModule,
+    MdSelectionList,
+    MdListOption
+  ],
+  declarations: [
+    MdList,
+    MdListItem,
+    MdListDivider,
+    MdListAvatarCssMatStyler,
+    MdListIconCssMatStyler,
+    MdListCssMatStyler,
+    MdNavListCssMatStyler,
+    MdDividerCssMatStyler,
+    MdListSubheaderCssMatStyler,
+    MdSelectionList,
+    MdListOption
+  ],
+})
+export class MdListModule {}
+
+
+export * from './list';
+export * from './selection-list';
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index ed0103933eb4..623cde717a65 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -3,8 +3,8 @@ import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {MdSelectionList, MdListOption, MdListModule} from './index';
 import {createKeyboardEvent} from '@angular/cdk/testing';
-import {UP_ARROW, DOWN_ARROW, SPACE} from '../core/keyboard/keycodes';
-import {Platform} from '../core/platform/index';
+import {UP_ARROW, DOWN_ARROW, SPACE} from '@angular/material/core';
+import {Platform} from '@angular/material/core';
 
 
 describe('MdSelectionList', () => {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index c2381d635d37..df76d6ec39e0 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -6,34 +6,42 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusableOption, FocusKeyManager} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {SelectionModel} from '@angular/cdk/collections';
 import {
   AfterContentInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ContentChildren,
   ElementRef,
-  Input,
-  QueryList,
-  ViewEncapsulation,
-  Optional,
-  Renderer2,
   EventEmitter,
-  Output,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  OnDestroy,
   forwardRef,
   Inject,
+  Input,
+  OnDestroy,
+  Optional,
+  Output,
+  QueryList,
+  Renderer2,
+  ViewEncapsulation,
 } from '@angular/core';
-import {coerceBooleanProperty, SelectionModel, MdLine, MdLineSetter} from '../core';
-import {FocusKeyManager} from '../core/a11y/focus-key-manager';
-import {Subscription} from 'rxjs/Subscription';
-import {SPACE} from '../core/keyboard/keycodes';
-import {FocusableOption} from '../core/a11y/focus-key-manager';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
-import {RxChain, switchMap, startWith} from '../core/rxjs/index';
+import {
+  CanDisable,
+  CanDisableRipple,
+  MATERIAL_COMPATIBILITY_MODE,
+  MdLine,
+  MdLineSetter,
+  mixinDisabled,
+  mixinDisableRipple,
+  RxChain,
+  SPACE,
+  startWith,
+  switchMap,
+} from '@angular/material/core';
 import {merge} from 'rxjs/observable/merge';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
-import {MATERIAL_COMPATIBILITY_MODE} from '../core/compatibility/compatibility';
+import {Subscription} from 'rxjs/Subscription';
 
 
 /** @docs-private */
diff --git a/src/lib/list/tsconfig-build.json b/src/lib/list/tsconfig-build.json
new file mode 100644
index 000000000000..21cbaa9d9aa3
--- /dev/null
+++ b/src/lib/list/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/list",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/menu/index.ts b/src/lib/menu/index.ts
index 06e7c2827980..f93e7c31d564 100644
--- a/src/lib/menu/index.ts
+++ b/src/lib/menu/index.ts
@@ -6,39 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '../core';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {MdMenu, MD_MENU_DEFAULT_OPTIONS} from './menu-directive';
-import {MdMenuItem} from './menu-item';
-import {MdMenuTrigger, MD_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
-import {MdRippleModule} from '../core/ripple/index';
-
-
-@NgModule({
-  imports: [
-    OverlayModule,
-    CommonModule,
-    MdRippleModule,
-    MdCommonModule,
-  ],
-  exports: [MdMenu, MdMenuItem, MdMenuTrigger, MdCommonModule],
-  declarations: [MdMenu, MdMenuItem, MdMenuTrigger],
-  providers: [
-    MD_MENU_SCROLL_STRATEGY_PROVIDER,
-    {
-      provide: MD_MENU_DEFAULT_OPTIONS,
-      useValue: {
-        overlapTrigger: true,
-        xPosition: 'after',
-        yPosition: 'below',
-      },
-    }
-  ],
-})
-export class MdMenuModule {}
-
-
-export * from './menu';
-export {fadeInItems, transformMenu} from './menu-animations';
+export * from './public_api';
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index adfa8565bfac..4c0a43b40d0b 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -31,7 +31,7 @@ import {FocusKeyManager} from '@angular/cdk/a11y';
 import {MdMenuPanel} from './menu-panel';
 import {Subscription} from 'rxjs/Subscription';
 import {transformMenu, fadeInItems} from './menu-animations';
-import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '../core/keyboard/keycodes';
+import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/material/core';
 import {merge} from 'rxjs/observable/merge';
 import {Observable} from 'rxjs/Observable';
 import {Direction} from '@angular/cdk/bidi';
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index 860a6216643f..fd3b53aefb96 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusableOption} from '@angular/cdk/a11y';
 import {
+  ChangeDetectionStrategy,
   Component,
   ElementRef,
   OnDestroy,
-  ChangeDetectionStrategy,
   ViewEncapsulation,
 } from '@angular/core';
-import {FocusableOption} from '../core/a11y/focus-key-manager';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
+import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
 // Boilerplate for applying mixins to MdMenuItem.
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index e3493c707ac5..7c3b7385f275 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -6,6 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {isFakeMousedownFromScreenReader} from '@angular/cdk/a11y';
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
+import {
+  ConnectedPositionStrategy,
+  HorizontalConnectionPos,
+  Overlay,
+  OverlayRef,
+  OverlayState,
+  RepositionScrollStrategy,
+  ScrollStrategy,
+  VerticalConnectionPos,
+} from '@angular/cdk/overlay';
+import {TemplatePortal} from '@angular/cdk/portal';
+import {filter, RxChain} from '@angular/cdk/rxjs';
 import {
   AfterViewInit,
   Directive,
@@ -20,32 +35,15 @@ import {
   Self,
   ViewContainerRef,
 } from '@angular/core';
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {isFakeMousedownFromScreenReader} from '@angular/cdk/a11y';
-import {TemplatePortal} from '@angular/cdk/portal';
-import {LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
-import {
-  ConnectedPositionStrategy,
-  HorizontalConnectionPos,
-  Overlay,
-  OverlayRef,
-  OverlayState,
-  RepositionScrollStrategy,
-  VerticalConnectionPos,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  ScrollStrategy,
-} from '@angular/cdk/overlay';
-import {filter, RxChain} from '@angular/cdk/rxjs';
+import {merge} from 'rxjs/observable/merge';
+import {of as observableOf} from 'rxjs/observable/of';
+import {Subscription} from 'rxjs/Subscription';
 import {MdMenu} from './menu-directive';
+import {throwMdMenuMissingError} from './menu-errors';
 import {MdMenuItem} from './menu-item';
 import {MdMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
-import {throwMdMenuMissingError} from './menu-errors';
-import {of as observableOf} from 'rxjs/observable/of';
-import {merge} from 'rxjs/observable/merge';
-import {Subscription} from 'rxjs/Subscription';
+
 
 /** Injection token that determines the scroll handling while the menu is open. */
 export const MD_MENU_SCROLL_STRATEGY =
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index a9e8086aaa5f..367090c8f942 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -23,7 +23,7 @@ import {
   MenuPositionY,
 } from './index';
 import {MENU_PANEL_TOP_PADDING} from './menu-trigger';
-import {extendObject} from '../core/util/object-extend';
+import {extendObject} from '@angular/material/core';
 import {
   dispatchKeyboardEvent,
   dispatchMouseEvent,
diff --git a/src/lib/menu/public_api.ts b/src/lib/menu/public_api.ts
new file mode 100644
index 000000000000..e058148b93e2
--- /dev/null
+++ b/src/lib/menu/public_api.ts
@@ -0,0 +1,45 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule} from '@angular/material/core';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {MdMenu, MD_MENU_DEFAULT_OPTIONS} from './menu-directive';
+import {MdMenuItem} from './menu-item';
+import {MdMenuTrigger, MD_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
+import {MdRippleModule} from '@angular/material/core';
+
+
+@NgModule({
+  imports: [
+    OverlayModule,
+    CommonModule,
+    MdRippleModule,
+    MdCommonModule,
+  ],
+  exports: [MdMenu, MdMenuItem, MdMenuTrigger, MdCommonModule],
+  declarations: [MdMenu, MdMenuItem, MdMenuTrigger],
+  providers: [
+    MD_MENU_SCROLL_STRATEGY_PROVIDER,
+    {
+      provide: MD_MENU_DEFAULT_OPTIONS,
+      useValue: {
+        overlapTrigger: true,
+        xPosition: 'after',
+        yPosition: 'below',
+      },
+    }
+  ],
+})
+export class MdMenuModule {}
+
+
+export * from './menu';
+export {MD_MENU_SCROLL_STRATEGY} from './menu-trigger';
+export {fadeInItems, transformMenu} from './menu-animations';
diff --git a/src/lib/menu/tsconfig-build.json b/src/lib/menu/tsconfig-build.json
new file mode 100644
index 000000000000..c92044ad4fbb
--- /dev/null
+++ b/src/lib/menu/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/menu",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/package.json b/src/lib/package.json
index d077b8b5d8e2..1e0fbb0f1d4e 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular Material",
   "main": "./bundles/material.umd.js",
-  "module": "./@angular/material.es5.js",
-  "es2015": "./@angular/material.js",
+  "module": "./esm5/material.es5.js",
+  "es2015": "./esm2015/material.js",
   "typings": "./material.d.ts",
   "repository": {
     "type": "git",
diff --git a/src/lib/paginator/index.ts b/src/lib/paginator/index.ts
index f041a209dd8d..f93e7c31d564 100644
--- a/src/lib/paginator/index.ts
+++ b/src/lib/paginator/index.ts
@@ -6,28 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdButtonModule} from '../button/index';
-import {MdSelectModule} from '../select/index';
-import {MdPaginator} from './paginator';
-import {MdPaginatorIntl} from './paginator-intl';
-import {MdTooltipModule} from '../tooltip/index';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdButtonModule,
-    MdSelectModule,
-    MdTooltipModule,
-  ],
-  exports: [MdPaginator],
-  declarations: [MdPaginator],
-  providers: [MdPaginatorIntl],
-})
-export class MdPaginatorModule {}
-
-
-export * from './paginator';
-export * from './paginator-intl';
+export * from './public_api';
diff --git a/src/lib/paginator/paginator.ts b/src/lib/paginator/paginator.ts
index 10996698cfe5..b4c04903558f 100644
--- a/src/lib/paginator/paginator.ts
+++ b/src/lib/paginator/paginator.ts
@@ -12,14 +12,14 @@ import {
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
   ViewEncapsulation,
-  OnDestroy,
 } from '@angular/core';
-import {MdPaginatorIntl} from './paginator-intl';
-import {MATERIAL_COMPATIBILITY_MODE} from '../core';
+import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 import {Subscription} from 'rxjs/Subscription';
+import {MdPaginatorIntl} from './paginator-intl';
 
 /** The default page size if there is no page size and there are no provided page size options. */
 const DEFAULT_PAGE_SIZE = 50;
diff --git a/src/lib/paginator/public_api.ts b/src/lib/paginator/public_api.ts
new file mode 100644
index 000000000000..a3d7cd62f646
--- /dev/null
+++ b/src/lib/paginator/public_api.ts
@@ -0,0 +1,33 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdButtonModule} from '@angular/material/button';
+import {MdSelectModule} from '@angular/material/select';
+import {MdTooltipModule} from '@angular/material/tooltip';
+import {MdPaginator} from './paginator';
+import {MdPaginatorIntl} from './paginator-intl';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdButtonModule,
+    MdSelectModule,
+    MdTooltipModule,
+  ],
+  exports: [MdPaginator],
+  declarations: [MdPaginator],
+  providers: [MdPaginatorIntl],
+})
+export class MdPaginatorModule {}
+
+
+export * from './paginator';
+export * from './paginator-intl';
diff --git a/src/lib/paginator/tsconfig-build.json b/src/lib/paginator/tsconfig-build.json
new file mode 100644
index 000000000000..dc0ef8a23eca
--- /dev/null
+++ b/src/lib/paginator/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/paginator",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/progress-bar/index.ts b/src/lib/progress-bar/index.ts
index c9a403119cd1..f93e7c31d564 100644
--- a/src/lib/progress-bar/index.ts
+++ b/src/lib/progress-bar/index.ts
@@ -6,18 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '../core';
-import {MdProgressBar} from './progress-bar';
-
-
-@NgModule({
-  imports: [CommonModule, MdCommonModule],
-  exports: [MdProgressBar, MdCommonModule],
-  declarations: [MdProgressBar],
-})
-export class MdProgressBarModule {}
-
-
-export * from './progress-bar';
+export * from './public_api';
diff --git a/src/lib/progress-bar/public_api.ts b/src/lib/progress-bar/public_api.ts
new file mode 100644
index 000000000000..40218edb4439
--- /dev/null
+++ b/src/lib/progress-bar/public_api.ts
@@ -0,0 +1,23 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule} from '@angular/material/core';
+import {MdProgressBar} from './progress-bar';
+
+
+@NgModule({
+  imports: [CommonModule, MdCommonModule],
+  exports: [MdProgressBar, MdCommonModule],
+  declarations: [MdProgressBar],
+})
+export class MdProgressBarModule {}
+
+
+export * from './progress-bar';
diff --git a/src/lib/progress-bar/tsconfig-build.json b/src/lib/progress-bar/tsconfig-build.json
new file mode 100644
index 000000000000..ec367b48b5b2
--- /dev/null
+++ b/src/lib/progress-bar/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/progress-bar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/progress-spinner/index.ts b/src/lib/progress-spinner/index.ts
index 159ca80fc4d2..f93e7c31d564 100644
--- a/src/lib/progress-spinner/index.ts
+++ b/src/lib/progress-spinner/index.ts
@@ -6,30 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '../core';
-import {
-  MdProgressSpinner,
-  MdSpinner,
-  MdProgressSpinnerCssMatStyler,
-} from './progress-spinner';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [
-    MdProgressSpinner,
-    MdSpinner,
-    MdCommonModule,
-    MdProgressSpinnerCssMatStyler
-  ],
-  declarations: [
-    MdProgressSpinner,
-    MdSpinner,
-    MdProgressSpinnerCssMatStyler
-  ],
-})
-class MdProgressSpinnerModule {}
-
-export {MdProgressSpinnerModule};
-export * from './progress-spinner';
+export * from './public_api';
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index a4fe0ee2d986..ee4ec891a231 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -18,7 +18,7 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
+import {CanColor, mixinColor} from '@angular/material/core';
 
 
 // TODO(josephperrott): Benchpress tests.
diff --git a/src/lib/progress-spinner/public_api.ts b/src/lib/progress-spinner/public_api.ts
new file mode 100644
index 000000000000..94453fd891ed
--- /dev/null
+++ b/src/lib/progress-spinner/public_api.ts
@@ -0,0 +1,35 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {
+  MdProgressSpinner,
+  MdSpinner,
+  MdProgressSpinnerCssMatStyler,
+} from './progress-spinner';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [
+    MdProgressSpinner,
+    MdSpinner,
+    MdCommonModule,
+    MdProgressSpinnerCssMatStyler
+  ],
+  declarations: [
+    MdProgressSpinner,
+    MdSpinner,
+    MdProgressSpinnerCssMatStyler
+  ],
+})
+class MdProgressSpinnerModule {}
+
+export {MdProgressSpinnerModule};
+export * from './progress-spinner';
diff --git a/src/lib/progress-spinner/tsconfig-build.json b/src/lib/progress-spinner/tsconfig-build.json
new file mode 100644
index 000000000000..dc6e5bd5dbf4
--- /dev/null
+++ b/src/lib/progress-spinner/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/progress-spinner",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/public_api.ts b/src/lib/public_api.ts
index 84a7802d0425..44c3e6a600e2 100644
--- a/src/lib/public_api.ts
+++ b/src/lib/public_api.ts
@@ -13,36 +13,36 @@
  */
 
 export * from './version';
-export * from './core';
 
-export * from './autocomplete/index';
-export * from './button/index';
-export * from './button-toggle/index';
-export * from './card/index';
-export * from './chips/index';
-export * from './checkbox/index';
-export * from './datepicker/index';
-export * from './dialog/index';
-export * from './expansion/index';
-export * from './form-field/index';
-export * from './grid-list/index';
-export * from './icon/index';
-export * from './input/index';
-export * from './list/index';
-export * from './menu/index';
-export * from './paginator/index';
-export * from './progress-bar/index';
-export * from './progress-spinner/index';
-export * from './radio/index';
-export * from './select/index';
-export * from './sidenav/index';
-export * from './slider/index';
-export * from './slide-toggle/index';
-export * from './snack-bar/index';
-export * from './sort/index';
-export * from './table/index';
-export * from './tabs/index';
-export * from './tabs/tab-nav-bar/index';
-export * from './toolbar/index';
-export * from './tooltip/index';
-export * from './stepper/index';
+
+export * from '@angular/material/autocomplete';
+export * from '@angular/material/button';
+export * from '@angular/material/button-toggle';
+export * from '@angular/material/card';
+export * from '@angular/material/checkbox';
+export * from '@angular/material/chips';
+export * from '@angular/material/core';
+export * from '@angular/material/datepicker';
+export * from '@angular/material/dialog';
+export * from '@angular/material/expansion';
+export * from '@angular/material/form-field';
+export * from '@angular/material/grid-list';
+export * from '@angular/material/icon';
+export * from '@angular/material/input';
+export * from '@angular/material/list';
+export * from '@angular/material/menu';
+export * from '@angular/material/paginator';
+export * from '@angular/material/progress-bar';
+export * from '@angular/material/progress-spinner';
+export * from '@angular/material/radio';
+export * from '@angular/material/select';
+export * from '@angular/material/sidenav';
+export * from '@angular/material/slide-toggle';
+export * from '@angular/material/slider';
+export * from '@angular/material/snack-bar';
+export * from '@angular/material/sort';
+export * from '@angular/material/stepper';
+export * from '@angular/material/table';
+export * from '@angular/material/tabs';
+export * from '@angular/material/toolbar';
+export * from '@angular/material/tooltip';
diff --git a/src/lib/radio/index.ts b/src/lib/radio/index.ts
index 990836c1bea0..f93e7c31d564 100644
--- a/src/lib/radio/index.ts
+++ b/src/lib/radio/index.ts
@@ -6,25 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
-import {
-  MdRippleModule,
-  MdCommonModule,
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-  FocusOriginMonitor,
-} from '../core';
-import {MdRadioGroup, MdRadioButton} from './radio';
-
-
-@NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule],
-  exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER, FocusOriginMonitor],
-  declarations: [MdRadioGroup, MdRadioButton],
-})
-export class MdRadioModule {}
-
-
-export * from './radio';
+export * from './public_api';
diff --git a/src/lib/radio/public_api.ts b/src/lib/radio/public_api.ts
new file mode 100644
index 000000000000..2e9590b72913
--- /dev/null
+++ b/src/lib/radio/public_api.ts
@@ -0,0 +1,30 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
+import {
+  MdRippleModule,
+  MdCommonModule,
+  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
+  FocusOriginMonitor,
+} from '@angular/material/core';
+import {MdRadioGroup, MdRadioButton} from './radio';
+
+
+@NgModule({
+  imports: [CommonModule, MdRippleModule, MdCommonModule],
+  exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER, FocusOriginMonitor],
+  declarations: [MdRadioGroup, MdRadioButton],
+})
+export class MdRadioModule {}
+
+
+export * from './radio';
diff --git a/src/lib/radio/radio.spec.ts b/src/lib/radio/radio.spec.ts
index 0e03603d646d..d87f5a623271 100644
--- a/src/lib/radio/radio.spec.ts
+++ b/src/lib/radio/radio.spec.ts
@@ -4,7 +4,7 @@ import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
-import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
+import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
 import {MdRadioButton, MdRadioChange, MdRadioGroup, MdRadioModule} from './index';
 
 describe('MdRadio', () => {
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 3d9fbe38d454..229d800272e4 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -34,11 +34,11 @@ import {
   MdRipple,
   FocusOriginMonitor,
   FocusOrigin,
-} from '../core';
+} from '@angular/material/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {mixinDisabled, CanDisable} from '@angular/material/core';
+import {CanColor, mixinColor} from '@angular/material/core';
+import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 
 // Increasing integer for generating unique ids for radio components.
 let nextUniqueId = 0;
diff --git a/src/lib/radio/tsconfig-build.json b/src/lib/radio/tsconfig-build.json
new file mode 100644
index 000000000000..463d0fc3554b
--- /dev/null
+++ b/src/lib/radio/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/radio",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/select/index.ts b/src/lib/select/index.ts
index bd79179836f8..f93e7c31d564 100644
--- a/src/lib/select/index.ts
+++ b/src/lib/select/index.ts
@@ -6,26 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdSelect, MdSelectTrigger, MD_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
-import {MdCommonModule, MdOptionModule} from '../core';
-import {OverlayModule} from '@angular/cdk/overlay';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    OverlayModule,
-    MdOptionModule,
-    MdCommonModule,
-  ],
-  exports: [MdSelect, MdSelectTrigger, MdOptionModule, MdCommonModule],
-  declarations: [MdSelect, MdSelectTrigger],
-  providers: [MD_SELECT_SCROLL_STRATEGY_PROVIDER]
-})
-export class MdSelectModule {}
-
-
-export * from './select';
-export {fadeInContent, transformPanel, transformPlaceholder} from './select-animations';
+export * from './public_api';
diff --git a/src/lib/select/public_api.ts b/src/lib/select/public_api.ts
new file mode 100644
index 000000000000..71d19e278024
--- /dev/null
+++ b/src/lib/select/public_api.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdSelect, MdSelectTrigger, MD_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
+import {MdCommonModule, MdOptionModule} from '@angular/material/core';
+import {OverlayModule} from '@angular/cdk/overlay';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    OverlayModule,
+    MdOptionModule,
+    MdCommonModule,
+  ],
+  exports: [MdSelect, MdSelectTrigger, MdOptionModule, MdCommonModule],
+  declarations: [MdSelect, MdSelectTrigger],
+  providers: [MD_SELECT_SCROLL_STRATEGY_PROVIDER]
+})
+export class MdSelectModule {}
+
+
+export * from './select';
+export {fadeInContent, transformPanel, transformPlaceholder} from './select-animations';
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 18a6b6b90bfb..b774081a9c11 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -34,12 +34,12 @@ import {
   getMdSelectNonArrayValueError,
   getMdSelectNonFunctionValueError
 } from './select-errors';
-import {MdOption} from '../core/option/option';
+import {MdOption} from '@angular/material/core';
 import {
   FloatPlaceholderType,
   MD_PLACEHOLDER_GLOBAL_OPTIONS
-} from '../core/placeholder/placeholder-options';
-import {extendObject} from '../core/util/object-extend';
+} from '@angular/material/core';
+import {extendObject} from '@angular/material/core';
 
 
 describe('MdSelect', () => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8e6f4695ffe7..5ff27f2855a7 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -6,6 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusKeyManager} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {SelectionModel} from '@angular/cdk/collections';
+import {DOWN_ARROW, END, ENTER, HOME, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {
+  ConnectedOverlayDirective,
+  Overlay,
+  RepositionScrollStrategy,
+  ScrollStrategy,
+  ViewportRuler,
+} from '@angular/cdk/overlay';
+import {Platform} from '@angular/cdk/platform';
+import {filter, startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   Attribute,
@@ -14,11 +28,13 @@ import {
   Component,
   ContentChild,
   ContentChildren,
+  Directive,
   ElementRef,
   EventEmitter,
   Inject,
   InjectionToken,
   Input,
+  isDevMode,
   OnDestroy,
   OnInit,
   Optional,
@@ -28,45 +44,31 @@ import {
   Self,
   ViewChild,
   ViewEncapsulation,
-  Directive,
-  isDevMode,
 } from '@angular/core';
 import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
-import {DOWN_ARROW, END, ENTER, HOME, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
-import {FocusKeyManager} from '@angular/cdk/a11y';
-import {Directionality} from '@angular/cdk/bidi';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {filter, startWith} from '@angular/cdk/rxjs';
 import {
-  ConnectedOverlayDirective,
-  Overlay,
-  RepositionScrollStrategy,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  ScrollStrategy,
-  ViewportRuler
-} from '@angular/cdk/overlay';
-import {merge} from 'rxjs/observable/merge';
+  CanColor,
+  CanDisable,
+  FloatPlaceholderType,
+  HasTabIndex,
+  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  MdOptgroup,
+  MdOption,
+  MdOptionSelectionChange,
+  mixinColor,
+  mixinDisabled,
+  mixinTabIndex,
+  PlaceholderOptions,
+} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
+import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
 import {fadeInContent, transformPanel, transformPlaceholder} from './select-animations';
-import {SelectionModel} from '@angular/cdk/collections';
 import {
   getMdSelectDynamicMultipleError,
   getMdSelectNonArrayValueError,
-  getMdSelectNonFunctionValueError
+  getMdSelectNonFunctionValueError,
 } from './select-errors';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
-import {MdOptgroup, MdOption, MdOptionSelectionChange} from '../core/option/index';
-import {
-  FloatPlaceholderType,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS,
-  PlaceholderOptions
-} from '../core/placeholder/placeholder-options';
-import {Platform} from '@angular/cdk/platform';
-import {HasTabIndex, mixinTabIndex} from '../core/common-behaviors/tabindex';
 
 /**
  * The following style constants are necessary to save here in order
diff --git a/src/lib/select/tsconfig-build.json b/src/lib/select/tsconfig-build.json
new file mode 100644
index 000000000000..e763b501c047
--- /dev/null
+++ b/src/lib/select/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/select",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 909fe6a0a38f..ea4d0af73d96 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -6,29 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
+import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
   AfterContentInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ContentChildren,
   ElementRef,
+  EventEmitter,
+  Inject,
   Input,
+  NgZone,
+  OnDestroy,
   Optional,
   Output,
   QueryList,
-  ChangeDetectionStrategy,
-  EventEmitter,
   Renderer2,
   ViewEncapsulation,
-  NgZone,
-  OnDestroy,
-  Inject,
-  ChangeDetectorRef,
 } from '@angular/core';
-import {animate, state, style, transition, trigger, AnimationEvent} from '@angular/animations';
-import {Directionality, coerceBooleanProperty} from '../core';
-import {FocusTrapFactory, FocusTrap} from '../core/a11y/focus-trap';
-import {ESCAPE} from '../core/keyboard/keycodes';
-import {first, takeUntil, startWith} from '../core/rxjs/index';
+import {ESCAPE, first, startWith, takeUntil} from '@angular/material/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
diff --git a/src/lib/sidenav/index.ts b/src/lib/sidenav/index.ts
index dca718a9fca1..f93e7c31d564 100644
--- a/src/lib/sidenav/index.ts
+++ b/src/lib/sidenav/index.ts
@@ -6,22 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {A11yModule} from '@angular/cdk/a11y';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {MdCommonModule} from '../core';
-import {MdDrawer, MdDrawerContainer} from './drawer';
-import {MdSidenav, MdSidenavContainer} from './sidenav';
-
-
-@NgModule({
-  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
-  exports: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav, MdCommonModule],
-  declarations: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav],
-})
-export class MdSidenavModule {}
-
-
-export * from './drawer';
-export * from './sidenav';
+export * from './public_api';
diff --git a/src/lib/sidenav/public_api.ts b/src/lib/sidenav/public_api.ts
new file mode 100644
index 000000000000..948fed606daa
--- /dev/null
+++ b/src/lib/sidenav/public_api.ts
@@ -0,0 +1,27 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {A11yModule} from '@angular/cdk/a11y';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {MdCommonModule} from '@angular/material/core';
+import {MdDrawer, MdDrawerContainer} from './drawer';
+import {MdSidenav, MdSidenavContainer} from './sidenav';
+
+
+@NgModule({
+  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
+  exports: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav, MdCommonModule],
+  declarations: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav],
+})
+export class MdSidenavModule {}
+
+
+export * from './drawer';
+export * from './sidenav';
diff --git a/src/lib/sidenav/tsconfig-build.json b/src/lib/sidenav/tsconfig-build.json
new file mode 100644
index 000000000000..68f4c0a51b27
--- /dev/null
+++ b/src/lib/sidenav/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/sidenav",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/slide-toggle/index.ts b/src/lib/slide-toggle/index.ts
index 6c81e7460d4e..f93e7c31d564 100644
--- a/src/lib/slide-toggle/index.ts
+++ b/src/lib/slide-toggle/index.ts
@@ -6,29 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {PlatformModule} from '@angular/cdk/platform';
-import {ObserversModule} from '@angular/cdk/observers';
-import {MdSlideToggle} from './slide-toggle';
-import {
-  FOCUS_ORIGIN_MONITOR_PROVIDER,
-  GestureConfig,
-  MdCommonModule,
-  MdRippleModule,
-} from '../core';
-
-
-@NgModule({
-  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule],
-  exports: [MdSlideToggle, MdCommonModule],
-  declarations: [MdSlideToggle],
-  providers: [
-    FOCUS_ORIGIN_MONITOR_PROVIDER,
-    {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}
-  ],
-})
-export class MdSlideToggleModule {}
-
-
-export * from './slide-toggle';
+export * from './public_api';
diff --git a/src/lib/slide-toggle/public_api.ts b/src/lib/slide-toggle/public_api.ts
new file mode 100644
index 000000000000..af02957e433a
--- /dev/null
+++ b/src/lib/slide-toggle/public_api.ts
@@ -0,0 +1,34 @@
+/**
+ * @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 {ObserversModule} from '@angular/cdk/observers';
+import {PlatformModule} from '@angular/cdk/platform';
+import {NgModule} from '@angular/core';
+import {
+  FOCUS_ORIGIN_MONITOR_PROVIDER,
+  GestureConfig,
+  MdCommonModule,
+  MdRippleModule,
+} from '@angular/material/core';
+import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {MdSlideToggle} from './slide-toggle';
+
+
+@NgModule({
+  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule],
+  exports: [MdSlideToggle, MdCommonModule],
+  declarations: [MdSlideToggle],
+  providers: [
+    FOCUS_ORIGIN_MONITOR_PROVIDER,
+    {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}
+  ],
+})
+export class MdSlideToggleModule {}
+
+
+export * from './slide-toggle';
diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index 345dcb5e418c..14794ab96555 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -8,7 +8,7 @@ import {NgModel, FormsModule, ReactiveFormsModule, FormControl} from '@angular/f
 import {MdSlideToggle, MdSlideToggleChange, MdSlideToggleModule} from './index';
 import {TestGestureConfig} from '../slider/test-gesture-config';
 import {dispatchFakeEvent} from '@angular/cdk/testing';
-import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '../core/ripple/ripple-renderer';
+import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
 
 describe('MdSlideToggle without forms', () => {
   let gestureConfig: TestGestureConfig;
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 8b5d13de0d04..cfdc881a01d5 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -31,12 +31,12 @@ import {
   HammerInput,
   MdRipple,
   RippleRef,
-} from '../core';
+} from '@angular/material/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {mixinDisabled, CanDisable} from '../core/common-behaviors/disabled';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
-import {HasTabIndex, mixinTabIndex} from '../core/common-behaviors/tabindex';
+import {mixinDisabled, CanDisable} from '@angular/material/core';
+import {CanColor, mixinColor} from '@angular/material/core';
+import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
+import {HasTabIndex, mixinTabIndex} from '@angular/material/core';
 
 // Increasing integer for generating unique ids for slide-toggle components.
 let nextUniqueId = 0;
diff --git a/src/lib/slide-toggle/tsconfig-build.json b/src/lib/slide-toggle/tsconfig-build.json
new file mode 100644
index 000000000000..ec866d061861
--- /dev/null
+++ b/src/lib/slide-toggle/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/slide-toggle",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/slider/index.ts b/src/lib/slider/index.ts
index 508cd636e6c3..f93e7c31d564 100644
--- a/src/lib/slider/index.ts
+++ b/src/lib/slider/index.ts
@@ -6,21 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule, GestureConfig, StyleModule} from '../core';
-import {MdSlider} from './slider';
-import {BidiModule} from '../core/bidi/index';
-
-
-@NgModule({
-  imports: [CommonModule, MdCommonModule, StyleModule, BidiModule],
-  exports: [MdSlider, MdCommonModule],
-  declarations: [MdSlider],
-  providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
-})
-export class MdSliderModule {}
-
-
-export * from './slider';
+export * from './public_api';
diff --git a/src/lib/slider/public_api.ts b/src/lib/slider/public_api.ts
new file mode 100644
index 000000000000..f7cc6fb8acd1
--- /dev/null
+++ b/src/lib/slider/public_api.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule, GestureConfig, StyleModule} from '@angular/material/core';
+import {MdSlider} from './slider';
+import {BidiModule} from '@angular/material/core';
+
+
+@NgModule({
+  imports: [CommonModule, MdCommonModule, StyleModule, BidiModule],
+  exports: [MdSlider, MdCommonModule],
+  declarations: [MdSlider],
+  providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
+})
+export class MdSliderModule {}
+
+
+export * from './slider';
diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index 676929861740..e8962601f00b 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -4,7 +4,7 @@ import {Component, DebugElement, ViewChild} from '@angular/core';
 import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
 import {MdSlider, MdSliderModule} from './index';
 import {TestGestureConfig} from './test-gesture-config';
-import {BidiModule} from '../core/bidi/index';
+import {BidiModule} from '@angular/material/core';
 import {
   DOWN_ARROW,
   END,
@@ -15,7 +15,7 @@ import {
   RIGHT_ARROW,
   UP_ARROW,
   BACKSPACE
-} from '../core/keyboard/keycodes';
+} from '@angular/material/core';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 
 describe('MdSlider without forms', () => {
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 3bcb41ac02d0..a564ce51d447 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -6,6 +6,18 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
+import {
+  DOWN_ARROW,
+  END,
+  HOME,
+  LEFT_ARROW,
+  PAGE_DOWN,
+  PAGE_UP,
+  RIGHT_ARROW,
+  UP_ARROW,
+} from '@angular/cdk/keycodes';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -15,29 +27,23 @@ import {
   forwardRef,
   Input,
   OnDestroy,
+  OnInit,
   Optional,
   Output,
   Renderer2,
+  ViewChild,
   ViewEncapsulation,
-  ViewChild, OnInit,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
-import {Directionality} from '@angular/cdk/bidi';
 import {
-  DOWN_ARROW,
-  END,
-  HOME,
-  LEFT_ARROW,
-  PAGE_DOWN,
-  PAGE_UP,
-  RIGHT_ARROW,
-  UP_ARROW,
-} from '@angular/cdk/keycodes';
-import {HammerInput} from '../core';
-import {FocusOrigin, FocusOriginMonitor} from '../core/style/focus-origin-monitor';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
+  CanColor,
+  CanDisable,
+  FocusOrigin,
+  FocusOriginMonitor,
+  HammerInput,
+  mixinColor,
+  mixinDisabled,
+} from '@angular/material/core';
 import {Subscription} from 'rxjs/Subscription';
 
 /**
diff --git a/src/lib/slider/test-gesture-config.ts b/src/lib/slider/test-gesture-config.ts
index 693f7cf9b3e2..486ff3fd252b 100644
--- a/src/lib/slider/test-gesture-config.ts
+++ b/src/lib/slider/test-gesture-config.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injectable} from '@angular/core';
-import {GestureConfig, HammerManager} from '../core';
+import {GestureConfig, HammerManager} from '@angular/material/core';
 
 /**
  * An extension of GestureConfig that exposes the underlying HammerManager instances.
diff --git a/src/lib/slider/tsconfig-build.json b/src/lib/slider/tsconfig-build.json
new file mode 100644
index 000000000000..dc10c8d1a735
--- /dev/null
+++ b/src/lib/slider/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/slider",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/snack-bar/index.ts b/src/lib/snack-bar/index.ts
index 12082fa3c625..f93e7c31d564 100644
--- a/src/lib/snack-bar/index.ts
+++ b/src/lib/snack-bar/index.ts
@@ -6,34 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
-import {LIVE_ANNOUNCER_PROVIDER} from '@angular/cdk/a11y';
-import {MdCommonModule} from '../core';
-import {MdSnackBar} from './snack-bar';
-import {MdSnackBarContainer} from './snack-bar-container';
-import {SimpleSnackBar} from './simple-snack-bar';
-
-
-@NgModule({
-  imports: [
-    OverlayModule,
-    PortalModule,
-    CommonModule,
-    MdCommonModule,
-  ],
-  exports: [MdSnackBarContainer, MdCommonModule],
-  declarations: [MdSnackBarContainer, SimpleSnackBar],
-  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
-  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
-})
-export class MdSnackBarModule {}
-
-
-export * from './snack-bar';
-export * from './snack-bar-container';
-export * from './snack-bar-config';
-export * from './snack-bar-ref';
-export * from './simple-snack-bar';
+export * from './public_api';
diff --git a/src/lib/snack-bar/public_api.ts b/src/lib/snack-bar/public_api.ts
new file mode 100644
index 000000000000..db641fd145ad
--- /dev/null
+++ b/src/lib/snack-bar/public_api.ts
@@ -0,0 +1,39 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {PortalModule} from '@angular/cdk/portal';
+import {LIVE_ANNOUNCER_PROVIDER} from '@angular/cdk/a11y';
+import {MdCommonModule} from '@angular/material/core';
+import {MdSnackBar} from './snack-bar';
+import {MdSnackBarContainer} from './snack-bar-container';
+import {SimpleSnackBar} from './simple-snack-bar';
+
+
+@NgModule({
+  imports: [
+    OverlayModule,
+    PortalModule,
+    CommonModule,
+    MdCommonModule,
+  ],
+  exports: [MdSnackBarContainer, MdCommonModule],
+  declarations: [MdSnackBarContainer, SimpleSnackBar],
+  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
+  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
+})
+export class MdSnackBarModule {}
+
+
+export * from './snack-bar';
+export * from './snack-bar-container';
+export * from './snack-bar-config';
+export * from './snack-bar-ref';
+export * from './simple-snack-bar';
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 8696895c04ad..a4ed737b2add 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -10,8 +10,8 @@ import {ComponentRef, Injectable, Injector, Optional, SkipSelf } from '@angular/
 import {Overlay, OverlayRef, OverlayState} from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType} from '@angular/cdk/portal';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {PortalInjector} from '../core/portal/portal-injector';
-import {extendObject} from '../core/util/object-extend';
+import {PortalInjector} from '@angular/material/core';
+import {extendObject} from '@angular/material/core';
 import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
 import {MdSnackBarRef} from './snack-bar-ref';
 import {MdSnackBarContainer} from './snack-bar-container';
diff --git a/src/lib/snack-bar/tsconfig-build.json b/src/lib/snack-bar/tsconfig-build.json
new file mode 100644
index 000000000000..d359903ccc29
--- /dev/null
+++ b/src/lib/snack-bar/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/snack-bar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/sort/index.ts b/src/lib/sort/index.ts
index 7d1ed5454b68..f93e7c31d564 100644
--- a/src/lib/sort/index.ts
+++ b/src/lib/sort/index.ts
@@ -6,21 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdSortHeader} from './sort-header';
-import {MdSort} from './sort';
-import {MdSortHeaderIntl} from './sort-header-intl';
-import {CommonModule} from '@angular/common';
-
-export * from './sort-direction';
-export * from './sort-header';
-export * from './sort-header-intl';
-export * from './sort';
-
-@NgModule({
-  imports: [CommonModule],
-  exports: [MdSort, MdSortHeader],
-  declarations: [MdSort, MdSortHeader],
-  providers: [MdSortHeaderIntl]
-})
-export class MdSortModule {}
+export * from './public_api';
diff --git a/src/lib/sort/public_api.ts b/src/lib/sort/public_api.ts
new file mode 100644
index 000000000000..7d1ed5454b68
--- /dev/null
+++ b/src/lib/sort/public_api.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdSortHeader} from './sort-header';
+import {MdSort} from './sort';
+import {MdSortHeaderIntl} from './sort-header-intl';
+import {CommonModule} from '@angular/common';
+
+export * from './sort-direction';
+export * from './sort-header';
+export * from './sort-header-intl';
+export * from './sort';
+
+@NgModule({
+  imports: [CommonModule],
+  exports: [MdSort, MdSortHeader],
+  declarations: [MdSort, MdSortHeader],
+  providers: [MdSortHeaderIntl]
+})
+export class MdSortModule {}
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index 803abb0333f4..57ff5f347081 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -12,7 +12,7 @@ import {
   getMdSortHeaderNotContainedWithinMdSortError
 } from './sort-errors';
 import {wrappedErrorMessage, dispatchMouseEvent} from '@angular/cdk/testing';
-import {map} from '../core/rxjs/index';
+import {map} from '@angular/material/core';
 import {MdTableModule} from '../table/index';
 
 describe('MdSort', () => {
diff --git a/src/lib/sort/tsconfig-build.json b/src/lib/sort/tsconfig-build.json
new file mode 100644
index 000000000000..ec944587d015
--- /dev/null
+++ b/src/lib/sort/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/sort",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/stepper/index.ts b/src/lib/stepper/index.ts
index 46ba69495ace..f93e7c31d564 100644
--- a/src/lib/stepper/index.ts
+++ b/src/lib/stepper/index.ts
@@ -6,44 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {PortalModule} from '@angular/cdk/portal';
-import {MdButtonModule} from '../button/index';
-import {MdStep, MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
-import {CdkStepperModule} from '@angular/cdk/stepper';
-import {MdCommonModule} from '../core';
-import {MdStepLabel} from './step-label';
-import {MdStepperNext, MdStepperPrevious} from './stepper-button';
-import {MdIconModule} from '../icon/index';
-import {MdStepHeader} from './step-header';
-
-@NgModule({
-  imports: [
-    MdCommonModule,
-    CommonModule,
-    PortalModule,
-    MdButtonModule,
-    CdkStepperModule,
-    MdIconModule
-  ],
-  exports: [
-    MdCommonModule,
-    MdHorizontalStepper,
-    MdVerticalStepper,
-    MdStep,
-    MdStepLabel,
-    MdStepper,
-    MdStepperNext,
-    MdStepperPrevious,
-    MdStepHeader
-  ],
-  declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
-    MdStepperNext, MdStepperPrevious, MdStepHeader],
-})
-export class MdStepperModule {}
-
-export * from './step-label';
-export * from './stepper';
-export * from './stepper-button';
-export * from './step-header';
+export * from './public_api';
diff --git a/src/lib/stepper/public_api.ts b/src/lib/stepper/public_api.ts
new file mode 100644
index 000000000000..298427d9eb63
--- /dev/null
+++ b/src/lib/stepper/public_api.ts
@@ -0,0 +1,50 @@
+/**
+ * @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 {PortalModule} from '@angular/cdk/portal';
+import {CdkStepperModule} from '@angular/cdk/stepper';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdButtonModule} from '@angular/material/button';
+import {MdCommonModule} from '@angular/material/core';
+import {MdIconModule} from '@angular/material/icon';
+import {MdStepHeader} from './step-header';
+import {MdStepLabel} from './step-label';
+import {MdHorizontalStepper, MdStep, MdStepper, MdVerticalStepper} from './stepper';
+import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+
+
+@NgModule({
+  imports: [
+    MdCommonModule,
+    CommonModule,
+    PortalModule,
+    MdButtonModule,
+    CdkStepperModule,
+    MdIconModule
+  ],
+  exports: [
+    MdCommonModule,
+    MdHorizontalStepper,
+    MdVerticalStepper,
+    MdStep,
+    MdStepLabel,
+    MdStepper,
+    MdStepperNext,
+    MdStepperPrevious,
+    MdStepHeader
+  ],
+  declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
+    MdStepperNext, MdStepperPrevious, MdStepHeader],
+})
+export class MdStepperModule {}
+
+export * from './step-label';
+export * from './stepper';
+export * from './stepper-button';
+export * from './step-header';
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index e25369d35c87..10176b3c2424 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Component, Input, ViewEncapsulation} from '@angular/core';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
+import {Component, Input, ViewEncapsulation} from '@angular/core';
+import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 import {MdStepLabel} from './step-label';
-import {MATERIAL_COMPATIBILITY_MODE} from '../core/compatibility/compatibility';
+
 
 @Component({
   moduleId: module.id,
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 13c357d80b62..db0f539358e1 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -8,7 +8,7 @@ import {MdStepperNext, MdStepperPrevious} from './stepper-button';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
 import {MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
-import {Directionality} from '../core';
+import {Directionality} from '@angular/material/core';
 
 const VALID_REGEX = /valid/;
 
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 6f40496d2cef..3ffab445a85b 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, state, style, transition, trigger} from '@angular/animations';
 import {CdkStep, CdkStepper} from '@angular/cdk/stepper';
 import {
   Component,
   ContentChild,
-  ContentChildren, Directive,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
+  ContentChildren,
+  Directive,
   ElementRef,
   forwardRef,
   Inject,
@@ -21,18 +20,17 @@ import {
   QueryList,
   SkipSelf,
   ViewChildren,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
-import {MdStepLabel} from './step-label';
+import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
 import {
   defaultErrorStateMatcher,
   ErrorOptions,
+  ErrorStateMatcher,
   MD_ERROR_GLOBAL_OPTIONS,
-  ErrorStateMatcher
-} from '../core/error/error-options';
-import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
+} from '@angular/material/core';
 import {MdStepHeader} from './step-header';
-import {state, style, transition, trigger, animate} from '@angular/animations';
+import {MdStepLabel} from './step-label';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
 export const _MdStep = CdkStep;
diff --git a/src/lib/stepper/tsconfig-build.json b/src/lib/stepper/tsconfig-build.json
new file mode 100644
index 000000000000..09793c4ded61
--- /dev/null
+++ b/src/lib/stepper/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/stepper",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/table/index.ts b/src/lib/table/index.ts
index 7976a84b62ec..f93e7c31d564 100644
--- a/src/lib/table/index.ts
+++ b/src/lib/table/index.ts
@@ -6,27 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdTable} from './table';
-import {CdkTableModule} from '@angular/cdk/table';
-import {MdCell, MdHeaderCell, MdCellDef, MdHeaderCellDef, MdColumnDef} from './cell';
-import {MdHeaderRow, MdRow, MdHeaderRowDef, MdRowDef, MatHeaderRowDef, MatRowDef} from './row';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '../core';
-
-export * from './cell';
-export * from './table';
-export * from './row';
-
-@NgModule({
-  imports: [CdkTableModule, CommonModule, MdCommonModule],
-  exports: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
-    MdHeaderRowDef, MdRowDef,
-    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
-    MatHeaderRowDef, MatRowDef],
-  declarations: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
-    MdHeaderRowDef, MdRowDef,
-    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
-    MatHeaderRowDef, MatRowDef],
-})
-export class MdTableModule {}
+export * from './public_api';
diff --git a/src/lib/table/public_api.ts b/src/lib/table/public_api.ts
new file mode 100644
index 000000000000..80517d4dde91
--- /dev/null
+++ b/src/lib/table/public_api.ts
@@ -0,0 +1,32 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdTable} from './table';
+import {CdkTableModule} from '@angular/cdk/table';
+import {MdCell, MdHeaderCell, MdCellDef, MdHeaderCellDef, MdColumnDef} from './cell';
+import {MdHeaderRow, MdRow, MdHeaderRowDef, MdRowDef, MatHeaderRowDef, MatRowDef} from './row';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule} from '@angular/material/core';
+
+export * from './cell';
+export * from './table';
+export * from './row';
+
+@NgModule({
+  imports: [CdkTableModule, CommonModule, MdCommonModule],
+  exports: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
+    MdHeaderRowDef, MdRowDef,
+    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
+    MatHeaderRowDef, MatRowDef],
+  declarations: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
+    MdHeaderRowDef, MdRowDef,
+    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
+    MatHeaderRowDef, MatRowDef],
+})
+export class MdTableModule {}
diff --git a/src/lib/table/tsconfig-build.json b/src/lib/table/tsconfig-build.json
new file mode 100644
index 000000000000..1f0b7ce0ec35
--- /dev/null
+++ b/src/lib/table/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/table",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tabs/index.ts b/src/lib/tabs/index.ts
index fec6353800b1..f93e7c31d564 100644
--- a/src/lib/tabs/index.ts
+++ b/src/lib/tabs/index.ts
@@ -6,61 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {PortalModule} from '@angular/cdk/portal';
-import {ObserversModule} from '@angular/cdk/observers';
-import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
-import {MdCommonModule, MdRippleModule} from '../core';
-import {MdTab} from './tab';
-import {MdTabGroup} from './tab-group';
-import {MdTabLabel} from './tab-label';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
-import {MdTabLink, MdTabNav} from './tab-nav-bar/tab-nav-bar';
-import {MdInkBar} from './ink-bar';
-import {MdTabBody} from './tab-body';
-import {MdTabHeader} from './tab-header';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdCommonModule,
-    PortalModule,
-    MdRippleModule,
-    ObserversModule,
-    ScrollDispatchModule,
-  ],
-  // Don't export all components because some are only to be used internally.
-  exports: [
-    MdCommonModule,
-    MdTabGroup,
-    MdTabLabel,
-    MdTab,
-    MdTabNav,
-    MdTabLink,
-  ],
-  declarations: [
-    MdTabGroup,
-    MdTabLabel,
-    MdTab,
-    MdInkBar,
-    MdTabLabelWrapper,
-    MdTabNav,
-    MdTabLink,
-    MdTabBody,
-    MdTabHeader
-  ],
-  providers: [VIEWPORT_RULER_PROVIDER],
-})
-export class MdTabsModule {}
-
-
-export * from './tab-group';
-export {MdInkBar} from './ink-bar';
-export {MdTabBody, MdTabBodyOriginState, MdTabBodyPositionState} from './tab-body';
-export {MdTabHeader, ScrollDirection} from './tab-header';
-export {MdTabLabelWrapper} from './tab-label-wrapper';
-export {MdTab} from './tab';
-export {MdTabLabel} from './tab-label';
-export {MdTabNav, MdTabLink} from './tab-nav-bar/index';
+export * from './public_api';
diff --git a/src/lib/tabs/public_api.ts b/src/lib/tabs/public_api.ts
new file mode 100644
index 000000000000..1821ae41243e
--- /dev/null
+++ b/src/lib/tabs/public_api.ts
@@ -0,0 +1,67 @@
+/**
+ * @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 {ObserversModule} from '@angular/cdk/observers';
+import {PortalModule} from '@angular/cdk/portal';
+import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdCommonModule, MdRippleModule} from '@angular/material/core';
+import {MdInkBar} from './ink-bar';
+import {MdTab} from './tab';
+import {MdTabBody} from './tab-body';
+import {MdTabGroup} from './tab-group';
+import {MdTabHeader} from './tab-header';
+import {MdTabLabel} from './tab-label';
+import {MdTabLabelWrapper} from './tab-label-wrapper';
+import {MdTabLink, MdTabNav} from './tab-nav-bar/tab-nav-bar';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdCommonModule,
+    PortalModule,
+    MdRippleModule,
+    ObserversModule,
+    ScrollDispatchModule,
+  ],
+  // Don't export all components because some are only to be used internally.
+  exports: [
+    MdCommonModule,
+    MdTabGroup,
+    MdTabLabel,
+    MdTab,
+    MdTabNav,
+    MdTabLink,
+  ],
+  declarations: [
+    MdTabGroup,
+    MdTabLabel,
+    MdTab,
+    MdInkBar,
+    MdTabLabelWrapper,
+    MdTabNav,
+    MdTabLink,
+    MdTabBody,
+    MdTabHeader
+  ],
+  providers: [VIEWPORT_RULER_PROVIDER],
+})
+export class MdTabsModule {}
+
+
+export * from './tab-group';
+export {MdInkBar} from './ink-bar';
+export {MdTabBody, MdTabBodyOriginState, MdTabBodyPositionState} from './tab-body';
+export {MdTabHeader, ScrollDirection} from './tab-header';
+export {MdTabLabelWrapper} from './tab-label-wrapper';
+export {MdTab} from './tab';
+export {MdTabLabel} from './tab-label';
+export {MdTabNav, MdTabLink} from './tab-nav-bar/index';
+
diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts
index e5f459ec12fb..bd7592f97a36 100644
--- a/src/lib/tabs/tab-body.spec.ts
+++ b/src/lib/tabs/tab-body.spec.ts
@@ -3,10 +3,10 @@ import {CommonModule} from '@angular/common';
 import {PortalModule} from '@angular/cdk/portal';
 import {async, ComponentFixture, TestBed, flushMicrotasks, fakeAsync} from '@angular/core/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {Direction, Directionality} from '../core/bidi/index';
-import {TemplatePortal} from '../core/portal/portal';
+import {Direction, Directionality} from '@angular/material/core';
+import {TemplatePortal} from '@angular/material/core';
 import {MdTabBody} from './tab-body';
-import {MdRippleModule} from '../core/ripple/index';
+import {MdRippleModule} from '@angular/material/core';
 
 
 describe('MdTabBody', () => {
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 749e9d6c661c..1521c92382ac 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -28,8 +28,8 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
 import {MdTab} from './tab';
 import {merge} from 'rxjs/observable/merge';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
-import {CanColor, mixinColor, ThemePalette} from '../core/common-behaviors/color';
+import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
+import {CanColor, mixinColor, ThemePalette} from '@angular/material/core';
 
 
 /** Used to generate unique ID's for each tab component */
diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index 64239dfc60a2..d3a2aceea4e2 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -10,7 +10,7 @@ import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {dispatchFakeEvent, dispatchKeyboardEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {MdTabHeader} from './tab-header';
-import {MdRippleModule} from '../core/ripple/index';
+import {MdRippleModule} from '@angular/material/core';
 import {MdInkBar} from './ink-bar';
 import {MdTabLabelWrapper} from './tab-label-wrapper';
 import {Subject} from 'rxjs/Subject';
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 00f0987bc69e..638c53a268f7 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -6,34 +6,35 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
+import {auditTime, startWith} from '@angular/cdk/rxjs';
 import {
-  ViewChild,
+  AfterContentChecked,
+  AfterContentInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
-  Input,
-  QueryList,
-  ElementRef,
-  ViewEncapsulation,
   ContentChildren,
-  Output,
+  ElementRef,
   EventEmitter,
-  Optional,
-  AfterContentChecked,
-  AfterContentInit,
+  Input,
   OnDestroy,
+  Optional,
+  Output,
+  QueryList,
   Renderer2,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
+  ViewChild,
+  ViewEncapsulation,
 } from '@angular/core';
-import {Directionality, Direction} from '@angular/cdk/bidi';
-import {RIGHT_ARROW, LEFT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
-import {auditTime, startWith} from '@angular/cdk/rxjs';
-import {Subscription} from 'rxjs/Subscription';
-import {of as observableOf} from 'rxjs/observable/of';
-import {merge} from 'rxjs/observable/merge';
+import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 import {fromEvent} from 'rxjs/observable/fromEvent';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
+import {merge} from 'rxjs/observable/merge';
+import {of as observableOf} from 'rxjs/observable/of';
+import {Subscription} from 'rxjs/Subscription';
 import {MdInkBar} from './ink-bar';
-import {CanDisableRipple, mixinDisableRipple} from '../core/common-behaviors/disable-ripple';
+import {MdTabLabelWrapper} from './tab-label-wrapper';
+
 
 /**
  * The directions that scrolling can go in when the header's tabs exceed the header width. 'After'
diff --git a/src/lib/tabs/tab-label-wrapper.ts b/src/lib/tabs/tab-label-wrapper.ts
index 4ce986a27dff..6dcc39f556bf 100644
--- a/src/lib/tabs/tab-label-wrapper.ts
+++ b/src/lib/tabs/tab-label-wrapper.ts
@@ -7,7 +7,7 @@
  */
 
 import {Directive, ElementRef} from '@angular/core';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
+import {CanDisable, mixinDisabled} from '@angular/material/core';
 
 // Boilerplate for applying mixins to MdTabLabelWrapper.
 /** @docs-private */
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index d247017fe418..44a22aa7b18c 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -6,38 +6,46 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {Platform} from '@angular/cdk/platform';
+import {auditTime, takeUntil} from '@angular/cdk/rxjs';
+import {ViewportRuler} from '@angular/cdk/scrolling';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  ContentChildren,
   Directive,
   ElementRef,
+  forwardRef,
   Inject,
   Input,
   NgZone,
   OnDestroy,
   Optional,
+  QueryList,
   Renderer2,
   ViewChild,
   ViewEncapsulation,
-  ContentChildren,
-  QueryList,
-  forwardRef,
 } from '@angular/core';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {Directionality} from '@angular/cdk/bidi';
-import {Platform} from '@angular/cdk/platform';
-import {auditTime, takeUntil} from '@angular/cdk/rxjs';
-import {Subject} from 'rxjs/Subject';
-import {of as observableOf} from 'rxjs/observable/of';
-import {merge} from 'rxjs/observable/merge';
+import {
+  CanColor,
+  CanDisable,
+  CanDisableRipple,
+  MD_RIPPLE_GLOBAL_OPTIONS,
+  MdRipple,
+  mixinColor,
+  mixinDisabled,
+  mixinDisableRipple,
+  RippleGlobalOptions,
+  ThemePalette,
+} from '@angular/material/core';
 import {fromEvent} from 'rxjs/observable/fromEvent';
-import {CanDisableRipple, mixinDisableRipple} from '../../core/common-behaviors/disable-ripple';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {CanDisable, mixinDisabled} from '../../core/common-behaviors/disabled';
-import {MD_RIPPLE_GLOBAL_OPTIONS, MdRipple, RippleGlobalOptions} from '../../core';
-import {CanColor, mixinColor, ThemePalette} from '../../core/common-behaviors/color';
+import {merge} from 'rxjs/observable/merge';
+import {of as observableOf} from 'rxjs/observable/of';
+import {Subject} from 'rxjs/Subject';
 import {MdInkBar} from '../ink-bar';
 
 
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index 306593ae0b71..2031d0716541 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TemplatePortal} from '../core/portal/portal';
+import {TemplatePortal} from '@angular/material/core';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -21,7 +21,7 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanDisable, mixinDisabled} from '../core/common-behaviors/disabled';
+import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {MdTabLabel} from './tab-label';
 import {Subject} from 'rxjs/Subject';
 
diff --git a/src/lib/tabs/tsconfig-build.json b/src/lib/tabs/tsconfig-build.json
new file mode 100644
index 000000000000..b86c725d3b37
--- /dev/null
+++ b/src/lib/tabs/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/tabs",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/toolbar/index.ts b/src/lib/toolbar/index.ts
index eb66854ca316..f93e7c31d564 100644
--- a/src/lib/toolbar/index.ts
+++ b/src/lib/toolbar/index.ts
@@ -6,17 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '../core';
-import {MdToolbar, MdToolbarRow} from './toolbar';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [MdToolbar, MdToolbarRow, MdCommonModule],
-  declarations: [MdToolbar, MdToolbarRow],
-})
-export class MdToolbarModule {}
-
-
-export * from './toolbar';
+export * from './public_api';
diff --git a/src/lib/toolbar/public_api.ts b/src/lib/toolbar/public_api.ts
new file mode 100644
index 000000000000..011492c6388f
--- /dev/null
+++ b/src/lib/toolbar/public_api.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {MdToolbar, MdToolbarRow} from './toolbar';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [MdToolbar, MdToolbarRow, MdCommonModule],
+  declarations: [MdToolbar, MdToolbarRow],
+})
+export class MdToolbarModule {}
+
+
+export * from './toolbar';
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index 772869c8fadb..19bdad5ff463 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -14,7 +14,7 @@ import {
   ElementRef,
   Renderer2,
 } from '@angular/core';
-import {CanColor, mixinColor} from '../core/common-behaviors/color';
+import {CanColor, mixinColor} from '@angular/material/core';
 
 
 @Directive({
diff --git a/src/lib/toolbar/tsconfig-build.json b/src/lib/toolbar/tsconfig-build.json
new file mode 100644
index 000000000000..5cb7948f310d
--- /dev/null
+++ b/src/lib/toolbar/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/toolbar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tooltip/index.ts b/src/lib/tooltip/index.ts
index f16ad06caff9..f93e7c31d564 100644
--- a/src/lib/tooltip/index.ts
+++ b/src/lib/tooltip/index.ts
@@ -6,29 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PlatformModule} from '@angular/cdk/platform';
-import {MdCommonModule} from '../core';
-import {MdTooltip, TooltipComponent, MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER} from './tooltip';
-import {A11yModule, ARIA_DESCRIBER_PROVIDER} from '@angular/cdk/a11y';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    OverlayModule,
-    MdCommonModule,
-    PlatformModule,
-    A11yModule,
-  ],
-  exports: [MdTooltip, TooltipComponent, MdCommonModule],
-  declarations: [MdTooltip, TooltipComponent],
-  entryComponents: [TooltipComponent],
-  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
-})
-export class MdTooltipModule {}
-
-
-export * from './tooltip';
+export * from './public_api';
diff --git a/src/lib/tooltip/public_api.ts b/src/lib/tooltip/public_api.ts
new file mode 100644
index 000000000000..db8e168c0701
--- /dev/null
+++ b/src/lib/tooltip/public_api.ts
@@ -0,0 +1,34 @@
+/**
+ * @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 {A11yModule, ARIA_DESCRIBER_PROVIDER} from '@angular/cdk/a11y';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {PlatformModule} from '@angular/cdk/platform';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, MdTooltip, TooltipComponent} from './tooltip';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    OverlayModule,
+    MdCommonModule,
+    PlatformModule,
+    A11yModule,
+  ],
+  exports: [MdTooltip, TooltipComponent, MdCommonModule],
+  declarations: [MdTooltip, TooltipComponent],
+  entryComponents: [TooltipComponent],
+  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
+})
+export class MdTooltipModule {}
+
+
+export * from './tooltip';
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 9dddf7387c6d..7cca6e1c9fb9 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -6,6 +6,24 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
+import {AriaDescriber} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {
+  OriginConnectionPosition,
+  Overlay,
+  OverlayConnectionPosition,
+  OverlayRef,
+  OverlayState,
+  RepositionScrollStrategy,
+  ScrollStrategy,
+} from '@angular/cdk/overlay';
+import {Platform} from '@angular/cdk/platform';
+import {ComponentPortal} from '@angular/cdk/portal';
+import {first} from '@angular/cdk/rxjs';
+import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -22,29 +40,8 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
-import {ComponentPortal} from '@angular/cdk/portal';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {Directionality} from '@angular/cdk/bidi';
-import {Platform} from '@angular/cdk/platform';
-import {first} from '@angular/cdk/rxjs';
-import {
-  OriginConnectionPosition,
-  Overlay,
-  OverlayConnectionPosition,
-  OverlayRef,
-  OverlayState,
-  RepositionScrollStrategy,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  ScrollStrategy,
-} from '@angular/cdk/overlay';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {ESCAPE} from '@angular/cdk/keycodes';
-import {AriaDescriber} from '@angular/cdk/a11y';
 
 
 export type TooltipPosition = 'left' | 'right' | 'above' | 'below' | 'before' | 'after';
diff --git a/src/lib/tooltip/tsconfig-build.json b/src/lib/tooltip/tsconfig-build.json
new file mode 100644
index 000000000000..1a9490324e1f
--- /dev/null
+++ b/src/lib/tooltip/tsconfig-build.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/tooltip",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tsconfig-build.json b/src/lib/tsconfig-build.json
index baba3f5ba82d..8da26353210e 100644
--- a/src/lib/tsconfig-build.json
+++ b/src/lib/tsconfig-build.json
@@ -21,7 +21,8 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"],
+      "@angular/material/*": ["../../dist/packages/material/*/public_api"]
     }
   },
   "files": [
diff --git a/src/lib/tsconfig-tests.json b/src/lib/tsconfig-tests.json
index 161d5a28c2d4..6a405806a69d 100644
--- a/src/lib/tsconfig-tests.json
+++ b/src/lib/tsconfig-tests.json
@@ -7,7 +7,11 @@
     "importHelpers": false,
     "module": "commonjs",
     "target": "es5",
-    "types": ["jasmine"]
+    "types": ["jasmine"],
+    "paths": {
+      "@angular/material/*": ["./*"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+    }
   },
   "include": [
     "**/*.spec.ts",
diff --git a/src/lib/tsconfig.json b/src/lib/tsconfig.json
new file mode 100644
index 000000000000..d5174fe9611c
--- /dev/null
+++ b/src/lib/tsconfig.json
@@ -0,0 +1,13 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/material/*": ["./*"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/material-examples/package.json b/src/material-examples/package.json
index e4f029d0dfa4..dc2080808034 100644
--- a/src/material-examples/package.json
+++ b/src/material-examples/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular Material Examples",
   "main": "./bundles/material-examples.umd.js",
-  "module": "./@angular/material-examples.es5.js",
-  "es2015": "./@angular/material-examples.js",
+  "module": "./esm5/material-examples.es5.js",
+  "es2015": "./esm2015/material-examples.js",
   "typings": "./material-examples.d.ts",
   "private": true,
   "repository": {
diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index 34389b71561e..60c10fa515b6 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -109,7 +109,7 @@ export class ExampleDataSource extends DataSource<GithubIssue> {
         this.isLoadingResults = false;
         // Catch if the GitHub API has reached its rate limit. Return empty data.
         this.isRateLimitReached = true;
-        return Observable.of(null);
+        return Observable.of([]);
       });
   }
 
diff --git a/src/material-examples/tsconfig-build.json b/src/material-examples/tsconfig-build.json
index 312490abaec9..4d04613664e0 100644
--- a/src/material-examples/tsconfig-build.json
+++ b/src/material-examples/tsconfig-build.json
@@ -20,6 +20,7 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*/public_api"],
       "@angular/material": ["../../dist/packages/material/public_api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
     }
diff --git a/src/material-examples/tsconfig.json b/src/material-examples/tsconfig.json
new file mode 100644
index 000000000000..3e4fa9c6417d
--- /dev/null
+++ b/src/material-examples/tsconfig.json
@@ -0,0 +1,14 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/material/*": ["../lib/*"],
+      "@angular/material": ["../lib/public_api.ts"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/material-examples/typings.d.ts b/src/material-examples/typings.d.ts
new file mode 100644
index 000000000000..bf6ef74f4b61
--- /dev/null
+++ b/src/material-examples/typings.d.ts
@@ -0,0 +1 @@
+declare const module: {id: string};
diff --git a/src/material-moment-adapter/package.json b/src/material-moment-adapter/package.json
index 8e50eeac9aa7..7e1141586f4f 100644
--- a/src/material-moment-adapter/package.json
+++ b/src/material-moment-adapter/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular Material Moment Adapter",
   "main": "./bundles/material-moment-adapter.umd.js",
-  "module": "./@angular/material-moment-adapter.es5.js",
-  "es2015": "./@angular/material-moment-adapter.js",
+  "module": "./esm5/material-moment-adapter.es5.js",
+  "es2015": "./esm2015/material-moment-adapter.js",
   "typings": "./material-moment-adapter.d.ts",
   "repository": {
     "type": "git",
diff --git a/src/material-moment-adapter/tsconfig-build.json b/src/material-moment-adapter/tsconfig-build.json
index e964dd29752b..8aeaea2f87d6 100644
--- a/src/material-moment-adapter/tsconfig-build.json
+++ b/src/material-moment-adapter/tsconfig-build.json
@@ -23,7 +23,9 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/material": ["../../dist/packages/material/public_api"]
+      "@angular/material/*": ["../../dist/packages/material/*/public_api"],
+      "@angular/material": ["../../dist/packages/material/public_api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
     }
   },
   "files": [
diff --git a/src/material-moment-adapter/tsconfig.json b/src/material-moment-adapter/tsconfig.json
new file mode 100644
index 000000000000..3e4fa9c6417d
--- /dev/null
+++ b/src/material-moment-adapter/tsconfig.json
@@ -0,0 +1,14 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/material/*": ["../lib/*"],
+      "@angular/material": ["../lib/public_api.ts"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/universal-app/tsconfig-build.json b/src/universal-app/tsconfig-build.json
index b51d28668fc0..adf897b7aba4 100644
--- a/src/universal-app/tsconfig-build.json
+++ b/src/universal-app/tsconfig-build.json
@@ -19,7 +19,8 @@
     "baseUrl": ".",
     "paths": {
       "@angular/material": ["./material"],
-      "@angular/cdk/*": ["./cdk/*"]
+      "@angular/cdk/*": ["./cdk/*"],
+      "@angular/material/*": ["./material/*"]
     }
   },
   "files": [
diff --git a/src/universal-app/tsconfig-prerender.json b/src/universal-app/tsconfig-prerender.json
index b93ecc292994..1d43000eef9e 100644
--- a/src/universal-app/tsconfig-prerender.json
+++ b/src/universal-app/tsconfig-prerender.json
@@ -19,7 +19,8 @@
     "baseUrl": ".",
     "paths": {
       "@angular/material": ["./material"],
-      "@angular/cdk/*": ["./cdk/*"]
+      "@angular/cdk/*": ["./cdk/*"],
+      "@angular/material/*": ["./material/*"]
     }
   },
   "files": [
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 51fb7450022c..685ad98cefd7 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -64,6 +64,38 @@ System.config({
     '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
     '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
     '@angular/cdk/testing': 'dist/packages/cdk/testing/index.js',
+
+    '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
+    '@angular/material/button': 'dist/packages/material/button/index.js',
+    '@angular/material/button-toggle': 'dist/packages/material/button-toggle/index.js',
+    '@angular/material/card': 'dist/packages/material/card/index.js',
+    '@angular/material/checkbox': 'dist/packages/material/checkbox/index.js',
+    '@angular/material/chips': 'dist/packages/material/chips/index.js',
+    '@angular/material/core': 'dist/packages/material/core/index.js',
+    '@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
+    '@angular/material/dialog': 'dist/packages/material/dialog/index.js',
+    '@angular/material/expansion': 'dist/packages/material/expansion/index.js',
+    '@angular/material/form-field': 'dist/packages/material/form-field/index.js',
+    '@angular/material/grid-list': 'dist/packages/material/grid-list/index.js',
+    '@angular/material/icon': 'dist/packages/material/icon/index.js',
+    '@angular/material/input': 'dist/packages/material/input/index.js',
+    '@angular/material/list': 'dist/packages/material/list/index.js',
+    '@angular/material/menu': 'dist/packages/material/menu/index.js',
+    '@angular/material/paginator': 'dist/packages/material/paginator/index.js',
+    '@angular/material/progress-bar': 'dist/packages/material/progress-bar/index.js',
+    '@angular/material/progress-spinner': 'dist/packages/material/progress-spinner/index.js',
+    '@angular/material/radio': 'dist/packages/material/radio/index.js',
+    '@angular/material/select': 'dist/packages/material/select/index.js',
+    '@angular/material/sidenav': 'dist/packages/material/sidenav/index.js',
+    '@angular/material/slide-toggle': 'dist/packages/material/slide-toggle/index.js',
+    '@angular/material/slider': 'dist/packages/material/slider/index.js',
+    '@angular/material/snack-bar': 'dist/packages/material/snack-bar/index.js',
+    '@angular/material/sort': 'dist/packages/material/sort/index.js',
+    '@angular/material/stepper': 'dist/packages/material/stepper/index.js',
+    '@angular/material/table': 'dist/packages/material/table/index.js',
+    '@angular/material/tabs': 'dist/packages/material/tabs/index.js',
+    '@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
+    '@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
   },
   packages: {
     // Thirdparty barrels.
diff --git a/tools/gulp/packages.ts b/tools/gulp/packages.ts
index 40ce3463fd9a..890c435f52ad 100644
--- a/tools/gulp/packages.ts
+++ b/tools/gulp/packages.ts
@@ -7,5 +7,9 @@ export const examplesPackage = new BuildPackage('material-examples', [materialPa
 export const momentAdapterPackage = new BuildPackage('material-moment-adapter',
     [materialPackage, cdkPackage]);
 
+// The material package re-exports its secondary entry-points at the root so that all of the
+// components can still be imported through `@angular/material`.
+materialPackage.exportsSecondaryEntryPointsAtRoot = true;
+
 // To avoid refactoring of the project the material package will map to the source path `lib/`.
-materialPackage.packageRoot = join(buildConfig.packagesDir, 'lib');
+materialPackage.sourceDir = join(buildConfig.packagesDir, 'lib');
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index 313a74239129..cb3cec505951 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -17,7 +17,7 @@ const appDir = join(packagesDir, 'demo-app');
 const outDir = join(outputDir, 'packages', 'demo-app');
 
 /** Path to the output of the Material package. */
-const materialOutPath = join(outputDir, 'packages', 'material');
+const materialOutPath = join(outDir, 'packages', 'material');
 
 /** Array of vendors that are required to serve the demo-app. */
 const appVendors = [
diff --git a/tools/gulp/tasks/material-release.ts b/tools/gulp/tasks/material-release.ts
index 183cf0bea501..201ab1c17991 100644
--- a/tools/gulp/tasks/material-release.ts
+++ b/tools/gulp/tasks/material-release.ts
@@ -8,22 +8,22 @@ import {materialPackage} from '../packages';
 // There are no type definitions available for these imports.
 const gulpRename = require('gulp-rename');
 
-const {outputDir} = buildConfig;
-const {packageRoot, packageOut} = materialPackage;
+const distDir = buildConfig.outputDir;
+const {sourceDir, outputDir} = materialPackage;
 
 /** Path to the directory where all releases are created. */
-const releasesDir = join(outputDir, 'releases');
+const releasesDir = join(distDir, 'releases');
 
 // Path to the release output of material.
 const releasePath = join(releasesDir, 'material');
 // The entry-point for the scss theming bundle.
-const themingEntryPointPath = join(packageRoot, 'core', 'theming', '_all-theme.scss');
+const themingEntryPointPath = join(sourceDir, 'core', 'theming', '_all-theme.scss');
 // Output path for the scss theming bundle.
 const themingBundlePath = join(releasePath, '_theming.scss');
 // Matches all pre-built theme css files
-const prebuiltThemeGlob = join(packageOut, '**/theming/prebuilt/*.css?(.map)');
+const prebuiltThemeGlob = join(outputDir, '**/theming/prebuilt/*.css?(.map)');
 // Matches all SCSS files in the library.
-const allScssGlob = join(packageRoot, '**/*.scss');
+const allScssGlob = join(sourceDir, '**/*.scss');
 
 /**
  * Overwrite the release task for the material package. The material release will include special
diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index ab84af91386c..d65c3fe2dd70 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -1,80 +1,181 @@
-import {join} from 'path';
+import {join, dirname} from 'path';
 import {ScriptTarget, ModuleKind, NewLineKind} from 'typescript';
 import {uglifyJsFile} from './minify-sources';
-import {createRollupBundle} from './rollup-helpers';
 import {remapSourcemap} from './sourcemap-remap';
 import {transpileFile} from './typescript-transpile';
 import {buildConfig} from './build-config';
+import {BuildPackage} from './build-package';
+import {rollupRemoveLicensesPlugin} from './rollup-remove-licenses';
+import {rollupGlobals} from './rollup-globals';
+
+// There are no type definitions available for these imports.
+const rollup = require('rollup');
+const rollupNodeResolutionPlugin = require('rollup-plugin-node-resolve');
+const rollupAlias = require('rollup-plugin-alias');
 
 /** Directory where all bundles will be created in. */
 const bundlesDir = join(buildConfig.outputDir, 'bundles');
 
-/** Builds bundles for the primary entry-point w/ given entry file, e.g. @angular/cdk */
-export async function buildPrimaryEntryPointBundles(entryFile: string, packageName: string) {
-  return createBundlesForEntryPoint({
-    entryFile,
-    moduleName: `ng.${packageName}`,
-    fesm2015Dest: join(bundlesDir, `${packageName}.js`),
-    fesm2014Dest: join(bundlesDir, `${packageName}.es5.js`),
-    umdDest: join(bundlesDir, `${packageName}.umd.js`),
-    umdMinDest: join(bundlesDir, `${packageName}.umd.min.js`),
-  });
-}
 
-/** Builds bundles for a single secondary entry-point w/ given entry file, e.g. @angular/cdk/a11y */
-export async function buildSecondaryEntryPointBundles(entryFile: string, packageName: string,
-                                                      entryPointName: string) {
-  return createBundlesForEntryPoint({
-    entryFile,
-    moduleName: `ng.${packageName}.${entryPointName}`,
-    fesm2015Dest: join(bundlesDir, `${packageName}`, `${entryPointName}.js`),
-    fesm2014Dest: join(bundlesDir, `${packageName}`, `${entryPointName}.es5.js`),
-    umdDest: join(bundlesDir, `${packageName}-${entryPointName}.umd.js`),
-    umdMinDest: join(bundlesDir, `${packageName}-${entryPointName}.umd.min.js`),
-  });
-}
+/** Utility for creating bundles from raw ngc output. */
+export class PackageBundler {
+  constructor(private buildPackage: BuildPackage) {}
+
+  /** Creates all bundles for the package and all associated entry points (UMD, ES5, ES2015). */
+  async createBundles() {
+    for (const entryPoint of this.buildPackage.secondaryEntryPoints) {
+      await this.bundleSecondaryEntryPoint(entryPoint);
+    }
+
+    await this.bundlePrimaryEntryPoint();
+  }
+
+  /** Bundles the primary entry-point w/ given entry file, e.g. @angular/cdk */
+  private async bundlePrimaryEntryPoint() {
+    const packageName = this.buildPackage.name;
+
+    return this.bundleEntryPoint({
+      entryFile: this.buildPackage.entryFilePath,
+      moduleName: `ng.${this.buildPackage.name}`,
+      esm2015Dest: join(bundlesDir, `${packageName}.js`),
+      esm5Dest: join(bundlesDir, `${packageName}.es5.js`),
+      umdDest: join(bundlesDir, `${packageName}.umd.js`),
+      umdMinDest: join(bundlesDir, `${packageName}.umd.min.js`),
+    });
+  }
+
+  /** Bundles a single secondary entry-point w/ given entry file, e.g. @angular/cdk/a11y */
+  private async bundleSecondaryEntryPoint(entryPoint: string) {
+    const packageName = this.buildPackage.name;
+    const entryFile = join(this.buildPackage.outputDir, entryPoint, 'index.js');
+
+    return this.bundleEntryPoint({
+      entryFile,
+      moduleName: `ng.${packageName}.${entryPoint}`,
+      esm2015Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.js`),
+      esm5Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.es5.js`),
+      umdDest: join(bundlesDir, `${packageName}-${entryPoint}.umd.js`),
+      umdMinDest: join(bundlesDir, `${packageName}-${entryPoint}.umd.min.js`),
+    });
+  }
+
+  /**
+   * Creates the ES5, ES2015, and UMD bundles for the specified entry-point.
+   * @param config Configuration that specifies the entry-point, module name, and output
+   *     bundle paths.
+   */
+  private async bundleEntryPoint(config: BundlesConfig) {
+    // Build FESM-2015 bundle file.
+    await this.createRollupBundle({
+      moduleName: config.moduleName,
+      entry: config.entryFile,
+      dest: config.esm2015Dest,
+      format: 'es',
+    });
+
+    await remapSourcemap(config.esm2015Dest);
+
+    // Downlevel ES2015 bundle to ES5.
+    transpileFile(config.esm2015Dest, config.esm5Dest, {
+      importHelpers: true,
+      target: ScriptTarget.ES5,
+      module: ModuleKind.ES2015,
+      allowJs: true,
+      newLine: NewLineKind.LineFeed
+    });
+
+    await remapSourcemap(config.esm5Dest);
+
+    // Create UMD bundle of ES5 output.
+    await this.createRollupBundle({
+      moduleName: config.moduleName,
+      entry: config.esm5Dest,
+      dest: config.umdDest,
+      format: 'umd'
+    });
+
+    await remapSourcemap(config.umdDest);
 
-/**
- * Creates the ES5, ES2015, and UMD bundles for the specified entry-point.
- * @param config Configuration that specifies the entry-point, module name, and output
- *     bundle paths.
- */
-async function createBundlesForEntryPoint(config: BundlesConfig) {
-  // Build FESM-2015 bundle file.
-  await createRollupBundle({
-    moduleName: config.moduleName,
-    entry: config.entryFile,
-    dest: config.fesm2015Dest,
-    format: 'es',
-  });
-
-  await remapSourcemap(config.fesm2015Dest);
-
-  // Downlevel FESM-2015 file to ES5.
-  transpileFile(config.fesm2015Dest, config.fesm2014Dest, {
-    importHelpers: true,
-    target: ScriptTarget.ES5,
-    module: ModuleKind.ES2015,
-    allowJs: true,
-    newLine: NewLineKind.LineFeed
-  });
-
-  await remapSourcemap(config.fesm2014Dest);
-
-  // Create UMD bundle of FESM-2014 output.
-  await createRollupBundle({
-    moduleName: config.moduleName,
-    entry: config.fesm2014Dest,
-    dest: config.umdDest,
-    format: 'umd'
-  });
-
-  await remapSourcemap(config.umdDest);
-
-  // Create a minified UMD bundle using UglifyJS
-  uglifyJsFile(config.umdDest, config.umdMinDest);
-
-  await remapSourcemap(config.umdMinDest);
+    // Create a minified UMD bundle using UglifyJS
+    uglifyJsFile(config.umdDest, config.umdMinDest);
+
+    await remapSourcemap(config.umdMinDest);
+  }
+
+  /** Creates a rollup bundle of a specified JavaScript file.*/
+  private async createRollupBundle(config: RollupBundleConfig) {
+    const bundleOptions = {
+      context: 'this',
+      external: Object.keys(rollupGlobals),
+      entry: config.entry,
+      onwarn: (message: string) => {
+        // TODO(jelbourn): figure out *why* rollup warns about certain symbols not being found
+        // when those symbols don't appear to be in the input file in the first place.
+        if (/but never used/.test(message)) {
+          return false;
+        }
+
+        console.warn(message);
+      },
+      plugins: [
+        rollupRemoveLicensesPlugin,
+      ]
+    };
+
+    const writeOptions = {
+      // Keep the moduleId empty because we don't want to force developers to a specific moduleId.
+      moduleId: '',
+      moduleName: config.moduleName || 'ng.material',
+      banner: buildConfig.licenseBanner,
+      format: config.format,
+      dest: config.dest,
+      globals: rollupGlobals,
+      sourceMap: true
+    };
+
+    // For UMD bundles, we need to adjust the `external` bundle option in order to include
+    // all necessary code in the bundle.
+    if (config.format === 'umd') {
+      bundleOptions.plugins.push(rollupNodeResolutionPlugin());
+
+      // For all UMD bundles, we want to exclude tslib from the `external` bundle option so that
+      // it is inlined into the bundle.
+      let external = Object.keys(rollupGlobals);
+      external.splice(external.indexOf('tslib'), 1);
+
+      // If each secondary entry-point is re-exported at the root, we want to exlclude those
+      // secondary entry-points from the rollup globals because we want the UMD for this package
+      // to include *all* of the sources for those entry-points.
+      if (this.buildPackage.exportsSecondaryEntryPointsAtRoot) {
+        const importRegex = new RegExp(`@angular/${this.buildPackage.name}/.+`, 'g');
+        external = external.filter(e => !importRegex.test(e));
+
+        // Use the rollup-alias plugin to map imports of the form `@angular/material/button`
+        // to the actual file location so that rollup can resolve the imports (otherwise they
+        // will be treated as external dependencies and not included in the bundle).
+        bundleOptions.plugins.push(
+            rollupAlias(this.getResolvedSecondaryEntryPointImportPaths(config.dest)));
+      }
+
+      bundleOptions.external = external;
+    }
+
+    return rollup.rollup(bundleOptions).then((bundle: any) => bundle.write(writeOptions));
+  }
+
+  /**
+   * Gets mapping of import aliases (e.g. `@angular/material/button`) to the path of the es5
+   * bundle output.
+   * @param bundleOutputDir Path to the bundle output directory.
+   * @returns Map of alias to resolved path.
+   */
+  private getResolvedSecondaryEntryPointImportPaths(bundleOutputDir: string) {
+    return this.buildPackage.secondaryEntryPoints.reduce((map, p) => {
+      map[`@angular/${this.buildPackage.name}/${p}`] =
+          join(dirname(bundleOutputDir), 'material', `${p}.es5`);
+      return map;
+    }, {} as {[key: string]: string});
+  }
 }
 
 
@@ -82,8 +183,16 @@ async function createBundlesForEntryPoint(config: BundlesConfig) {
 interface BundlesConfig {
   entryFile: string;
   moduleName: string;
-  fesm2015Dest: string;
-  fesm2014Dest: string;
+  esm2015Dest: string;
+  esm5Dest: string;
   umdDest: string;
   umdMinDest: string;
 }
+
+/** Configuration for creating a bundle via rollup. */
+interface RollupBundleConfig {
+  entry: string;
+  dest: string;
+  format: string;
+  moduleName: string;
+}
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index d90af0899736..616d8b0e68eb 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -1,8 +1,10 @@
+import {main as ngc} from '@angular/tsc-wrapped';
+import {readFileSync, writeFileSync} from 'fs';
+import {sync as glob} from 'glob';
 import {join} from 'path';
-import {main as tsc} from '@angular/tsc-wrapped';
 import {buildConfig} from './build-config';
 import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
-import {buildPrimaryEntryPointBundles, buildSecondaryEntryPointBundles} from './build-bundles';
+import {PackageBundler} from './build-bundles';
 
 
 const {packagesDir, outputDir} = buildConfig;
@@ -13,22 +15,29 @@ const buildTsconfigName = 'tsconfig-build.json';
 /** Name of the tsconfig file that is responsible for building the tests. */
 const testsTsconfigName = 'tsconfig-tests.json';
 
-export class BuildPackage {
+/** Incrementing ID counter. */
+let nextId = 0;
 
+export class BuildPackage {
   /** Path to the package sources. */
-  packageRoot: string;
+  sourceDir: string;
 
   /** Path to the package output. */
-  packageOut: string;
+  outputDir: string;
+
+  /** Whether this package will re-export its secondary-entry points at the root module. */
+  exportsSecondaryEntryPointsAtRoot = false;
 
   /** Path to the entry file of the package in the output directory. */
-  private entryFilePath: string;
+  readonly entryFilePath: string;
 
   /** Path to the tsconfig file, which will be used to build the package. */
-  private tsconfigBuild: string;
+  private readonly tsconfigBuild: string;
 
   /** Path to the tsconfig file, which will be used to build the tests. */
-  private tsconfigTests: string;
+  private readonly tsconfigTests: string;
+
+  private readonly bundler = new PackageBundler(this);
 
   /** Secondary entry points for the package. */
   get secondaryEntryPoints(): string[] {
@@ -41,24 +50,25 @@ export class BuildPackage {
 
   private _secondaryEntryPoints: string[];
 
-  constructor(public packageName: string, public dependencies: BuildPackage[] = []) {
-    this.packageRoot = join(packagesDir, packageName);
-    this.packageOut = join(outputDir, 'packages', packageName);
+  constructor(public readonly name: string, public readonly dependencies: BuildPackage[] = []) {
+    this.sourceDir = join(packagesDir, name);
+    this.outputDir = join(outputDir, 'packages', name);
 
-    this.tsconfigBuild = join(this.packageRoot, buildTsconfigName);
-    this.tsconfigTests = join(this.packageRoot, testsTsconfigName);
+    this.tsconfigBuild = join(this.sourceDir, buildTsconfigName);
+    this.tsconfigTests = join(this.sourceDir, testsTsconfigName);
 
-    this.entryFilePath = join(this.packageOut, 'index.js');
+    this.entryFilePath = join(this.outputDir, 'index.js');
   }
 
   /** Compiles the package sources with all secondary entry points. */
   async compile() {
-    await this._compileEntryPoint(buildTsconfigName);
-
     // Walk through every secondary entry point and build the TypeScript sources sequentially.
     for (const entryPoint of this.secondaryEntryPoints) {
       await this._compileEntryPoint(buildTsconfigName, entryPoint);
     }
+
+    // Compile the primary entry-point.
+    await this._compileEntryPoint(buildTsconfigName);
   }
 
   /** Compiles the TypeScript test source files for the package. */
@@ -68,19 +78,33 @@ export class BuildPackage {
 
   /** Creates all bundles for the package and all associated entry points. */
   async createBundles() {
-    await buildPrimaryEntryPointBundles(this.entryFilePath, this.packageName);
-
-    for (const entryPoint of this.secondaryEntryPoints) {
-      const entryPointEntryFilePath = join(this.packageOut, entryPoint, 'index.js');
-      await buildSecondaryEntryPointBundles(entryPointEntryFilePath, this.packageName, entryPoint);
-    }
+    await this.bundler.createBundles();
   }
 
   /** Compiles the TypeScript sources of a primary or secondary entry point. */
-  private async _compileEntryPoint(tsconfigName: string, secondaryEntryPoint?: string) {
-    const entryPointPath = join(this.packageRoot, secondaryEntryPoint || '');
+  private async _compileEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
+    const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
     const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
 
-    await tsc(entryPointTsconfigPath, {basePath: entryPointPath});
+    await ngc(entryPointTsconfigPath, {basePath: entryPointPath});
+    this.renamePrivateReExportsToBeUnique(secondaryEntryPoint);
+  }
+
+  /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
+  private renamePrivateReExportsToBeUnique(secondaryEntryPoint = '') {
+    // When we compiled the typescript sources with ngc, we do entry-point individually.
+    // If the root-level module re-exports multiple of these entry-points, the private-export
+    // identifiers (e.g., `ɵa`) generated by ngc will collide. We work around this by suffixing
+    // each of these identifiers with an ID specific to this entry point. We make this
+    // replacement in the js, d.ts, and metadata output.
+    if (this.exportsSecondaryEntryPointsAtRoot && secondaryEntryPoint) {
+      const entryPointId = nextId++;
+      const outputPath = join(this.outputDir, secondaryEntryPoint);
+      glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
+        let fileContent = readFileSync(filePath, 'utf-8');
+        fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
+        writeFileSync(filePath, fileContent, 'utf-8');
+      });
+    }
   }
 }
diff --git a/tools/package-tools/build-release.ts b/tools/package-tools/build-release.ts
index d9e8b08110ae..9ddb0150f538 100644
--- a/tools/package-tools/build-release.ts
+++ b/tools/package-tools/build-release.ts
@@ -1,14 +1,14 @@
-import {join} from 'path';
+import {appendFileSync} from 'fs';
 import {mkdirpSync} from 'fs-extra';
+import {join} from 'path';
+import {buildConfig} from './build-config';
+import {BuildPackage} from './build-package';
 import {copyFiles} from './copy-files';
-import {replaceVersionPlaceholders} from './version-placeholders';
+import {createEntryPointPackageJson} from './entry-point-package-json';
 import {inlinePackageMetadataFiles} from './metadata-inlining';
-import {createTypingsReexportFile} from './typings-reexport';
 import {createMetadataReexportFile} from './metadata-reexport';
-import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
-import {createEntryPointPackageJson} from './entry-point-package-json';
-import {buildConfig} from './build-config';
-import {BuildPackage} from './build-package';
+import {createTypingsReexportFile} from './typings-reexport';
+import {replaceVersionPlaceholders} from './version-placeholders';
 
 const {packagesDir, outputDir, projectDir} = buildConfig;
 
@@ -21,33 +21,61 @@ const bundlesDir = join(outputDir, 'bundles');
  * file. Additionally the package will be Closure Compiler and AOT compatible.
  */
 export function composeRelease(buildPackage: BuildPackage) {
-  const {packageName, packageOut, packageRoot} = buildPackage;
-  const releasePath = join(outputDir, 'releases', packageName);
+  const {name, sourceDir} = buildPackage;
+  const packageOut = buildPackage.outputDir;
+  const releasePath = join(outputDir, 'releases', name);
 
   inlinePackageMetadataFiles(packageOut);
 
+  // Copy all d.ts and metadata files to the `typings/` directory
   copyFiles(packageOut, '**/*.+(d.ts|metadata.json)', join(releasePath, 'typings'));
-  copyFiles(bundlesDir, `${packageName}?(-*).umd?(.min).js?(.map)`, join(releasePath, 'bundles'));
-  copyFiles(bundlesDir, `${packageName}?(.es5).js?(.map)`, join(releasePath, '@angular'));
-  copyFiles(join(bundlesDir, packageName), '**', join(releasePath, '@angular', packageName));
+
+  // Copy UMD bundles.
+  copyFiles(bundlesDir, `${name}?(-*).umd?(.min).js?(.map)`, join(releasePath, 'bundles'));
+
+  // Copy ES5 bundles.
+  copyFiles(bundlesDir, `${name}.es5.js?(.map)`, join(releasePath, 'esm5'));
+  copyFiles(join(bundlesDir, name), `*.es5.js?(.map)`, join(releasePath, 'esm5'));
+
+  // Copy ES2015 bundles
+  copyFiles(bundlesDir, `${name}.js?(.map)`, join(releasePath, 'esm2015'));
+  copyFiles(join(bundlesDir, name), `!(*.es5|*.umd).js?(.map)`, join(releasePath, 'esm2015'));
+
+  // Copy any additional files that belong in the package.
   copyFiles(projectDir, 'LICENSE', releasePath);
   copyFiles(packagesDir, 'README.md', releasePath);
-  copyFiles(packageRoot, 'package.json', releasePath);
+  copyFiles(sourceDir, 'package.json', releasePath);
 
   replaceVersionPlaceholders(releasePath);
-  createTypingsReexportFile(releasePath, './typings/index', packageName);
-  createMetadataReexportFile(releasePath, './typings/index', packageName);
+  createTypingsReexportFile(releasePath, './typings/index', name);
+  createMetadataReexportFile(releasePath, './typings/index', name);
 
   if (buildPackage.secondaryEntryPoints.length) {
     createFilesForSecondaryEntryPoint(buildPackage, releasePath);
   }
+
+  if (buildPackage.exportsSecondaryEntryPointsAtRoot) {
+    // Add re-exports to the root d.ts file to prevent errors of the form
+    // "@angular/material/material has no exported member 'MATERIAL_SANITY_CHECKS."
+    const es2015Exports = buildPackage.secondaryEntryPoints
+        .map(p => `export * from './${p}';`).join('\n');
+    appendFileSync(join(releasePath, `${name}.d.ts`), es2015Exports, 'utf-8');
+
+    // When re-exporting secondary entry-points, we need to manually create a metadata file that
+    // re-exports everything.
+    createMetadataReexportFile(
+        releasePath,
+        buildPackage.secondaryEntryPoints.map(p => `./${p}`),
+        name);
+  }
 }
 
 /** Creates files necessary for a secondary entry-point. */
 function createFilesForSecondaryEntryPoint(buildPackage: BuildPackage, releasePath: string) {
-  const {packageName, packageOut} = buildPackage;
+  const {name} = buildPackage;
+  const packageOut = buildPackage.outputDir;
 
-  getSecondaryEntryPointsForPackage(buildPackage).forEach(entryPointName => {
+  buildPackage.secondaryEntryPoints.forEach(entryPointName => {
     // Create a directory in the root of the package for this entry point that contains
     // * A package.json that lists the different bundle locations
     // * An index.d.ts file that re-exports the index.d.ts from the typings/ directory
@@ -55,7 +83,7 @@ function createFilesForSecondaryEntryPoint(buildPackage: BuildPackage, releasePa
     const entryPointDir = join(releasePath, entryPointName);
 
     mkdirpSync(entryPointDir);
-    createEntryPointPackageJson(entryPointDir, packageName, entryPointName);
+    createEntryPointPackageJson(entryPointDir, name, entryPointName);
 
     // Copy typings and metadata from tsc output location into the entry-point.
     copyFiles(
diff --git a/tools/package-tools/entry-point-package-json.ts b/tools/package-tools/entry-point-package-json.ts
index f804be61719e..68307a97277f 100644
--- a/tools/package-tools/entry-point-package-json.ts
+++ b/tools/package-tools/entry-point-package-json.ts
@@ -8,8 +8,8 @@ export function createEntryPointPackageJson(destDir: string, packageName: string
     name: `@angular/${packageName}/${entryPointName}`,
     typings: `../${entryPointName}.d.ts`,
     main: `../bundles/${packageName}-${entryPointName}.umd.js`,
-    module: `../@angular/${packageName}/${entryPointName}.es5.js`,
-    es2015: `../@angular/${packageName}/${entryPointName}.js`,
+    module: `../esm5/${entryPointName}.es5.js`,
+    es2015: `../esm2015/${entryPointName}.js`,
   };
 
   writeFileSync(join(destDir, 'package.json'), JSON.stringify(content, null, 2), 'utf-8');
diff --git a/tools/package-tools/gulp/build-tasks-gulp.ts b/tools/package-tools/gulp/build-tasks-gulp.ts
index 11edecc745fc..94e610891175 100644
--- a/tools/package-tools/gulp/build-tasks-gulp.ts
+++ b/tools/package-tools/gulp/build-tasks-gulp.ts
@@ -7,6 +7,7 @@ import {sequenceTask} from './sequence-task';
 import {watchFiles} from './watch-files';
 import {BuildPackage} from '../build-package';
 
+
 // There are no type definitions available for these imports.
 const htmlmin = require('gulp-htmlmin');
 
@@ -20,19 +21,19 @@ const htmlMinifierOptions = {
 /** Creates a set of gulp tasks that can build the specified package. */
 export function createPackageBuildTasks(buildPackage: BuildPackage) {
   // Name of the package build tasks for Gulp.
-  const taskName = buildPackage.packageName;
+  const taskName = buildPackage.name;
 
   // Name of all dependencies of the current package.
-  const dependencyNames = buildPackage.dependencies.map(p => p.packageName);
+  const dependencyNames = buildPackage.dependencies.map(p => p.name);
 
   // Glob that matches all style files that need to be copied to the package output.
-  const stylesGlob = join(buildPackage.packageRoot, '**/*.+(scss|css)');
+  const stylesGlob = join(buildPackage.sourceDir, '**/*.+(scss|css)');
 
   // Glob that matches every HTML file in the current package.
-  const htmlGlob = join(buildPackage.packageRoot, '**/*.html');
+  const htmlGlob = join(buildPackage.sourceDir, '**/*.html');
 
   // List of watch tasks that need run together with the watch task of the current package.
-  const dependentWatchTasks = buildPackage.dependencies.map(p => `${p.packageName}:watch`);
+  const dependentWatchTasks = buildPackage.dependencies.map(p => `${p.name}:watch`);
 
   /**
    * Main tasks for the package building. Tasks execute the different sub-tasks in the correct
@@ -86,22 +87,22 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
   ]);
 
   task(`${taskName}:assets:scss`, buildScssTask(
-    buildPackage.packageOut, buildPackage.packageRoot, true)
+    buildPackage.outputDir, buildPackage.sourceDir, true)
   );
 
   task(`${taskName}:assets:copy-styles`, () => {
-    return src(stylesGlob).pipe(dest(buildPackage.packageOut));
+    return src(stylesGlob).pipe(dest(buildPackage.outputDir));
   });
   task(`${taskName}:assets:html`, () => {
-    return src(htmlGlob).pipe(htmlmin(htmlMinifierOptions)).pipe(dest(buildPackage.packageOut));
+    return src(htmlGlob).pipe(htmlmin(htmlMinifierOptions)).pipe(dest(buildPackage.outputDir));
   });
 
-  task(`${taskName}:assets:inline`, () => inlineResourcesForDirectory(buildPackage.packageOut));
+  task(`${taskName}:assets:inline`, () => inlineResourcesForDirectory(buildPackage.outputDir));
 
   /**
    * Watch tasks, that will rebuild the package whenever TS, SCSS, or HTML files change.
    */
   task(`${taskName}:watch`, dependentWatchTasks, () => {
-    watchFiles(join(buildPackage.packageRoot, '**/*.+(ts|scss|html)'), [`${taskName}:build`]);
+    watchFiles(join(buildPackage.sourceDir, '**/*.+(ts|scss|html)'), [`${taskName}:build`]);
   });
 }
diff --git a/tools/package-tools/metadata-reexport.ts b/tools/package-tools/metadata-reexport.ts
index cd79e86c6cad..6f61ce8ddd65 100644
--- a/tools/package-tools/metadata-reexport.ts
+++ b/tools/package-tools/metadata-reexport.ts
@@ -2,12 +2,14 @@ import {writeFileSync} from 'fs';
 import {join} from 'path';
 
 /** Creates a metadata file that re-exports the metadata bundle inside of the typings. */
-export function createMetadataReexportFile(destDir: string, from: string, name: string) {
+export function createMetadataReexportFile(destDir: string, from: string|string[], name: string) {
+  from = Array.isArray(from) ? from : [from];
+
   const metadataJsonContent = JSON.stringify({
     __symbolic: 'module',
     version: 3,
     metadata: {},
-    exports: [{from}],
+    exports: from.map(f => ({from: f})),
     flatModuleIndexRedirect: true
   }, null, 2);
 
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 7800d3530c51..419afdf7d2cd 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -5,15 +5,24 @@ import {buildConfig} from './build-config';
 /** Method that converts dash-case strings to a camel-based string. */
 const dashCaseToCamelCase = (str: string) => str.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
 
-/** List of potential secondary entry-points for the CDK package. */
+/** List of potential secondary entry-points for the cdk package. */
 const cdkSecondaryEntryPoints = getSubdirectoryNames(join(buildConfig.packagesDir, 'cdk'));
 
-/** Object with all CDK entry points in the format of Rollup globals. */
+/** List of potential secondary entry-points for the material package. */
+const matSecondaryEntryPoints = getSubdirectoryNames(join(buildConfig.packagesDir, 'lib'));
+
+/** Object with all cdk entry points in the format of Rollup globals. */
 const rollupCdkEntryPoints = cdkSecondaryEntryPoints.reduce((globals: any, entryPoint: string) => {
   globals[`@angular/cdk/${entryPoint}`] = `ng.cdk.${dashCaseToCamelCase(entryPoint)}`;
   return globals;
 }, {});
 
+/** Object with all material entry points in the format of Rollup globals. */
+const rollupMatEntryPoints = matSecondaryEntryPoints.reduce((globals: any, entryPoint: string) => {
+  globals[`@angular/material/${entryPoint}`] = `ng.mat.${dashCaseToCamelCase(entryPoint)}`;
+  return globals;
+}, {});
+
 /** Map of globals that are used inside of the different packages. */
 export const rollupGlobals = {
   'tslib': 'tslib',
@@ -37,8 +46,9 @@ export const rollupGlobals = {
   '@angular/material': 'ng.material',
   '@angular/cdk': 'ng.cdk',
 
-  // Include secondary entry-points of the CDK package
+  // Include secondary entry-points of the cdk and material packages
   ...rollupCdkEntryPoints,
+  ...rollupMatEntryPoints,
 
   // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
   // TODO(devversion): remove by adding minimatch and better globbing to rules
diff --git a/tools/package-tools/rollup-helpers.ts b/tools/package-tools/rollup-helpers.ts
deleted file mode 100644
index 515a2382584e..000000000000
--- a/tools/package-tools/rollup-helpers.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {buildConfig} from './build-config';
-import {rollupRemoveLicensesPlugin} from './rollup-remove-licenses';
-import {rollupGlobals} from './rollup-globals';
-
-// There are no type definitions available for these imports.
-const rollup = require('rollup');
-const rollupNodeResolutionPlugin = require('rollup-plugin-node-resolve');
-
-export type BundleConfig = {
-  entry: string;
-  dest: string;
-  format: string;
-  moduleName: string;
-};
-
-/** Creates a rollup bundle of a specified JavaScript file.*/
-export function createRollupBundle(config: BundleConfig): Promise<any> {
-  const bundleOptions = {
-    context: 'this',
-    external: Object.keys(rollupGlobals),
-    entry: config.entry,
-    plugins: [rollupRemoveLicensesPlugin]
-  };
-
-  const writeOptions = {
-    // Keep the moduleId empty because we don't want to force developers to a specific moduleId.
-    moduleId: '',
-    moduleName: config.moduleName || 'ng.material',
-    banner: buildConfig.licenseBanner,
-    format: config.format,
-    dest: config.dest,
-    globals: rollupGlobals,
-    sourceMap: true
-  };
-
-  // When creating a UMD, we want to exclude tslib from the `external` bundle option so that it
-  // is inlined into the bundle.
-  if (config.format === 'umd') {
-    bundleOptions.plugins.push(rollupNodeResolutionPlugin());
-
-    const external = Object.keys(rollupGlobals);
-    external.splice(external.indexOf('tslib'), 1);
-    bundleOptions.external = external;
-  }
-
-  return rollup.rollup(bundleOptions).then((bundle: any) => bundle.write(writeOptions));
-}
diff --git a/tools/package-tools/secondary-entry-points.ts b/tools/package-tools/secondary-entry-points.ts
index 935877d12eec..0e6bcedea35b 100644
--- a/tools/package-tools/secondary-entry-points.ts
+++ b/tools/package-tools/secondary-entry-points.ts
@@ -15,8 +15,8 @@ import {platform} from 'os';
  * @returns An array of secondary entry-points names, e.g., ['a11y', 'bidi', ...]
  */
 export function getSecondaryEntryPointsForPackage(pkg: BuildPackage) {
-  const packageName = pkg.packageName;
-  const packageDir = pkg.packageRoot;
+  const packageName = pkg.name;
+  const packageDir = pkg.sourceDir;
 
   // Get the list of all entry-points as the list of directories in the package that have a
   // tsconfig-build.json
diff --git a/tools/package-tools/typescript-transpile.ts b/tools/package-tools/typescript-transpile.ts
index cf10e5bd7a96..b22195f384e8 100644
--- a/tools/package-tools/typescript-transpile.ts
+++ b/tools/package-tools/typescript-transpile.ts
@@ -25,7 +25,7 @@ function formatDiagnostics(diagnostics: ts.Diagnostic[], baseDir = ''): string {
     let res = `• ${chalk.red(`TS${diagnostic.code}`)} - `;
 
     if (diagnostic.file) {
-      const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+      const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
       const filePath = path.relative(baseDir, diagnostic.file.fileName);
 
       res += `${filePath}(${line + 1},${character + 1}): `;
diff --git a/tsconfig.json b/tsconfig.json
index e06d166854ce..8bf992e61bb6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,27 +2,18 @@
 // IDEs and TSLint. For IDEs it ensures that `experimentalDecorator` warnings are not showing up.
 {
   "compilerOptions": {
+    "outDir": "./dist/packages/all",
     // Needed for Moment.js since it doesn't have a default export.
     "allowSyntheticDefaultImports": true,
-    "rootDir": ".",
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
     "noUnusedParameters": true,
     "strictNullChecks": true,
     "skipLibCheck": true,
-    "outDir": "./dist/packages/all",
     "target": "es2015",
     "lib": ["es5", "es2015", "dom"],
-    "types": ["jasmine"],
-    "baseUrl": ".",
-    "paths": {
-      "@angular/material": ["./src/lib/public_api.ts"],
-      "@angular/cdk/*": ["./src/cdk/*"],
-      "@angular/material-moment-adapter": ["./src/material-moment-adapter"],
-      "@angular/material-examples": ["./src/material-examples"],
-      "material2-build-tools": ["./tools/package-tools"]
-    }
+    "types": ["jasmine"]
   },
   "include": [
     "src/**/*.ts",

From ed74da7c5507f734eda0d69f59a862d61e83be4b Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Thu, 14 Sep 2017 16:57:34 -0700
Subject: [PATCH 087/575] Bump to gulp-highlight-files@0.0.5 (#7085)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7c36a280c74c..d3fd943722ee 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "gulp-conventional-changelog": "^1.1.3",
     "gulp-dom": "^0.9.17",
     "gulp-flatten": "^0.3.1",
-    "gulp-highlight-files": "^0.0.4",
+    "gulp-highlight-files": "^0.0.5",
     "gulp-htmlmin": "^3.0.0",
     "gulp-if": "^2.0.2",
     "gulp-markdown": "^1.2.0",

From b666616a45818cc355551d8d396a52ac00b0b5e5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 15 Sep 2017 01:58:53 +0200
Subject: [PATCH 088/575] chore: move overlay-container specs (#7080)

It seems like the overlay container tests got left behind during the move to the CDK. These changes move them next to the container.
---
 src/{lib/core => cdk}/overlay/overlay-container.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/{lib/core => cdk}/overlay/overlay-container.spec.ts (96%)

diff --git a/src/lib/core/overlay/overlay-container.spec.ts b/src/cdk/overlay/overlay-container.spec.ts
similarity index 96%
rename from src/lib/core/overlay/overlay-container.spec.ts
rename to src/cdk/overlay/overlay-container.spec.ts
index 218f3f358826..06f02e7d99dc 100644
--- a/src/lib/core/overlay/overlay-container.spec.ts
+++ b/src/cdk/overlay/overlay-container.spec.ts
@@ -1,6 +1,6 @@
 import {async, inject, TestBed} from '@angular/core/testing';
 import {Component, NgModule, ViewChild, ViewContainerRef} from '@angular/core';
-import {PortalModule, TemplatePortalDirective} from '../portal/portal-directives';
+import {PortalModule, TemplatePortalDirective} from '@angular/cdk/portal';
 import {Overlay, OverlayContainer, OverlayModule} from './index';
 
 describe('OverlayContainer', () => {

From 5e02aef3a7cf60b1569e44a282fee5d0c6f31d8c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 15 Sep 2017 01:59:20 +0200
Subject: [PATCH 089/575] demo(tooltip): add accessibility demo for tooltip
 (#7058)

Adds an accessibility demo page for the tooltip.

Fixes #6499.
---
 src/demo-app/a11y/a11y-module.ts            |  2 +
 src/demo-app/a11y/a11y.ts                   |  1 +
 src/demo-app/a11y/routes.ts                 |  2 +
 src/demo-app/a11y/tooltip/tooltip-a11y.html | 45 +++++++++++++++++++++
 src/demo-app/a11y/tooltip/tooltip-a11y.ts   |  8 ++++
 5 files changed, 58 insertions(+)
 create mode 100644 src/demo-app/a11y/tooltip/tooltip-a11y.html
 create mode 100644 src/demo-app/a11y/tooltip/tooltip-a11y.ts

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index 79835975bcde..81c854a3ec09 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -39,6 +39,7 @@ import {
   RainyTabContent,
   FoggyTabContent,
 } from './tabs/tabs-a11y';
+import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
 
 
 @NgModule({
@@ -91,6 +92,7 @@ export class AccessibilityRoutingModule {}
     SunnyTabContent,
     RainyTabContent,
     FoggyTabContent,
+    TooltipAccessibilityDemo,
   ],
   entryComponents: [
     DialogAccessibilityDemo,
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 214d77fddbb9..644430399887 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -40,6 +40,7 @@ export class AccessibilityDemo {
     {name: 'Select', route: 'select'},
     {name: 'Tabs', route: 'tabs'},
     {name: 'Toolbar', route: 'toolbar'},
+    {name: 'Tooltip', route: 'tooltip'},
   ];
 
   skipNavigation() {
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index 3220a0a8a0f3..a9d82c0e668c 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -22,6 +22,7 @@ import {SnackBarAccessibilityDemo} from './snack-bar/snack-bar-a11y';
 import {SelectAccessibilityDemo} from './select/select-a11y';
 import {TabsAccessibilityDemo} from './tabs/tabs-a11y';
 import {TABS_DEMO_ROUTES} from './tabs/routes';
+import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
 
 export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: '', component: AccessibilityHome},
@@ -46,4 +47,5 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'select', component: SelectAccessibilityDemo},
   {path: 'tabs', component: TabsAccessibilityDemo, children: TABS_DEMO_ROUTES},
   {path: 'toolbar', component: ToolbarAccessibilityDemo},
+  {path: 'tooltip', component: TooltipAccessibilityDemo},
 ];
diff --git a/src/demo-app/a11y/tooltip/tooltip-a11y.html b/src/demo-app/a11y/tooltip/tooltip-a11y.html
new file mode 100644
index 000000000000..14c2307cd09b
--- /dev/null
+++ b/src/demo-app/a11y/tooltip/tooltip-a11y.html
@@ -0,0 +1,45 @@
+<section>
+  <h2>Mouse over or tab to trigger a tooltip</h2>
+  <p>Mouse over or focus the button to show and hide the tooltip</p>
+  <button md-raised-button mdTooltip="This is an example of a tooltip">What is this?</button>
+</section>
+
+
+<section>
+  <h2>Click to trigger a tooltip</h2>
+  <button md-raised-button (click)="tooltip.toggle(); $event.stopPropagation()">Toggle the tooltip</button>
+  <button md-raised-button mdTooltip="This is a tooltip that shows on click" #tooltip="mdTooltip">I have a tooltip</button>
+</section>
+
+
+<section>
+  <h2>Different tooltip positions</h2>
+
+  <button
+    md-raised-button
+    mdTooltip="This tooltip appears below the trigger"
+    mdTooltipPosition="below">Below</button>
+
+  <button
+    md-raised-button
+    mdTooltip="This tooltip appears above the trigger"
+    mdTooltipPosition="above">Above</button>
+
+  <button
+    md-raised-button
+    mdTooltip="This tooltip appears to the left of the trigger"
+    mdTooltipPosition="left">Left</button>
+
+  <button
+    md-raised-button
+    mdTooltip="This tooltip appears to the right of the trigger"
+    mdTooltipPosition="right">Right</button>
+</section>
+
+<section>
+  <h2>Delayed tooltip</h2>
+  <button
+    md-raised-button
+    mdTooltip="This tooltip will show up after a delay"
+    [mdTooltipShowDelay]="2000">What is this?</button>
+</section>
diff --git a/src/demo-app/a11y/tooltip/tooltip-a11y.ts b/src/demo-app/a11y/tooltip/tooltip-a11y.ts
new file mode 100644
index 000000000000..b613fb3ac10f
--- /dev/null
+++ b/src/demo-app/a11y/tooltip/tooltip-a11y.ts
@@ -0,0 +1,8 @@
+import {Component} from '@angular/core';
+
+@Component({
+  moduleId: module.id,
+  selector: 'tooltip-a11y',
+  templateUrl: 'tooltip-a11y.html',
+})
+export class TooltipAccessibilityDemo {}

From 5daf7ff3c155db5e54d572b9d0c6a6c3f65b8f43 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 14 Sep 2017 16:59:47 -0700
Subject: [PATCH 090/575] docs(overlay): expand overview for overlay (#6976)

---
 src/cdk/overlay/overlay.md | 87 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 1 deletion(-)

diff --git a/src/cdk/overlay/overlay.md b/src/cdk/overlay/overlay.md
index f5c4fd2cdfac..f37cce43fe7a 100644
--- a/src/cdk/overlay/overlay.md
+++ b/src/cdk/overlay/overlay.md
@@ -1,3 +1,88 @@
 ### Overlay
 
-A service used to manage overlays.
\ No newline at end of file
+The `Overlay` service provides a way to open floating panels on the screen.
+
+### Creating overlays
+Calling `overlay.create()` will return an `OverlayRef` instance. This instance is a handle for
+managing that specific overlay.
+
+The `OverlayRef` _is_ a `PortalHost`- once created, content can be added by attaching a `Portal`.
+See the documentation on portals for further information.
+```ts
+const overlayRef = overlay.create();
+const userProfilePortal = new ComponentPortal(UserProfile);
+overlayRef.attach(userProfilePortal);
+```
+
+### Configuring an overlay
+When creating an overlay, an optional configuration object can be provided.
+```ts
+const overlayRef = overlay.create({
+  height: '400px',
+  width: '600px',
+});
+```
+
+The full set of configuration options can be found in the API documentation.
+
+#### Position strategies
+The `positionStrategy` configuration option determines how the overlay will be positioned on-screen.
+There are two position strategies available as part of the library: `GlobalPositionStrategy` and
+`ConnectedPositionStrategy`.
+
+`GlobalPositionStrategy` is used for overlays that require a specific position in the viewport,
+unrelated to other elements. This is commonly used for modal dialogs and application-level
+notifications.
+
+`ConnectedPositionStrategy` is used for overlays that are positioned relative to some other "origin"
+element on the page. This is commonly used for menus, pickers, and tooltips. When using the
+connected strategy, a set of preferred positions is provided; the "best" position will be selected
+based on how well the overlay would fit within the viewport.
+
+A custom position strategy can be created by implementing the `PositionStrategy` interface.
+Each `PositionStrategy` defines an `apply` method that is called whenever the overlay's position
+should be updated. A custom position strategy can additionally expose any other APIs necessary as
+related to the positioning of the overlay element.
+
+
+#### Scroll strategies
+The `scrollStrategy` configuration option determines how the overlay will react to scrolling outside
+the overlay element. There are four scroll strategies available as part of the library.
+
+`NoopScrollStrategy` is the default option. This strategy does nothing.
+
+`CloseScrollStrategy` will automatically close the overlay when scrolling occurs.
+
+`BlockScrollStrategy` will block page scrolling while the overlay is open. Note that some
+applications may implement special or customized page scrolling; if the `BlockScrollStrategy`
+conflicts with this kind of situation, it can be overriden by re-providing `BlockScrollStrategy`
+with a custom implementation.
+
+`RepositionScrollStrategy` will re-position the overlay element on scroll. Note that this will have
+some performance impact on scrolling- users should weigh this cost in the context of each specific
+application.
+
+
+A custom scroll strategy can be created by implementing the `ScrollStrategy` interface. Each
+strategy will typically inject `ScrollDispatcher` (from `@angular/cdk/scrolling`) to be notified
+of when scrolling takes place. See the documentation for `ScrollDispatcher` for more information
+on how scroll events are detected and dispatched.
+
+### The overlay container
+The `OverlayContainer` provides a handle to the container element in which all individual overlay
+elements are rendered. By default, the overlay container is appended directly to the document body
+so that an overlay is never clipped by an `overflow: hidden` parent.
+
+#### Full-screen overlays
+The `FullscreenOverlayContainer` is an alternative to `OverlayContainer` that supports correct
+displaying of overlay elements in
+[fullscreen mode](https://developer.mozilla.org/en-US/docs/Web/API/Element/requestFullScreen).
+
+`FullscreenOverlayContainer` can be enabled by providing it in your `NgModule`:
+```ts
+@NgModule({
+  providers: [{provide: OverlayContainer, useClass: FullscreenOverlayContainer}],
+  // ...
+})
+export class MyModule { }
+```

From 2730fe03372b339c03d10b354afb5c7eb231da7e Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Thu, 14 Sep 2017 17:00:49 -0700
Subject: [PATCH 091/575] docs(chips): remove example from component jsdoc
 (#6888)

* docs(chips): close md-chip tag

* remove example
---
 src/lib/chips/chip-list.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 2ce4e3e35043..e2587427028e 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -29,13 +29,6 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
 /**
  * A material design chips component (named ChipList for it's similarity to the List component).
- *
- * Example:
- *
- *     <md-chip-list>
- *       <md-chip>Chip 1<md-chip>
- *       <md-chip>Chip 2<md-chip>
- *     </md-chip-list>
  */
 @Component({
   moduleId: module.id,

From b8218e14893dcdfb95e875c5853d30be093ea01d Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 14 Sep 2017 17:10:46 -0700
Subject: [PATCH 092/575] build: fix regex for matching imports for umd
 generation (#7093)

---
 tools/package-tools/build-bundles.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index d65c3fe2dd70..2278a3fd3343 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -147,7 +147,7 @@ export class PackageBundler {
       // secondary entry-points from the rollup globals because we want the UMD for this package
       // to include *all* of the sources for those entry-points.
       if (this.buildPackage.exportsSecondaryEntryPointsAtRoot) {
-        const importRegex = new RegExp(`@angular/${this.buildPackage.name}/.+`, 'g');
+        const importRegex = new RegExp(`@angular/${this.buildPackage.name}/.+`);
         external = external.filter(e => !importRegex.test(e));
 
         // Use the rollup-alias plugin to map imports of the form `@angular/material/button`

From 34b5620aa3a1592c08cd5dbc9d93c748185d43d8 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 15 Sep 2017 02:11:12 +0200
Subject: [PATCH 093/575] build: cancel screenshot diff if there is no activity
 (#6957)

* build: cancel screenshot diff if there is no activity

* No longer just gives the screenshot diff task 8 minutes to pass, because the run time can vary. Now it just exits the process if the last action in the task takes longer than 6 minutes.
* Instead of just closing the firebase connection, the process will be exited with an error code. Just closing the connection is not helpful and breaks the screenshot diff Web Interface.

* Add comments
---
 tools/gulp/tasks/screenshots.ts | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/tools/gulp/tasks/screenshots.ts b/tools/gulp/tasks/screenshots.ts
index 79aba93f886e..e7475fc8d155 100644
--- a/tools/gulp/tasks/screenshots.ts
+++ b/tools/gulp/tasks/screenshots.ts
@@ -26,14 +26,20 @@ const LOCAL_GOLDENS = path.join(SCREENSHOT_DIR, `golds`);
 const LOCAL_DIFFS = path.join(SCREENSHOT_DIR, `diff`);
 
 // Directory to which untrusted screenshot results are temporarily written
-//   (without authentication required) before they are verified and copied to
-//   the final storage location.
+// (without authentication required) before they are verified and copied to
+// the final storage location.
 const TEMP_FOLDER = 'untrustedInbox';
 const FIREBASE_REPORT = `${TEMP_FOLDER}/screenshot/reports`;
 const FIREBASE_IMAGE = `${TEMP_FOLDER}/screenshot/images`;
 const FIREBASE_DATA_GOLDENS = `screenshot/goldens`;
 const FIREBASE_STORAGE_GOLDENS = 'goldens';
 
+/** Time in ms until the process will be exited if the last action took too long (6 minutes). */
+const lastActionTimeout = 1000 * 60 * 6;
+
+/** Time in ms that specifies how often the last action should be checked (45 seconds). */
+const lastActionRefreshInterval = 1000 * 45;
+
 /** Task which upload screenshots generated from e2e test. */
 task('screenshots', () => {
   const prNumber = process.env['TRAVIS_PULL_REQUEST'];
@@ -44,14 +50,20 @@ task('screenshots', () => {
   } else if (prNumber) {
     const firebaseApp = connectFirebaseScreenshots();
     const database = firebaseApp.database();
+    let lastActionTime = Date.now();
 
-    // If this task hasn't completed in 8 minutes, close the firebase connection.
-    const timeoutId = setTimeout(() => {
-      console.error('Screenshot tests did not finish in 8 minutes, closing Firebase connection.');
-      return firebaseApp.delete();
-    }, 60 * 1000 * 8);
+    // If the last action of the task takes longer than 6 minutes, close the firebase connection.
+    const timeoutId = setInterval(() => {
+      if (lastActionTime + lastActionTimeout <= Date.now()) {
+        clearTimeout(timeoutId);
+        console.error('Last action for screenshot tests did not finish in ' +
+            (lastActionTimeout / 1000 / 60) + ' minutes. Closing Firebase connection...');
+        return firebaseApp.delete().then(() => process.exit(1));
+      }
+    }, lastActionRefreshInterval);
+
+    console.log(`  Starting screenshots task with results from e2e task...`);
 
-    let lastActionTime = Date.now();
     return uploadTravisJobInfo(database, prNumber)
       .then(() => {
         console.log(`  Downloading screenshot golds from Firebase...`);

From 5ec538eeebb0883df5e2a60dceb556dd15b5f95f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 15 Sep 2017 17:36:36 +0200
Subject: [PATCH 094/575] build: fix umd bundles build task (#7102)

Currently when trying to serve the devapp, the `build-bundles` task seems to be broken. Rollup is not able to properly read the source files from the disk because the `.js` file extension is missing.
---
 tools/package-tools/build-bundles.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index 2278a3fd3343..8fd0ea387f5e 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -172,7 +172,7 @@ export class PackageBundler {
   private getResolvedSecondaryEntryPointImportPaths(bundleOutputDir: string) {
     return this.buildPackage.secondaryEntryPoints.reduce((map, p) => {
       map[`@angular/${this.buildPackage.name}/${p}`] =
-          join(dirname(bundleOutputDir), 'material', `${p}.es5`);
+          join(dirname(bundleOutputDir), this.buildPackage.name, `${p}.es5.js`);
       return map;
     }, {} as {[key: string]: string});
   }

From b296e2bd59c57a1c6affe5470c41f7ad02677534 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 15 Sep 2017 13:51:08 -0700
Subject: [PATCH 095/575] build: compile entry-points in parallel (#7094)

---
 tools/package-tools/build-package.ts          | 53 ++++++++++++++-----
 tools/package-tools/secondary-entry-points.ts | 38 ++++++++++---
 2 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index 616d8b0e68eb..2ab4f5e94be3 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -1,10 +1,11 @@
-import {main as ngc} from '@angular/tsc-wrapped';
+import {red} from 'chalk';
+import {spawn} from 'child_process';
 import {readFileSync, writeFileSync} from 'fs';
 import {sync as glob} from 'glob';
 import {join} from 'path';
+import {PackageBundler} from './build-bundles';
 import {buildConfig} from './build-config';
 import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
-import {PackageBundler} from './build-bundles';
 
 
 const {packagesDir, outputDir} = buildConfig;
@@ -37,19 +38,23 @@ export class BuildPackage {
   /** Path to the tsconfig file, which will be used to build the tests. */
   private readonly tsconfigTests: string;
 
+  private _secondaryEntryPoints: string[];
+  private _secondaryEntryPointsByDepth: string[][];
+
+  /** Secondary entry-points partitioned by their build depth. */
+  private get secondaryEntryPointsByDepth(): string[][] {
+    this.cacheSecondaryEntryPoints();
+    return this._secondaryEntryPointsByDepth;
+  }
+
   private readonly bundler = new PackageBundler(this);
 
   /** Secondary entry points for the package. */
   get secondaryEntryPoints(): string[] {
-    if (!this._secondaryEntryPoints) {
-      this._secondaryEntryPoints = getSecondaryEntryPointsForPackage(this);
-    }
-
+    this.cacheSecondaryEntryPoints();
     return this._secondaryEntryPoints;
   }
 
-  private _secondaryEntryPoints: string[];
-
   constructor(public readonly name: string, public readonly dependencies: BuildPackage[] = []) {
     this.sourceDir = join(packagesDir, name);
     this.outputDir = join(outputDir, 'packages', name);
@@ -62,9 +67,13 @@ export class BuildPackage {
 
   /** Compiles the package sources with all secondary entry points. */
   async compile() {
-    // Walk through every secondary entry point and build the TypeScript sources sequentially.
-    for (const entryPoint of this.secondaryEntryPoints) {
-      await this._compileEntryPoint(buildTsconfigName, entryPoint);
+    // Compile all secondary entry-points with the same depth in parallel, and each separate depth
+    // group in sequence. This will look something like:
+    // Depth 0: coercion, platform, keycodes, bidi
+    // Depth 1: a11y, scrolling
+    // Depth 2: overlay
+    for (const entryPointGroup of this.secondaryEntryPointsByDepth) {
+      await Promise.all(entryPointGroup.map(p => this._compileEntryPoint(buildTsconfigName, p)));
     }
 
     // Compile the primary entry-point.
@@ -86,8 +95,17 @@ export class BuildPackage {
     const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
     const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
 
-    await ngc(entryPointTsconfigPath, {basePath: entryPointPath});
-    this.renamePrivateReExportsToBeUnique(secondaryEntryPoint);
+    return new Promise((resolve, reject) => {
+      const childProcess = spawn('./node_modules/.bin/ngc', ['-p', entryPointTsconfigPath]);
+
+      // Pipe stdout and stderr from the child process.
+      childProcess.stdout.on('data', (data: any) => console.log(`${data}`));
+      childProcess.stderr.on('data', (data: any) => console.error(red(`${data}`)));
+
+      childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
+    })
+    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)))
+    .then(() => this.renamePrivateReExportsToBeUnique(secondaryEntryPoint));
   }
 
   /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
@@ -107,4 +125,13 @@ export class BuildPackage {
       });
     }
   }
+
+  /** Stores the secondary entry-points for this package if they haven't been computed already. */
+  private cacheSecondaryEntryPoints() {
+    if (!this._secondaryEntryPoints) {
+      this._secondaryEntryPointsByDepth = getSecondaryEntryPointsForPackage(this);
+      this._secondaryEntryPoints =
+        this._secondaryEntryPointsByDepth.reduce((list, p) => list.concat(p), []);
+    }
+  }
 }
diff --git a/tools/package-tools/secondary-entry-points.ts b/tools/package-tools/secondary-entry-points.ts
index 0e6bcedea35b..d94d1e251deb 100644
--- a/tools/package-tools/secondary-entry-points.ts
+++ b/tools/package-tools/secondary-entry-points.ts
@@ -24,7 +24,7 @@ export function getSecondaryEntryPointsForPackage(pkg: BuildPackage) {
       .filter(d => existsSync(join(packageDir, d, 'tsconfig-build.json')));
 
   // Create nodes that comprise the build graph.
-  const buildNodes: BuildNode[] = entryPoints.map(p => ({name: p, deps: []}));
+  const buildNodes: BuildNode[] = entryPoints.map(p => ({name: p, deps: [], depth: 0}));
 
   // Create a lookup for name -> build graph node.
   const nodeLookup = buildNodes.reduce((lookup, node) => {
@@ -54,24 +54,27 @@ export function getSecondaryEntryPointsForPackage(pkg: BuildPackage) {
 
   // Concatenate the build order for each node into one global build order.
   // Duplicates are automatically omitted by getBuildOrder.
-  return buildNodes.reduce((order: string[], node) => {
+  const buildOrder = buildNodes.reduce((order: BuildNode[], node) => {
     return [...order, ...getBuildOrder(node)];
   }, []);
+
+  return partitionNodesByDepth(buildOrder).map(level => level.map(node => node.name));
 }
 
-/** Gets the build order for a given node with DFS. */
-function getBuildOrder(node: BuildNode): string[] {
+/** Gets the build order for node with DFS. As a side-effect, sets the depth on visited nodes. */
+function getBuildOrder(node: BuildNode): BuildNode[] {
   if (node.visited) {
     return [];
   }
 
-  let buildOrder: string[] = [];
+  let buildOrder: BuildNode[] = [];
   for (const dep of node.deps) {
     buildOrder = [...buildOrder, ...getBuildOrder(dep)];
+    node.depth = node.deps.reduce((maxDepth, d) => Math.max(d.depth + 1, maxDepth), -1);
   }
 
   node.visited = true;
-  return [...buildOrder, node.name];
+  return [...buildOrder, node];
 }
 
 /** Gets the names of all subdirectories for a given path. */
@@ -84,9 +87,32 @@ interface BuildNode {
   name: string;
   deps: BuildNode[];
   visited?: boolean;
+  depth: number;
 }
 
 
+/**
+ * Partitions nodes into groups by depth. For example,
+ * [{name: a11y, depth: 1}, {name: bidi, depth: 0}, {name: platform, depth: 0}]
+ * =>
+ * [ [{name: bidi, depth: 0}, {name: platform, depth: 0}], [{name: a11y, depth: 1}] ]
+ */
+function partitionNodesByDepth(nodes: BuildNode[]): BuildNode[][] {
+  const result: BuildNode[][] = [[]];
+  let lastDepth = 0;
+
+  nodes.sort((a, b) => a.depth - b.depth).forEach(node => {
+    if (node.depth === lastDepth) {
+      result[result.length - 1].push(node);
+    } else {
+      result.push([node]);
+      lastDepth = node.depth;
+    }
+  });
+
+  return result;
+}
+
 /** Builds the command that will be executed to find all import statements for a package. */
 function buildPackageImportStatementFindCommand(searchDirectory: string, packageName: string) {
   if (platform() === 'win32') {

From a96b545d281b85c6649995fb058e6c61e3167aae Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 15 Sep 2017 13:55:38 -0700
Subject: [PATCH 096/575] fix: add `mat` exportAs and class aliases (#7106)

---
 package-lock.json                       | 101 +++--
 package.json                            |  24 +-
 src/lib/autocomplete/autocomplete.ts    |   2 +-
 src/lib/button-toggle/button-toggle.ts  |   4 +-
 src/lib/chips/chip-list.ts              |   2 +-
 src/lib/chips/chip.ts                   |   2 +-
 src/lib/core/ripple/ripple.ts           |   2 +-
 src/lib/datepicker/datepicker-input.ts  |   2 +-
 src/lib/input/autosize.ts               |   2 +-
 src/lib/mat-exports.ts                  | 527 ++++++++++++++++++++++++
 src/lib/menu/menu-item.ts               |   2 +-
 src/lib/public_api.ts                   |   1 +
 src/lib/select/select.ts                |   2 +-
 src/lib/tabs/tab.ts                     |   2 +-
 src/lib/tooltip/tooltip.ts              |   2 +-
 src/material-examples/example-module.ts |  16 +-
 tools/package-tools/rollup-globals.ts   |   2 +-
 17 files changed, 623 insertions(+), 72 deletions(-)
 create mode 100644 src/lib/mat-exports.ts

diff --git a/package-lock.json b/package-lock.json
index 4d90745db73c..d2159d5291ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,85 +5,108 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.6.tgz",
-      "integrity": "sha1-v5KD7HyMmLMvVp2E3NoQiQ/cAmI=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.0-RC.0.tgz",
+      "integrity": "sha1-z9WTfOEeq6A64+vXeLCHG3dTlmU=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/common": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.6.tgz",
-      "integrity": "sha1-7TfpMHx1Bt2DR5fBps9nXlK1tu4=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.0-RC.0.tgz",
+      "integrity": "sha1-rS0IU6YtLoe7oL3WWI2m+l8tq7g=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.6.tgz",
-      "integrity": "sha1-vhcN8Ji3HoNczt8WjV+3sj5QRbg=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.0-RC.0.tgz",
+      "integrity": "sha1-oiqet9DP0EwBVYtLb/FE5PIENO4=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.6.tgz",
-      "integrity": "sha1-avpq72jdaB5hs5i+TWJw5choCxI=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.0-RC.0.tgz",
+      "integrity": "sha1-0trwhngqKAIQBVoiH2DRYrT+Yno=",
       "dev": true,
       "requires": {
         "@angular/tsc-wrapped": "4.3.6",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
+      },
+      "dependencies": {
+        "@angular/tsc-wrapped": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz",
+          "integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=",
+          "dev": true,
+          "requires": {
+            "tsickle": "0.21.6"
+          }
+        },
+        "tsickle": {
+          "version": "0.21.6",
+          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz",
+          "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=",
+          "dev": true,
+          "requires": {
+            "minimist": "1.2.0",
+            "mkdirp": "0.5.1",
+            "source-map": "0.5.6",
+            "source-map-support": "0.4.15"
+          }
+        }
       }
     },
     "@angular/core": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.6.tgz",
-      "integrity": "sha1-u6xj1o0Pe8s4nRKzQghlK+MofpY=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.0-RC.0.tgz",
+      "integrity": "sha1-bxsF1Y2+guLNMpzT3AZm82xgw48=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/forms": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.6.tgz",
-      "integrity": "sha1-DyDEWXwWoVJ0XXzZVVmFWgpcZoc=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.0-RC.0.tgz",
+      "integrity": "sha1-LG1b231G/m6wQW4WGWK0JyZcP3s=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.6.tgz",
-      "integrity": "sha1-Vjgn0afV6J47fYa3f7vTZ7LAhZE=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.0-RC.0.tgz",
+      "integrity": "sha1-a6qUX6OhgqbOgqFRr2X8FIn14bE=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.6.tgz",
-      "integrity": "sha1-YVKx87eNAkb8XhUOL3ue1DN+O6Y=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.0-RC.0.tgz",
+      "integrity": "sha1-t8W4tjiFZMdLBRD4dQ4tdJJBPO4=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.6.tgz",
-      "integrity": "sha1-nqv4JvEZyY+Fwqlu3LGKsAtO+xw=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.0-RC.0.tgz",
+      "integrity": "sha1-dP6kqPvYljMgnyrwygpxp6Vp2DU=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-server": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.3.6.tgz",
-      "integrity": "sha1-Np1JhE8cCpoQx8upsMt4wlIHQaU=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.0-RC.0.tgz",
+      "integrity": "sha1-Dch10TyFEwqBVSJp3hHBmreDytM=",
       "dev": true,
       "requires": {
         "parse5": "3.0.2",
@@ -92,18 +115,18 @@
       }
     },
     "@angular/router": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.6.tgz",
-      "integrity": "sha1-ZAM+20/NoIoyPnUztKGCDA8o0TA=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.0-RC.0.tgz",
+      "integrity": "sha1-72wHXxZkqf5nf6VCM0cH5nBGHuA=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz",
-      "integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=",
+      "version": "4.4.0-RC.0",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.0-RC.0.tgz",
+      "integrity": "sha1-xXZeYDDjQzHowAfF0RYotfCxi3I=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
@@ -7870,9 +7893,9 @@
       }
     },
     "gulp-highlight-files": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/gulp-highlight-files/-/gulp-highlight-files-0.0.4.tgz",
-      "integrity": "sha1-jP1kIJ5TysUs17j2qLXZ6nl5UXI=",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/gulp-highlight-files/-/gulp-highlight-files-0.0.5.tgz",
+      "integrity": "sha512-lGLApyg6ycB45MWsLx9WbsAv0iTPxGTUH+Lq8evAXUXCFBPITG2JmLxQ3OYWA1/AOItDeAX5yza1HdLlaIXIPA==",
       "dev": true,
       "requires": {
         "gulp-util": "3.0.8",
diff --git a/package.json b/package.json
index d3fd943722ee..336a38a8d2d6 100644
--- a/package.json
+++ b/package.json
@@ -25,13 +25,13 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": "~4.3.6",
-    "@angular/common": "~4.3.6",
-    "@angular/compiler": "~4.3.6",
-    "@angular/core": "~4.3.6",
-    "@angular/forms": "~4.3.6",
-    "@angular/http": "~4.3.6",
-    "@angular/platform-browser": "~4.3.6",
+    "@angular/animations": "~4.4.0-RC.0",
+    "@angular/common": "~4.4.0-RC.0",
+    "@angular/compiler": "~4.4.0-RC.0",
+    "@angular/core": "~4.4.0-RC.0",
+    "@angular/forms": "~4.4.0-RC.0",
+    "@angular/http": "~4.4.0-RC.0",
+    "@angular/platform-browser": "~4.4.0-RC.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
     "systemjs": "0.19.43",
@@ -40,11 +40,11 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.3.6",
-    "@angular/platform-browser-dynamic": "~4.3.6",
-    "@angular/platform-server": "~4.3.6",
-    "@angular/router": "~4.3.6",
-    "@angular/tsc-wrapped": "~4.3.6",
+    "@angular/compiler-cli": "~4.4.0-RC.0",
+    "@angular/platform-browser-dynamic": "~4.4.0-RC.0",
+    "@angular/platform-server": "~4.4.0-RC.0",
+    "@angular/router": "~4.4.0-RC.0",
+    "@angular/tsc-wrapped": "~4.4.0-RC.0",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^3.0.1",
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index b8c7885d1b1c..e9041dee1533 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -44,7 +44,7 @@ export class MdAutocompleteSelectedEvent {
   styleUrls: ['autocomplete.css'],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  exportAs: 'mdAutocomplete',
+  exportAs: 'mdAutocomplete, matAutocomplete',
   host: {
     'class': 'mat-autocomplete'
   }
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index daa882984084..740867820918 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -69,7 +69,7 @@ export class MdButtonToggleChange {
     'class': 'mat-button-toggle-group',
     '[class.mat-button-toggle-vertical]': 'vertical'
   },
-  exportAs: 'mdButtonToggleGroup',
+  exportAs: 'mdButtonToggleGroup, matButtonToggleGroup',
 })
 export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
     implements ControlValueAccessor, CanDisable {
@@ -229,7 +229,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
 /** Multiple selection button-toggle group. `ngModel` is not supported in this mode. */
 @Directive({
   selector: 'md-button-toggle-group[multiple], mat-button-toggle-group[multiple]',
-  exportAs: 'mdButtonToggleGroup',
+  exportAs: 'mdButtonToggleGroup, matButtonToggleGroup',
   inputs: ['disabled'],
   host: {
     'class': 'mat-button-toggle-group',
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index e2587427028e..bf8b784ec167 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -34,7 +34,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
   moduleId: module.id,
   selector: 'md-chip-list, mat-chip-list',
   template: `<div class="mat-chip-list-wrapper"><ng-content></ng-content></div>`,
-  exportAs: 'mdChipList',
+  exportAs: 'mdChipList, matChipList',
   host: {
     '[attr.tabindex]': '_tabIndex',
     'role': 'listbox',
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 3a88bd516064..642a41ea7e19 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -59,7 +59,7 @@ export class MdBasicChip { }
   selector: `md-basic-chip, [md-basic-chip], md-chip, [md-chip],
              mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]`,
   inputs: ['color', 'disabled'],
-  exportAs: 'mdChip',
+  exportAs: 'mdChip, matChip',
   host: {
     'class': 'mat-chip',
     'tabindex': '-1',
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index e8c27b65e6d3..c232ec2fb02e 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -34,7 +34,7 @@ export const MD_RIPPLE_GLOBAL_OPTIONS =
 
 @Directive({
   selector: '[md-ripple], [mat-ripple], [mdRipple], [matRipple]',
-  exportAs: 'mdRipple',
+  exportAs: 'mdRipple, matRipple',
   host: {
     'class': 'mat-ripple',
     '[class.mat-ripple-unbounded]': 'unbounded'
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index ab16cdf850b4..ee97403108b7 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -82,7 +82,7 @@ export class MdDatepickerInputEvent<D> {
     '(blur)': '_onTouched()',
     '(keydown)': '_onKeydown($event)',
   },
-  exportAs: 'mdDatepickerInput',
+  exportAs: 'mdDatepickerInput, matDatepickerInput',
 })
 export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAccessor, OnDestroy,
     Validator {
diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts
index ecb135b8ce7b..1bc338021849 100644
--- a/src/lib/input/autosize.ts
+++ b/src/lib/input/autosize.ts
@@ -16,7 +16,7 @@ import {Platform} from '@angular/cdk/platform';
 @Directive({
   selector: `textarea[md-autosize], textarea[mdTextareaAutosize],
              textarea[mat-autosize], textarea[matTextareaAutosize]`,
-  exportAs: 'mdTextareaAutosize',
+  exportAs: 'mdTextareaAutosize, matTextareaAutosize',
   host: {
     // Textarea elements that have the directive applied should have a single row by default.
     // Browsers normally show two rows by default and therefore this limits the minRows binding.
diff --git a/src/lib/mat-exports.ts b/src/lib/mat-exports.ts
new file mode 100644
index 000000000000..9afb2175f3a2
--- /dev/null
+++ b/src/lib/mat-exports.ts
@@ -0,0 +1,527 @@
+/**
+ * @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 {
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY,
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MD_AUTOCOMPLETE_VALUE_ACCESSOR,
+  MdAutocomplete,
+  MdAutocompleteModule,
+  MdAutocompleteTrigger,
+} from '@angular/material/autocomplete';
+import {
+  MdAnchor,
+  MdButton,
+  MdButtonBase,
+  MdButtonCssMatStyler,
+  MdButtonModule,
+  MdFab,
+  MdIconButtonCssMatStyler,
+  MdMiniFab,
+  MdRaisedButtonCssMatStyler,
+} from '@angular/material/button';
+import {
+  MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR,
+  MdButtonToggle,
+  MdButtonToggleChange,
+  MdButtonToggleGroup,
+  MdButtonToggleGroupBase,
+  MdButtonToggleGroupMultiple,
+  MdButtonToggleModule,
+} from '@angular/material/button-toggle';
+import {
+  MdCard,
+  MdCardActions,
+  MdCardAvatar,
+  MdCardContent,
+  MdCardFooter,
+  MdCardHeader,
+  MdCardImage,
+  MdCardLgImage,
+  MdCardMdImage,
+  MdCardModule,
+  MdCardSmImage,
+  MdCardSubtitle,
+  MdCardTitle,
+  MdCardTitleGroup,
+  MdCardXlImage,
+} from '@angular/material/card';
+import {
+  MD_CHECKBOX_CONTROL_VALUE_ACCESSOR,
+  MD_CHECKBOX_REQUIRED_VALIDATOR,
+  MdCheckbox,
+  MdCheckboxBase,
+  MdCheckboxChange,
+  MdCheckboxModule,
+  MdCheckboxRequiredValidator,
+} from '@angular/material/checkbox';
+import {
+  MdBasicChip,
+  MdChip,
+  MdChipBase,
+  MdChipEvent,
+  MdChipInput,
+  MdChipInputEvent,
+  MdChipList,
+  MdChipRemove,
+  MdChipsModule,
+} from '@angular/material/chips';
+import {
+  MD_DATE_FORMATS,
+  MD_ERROR_GLOBAL_OPTIONS,
+  MD_NATIVE_DATE_FORMATS,
+  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  MD_RIPPLE_GLOBAL_OPTIONS,
+  MdCommonModule,
+  MdDateFormats,
+  MdLine,
+  MdLineModule,
+  MdLineSetter,
+  MdNativeDateModule,
+  MdOptgroup,
+  MdOptgroupBase,
+  MdOption,
+  MdOptionModule,
+  MdOptionSelectionChange,
+  MdPseudoCheckbox,
+  MdPseudoCheckboxModule,
+  MdPseudoCheckboxState,
+  MdRipple,
+  MdRippleModule,
+} from '@angular/material/core';
+import {
+  MD_DATEPICKER_SCROLL_STRATEGY,
+  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MD_DATEPICKER_VALIDATORS,
+  MD_DATEPICKER_VALUE_ACCESSOR,
+  MdCalendar,
+  MdCalendarBody,
+  MdCalendarCell,
+  MdDatepicker,
+  MdDatepickerContent,
+  MdDatepickerInput,
+  MdDatepickerInputEvent,
+  MdDatepickerIntl,
+  MdDatepickerModule,
+  MdDatepickerToggle,
+  MdMonthView,
+  MdYearView,
+} from '@angular/material/datepicker';
+import {
+  MD_DIALOG_DATA,
+  MD_DIALOG_SCROLL_STRATEGY,
+  MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
+  MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdDialog,
+  MdDialogActions,
+  MdDialogClose,
+  MdDialogConfig,
+  MdDialogContainer,
+  MdDialogContent,
+  MdDialogModule,
+  MdDialogRef,
+  MdDialogTitle,
+} from '@angular/material/dialog';
+import {
+  MdAccordion,
+  MdAccordionDisplayMode,
+  MdExpansionModule,
+  MdExpansionPanel,
+  MdExpansionPanelActionRow,
+  MdExpansionPanelDescription,
+  MdExpansionPanelHeader,
+  MdExpansionPanelState,
+  MdExpansionPanelTitle,
+} from '@angular/material/expansion';
+import {
+  MdError,
+  MdFormField,
+  MdFormFieldControl,
+  MdFormFieldModule,
+  MdHint,
+  MdPlaceholder,
+  MdPrefix,
+  MdSuffix,
+} from '@angular/material/form-field';
+import {MdGridList, MdGridListModule, MdGridTile} from '@angular/material/grid-list';
+import {MdIcon, MdIconBase, MdIconModule, MdIconRegistry} from '@angular/material/icon';
+import {MdInput, MdInputModule, MdTextareaAutosize} from '@angular/material/input';
+import {
+  MdDividerCssMatStyler,
+  MdList,
+  MdListAvatarCssMatStyler,
+  MdListBase,
+  MdListCssMatStyler,
+  MdListDivider,
+  MdListIconCssMatStyler,
+  MdListItem,
+  MdListItemBase,
+  MdListModule,
+  MdListOption,
+  MdListOptionBase,
+  MdListSubheaderCssMatStyler,
+  MdNavListCssMatStyler,
+  MdSelectionList,
+  MdSelectionListBase,
+  MdSelectionListOptionEvent,
+} from '@angular/material/list';
+import {
+  MD_MENU_DEFAULT_OPTIONS,
+  MdMenu,
+  MdMenuDefaultOptions,
+  MdMenuItem,
+  MdMenuModule,
+  MdMenuPanel,
+  MdMenuTrigger,
+} from '@angular/material/menu';
+import {MdPaginator, MdPaginatorIntl, MdPaginatorModule} from '@angular/material/paginator';
+import {MdProgressBar, MdProgressBarModule} from '@angular/material/progress-bar';
+import {
+  MdProgressSpinner,
+  MdProgressSpinnerBase,
+  MdProgressSpinnerCssMatStyler,
+  MdProgressSpinnerModule,
+  MdSpinner,
+} from '@angular/material/progress-spinner';
+import {
+  MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR,
+  MdRadioButton,
+  MdRadioButtonBase,
+  MdRadioChange,
+  MdRadioGroup,
+  MdRadioGroupBase,
+  MdRadioModule,
+} from '@angular/material/radio';
+import {
+  MD_SELECT_SCROLL_STRATEGY,
+  MD_SELECT_SCROLL_STRATEGY_PROVIDER,
+  MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdSelect,
+  MdSelectBase,
+  MdSelectChange,
+  MdSelectModule,
+  MdSelectTrigger,
+} from '@angular/material/select';
+import {
+  MdDrawer,
+  MdDrawerContainer,
+  MdDrawerToggleResult,
+  MdSidenav,
+  MdSidenavContainer,
+  MdSidenavModule,
+} from '@angular/material/sidenav';
+import {
+  MD_SLIDE_TOGGLE_VALUE_ACCESSOR,
+  MdSlideToggle,
+  MdSlideToggleBase,
+  MdSlideToggleChange,
+  MdSlideToggleModule,
+} from '@angular/material/slide-toggle';
+import {
+  MD_SLIDER_VALUE_ACCESSOR,
+  MdSlider,
+  MdSliderBase,
+  MdSliderChange,
+  MdSliderModule,
+} from '@angular/material/slider';
+import {
+  MD_SNACK_BAR_DATA,
+  MdSnackBar,
+  MdSnackBarConfig,
+  MdSnackBarContainer,
+  MdSnackBarModule,
+  MdSnackBarRef,
+} from '@angular/material/snack-bar';
+import {
+  MdSort,
+  MdSortable,
+  MdSortHeader,
+  MdSortHeaderIntl,
+  MdSortModule,
+} from '@angular/material/sort';
+import {
+  MdCell,
+  MdCellDef,
+  MdColumnDef,
+  MdHeaderCell,
+  MdHeaderCellDef,
+  MdHeaderRow,
+  MdRow,
+  MdTable,
+  MdTableModule,
+} from '@angular/material/table';
+import {
+  MdInkBar,
+  MdTab,
+  MdTabBody,
+  MdTabBodyOriginState,
+  MdTabBodyPositionState,
+  MdTabChangeEvent,
+  MdTabGroup,
+  MdTabGroupBase,
+  MdTabHeader,
+  MdTabHeaderPosition,
+  MdTabLabel,
+  MdTabLabelWrapper,
+  MdTabLink,
+  MdTabNav,
+  MdTabsModule,
+} from '@angular/material/tabs';
+import {MdToolbar, MdToolbarBase, MdToolbarModule, MdToolbarRow} from '@angular/material/toolbar';
+import {
+  MD_TOOLTIP_SCROLL_STRATEGY,
+  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER,
+  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdTooltip,
+  MdTooltipModule,
+} from '@angular/material/tooltip';
+
+/* tslint:disable:max-line-length */
+export {MD_AUTOCOMPLETE_SCROLL_STRATEGY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY};
+export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER};
+export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MD_AUTOCOMPLETE_VALUE_ACCESSOR as MAT_AUTOCOMPLETE_VALUE_ACCESSOR};
+export {MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR};
+export {MD_CHECKBOX_CONTROL_VALUE_ACCESSOR as MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR};
+export {MD_CHECKBOX_REQUIRED_VALIDATOR as MAT_CHECKBOX_REQUIRED_VALIDATOR};
+export {MD_DATE_FORMATS as MAT_DATE_FORMATS};
+export {MD_DATEPICKER_SCROLL_STRATEGY as MAT_DATEPICKER_SCROLL_STRATEGY};
+export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER};
+export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MD_DATEPICKER_VALIDATORS as MAT_DATEPICKER_VALIDATORS};
+export {MD_DATEPICKER_VALUE_ACCESSOR as MAT_DATEPICKER_VALUE_ACCESSOR};
+export {MD_DIALOG_DATA as MAT_DIALOG_DATA};
+export {MD_DIALOG_SCROLL_STRATEGY as MAT_DIALOG_SCROLL_STRATEGY};
+export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER};
+export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MD_ERROR_GLOBAL_OPTIONS as MAT_ERROR_GLOBAL_OPTIONS};
+export {MD_MENU_DEFAULT_OPTIONS as MAT_MENU_DEFAULT_OPTIONS};
+export {MD_NATIVE_DATE_FORMATS as MAT_NATIVE_DATE_FORMATS};
+export {MD_PLACEHOLDER_GLOBAL_OPTIONS as MAT_PLACEHOLDER_GLOBAL_OPTIONS};
+export {MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR as MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR};
+export {MD_RIPPLE_GLOBAL_OPTIONS as MAT_RIPPLE_GLOBAL_OPTIONS};
+export {MD_SELECT_SCROLL_STRATEGY as MAT_SELECT_SCROLL_STRATEGY};
+export {MD_SELECT_SCROLL_STRATEGY_PROVIDER as MAT_SELECT_SCROLL_STRATEGY_PROVIDER};
+export {MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MD_SLIDE_TOGGLE_VALUE_ACCESSOR as MAT_SLIDE_TOGGLE_VALUE_ACCESSOR};
+export {MD_SLIDER_VALUE_ACCESSOR as MAT_SLIDER_VALUE_ACCESSOR};
+export {MD_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA};
+export {MD_TOOLTIP_SCROLL_STRATEGY as MAT_TOOLTIP_SCROLL_STRATEGY};
+export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER};
+export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MdAccordion as MatAccordion};
+export {MdAccordionDisplayMode as MatAccordionDisplayMode};
+export {MdAnchor as MatAnchor};
+export {MdAutocomplete as MatAutocomplete};
+export {MdAutocompleteModule as MatAutocompleteModule};
+export {MdAutocompleteTrigger as MatAutocompleteTrigger};
+export {MdBasicChip as MatBasicChip};
+export {MdButton as MatButton};
+export {MdButtonBase as MatButtonBase};
+export {MdButtonCssMatStyler as MatButtonCssMatStyler};
+export {MdButtonModule as MatButtonModule};
+export {MdButtonToggle as MatButtonToggle};
+export {MdButtonToggleChange as MatButtonToggleChange};
+export {MdButtonToggleGroup as MatButtonToggleGroup};
+export {MdButtonToggleGroupBase as MatButtonToggleGroupBase};
+export {MdButtonToggleGroupMultiple as MatButtonToggleGroupMultiple};
+export {MdButtonToggleModule as MatButtonToggleModule};
+export {MdCalendar as MatCalendar};
+export {MdCalendarBody as MatCalendarBody};
+export {MdCalendarCell as MatCalendarCell};
+export {MdCard as MatCard};
+export {MdCardActions as MatCardActions};
+export {MdCardAvatar as MatCardAvatar};
+export {MdCardContent as MatCardContent};
+export {MdCardFooter as MatCardFooter};
+export {MdCardHeader as MatCardHeader};
+export {MdCardImage as MatCardImage};
+export {MdCardLgImage as MatCardLgImage};
+export {MdCardMdImage as MatCardMatImage};
+export {MdCardModule as MatCardModule};
+export {MdCardSmImage as MatCardSmImage};
+export {MdCardSubtitle as MatCardSubtitle};
+export {MdCardTitle as MatCardTitle};
+export {MdCardTitleGroup as MatCardTitleGroup};
+export {MdCardXlImage as MatCardXlImage};
+export {MdCell as MatCell};
+export {MdCellDef as MatCellDef};
+export {MdCheckbox as MatCheckbox};
+export {MdCheckboxBase as MatCheckboxBase};
+export {MdCheckboxChange as MatCheckboxChange};
+export {MdCheckboxModule as MatCheckboxModule};
+export {MdCheckboxRequiredValidator as MatCheckboxRequiredValidator};
+export {MdChip as MatChip};
+export {MdChipBase as MatChipBase};
+export {MdChipEvent as MatChipEvent};
+export {MdChipInput as MatChipInput};
+export {MdChipInputEvent as MatChipInputEvent};
+export {MdChipList as MatChipList};
+export {MdChipRemove as MatChipRemove};
+export {MdChipsModule as MatChipsModule};
+export {MdColumnDef as MatColumnDef};
+export {MdCommonModule as MatCommonModule};
+export {MdDateFormats as MatDateFormats};
+export {MdDatepicker as MatDatepicker};
+export {MdDatepickerContent as MatDatepickerContent};
+export {MdDatepickerInput as MatDatepickerInput};
+export {MdDatepickerInputEvent as MatDatepickerInputEvent};
+export {MdDatepickerIntl as MatDatepickerIntl};
+export {MdDatepickerModule as MatDatepickerModule};
+export {MdDatepickerToggle as MatDatepickerToggle};
+export {MdDialog as MatDialog};
+export {MdDialogActions as MatDialogActions};
+export {MdDialogClose as MatDialogClose};
+export {MdDialogConfig as MatDialogConfig};
+export {MdDialogContainer as MatDialogContainer};
+export {MdDialogContent as MatDialogContent};
+export {MdDialogModule as MatDialogModule};
+export {MdDialogRef as MatDialogRef};
+export {MdDialogTitle as MatDialogTitle};
+export {MdDividerCssMatStyler as MatDividerCssMatStyler};
+export {MdDrawerToggleResult as MatDrawerToggleResult};
+export {MdDrawer as MatDrawer};
+export {MdDrawerContainer as MatDrawerContainer};
+export {MdExpansionModule as MatExpansionModule};
+export {MdExpansionPanel as MatExpansionPanel};
+export {MdExpansionPanelActionRow as MatExpansionPanelActionRow};
+export {MdExpansionPanelDescription as MatExpansionPanelDescription};
+export {MdExpansionPanelHeader as MatExpansionPanelHeader};
+export {MdExpansionPanelState as MatExpansionPanelState};
+export {MdExpansionPanelTitle as MatExpansionPanelTitle};
+export {MdFab as MatFab};
+export {MdGridList as MatGridList};
+export {MdGridListModule as MatGridListModule};
+export {MdGridTile as MatGridTile};
+export {MdHeaderCell as MatHeaderCell};
+export {MdHeaderCellDef as MatHeaderCellDef};
+export {MdHeaderRow as MatHeaderRow};
+export {MdIcon as MatIcon};
+export {MdIconBase as MatIconBase};
+export {MdIconButtonCssMatStyler as MatIconButtonCssMatStyler};
+export {MdIconModule as MatIconModule};
+export {MdIconRegistry as MatIconRegistry};
+export {MdInkBar as MatInkBar};
+export {MdInput as MatInput};
+export {MdInputModule as MatInputModule};
+export {MdLine as MatLine};
+export {MdLineModule as MatLineModule};
+export {MdLineSetter as MatLineSetter};
+export {MdList as MatList};
+export {MdListAvatarCssMatStyler as MatListAvatarCssMatStyler};
+export {MdListBase as MatListBase};
+export {MdListCssMatStyler as MatListCssMatStyler};
+export {MdListDivider as MatListDivider};
+export {MdListIconCssMatStyler as MatListIconCssMatStyler};
+export {MdListItem as MatListItem};
+export {MdListItemBase as MatListItemBase};
+export {MdListModule as MatListModule};
+export {MdListOption as MatListOption};
+export {MdListOptionBase as MatListOptionBase};
+export {MdListSubheaderCssMatStyler as MatListSubheaderCssMatStyler};
+export {MdMenu as MatMenu};
+export {MdMenuDefaultOptions as MatMenuDefaultOptions};
+export {MdMenuItem as MatMenuItem};
+export {MdMenuModule as MatMenuModule};
+export {MdMenuPanel as MatMenuPanel};
+export {MdMenuTrigger as MatMenuTrigger};
+export {MdMiniFab as MatMiniFab};
+export {MdMonthView as MatMonthView};
+export {MdNativeDateModule as MatNativeDateModule};
+export {MdNavListCssMatStyler as MatNavListCssMatStyler};
+export {MdOptgroup as MatOptgroup};
+export {MdOptgroupBase as MatOptgroupBase};
+export {MdOption as MatOption};
+export {MdOptionModule as MatOptionModule};
+export {MdOptionSelectionChange as MatOptionSelectionChange};
+export {MdPaginator as MatPaginator};
+export {MdPaginatorIntl as MatPaginatorIntl};
+export {MdPaginatorModule as MatPaginatorModule};
+export {MdProgressBar as MatProgressBar};
+export {MdProgressBarModule as MatProgressBarModule};
+export {MdProgressSpinner as MatProgressSpinner};
+export {MdProgressSpinnerBase as MatProgressSpinnerBase};
+export {MdProgressSpinnerCssMatStyler as MatProgressSpinnerCssMatStyler};
+export {MdProgressSpinnerModule as MatProgressSpinnerModule};
+export {MdPseudoCheckbox as MatPseudoCheckbox};
+export {MdPseudoCheckboxModule as MatPseudoCheckboxModule};
+export {MdPseudoCheckboxState as MatPseudoCheckboxState};
+export {MdRadioButton as MatRadioButton};
+export {MdRadioButtonBase as MatRadioButtonBase};
+export {MdRadioChange as MatRadioChange};
+export {MdRadioGroup as MatRadioGroup};
+export {MdRadioGroupBase as MatRadioGroupBase};
+export {MdRadioModule as MatRadioModule};
+export {MdRaisedButtonCssMatStyler as MatRaisedButtonCssMatStyler};
+export {MdRipple as MatRipple};
+export {MdRippleModule as MatRippleModule};
+export {MdRow as MatRow};
+export {MdSelect as MatSelect};
+export {MdSelectBase as MatSelectBase};
+export {MdSelectChange as MatSelectChange};
+export {MdSelectionList as MatSelectionList};
+export {MdSelectionListBase as MatSelectionListBase};
+export {MdSelectionListOptionEvent as MatSelectionListOptionEvent};
+export {MdSelectModule as MatSelectModule};
+export {MdSelectTrigger as MatSelectTrigger};
+export {MdSidenav as MatSidenav};
+export {MdSidenavContainer as MatSidenavContainer};
+export {MdSidenavModule as MatSidenavModule};
+export {MdSlider as MatSlider};
+export {MdSliderBase as MatSliderBase};
+export {MdSliderChange as MatSliderChange};
+export {MdSliderModule as MatSliderModule};
+export {MdSlideToggle as MatSlideToggle};
+export {MdSlideToggleBase as MatSlideToggleBase};
+export {MdSlideToggleChange as MatSlideToggleChange};
+export {MdSlideToggleModule as MatSlideToggleModule};
+export {MdSnackBar as MatSnackBar};
+export {MdSnackBarConfig as MatSnackBarConfig};
+export {MdSnackBarContainer as MatSnackBarContainer};
+export {MdSnackBarModule as MatSnackBarModule};
+export {MdSnackBarRef as MatSnackBarRef};
+export {MdSort as MatSort};
+export {MdSortable as MatSortable};
+export {MdSortHeader as MatSortHeader};
+export {MdSortHeaderIntl as MatSortHeaderIntl};
+export {MdSortModule as MatSortModule};
+export {MdSpinner as MatSpinner};
+export {MdTab as MatTab};
+export {MdTabBody as MatTabBody};
+export {MdTabBodyOriginState as MatTabBodyOriginState};
+export {MdTabBodyPositionState as MatTabBodyPositionState};
+export {MdTabChangeEvent as MatTabChangeEvent};
+export {MdTabGroup as MatTabGroup};
+export {MdTabGroupBase as MatTabGroupBase};
+export {MdTabHeader as MatTabHeader};
+export {MdTabHeaderPosition as MatTabHeaderPosition};
+export {MdTabLabel as MatTabLabel};
+export {MdTabLabelWrapper as MatTabLabelWrapper};
+export {MdTable as MatTable};
+export {MdTableModule as MatTableModule};
+export {MdTabLink as MatTabLink};
+export {MdTabNav as MatTabNav};
+export {MdTabsModule as MatTabsModule};
+export {MdTextareaAutosize as MatTextareaAutosize};
+export {MdToolbar as MatToolbar};
+export {MdToolbarBase as MatToolbarBase};
+export {MdToolbarModule as MatToolbarModule};
+export {MdToolbarRow as MatToolbarRow};
+export {MdTooltip as MatTooltip};
+export {MdTooltipModule as MatTooltipModule};
+export {MdYearView as MatYearView};
+export {MdFormFieldModule as MatFormFieldModule};
+export {MdError as MatError};
+export {MdFormField as MatFormField};
+export {MdFormFieldControl as MatFormFieldControl};
+export {MdHint as MatHint};
+export {MdPlaceholder as MatPlaceholder};
+export {MdPrefix as MatPrefix};
+export {MdSuffix as MatSuffix};
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index fd3b53aefb96..a0745fe3baf5 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -44,7 +44,7 @@ export const _MdMenuItemMixinBase = mixinDisabled(MdMenuItemBase);
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   templateUrl: 'menu-item.html',
-  exportAs: 'mdMenuItem',
+  exportAs: 'mdMenuItem, matMenuItem',
 })
 export class MdMenuItem extends _MdMenuItemMixinBase implements FocusableOption, CanDisable,
   OnDestroy {
diff --git a/src/lib/public_api.ts b/src/lib/public_api.ts
index 44c3e6a600e2..b38675d877ba 100644
--- a/src/lib/public_api.ts
+++ b/src/lib/public_api.ts
@@ -46,3 +46,4 @@ export * from '@angular/material/table';
 export * from '@angular/material/tabs';
 export * from '@angular/material/toolbar';
 export * from '@angular/material/tooltip';
+export * from './mat-exports';
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 5ff27f2855a7..d7a20d8fc639 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -201,7 +201,7 @@ export class MdSelectTrigger {}
     transformPanel,
     fadeInContent
   ],
-  exportAs: 'mdSelect',
+  exportAs: 'mdSelect, matSelect',
 })
 export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
     ControlValueAccessor, CanColor, CanDisable, HasTabIndex {
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index 2031d0716541..f848e33f0443 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -37,7 +37,7 @@ export const _MdTabMixinBase = mixinDisabled(MdTabBase);
   inputs: ['disabled'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
-  exportAs: 'mdTab',
+  exportAs: 'mdTab, matTab',
 })
 export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChanges, OnDestroy {
   /** Content for the tab label given by <ng-template md-tab-label>. */
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 7cca6e1c9fb9..49aaabfbb9d8 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -91,7 +91,7 @@ export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
     '(keydown)': '_handleKeydown($event)',
     '(touchend)': 'hide(' + TOUCHEND_HIDE_DELAY + ')',
   },
-  exportAs: 'mdTooltip',
+  exportAs: 'mdTooltip, matTooltip',
 })
 export class MdTooltip implements OnDestroy {
   _overlayRef: OverlayRef | null;
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 95b9ca85a27d..e0faea947450 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -54,8 +54,8 @@ import {ListOverviewExample} from './list-overview/list-overview-example';
 import {ListSectionsExample} from './list-sections/list-sections-example';
 import {ListSelectionExample} from './list-selection/list-selection-example';
 import {MenuIconsExample} from './menu-icons/menu-icons-example';
-import {NestedMenuExample} from './nested-menu/nested-menu-example';
 import {MenuOverviewExample} from './menu-overview/menu-overview-example';
+import {NestedMenuExample} from './nested-menu/nested-menu-example';
 import {PaginatorConfigurableExample} from './paginator-configurable/paginator-configurable-example';
 import {PaginatorOverviewExample} from './paginator-overview/paginator-overview-example';
 import {ProgressBarConfigurableExample} from './progress-bar-configurable/progress-bar-configurable-example';
@@ -337,18 +337,18 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
-  'nested-menu': {
-    title: 'Nested menu',
-    component: NestedMenuExample,
-    additionalFiles: null,
-    selectorName: null
-  },
   'menu-overview': {
     title: 'Basic menu',
     component: MenuOverviewExample,
     additionalFiles: null,
     selectorName: null
   },
+  'nested-menu': {
+    title: 'Nested menu',
+    component: NestedMenuExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'paginator-configurable': {
     title: 'Configurable paginator',
     component: PaginatorConfigurableExample,
@@ -591,8 +591,8 @@ export const EXAMPLE_LIST = [
   ListSectionsExample,
   ListSelectionExample,
   MenuIconsExample,
-  NestedMenuExample,
   MenuOverviewExample,
+  NestedMenuExample,
   PaginatorConfigurableExample,
   PaginatorOverviewExample,
   ProgressBarConfigurableExample,
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 419afdf7d2cd..3319cbb76465 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -19,7 +19,7 @@ const rollupCdkEntryPoints = cdkSecondaryEntryPoints.reduce((globals: any, entry
 
 /** Object with all material entry points in the format of Rollup globals. */
 const rollupMatEntryPoints = matSecondaryEntryPoints.reduce((globals: any, entryPoint: string) => {
-  globals[`@angular/material/${entryPoint}`] = `ng.mat.${dashCaseToCamelCase(entryPoint)}`;
+  globals[`@angular/material/${entryPoint}`] = `ng.material.${dashCaseToCamelCase(entryPoint)}`;
   return globals;
 }, {});
 

From 548eca0538f41df211f1d9daeafda3fa7e5a2bb1 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 15 Sep 2017 14:04:40 -0700
Subject: [PATCH 097/575] chore: add missing mat prefix selectors (#7114)

---
 src/lib/menu/menu-directive.ts | 2 +-
 src/lib/menu/menu-trigger.ts   | 2 +-
 src/lib/menu/menu.spec.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 4c0a43b40d0b..3c673254278f 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -66,7 +66,7 @@ const MD_MENU_BASE_ELEVATION = 2;
     transformMenu,
     fadeInItems
   ],
-  exportAs: 'mdMenu'
+  exportAs: 'mdMenu, matMenu'
 })
 export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   private _keyManager: FocusKeyManager<MdMenuItem>;
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 7c3b7385f275..9c3b8cfa700c 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -81,7 +81,7 @@ export const MENU_PANEL_TOP_PADDING = 8;
     '(keydown)': '_handleKeydown($event)',
     '(click)': '_handleClick($event)',
   },
-  exportAs: 'mdMenuTrigger'
+  exportAs: 'mdMenuTrigger, matMenuTrigger'
 })
 export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   private _portal: TemplatePortal<any>;
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 367090c8f942..8b07cf95975c 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -1113,7 +1113,7 @@ class OverlapMenu implements TestableMenu {
       <ng-content></ng-content>
     </ng-template>
   `,
-  exportAs: 'mdCustomMenu'
+  exportAs: 'mdCustomMenu, matCustomMenu'
 })
 class CustomMenuPanel implements MdMenuPanel {
   direction: Direction;

From df808b845c25d9f40d5bbeff7a7c4b206f26a0a1 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 15 Sep 2017 15:28:38 -0700
Subject: [PATCH 098/575] build: fix material unit tests not running (#7117)

---
 tools/package-tools/build-package.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index 2ab4f5e94be3..9977fd5d98ce 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -3,6 +3,7 @@ import {spawn} from 'child_process';
 import {readFileSync, writeFileSync} from 'fs';
 import {sync as glob} from 'glob';
 import {join} from 'path';
+import {main as ngc} from '@angular/tsc-wrapped';
 import {PackageBundler} from './build-bundles';
 import {buildConfig} from './build-config';
 import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
@@ -82,7 +83,7 @@ export class BuildPackage {
 
   /** Compiles the TypeScript test source files for the package. */
   async compileTests() {
-    await this._compileEntryPoint(testsTsconfigName);
+    await this._compileTestEntryPoint(testsTsconfigName);
   }
 
   /** Creates all bundles for the package and all associated entry points. */
@@ -108,6 +109,15 @@ export class BuildPackage {
     .then(() => this.renamePrivateReExportsToBeUnique(secondaryEntryPoint));
   }
 
+  /** Compiles the TypeScript sources of a primary or secondary entry point. */
+  private async _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
+    const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
+    const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
+
+    await ngc(entryPointTsconfigPath, {basePath: entryPointPath});
+    this.renamePrivateReExportsToBeUnique(secondaryEntryPoint);
+  }
+
   /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
   private renamePrivateReExportsToBeUnique(secondaryEntryPoint = '') {
     // When we compiled the typescript sources with ngc, we do entry-point individually.

From a611d36ece8e25c0c96d84e0ec4095c9571c6662 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 18 Sep 2017 18:55:16 +0200
Subject: [PATCH 099/575] build: new packaging not working on Windows (#7120)

Fixes the new packaging throwing an error on Windows as a result of b296e2bd59c57a1c6affe5470c41f7ad02677534.
---
 tools/package-tools/build-package.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index 9977fd5d98ce..381955c58f7c 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -2,7 +2,7 @@ import {red} from 'chalk';
 import {spawn} from 'child_process';
 import {readFileSync, writeFileSync} from 'fs';
 import {sync as glob} from 'glob';
-import {join} from 'path';
+import {join, resolve as resolvePath} from 'path';
 import {main as ngc} from '@angular/tsc-wrapped';
 import {PackageBundler} from './build-bundles';
 import {buildConfig} from './build-config';
@@ -97,7 +97,8 @@ export class BuildPackage {
     const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
 
     return new Promise((resolve, reject) => {
-      const childProcess = spawn('./node_modules/.bin/ngc', ['-p', entryPointTsconfigPath]);
+      const ngcPath = resolvePath('./node_modules/.bin/ngc');
+      const childProcess = spawn(ngcPath, ['-p', entryPointTsconfigPath], {shell: true});
 
       // Pipe stdout and stderr from the child process.
       childProcess.stdout.on('data', (data: any) => console.log(`${data}`));

From 7e096b1382dd429a33ee0abbd26a8dd41398095d Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Mon, 18 Sep 2017 12:55:49 -0400
Subject: [PATCH 100/575] fix(sidenav-fab-example): correctly position fab in
 plunker (#7108)

Fixes #7051
---
 src/material-examples/sidenav-fab/sidenav-fab-example.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.css b/src/material-examples/sidenav-fab/sidenav-fab-example.css
index 51cdee38fca8..a2f237c6049f 100644
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.css
+++ b/src/material-examples/sidenav-fab/sidenav-fab-example.css
@@ -18,7 +18,7 @@
   overflow: auto;
 }
 
-.example-fab {
+.example-fab.mat-mini-fab {
   position: absolute;
   right: 20px;
   bottom: 10px;

From b5d2e0ba9d7021ba497e7a636c1070da14101e14 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 18 Sep 2017 09:56:17 -0700
Subject: [PATCH 101/575] docs(chips): Add chips with input example (#7081)

---
 src/lib/chips/chips.md                        | 24 ++++++++-
 .../chips-input/chips-input-example.html      | 14 +++++
 .../chips-input/chips-input-example.scss      |  3 ++
 .../chips-input/chips-input-example.ts        | 52 +++++++++++++++++++
 src/material-examples/example-module.ts       |  8 +++
 5 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 src/material-examples/chips-input/chips-input-example.html
 create mode 100644 src/material-examples/chips-input/chips-input-example.scss
 create mode 100644 src/material-examples/chips-input/chips-input-example.ts

diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 1e26923b5b79..1eadeab12a50 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -22,13 +22,33 @@ _Hint: `<md-basic-chip>` receives the `mat-basic-chip` CSS class in addition to
 Chips can be selected via the `selected` property. Selection can be disabled by setting
 `selectable` to `false` on the `<md-chip-list>`.
 
-Selection emits the `(select)` output while deselecting emits the `(deselect)` output. Both outputs
-receive a ChipEvent object with a structure of `{ chip: alteredChip }`.
+Whenever the selection state changes, a `ChipSelectionChange` event will be emitted via 
+`(onSelectionChange)`.
 
 ### Disabled chips
 Individual chips may be disabled by applying the `disabled` attribute to the chip. When disabled,
 chips are neither selectable nor focusable. Currently, disabled chips receive no special styling.
 
+### Chip input
+The `MdChipInput` directive can be used together with a chip-list to streamline the interaction
+between the two components. This directive adds chip-specific behaviors to the input element
+within `<md-form-field>` for adding and removing chips. The `<input>` with `MdChipInput` can
+be placed inside or outside the chip-list element.
+
+An exmaple of chip input placed inside the chip-list element.
+<!-- example(chips-input) -->
+
+An example of chip input placed outside the chip-list element.
+```html
+<md-form-field>
+  <md-chip-list #chipList>
+    <md-chip>Chip 1<md-chip>
+    <md-chip>Chip 2<md-chip>
+  </md-chip-list>
+  <input mdChipInputFor="chipList">
+</md-form-field>
+```
+
 ### Keyboard interaction
 Users can move through the chips using the arrow keys and select/deselect them with the space. Chips
 also gain focus when clicked, ensuring keyboard navigation starts at the appropriate chip.
diff --git a/src/material-examples/chips-input/chips-input-example.html b/src/material-examples/chips-input/chips-input-example.html
new file mode 100644
index 000000000000..f80ef3152670
--- /dev/null
+++ b/src/material-examples/chips-input/chips-input-example.html
@@ -0,0 +1,14 @@
+<md-form-field class="demo-chip-list">
+  <md-chip-list mdPrefix #chipList>
+    <md-chip *ngFor="let fruit of fruits" [selectable]="selectable"
+             [removable]="removable" (remove)="remove(fruit)">
+      {{fruit.name}}
+      <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
+    </md-chip>
+  </md-chip-list>
+  <input mdInput placeholder="New fruit..."
+         [mdChipInputFor]="chipList"
+         [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
+         [mdChipInputAddOnBlur]="addOnBlur"
+         (mdChipInputTokenEnd)="add($event)" />
+</md-form-field>
diff --git a/src/material-examples/chips-input/chips-input-example.scss b/src/material-examples/chips-input/chips-input-example.scss
new file mode 100644
index 000000000000..505a4c661c34
--- /dev/null
+++ b/src/material-examples/chips-input/chips-input-example.scss
@@ -0,0 +1,3 @@
+.demo-chip-list {
+  width: 100%;
+}
diff --git a/src/material-examples/chips-input/chips-input-example.ts b/src/material-examples/chips-input/chips-input-example.ts
new file mode 100644
index 000000000000..0e96d0862e05
--- /dev/null
+++ b/src/material-examples/chips-input/chips-input-example.ts
@@ -0,0 +1,52 @@
+import {Component} from '@angular/core';
+import {MdChipInputEvent, ENTER} from '@angular/material';
+
+const COMMA = 188;
+
+/**
+ * @title Chips with input
+ */
+@Component({
+  selector: 'chips-input-example',
+  templateUrl: 'chips-input-example.html',
+  styleUrls: ['chips-input-example.css']
+})
+export class ChipsInputExample {
+  visible: boolean = true;
+  selectable: boolean = true;
+  removable: boolean = true;
+  addOnBlur: boolean = true;
+
+  // Enter, comma
+  separatorKeysCodes = [ENTER, COMMA];
+
+  fruits = [
+    { name: 'Lemon' },
+    { name: 'Lime' },
+    { name: 'Apple' },
+  ];
+
+
+  add(event: MdChipInputEvent): void {
+    let input = event.input;
+    let value = event.value;
+
+    // Add our person
+    if ((value || '').trim()) {
+      this.fruits.push({ name: value.trim() });
+    }
+
+    // Reset the input value
+    if (input) {
+      input.value = '';
+    }
+  }
+
+  remove(fruit: any): void {
+    let index = this.fruits.indexOf(fruit);
+
+    if (index >= 0) {
+      this.fruits.splice(index, 1);
+    }
+  }
+}
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index e0faea947450..9a0fa11c6e4c 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -26,6 +26,7 @@ import {CardOverviewExample} from './card-overview/card-overview-example';
 import {CdkTableBasicExample} from './cdk-table-basic/cdk-table-basic-example';
 import {CheckboxConfigurableExample} from './checkbox-configurable/checkbox-configurable-example';
 import {CheckboxOverviewExample} from './checkbox-overview/checkbox-overview-example';
+import {ChipsInputExample} from './chips-input/chips-input-example';
 import {ChipsOverviewExample} from './chips-overview/chips-overview-example';
 import {ChipsStackedExample} from './chips-stacked/chips-stacked-example';
 import {DatepickerApiExample} from './datepicker-api/datepicker-api-example';
@@ -169,6 +170,12 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'chips-input': {
+    title: 'Chips with input',
+    component: ChipsInputExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'chips-overview': {
     title: 'Basic chips',
     component: ChipsOverviewExample,
@@ -563,6 +570,7 @@ export const EXAMPLE_LIST = [
   CdkTableBasicExample,
   CheckboxConfigurableExample,
   CheckboxOverviewExample,
+  ChipsInputExample,
   ChipsOverviewExample,
   ChipsStackedExample,
   DatepickerApiExample,

From 90434668bb754658c7a1ab217fbb8dee8b487d3f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 18 Sep 2017 18:57:25 +0200
Subject: [PATCH 102/575] build: fix payload calculation (#7132)

* Due to the recent changes in the Material package, the payload is no longer calculated correctly. All components have been moved into different bundles instead of a single bundle.
---
 tools/gulp/tasks/payload.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/gulp/tasks/payload.ts b/tools/gulp/tasks/payload.ts
index 6cbbb2a14af0..7c0023245749 100644
--- a/tools/gulp/tasks/payload.ts
+++ b/tools/gulp/tasks/payload.ts
@@ -23,8 +23,8 @@ task('payload', ['material:clean-build'], async () => {
     // Material bundles
     material_umd: getBundleSize('material.umd.js'),
     material_umd_minified_uglify: getBundleSize('material.umd.min.js'),
-    material_fesm_2015: getBundleSize('material.js'),
-    material_fesm_2014: getBundleSize('material.es5.js'),
+    material_fesm_2015: getBundleSize('material.js') + getBundleSize('material/!(*.es5).js'),
+    material_fesm_2014: getBundleSize('material.es5.js') + getBundleSize('material/*.es5.js'),
     // CDK bundles
     cdk_umd: getBundleSize('cdk*.umd.js'),
     cdk_umd_minified_uglify: getBundleSize('cdk*.umd.min.js'),

From 86ec493c00ecbd105371c8655e30e0e2beadbbae Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 18 Sep 2017 10:05:10 -0700
Subject: [PATCH 103/575] compat(sort): add mat compatible sort event (#6611)

---
 src/demo-app/table/person-data-source.ts                  | 2 +-
 src/lib/sort/sort-header.ts                               | 2 +-
 src/lib/sort/sort.spec.ts                                 | 8 ++++----
 src/lib/sort/sort.ts                                      | 7 +++++--
 src/material-examples/table-http/table-http-example.ts    | 4 ++--
 .../table-overview/table-overview-example.ts              | 2 +-
 .../table-sorting/table-sorting-example.ts                | 2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/demo-app/table/person-data-source.ts b/src/demo-app/table/person-data-source.ts
index 9837486dcdae..6bf96511be1d 100644
--- a/src/demo-app/table/person-data-source.ts
+++ b/src/demo-app/table/person-data-source.ts
@@ -15,7 +15,7 @@ export class PersonDataSource extends DataSource<any> {
   connect(): Observable<UserData[]> {
     const displayDataChanges = [
       this._paginator.page,
-      this._sort.mdSortChange,
+      this._sort.sortChange,
       this._peopleDatabase.dataChange
     ];
     return Observable.merge(...displayDataChanges).map(() => {
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index fd78373b18c6..bdd4ccaec01b 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -91,7 +91,7 @@ export class MdSortHeader implements MdSortable {
       throw getMdSortHeaderNotContainedWithinMdSortError();
     }
 
-    this._rerenderSubscription = merge(_sort.mdSortChange, _intl.changes).subscribe(() => {
+    this._rerenderSubscription = merge(_sort.sortChange, _intl.changes).subscribe(() => {
       changeDetectorRef.markForCheck();
     });
   }
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index 57ff5f347081..d4a5d40b53b1 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -200,10 +200,10 @@ function testSingleColumnSortDirectionSequence(fixture: ComponentFixture<SimpleM
          [mdSortDirection]="direction"
          [mdSortDisableClear]="disableClear"
          (mdSortChange)="latestSortEvent = $event">
-      <div id="defaultSortHeaderA" #defaultSortHeaderA md-sort-header="defaultSortHeaderA"> A </div>
-      <div id="defaultSortHeaderB" #defaultSortHeaderB md-sort-header="defaultSortHeaderB"> B </div>
-      <div id="overrideStart" md-sort-header="overrideStart" start="desc"> D </div>
-      <div id="overrideDisableClear" md-sort-header="overrideDisableClear" disableClear> E </div>
+      <div id="defaultSortHeaderA" #defaultSortHeaderA md-sort-header="defaultSortHeaderA"> A</div>
+      <div id="defaultSortHeaderB" #defaultSortHeaderB md-sort-header="defaultSortHeaderB"> B</div>
+      <div id="overrideStart" md-sort-header="overrideStart" start="desc"> D</div>
+      <div id="overrideDisableClear" md-sort-header="overrideDisableClear" disableClear> E</div>
     </div>
   `
 })
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index ec30d607b24e..c0151361bfe3 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -72,7 +72,10 @@ export class MdSort {
   set _matSortDisableClear(v) { this.disableClear = v; }
 
   /** Event emitted when the user changes either the active sort or sort direction. */
-  @Output() mdSortChange = new EventEmitter<Sort>();
+  @Output('mdSortChange') readonly sortChange = new EventEmitter<Sort>();
+
+  @Output('matSortChange')
+  get _matSortChange(): EventEmitter<Sort> { return this.sortChange; }
 
   /**
    * Register function to be used by the contained MdSortables. Adds the MdSortable to the
@@ -106,7 +109,7 @@ export class MdSort {
       this.direction = this.getNextSortDirection(sortable);
     }
 
-    this.mdSortChange.next({active: this.active, direction: this.direction});
+    this.sortChange.next({active: this.active, direction: this.direction});
   }
 
   /** Returns the next sort direction of the active sortable, checking for potential overrides. */
diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index 60c10fa515b6..bd3fac7c6bae 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -83,12 +83,12 @@ export class ExampleDataSource extends DataSource<GithubIssue> {
   /** Connect function called by the table to retrieve one stream containing the data to render. */
   connect(): Observable<GithubIssue[]> {
     const displayDataChanges = [
-      this.sort.mdSortChange,
+      this.sort.sortChange,
       this.paginator.page
     ];
 
     // If the user changes the sort order, reset back to the first page.
-    this.sort.mdSortChange.subscribe(() => this.paginator.pageIndex = 0);
+    this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
 
     return Observable.merge(...displayDataChanges)
       .startWith(null)
diff --git a/src/material-examples/table-overview/table-overview-example.ts b/src/material-examples/table-overview/table-overview-example.ts
index b564dd30488d..2fd7d0883e47 100644
--- a/src/material-examples/table-overview/table-overview-example.ts
+++ b/src/material-examples/table-overview/table-overview-example.ts
@@ -140,7 +140,7 @@ export class ExampleDataSource extends DataSource<any> {
     // Listen for any changes in the base data, sorting, filtering, or pagination
     const displayDataChanges = [
       this._exampleDatabase.dataChange,
-      this._sort.mdSortChange,
+      this._sort.sortChange,
       this._filterChange,
       this._paginator.page,
     ];
diff --git a/src/material-examples/table-sorting/table-sorting-example.ts b/src/material-examples/table-sorting/table-sorting-example.ts
index 1cbcc4c6f683..36df176410c0 100644
--- a/src/material-examples/table-sorting/table-sorting-example.ts
+++ b/src/material-examples/table-sorting/table-sorting-example.ts
@@ -90,7 +90,7 @@ export class ExampleDataSource extends DataSource<any> {
   connect(): Observable<UserData[]> {
     const displayDataChanges = [
       this._exampleDatabase.dataChange,
-      this._sort.mdSortChange,
+      this._sort.sortChange,
     ];
 
     return Observable.merge(...displayDataChanges).map(() => {

From 6fa9e6f88b521f5953ab60ca21f16910cc8c5fea Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 18 Sep 2017 10:28:10 -0700
Subject: [PATCH 104/575] fix(sort): reverse directions and better animation
 (#6802)

---
 src/lib/sort/sort-header.html | 11 ++++----
 src/lib/sort/sort-header.scss | 48 +++++++++++++++++++++++++----------
 src/lib/sort/sort-header.ts   | 20 ++++++++++++---
 3 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/lib/sort/sort-header.html b/src/lib/sort/sort-header.html
index 710ae6b519b6..bf16458d5038 100644
--- a/src/lib/sort/sort-header.html
+++ b/src/lib/sort/sort-header.html
@@ -5,12 +5,13 @@
     <ng-content></ng-content>
   </button>
 
-  <div *ngIf="_isSorted()"
-       class="mat-sort-header-arrow"
-       [@indicatorRotate]="_sort.direction">
+  <div *ngIf="_isSorted()" class="mat-sort-header-arrow">
     <div class="mat-sort-header-stem"></div>
-    <div class="mat-sort-header-pointer-left"></div>
-    <div class="mat-sort-header-pointer-right"></div>
+    <div class="mat-sort-header-indicator" [@indicator]="_sort.direction" >
+      <div class="mat-sort-header-pointer-left" [@leftPointer]="_sort.direction"></div>
+      <div class="mat-sort-header-pointer-right" [@rightPointer]="_sort.direction"></div>
+      <div class="mat-sort-header-pointer-middle"></div>
+    </div>
   </div>
 </div>
 
diff --git a/src/lib/sort/sort-header.scss b/src/lib/sort/sort-header.scss
index 466e3a1e9e95..53d333132555 100644
--- a/src/lib/sort/sort-header.scss
+++ b/src/lib/sort/sort-header.scss
@@ -1,7 +1,9 @@
 $mat-sort-header-arrow-margin: 6px;
-$mat-sort-header-arrow-container-size: 10px;
-$mat-sort-header-arrow-pointer-length: 8px;
+$mat-sort-header-arrow-container-size: 12px;
+$mat-sort-header-arrow-stem-size: 10px;
+$mat-sort-header-arrow-pointer-length: 6px;
 $mat-sort-header-arrow-thickness: 2px;
+$mat-sort-header-arrow-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1);
 
 .mat-sort-header-container {
   display: flex;
@@ -27,9 +29,9 @@ $mat-sort-header-arrow-thickness: 2px;
 .mat-sort-header-arrow {
   height: $mat-sort-header-arrow-container-size;
   width: $mat-sort-header-arrow-container-size;
-  position: relative;
   margin: 0 0 0 $mat-sort-header-arrow-margin;
-  transform: rotate(45deg);
+  position: relative;
+  display: flex;
 
   .mat-sort-header-position-before & {
     margin: 0 $mat-sort-header-arrow-margin 0 0;
@@ -38,26 +40,46 @@ $mat-sort-header-arrow-thickness: 2px;
 
 .mat-sort-header-stem {
   background: currentColor;
-  transform: rotate(135deg);
-  height: $mat-sort-header-arrow-container-size;
+  height: $mat-sort-header-arrow-stem-size;
   width: $mat-sort-header-arrow-thickness;
   margin: auto;
+  display: flex;
+  align-items: center;
 }
 
-.mat-sort-header-pointer-left {
-  background: currentColor;
-  width: $mat-sort-header-arrow-thickness;
-  height: $mat-sort-header-arrow-pointer-length;
+.mat-sort-header-indicator {
+  width: 100%;
+  height: $mat-sort-header-arrow-thickness;
+  display: flex;
+  align-items: center;
   position: absolute;
-  bottom: 0;
-  right: 0;
+  top: 0;
+  transition: $mat-sort-header-arrow-transition;
 }
 
+.mat-sort-header-pointer-middle {
+  margin: auto;
+  height: $mat-sort-header-arrow-thickness;
+  width: $mat-sort-header-arrow-thickness;
+  background: currentColor;
+  transform: rotate(45deg);
+}
+
+.mat-sort-header-pointer-left,
 .mat-sort-header-pointer-right {
   background: currentColor;
   width: $mat-sort-header-arrow-pointer-length;
   height: $mat-sort-header-arrow-thickness;
+  transition: $mat-sort-header-arrow-transition;
   position: absolute;
-  bottom: 0;
+}
+
+.mat-sort-header-pointer-left {
+  transform-origin: right;
+  left: 0;
+}
+
+.mat-sort-header-pointer-right {
+  transform-origin: left;
   right: 0;
 }
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index bdd4ccaec01b..87a2e80e1080 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -28,7 +28,10 @@ import {merge} from 'rxjs/observable/merge';
 import {MdSort, MdSortable} from './sort';
 import {MdSortHeaderIntl} from './sort-header-intl';
 import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
+import {AnimationCurves, AnimationDurations} from '../core/animation/animation';
 
+const SORT_ANIMATION_TRANSITION =
+    AnimationDurations.ENTERING + ' ' + AnimationCurves.STANDARD_CURVE;
 
 /**
  * Applies sorting behavior (click to change sort) and styles to an element, including an
@@ -51,10 +54,21 @@ import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
-    trigger('indicatorRotate', [
+    trigger('indicator', [
+      state('asc', style({transform: 'translateY(0px)'})),
+      // 10px is the height of the sort indicator, minus the width of the pointers
+      state('desc', style({transform: 'translateY(10px)'})),
+      transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
+    ]),
+    trigger('leftPointer', [
+      state('asc', style({transform: 'rotate(-45deg)'})),
+      state('desc', style({transform: 'rotate(45deg)'})),
+      transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
+    ]),
+    trigger('rightPointer', [
       state('asc', style({transform: 'rotate(45deg)'})),
-      state('desc', style({transform: 'rotate(225deg)'})),
-      transition('asc <=> desc', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
+      state('desc', style({transform: 'rotate(-45deg)'})),
+      transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
     ])
   ]
 })

From 7a4270661448948f5eeac6636ea7eff02f38b0cd Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 18 Sep 2017 10:28:52 -0700
Subject: [PATCH 105/575] feat(chip-list): implement FormFieldControl and
 ControlValueAccessor (#6686)

BREAKING CHANGES:
 - Deprecated: @Output() select, and @Output() deselect
 - Added @Output() onSelectionChange = EventEmitter<MdChipSelectionChange>
---
 src/demo-app/chips/chips-demo.html |  74 +++-
 src/demo-app/chips/chips-demo.scss |   4 +
 src/demo-app/chips/chips-demo.ts   |  19 +
 src/lib/chips/chip-input.spec.ts   |   3 +-
 src/lib/chips/chip-input.ts        |  41 +-
 src/lib/chips/chip-list.spec.ts    | 674 ++++++++++++++++++++++++++++-
 src/lib/chips/chip-list.ts         | 611 +++++++++++++++++++++-----
 src/lib/chips/chip.spec.ts         |  29 +-
 src/lib/chips/chip.ts              | 113 +++--
 src/lib/chips/chips.md             |   1 +
 src/lib/chips/chips.scss           |  15 +-
 src/lib/input/input.ts             |  38 +-
 12 files changed, 1416 insertions(+), 206 deletions(-)

diff --git a/src/demo-app/chips/chips-demo.html b/src/demo-app/chips/chips-demo.html
index b55c55954aea..4673b48b256a 100644
--- a/src/demo-app/chips/chips-demo.html
+++ b/src/demo-app/chips/chips-demo.html
@@ -45,20 +45,22 @@ <h4>Form Field</h4>
         <code>&lt;md-form-field&gt;</code>.
       </p>
 
-
-      <md-form-field>
-        <md-chip-list mdPrefix #chipList1>
-          <md-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
+      <button md-button (click)="tabIndex = (tabIndex === 0 ? -1 : 0)">
+        Set tabIndex to {{tabIndex === 0 ? -1 : 0}}
+      </button>
+      <md-form-field class="has-chip-list">
+        <md-chip-list [tabIndex]="tabIndex" #chipList1 [(ngModel)]="selectedPeople" required>
+          <md-chip  *ngFor="let person of people" [color]="color" [selectable]="selectable"
                    [removable]="removable" (remove)="remove(person)">
             {{person.name}}
             <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
           </md-chip>
+          <input placeholder="New Contributor..."
+                 [mdChipInputFor]="chipList1"
+                 [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                 [mdChipInputAddOnBlur]="false"
+                 (mdChipInputTokenEnd)="add($event)" />
         </md-chip-list>
-        <input mdInput placeholder="New Contributor..."
-               [mdChipInputFor]="chipList1"
-               [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
-               [mdChipInputAddOnBlur]="addOnBlur"
-               (mdChipInputTokenEnd)="add($event)" />
       </md-form-field>
 
 
@@ -68,21 +70,37 @@ <h4>Form Field</h4>
         With <code>mdChipInput</code> the input work with chip-list
       </p>
 
-      <md-chip-list #chipList2>
-        <md-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
-                 [removable]="removable" (remove)="remove(person)">
-          {{person.name}}
-          <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
-        </md-chip>
-      </md-chip-list>
       <md-form-field>
-        <input mdInput placeholder="New Contributor..."
+        <md-chip-list [tabIndex]="tabIndex"  #chipList2 [(ngModel)]="selectedPeople" required>
+          <md-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
+                   [removable]="removable" (remove)="remove(person)">
+            {{person.name}}
+            <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
+          </md-chip>
+        </md-chip-list>
+        <input placeholder="New Contributor..."
                [mdChipInputFor]="chipList2"
                [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
                [mdChipInputAddOnBlur]="addOnBlur"
                (mdChipInputTokenEnd)="add($event)" />
       </md-form-field>
 
+      <p>
+        Chips list without input
+      </p>
+
+
+      <md-form-field class="has-chip-list">
+        <md-chip-list #chipList3>
+          <md-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
+                   [removable]="removable" (remove)="remove(person)">
+            {{person.name}}
+            <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
+          </md-chip>
+        </md-chip-list>
+      </md-form-field>
+
+
       <p>
         The example above has overridden the <code>[separatorKeys]</code> input to allow for
         <code>ENTER</code>, <code>COMMA</code> and <code>SEMI COLON</code> keys.
@@ -108,6 +126,28 @@ <h4>Stacked Chips</h4>
           {{aColor.name}}
         </md-chip>
       </md-chip-list>
+
+      <h4>NgModel with chip list</h4>
+      <md-chip-list [multiple]="true" [(ngModel)]="selectedColors">
+        <md-chip *ngFor="let aColor of availableColors" color="{{aColor.color}}"
+                 [value]="aColor.name" (remove)="removeColor(aColor)">
+          {{aColor.name}}
+          <md-icon mdChipRemove>cancel</md-icon>
+        </md-chip>
+      </md-chip-list>
+
+      The selected colors are <span *ngFor="let color of selectedColors"> {{color}}</span>.
+
+      <h4>NgModel with single selection chip list</h4>
+      <md-chip-list [(ngModel)]="selectedColor">
+        <md-chip *ngFor="let aColor of availableColors" color="{{aColor.color}}"
+                 [value]="aColor.name" (remove)="removeColor(aColor)">
+          {{aColor.name}}
+          <md-icon mdChipRemove>cancel</md-icon>
+        </md-chip>
+      </md-chip-list>
+
+      The selected color is {{selectedColor}}.
     </md-card-content>
   </md-card>
 </div>
diff --git a/src/demo-app/chips/chips-demo.scss b/src/demo-app/chips/chips-demo.scss
index 5fdb999211a1..5928eef7375b 100644
--- a/src/demo-app/chips/chips-demo.scss
+++ b/src/demo-app/chips/chips-demo.scss
@@ -25,3 +25,7 @@
     width: 150px;
   }
 }
+
+.has-chip-list {
+  width: 100%;
+}
diff --git a/src/demo-app/chips/chips-demo.ts b/src/demo-app/chips/chips-demo.ts
index ce46def82be2..4d5995aed4a3 100644
--- a/src/demo-app/chips/chips-demo.ts
+++ b/src/demo-app/chips/chips-demo.ts
@@ -20,6 +20,7 @@ export interface DemoColor {
   styleUrls: ['chips-demo.css']
 })
 export class ChipsDemo {
+  tabIndex: number = 0;
   visible: boolean = true;
   color: string = '';
   selectable: boolean = true;
@@ -30,6 +31,8 @@ export class ChipsDemo {
   // Enter, comma, semi-colon
   separatorKeysCodes = [ENTER, COMMA, 186];
 
+  selectedPeople = null;
+
   people: Person[] = [
     { name: 'Kara' },
     { name: 'Jeremy' },
@@ -73,7 +76,23 @@ export class ChipsDemo {
     }
   }
 
+  removeColor(color: DemoColor) {
+    let index = this.availableColors.indexOf(color);
+
+    if (index >= 0) {
+      this.availableColors.splice(index, 1);
+    }
+
+    index = this.selectedColors.indexOf(color.name);
+
+    if (index >= 0) {
+      this.selectedColors.splice(index, 1);
+    }
+  }
+
   toggleVisible(): void {
     this.visible = false;
   }
+  selectedColors: any[] = ['Primary', 'Warn'];
+  selectedColor = 'Accent';
 }
diff --git a/src/lib/chips/chip-input.spec.ts b/src/lib/chips/chip-input.spec.ts
index 827edb24ffd1..b50edcd4dbb9 100644
--- a/src/lib/chips/chip-input.spec.ts
+++ b/src/lib/chips/chip-input.spec.ts
@@ -1,6 +1,7 @@
 import {async, TestBed, ComponentFixture} from '@angular/core/testing';
 import {MdChipsModule} from './index';
 import {Component, DebugElement} from '@angular/core';
+import {PlatformModule} from '../core/platform/index';
 import {MdChipInput, MdChipInputEvent} from './chip-input';
 import {By} from '@angular/platform-browser';
 import {Directionality} from '@angular/material/core';
@@ -21,7 +22,7 @@ describe('MdChipInput', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule],
+      imports: [MdChipsModule, PlatformModule],
       declarations: [TestChipInput],
       providers: [{
         provide: Directionality, useFactory: () => {
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index ed7ac8470e99..1c8aa79e6424 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -6,7 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Output, EventEmitter, ElementRef, Input} from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  Output,
+  EventEmitter,
+  Input,
+} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ENTER} from '@angular/material/core';
 import {MdChipList} from './chip-list';
@@ -16,16 +22,21 @@ export interface MdChipInputEvent {
   value: string;
 }
 
+/**
+ * Directive that adds chip-specific behaviors to an input element inside <md-form-field>.
+ * May be placed inside or outside of an <md-chip-list>.
+ */
 @Directive({
   selector: 'input[mdChipInputFor], input[matChipInputFor]',
   host: {
-    'class': 'mat-chip-input',
+    'class': 'mat-chip-input mat-input-element',
     '(keydown)': '_keydown($event)',
-    '(blur)': '_blur()'
+    '(blur)': '_blur()',
+    '(focus)': '_focus()',
   }
 })
 export class MdChipInput {
-
+  focused: boolean = false;
   _chipList: MdChipList;
 
   /** Register input for chip list */
@@ -33,7 +44,7 @@ export class MdChipInput {
   set chipList(value: MdChipList) {
     if (value) {
       this._chipList = value;
-      this._chipList.registerInput(this._inputElement);
+      this._chipList.registerInput(this);
     }
   }
 
@@ -68,6 +79,13 @@ export class MdChipInput {
   get matSeparatorKeyCodes() { return this.separatorKeyCodes; }
   set matSeparatorKeyCodes(v: number[]) { this.separatorKeyCodes = v; }
 
+  @Input() placeholder: string = '';
+
+  get empty(): boolean {
+    let value: string | null = this._inputElement.value;
+    return value == null || value === '';
+  }
+
   /** The native input element to which this directive is attached. */
   protected _inputElement: HTMLInputElement;
 
@@ -85,6 +103,17 @@ export class MdChipInput {
     if (this.addOnBlur) {
       this._emitChipEnd();
     }
+    this.focused = false;
+    // Blur the chip list if it is not focused
+    if (!this._chipList.focused) {
+      this._chipList._blur();
+    }
+    this._chipList.stateChanges.next();
+  }
+
+  _focus() {
+    this.focused = true;
+    this._chipList.stateChanges.next();
   }
 
   /** Checks to see if the (chipEnd) event needs to be emitted. */
@@ -100,4 +129,6 @@ export class MdChipInput {
       }
     }
   }
+
+  focus() { this._inputElement.focus(); }
 }
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 1a080fb4f708..947c59071f10 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -1,13 +1,16 @@
 import {FocusKeyManager} from '@angular/cdk/a11y';
-import {createKeyboardEvent} from '@angular/cdk/testing';
-import {Component, DebugElement, QueryList} from '@angular/core';
+import {createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
+import {Component, DebugElement, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {
   BACKSPACE,
   DELETE,
   Directionality,
+  ENTER,
   LEFT_ARROW,
   RIGHT_ARROW,
+  SPACE,
   TAB,
 } from '@angular/material/core';
 import {MdFormFieldModule} from '@angular/material/form-field';
@@ -16,6 +19,7 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
 import {MdInputModule} from '../input/index';
 import {MdChip} from './chip';
+import {MdChipInputEvent} from './chip-input';
 import {MdChipList, MdChipsModule} from './index';
 
 
@@ -31,9 +35,21 @@ describe('MdChipList', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule, MdFormFieldModule, MdInputModule, NoopAnimationsModule],
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        MdChipsModule,
+        MdFormFieldModule,
+        MdInputModule,
+        NoopAnimationsModule
+      ],
       declarations: [
-        StandardChipList, FormFieldChipList
+        StandardChipList,
+        FormFieldChipList,
+        BasicChipList,
+        InputChipList,
+        MultiSelectionChipList,
+        FalsyValueChipList,
       ],
       providers: [{
         provide: Directionality, useFactory: () => {
@@ -311,6 +327,512 @@ describe('MdChipList', () => {
 
   });
 
+  describe('selection logic', () => {
+    let formField: HTMLElement;
+    let nativeChips: HTMLElement[];
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(BasicChipList);
+      fixture.detectChanges();
+
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+      nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+          .map((chip) => chip.nativeElement);
+
+
+      chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
+      chipListInstance = chipListDebugElement.componentInstance;
+      chips = chipListInstance.chips;
+
+    });
+
+    it('should not float placeholder if no chip is selected', () => {
+      expect(formField.classList.contains('mat-form-field-should-float'))
+        .toBe(false, 'placeholder should not be floating');
+    });
+
+    it('should remove selection if chip has been removed', async(() => {
+      const instanceChips = fixture.componentInstance.chips;
+      const chipList = fixture.componentInstance.chipList;
+      const firstChip = nativeChips[0];
+      dispatchKeyboardEvent(firstChip, 'keydown', SPACE);
+      fixture.detectChanges();
+
+      expect(instanceChips.first.selected).toBe(true, 'Expected first option to be selected.');
+      expect(chipList.selected).toBe(chips.first, 'Expected first option to be selected.');
+
+      fixture.componentInstance.foods = [];
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        expect(chipList.selected)
+          .toBe(undefined, 'Expected selection to be removed when option no longer exists.');
+      });
+    }));
+
+
+    it('should select an option that was added after initialization', () => {
+      fixture.componentInstance.foods.push({viewValue: 'Potatoes', value: 'potatoes-8'});
+      fixture.detectChanges();
+
+      nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+        .map((chip) => chip.nativeElement);
+      const lastChip = nativeChips[8];
+      dispatchKeyboardEvent(lastChip, 'keydown', SPACE);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.chipList.value)
+        .toContain('potatoes-8', 'Expect value contain the value of the last option');
+      expect(fixture.componentInstance.chips.last.selected)
+        .toBeTruthy('Expect last option selected');
+    });
+
+    it('should not select disabled chips', () => {
+      const array = chips.toArray();
+      const disabledChip = nativeChips[2];
+      dispatchKeyboardEvent(disabledChip, 'keydown', SPACE);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.chipList.value)
+        .toBeUndefined('Expect value to be undefined');
+      expect(array[2].selected).toBeFalsy('Expect disabled chip not selected');
+      expect(fixture.componentInstance.chipList.selected)
+        .toBeUndefined('Expect no selected chips');
+    });
+
+  });
+
+  describe('forms integration', () => {
+    let formField: HTMLElement;
+    let nativeChips: HTMLElement[];
+
+    describe('single selection', () => {
+      beforeEach(() => {
+        fixture = TestBed.createComponent(BasicChipList);
+        fixture.detectChanges();
+
+        formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+        nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+          .map((chip) => chip.nativeElement);
+        chips = fixture.componentInstance.chips;
+      });
+
+      it('should take an initial view value with reactive forms', () => {
+        fixture.componentInstance.control = new FormControl('pizza-1');
+        fixture.detectChanges();
+
+        const array = chips.toArray();
+
+        expect(array[1].selected).toBeTruthy('Expect pizza-1 chip to be selected');
+
+        dispatchKeyboardEvent(nativeChips[1], 'keydown', SPACE);
+        fixture.detectChanges();
+
+        expect(array[1].selected).toBeFalsy('Expect chip to be not selected after toggle selected');
+      });
+
+      it('should set the view value from the form', () => {
+        const chipList = fixture.componentInstance.chipList;
+        const array = chips.toArray();
+
+        expect(chipList.value).toBeFalsy('Expect chip list to have no initial value');
+
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
+
+        expect(array[1].selected).toBeTruthy('Expect chip to be selected');
+      });
+
+      it('should update the form value when the view changes', () => {
+
+        expect(fixture.componentInstance.control.value)
+          .toEqual(null, `Expected the control's value to be empty initially.`);
+
+        dispatchKeyboardEvent(nativeChips[0], 'keydown', SPACE);
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.control.value)
+          .toEqual('steak-0', `Expected control's value to be set to the new option.`);
+      });
+
+      it('should clear the selection when a nonexistent option value is selected', () => {
+        const array = chips.toArray();
+
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
+
+        expect(array[1].selected)
+          .toBeTruthy(`Expected chip with the value to be selected.`);
+
+        fixture.componentInstance.control.setValue('gibberish');
+
+        fixture.detectChanges();
+
+        expect(array[1].selected)
+          .toBeFalsy(`Expected chip with the old value not to be selected.`);
+      });
+
+
+      it('should clear the selection when the control is reset', () => {
+        const array = chips.toArray();
+
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
+
+        fixture.componentInstance.control.reset();
+        fixture.detectChanges();
+
+        expect(array[1].selected)
+          .toBeFalsy(`Expected chip with the old value not to be selected.`);
+      });
+
+      it('should set the control to touched when the chip list is touched', () => {
+        expect(fixture.componentInstance.control.touched)
+          .toBe(false, 'Expected the control to start off as untouched.');
+
+        const nativeChipList = fixture.debugElement.query(By.css('.mat-chip-list')).nativeElement;
+        dispatchFakeEvent(nativeChipList, 'blur');
+
+        expect(fixture.componentInstance.control.touched)
+          .toBe(true, 'Expected the control to be touched.');
+      });
+
+      it('should not set touched when a disabled chip list is touched', () => {
+        expect(fixture.componentInstance.control.touched)
+          .toBe(false, 'Expected the control to start off as untouched.');
+
+        fixture.componentInstance.control.disable();
+        const nativeChipList = fixture.debugElement.query(By.css('.mat-chip-list')).nativeElement;
+        dispatchFakeEvent(nativeChipList, 'blur');
+
+        expect(fixture.componentInstance.control.touched)
+          .toBe(false, 'Expected the control to stay untouched.');
+      });
+
+      it('should set the control to dirty when the chip list\'s value changes in the DOM', () => {
+        expect(fixture.componentInstance.control.dirty)
+          .toEqual(false, `Expected control to start out pristine.`);
+
+        dispatchKeyboardEvent(nativeChips[1], 'keydown', SPACE);
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.control.dirty)
+          .toEqual(true, `Expected control to be dirty after value was changed by user.`);
+      });
+
+      it('should not set the control to dirty when the value changes programmatically', () => {
+        expect(fixture.componentInstance.control.dirty)
+          .toEqual(false, `Expected control to start out pristine.`);
+
+        fixture.componentInstance.control.setValue('pizza-1');
+
+        expect(fixture.componentInstance.control.dirty)
+          .toEqual(false, `Expected control to stay pristine after programmatic change.`);
+      });
+
+
+      it('should set an asterisk after the placeholder if the control is required', () => {
+        let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+        expect(requiredMarker)
+          .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
+
+        fixture.componentInstance.isRequired = true;
+        fixture.detectChanges();
+
+        requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+        expect(requiredMarker)
+          .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
+      });
+
+      it('should be able to programmatically select a falsy option', () => {
+        fixture.destroy();
+
+        const falsyFixture = TestBed.createComponent(FalsyValueChipList);
+        falsyFixture.detectChanges();
+
+        falsyFixture.componentInstance.control.setValue([0]);
+        falsyFixture.detectChanges();
+        falsyFixture.detectChanges();
+
+        expect(falsyFixture.componentInstance.chips.first.selected)
+          .toBe(true, 'Expected first option to be selected');
+      });
+    });
+
+    describe('multiple selection', () => {
+      beforeEach(() => {
+        fixture = TestBed.createComponent(MultiSelectionChipList);
+        fixture.detectChanges();
+
+        formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+        nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+          .map((chip) => chip.nativeElement);
+        chips = fixture.componentInstance.chips;
+      });
+
+      it('should take an initial view value with reactive forms', () => {
+        fixture.componentInstance.control = new FormControl(['pizza-1']);
+        fixture.detectChanges();
+
+        const array = chips.toArray();
+
+        expect(array[1].selected).toBeTruthy('Expect pizza-1 chip to be selected');
+
+        dispatchKeyboardEvent(nativeChips[1], 'keydown', SPACE);
+        fixture.detectChanges();
+
+        expect(array[1].selected).toBeFalsy('Expect chip to be not selected after toggle selected');
+      });
+
+      it('should set the view value from the form', () => {
+        const chipList = fixture.componentInstance.chipList;
+        const array = chips.toArray();
+
+        expect(chipList.value).toBeFalsy('Expect chip list to have no initial value');
+
+        fixture.componentInstance.control.setValue(['pizza-1']);
+        fixture.detectChanges();
+
+        expect(array[1].selected).toBeTruthy('Expect chip to be selected');
+      });
+
+      it('should update the form value when the view changes', () => {
+
+        expect(fixture.componentInstance.control.value)
+          .toEqual(null, `Expected the control's value to be empty initially.`);
+
+        dispatchKeyboardEvent(nativeChips[0], 'keydown', SPACE);
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.control.value)
+          .toEqual(['steak-0'], `Expected control's value to be set to the new option.`);
+      });
+
+      it('should clear the selection when a nonexistent option value is selected', () => {
+        const array = chips.toArray();
+
+        fixture.componentInstance.control.setValue(['pizza-1']);
+        fixture.detectChanges();
+
+        expect(array[1].selected)
+          .toBeTruthy(`Expected chip with the value to be selected.`);
+
+        fixture.componentInstance.control.setValue(['gibberish']);
+
+        fixture.detectChanges();
+
+        expect(array[1].selected)
+          .toBeFalsy(`Expected chip with the old value not to be selected.`);
+      });
+
+
+      it('should clear the selection when the control is reset', () => {
+        const array = chips.toArray();
+
+        fixture.componentInstance.control.setValue(['pizza-1']);
+        fixture.detectChanges();
+
+        fixture.componentInstance.control.reset();
+        fixture.detectChanges();
+
+        expect(array[1].selected)
+          .toBeFalsy(`Expected chip with the old value not to be selected.`);
+      });
+    });
+  });
+
+  describe('chip list with chip input', () => {
+    let formField: HTMLElement;
+    let nativeChips: HTMLElement[];
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(InputChipList);
+      fixture.detectChanges();
+
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+      nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+        .map((chip) => chip.nativeElement);
+    });
+
+    it('should take an initial view value with reactive forms', () => {
+      fixture.componentInstance.control = new FormControl(['pizza-1']);
+      fixture.detectChanges();
+
+      const array = fixture.componentInstance.chips.toArray();
+
+      expect(array[1].selected).toBeTruthy('Expect pizza-1 chip to be selected');
+
+      dispatchKeyboardEvent(nativeChips[1], 'keydown', SPACE);
+      fixture.detectChanges();
+
+      expect(array[1].selected).toBeFalsy('Expect chip to be not selected after toggle selected');
+    });
+
+    it('should set the view value from the form', () => {
+      const array = fixture.componentInstance.chips.toArray();
+
+      expect(array[1].selected).toBeFalsy('Expect chip to not be selected');
+
+      fixture.componentInstance.control.setValue(['pizza-1']);
+      fixture.detectChanges();
+
+      expect(array[1].selected).toBeTruthy('Expect chip to be selected');
+    });
+
+    it('should update the form value when the view changes', () => {
+
+      expect(fixture.componentInstance.control.value)
+        .toEqual(null, `Expected the control's value to be empty initially.`);
+
+      dispatchKeyboardEvent(nativeChips[0], 'keydown', SPACE);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.control.value)
+        .toEqual(['steak-0'], `Expected control's value to be set to the new option.`);
+    });
+
+    it('should clear the selection when a nonexistent option value is selected', () => {
+      const array = fixture.componentInstance.chips.toArray();
+
+      fixture.componentInstance.control.setValue(['pizza-1']);
+      fixture.detectChanges();
+
+      expect(array[1].selected)
+        .toBeTruthy(`Expected chip with the value to be selected.`);
+
+      fixture.componentInstance.control.setValue(['gibberish']);
+
+      fixture.detectChanges();
+
+      expect(array[1].selected)
+        .toBeFalsy(`Expected chip with the old value not to be selected.`);
+    });
+
+
+    it('should clear the selection when the control is reset', () => {
+      const array = fixture.componentInstance.chips.toArray();
+
+      fixture.componentInstance.control.setValue(['pizza-1']);
+      fixture.detectChanges();
+
+      fixture.componentInstance.control.reset();
+      fixture.detectChanges();
+
+      expect(array[1].selected)
+        .toBeFalsy(`Expected chip with the old value not to be selected.`);
+    });
+
+    it('should set the control to touched when the chip list is touched', async(() => {
+      expect(fixture.componentInstance.control.touched)
+        .toBe(false, 'Expected the control to start off as untouched.');
+
+      const nativeChipList = fixture.debugElement.query(By.css('.mat-chip-list')).nativeElement;
+
+      dispatchFakeEvent(nativeChipList, 'blur');
+
+      fixture.whenStable().then(() => {
+        expect(fixture.componentInstance.control.touched)
+          .toBe(true, 'Expected the control to be touched.');
+      });
+    }));
+
+    it('should not set touched when a disabled chip list is touched', () => {
+      expect(fixture.componentInstance.control.touched)
+        .toBe(false, 'Expected the control to start off as untouched.');
+
+      fixture.componentInstance.control.disable();
+      const nativeChipList = fixture.debugElement.query(By.css('.mat-chip-list')).nativeElement;
+      dispatchFakeEvent(nativeChipList, 'blur');
+
+      expect(fixture.componentInstance.control.touched)
+        .toBe(false, 'Expected the control to stay untouched.');
+    });
+
+    it('should set the control to dirty when the chip list\'s value changes in the DOM', () => {
+      expect(fixture.componentInstance.control.dirty)
+        .toEqual(false, `Expected control to start out pristine.`);
+
+      dispatchKeyboardEvent(nativeChips[1], 'keydown', SPACE);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.control.dirty)
+        .toEqual(true, `Expected control to be dirty after value was changed by user.`);
+    });
+
+    it('should not set the control to dirty when the value changes programmatically', () => {
+      expect(fixture.componentInstance.control.dirty)
+        .toEqual(false, `Expected control to start out pristine.`);
+
+      fixture.componentInstance.control.setValue(['pizza-1']);
+
+      expect(fixture.componentInstance.control.dirty)
+        .toEqual(false, `Expected control to stay pristine after programmatic change.`);
+    });
+
+
+    it('should set an asterisk after the placeholder if the control is required', () => {
+      let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+      expect(requiredMarker)
+        .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
+
+      fixture.componentInstance.isRequired = true;
+      fixture.detectChanges();
+
+      requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+      expect(requiredMarker)
+        .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
+    });
+
+    describe('keyboard behavior', () => {
+      beforeEach(() => {
+        fixture = TestBed.createComponent(InputChipList);
+        fixture.detectChanges();
+        chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
+        chipListInstance = chipListDebugElement.componentInstance;
+        chips = chipListInstance.chips;
+        manager = fixture.componentInstance.chipList._keyManager;
+      });
+
+      describe('when the input has focus', () => {
+
+        it('should focus the last chip when press DELETE', () => {
+          let nativeInput = fixture.nativeElement.querySelector('input');
+          let DELETE_EVENT: KeyboardEvent =
+            createKeyboardEvent('keydown', DELETE, nativeInput);
+
+          // Focus the input
+          nativeInput.focus();
+          expect(manager.activeItemIndex).toBe(-1);
+
+          // Press the DELETE key
+          chipListInstance._keydown(DELETE_EVENT);
+          fixture.detectChanges();
+
+          // It focuses the last chip
+          expect(manager.activeItemIndex).toEqual(chips.length - 1);
+        });
+
+        it('should focus the last chip when press BACKSPACE', () => {
+          let nativeInput = fixture.nativeElement.querySelector('input');
+          let BACKSPACE_EVENT: KeyboardEvent =
+            createKeyboardEvent('keydown', BACKSPACE, nativeInput);
+
+          // Focus the input
+          nativeInput.focus();
+          expect(manager.activeItemIndex).toBe(-1);
+
+          // Press the BACKSPACE key
+          chipListInstance._keydown(BACKSPACE_EVENT);
+          fixture.detectChanges();
+
+          // It focuses the last chip
+          expect(manager.activeItemIndex).toEqual(chips.length - 1);
+        });
+
+      });
+    });
+  });
+
   function setupStandardList() {
     fixture = TestBed.createComponent(StandardChipList);
     fixture.detectChanges();
@@ -370,3 +892,147 @@ class StandardChipList {
 })
 class FormFieldChipList {
 }
+
+
+@Component({
+  selector: 'basic-chip-list',
+  template: `
+    <md-form-field>
+      <md-chip-list placeholder="Food" [formControl]="control" [required]="isRequired"
+        [tabIndex]="tabIndexOverride" [selectable]="selectable">
+        <md-chip *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
+          {{ food.viewValue }}
+        </md-chip>
+      </md-chip-list>
+    </md-form-field>
+  `
+})
+class BasicChipList {
+  foods: any[] = [
+    { value: 'steak-0', viewValue: 'Steak' },
+    { value: 'pizza-1', viewValue: 'Pizza' },
+    { value: 'tacos-2', viewValue: 'Tacos', disabled: true },
+    { value: 'sandwich-3', viewValue: 'Sandwich' },
+    { value: 'chips-4', viewValue: 'Chips' },
+    { value: 'eggs-5', viewValue: 'Eggs' },
+    { value: 'pasta-6', viewValue: 'Pasta' },
+    { value: 'sushi-7', viewValue: 'Sushi' },
+  ];
+  control = new FormControl();
+  isRequired: boolean;
+  tabIndexOverride: number;
+  selectable: boolean;
+
+  @ViewChild(MdChipList) chipList: MdChipList;
+  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+}
+
+
+@Component({
+  selector: 'multi-selection-chip-list',
+  template: `
+    <md-form-field>
+      <md-chip-list [multiple]="true" placeholder="Food" [formControl]="control"
+        [required]="isRequired"
+        [tabIndex]="tabIndexOverride" [selectable]="selectable">
+        <md-chip *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
+          {{ food.viewValue }}
+        </md-chip>
+      </md-chip-list>
+    </md-form-field>
+  `
+})
+class MultiSelectionChipList {
+  foods: any[] = [
+    { value: 'steak-0', viewValue: 'Steak' },
+    { value: 'pizza-1', viewValue: 'Pizza' },
+    { value: 'tacos-2', viewValue: 'Tacos', disabled: true },
+    { value: 'sandwich-3', viewValue: 'Sandwich' },
+    { value: 'chips-4', viewValue: 'Chips' },
+    { value: 'eggs-5', viewValue: 'Eggs' },
+    { value: 'pasta-6', viewValue: 'Pasta' },
+    { value: 'sushi-7', viewValue: 'Sushi' },
+  ];
+  control = new FormControl();
+  isRequired: boolean;
+  tabIndexOverride: number;
+  selectable: boolean;
+
+  @ViewChild(MdChipList) chipList: MdChipList;
+  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+}
+
+@Component({
+  selector: 'input-chip-list',
+  template: `
+    <md-form-field>
+      <md-chip-list [multiple]="true"
+                    placeholder="Food" [formControl]="control" [required]="isRequired" #chipList1>
+        <md-chip *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-chip>
+      </md-chip-list>
+      <input placeholder="New food..."
+          [mdChipInputFor]="chipList1"
+          [mdChipInputSeparatorKeyCodes]="separatorKeyCodes"
+          [mdChipInputAddOnBlur]="addOnBlur"
+          (mdChipInputTokenEnd)="add($event)" />/>
+    </md-form-field>
+  `
+})
+class InputChipList {
+  foods: any[] = [
+    { value: 'steak-0', viewValue: 'Steak' },
+    { value: 'pizza-1', viewValue: 'Pizza' },
+    { value: 'tacos-2', viewValue: 'Tacos', disabled: true },
+    { value: 'sandwich-3', viewValue: 'Sandwich' },
+    { value: 'chips-4', viewValue: 'Chips' },
+    { value: 'eggs-5', viewValue: 'Eggs' },
+    { value: 'pasta-6', viewValue: 'Pasta' },
+    { value: 'sushi-7', viewValue: 'Sushi' },
+  ];
+  control = new FormControl();
+
+  separatorKeyCodes = [ENTER, SPACE];
+  addOnBlur: boolean = true;
+  isRequired: boolean;
+
+  add(event: MdChipInputEvent): void {
+    let input = event.input;
+    let value = event.value;
+
+    // Add our foods
+    if ((value || '').trim()) {
+      this.foods.push({
+        value: `${value.trim().toLowerCase()}-${this.foods.length}`,
+        viewValue: value.trim()
+      });
+    }
+
+    // Reset the input value
+    if (input) {
+      input.value = '';
+    }
+  }
+
+  @ViewChild(MdChipList) chipList: MdChipList;
+  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+}
+
+@Component({
+  template: `
+    <md-form-field>
+      <md-chip-list [formControl]="control">
+        <md-chip *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-chip>
+      </md-chip-list>
+    </md-form-field>
+  `
+})
+class FalsyValueChipList {
+  foods: any[] = [
+    { value: 0, viewValue: 'Steak' },
+    { value: 1, viewValue: 'Pizza' },
+  ];
+  control = new FormControl();
+  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+}
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index bf8b784ec167..0643aeb9978c 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -5,27 +5,55 @@
  * 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 {FocusKeyManager} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {SelectionModel} from '@angular/cdk/collections';
+import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
+  ChangeDetectorRef,
   ChangeDetectionStrategy,
   Component,
   ContentChildren,
+  ElementRef,
+  EventEmitter,
   Input,
-  QueryList,
-  ViewEncapsulation,
   OnDestroy,
+  OnInit,
   Optional,
-  ElementRef,
+  Output,
+  QueryList,
   Renderer2,
+  Self,
+  ViewEncapsulation,
 } from '@angular/core';
-
-import {MdChip} from './chip';
-import {FocusKeyManager} from '@angular/cdk/a11y';
-import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW} from '@angular/material/core';
-import {Directionality} from '@angular/cdk/bidi';
+import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {
+  BACKSPACE,
+  DELETE,
+  Directionality,
+  LEFT_ARROW,
+  RIGHT_ARROW,
+  UP_ARROW
+} from '@angular/material/core';
+import {MdFormFieldControl} from '@angular/material/form-field';
+
+import {Observable} from 'rxjs/Observable';
+import {merge} from 'rxjs/observable/merge';
+import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
+
+import {MdChip, MdChipEvent, MdChipSelectionChange} from './chip';
+import {MdChipInput} from './chip-input';
+
+// Increasing integer for generating unique ids for chip-list components.
+let nextUniqueId = 0;
+
+/** Change event object that is emitted when the chip list value has changed. */
+export class MdChipListChange {
+  constructor(public source: MdChipList, public value: any) { }
+}
+
 
 /**
  * A material design chips component (named ChipList for it's similarity to the List component).
@@ -37,21 +65,34 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
   exportAs: 'mdChipList, matChipList',
   host: {
     '[attr.tabindex]': '_tabIndex',
+    '[attr.aria-describedby]': '_ariaDescribedby || null',
+    '[attr.aria-required]': 'required.toString()',
+    '[attr.aria-disabled]': 'disabled.toString()',
+    '[attr.aria-invalid]': 'errorState',
+    '[attr.aria-multiselectable]': 'multiple',
+    '[class.mat-chip-list-disabled]': 'disabled',
+    '[class.mat-chip-list-invalid]': 'errorState',
+    '[class.mat-chip-list-required]': 'required',
     'role': 'listbox',
     '[attr.aria-orientation]': 'ariaOrientation',
     'class': 'mat-chip-list',
-
     '(focus)': 'focus()',
+    '(blur)': '_blur()',
     '(keydown)': '_keydown($event)'
   },
-  queries: {
-    chips: new ContentChildren(MdChip)
-  },
+  providers: [{provide: MdFormFieldControl, useExisting: MdChipList}],
   styleUrls: ['chips.css'],
   encapsulation: ViewEncapsulation.None,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MdChipList implements AfterContentInit, OnDestroy {
+export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor,
+    AfterContentInit, OnInit, OnDestroy {
+
+  /**
+   * Stream that emits whenever the state of the input changes such that the wrapping `MdFormField`
+   * needs to run change detection.
+   */
+  stateChanges = new Subject<void>();
 
   /** When a chip is destroyed, we track the index so we can focus the appropriate next chip. */
   protected _lastDestroyedIndex: number|null = null;
@@ -62,10 +103,49 @@ export class MdChipList implements AfterContentInit, OnDestroy {
   /** Subscription to tabbing out from the chip list. */
   private _tabOutSubscription = Subscription.EMPTY;
 
+  /** Subscription to changes in the chip list. */
+  private _changeSubscription: Subscription;
+
+  /** Subscription to focus changes in the chips. */
+  private _chipFocusSubscription: Subscription|null;
+
+  /** Subscription to blur changes in the chips. */
+  private _chipBlurSubscription: Subscription|null;
+
+  /** Subscription to selection changes in chips. */
+  private _chipSelectionSubscription: Subscription|null;
+
+  /** Subscription to remove changes in chips. */
+  private _chipRemoveSubscription: Subscription|null;
+
   /** Whether or not the chip is selectable. */
   protected _selectable: boolean = true;
 
-  protected _inputElement: HTMLInputElement;
+  /** Whether the component is in multiple selection mode. */
+  private _multiple: boolean = false;
+
+  /** The chip input to add more chips */
+  protected _chipInput: MdChipInput;
+
+  /** The aria-describedby attribute on the chip list for improved a11y. */
+  protected _ariaDescribedby: string;
+
+  /** Id of the chip list */
+  protected _id: string;
+
+  /** Uid of the chip list */
+  protected _uid: string = `md-chip-list-${nextUniqueId++}`;
+
+  /** Whether this is required */
+  protected _required: boolean = false;
+
+  /** Whether this is disabled */
+  protected _disabled: boolean = false;
+
+  protected _value: any;
+
+  /** Placeholder for the chip list. Alternatively, placeholder can be set on MdChipInput */
+  protected _placeholder: string;
 
   /** Tab index for the chip list. */
   _tabIndex = 0;
@@ -79,17 +159,169 @@ export class MdChipList implements AfterContentInit, OnDestroy {
   /** The FocusKeyManager which handles focus. */
   _keyManager: FocusKeyManager<MdChip>;
 
-  /** The chip components contained within this chip list. */
-  chips: QueryList<MdChip>;
+  /** Function when touched */
+  _onTouched = () => {};
+
+  /** Function when changed */
+  _onChange: (value: any) => void = () => {};
+
+  _selectionModel: SelectionModel<MdChip>;
+
+  /** Comparison function to specify which option is displayed. Defaults to object equality. */
+  private _compareWith = (o1: any, o2: any) => o1 === o2;
+
+  /** The array of selected chips inside chip list. */
+  get selected(): MdChip[] | MdChip {
+    return this.multiple ? this._selectionModel.selected : this._selectionModel.selected[0];
+  }
+
+  /** Whether the user should be allowed to select multiple chips. */
+  @Input()
+  get multiple(): boolean { return this._multiple; }
+  set multiple(value: boolean) {
+    this._multiple = coerceBooleanProperty(value);
+  }
+
+  /**
+   * A function to compare the option values with the selected values. The first argument
+   * is a value from an option. The second is a value from the selection. A boolean
+   * should be returned.
+   */
+  @Input()
+  get compareWith() { return this._compareWith; }
+  set compareWith(fn: (o1: any, o2: any) => boolean) {
+    this._compareWith = fn;
+    if (this._selectionModel) {
+      // A different comparator means the selection could change.
+      this._initializeSelection();
+    }
+  }
+
+  /** Required for FormFieldControl */
+  @Input()
+  get value() { return this._value; }
+  set value(newValue: any) {
+    this.writeValue(newValue);
+    this._value = newValue;
+  }
+
+  /** Required for FormFieldControl. The ID of the chip list */
+  @Input()
+  set id(value: string) {
+    this._id = value;
+    this.stateChanges.next();
+  }
+  get id() { return this._id || this._uid; }
+
+  /** Required for FormFieldControl. Whether the chip list is required. */
+  @Input()
+  set required(value: any) {
+    this._required = coerceBooleanProperty(value);
+    this.stateChanges.next();
+  }
+  get required() {
+    return this._required;
+  }
+
+  /** For FormFieldControl. Use chip input's placholder if there's a chip input */
+  @Input()
+  set placeholder(value: string) {
+    this._placeholder = value;
+    this.stateChanges.next();
+  }
+  get placeholder() {
+    return this._chipInput ? this._chipInput.placeholder : this._placeholder;
+  }
+
+  /** Whether any chips or the mdChipInput inside of this chip-list has focus. */
+  get focused() {
+    return this.chips.some(chip => chip._hasFocus) ||
+      (this._chipInput && this._chipInput.focused);
+  }
+
+  /** Whether this chip-list contains no chips and no mdChipInput. */
+  get empty(): boolean {
+    return (!this._chipInput || this._chipInput.empty) && this.chips.length === 0;
+  }
+
+  /** Whether this chip-list is disabled. */
+  @Input()
+  get disabled() { return this.ngControl ? this.ngControl.disabled : this._disabled; }
+  set disabled(value: any) { this._disabled = coerceBooleanProperty(value); }
+
+  /** Whether the chip list is in an error state. */
+  get errorState(): boolean {
+    const isInvalid = this.ngControl && this.ngControl.invalid;
+    const isTouched = this.ngControl && this.ngControl.touched;
+    const isSubmitted = (this._parentFormGroup && this._parentFormGroup.submitted) ||
+      (this._parentForm && this._parentForm.submitted);
+    return !!(isInvalid && (isTouched || isSubmitted));
+  }
 
   /** Orientation of the chip list. */
   @Input('aria-orientation') ariaOrientation: 'horizontal' | 'vertical' = 'horizontal';
 
-  constructor(protected _renderer: Renderer2, protected _elementRef: ElementRef,
-              @Optional() private _dir: Directionality) {
+  /**
+   * Whether or not this chip is selectable. When a chip is not selectable,
+   * its selected state is always ignored.
+   */
+  @Input()
+  get selectable(): boolean { return this._selectable; }
+  set selectable(value: boolean) { this._selectable = coerceBooleanProperty(value); }
+
+  @Input()
+  set tabIndex(value: number) {
+    this._userTabIndex = value;
+    this._tabIndex = value;
+  }
+
+  /** Combined stream of all of the child chips' selection change events. */
+  get chipSelectionChanges(): Observable<MdChipSelectionChange> {
+    return merge(...this.chips.map(chip => chip.onSelectionChange));
+  }
+
+  /** Combined stream of all of the child chips' focus change events. */
+  get chipFocusChanges(): Observable<MdChipEvent> {
+    return merge(...this.chips.map(chip => chip._onFocus));
+  }
+
+  /** Combined stream of all of the child chips' blur change events. */
+  get chipBlurChanges(): Observable<MdChipEvent> {
+    return merge(...this.chips.map(chip => chip._onBlur));
+  }
+
+  /** Combined stream of all of the child chips' remove change events. */
+  get chipRemoveChanges(): Observable<MdChipEvent> {
+    return merge(...this.chips.map(chip => chip.destroy));
+  }
+
+  /** Event emitted when the selected chip list value has been changed by the user. */
+  @Output() change: EventEmitter<MdChipListChange> = new EventEmitter<MdChipListChange>();
+
+  /**
+   * Event that emits whenever the raw value of the chip-list changes. This is here primarily
+   * to facilitate the two-way binding for the `value` input.
+   * @docs-private
+   */
+  @Output() valueChange = new EventEmitter<any>();
+
+  /** The chip components contained within this chip list. */
+  @ContentChildren(MdChip) chips: QueryList<MdChip>;
+
+  constructor(protected _renderer: Renderer2,
+              protected _elementRef: ElementRef,
+              private _changeDetectorRef: ChangeDetectorRef,
+              @Optional() private _dir: Directionality,
+              @Optional() private _parentForm: NgForm,
+              @Optional() private _parentFormGroup: FormGroupDirective,
+              @Optional() @Self() public ngControl: NgControl) {
+    if (this.ngControl) {
+      this.ngControl.valueAccessor = this;
+    }
   }
 
   ngAfterContentInit(): void {
+
     this._keyManager = new FocusKeyManager<MdChip>(this.chips).withWrap();
 
     // Prevents the chip list from capturing focus and redirecting
@@ -99,20 +331,12 @@ export class MdChipList implements AfterContentInit, OnDestroy {
       setTimeout(() => this._tabIndex = this._userTabIndex || 0);
     });
 
-    // Go ahead and subscribe all of the initial chips
-    this._subscribeChips(this.chips);
-
-    // Make sure we set our tab index at the start
-    this._updateTabIndex();
-
     // When the list changes, re-subscribe
-    this.chips.changes.subscribe((chips: QueryList<MdChip>) => {
-      this._subscribeChips(chips);
+    this._changeSubscription = startWith.call(this.chips.changes, null).subscribe(() => {
+      this._resetChips();
 
-      // If we have 0 chips, attempt to focus an input (if available)
-      if (chips.length === 0) {
-        this._focusInput();
-      }
+      // Reset chips selected/deselected status
+      this._initializeSelection();
 
       // Check to see if we need to update our tab index
       this._updateTabIndex();
@@ -122,32 +346,51 @@ export class MdChipList implements AfterContentInit, OnDestroy {
     });
   }
 
+  ngOnInit() {
+    this._selectionModel = new SelectionModel<MdChip>(this.multiple, undefined, false);
+    this.stateChanges.next();
+  }
+
   ngOnDestroy(): void {
     this._tabOutSubscription.unsubscribe();
+
+    if (this._changeSubscription) {
+      this._changeSubscription.unsubscribe();
+    }
+    this._dropSubscriptions();
   }
 
-  /**
-   * Whether or not this chip is selectable. When a chip is not selectable,
-   * it's selected state is always ignored.
-   */
-  @Input()
-  get selectable(): boolean {
-    return this._selectable;
+
+  /** Associates an HTML input element with this chip list. */
+  registerInput(inputElement: MdChipInput) {
+    this._chipInput = inputElement;
   }
 
-  set selectable(value: boolean) {
-    this._selectable = coerceBooleanProperty(value);
+  // Implemented as part of MdFormFieldControl.
+  setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
+
+  // Implemented as part of ControlValueAccessor
+  writeValue(value: any): void {
+    if (this.chips) {
+      this._setSelectionByValue(value, false);
+    }
   }
 
-  @Input()
-  set tabIndex(value: number) {
-    this._userTabIndex = value;
-    this._tabIndex = value;
+  // Implemented as part of ControlValueAccessor
+  registerOnChange(fn: (value: any) => void): void {
+    this._onChange = fn;
   }
 
-  /** Associates an HTML input element with this chip list. */
-  registerInput(inputElement: HTMLInputElement) {
-    this._inputElement = inputElement;
+  // Implemented as part of ControlValueAccessor
+  registerOnTouched(fn: () => void): void {
+    this._onTouched = fn;
+  }
+
+  // Implemented as part of ControlValueAccessor
+  setDisabledState(disabled: boolean): void {
+    this.disabled = disabled;
+    this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', disabled);
+    this.stateChanges.next();
   }
 
   /**
@@ -156,17 +399,22 @@ export class MdChipList implements AfterContentInit, OnDestroy {
    */
   focus() {
     // TODO: ARIA says this should focus the first `selected` chip if any are selected.
-    if (this.chips.length > 0) {
+    // Focus on first element if there's no chipInput inside chip-list
+    if (this._chipInput && this._chipInput.focused) {
+      // do nothing
+    } else if (this.chips.length > 0) {
       this._keyManager.setFirstItemActive();
+      this.stateChanges.next();
     } else {
       this._focusInput();
+      this.stateChanges.next();
     }
   }
 
   /** Attempt to focus an input if we have one. */
   _focusInput() {
-    if (this._inputElement) {
-      this._inputElement.focus();
+    if (this._chipInput) {
+      this._chipInput.focus();
     }
   }
 
@@ -202,17 +450,9 @@ export class MdChipList implements AfterContentInit, OnDestroy {
         this._keyManager.onKeydown(event);
       }
     }
+    this.stateChanges.next();
   }
 
-  /**
-   * Iterate through the list of chips and add them to our list of
-   * subscribed chips.
-   *
-   * @param chips The list of chips to be subscribed.
-   */
-  protected _subscribeChips(chips: QueryList<MdChip>): void {
-    chips.forEach(chip => this._addChip(chip));
-  }
 
   /**
    * Check the tab index as you should not be allowed to focus an empty list.
@@ -223,51 +463,26 @@ export class MdChipList implements AfterContentInit, OnDestroy {
   }
 
   /**
-   * Add a specific chip to our subscribed list. If the chip has
-   * already been subscribed, this ensures it is only subscribed
-   * once.
-   *
-   * @param chip The chip to be subscribed (or checked for existing
-   * subscription).
+   * Update key manager's active item when chip is deleted.
+   * If the deleted chip is the last chip in chip list, focus the new last chip.
+   * Otherwise focus the next chip in the list.
+   * Save `_lastDestroyedIndex` so we can set the correct focus.
    */
-  protected _addChip(chip: MdChip) {
-    // If we've already been subscribed to a parent, do nothing
-    if (this._chipSet.has(chip)) {
-      return;
-    }
-
-    // Watch for focus events outside of the keyboard navigation
-    chip._onFocus.subscribe(() => {
-      let chipIndex: number = this.chips.toArray().indexOf(chip);
-
-      if (this._isValidIndex(chipIndex)) {
-        this._keyManager.updateActiveItemIndex(chipIndex);
-      }
-    });
-
-    // On destroy, remove the item from our list, and setup our destroyed focus check
-    chip.destroy.subscribe(() => {
-      let chipIndex: number = this.chips.toArray().indexOf(chip);
-      if (this._isValidIndex(chipIndex)) {
-        if (chip._hasFocus) {
-          // Check whether the chip is the last item
-          if (chipIndex < this.chips.length - 1) {
-            this._keyManager.setActiveItem(chipIndex);
-          } else if (chipIndex - 1 >= 0) {
-            this._keyManager.setActiveItem(chipIndex - 1);
-          }
-        }
-        if (this._keyManager.activeItemIndex === chipIndex) {
-          this._lastDestroyedIndex = chipIndex;
+  protected _updateKeyManager(chip: MdChip) {
+    let chipIndex: number = this.chips.toArray().indexOf(chip);
+    if (this._isValidIndex(chipIndex)) {
+      if (chip._hasFocus) {
+        // Check whether the chip is not the last item
+        if (chipIndex < this.chips.length - 1) {
+          this._keyManager.setActiveItem(chipIndex);
+        } else if (chipIndex - 1 >= 0) {
+          this._keyManager.setActiveItem(chipIndex - 1);
         }
-
       }
-
-      this._chipSet.delete(chip);
-      chip.destroy.unsubscribe();
-    });
-
-    this._chipSet.set(chip, true);
+      if (this._keyManager.activeItemIndex === chipIndex) {
+        this._lastDestroyedIndex = chipIndex;
+      }
+    }
   }
 
   /**
@@ -282,11 +497,12 @@ export class MdChipList implements AfterContentInit, OnDestroy {
       const newFocusIndex = Math.min(this._lastDestroyedIndex, chipsArray.length - 1);
       this._keyManager.setActiveItem(newFocusIndex);
       let focusChip = this._keyManager.activeItem;
-
       // Focus the chip
       if (focusChip) {
         focusChip.focus();
       }
+    } else if (chipsArray.length === 0) {
+      this._focusInput();
     }
 
     // Reset our destroyed index
@@ -312,4 +528,193 @@ export class MdChipList implements AfterContentInit, OnDestroy {
 
     return false;
   }
+
+  _setSelectionByValue(value: any, isUserInput: boolean = true) {
+    this._clearSelection();
+    this.chips.forEach(chip => chip.deselect());
+
+    if (Array.isArray(value)) {
+      value.forEach(currentValue => this._selectValue(currentValue, isUserInput));
+      this._sortValues();
+    } else {
+      const correspondingChip = this._selectValue(value, isUserInput);
+
+      // Shift focus to the active item. Note that we shouldn't do this in multiple
+      // mode, because we don't know what chip the user interacted with last.
+      if (correspondingChip) {
+        this._keyManager.setActiveItem(this.chips.toArray().indexOf(correspondingChip));
+      }
+    }
+  }
+
+  /**
+   * Finds and selects the chip based on its value.
+   * @returns Chip that has the corresponding value.
+   */
+  private _selectValue(value: any, isUserInput: boolean = true): MdChip | undefined {
+
+    const correspondingChip = this.chips.find(chip => {
+      return chip.value != null && this._compareWith(chip.value,  value);
+    });
+
+    if (correspondingChip) {
+      isUserInput ? correspondingChip.selectViaInteraction() : correspondingChip.select();
+      this._selectionModel.select(correspondingChip);
+    }
+
+    return correspondingChip;
+  }
+
+  private _initializeSelection(): void {
+    // Defer setting the value in order to avoid the "Expression
+    // has changed after it was checked" errors from Angular.
+    Promise.resolve().then(() => {
+      this._setSelectionByValue(this.ngControl ? this.ngControl.value : this._value, false);
+      this.stateChanges.next();
+    });
+  }
+
+  /**
+   * Deselects every chip in the list.
+   * @param skip Chip that should not be deselected.
+   */
+  private _clearSelection(skip?: MdChip): void {
+    this._selectionModel.clear();
+    this.chips.forEach(chip => {
+      if (chip !== skip) {
+        chip.deselect();
+      }
+    });
+    this.stateChanges.next();
+  }
+
+  /**
+   * Sorts the model values, ensuring that they keep the same
+   * order that they have in the panel.
+   */
+  private _sortValues(): void {
+    if (this._multiple) {
+      this._selectionModel.clear();
+
+      this.chips.forEach(chip => {
+        if (chip.selected) {
+          this._selectionModel.select(chip);
+        }
+      });
+      this.stateChanges.next();
+    }
+  }
+
+  /** Emits change event to set the model value. */
+  private _propagateChanges(fallbackValue?: any): void {
+    let valueToEmit: any = null;
+
+    if (Array.isArray(this.selected)) {
+      valueToEmit = this.selected.map(chip => chip.value);
+    } else {
+      valueToEmit = this.selected ? this.selected.value : fallbackValue;
+    }
+    this._value = valueToEmit;
+    this.change.emit(new MdChipListChange(this, valueToEmit));
+    this.valueChange.emit(valueToEmit);
+    this._onChange(valueToEmit);
+    this._changeDetectorRef.markForCheck();
+  }
+
+  /** When blurred, mark the field as touched when focus moved outside the chip list. */
+  _blur() {
+    if (!this.disabled) {
+      if (this._chipInput) {
+        // If there's a chip input, we should check whether the focus moved to chip input.
+        // If the focus is not moved to chip input, mark the field as touched. If the focus moved
+        // to chip input, do nothing.
+        // Timeout is needed to wait for the focus() event trigger on chip input.
+        setTimeout(() => {
+          if (!this.focused) {
+            this._markAsTouched();
+          }
+        });
+      } else {
+        // If there's no chip input, then mark the field as touched.
+        this._markAsTouched();
+      }
+    }
+  }
+
+  /** Mark the field as touched */
+  _markAsTouched() {
+    this._onTouched();
+    this._changeDetectorRef.markForCheck();
+    this.stateChanges.next();
+  }
+
+  private _resetChips() {
+    this._dropSubscriptions();
+    this._listenToChipsFocus();
+    this._listenToChipsSelection();
+    this._listenToChipsRemoved();
+  }
+
+
+  private _dropSubscriptions() {
+    if (this._chipFocusSubscription) {
+      this._chipFocusSubscription.unsubscribe();
+      this._chipFocusSubscription = null;
+    }
+
+    if (this._chipBlurSubscription) {
+      this._chipBlurSubscription.unsubscribe();
+      this._chipBlurSubscription = null;
+    }
+
+    if (this._chipSelectionSubscription) {
+      this._chipSelectionSubscription.unsubscribe();
+      this._chipSelectionSubscription = null;
+    }
+  }
+
+  /** Listens to user-generated selection events on each chip. */
+  private _listenToChipsSelection(): void {
+    this._chipSelectionSubscription = this.chipSelectionChanges.subscribe(event => {
+      event.source.selected
+        ? this._selectionModel.select(event.source)
+        : this._selectionModel.deselect(event.source);
+
+      // For single selection chip list, make sure the deselected value is unselected.
+      if (!this.multiple) {
+        this.chips.forEach(chip => {
+          if (!this._selectionModel.isSelected(chip) && chip.selected) {
+            chip.deselect();
+          }
+        });
+      }
+
+      if (event.isUserInput) {
+        this._propagateChanges();
+      }
+    });
+  }
+
+  /** Listens to user-generated selection events on each chip. */
+  private _listenToChipsFocus(): void {
+    this._chipFocusSubscription = this.chipFocusChanges.subscribe(event => {
+      let chipIndex: number = this.chips.toArray().indexOf(event.chip);
+
+      if (this._isValidIndex(chipIndex)) {
+        this._keyManager.updateActiveItemIndex(chipIndex);
+      }
+      this.stateChanges.next();
+    });
+
+    this._chipBlurSubscription = this.chipBlurChanges.subscribe(_ => {
+      this._blur();
+      this.stateChanges.next();
+    });
+  }
+
+  private _listenToChipsRemoved(): void {
+    this._chipRemoveSubscription = this.chipRemoveChanges.subscribe((event) => {
+      this._updateKeyManager(event.chip);
+    });
+  }
 }
diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
index 90c3bdfa873f..cb8b6f506658 100644
--- a/src/lib/chips/chip.spec.ts
+++ b/src/lib/chips/chip.spec.ts
@@ -2,7 +2,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component, DebugElement}  from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {createKeyboardEvent} from '@angular/cdk/testing';
-import {MdChipList, MdChip, MdChipEvent, MdChipsModule} from './index';
+import {MdChipList, MdChip, MdChipEvent, MdChipsModule, MdChipSelectionChange} from './index';
 import {SPACE, DELETE, BACKSPACE} from '@angular/material/core';
 import {Directionality} from '@angular/material/core';
 
@@ -113,14 +113,15 @@ describe('Chips', () => {
       });
 
       it('allows selection', () => {
-        spyOn(testComponent, 'chipSelect');
+        spyOn(testComponent, 'chipSelectionChange');
         expect(chipNativeElement.classList).not.toContain('mat-chip-selected');
 
         testComponent.selected = true;
         fixture.detectChanges();
 
         expect(chipNativeElement.classList).toContain('mat-chip-selected');
-        expect(testComponent.chipSelect).toHaveBeenCalledWith({chip: chipInstance});
+        expect(testComponent.chipSelectionChange)
+          .toHaveBeenCalledWith({source: chipInstance, isUserInput: false});
       });
 
       it('allows removal', () => {
@@ -143,26 +144,25 @@ describe('Chips', () => {
 
         it('should selects/deselects the currently focused chip on SPACE', () => {
           const SPACE_EVENT: KeyboardEvent = createKeyboardEvent('keydown', SPACE) as KeyboardEvent;
-          const CHIP_EVENT: MdChipEvent = {chip: chipInstance};
+          const CHIP_EVENT: MdChipSelectionChange = {source: chipInstance, isUserInput: true};
 
-          spyOn(testComponent, 'chipSelect');
-          spyOn(testComponent, 'chipDeselect');
+          spyOn(testComponent, 'chipSelectionChange');
 
           // Use the spacebar to select the chip
           chipInstance._handleKeydown(SPACE_EVENT);
           fixture.detectChanges();
 
           expect(chipInstance.selected).toBeTruthy();
-          expect(testComponent.chipSelect).toHaveBeenCalledTimes(1);
-          expect(testComponent.chipSelect).toHaveBeenCalledWith(CHIP_EVENT);
+          expect(testComponent.chipSelectionChange).toHaveBeenCalledTimes(1);
+          expect(testComponent.chipSelectionChange).toHaveBeenCalledWith(CHIP_EVENT);
 
           // Use the spacebar to deselect the chip
           chipInstance._handleKeydown(SPACE_EVENT);
           fixture.detectChanges();
 
           expect(chipInstance.selected).toBeFalsy();
-          expect(testComponent.chipDeselect).toHaveBeenCalledTimes(1);
-          expect(testComponent.chipDeselect).toHaveBeenCalledWith(CHIP_EVENT);
+          expect(testComponent.chipSelectionChange).toHaveBeenCalledTimes(2);
+          expect(testComponent.chipSelectionChange).toHaveBeenCalledWith(CHIP_EVENT);
         });
 
         it('should have correct aria-selected', () => {
@@ -184,14 +184,14 @@ describe('Chips', () => {
         it('SPACE ignores selection', () => {
           const SPACE_EVENT: KeyboardEvent = createKeyboardEvent('keydown', SPACE) as KeyboardEvent;
 
-          spyOn(testComponent, 'chipSelect');
+          spyOn(testComponent, 'chipSelectionChange');
 
           // Use the spacebar to attempt to select the chip
           chipInstance._handleKeydown(SPACE_EVENT);
           fixture.detectChanges();
 
           expect(chipInstance.selected).toBeFalsy();
-          expect(testComponent.chipSelect).not.toHaveBeenCalled();
+          expect(testComponent.chipSelectionChange).not.toHaveBeenCalled();
         });
 
         it('should not have the aria-selected attribute', () => {
@@ -281,7 +281,7 @@ describe('Chips', () => {
         <md-chip [selectable]="selectable" [removable]="removable"
                  [color]="color" [selected]="selected" [disabled]="disabled"
                  (focus)="chipFocus($event)" (destroy)="chipDestroy($event)"
-                 (select)="chipSelect($event)" (deselect)="chipDeselect($event)"
+                 (onSelectionChange)="chipSelectionChange($event)"
                  (remove)="chipRemove($event)">
           {{name}}
         </md-chip>
@@ -299,8 +299,7 @@ class SingleChip {
 
   chipFocus: (event?: MdChipEvent) => void = () => {};
   chipDestroy: (event?: MdChipEvent) => void = () => {};
-  chipSelect: (event?: MdChipEvent) => void = () => {};
-  chipDeselect: (event?: MdChipEvent) => void = () => {};
+  chipSelectionChange: (event?: MdChipSelectionChange) => void = () => {};
   chipRemove: (event?: MdChipEvent) => void = () => {};
 }
 
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 642a41ea7e19..26ab43c56e4c 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -9,11 +9,9 @@
 import {FocusableOption} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
-  ContentChild,
   Directive,
   ElementRef,
   EventEmitter,
-  forwardRef,
   Input,
   OnDestroy,
   Output,
@@ -34,6 +32,12 @@ export interface MdChipEvent {
   chip: MdChip;
 }
 
+/** Event object emitted by MdChip when selected or deselected. */
+export class MdChipSelectionChange {
+  constructor(public source: MdChip, public isUserInput = false) { }
+}
+
+
 // Boilerplate for applying mixins to MdChip.
 /** @docs-private */
 export class MdChipBase {
@@ -71,80 +75,106 @@ export class MdBasicChip { }
     '(click)': '_handleClick($event)',
     '(keydown)': '_handleKeydown($event)',
     '(focus)': '_hasFocus = true',
-    '(blur)': '_hasFocus = false',
-  }
+    '(blur)': '_blur()',
+  },
+
 })
 export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestroy, CanColor,
   CanDisable {
 
-  @ContentChild(forwardRef(() => MdChipRemove)) _chipRemove: MdChipRemove;
+  protected _value: any;
+
+  protected _selected: boolean = false;
+
+  protected _selectable: boolean = true;
+
+  protected _removable: boolean = true;
+
+  /** Whether the chip has focus. */
+  _hasFocus: boolean = false;
 
   /** Whether the chip is selected. */
-  @Input() get selected(): boolean { return this._selected; }
+  @Input()
+  get selected(): boolean { return this._selected; }
   set selected(value: boolean) {
     this._selected = coerceBooleanProperty(value);
-    (this.selected ? this.select : this.deselect).emit({chip: this});
+    this.onSelectionChange.emit({source: this, isUserInput: false});
   }
-  protected _selected: boolean = false;
+
+  /** The value of the chip. Defaults to the content inside <md-chip> tags. */
+  @Input()
+  get value(): any {
+    return this._value != undefined
+      ? this._value
+      : this._elementRef.nativeElement.textContent;
+  }
+  set value(newValue: any) { this._value = newValue; }
 
   /**
    * Whether or not the chips are selectable. When a chip is not selectable,
    * changes to it's selected state are always ignored.
    */
-  @Input() get selectable(): boolean {
-    return this._selectable;
-  }
-
-  set selectable(value: boolean) {
-    this._selectable = coerceBooleanProperty(value);
-  }
-  protected _selectable: boolean = true;
+  @Input()
+  get selectable(): boolean { return this._selectable; }
+  set selectable(value: boolean) { this._selectable = coerceBooleanProperty(value); }
 
   /**
    * Determines whether or not the chip displays the remove styling and emits (remove) events.
    */
-  @Input() get removable(): boolean {
-    return this._removable;
-  }
-
-  set removable(value: boolean) {
-    this._removable = coerceBooleanProperty(value);
-  }
-  protected _removable: boolean = true;
-
-  /** Whether the chip has focus. */
-  _hasFocus: boolean = false;
+  @Input()
+  get removable(): boolean { return this._removable; }
+  set removable(value: boolean) { this._removable = coerceBooleanProperty(value); }
 
   /** Emits when the chip is focused. */
   _onFocus = new Subject<MdChipEvent>();
 
-  /** Emitted when the chip is selected. */
-  @Output() select = new EventEmitter<MdChipEvent>();
+  /** Emits when the chip is blured. */
+  _onBlur = new Subject<MdChipEvent>();
 
-  /** Emitted when the chip is deselected. */
-  @Output() deselect = new EventEmitter<MdChipEvent>();
+  /** Emitted when the chip is selected or deselected. */
+  @Output() onSelectionChange = new EventEmitter<MdChipSelectionChange>();
 
   /** Emitted when the chip is destroyed. */
   @Output() destroy = new EventEmitter<MdChipEvent>();
 
+  /** Emitted when a chip is to be removed. */
+  @Output('remove') onRemove = new EventEmitter<MdChipEvent>();
+
   get ariaSelected(): string | null {
     return this.selectable ? this.selected.toString() : null;
   }
 
-  constructor(renderer: Renderer2, elementRef: ElementRef) {
-    super(renderer, elementRef);
+  constructor(renderer: Renderer2, public _elementRef: ElementRef) {
+    super(renderer, _elementRef);
   }
 
-  /** Emitted when a chip is to be removed. */
-  @Output('remove') onRemove = new EventEmitter<MdChipEvent>();
-
   ngOnDestroy(): void {
     this.destroy.emit({chip: this});
   }
 
+  /** Selects the chip. */
+  select(): void {
+    this._selected = true;
+    this.onSelectionChange.emit({source: this, isUserInput: false});
+  }
+
+  /** Deselects the chip. */
+  deselect(): void {
+    this._selected = false;
+    this.onSelectionChange.emit({source: this, isUserInput: false});
+  }
+
+  /** Select this chip and emit selected event */
+  selectViaInteraction() {
+    this._selected = true;
+    // Emit select event when selected changes.
+    this.onSelectionChange.emit({source: this, isUserInput: true});
+  }
+
   /** Toggles the current selected state of this chip. */
-  toggleSelected(): boolean {
-    this.selected = !this.selected;
+  toggleSelected(isUserInput: boolean = false): boolean {
+    this._selected = !this.selected;
+    this.onSelectionChange.emit({source: this, isUserInput});
     return this.selected;
   }
 
@@ -196,7 +226,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       case SPACE:
         // If we are selectable, toggle the focused chip
         if (this.selectable) {
-          this.toggleSelected();
+          this.toggleSelected(true);
         }
 
         // Always prevent space from scrolling the page since the list has focus
@@ -204,6 +234,11 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
         break;
     }
   }
+
+  _blur() {
+    this._hasFocus = false;
+    this._onBlur.next({chip: this});
+  }
 }
 
 
diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 1eadeab12a50..6b7760f77ac1 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -39,6 +39,7 @@ An exmaple of chip input placed inside the chip-list element.
 <!-- example(chips-input) -->
 
 An example of chip input placed outside the chip-list element.
+
 ```html
 <md-form-field>
   <md-chip-list #chipList>
diff --git a/src/lib/chips/chips.scss b/src/lib/chips/chips.scss
index b170a27039e1..478caf88d71f 100644
--- a/src/lib/chips/chips.scss
+++ b/src/lib/chips/chips.scss
@@ -7,12 +7,16 @@ $mat-chip-remove-margin-before: 6px;
 $mat-chip-remove-margin-after: -4px;
 
 $mat-chips-chip-margin: 8px;
+$mat-chips-chip-bottom-margin: 3px;
+
+$mat-chip-input-width: 150px;
+$mat-chip-input-margin: 3px;
 
 .mat-chip-list-wrapper {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: flex-start;
+  align-items: baseline;
 }
 
 .mat-chip:not(.mat-basic-chip) {
@@ -25,10 +29,10 @@ $mat-chips-chip-margin: 8px;
 
   // Apply a margin to adjacent sibling chips.
   & + & {
-    margin: 0 0 0 $mat-chips-chip-margin;
+    margin: 0 0 $mat-chips-chip-bottom-margin $mat-chips-chip-margin;
 
     [dir='rtl'] & {
-      margin: 0 $mat-chips-chip-margin 0 0;
+      margin: 0 $mat-chips-chip-margin $mat-chips-chip-bottom-margin 0;
     }
   }
 
@@ -90,3 +94,8 @@ $mat-chips-chip-margin: 8px;
     margin-left: $mat-chip-remove-margin-after;
   }
 }
+
+input.mat-chip-input {
+  width: $mat-chip-input-width;
+  margin: $mat-chip-input-margin;
+}
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 8a3df761e601..c3a3c72f3d07 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -69,13 +69,13 @@ let nextUniqueId = 0;
 })
 export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, DoCheck {
   /** Variables used as cache for getters and setters. */
-  private _type = 'text';
-  private _disabled = false;
-  private _required = false;
-  private _id: string;
-  private _uid = `md-input-${nextUniqueId++}`;
-  private _errorOptions: ErrorOptions;
-  private _previousNativeValue = this.value;
+  protected _type = 'text';
+  protected _disabled = false;
+  protected _required = false;
+  protected _id: string;
+  protected _uid = `md-input-${nextUniqueId++}`;
+  protected _errorOptions: ErrorOptions;
+  protected _previousNativeValue = this.value;
 
   /** Whether the input is focused. */
   focused = false;
@@ -137,7 +137,7 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
     }
   }
 
-  private _neverEmptyInputTypes = [
+  protected _neverEmptyInputTypes = [
     'date',
     'datetime',
     'datetime-local',
@@ -146,12 +146,12 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
     'week'
   ].filter(t => getSupportedInputTypes().has(t));
 
-  constructor(private _elementRef: ElementRef,
-              private _renderer: Renderer2,
-              private _platform: Platform,
+  constructor(protected _elementRef: ElementRef,
+              protected _renderer: Renderer2,
+              protected _platform: Platform,
               @Optional() @Self() public ngControl: NgControl,
-              @Optional() private _parentForm: NgForm,
-              @Optional() private _parentFormGroup: FormGroupDirective,
+              @Optional() protected _parentForm: NgForm,
+              @Optional() protected _parentFormGroup: FormGroupDirective,
               @Optional() @Inject(MD_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
 
     // Force setter to be called in case id was not specified.
@@ -216,7 +216,7 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
   }
 
   /** Re-evaluates the error state. This is only relevant with @angular/forms. */
-  private _updateErrorState() {
+  protected _updateErrorState() {
     const oldState = this.errorState;
     const ngControl = this.ngControl;
     const parent = this._parentFormGroup || this._parentForm;
@@ -229,7 +229,7 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
   }
 
   /** Does some manual dirty checking on the native input `value` property. */
-  private _dirtyCheckNativeValue() {
+  protected _dirtyCheckNativeValue() {
     const newValue = this.value;
 
     if (this._previousNativeValue !== newValue) {
@@ -239,26 +239,26 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
   }
 
   /** Make sure the input is a supported type. */
-  private _validateType() {
+  protected _validateType() {
     if (MD_INPUT_INVALID_TYPES.indexOf(this._type) > -1) {
       throw getMdInputUnsupportedTypeError(this._type);
     }
   }
 
   /** Checks whether the input type is one of the types that are never empty. */
-  private _isNeverEmpty() {
+  protected _isNeverEmpty() {
     return this._neverEmptyInputTypes.indexOf(this._type) > -1;
   }
 
   /** Checks whether the input is invalid based on the native validation. */
-  private _isBadInput() {
+  protected _isBadInput() {
     // The `validity` property won't be present on platform-server.
     let validity = (this._elementRef.nativeElement as HTMLInputElement).validity;
     return validity && validity.badInput;
   }
 
   /** Determines if the component host is a textarea. If not recognizable it returns false. */
-  private _isTextarea() {
+  protected _isTextarea() {
     let nativeElement = this._elementRef.nativeElement;
 
     // In Universal, we don't have access to `nodeName`, but the same can be achieved with `name`.

From e4a93234c15dae90e862c1d74694a33f8248b358 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 18 Sep 2017 10:29:38 -0700
Subject: [PATCH 106/575] chore: bump Angular dep to 4.4.1 (#7118)

BREAKING CHANGE: Angular Material now requires Angular 4.4.1 or greater
---
 package.json                             | 24 ++++++++++++------------
 src/cdk/package.json                     |  4 ++--
 src/lib/package.json                     |  4 ++--
 src/material-examples/package.json       |  6 +++---
 src/material-moment-adapter/package.json |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 336a38a8d2d6..e71ff898154b 100644
--- a/package.json
+++ b/package.json
@@ -25,13 +25,13 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": "~4.4.0-RC.0",
-    "@angular/common": "~4.4.0-RC.0",
-    "@angular/compiler": "~4.4.0-RC.0",
-    "@angular/core": "~4.4.0-RC.0",
-    "@angular/forms": "~4.4.0-RC.0",
-    "@angular/http": "~4.4.0-RC.0",
-    "@angular/platform-browser": "~4.4.0-RC.0",
+    "@angular/animations": "~4.4.1",
+    "@angular/common": "~4.4.1",
+    "@angular/compiler": "~4.4.1",
+    "@angular/core": "~4.4.1",
+    "@angular/forms": "~4.4.1",
+    "@angular/http": "~4.4.1",
+    "@angular/platform-browser": "~4.4.1",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
     "systemjs": "0.19.43",
@@ -40,11 +40,11 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.4.0-RC.0",
-    "@angular/platform-browser-dynamic": "~4.4.0-RC.0",
-    "@angular/platform-server": "~4.4.0-RC.0",
-    "@angular/router": "~4.4.0-RC.0",
-    "@angular/tsc-wrapped": "~4.4.0-RC.0",
+    "@angular/compiler-cli": "~4.4.1",
+    "@angular/platform-browser-dynamic": "~4.4.1",
+    "@angular/platform-server": "~4.4.1",
+    "@angular/router": "~4.4.1",
+    "@angular/tsc-wrapped": "~4.4.1",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^3.0.1",
diff --git a/src/cdk/package.json b/src/cdk/package.json
index 0109d456cd20..abbd68d5d494 100644
--- a/src/cdk/package.json
+++ b/src/cdk/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular/core": "^4.3.0",
-    "@angular/common": "^4.3.0"
+    "@angular/core": "^4.4.1",
+    "@angular/common": "^4.4.1"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/lib/package.json b/src/lib/package.json
index 1e0fbb0f1d4e..5bee54b1f6a6 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -23,8 +23,8 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/cdk": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.3.0",
-    "@angular/common": "^4.3.0"
+    "@angular/core": "^4.4.1",
+    "@angular/common": "^4.4.1"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/material-examples/package.json b/src/material-examples/package.json
index dc2080808034..6c952f6a9b14 100644
--- a/src/material-examples/package.json
+++ b/src/material-examples/package.json
@@ -24,9 +24,9 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/cdk": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.3.0",
-    "@angular/common": "^4.3.0",
-    "@angular/http": "^4.3.0",
+    "@angular/core": "^4.4.1",
+    "@angular/common": "^4.4.1",
+    "@angular/http": "^4.4.1",
     "@angular/material": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
diff --git a/src/material-moment-adapter/package.json b/src/material-moment-adapter/package.json
index 7e1141586f4f..991f53045c92 100644
--- a/src/material-moment-adapter/package.json
+++ b/src/material-moment-adapter/package.json
@@ -17,7 +17,7 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/material": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.0.0",
+    "@angular/core": "^4.4.1",
     "moment": "^2.18.1"
   },
   "dependencies": {

From 6cfe5c4aa3b6b0a3468460982d7770486ac8785d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 18 Sep 2017 19:32:21 +0200
Subject: [PATCH 107/575] feat: move FocusMonitor into cdk (#6921)

Moves the `FocusOriginMonitor` into `@angular/cdk/a11y`, renames it to `FocusMonitor`, deprecates the `StyleModule` and updates all the references.

BREAKING CHANGE: `FocusOriginMonitor` has been renamed to `FocusMonitor`.
---
 .../a11y/focus-monitor.spec.ts}               | 32 +++++++++----------
 .../a11y/focus-monitor.ts}                    | 28 ++++++++--------
 src/cdk/a11y/public_api.ts                    |  9 ++++--
 src/demo-app/demo-app/demo-app.ts             |  2 +-
 src/demo-app/demo-app/demo-module.ts          |  4 +--
 src/demo-app/demo-app/routes.ts               |  4 +--
 src/demo-app/demo-material-module.ts          |  3 +-
 .../focus-origin-demo.html}                   |  0
 .../focus-origin-demo.scss}                   |  0
 .../focus-origin/focus-origin-demo.ts         | 13 ++++++++
 src/demo-app/style/style-demo.ts              | 13 --------
 src/lib/button-toggle/button-toggle.ts        |  7 ++--
 src/lib/button-toggle/public_api.ts           |  9 ++----
 src/lib/button/button.ts                      | 12 +++----
 src/lib/button/public_api.ts                  |  5 +--
 src/lib/checkbox/checkbox.ts                  | 11 +++----
 src/lib/checkbox/public_api.ts                |  6 ++--
 src/lib/core/style/index.ts                   | 19 +++++------
 src/lib/datepicker/public_api.ts              |  2 --
 src/lib/expansion/expansion-panel-header.ts   |  8 ++---
 src/lib/expansion/public_api.ts               |  9 ++----
 src/lib/radio/public_api.ts                   |  7 ++--
 src/lib/radio/radio.ts                        | 11 +++----
 src/lib/slide-toggle/public_api.ts            |  5 ++-
 src/lib/slide-toggle/slide-toggle.ts          | 11 +++----
 src/lib/slider/public_api.ts                  |  5 +--
 src/lib/slider/slider.ts                      |  9 +++---
 27 files changed, 118 insertions(+), 126 deletions(-)
 rename src/{lib/core/style/focus-origin-monitor.spec.ts => cdk/a11y/focus-monitor.spec.ts} (94%)
 rename src/{lib/core/style/focus-origin-monitor.ts => cdk/a11y/focus-monitor.ts} (93%)
 rename src/demo-app/{style/style-demo.html => focus-origin/focus-origin-demo.html} (100%)
 rename src/demo-app/{style/style-demo.scss => focus-origin/focus-origin-demo.scss} (100%)
 create mode 100644 src/demo-app/focus-origin/focus-origin-demo.ts
 delete mode 100644 src/demo-app/style/style-demo.ts

diff --git a/src/lib/core/style/focus-origin-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts
similarity index 94%
rename from src/lib/core/style/focus-origin-monitor.spec.ts
rename to src/cdk/a11y/focus-monitor.spec.ts
index 672d8dedc16f..a2b8fbfbb5a8 100644
--- a/src/lib/core/style/focus-origin-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor.spec.ts
@@ -1,38 +1,38 @@
 import {ComponentFixture, inject, TestBed, fakeAsync, tick} from '@angular/core/testing';
 import {Component, Renderer2} from '@angular/core';
-import {StyleModule} from './index';
+import {A11yModule} from './index';
 import {By} from '@angular/platform-browser';
-import {TAB} from '../keyboard/keycodes';
-import {FocusOrigin, FocusOriginMonitor, TOUCH_BUFFER_MS} from './focus-origin-monitor';
+import {TAB} from '@angular/cdk/keycodes';
+import {FocusOrigin, FocusMonitor, TOUCH_BUFFER_MS} from './focus-monitor';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 
 
-describe('FocusOriginMonitor', () => {
+describe('FocusMonitor', () => {
   let fixture: ComponentFixture<PlainButton>;
   let buttonElement: HTMLElement;
   let buttonRenderer: Renderer2;
-  let focusOriginMonitor: FocusOriginMonitor;
+  let focusMonitor: FocusMonitor;
   let changeHandler: (origin: FocusOrigin) => void;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [StyleModule],
+      imports: [A11yModule],
       declarations: [
         PlainButton,
       ],
     }).compileComponents();
   });
 
-  beforeEach(inject([FocusOriginMonitor], (fom: FocusOriginMonitor) => {
+  beforeEach(inject([FocusMonitor], (fm: FocusMonitor) => {
     fixture = TestBed.createComponent(PlainButton);
     fixture.detectChanges();
 
     buttonElement = fixture.debugElement.query(By.css('button')).nativeElement;
     buttonRenderer = fixture.componentInstance.renderer;
-    focusOriginMonitor = fom;
+    focusMonitor = fm;
 
     changeHandler = jasmine.createSpy('focus origin change handler');
-    focusOriginMonitor.monitor(buttonElement, buttonRenderer, false).subscribe(changeHandler);
+    focusMonitor.monitor(buttonElement, buttonRenderer, false).subscribe(changeHandler);
     patchElementFocus(buttonElement);
   }));
 
@@ -110,7 +110,7 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia keyboard should simulate keyboard focus', fakeAsync(() => {
-    focusOriginMonitor.focusVia(buttonElement, 'keyboard');
+    focusMonitor.focusVia(buttonElement, 'keyboard');
     tick();
 
     expect(buttonElement.classList.length)
@@ -123,7 +123,7 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia mouse should simulate mouse focus', fakeAsync(() => {
-    focusOriginMonitor.focusVia(buttonElement, 'mouse');
+    focusMonitor.focusVia(buttonElement, 'mouse');
     fixture.detectChanges();
     tick();
 
@@ -137,7 +137,7 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia mouse should simulate mouse focus', fakeAsync(() => {
-    focusOriginMonitor.focusVia(buttonElement, 'touch');
+    focusMonitor.focusVia(buttonElement, 'touch');
     fixture.detectChanges();
     tick();
 
@@ -151,7 +151,7 @@ describe('FocusOriginMonitor', () => {
   }));
 
   it('focusVia program should simulate programmatic focus', fakeAsync(() => {
-    focusOriginMonitor.focusVia(buttonElement, 'program');
+    focusMonitor.focusVia(buttonElement, 'program');
     fixture.detectChanges();
     tick();
 
@@ -175,7 +175,7 @@ describe('FocusOriginMonitor', () => {
 
     // Call `blur` directly because invoking `buttonElement.blur()` does not always trigger the
     // handler on IE11 on SauceLabs.
-    focusOriginMonitor._onBlur({} as any, buttonElement);
+    focusMonitor._onBlur({} as any, buttonElement);
     fixture.detectChanges();
 
     expect(buttonElement.classList.length)
@@ -191,7 +191,7 @@ describe('FocusOriginMonitor', () => {
     expect(buttonElement.classList.length)
         .toBe(2, 'button should have exactly 2 focus classes');
 
-    focusOriginMonitor.stopMonitoring(buttonElement);
+    focusMonitor.stopMonitoring(buttonElement);
     fixture.detectChanges();
 
     expect(buttonElement.classList.length).toBe(0, 'button should not have any focus classes');
@@ -202,7 +202,7 @@ describe('FocusOriginMonitor', () => {
 describe('cdkMonitorFocus', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [StyleModule],
+      imports: [A11yModule],
       declarations: [
         ButtonWithFocusClasses,
         ComplexComponentWithMonitorElementFocus,
diff --git a/src/lib/core/style/focus-origin-monitor.ts b/src/cdk/a11y/focus-monitor.ts
similarity index 93%
rename from src/lib/core/style/focus-origin-monitor.ts
rename to src/cdk/a11y/focus-monitor.ts
index 418777bec907..6ed78b200df3 100644
--- a/src/lib/core/style/focus-origin-monitor.ts
+++ b/src/cdk/a11y/focus-monitor.ts
@@ -18,10 +18,10 @@ import {
   Renderer2,
   SkipSelf,
 } from '@angular/core';
+import {Platform} from '@angular/cdk/platform';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {Platform} from '../platform/platform';
 import {of as observableOf} from 'rxjs/observable/of';
 
 
@@ -43,11 +43,11 @@ type MonitoredElementInfo = {
 
 /** Monitors mouse and keyboard events to determine the cause of focus events. */
 @Injectable()
-export class FocusOriginMonitor {
+export class FocusMonitor {
   /** The focus origin that the next focus event is a result of. */
   private _origin: FocusOrigin = null;
 
-  /** The FocusOrigin of the last focus event tracked by the FocusOriginMonitor. */
+  /** The FocusOrigin of the last focus event tracked by the FocusMonitor. */
   private _lastFocusOrigin: FocusOrigin;
 
   /** Whether the window has just been focused. */
@@ -320,30 +320,30 @@ export class CdkMonitorFocus implements OnDestroy {
   private _monitorSubscription: Subscription;
   @Output() cdkFocusChange = new EventEmitter<FocusOrigin>();
 
-  constructor(private _elementRef: ElementRef, private _focusOriginMonitor: FocusOriginMonitor,
+  constructor(private _elementRef: ElementRef, private _focusMonitor: FocusMonitor,
               renderer: Renderer2) {
-    this._monitorSubscription = this._focusOriginMonitor.monitor(
+    this._monitorSubscription = this._focusMonitor.monitor(
         this._elementRef.nativeElement, renderer,
         this._elementRef.nativeElement.hasAttribute('cdkMonitorSubtreeFocus'))
         .subscribe(origin => this.cdkFocusChange.emit(origin));
   }
 
   ngOnDestroy() {
-    this._focusOriginMonitor.stopMonitoring(this._elementRef.nativeElement);
+    this._focusMonitor.stopMonitoring(this._elementRef.nativeElement);
     this._monitorSubscription.unsubscribe();
   }
 }
 
 /** @docs-private */
-export function FOCUS_ORIGIN_MONITOR_PROVIDER_FACTORY(
-    parentDispatcher: FocusOriginMonitor, ngZone: NgZone, platform: Platform) {
-  return parentDispatcher || new FocusOriginMonitor(ngZone, platform);
+export function FOCUS_MONITOR_PROVIDER_FACTORY(
+    parentDispatcher: FocusMonitor, ngZone: NgZone, platform: Platform) {
+  return parentDispatcher || new FocusMonitor(ngZone, platform);
 }
 
 /** @docs-private */
-export const FOCUS_ORIGIN_MONITOR_PROVIDER = {
-  // If there is already a FocusOriginMonitor available, use that. Otherwise, provide a new one.
-  provide: FocusOriginMonitor,
-  deps: [[new Optional(), new SkipSelf(), FocusOriginMonitor], NgZone, Platform],
-  useFactory: FOCUS_ORIGIN_MONITOR_PROVIDER_FACTORY
+export const FOCUS_MONITOR_PROVIDER = {
+  // If there is already a FocusMonitor available, use that. Otherwise, provide a new one.
+  provide: FocusMonitor,
+  deps: [[new Optional(), new SkipSelf(), FocusMonitor], NgZone, Platform],
+  useFactory: FOCUS_MONITOR_PROVIDER_FACTORY
 };
diff --git a/src/cdk/a11y/public_api.ts b/src/cdk/a11y/public_api.ts
index 588e73a804c4..ddd32c71097d 100644
--- a/src/cdk/a11y/public_api.ts
+++ b/src/cdk/a11y/public_api.ts
@@ -13,17 +13,19 @@ import {InteractivityChecker} from './interactivity-checker';
 import {CommonModule} from '@angular/common';
 import {PlatformModule} from '@angular/cdk/platform';
 import {AriaDescriber, ARIA_DESCRIBER_PROVIDER} from './aria-describer';
+import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor';
 
 @NgModule({
   imports: [CommonModule, PlatformModule],
-  declarations: [FocusTrapDirective, FocusTrapDeprecatedDirective],
-  exports: [FocusTrapDirective, FocusTrapDeprecatedDirective],
+  declarations: [FocusTrapDirective, FocusTrapDeprecatedDirective, CdkMonitorFocus],
+  exports: [FocusTrapDirective, FocusTrapDeprecatedDirective, CdkMonitorFocus],
   providers: [
     InteractivityChecker,
     FocusTrapFactory,
     AriaDescriber,
     LIVE_ANNOUNCER_PROVIDER,
-    ARIA_DESCRIBER_PROVIDER
+    ARIA_DESCRIBER_PROVIDER,
+    FOCUS_MONITOR_PROVIDER,
   ]
 })
 export class A11yModule {}
@@ -36,3 +38,4 @@ export * from './focus-trap';
 export * from './interactivity-checker';
 export * from './list-key-manager';
 export * from './live-announcer';
+export * from './focus-monitor';
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 6f8341a5d88e..4d43f5711873 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -78,7 +78,7 @@ export class DemoApp {
     {name: 'Toolbar', route: '/toolbar'},
     {name: 'Tooltip', route: '/tooltip'},
     {name: 'Platform', route: '/platform'},
-    {name: 'Style', route: '/style'},
+    {name: 'Focus Origin', route: '/focus-origin'},
     {name: 'Typography', route: '/typography'}
   ];
 
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index 3d98a8f0efc8..59a632277ee1 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -34,7 +34,7 @@ import {FoggyTabContent, RainyTabContent, SunnyTabContent, TabsDemo} from '../ta
 import {PlatformDemo} from '../platform/platform-demo';
 import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
 import {InputDemo} from '../input/input-demo';
-import {StyleDemo} from '../style/style-demo';
+import {FocusOriginDemo} from '../focus-origin/focus-origin-demo';
 import {TableDemo} from '../table/table-demo';
 import {PeopleDatabase} from '../table/people-database';
 import {DatepickerDemo} from '../datepicker/datepicker-demo';
@@ -94,7 +94,7 @@ import {TableHeaderDemo} from '../table/table-header-demo';
     SlideToggleDemo,
     SpagettiPanel,
     StepperDemo,
-    StyleDemo,
+    FocusOriginDemo,
     TableHeaderDemo,
     ToolbarDemo,
     TooltipDemo,
diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts
index 1a0b5eb5a389..7ee134565fdb 100644
--- a/src/demo-app/demo-app/routes.ts
+++ b/src/demo-app/demo-app/routes.ts
@@ -31,7 +31,7 @@ import {TABS_DEMO_ROUTES} from '../tabs/routes';
 import {PlatformDemo} from '../platform/platform-demo';
 import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
 import {InputDemo} from '../input/input-demo';
-import {StyleDemo} from '../style/style-demo';
+import {FocusOriginDemo} from '../focus-origin/focus-origin-demo';
 import {DatepickerDemo} from '../datepicker/datepicker-demo';
 import {TableDemo} from '../table/table-demo';
 import {TypographyDemo} from '../typography/typography-demo';
@@ -76,7 +76,7 @@ export const DEMO_APP_ROUTES: Routes = [
     {path: 'tooltip', component: TooltipDemo},
     {path: 'snack-bar', component: SnackBarDemo},
     {path: 'platform', component: PlatformDemo},
-    {path: 'style', component: StyleDemo},
+    {path: 'focus-origin', component: FocusOriginDemo},
     {path: 'typography', component: TypographyDemo},
     {path: 'expansion', component: ExpansionDemo},
     {path: 'stepper', component: StepperDemo}
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index 58617586afec..1cf016b7a2dc 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -31,7 +31,7 @@ import {
   MdTooltipModule,
   MdStepperModule,
 } from '@angular/material';
-import {StyleModule, MdNativeDateModule, MdRippleModule} from '@angular/material';
+import {MdNativeDateModule, MdRippleModule} from '@angular/material';
 import {CdkTableModule} from '@angular/cdk/table';
 import {A11yModule} from '@angular/cdk/a11y';
 import {BidiModule} from '@angular/cdk/bidi';
@@ -78,7 +78,6 @@ import {PortalModule} from '@angular/cdk/portal';
     MdTooltipModule,
     MdNativeDateModule,
     CdkTableModule,
-    StyleModule,
     A11yModule,
     BidiModule,
     ObserversModule,
diff --git a/src/demo-app/style/style-demo.html b/src/demo-app/focus-origin/focus-origin-demo.html
similarity index 100%
rename from src/demo-app/style/style-demo.html
rename to src/demo-app/focus-origin/focus-origin-demo.html
diff --git a/src/demo-app/style/style-demo.scss b/src/demo-app/focus-origin/focus-origin-demo.scss
similarity index 100%
rename from src/demo-app/style/style-demo.scss
rename to src/demo-app/focus-origin/focus-origin-demo.scss
diff --git a/src/demo-app/focus-origin/focus-origin-demo.ts b/src/demo-app/focus-origin/focus-origin-demo.ts
new file mode 100644
index 000000000000..3af33dbbce2b
--- /dev/null
+++ b/src/demo-app/focus-origin/focus-origin-demo.ts
@@ -0,0 +1,13 @@
+import {Component} from '@angular/core';
+import {FocusMonitor} from '@angular/cdk/a11y';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'focus-origin-demo',
+  templateUrl: 'focus-origin-demo.html',
+  styleUrls: ['focus-origin-demo.css'],
+})
+export class FocusOriginDemo {
+  constructor(public fom: FocusMonitor) {}
+}
diff --git a/src/demo-app/style/style-demo.ts b/src/demo-app/style/style-demo.ts
deleted file mode 100644
index f66c1bded235..000000000000
--- a/src/demo-app/style/style-demo.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {Component} from '@angular/core';
-import {FocusOriginMonitor} from '@angular/material';
-
-
-@Component({
-  moduleId: module.id,
-  selector: 'style-demo',
-  templateUrl: 'style-demo.html',
-  styleUrls: ['style-demo.css'],
-})
-export class StyleDemo {
-  constructor(public fom: FocusOriginMonitor) {}
-}
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index 740867820918..a38023fedfa5 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -27,8 +27,9 @@ import {
 } from '@angular/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {UniqueSelectionDispatcher, FocusOriginMonitor} from '@angular/material/core';
+import {UniqueSelectionDispatcher} from '@angular/material/core';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
+import {FocusMonitor} from '@angular/cdk/a11y';
 
 /** Acceptable types for a button toggle. */
 export type ToggleType = 'checkbox' | 'radio';
@@ -371,7 +372,7 @@ export class MdButtonToggle implements OnInit, OnDestroy {
               private _buttonToggleDispatcher: UniqueSelectionDispatcher,
               private _renderer: Renderer2,
               private _elementRef: ElementRef,
-              private _focusOriginMonitor: FocusOriginMonitor) {
+              private _focusMonitor: FocusMonitor) {
 
     this.buttonToggleGroup = toggleGroup;
     this.buttonToggleGroupMultiple = toggleGroupMultiple;
@@ -404,7 +405,7 @@ export class MdButtonToggle implements OnInit, OnDestroy {
     if (this.buttonToggleGroup && this._value == this.buttonToggleGroup.value) {
       this._checked = true;
     }
-    this._focusOriginMonitor.monitor(this._elementRef.nativeElement, this._renderer, true);
+    this._focusMonitor.monitor(this._elementRef.nativeElement, this._renderer, true);
   }
 
   /** Focuses the button. */
diff --git a/src/lib/button-toggle/public_api.ts b/src/lib/button-toggle/public_api.ts
index 3b4ad6857692..f9660192a224 100644
--- a/src/lib/button-toggle/public_api.ts
+++ b/src/lib/button-toggle/public_api.ts
@@ -8,15 +8,12 @@
 
 import {NgModule} from '@angular/core';
 import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
-import {
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-  MdCommonModule,
-  StyleModule,
-} from '@angular/material/core';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MdCommonModule} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
 
 
 @NgModule({
-  imports: [MdCommonModule, StyleModule],
+  imports: [MdCommonModule, A11yModule],
   exports: [
     MdButtonToggleGroup,
     MdButtonToggleGroupMultiple,
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 1b69aa9f99f2..208a16f04d89 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -24,11 +24,11 @@ import {
   CanColor,
   CanDisable,
   CanDisableRipple,
-  FocusOriginMonitor,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple
 } from '@angular/material/core';
+import {FocusMonitor} from '@angular/cdk/a11y';
 
 
 // TODO(kara): Convert attribute selectors to classes when attr maps become available
@@ -142,13 +142,13 @@ export class MdButton extends _MdButtonMixinBase
   constructor(renderer: Renderer2,
               elementRef: ElementRef,
               private _platform: Platform,
-              private _focusOriginMonitor: FocusOriginMonitor) {
+              private _focusMonitor: FocusMonitor) {
     super(renderer, elementRef);
-    this._focusOriginMonitor.monitor(this._elementRef.nativeElement, this._renderer, true);
+    this._focusMonitor.monitor(this._elementRef.nativeElement, this._renderer, true);
   }
 
   ngOnDestroy() {
-    this._focusOriginMonitor.stopMonitoring(this._elementRef.nativeElement);
+    this._focusMonitor.stopMonitoring(this._elementRef.nativeElement);
   }
 
   /** Focuses the button. */
@@ -206,10 +206,10 @@ export class MdButton extends _MdButtonMixinBase
 export class MdAnchor extends MdButton {
   constructor(
       platform: Platform,
-      focusOriginMonitor: FocusOriginMonitor,
+      focusMonitor: FocusMonitor,
       elementRef: ElementRef,
       renderer: Renderer2) {
-    super(renderer, elementRef, platform, focusOriginMonitor);
+    super(renderer, elementRef, platform, focusMonitor);
   }
 
   _haltDisabledEvents(event: Event) {
diff --git a/src/lib/button/public_api.ts b/src/lib/button/public_api.ts
index 3cec824cd095..defe5b13cab2 100644
--- a/src/lib/button/public_api.ts
+++ b/src/lib/button/public_api.ts
@@ -8,7 +8,8 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule, MdRippleModule, StyleModule} from '@angular/material/core';
+import {MdCommonModule, MdRippleModule} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
 import {
   MdAnchor,
   MdButton,
@@ -28,7 +29,7 @@ export * from './button';
     CommonModule,
     MdRippleModule,
     MdCommonModule,
-    StyleModule,
+    A11yModule,
   ],
   exports: [
     MdButton,
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 3ad31b7abdae..c94975d72c76 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -27,14 +27,13 @@ import {
   CanColor,
   CanDisable,
   CanDisableRipple,
-  FocusOrigin,
-  FocusOriginMonitor,
   MdRipple,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
   RippleRef,
 } from '@angular/material/core';
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 
 // Increasing integer for generating unique ids for checkbox components.
@@ -199,18 +198,18 @@ export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAcce
   constructor(renderer: Renderer2,
               elementRef: ElementRef,
               private _changeDetectorRef: ChangeDetectorRef,
-              private _focusOriginMonitor: FocusOriginMonitor) {
+              private _focusMonitor: FocusMonitor) {
     super(renderer, elementRef);
   }
 
   ngAfterViewInit() {
-    this._focusOriginMonitor
+    this._focusMonitor
       .monitor(this._inputElement.nativeElement, this._renderer, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
   ngOnDestroy() {
-    this._focusOriginMonitor.stopMonitoring(this._inputElement.nativeElement);
+    this._focusMonitor.stopMonitoring(this._inputElement.nativeElement);
   }
 
   /**
@@ -385,7 +384,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAcce
 
   /** Focuses the checkbox. */
   focus(): void {
-    this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
+    this._focusMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
   }
 
   _onInteractionEvent(event: Event) {
diff --git a/src/lib/checkbox/public_api.ts b/src/lib/checkbox/public_api.ts
index 0b7668432b5c..b6b37dc67318 100644
--- a/src/lib/checkbox/public_api.ts
+++ b/src/lib/checkbox/public_api.ts
@@ -9,15 +9,15 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ObserversModule} from '@angular/cdk/observers';
-import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '@angular/material/core';
+import {MdRippleModule, MdCommonModule} from '@angular/material/core';
 import {MdCheckbox} from './checkbox';
 import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
+import {A11yModule} from '@angular/cdk/a11y';
 
 @NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule],
+  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule, A11yModule],
   exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
   declarations: [MdCheckbox, MdCheckboxRequiredValidator],
-  providers: [FocusOriginMonitor]
 })
 export class MdCheckboxModule {}
 
diff --git a/src/lib/core/style/index.ts b/src/lib/core/style/index.ts
index ef0610762e15..54ed99b4b68a 100644
--- a/src/lib/core/style/index.ts
+++ b/src/lib/core/style/index.ts
@@ -7,18 +7,19 @@
  */
 
 import {NgModule} from '@angular/core';
-import {CdkMonitorFocus, FOCUS_ORIGIN_MONITOR_PROVIDER} from './focus-origin-monitor';
-import {PlatformModule} from '../platform/index';
-
+import {A11yModule} from '@angular/cdk/a11y';
 
+/** @deprecated */
 @NgModule({
-  imports: [PlatformModule],
-  declarations: [CdkMonitorFocus],
-  exports: [CdkMonitorFocus],
-  providers: [FOCUS_ORIGIN_MONITOR_PROVIDER],
+  imports: [A11yModule],
+  exports: [A11yModule],
 })
 export class StyleModule {}
 
-
-export * from './focus-origin-monitor';
+export {
+  CdkMonitorFocus,
+  FocusMonitor,
+  FOCUS_MONITOR_PROVIDER,
+  FocusOrigin,
+} from '@angular/cdk/a11y';
 export * from './apply-transform';
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public_api.ts
index 825e9a14e1cd..176f930bba88 100644
--- a/src/lib/datepicker/public_api.ts
+++ b/src/lib/datepicker/public_api.ts
@@ -11,7 +11,6 @@ import {OverlayModule} from '@angular/cdk/overlay';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {MdButtonModule} from '@angular/material/button';
-import {StyleModule} from '@angular/material/core';
 import {MdDialogModule} from '@angular/material/dialog';
 import {MdIconModule} from '@angular/material/icon';
 import {MdCalendar} from './calendar';
@@ -45,7 +44,6 @@ export * from './year-view';
     MdDialogModule,
     MdIconModule,
     OverlayModule,
-    StyleModule,
     A11yModule,
   ],
   exports: [
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index d6657d751331..afdfad08d6af 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -28,7 +28,7 @@ import {
 import {SPACE, ENTER} from '@angular/material/core';
 import {MdExpansionPanel, EXPANSION_PANEL_ANIMATION_TIMING} from './expansion-panel';
 import {filter} from '@angular/material/core';
-import {FocusOriginMonitor} from '@angular/material/core';
+import {FocusMonitor} from '@angular/cdk/a11y';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
 
@@ -93,7 +93,7 @@ export class MdExpansionPanelHeader implements OnDestroy {
     renderer: Renderer2,
     @Host() public panel: MdExpansionPanel,
     private _element: ElementRef,
-    private _focusOriginMonitor: FocusOriginMonitor,
+    private _focusMonitor: FocusMonitor,
     private _changeDetectorRef: ChangeDetectorRef) {
 
     // Since the toggle state depends on an @Input on the panel, we
@@ -105,7 +105,7 @@ export class MdExpansionPanelHeader implements OnDestroy {
     )
     .subscribe(() => this._changeDetectorRef.markForCheck());
 
-    _focusOriginMonitor.monitor(_element.nativeElement, renderer, false);
+    _focusMonitor.monitor(_element.nativeElement, renderer, false);
   }
 
   /** Height of the header while the panel is expanded. */
@@ -157,7 +157,7 @@ export class MdExpansionPanelHeader implements OnDestroy {
 
   ngOnDestroy() {
     this._parentChangeSubscription.unsubscribe();
-    this._focusOriginMonitor.stopMonitoring(this._element.nativeElement);
+    this._focusMonitor.stopMonitoring(this._element.nativeElement);
   }
 }
 
diff --git a/src/lib/expansion/public_api.ts b/src/lib/expansion/public_api.ts
index aea8a512c2f0..6b8aace89ac7 100644
--- a/src/lib/expansion/public_api.ts
+++ b/src/lib/expansion/public_api.ts
@@ -8,11 +8,8 @@
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {
-  CompatibilityModule,
-  StyleModule,
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-} from '@angular/material/core';
+import {CompatibilityModule, UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
 import {CdkAccordion, MdAccordion} from './accordion';
 import {MdExpansionPanel, MdExpansionPanelActionRow} from './expansion-panel';
 import {
@@ -23,7 +20,7 @@ import {
 
 
 @NgModule({
-  imports: [CompatibilityModule, CommonModule, StyleModule],
+  imports: [CompatibilityModule, CommonModule, A11yModule],
   exports: [
     CdkAccordion,
     MdAccordion,
diff --git a/src/lib/radio/public_api.ts b/src/lib/radio/public_api.ts
index 2e9590b72913..d434c542fcb2 100644
--- a/src/lib/radio/public_api.ts
+++ b/src/lib/radio/public_api.ts
@@ -13,15 +13,14 @@ import {
   MdRippleModule,
   MdCommonModule,
   UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-  FocusOriginMonitor,
 } from '@angular/material/core';
 import {MdRadioGroup, MdRadioButton} from './radio';
-
+import {A11yModule} from '@angular/cdk/a11y';
 
 @NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule],
+  imports: [CommonModule, MdRippleModule, MdCommonModule, A11yModule],
   exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER, FocusOriginMonitor],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER],
   declarations: [MdRadioGroup, MdRadioButton],
 })
 export class MdRadioModule {}
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 229d800272e4..c30a1ddd848e 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -32,13 +32,12 @@ import {
   RippleRef,
   UniqueSelectionDispatcher,
   MdRipple,
-  FocusOriginMonitor,
-  FocusOrigin,
 } from '@angular/material/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {mixinDisabled, CanDisable} from '@angular/material/core';
 import {CanColor, mixinColor} from '@angular/material/core';
 import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for radio components.
 let nextUniqueId = 0;
@@ -489,7 +488,7 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
               elementRef: ElementRef,
               renderer: Renderer2,
               private _changeDetector: ChangeDetectorRef,
-              private _focusOriginMonitor: FocusOriginMonitor,
+              private _focusMonitor: FocusMonitor,
               private _radioDispatcher: UniqueSelectionDispatcher) {
     super(renderer, elementRef);
 
@@ -507,7 +506,7 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
 
   /** Focuses the radio button. */
   focus(): void {
-    this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
+    this._focusMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
   }
 
   /**
@@ -531,13 +530,13 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
   }
 
   ngAfterViewInit() {
-    this._focusOriginMonitor
+    this._focusMonitor
       .monitor(this._inputElement.nativeElement, this._renderer, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
   ngOnDestroy() {
-    this._focusOriginMonitor.stopMonitoring(this._inputElement.nativeElement);
+    this._focusMonitor.stopMonitoring(this._inputElement.nativeElement);
     this._removeUniqueSelectionListener();
   }
 
diff --git a/src/lib/slide-toggle/public_api.ts b/src/lib/slide-toggle/public_api.ts
index af02957e433a..9ad294e0f0d0 100644
--- a/src/lib/slide-toggle/public_api.ts
+++ b/src/lib/slide-toggle/public_api.ts
@@ -10,21 +10,20 @@ import {ObserversModule} from '@angular/cdk/observers';
 import {PlatformModule} from '@angular/cdk/platform';
 import {NgModule} from '@angular/core';
 import {
-  FOCUS_ORIGIN_MONITOR_PROVIDER,
   GestureConfig,
   MdCommonModule,
   MdRippleModule,
 } from '@angular/material/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {A11yModule} from '@angular/cdk/a11y';
 import {MdSlideToggle} from './slide-toggle';
 
 
 @NgModule({
-  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule],
+  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule, A11yModule],
   exports: [MdSlideToggle, MdCommonModule],
   declarations: [MdSlideToggle],
   providers: [
-    FOCUS_ORIGIN_MONITOR_PROVIDER,
     {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}
   ],
 })
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index cfdc881a01d5..d7b6b2b895c6 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -26,8 +26,6 @@ import {Platform} from '@angular/cdk/platform';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
   applyCssTransform,
-  FocusOrigin,
-  FocusOriginMonitor,
   HammerInput,
   MdRipple,
   RippleRef,
@@ -37,6 +35,7 @@ import {mixinDisabled, CanDisable} from '@angular/material/core';
 import {CanColor, mixinColor} from '@angular/material/core';
 import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 import {HasTabIndex, mixinTabIndex} from '@angular/material/core';
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for slide-toggle components.
 let nextUniqueId = 0;
@@ -137,7 +136,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
   constructor(elementRef: ElementRef,
               renderer: Renderer2,
               private _platform: Platform,
-              private _focusOriginMonitor: FocusOriginMonitor,
+              private _focusMonitor: FocusMonitor,
               private _changeDetectorRef: ChangeDetectorRef,
               @Attribute('tabindex') tabIndex: string) {
     super(renderer, elementRef);
@@ -148,13 +147,13 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
   ngAfterContentInit() {
     this._slideRenderer = new SlideToggleRenderer(this._elementRef, this._platform);
 
-    this._focusOriginMonitor
+    this._focusMonitor
       .monitor(this._inputElement.nativeElement, this._renderer, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
   ngOnDestroy() {
-    this._focusOriginMonitor.stopMonitoring(this._inputElement.nativeElement);
+    this._focusMonitor.stopMonitoring(this._inputElement.nativeElement);
   }
 
   /**
@@ -216,7 +215,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
 
   /** Focuses the slide-toggle. */
   focus() {
-    this._focusOriginMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
+    this._focusMonitor.focusVia(this._inputElement.nativeElement, 'keyboard');
   }
 
   /** Toggles the checked state of the slide-toggle. */
diff --git a/src/lib/slider/public_api.ts b/src/lib/slider/public_api.ts
index f7cc6fb8acd1..4af4cafbdd60 100644
--- a/src/lib/slider/public_api.ts
+++ b/src/lib/slider/public_api.ts
@@ -9,13 +9,14 @@
 import {NgModule} from '@angular/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule, GestureConfig, StyleModule} from '@angular/material/core';
+import {MdCommonModule, GestureConfig} from '@angular/material/core';
 import {MdSlider} from './slider';
 import {BidiModule} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
 
 
 @NgModule({
-  imports: [CommonModule, MdCommonModule, StyleModule, BidiModule],
+  imports: [CommonModule, MdCommonModule, BidiModule, A11yModule],
   exports: [MdSlider, MdCommonModule],
   declarations: [MdSlider],
   providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index a564ce51d447..0f78a906429d 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -38,12 +38,11 @@ import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {
   CanColor,
   CanDisable,
-  FocusOrigin,
-  FocusOriginMonitor,
   HammerInput,
   mixinColor,
   mixinDisabled,
 } from '@angular/material/core';
+import {FocusOrigin, FocusMonitor} from '@angular/cdk/a11y';
 import {Subscription} from 'rxjs/Subscription';
 
 /**
@@ -415,14 +414,14 @@ export class MdSlider extends _MdSliderMixinBase
 
   constructor(renderer: Renderer2,
               elementRef: ElementRef,
-              private _focusOriginMonitor: FocusOriginMonitor,
+              private _focusMonitor: FocusMonitor,
               private _changeDetectorRef: ChangeDetectorRef,
               @Optional() private _dir: Directionality) {
     super(renderer, elementRef);
   }
 
   ngOnInit() {
-    this._focusOriginMonitor
+    this._focusMonitor
         .monitor(this._elementRef.nativeElement, this._renderer, true)
         .subscribe((origin: FocusOrigin) => {
           this._isActive = !!origin && origin !== 'keyboard';
@@ -436,7 +435,7 @@ export class MdSlider extends _MdSliderMixinBase
   }
 
   ngOnDestroy() {
-    this._focusOriginMonitor.stopMonitoring(this._elementRef.nativeElement);
+    this._focusMonitor.stopMonitoring(this._elementRef.nativeElement);
     this._dirChangeSubscription.unsubscribe();
   }
 

From 95ab1eb2c7c46ed3da36a14fca85a7686c45baf6 Mon Sep 17 00:00:00 2001
From: Fady Samir Sadek <fadysamirsadek@live.com>
Date: Mon, 18 Sep 2017 19:33:28 +0200
Subject: [PATCH 108/575] fix(sidenav-fab-example): remove `overflow: auto`
 (#7099)

---
 src/material-examples/sidenav-fab/sidenav-fab-example.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.css b/src/material-examples/sidenav-fab/sidenav-fab-example.css
index a2f237c6049f..6d58f0f24b13 100644
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.css
+++ b/src/material-examples/sidenav-fab/sidenav-fab-example.css
@@ -16,6 +16,7 @@
 
 .example-scrolling-content {
   overflow: auto;
+  height: 100%;
 }
 
 .example-fab.mat-mini-fab {

From bdadbad7dd443ff0af7a1d34bcb48dfcf2f63a31 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 18 Sep 2017 20:11:01 +0200
Subject: [PATCH 109/575] chore(sort): fix invalid import path (#7148)

* Fixes an incorrect import inside of the sort entry-point of Material. Due to a relative import to the core entry-point, the prerender task fails to execute and the packaging doesn't work properly either.
---
 src/lib/sort/sort-header.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index 87a2e80e1080..de8d3628a01e 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -28,7 +28,7 @@ import {merge} from 'rxjs/observable/merge';
 import {MdSort, MdSortable} from './sort';
 import {MdSortHeaderIntl} from './sort-header-intl';
 import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
-import {AnimationCurves, AnimationDurations} from '../core/animation/animation';
+import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 
 const SORT_ANIMATION_TRANSITION =
     AnimationDurations.ENTERING + ' ' + AnimationCurves.STANDARD_CURVE;

From be8c303c9874271d6d9b2c11a9ddfbc89278e666 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 18 Sep 2017 14:35:03 -0700
Subject: [PATCH 110/575] =?UTF-8?q?Remove=20extra=20=F0=9F=8D=95=20in=20sn?=
 =?UTF-8?q?ackbar=20component=20example.=20(#7153)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../snack-bar-component/snack-bar-component-example-snack.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material-examples/snack-bar-component/snack-bar-component-example-snack.html b/src/material-examples/snack-bar-component/snack-bar-component-example-snack.html
index d43b91e9a961..cfba7c45391f 100644
--- a/src/material-examples/snack-bar-component/snack-bar-component-example-snack.html
+++ b/src/material-examples/snack-bar-component/snack-bar-component-example-snack.html
@@ -1,3 +1,3 @@
 <span class="example-pizza-party">
-  🍕🍕🍕🍕🍕 Pizza party!!! 🍕🍕🍕🍕🍕
+  Pizza party!!! 🍕
 </span>

From 244c906f90a44e2516259f02cf9d46224b0ed8e6 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 18 Sep 2017 14:53:59 -0700
Subject: [PATCH 111/575] chore: update expansion-panel status in readme
 (#7151)

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 838c2238314d..44e1ab75a379 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 This is the home for the Angular team's Material Design components built for and with Angular.
 
 #### Quick links
-[Documentation, demos, and guides][aio] | 
+[Documentation, demos, and guides][aio] |
 [Google group](https://groups.google.com/forum/#!forum/angular-material2) |
 [Contributing](https://github.com/angular/material2/blob/master/CONTRIBUTING.md) |
 [Plunker Template](http://plnkr.co/edit/o077B6uEiiIgkC0S06dd?p=preview)
@@ -55,7 +55,7 @@ High level stuff planned for Q3 2017 (July - September):
 | data-table       | Sticky headers & incremental row rendering in-progress |   [Docs][28] |
 | datepicker       |                                                        |   [Docs][25] |
 | dialog           |                                                        |   [Docs][22] |
-| expansion-panel  |                                    Needs documentation |           -  |
+| expansion-panel  |                                                        |   [Docs][32] |
 | grid-list        |                                                        |   [Docs][9]  |
 | icon             |                                                        |   [Docs][10] |
 | input            |                                                        |   [Docs][5]  |
@@ -76,7 +76,7 @@ High level stuff planned for Q3 2017 (July - September):
 | textarea         |                                                        |   [Docs][5]  |
 | toolbar          |                                                        |   [Docs][7]  |
 | tooltip          |                                                        |   [Docs][18] |
-| ---------------- | ------------------------------------------------------ | ------------ | 
+| ---------------- | ------------------------------------------------------ | ------------ |
 | theming          |                                                        |  [Guide][20] |
 | typography       |                                                        |  [Guide][27] |
 | layout           |                      See [angular/flex-layout][lay_rp] |  [Wiki][0]   |
@@ -128,6 +128,7 @@ High level stuff planned for Q3 2017 (July - September):
 [29]: https://material.angular.io/components/component/paginator
 [30]: https://material.angular.io/components/component/sort
 [31]: https://tina-material-tree.firebaseapp.com/simple-tree
+[32]: https://material.angular.io/components/expansion/overview
 
 [0107]: https://github.com/angular/material2/issues/107
 [0119]: https://github.com/angular/material2/issues/119

From dcf3b270746096c1ba3bd4eb7230b920e4c42a60 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 19 Sep 2017 21:21:50 +0200
Subject: [PATCH 112/575] fix(tooltip): error on trigger escape presses while
 closed (#7028)

Fixes an error being thrown when pressing escape on a tooltip trigger that isn't showing a tooltip.

Fixes #7009.
---
 src/lib/tooltip/tooltip.spec.ts | 10 +++++++++-
 src/lib/tooltip/tooltip.ts      |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index d05fd3e983e4..1ab5abae667d 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -19,7 +19,8 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {OverlayContainer, OverlayModule, Scrollable} from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
-import {dispatchFakeEvent} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
+import {ESCAPE} from '@angular/cdk/keycodes';
 import {
   MdTooltip,
   MdTooltipModule,
@@ -469,6 +470,13 @@ describe('MdTooltip', () => {
       expect(overlayContainerElement.textContent).toContain(initialTooltipMessage);
     }));
 
+    it('should not throw when pressing ESCAPE', fakeAsync(() => {
+      expect(() => {
+        dispatchKeyboardEvent(buttonElement, 'keydown', ESCAPE);
+        fixture.detectChanges();
+      }).not.toThrow();
+    }));
+
   });
 
   describe('scrollable usage', () => {
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 49aaabfbb9d8..d9fab238996e 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -270,7 +270,7 @@ export class MdTooltip implements OnDestroy {
 
   /** Handles the keydown events on the host element. */
   _handleKeydown(e: KeyboardEvent) {
-    if (this._tooltipInstance!.isVisible() && e.keyCode === ESCAPE) {
+    if (this._isTooltipVisible() && e.keyCode === ESCAPE) {
       e.stopPropagation();
       this.hide(0);
     }

From 0e4806b06c31c4968cd23a16f73bdcee8fe44cde Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 20 Sep 2017 15:49:06 -0700
Subject: [PATCH 113/575] chore: move mat re-exports to package where their
 metadata lives (#7193)

This also required creating a module file for every component because
the max re-export can't be in the same file as the module definition or
else ngc will *only* export the alias.
---
 src/lib/autocomplete/autocomplete-module.ts   |  25 +
 src/lib/autocomplete/mat-exports.ts           |  27 +
 src/lib/autocomplete/public_api.ts            |  21 +-
 src/lib/button-toggle/button-toggle-module.ts |  26 +
 src/lib/button-toggle/mat-exports.ts          |  26 +
 src/lib/button-toggle/public_api.ts           |  22 +-
 src/lib/button/button-module.ts               |  51 ++
 src/lib/button/mat-exports.ts                 |  29 +
 src/lib/button/public_api.ts                  |  47 +-
 src/lib/card/card-module.ts                   |  54 ++
 src/lib/card/mat-exports.ts                   |  42 ++
 src/lib/card/public_api.ts                    |  50 +-
 src/lib/checkbox/checkbox-module.ts           |  22 +
 src/lib/checkbox/mat-exports.ts               |  28 +
 src/lib/checkbox/public_api.ts                |  18 +-
 src/lib/chips/chips-module.ts                 |  20 +
 src/lib/chips/mat-exports.ts                  |  24 +
 src/lib/chips/public_api.ts                   |  14 +-
 src/lib/core/mat-exports.ts                   |  49 ++
 src/lib/core/public_api.ts                    |   1 +
 src/lib/datepicker/datepicker-module.ts       |  67 +++
 src/lib/datepicker/mat-exports.ts             |  48 ++
 src/lib/datepicker/public_api.ts              |  63 +--
 src/lib/dialog/dialog-module.ts               |  54 ++
 src/lib/dialog/mat-exports.ts                 |  40 ++
 src/lib/dialog/public_api.ts                  |  49 +-
 src/lib/expansion/expansion-module.ts         |  44 ++
 src/lib/expansion/mat-exports.ts              |  31 ++
 src/lib/expansion/public_api.ts               |  39 +-
 src/lib/form-field/form-field-module.ts       |  42 ++
 src/lib/form-field/mat-exports.ts             |  28 +
 src/lib/form-field/public_api.ts              |  39 +-
 src/lib/grid-list/grid-list-module.ts         |  39 ++
 src/lib/grid-list/mat-exports.ts              |  16 +
 src/lib/grid-list/public_api.ts               |  35 +-
 src/lib/icon/icon-module.ts                   |  21 +
 src/lib/icon/mat-exports.ts                   |  17 +
 src/lib/icon/public_api.ts                    |  17 +-
 src/lib/input/input-module.ts                 |  35 ++
 src/lib/input/mat-exports.ts                  |  16 +
 src/lib/input/public_api.ts                   |  30 +-
 src/lib/list/list-module.ts                   |  63 +++
 src/lib/list/mat-exports.ts                   |  48 ++
 src/lib/list/public_api.ts                    |  59 +-
 src/lib/mat-exports.ts                        | 527 ------------------
 src/lib/menu/mat-exports.ts                   |  26 +
 src/lib/menu/menu-module.ts                   |  40 ++
 src/lib/menu/public_api.ts                    |  36 +-
 src/lib/paginator/mat-exports.ts              |  16 +
 src/lib/paginator/paginator-module.ts         |  29 +
 src/lib/paginator/public_api.ts               |  25 +-
 src/lib/progress-bar/mat-exports.ts           |  14 +
 src/lib/progress-bar/progress-bar-module.ts   |  20 +
 src/lib/progress-bar/public_api.ts            |  16 +-
 src/lib/progress-spinner/mat-exports.ts       |  22 +
 .../progress-spinner-module.ts                |  32 ++
 src/lib/progress-spinner/public_api.ts        |  28 +-
 src/lib/public_api.ts                         |   9 -
 src/lib/radio/mat-exports.ts                  |  26 +
 src/lib/radio/public_api.ts                   |  22 +-
 src/lib/radio/radio-module.ts                 |  26 +
 src/lib/select/mat-exports.ts                 |  28 +
 src/lib/select/public_api.ts                  |  23 +-
 src/lib/select/select-module.ts               |  27 +
 src/lib/sidenav/mat-exports.ts                |  19 +
 src/lib/sidenav/public_api.ts                 |  19 +-
 src/lib/sidenav/sidenav-module.ts             |  23 +
 src/lib/slide-toggle/mat-exports.ts           |  22 +
 src/lib/slide-toggle/public_api.ts            |  26 +-
 src/lib/slide-toggle/slide-toggle-module.ts   |  30 +
 src/lib/slider/mat-exports.ts                 |  22 +
 src/lib/slider/public_api.ts                  |  20 +-
 src/lib/slider/slider-module.ts               |  24 +
 src/lib/snack-bar/mat-exports.ts              |  21 +
 src/lib/snack-bar/public_api.ts               |  28 +-
 src/lib/snack-bar/snack-bar-module.ts         |  32 ++
 src/lib/sort/mat-exports.ts                   |  19 +
 src/lib/sort/public_api.ts                    |  16 +-
 src/lib/sort/sort-module.ts                   |  22 +
 src/lib/stepper/mat-exports.ts                |  29 +
 src/lib/stepper/public_api.ts                 |  40 +-
 src/lib/stepper/stepper-module.ts             |  45 ++
 src/lib/table/mat-exports.ts                  |  23 +
 src/lib/table/public_api.ts                   |  23 +-
 src/lib/table/table-module.ts                 |  28 +
 src/lib/tabs/mat-exports.ts                   |  34 ++
 src/lib/tabs/public_api.ts                    |  52 +-
 src/lib/tabs/tabs-module.ts                   |  56 ++
 src/lib/toolbar/mat-exports.ts                |  16 +
 src/lib/toolbar/public_api.ts                 |  15 +-
 src/lib/toolbar/toolbar-module.ts             |  19 +
 src/lib/tooltip/mat-exports.ts                |  23 +
 src/lib/tooltip/public_api.ts                 |  27 +-
 src/lib/tooltip/tooltip-module.ts             |  31 ++
 tools/package-tools/secondary-entry-points.ts |   2 +-
 95 files changed, 1938 insertions(+), 1396 deletions(-)
 create mode 100644 src/lib/autocomplete/autocomplete-module.ts
 create mode 100644 src/lib/autocomplete/mat-exports.ts
 create mode 100644 src/lib/button-toggle/button-toggle-module.ts
 create mode 100644 src/lib/button-toggle/mat-exports.ts
 create mode 100644 src/lib/button/button-module.ts
 create mode 100644 src/lib/button/mat-exports.ts
 create mode 100644 src/lib/card/card-module.ts
 create mode 100644 src/lib/card/mat-exports.ts
 create mode 100644 src/lib/checkbox/checkbox-module.ts
 create mode 100644 src/lib/checkbox/mat-exports.ts
 create mode 100644 src/lib/chips/chips-module.ts
 create mode 100644 src/lib/chips/mat-exports.ts
 create mode 100644 src/lib/core/mat-exports.ts
 create mode 100644 src/lib/datepicker/datepicker-module.ts
 create mode 100644 src/lib/datepicker/mat-exports.ts
 create mode 100644 src/lib/dialog/dialog-module.ts
 create mode 100644 src/lib/dialog/mat-exports.ts
 create mode 100644 src/lib/expansion/expansion-module.ts
 create mode 100644 src/lib/expansion/mat-exports.ts
 create mode 100644 src/lib/form-field/form-field-module.ts
 create mode 100644 src/lib/form-field/mat-exports.ts
 create mode 100644 src/lib/grid-list/grid-list-module.ts
 create mode 100644 src/lib/grid-list/mat-exports.ts
 create mode 100644 src/lib/icon/icon-module.ts
 create mode 100644 src/lib/icon/mat-exports.ts
 create mode 100644 src/lib/input/input-module.ts
 create mode 100644 src/lib/input/mat-exports.ts
 create mode 100644 src/lib/list/list-module.ts
 create mode 100644 src/lib/list/mat-exports.ts
 delete mode 100644 src/lib/mat-exports.ts
 create mode 100644 src/lib/menu/mat-exports.ts
 create mode 100644 src/lib/menu/menu-module.ts
 create mode 100644 src/lib/paginator/mat-exports.ts
 create mode 100644 src/lib/paginator/paginator-module.ts
 create mode 100644 src/lib/progress-bar/mat-exports.ts
 create mode 100644 src/lib/progress-bar/progress-bar-module.ts
 create mode 100644 src/lib/progress-spinner/mat-exports.ts
 create mode 100644 src/lib/progress-spinner/progress-spinner-module.ts
 create mode 100644 src/lib/radio/mat-exports.ts
 create mode 100644 src/lib/radio/radio-module.ts
 create mode 100644 src/lib/select/mat-exports.ts
 create mode 100644 src/lib/select/select-module.ts
 create mode 100644 src/lib/sidenav/mat-exports.ts
 create mode 100644 src/lib/sidenav/sidenav-module.ts
 create mode 100644 src/lib/slide-toggle/mat-exports.ts
 create mode 100644 src/lib/slide-toggle/slide-toggle-module.ts
 create mode 100644 src/lib/slider/mat-exports.ts
 create mode 100644 src/lib/slider/slider-module.ts
 create mode 100644 src/lib/snack-bar/mat-exports.ts
 create mode 100644 src/lib/snack-bar/snack-bar-module.ts
 create mode 100644 src/lib/sort/mat-exports.ts
 create mode 100644 src/lib/sort/sort-module.ts
 create mode 100644 src/lib/stepper/mat-exports.ts
 create mode 100644 src/lib/stepper/stepper-module.ts
 create mode 100644 src/lib/table/mat-exports.ts
 create mode 100644 src/lib/table/table-module.ts
 create mode 100644 src/lib/tabs/mat-exports.ts
 create mode 100644 src/lib/tabs/tabs-module.ts
 create mode 100644 src/lib/toolbar/mat-exports.ts
 create mode 100644 src/lib/toolbar/toolbar-module.ts
 create mode 100644 src/lib/tooltip/mat-exports.ts
 create mode 100644 src/lib/tooltip/tooltip-module.ts

diff --git a/src/lib/autocomplete/autocomplete-module.ts b/src/lib/autocomplete/autocomplete-module.ts
new file mode 100644
index 000000000000..4fbc35f2f31b
--- /dev/null
+++ b/src/lib/autocomplete/autocomplete-module.ts
@@ -0,0 +1,25 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {MdOptionModule, MdCommonModule} from '@angular/material/core';
+import {MdAutocomplete} from './autocomplete';
+import {
+  MdAutocompleteTrigger,
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
+} from './autocomplete-trigger';
+
+@NgModule({
+  imports: [MdOptionModule, OverlayModule, MdCommonModule, CommonModule],
+  exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
+  declarations: [MdAutocomplete, MdAutocompleteTrigger],
+  providers: [MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
+})
+export class MdAutocompleteModule {}
diff --git a/src/lib/autocomplete/mat-exports.ts b/src/lib/autocomplete/mat-exports.ts
new file mode 100644
index 000000000000..adf1f587a717
--- /dev/null
+++ b/src/lib/autocomplete/mat-exports.ts
@@ -0,0 +1,27 @@
+/**
+ * @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 {MdAutocomplete} from './autocomplete';
+import {MdAutocompleteModule} from './autocomplete-module';
+import {
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY,
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
+  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MD_AUTOCOMPLETE_VALUE_ACCESSOR,
+  MdAutocompleteTrigger,
+} from './autocomplete-trigger';
+
+
+/* tslint:disable:max-line-length */
+export {MD_AUTOCOMPLETE_SCROLL_STRATEGY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY};
+export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER};
+export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MD_AUTOCOMPLETE_VALUE_ACCESSOR as MAT_AUTOCOMPLETE_VALUE_ACCESSOR};
+export {MdAutocomplete as MatAutocomplete};
+export {MdAutocompleteModule as MatAutocompleteModule};
+export {MdAutocompleteTrigger as MatAutocompleteTrigger};
diff --git a/src/lib/autocomplete/public_api.ts b/src/lib/autocomplete/public_api.ts
index 0f672a71b641..ce1e1dfacde8 100644
--- a/src/lib/autocomplete/public_api.ts
+++ b/src/lib/autocomplete/public_api.ts
@@ -6,24 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {MdOptionModule, MdCommonModule} from '@angular/material/core';
-import {MdAutocomplete} from './autocomplete';
-import {
-  MdAutocompleteTrigger,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
-} from './autocomplete-trigger';
-
-@NgModule({
-  imports: [MdOptionModule, OverlayModule, MdCommonModule, CommonModule],
-  exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
-  declarations: [MdAutocomplete, MdAutocompleteTrigger],
-  providers: [MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
-})
-export class MdAutocompleteModule {}
-
-
 export * from './autocomplete';
+export * from './autocomplete-module';
 export * from './autocomplete-trigger';
+export * from './mat-exports';
diff --git a/src/lib/button-toggle/button-toggle-module.ts b/src/lib/button-toggle/button-toggle-module.ts
new file mode 100644
index 000000000000..e14857e5b6a2
--- /dev/null
+++ b/src/lib/button-toggle/button-toggle-module.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MdCommonModule} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
+
+
+@NgModule({
+  imports: [MdCommonModule, A11yModule],
+  exports: [
+    MdButtonToggleGroup,
+    MdButtonToggleGroupMultiple,
+    MdButtonToggle,
+    MdCommonModule,
+  ],
+  declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
+})
+export class MdButtonToggleModule {}
diff --git a/src/lib/button-toggle/mat-exports.ts b/src/lib/button-toggle/mat-exports.ts
new file mode 100644
index 000000000000..cc90bd8db34c
--- /dev/null
+++ b/src/lib/button-toggle/mat-exports.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {
+  MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR,
+  MdButtonToggle,
+  MdButtonToggleChange,
+  MdButtonToggleGroup,
+  MdButtonToggleGroupBase,
+  MdButtonToggleGroupMultiple,
+} from './button-toggle';
+import {MdButtonToggleModule} from './button-toggle-module';
+
+
+export {MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR};
+export {MdButtonToggle as MatButtonToggle};
+export {MdButtonToggleChange as MatButtonToggleChange};
+export {MdButtonToggleGroup as MatButtonToggleGroup};
+export {MdButtonToggleGroupBase as MatButtonToggleGroupBase};
+export {MdButtonToggleGroupMultiple as MatButtonToggleGroupMultiple};
+export {MdButtonToggleModule as MatButtonToggleModule};
diff --git a/src/lib/button-toggle/public_api.ts b/src/lib/button-toggle/public_api.ts
index f9660192a224..22b48b8b9e18 100644
--- a/src/lib/button-toggle/public_api.ts
+++ b/src/lib/button-toggle/public_api.ts
@@ -6,24 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
-import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MdCommonModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
-
-
-@NgModule({
-  imports: [MdCommonModule, A11yModule],
-  exports: [
-    MdButtonToggleGroup,
-    MdButtonToggleGroupMultiple,
-    MdButtonToggle,
-    MdCommonModule,
-  ],
-  declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
-})
-export class MdButtonToggleModule {}
-
-
 export * from './button-toggle';
+export * from './button-toggle-module';
+export * from './mat-exports';
diff --git a/src/lib/button/button-module.ts b/src/lib/button/button-module.ts
new file mode 100644
index 000000000000..c32e3fa71ace
--- /dev/null
+++ b/src/lib/button/button-module.ts
@@ -0,0 +1,51 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule, MdRippleModule} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
+import {
+  MdAnchor,
+  MdButton,
+  MdMiniFab,
+  MdButtonCssMatStyler,
+  MdFab,
+  MdIconButtonCssMatStyler,
+  MdRaisedButtonCssMatStyler
+} from './button';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdRippleModule,
+    MdCommonModule,
+    A11yModule,
+  ],
+  exports: [
+    MdButton,
+    MdAnchor,
+    MdMiniFab,
+    MdFab,
+    MdCommonModule,
+    MdButtonCssMatStyler,
+    MdRaisedButtonCssMatStyler,
+    MdIconButtonCssMatStyler,
+  ],
+  declarations: [
+    MdButton,
+    MdAnchor,
+    MdMiniFab,
+    MdFab,
+    MdButtonCssMatStyler,
+    MdRaisedButtonCssMatStyler,
+    MdIconButtonCssMatStyler,
+  ],
+})
+export class MdButtonModule {}
diff --git a/src/lib/button/mat-exports.ts b/src/lib/button/mat-exports.ts
new file mode 100644
index 000000000000..61e08fd808dd
--- /dev/null
+++ b/src/lib/button/mat-exports.ts
@@ -0,0 +1,29 @@
+/**
+ * @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 {
+  MdAnchor,
+  MdButton,
+  MdButtonBase,
+  MdButtonCssMatStyler,
+  MdFab,
+  MdIconButtonCssMatStyler,
+  MdMiniFab,
+  MdRaisedButtonCssMatStyler,
+} from './button';
+import {MdButtonModule} from './button-module';
+
+export {MdButton as MatButton};
+export {MdButtonBase as MatButtonBase};
+export {MdButtonCssMatStyler as MatButtonCssMatStyler};
+export {MdButtonModule as MatButtonModule};
+export {MdAnchor as MatAnchor};
+export {MdIconButtonCssMatStyler as MatIconButtonCssMatStyler};
+export {MdFab as MatFab};
+export {MdMiniFab as MatMiniFab};
+export {MdRaisedButtonCssMatStyler as MatRaisedButtonCssMatStyler};
diff --git a/src/lib/button/public_api.ts b/src/lib/button/public_api.ts
index defe5b13cab2..7867a26b0db3 100644
--- a/src/lib/button/public_api.ts
+++ b/src/lib/button/public_api.ts
@@ -6,49 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule, MdRippleModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
-import {
-  MdAnchor,
-  MdButton,
-  MdMiniFab,
-  MdButtonCssMatStyler,
-  MdFab,
-  MdIconButtonCssMatStyler,
-  MdRaisedButtonCssMatStyler
-} from './button';
-
-
+export * from './button-module';
 export * from './button';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdRippleModule,
-    MdCommonModule,
-    A11yModule,
-  ],
-  exports: [
-    MdButton,
-    MdAnchor,
-    MdMiniFab,
-    MdFab,
-    MdCommonModule,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
-  ],
-  declarations: [
-    MdButton,
-    MdAnchor,
-    MdMiniFab,
-    MdFab,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
-  ],
-})
-export class MdButtonModule {}
+export * from './mat-exports';
diff --git a/src/lib/card/card-module.ts b/src/lib/card/card-module.ts
new file mode 100644
index 000000000000..3843333c7fd5
--- /dev/null
+++ b/src/lib/card/card-module.ts
@@ -0,0 +1,54 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {
+  MdCard,
+  MdCardHeader,
+  MdCardTitleGroup,
+  MdCardContent,
+  MdCardTitle,
+  MdCardSubtitle,
+  MdCardActions,
+  MdCardFooter,
+  MdCardSmImage,
+  MdCardMdImage,
+  MdCardLgImage,
+  MdCardImage,
+  MdCardXlImage,
+  MdCardAvatar,
+} from './card';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [
+    MdCard,
+    MdCardHeader,
+    MdCardTitleGroup,
+    MdCardContent,
+    MdCardTitle,
+    MdCardSubtitle,
+    MdCardActions,
+    MdCardFooter,
+    MdCardSmImage,
+    MdCardMdImage,
+    MdCardLgImage,
+    MdCardImage,
+    MdCardXlImage,
+    MdCardAvatar,
+    MdCommonModule,
+  ],
+  declarations: [
+    MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
+    MdCardActions, MdCardFooter, MdCardSmImage, MdCardMdImage, MdCardLgImage, MdCardImage,
+    MdCardXlImage, MdCardAvatar,
+  ],
+})
+export class MdCardModule {}
diff --git a/src/lib/card/mat-exports.ts b/src/lib/card/mat-exports.ts
new file mode 100644
index 000000000000..d4b22e577da0
--- /dev/null
+++ b/src/lib/card/mat-exports.ts
@@ -0,0 +1,42 @@
+/**
+ * @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 {
+  MdCard,
+  MdCardActions,
+  MdCardAvatar,
+  MdCardContent,
+  MdCardFooter,
+  MdCardHeader,
+  MdCardImage,
+  MdCardLgImage,
+  MdCardMdImage,
+  MdCardSmImage,
+  MdCardSubtitle,
+  MdCardTitle,
+  MdCardTitleGroup,
+  MdCardXlImage,
+} from './card';
+import {MdCardModule} from './card-module';
+
+
+export {MdCard as MatCard};
+export {MdCardActions as MatCardActions};
+export {MdCardAvatar as MatCardAvatar};
+export {MdCardContent as MatCardContent};
+export {MdCardFooter as MatCardFooter};
+export {MdCardHeader as MatCardHeader};
+export {MdCardImage as MatCardImage};
+export {MdCardLgImage as MatCardLgImage};
+export {MdCardMdImage as MatCardMatImage};
+export {MdCardModule as MatCardModule};
+export {MdCardSmImage as MatCardSmImage};
+export {MdCardSubtitle as MatCardSubtitle};
+export {MdCardTitle as MatCardTitle};
+export {MdCardTitleGroup as MatCardTitleGroup};
+export {MdCardXlImage as MatCardXlImage};
diff --git a/src/lib/card/public_api.ts b/src/lib/card/public_api.ts
index 986e21c4b3b0..863f34d9a5c7 100644
--- a/src/lib/card/public_api.ts
+++ b/src/lib/card/public_api.ts
@@ -6,52 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {
-  MdCard,
-  MdCardHeader,
-  MdCardTitleGroup,
-  MdCardContent,
-  MdCardTitle,
-  MdCardSubtitle,
-  MdCardActions,
-  MdCardFooter,
-  MdCardSmImage,
-  MdCardMdImage,
-  MdCardLgImage,
-  MdCardImage,
-  MdCardXlImage,
-  MdCardAvatar,
-} from './card';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [
-    MdCard,
-    MdCardHeader,
-    MdCardTitleGroup,
-    MdCardContent,
-    MdCardTitle,
-    MdCardSubtitle,
-    MdCardActions,
-    MdCardFooter,
-    MdCardSmImage,
-    MdCardMdImage,
-    MdCardLgImage,
-    MdCardImage,
-    MdCardXlImage,
-    MdCardAvatar,
-    MdCommonModule,
-  ],
-  declarations: [
-    MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
-    MdCardActions, MdCardFooter, MdCardSmImage, MdCardMdImage, MdCardLgImage, MdCardImage,
-    MdCardXlImage, MdCardAvatar,
-  ],
-})
-export class MdCardModule {}
-
-
 export * from './card';
+export * from './card-module';
+export * from './mat-exports';
diff --git a/src/lib/checkbox/checkbox-module.ts b/src/lib/checkbox/checkbox-module.ts
new file mode 100644
index 000000000000..49ff7562c8e0
--- /dev/null
+++ b/src/lib/checkbox/checkbox-module.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {ObserversModule} from '@angular/cdk/observers';
+import {MdRippleModule, MdCommonModule} from '@angular/material/core';
+import {MdCheckbox} from './checkbox';
+import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
+import {A11yModule} from '@angular/cdk/a11y';
+
+@NgModule({
+  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule, A11yModule],
+  exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
+  declarations: [MdCheckbox, MdCheckboxRequiredValidator],
+})
+export class MdCheckboxModule {}
diff --git a/src/lib/checkbox/mat-exports.ts b/src/lib/checkbox/mat-exports.ts
new file mode 100644
index 000000000000..6b3089901f56
--- /dev/null
+++ b/src/lib/checkbox/mat-exports.ts
@@ -0,0 +1,28 @@
+/**
+ * @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 {
+  MD_CHECKBOX_CONTROL_VALUE_ACCESSOR,
+  MdCheckbox,
+  MdCheckboxBase,
+  MdCheckboxChange,
+} from './checkbox';
+import {MdCheckboxModule} from './checkbox-module';
+import {
+  MD_CHECKBOX_REQUIRED_VALIDATOR,
+  MdCheckboxRequiredValidator,
+} from './checkbox-required-validator';
+
+
+export {MD_CHECKBOX_CONTROL_VALUE_ACCESSOR as MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR};
+export {MD_CHECKBOX_REQUIRED_VALIDATOR as MAT_CHECKBOX_REQUIRED_VALIDATOR};
+export {MdCheckbox as MatCheckbox};
+export {MdCheckboxBase as MatCheckboxBase};
+export {MdCheckboxChange as MatCheckboxChange};
+export {MdCheckboxModule as MatCheckboxModule};
+export {MdCheckboxRequiredValidator as MatCheckboxRequiredValidator};
diff --git a/src/lib/checkbox/public_api.ts b/src/lib/checkbox/public_api.ts
index b6b37dc67318..7a6132ac2ed2 100644
--- a/src/lib/checkbox/public_api.ts
+++ b/src/lib/checkbox/public_api.ts
@@ -6,21 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {ObserversModule} from '@angular/cdk/observers';
-import {MdRippleModule, MdCommonModule} from '@angular/material/core';
-import {MdCheckbox} from './checkbox';
-import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
-import {A11yModule} from '@angular/cdk/a11y';
-
-@NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule, A11yModule],
-  exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
-  declarations: [MdCheckbox, MdCheckboxRequiredValidator],
-})
-export class MdCheckboxModule {}
-
-
 export * from './checkbox';
+export * from './checkbox-module';
 export * from './checkbox-required-validator';
+export * from './mat-exports';
diff --git a/src/lib/chips/chips-module.ts b/src/lib/chips/chips-module.ts
new file mode 100644
index 000000000000..b87aac229dc8
--- /dev/null
+++ b/src/lib/chips/chips-module.ts
@@ -0,0 +1,20 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdChipList} from './chip-list';
+import {MdBasicChip, MdChip, MdChipRemove} from './chip';
+import {MdChipInput} from './chip-input';
+
+
+@NgModule({
+  imports: [],
+  exports: [MdChipList, MdChip, MdChipInput, MdChipRemove, MdChipRemove, MdBasicChip],
+  declarations: [MdChipList, MdChip, MdChipInput, MdChipRemove,  MdChipRemove, MdBasicChip]
+})
+export class MdChipsModule {}
diff --git a/src/lib/chips/mat-exports.ts b/src/lib/chips/mat-exports.ts
new file mode 100644
index 000000000000..73ccd86cd58f
--- /dev/null
+++ b/src/lib/chips/mat-exports.ts
@@ -0,0 +1,24 @@
+/**
+ * @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 {MdBasicChip, MdChip, MdChipBase, MdChipEvent, MdChipRemove} from './chip';
+import {MdChipInput, MdChipInputEvent} from './chip-input';
+import {MdChipList, MdChipListChange} from './chip-list';
+import {MdChipsModule} from './chips-module';
+
+
+export {MdBasicChip as MatBasicChip};
+export {MdChip as MatChip};
+export {MdChipBase as MatChipBase};
+export {MdChipEvent as MatChipEvent};
+export {MdChipInput as MatChipInput};
+export {MdChipInputEvent as MatChipInputEvent};
+export {MdChipListChange as MatChipListChange};
+export {MdChipList as MatChipList};
+export {MdChipRemove as MatChipRemove};
+export {MdChipsModule as MatChipsModule};
diff --git a/src/lib/chips/public_api.ts b/src/lib/chips/public_api.ts
index 7a3485835088..d7a19a1e5240 100644
--- a/src/lib/chips/public_api.ts
+++ b/src/lib/chips/public_api.ts
@@ -6,18 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdChipList} from './chip-list';
-import {MdBasicChip, MdChip, MdChipRemove} from './chip';
-import {MdChipInput} from './chip-input';
-
+export * from './chips-module';
 export * from './chip-list';
 export * from './chip';
 export * from './chip-input';
-
-@NgModule({
-  imports: [],
-  exports: [MdChipList, MdChip, MdChipInput, MdChipRemove, MdChipRemove, MdBasicChip],
-  declarations: [MdChipList, MdChip, MdChipInput, MdChipRemove,  MdChipRemove, MdBasicChip]
-})
-export class MdChipsModule {}
+export * from './mat-exports';
diff --git a/src/lib/core/mat-exports.ts b/src/lib/core/mat-exports.ts
new file mode 100644
index 000000000000..b38a9c583c59
--- /dev/null
+++ b/src/lib/core/mat-exports.ts
@@ -0,0 +1,49 @@
+/**
+ * @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 {MdCommonModule} from './common-behaviors/common-module';
+import {
+  MD_DATE_FORMATS,
+  MD_NATIVE_DATE_FORMATS,
+  MdDateFormats,
+  MdNativeDateModule,
+} from './datetime/index';
+import {MD_ERROR_GLOBAL_OPTIONS} from './error/error-options';
+import {MdLine, MdLineModule, MdLineSetter} from './line/line';
+import {
+  MdOptgroup,
+  MdOptgroupBase,
+  MdOption,
+  MdOptionModule,
+  MdOptionSelectionChange,
+} from './option/index';
+import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from './placeholder/placeholder-options';
+import {MD_RIPPLE_GLOBAL_OPTIONS, MdRipple, MdRippleModule} from './ripple/index';
+import {MdPseudoCheckbox, MdPseudoCheckboxModule, MdPseudoCheckboxState} from './selection/index';
+
+export {MD_DATE_FORMATS as MAT_DATE_FORMATS};
+export {MD_RIPPLE_GLOBAL_OPTIONS as MAT_RIPPLE_GLOBAL_OPTIONS};
+export {MD_NATIVE_DATE_FORMATS as MAT_NATIVE_DATE_FORMATS};
+export {MD_PLACEHOLDER_GLOBAL_OPTIONS as MAT_PLACEHOLDER_GLOBAL_OPTIONS};
+export {MD_ERROR_GLOBAL_OPTIONS as MAT_ERROR_GLOBAL_OPTIONS};
+export {MdCommonModule as MatCommonModule};
+export {MdDateFormats as MatDateFormats};
+export {MdLine as MatLine};
+export {MdLineModule as MatLineModule};
+export {MdLineSetter as MatLineSetter};
+export {MdOptgroup as MatOptgroup};
+export {MdOptgroupBase as MatOptgroupBase};
+export {MdOption as MatOption};
+export {MdOptionModule as MatOptionModule};
+export {MdOptionSelectionChange as MatOptionSelectionChange};
+export {MdNativeDateModule as MatNativeDateModule};
+export {MdPseudoCheckbox as MatPseudoCheckbox};
+export {MdPseudoCheckboxModule as MatPseudoCheckboxModule};
+export {MdPseudoCheckboxState as MatPseudoCheckboxState};
+export {MdRipple as MatRipple};
+export {MdRippleModule as MatRippleModule};
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public_api.ts
index b13cbd5df890..e0d835d549e8 100644
--- a/src/lib/core/public_api.ts
+++ b/src/lib/core/public_api.ts
@@ -31,6 +31,7 @@ export * from './rxjs/index';
 export * from './selection/index';
 export * from './style/index';
 export * from './util/object-extend';
+export * from './mat-exports';
 
 // TODO: don't have this
 export * from './testing/month-constants';
diff --git a/src/lib/datepicker/datepicker-module.ts b/src/lib/datepicker/datepicker-module.ts
new file mode 100644
index 000000000000..36272d381b14
--- /dev/null
+++ b/src/lib/datepicker/datepicker-module.ts
@@ -0,0 +1,67 @@
+/**
+ * @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 {A11yModule} from '@angular/cdk/a11y';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdButtonModule} from '@angular/material/button';
+import {MdDialogModule} from '@angular/material/dialog';
+import {MdIconModule} from '@angular/material/icon';
+import {MdCalendar} from './calendar';
+import {MdCalendarBody} from './calendar-body';
+import {
+  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  MdDatepicker,
+  MdDatepickerContent,
+} from './datepicker';
+import {MdDatepickerInput} from './datepicker-input';
+import {MdDatepickerIntl} from './datepicker-intl';
+import {MdDatepickerToggle} from './datepicker-toggle';
+import {MdMonthView} from './month-view';
+import {MdYearView} from './year-view';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdButtonModule,
+    MdDialogModule,
+    MdIconModule,
+    OverlayModule,
+    A11yModule,
+  ],
+  exports: [
+    MdCalendar,
+    MdCalendarBody,
+    MdDatepicker,
+    MdDatepickerContent,
+    MdDatepickerInput,
+    MdDatepickerToggle,
+    MdMonthView,
+    MdYearView,
+  ],
+  declarations: [
+    MdCalendar,
+    MdCalendarBody,
+    MdDatepicker,
+    MdDatepickerContent,
+    MdDatepickerInput,
+    MdDatepickerToggle,
+    MdMonthView,
+    MdYearView,
+  ],
+  providers: [
+    MdDatepickerIntl,
+    MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  ],
+  entryComponents: [
+    MdDatepickerContent,
+  ]
+})
+export class MdDatepickerModule {}
diff --git a/src/lib/datepicker/mat-exports.ts b/src/lib/datepicker/mat-exports.ts
new file mode 100644
index 000000000000..71e214bcd1f0
--- /dev/null
+++ b/src/lib/datepicker/mat-exports.ts
@@ -0,0 +1,48 @@
+/**
+ * @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 {MdCalendar} from './calendar';
+import {MdCalendarBody, MdCalendarCell} from './calendar-body';
+import {
+  MD_DATEPICKER_SCROLL_STRATEGY,
+  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdDatepicker,
+  MdDatepickerContent,
+} from './datepicker';
+import {
+  MD_DATEPICKER_VALIDATORS,
+  MD_DATEPICKER_VALUE_ACCESSOR,
+  MdDatepickerInput,
+  MdDatepickerInputEvent,
+} from './datepicker-input';
+import {MdDatepickerIntl} from './datepicker-intl';
+import {MdDatepickerModule} from './datepicker-module';
+import {MdDatepickerToggle} from './datepicker-toggle';
+import {MdMonthView} from './month-view';
+import {MdYearView} from './year-view';
+
+
+/* tslint:disable:max-line-length */
+export {MD_DATEPICKER_SCROLL_STRATEGY as MAT_DATEPICKER_SCROLL_STRATEGY};
+export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER};
+export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MD_DATEPICKER_VALIDATORS as MAT_DATEPICKER_VALIDATORS};
+export {MD_DATEPICKER_VALUE_ACCESSOR as MAT_DATEPICKER_VALUE_ACCESSOR};
+export {MdCalendar as MatCalendar};
+export {MdCalendarBody as MatCalendarBody};
+export {MdCalendarCell as MatCalendarCell};
+export {MdDatepicker as MatDatepicker};
+export {MdDatepickerContent as MatDatepickerContent};
+export {MdDatepickerInput as MatDatepickerInput};
+export {MdDatepickerInputEvent as MatDatepickerInputEvent};
+export {MdDatepickerIntl as MatDatepickerIntl};
+export {MdDatepickerModule as MatDatepickerModule};
+export {MdDatepickerToggle as MatDatepickerToggle};
+export {MdMonthView as MatMonthView};
+export {MdYearView as MatYearView};
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public_api.ts
index 176f930bba88..eb90e45ffc2b 100644
--- a/src/lib/datepicker/public_api.ts
+++ b/src/lib/datepicker/public_api.ts
@@ -6,27 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {A11yModule} from '@angular/cdk/a11y';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MdButtonModule} from '@angular/material/button';
-import {MdDialogModule} from '@angular/material/dialog';
-import {MdIconModule} from '@angular/material/icon';
-import {MdCalendar} from './calendar';
-import {MdCalendarBody} from './calendar-body';
-import {
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-  MdDatepicker,
-  MdDatepickerContent,
-} from './datepicker';
-import {MdDatepickerInput} from './datepicker-input';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdDatepickerToggle} from './datepicker-toggle';
-import {MdMonthView} from './month-view';
-import {MdYearView} from './year-view';
-
-
+export * from './datepicker-module';
 export * from './calendar';
 export * from './calendar-body';
 export * from './datepicker';
@@ -35,43 +15,4 @@ export * from './datepicker-intl';
 export * from './datepicker-toggle';
 export * from './month-view';
 export * from './year-view';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdButtonModule,
-    MdDialogModule,
-    MdIconModule,
-    OverlayModule,
-    A11yModule,
-  ],
-  exports: [
-    MdCalendar,
-    MdCalendarBody,
-    MdDatepicker,
-    MdDatepickerContent,
-    MdDatepickerInput,
-    MdDatepickerToggle,
-    MdMonthView,
-    MdYearView,
-  ],
-  declarations: [
-    MdCalendar,
-    MdCalendarBody,
-    MdDatepicker,
-    MdDatepickerContent,
-    MdDatepickerInput,
-    MdDatepickerToggle,
-    MdMonthView,
-    MdYearView,
-  ],
-  providers: [
-    MdDatepickerIntl,
-    MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-  ],
-  entryComponents: [
-    MdDatepickerContent,
-  ]
-})
-export class MdDatepickerModule {}
+export * from './mat-exports';
diff --git a/src/lib/dialog/dialog-module.ts b/src/lib/dialog/dialog-module.ts
new file mode 100644
index 000000000000..c587faf42df2
--- /dev/null
+++ b/src/lib/dialog/dialog-module.ts
@@ -0,0 +1,54 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {PortalModule} from '@angular/cdk/portal';
+import {A11yModule} from '@angular/cdk/a11y';
+import {MdCommonModule} from '@angular/material/core';
+import {MdDialog, MD_DIALOG_SCROLL_STRATEGY_PROVIDER} from './dialog';
+import {MdDialogContainer} from './dialog-container';
+import {
+  MdDialogClose,
+  MdDialogContent,
+  MdDialogTitle,
+  MdDialogActions
+} from './dialog-content-directives';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    OverlayModule,
+    PortalModule,
+    A11yModule,
+    MdCommonModule,
+  ],
+  exports: [
+    MdDialogContainer,
+    MdDialogClose,
+    MdDialogTitle,
+    MdDialogContent,
+    MdDialogActions,
+    MdCommonModule,
+  ],
+  declarations: [
+    MdDialogContainer,
+    MdDialogClose,
+    MdDialogTitle,
+    MdDialogActions,
+    MdDialogContent,
+  ],
+  providers: [
+    MdDialog,
+    MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
+  ],
+  entryComponents: [MdDialogContainer],
+})
+export class MdDialogModule {}
diff --git a/src/lib/dialog/mat-exports.ts b/src/lib/dialog/mat-exports.ts
new file mode 100644
index 000000000000..ce9f2daf51c3
--- /dev/null
+++ b/src/lib/dialog/mat-exports.ts
@@ -0,0 +1,40 @@
+/**
+ * @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 {
+  MD_DIALOG_DATA,
+  MD_DIALOG_SCROLL_STRATEGY,
+  MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
+  MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdDialog,
+} from './dialog';
+import {MdDialogConfig} from './dialog-config';
+import {MdDialogContainer} from './dialog-container';
+import {
+  MdDialogActions,
+  MdDialogClose,
+  MdDialogContent,
+  MdDialogTitle,
+} from './dialog-content-directives';
+import {MdDialogModule} from './dialog-module';
+import {MdDialogRef} from './dialog-ref';
+
+
+export {MD_DIALOG_DATA as MAT_DIALOG_DATA};
+export {MD_DIALOG_SCROLL_STRATEGY as MAT_DIALOG_SCROLL_STRATEGY};
+export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER};
+export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MdDialog as MatDialog};
+export {MdDialogActions as MatDialogActions};
+export {MdDialogClose as MatDialogClose};
+export {MdDialogConfig as MatDialogConfig};
+export {MdDialogContainer as MatDialogContainer};
+export {MdDialogContent as MatDialogContent};
+export {MdDialogModule as MatDialogModule};
+export {MdDialogRef as MatDialogRef};
+export {MdDialogTitle as MatDialogTitle};
diff --git a/src/lib/dialog/public_api.ts b/src/lib/dialog/public_api.ts
index 39b5352d1ae2..040eb5aff84f 100644
--- a/src/lib/dialog/public_api.ts
+++ b/src/lib/dialog/public_api.ts
@@ -6,55 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
-import {A11yModule} from '@angular/cdk/a11y';
-import {MdCommonModule} from '@angular/material/core';
-import {MdDialog, MD_DIALOG_SCROLL_STRATEGY_PROVIDER} from './dialog';
-import {MdDialogContainer} from './dialog-container';
-import {
-  MdDialogClose,
-  MdDialogContent,
-  MdDialogTitle,
-  MdDialogActions
-} from './dialog-content-directives';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    OverlayModule,
-    PortalModule,
-    A11yModule,
-    MdCommonModule,
-  ],
-  exports: [
-    MdDialogContainer,
-    MdDialogClose,
-    MdDialogTitle,
-    MdDialogContent,
-    MdDialogActions,
-    MdCommonModule,
-  ],
-  declarations: [
-    MdDialogContainer,
-    MdDialogClose,
-    MdDialogTitle,
-    MdDialogActions,
-    MdDialogContent,
-  ],
-  providers: [
-    MdDialog,
-    MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
-  ],
-  entryComponents: [MdDialogContainer],
-})
-export class MdDialogModule {}
-
+export * from './dialog-module';
 export * from './dialog';
 export * from './dialog-container';
 export * from './dialog-content-directives';
 export * from './dialog-config';
 export * from './dialog-ref';
+export * from './mat-exports';
diff --git a/src/lib/expansion/expansion-module.ts b/src/lib/expansion/expansion-module.ts
new file mode 100644
index 000000000000..80119c2c93cf
--- /dev/null
+++ b/src/lib/expansion/expansion-module.ts
@@ -0,0 +1,44 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {CompatibilityModule, UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
+import {CdkAccordion, MdAccordion} from './accordion';
+import {MdExpansionPanel, MdExpansionPanelActionRow} from './expansion-panel';
+import {
+  MdExpansionPanelDescription,
+  MdExpansionPanelHeader,
+  MdExpansionPanelTitle,
+} from './expansion-panel-header';
+
+
+@NgModule({
+  imports: [CompatibilityModule, CommonModule, A11yModule],
+  exports: [
+    CdkAccordion,
+    MdAccordion,
+    MdExpansionPanel,
+    MdExpansionPanelActionRow,
+    MdExpansionPanelHeader,
+    MdExpansionPanelTitle,
+    MdExpansionPanelDescription
+  ],
+  declarations: [
+    CdkAccordion,
+    MdAccordion,
+    MdExpansionPanel,
+    MdExpansionPanelActionRow,
+    MdExpansionPanelHeader,
+    MdExpansionPanelTitle,
+    MdExpansionPanelDescription
+  ],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
+})
+export class MdExpansionModule {}
diff --git a/src/lib/expansion/mat-exports.ts b/src/lib/expansion/mat-exports.ts
new file mode 100644
index 000000000000..be1bed20796f
--- /dev/null
+++ b/src/lib/expansion/mat-exports.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 {MdAccordion, MdAccordionDisplayMode} from './accordion';
+import {MdExpansionModule} from './expansion-module';
+import {
+  MdExpansionPanel,
+  MdExpansionPanelActionRow,
+  MdExpansionPanelState,
+} from './expansion-panel';
+import {
+  MdExpansionPanelDescription,
+  MdExpansionPanelHeader,
+  MdExpansionPanelTitle,
+} from './expansion-panel-header';
+
+
+export {MdAccordion as MatAccordion};
+export {MdAccordionDisplayMode as MatAccordionDisplayMode};
+export {MdExpansionModule as MatExpansionModule};
+export {MdExpansionPanel as MatExpansionPanel};
+export {MdExpansionPanelActionRow as MatExpansionPanelActionRow};
+export {MdExpansionPanelDescription as MatExpansionPanelDescription};
+export {MdExpansionPanelHeader as MatExpansionPanelHeader};
+export {MdExpansionPanelState as MatExpansionPanelState};
+export {MdExpansionPanelTitle as MatExpansionPanelTitle};
diff --git a/src/lib/expansion/public_api.ts b/src/lib/expansion/public_api.ts
index 6b8aace89ac7..d2e7b1224299 100644
--- a/src/lib/expansion/public_api.ts
+++ b/src/lib/expansion/public_api.ts
@@ -6,43 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {CompatibilityModule, UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
-import {CdkAccordion, MdAccordion} from './accordion';
-import {MdExpansionPanel, MdExpansionPanelActionRow} from './expansion-panel';
-import {
-  MdExpansionPanelDescription,
-  MdExpansionPanelHeader,
-  MdExpansionPanelTitle,
-} from './expansion-panel-header';
-
-
-@NgModule({
-  imports: [CompatibilityModule, CommonModule, A11yModule],
-  exports: [
-    CdkAccordion,
-    MdAccordion,
-    MdExpansionPanel,
-    MdExpansionPanelActionRow,
-    MdExpansionPanelHeader,
-    MdExpansionPanelTitle,
-    MdExpansionPanelDescription
-  ],
-  declarations: [
-    CdkAccordion,
-    MdAccordion,
-    MdExpansionPanel,
-    MdExpansionPanelActionRow,
-    MdExpansionPanelHeader,
-    MdExpansionPanelTitle,
-    MdExpansionPanelDescription
-  ],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
-})
-export class MdExpansionModule {}
-
+export * from './expansion-module';
 export {
   CdkAccordion,
   MdAccordion,
@@ -60,3 +24,4 @@ export {
   MdExpansionPanelTitle
 } from './expansion-panel-header';
 
+export * from './mat-exports';
diff --git a/src/lib/form-field/form-field-module.ts b/src/lib/form-field/form-field-module.ts
new file mode 100644
index 000000000000..6cb8d7ccdea8
--- /dev/null
+++ b/src/lib/form-field/form-field-module.ts
@@ -0,0 +1,42 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdError} from './error';
+import {MdFormField} from './form-field';
+import {MdHint} from './hint';
+import {MdPlaceholder} from './placeholder';
+import {MdPrefix} from './prefix';
+import {MdSuffix} from './suffix';
+import {CommonModule} from '@angular/common';
+import {PlatformModule} from '@angular/material/core';
+
+
+@NgModule({
+  declarations: [
+    MdError,
+    MdHint,
+    MdFormField,
+    MdPlaceholder,
+    MdPrefix,
+    MdSuffix,
+  ],
+  imports: [
+    CommonModule,
+    PlatformModule,
+  ],
+  exports: [
+    MdError,
+    MdHint,
+    MdFormField,
+    MdPlaceholder,
+    MdPrefix,
+    MdSuffix,
+  ],
+})
+export class MdFormFieldModule {}
diff --git a/src/lib/form-field/mat-exports.ts b/src/lib/form-field/mat-exports.ts
new file mode 100644
index 000000000000..788c9b4452d2
--- /dev/null
+++ b/src/lib/form-field/mat-exports.ts
@@ -0,0 +1,28 @@
+/**
+ * @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 {
+  MdFormField,
+} from './form-field';
+import {MdError} from './error';
+import {MdHint} from './hint';
+import {MdFormFieldModule} from './form-field-module';
+import {MdPrefix} from './prefix';
+import {MdSuffix} from './suffix';
+import {MdPlaceholder} from './placeholder';
+import {MdFormFieldControl} from './form-field-control';
+
+
+export {MdFormFieldModule as MatFormFieldModule};
+export {MdError as MatError};
+export {MdFormField as MatFormField};
+export {MdFormFieldControl as MatFormFieldControl};
+export {MdHint as MatHint};
+export {MdPlaceholder as MatPlaceholder};
+export {MdPrefix as MatPrefix};
+export {MdSuffix as MatSuffix};
diff --git a/src/lib/form-field/public_api.ts b/src/lib/form-field/public_api.ts
index eb3047954a48..4edf1173bbe0 100644
--- a/src/lib/form-field/public_api.ts
+++ b/src/lib/form-field/public_api.ts
@@ -6,42 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdError} from './error';
-import {MdFormField} from './form-field';
-import {MdHint} from './hint';
-import {MdPlaceholder} from './placeholder';
-import {MdPrefix} from './prefix';
-import {MdSuffix} from './suffix';
-import {CommonModule} from '@angular/common';
-import {PlatformModule} from '@angular/material/core';
-
-
-@NgModule({
-  declarations: [
-    MdError,
-    MdHint,
-    MdFormField,
-    MdPlaceholder,
-    MdPrefix,
-    MdSuffix,
-  ],
-  imports: [
-    CommonModule,
-    PlatformModule,
-  ],
-  exports: [
-    MdError,
-    MdHint,
-    MdFormField,
-    MdPlaceholder,
-    MdPrefix,
-    MdSuffix,
-  ],
-})
-export class MdFormFieldModule {}
-
-
+export * from './form-field-module';
 export * from './error';
 export * from './form-field';
 export * from './form-field-control';
@@ -50,4 +15,4 @@ export * from './hint';
 export * from './placeholder';
 export * from './prefix';
 export * from './suffix';
-
+export * from './mat-exports';
diff --git a/src/lib/grid-list/grid-list-module.ts b/src/lib/grid-list/grid-list-module.ts
new file mode 100644
index 000000000000..d57f8b80b5b0
--- /dev/null
+++ b/src/lib/grid-list/grid-list-module.ts
@@ -0,0 +1,39 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdLineModule, MdCommonModule} from '@angular/material/core';
+import {
+  MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
+  MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
+} from './grid-tile';
+import {MdGridList} from './grid-list';
+
+
+@NgModule({
+  imports: [MdLineModule, MdCommonModule],
+  exports: [
+    MdGridList,
+    MdGridTile,
+    MdGridTileText,
+    MdLineModule,
+    MdCommonModule,
+    MdGridTileHeaderCssMatStyler,
+    MdGridTileFooterCssMatStyler,
+    MdGridAvatarCssMatStyler
+  ],
+  declarations: [
+    MdGridList,
+    MdGridTile,
+    MdGridTileText,
+    MdGridTileHeaderCssMatStyler,
+    MdGridTileFooterCssMatStyler,
+    MdGridAvatarCssMatStyler
+  ],
+})
+export class MdGridListModule {}
diff --git a/src/lib/grid-list/mat-exports.ts b/src/lib/grid-list/mat-exports.ts
new file mode 100644
index 000000000000..0590465d4b71
--- /dev/null
+++ b/src/lib/grid-list/mat-exports.ts
@@ -0,0 +1,16 @@
+/**
+ * @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 {MdGridList} from './grid-list';
+import {MdGridListModule} from './grid-list-module';
+import {MdGridTile} from './grid-tile';
+
+
+export {MdGridList as MatGridList};
+export {MdGridListModule as MatGridListModule};
+export {MdGridTile as MatGridTile};
diff --git a/src/lib/grid-list/public_api.ts b/src/lib/grid-list/public_api.ts
index 78917c713df4..5329b294b274 100644
--- a/src/lib/grid-list/public_api.ts
+++ b/src/lib/grid-list/public_api.ts
@@ -6,38 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdLineModule, MdCommonModule} from '@angular/material/core';
-import {
-  MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
-  MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
-} from './grid-tile';
-import {MdGridList} from './grid-list';
-
-
-@NgModule({
-  imports: [MdLineModule, MdCommonModule],
-  exports: [
-    MdGridList,
-    MdGridTile,
-    MdGridTileText,
-    MdLineModule,
-    MdCommonModule,
-    MdGridTileHeaderCssMatStyler,
-    MdGridTileFooterCssMatStyler,
-    MdGridAvatarCssMatStyler
-  ],
-  declarations: [
-    MdGridList,
-    MdGridTile,
-    MdGridTileText,
-    MdGridTileHeaderCssMatStyler,
-    MdGridTileFooterCssMatStyler,
-    MdGridAvatarCssMatStyler
-  ],
-})
-export class MdGridListModule {}
-
-
+export * from './grid-list-module';
 export * from './grid-list';
 export {MdGridTile} from './grid-tile';
+export * from './mat-exports';
diff --git a/src/lib/icon/icon-module.ts b/src/lib/icon/icon-module.ts
new file mode 100644
index 000000000000..1104d7a29429
--- /dev/null
+++ b/src/lib/icon/icon-module.ts
@@ -0,0 +1,21 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {MdIcon} from './icon';
+import {ICON_REGISTRY_PROVIDER} from './icon-registry';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [MdIcon, MdCommonModule],
+  declarations: [MdIcon],
+  providers: [ICON_REGISTRY_PROVIDER],
+})
+export class MdIconModule {}
diff --git a/src/lib/icon/mat-exports.ts b/src/lib/icon/mat-exports.ts
new file mode 100644
index 000000000000..73a7dc18e85a
--- /dev/null
+++ b/src/lib/icon/mat-exports.ts
@@ -0,0 +1,17 @@
+/**
+ * @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 {MdIcon, MdIconBase} from './icon';
+import {MdIconRegistry} from './icon-registry';
+import {MdIconModule} from './icon-module';
+
+
+export {MdIcon as MatIcon};
+export {MdIconBase as MatIconBase};
+export {MdIconModule as MatIconModule};
+export {MdIconRegistry as MatIconRegistry};
diff --git a/src/lib/icon/public_api.ts b/src/lib/icon/public_api.ts
index 94a2329bd913..ac95ddd5615a 100644
--- a/src/lib/icon/public_api.ts
+++ b/src/lib/icon/public_api.ts
@@ -6,20 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MdIcon} from './icon';
-import {ICON_REGISTRY_PROVIDER} from './icon-registry';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [MdIcon, MdCommonModule],
-  declarations: [MdIcon],
-  providers: [ICON_REGISTRY_PROVIDER],
-})
-export class MdIconModule {}
-
-
+export * from './icon-module';
 export * from './icon';
 export * from './icon-registry';
+export * from './mat-exports';
diff --git a/src/lib/input/input-module.ts b/src/lib/input/input-module.ts
new file mode 100644
index 000000000000..0e6f22491e62
--- /dev/null
+++ b/src/lib/input/input-module.ts
@@ -0,0 +1,35 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdInput} from './input';
+import {MdTextareaAutosize} from './autosize';
+import {CommonModule} from '@angular/common';
+import {PlatformModule} from '@angular/material/core';
+import {MdFormFieldModule} from '@angular/material/form-field';
+
+
+@NgModule({
+  declarations: [
+    MdInput,
+    MdTextareaAutosize,
+  ],
+  imports: [
+    CommonModule,
+    MdFormFieldModule,
+    PlatformModule,
+  ],
+  exports: [
+    // We re-export the `MdFormFieldModule` since `MdInput` will almost always be used together with
+    // `MdFormField`.
+    MdFormFieldModule,
+    MdInput,
+    MdTextareaAutosize,
+  ],
+})
+export class MdInputModule {}
diff --git a/src/lib/input/mat-exports.ts b/src/lib/input/mat-exports.ts
new file mode 100644
index 000000000000..c3b588d4fd16
--- /dev/null
+++ b/src/lib/input/mat-exports.ts
@@ -0,0 +1,16 @@
+/**
+ * @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 {MdInput} from './input';
+import {MdTextareaAutosize} from './autosize';
+import {MdInputModule} from './input-module';
+
+
+export {MdInput as MatInput};
+export {MdInputModule as MatInputModule};
+export {MdTextareaAutosize as MatTextareaAutosize};
diff --git a/src/lib/input/public_api.ts b/src/lib/input/public_api.ts
index eafbd183b27b..ce320312d33b 100644
--- a/src/lib/input/public_api.ts
+++ b/src/lib/input/public_api.ts
@@ -6,36 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdInput} from './input';
-import {MdTextareaAutosize} from './autosize';
-import {CommonModule} from '@angular/common';
-import {PlatformModule} from '@angular/material/core';
-import {MdFormFieldModule} from '@angular/material/form-field';
-
-
-@NgModule({
-  declarations: [
-    MdInput,
-    MdTextareaAutosize,
-  ],
-  imports: [
-    CommonModule,
-    MdFormFieldModule,
-    PlatformModule,
-  ],
-  exports: [
-    // We re-export the `MdFormFieldModule` since `MdInput` will almost always be used together with
-    // `MdFormField`.
-    MdFormFieldModule,
-    MdInput,
-    MdTextareaAutosize,
-  ],
-})
-export class MdInputModule {}
-
 
+export * from './input-module';
 export * from './autosize';
 export * from './input';
 export * from './input-errors';
 
+export * from './mat-exports';
diff --git a/src/lib/list/list-module.ts b/src/lib/list/list-module.ts
new file mode 100644
index 000000000000..177bec5758b9
--- /dev/null
+++ b/src/lib/list/list-module.ts
@@ -0,0 +1,63 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {
+  MdCommonModule,
+  MdLineModule,
+  MdPseudoCheckboxModule,
+  MdRippleModule,
+} from '@angular/material/core';
+import {
+  MdDividerCssMatStyler,
+  MdList,
+  MdListAvatarCssMatStyler,
+  MdListCssMatStyler,
+  MdListDivider,
+  MdListIconCssMatStyler,
+  MdListItem,
+  MdListSubheaderCssMatStyler,
+  MdNavListCssMatStyler,
+} from './list';
+import {MdListOption, MdSelectionList} from './selection-list';
+
+
+@NgModule({
+  imports: [MdLineModule, MdRippleModule, MdCommonModule, MdPseudoCheckboxModule, CommonModule],
+  exports: [
+    MdList,
+    MdListItem,
+    MdListDivider,
+    MdListAvatarCssMatStyler,
+    MdLineModule,
+    MdCommonModule,
+    MdListIconCssMatStyler,
+    MdListCssMatStyler,
+    MdNavListCssMatStyler,
+    MdDividerCssMatStyler,
+    MdListSubheaderCssMatStyler,
+    MdPseudoCheckboxModule,
+    MdSelectionList,
+    MdListOption
+  ],
+  declarations: [
+    MdList,
+    MdListItem,
+    MdListDivider,
+    MdListAvatarCssMatStyler,
+    MdListIconCssMatStyler,
+    MdListCssMatStyler,
+    MdNavListCssMatStyler,
+    MdDividerCssMatStyler,
+    MdListSubheaderCssMatStyler,
+    MdSelectionList,
+    MdListOption
+  ],
+})
+export class MdListModule {}
diff --git a/src/lib/list/mat-exports.ts b/src/lib/list/mat-exports.ts
new file mode 100644
index 000000000000..e8f8a9e89e40
--- /dev/null
+++ b/src/lib/list/mat-exports.ts
@@ -0,0 +1,48 @@
+/**
+ * @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 {
+  MdDividerCssMatStyler,
+  MdList,
+  MdListAvatarCssMatStyler,
+  MdListBase,
+  MdListCssMatStyler,
+  MdListDivider,
+  MdListIconCssMatStyler,
+  MdListItem,
+  MdListItemBase,
+  MdListSubheaderCssMatStyler,
+  MdNavListCssMatStyler,
+} from './list';
+import {
+  MdListOption,
+  MdListOptionBase,
+  MdSelectionList,
+  MdSelectionListBase,
+  MdSelectionListOptionEvent,
+} from './selection-list';
+import {MdListModule} from './list-module';
+
+
+export {MdDividerCssMatStyler as MatDividerCssMatStyler};
+export {MdList as MatList};
+export {MdListAvatarCssMatStyler as MatListAvatarCssMatStyler};
+export {MdListBase as MatListBase};
+export {MdListCssMatStyler as MatListCssMatStyler};
+export {MdListDivider as MatListDivider};
+export {MdListIconCssMatStyler as MatListIconCssMatStyler};
+export {MdListItem as MatListItem};
+export {MdListItemBase as MatListItemBase};
+export {MdListModule as MatListModule};
+export {MdListOption as MatListOption};
+export {MdListOptionBase as MatListOptionBase};
+export {MdListSubheaderCssMatStyler as MatListSubheaderCssMatStyler};
+export {MdNavListCssMatStyler as MatNavListCssMatStyler};
+export {MdSelectionList as MatSelectionList};
+export {MdSelectionListBase as MatSelectionListBase};
+export {MdSelectionListOptionEvent as MatSelectionListOptionEvent};
diff --git a/src/lib/list/public_api.ts b/src/lib/list/public_api.ts
index 4f88dea8fccd..98b17cb93de7 100644
--- a/src/lib/list/public_api.ts
+++ b/src/lib/list/public_api.ts
@@ -6,62 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {
-  MdCommonModule,
-  MdLineModule,
-  MdPseudoCheckboxModule,
-  MdRippleModule,
-} from '@angular/material/core';
-import {
-  MdDividerCssMatStyler,
-  MdList,
-  MdListAvatarCssMatStyler,
-  MdListCssMatStyler,
-  MdListDivider,
-  MdListIconCssMatStyler,
-  MdListItem,
-  MdListSubheaderCssMatStyler,
-  MdNavListCssMatStyler,
-} from './list';
-import {MdListOption, MdSelectionList} from './selection-list';
-
-
-@NgModule({
-  imports: [MdLineModule, MdRippleModule, MdCommonModule, MdPseudoCheckboxModule, CommonModule],
-  exports: [
-    MdList,
-    MdListItem,
-    MdListDivider,
-    MdListAvatarCssMatStyler,
-    MdLineModule,
-    MdCommonModule,
-    MdListIconCssMatStyler,
-    MdListCssMatStyler,
-    MdNavListCssMatStyler,
-    MdDividerCssMatStyler,
-    MdListSubheaderCssMatStyler,
-    MdPseudoCheckboxModule,
-    MdSelectionList,
-    MdListOption
-  ],
-  declarations: [
-    MdList,
-    MdListItem,
-    MdListDivider,
-    MdListAvatarCssMatStyler,
-    MdListIconCssMatStyler,
-    MdListCssMatStyler,
-    MdNavListCssMatStyler,
-    MdDividerCssMatStyler,
-    MdListSubheaderCssMatStyler,
-    MdSelectionList,
-    MdListOption
-  ],
-})
-export class MdListModule {}
-
-
+export * from './list-module';
 export * from './list';
 export * from './selection-list';
+export * from './mat-exports';
diff --git a/src/lib/mat-exports.ts b/src/lib/mat-exports.ts
deleted file mode 100644
index 9afb2175f3a2..000000000000
--- a/src/lib/mat-exports.ts
+++ /dev/null
@@ -1,527 +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 {
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MD_AUTOCOMPLETE_VALUE_ACCESSOR,
-  MdAutocomplete,
-  MdAutocompleteModule,
-  MdAutocompleteTrigger,
-} from '@angular/material/autocomplete';
-import {
-  MdAnchor,
-  MdButton,
-  MdButtonBase,
-  MdButtonCssMatStyler,
-  MdButtonModule,
-  MdFab,
-  MdIconButtonCssMatStyler,
-  MdMiniFab,
-  MdRaisedButtonCssMatStyler,
-} from '@angular/material/button';
-import {
-  MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR,
-  MdButtonToggle,
-  MdButtonToggleChange,
-  MdButtonToggleGroup,
-  MdButtonToggleGroupBase,
-  MdButtonToggleGroupMultiple,
-  MdButtonToggleModule,
-} from '@angular/material/button-toggle';
-import {
-  MdCard,
-  MdCardActions,
-  MdCardAvatar,
-  MdCardContent,
-  MdCardFooter,
-  MdCardHeader,
-  MdCardImage,
-  MdCardLgImage,
-  MdCardMdImage,
-  MdCardModule,
-  MdCardSmImage,
-  MdCardSubtitle,
-  MdCardTitle,
-  MdCardTitleGroup,
-  MdCardXlImage,
-} from '@angular/material/card';
-import {
-  MD_CHECKBOX_CONTROL_VALUE_ACCESSOR,
-  MD_CHECKBOX_REQUIRED_VALIDATOR,
-  MdCheckbox,
-  MdCheckboxBase,
-  MdCheckboxChange,
-  MdCheckboxModule,
-  MdCheckboxRequiredValidator,
-} from '@angular/material/checkbox';
-import {
-  MdBasicChip,
-  MdChip,
-  MdChipBase,
-  MdChipEvent,
-  MdChipInput,
-  MdChipInputEvent,
-  MdChipList,
-  MdChipRemove,
-  MdChipsModule,
-} from '@angular/material/chips';
-import {
-  MD_DATE_FORMATS,
-  MD_ERROR_GLOBAL_OPTIONS,
-  MD_NATIVE_DATE_FORMATS,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS,
-  MD_RIPPLE_GLOBAL_OPTIONS,
-  MdCommonModule,
-  MdDateFormats,
-  MdLine,
-  MdLineModule,
-  MdLineSetter,
-  MdNativeDateModule,
-  MdOptgroup,
-  MdOptgroupBase,
-  MdOption,
-  MdOptionModule,
-  MdOptionSelectionChange,
-  MdPseudoCheckbox,
-  MdPseudoCheckboxModule,
-  MdPseudoCheckboxState,
-  MdRipple,
-  MdRippleModule,
-} from '@angular/material/core';
-import {
-  MD_DATEPICKER_SCROLL_STRATEGY,
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MD_DATEPICKER_VALIDATORS,
-  MD_DATEPICKER_VALUE_ACCESSOR,
-  MdCalendar,
-  MdCalendarBody,
-  MdCalendarCell,
-  MdDatepicker,
-  MdDatepickerContent,
-  MdDatepickerInput,
-  MdDatepickerInputEvent,
-  MdDatepickerIntl,
-  MdDatepickerModule,
-  MdDatepickerToggle,
-  MdMonthView,
-  MdYearView,
-} from '@angular/material/datepicker';
-import {
-  MD_DIALOG_DATA,
-  MD_DIALOG_SCROLL_STRATEGY,
-  MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
-  MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdDialog,
-  MdDialogActions,
-  MdDialogClose,
-  MdDialogConfig,
-  MdDialogContainer,
-  MdDialogContent,
-  MdDialogModule,
-  MdDialogRef,
-  MdDialogTitle,
-} from '@angular/material/dialog';
-import {
-  MdAccordion,
-  MdAccordionDisplayMode,
-  MdExpansionModule,
-  MdExpansionPanel,
-  MdExpansionPanelActionRow,
-  MdExpansionPanelDescription,
-  MdExpansionPanelHeader,
-  MdExpansionPanelState,
-  MdExpansionPanelTitle,
-} from '@angular/material/expansion';
-import {
-  MdError,
-  MdFormField,
-  MdFormFieldControl,
-  MdFormFieldModule,
-  MdHint,
-  MdPlaceholder,
-  MdPrefix,
-  MdSuffix,
-} from '@angular/material/form-field';
-import {MdGridList, MdGridListModule, MdGridTile} from '@angular/material/grid-list';
-import {MdIcon, MdIconBase, MdIconModule, MdIconRegistry} from '@angular/material/icon';
-import {MdInput, MdInputModule, MdTextareaAutosize} from '@angular/material/input';
-import {
-  MdDividerCssMatStyler,
-  MdList,
-  MdListAvatarCssMatStyler,
-  MdListBase,
-  MdListCssMatStyler,
-  MdListDivider,
-  MdListIconCssMatStyler,
-  MdListItem,
-  MdListItemBase,
-  MdListModule,
-  MdListOption,
-  MdListOptionBase,
-  MdListSubheaderCssMatStyler,
-  MdNavListCssMatStyler,
-  MdSelectionList,
-  MdSelectionListBase,
-  MdSelectionListOptionEvent,
-} from '@angular/material/list';
-import {
-  MD_MENU_DEFAULT_OPTIONS,
-  MdMenu,
-  MdMenuDefaultOptions,
-  MdMenuItem,
-  MdMenuModule,
-  MdMenuPanel,
-  MdMenuTrigger,
-} from '@angular/material/menu';
-import {MdPaginator, MdPaginatorIntl, MdPaginatorModule} from '@angular/material/paginator';
-import {MdProgressBar, MdProgressBarModule} from '@angular/material/progress-bar';
-import {
-  MdProgressSpinner,
-  MdProgressSpinnerBase,
-  MdProgressSpinnerCssMatStyler,
-  MdProgressSpinnerModule,
-  MdSpinner,
-} from '@angular/material/progress-spinner';
-import {
-  MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR,
-  MdRadioButton,
-  MdRadioButtonBase,
-  MdRadioChange,
-  MdRadioGroup,
-  MdRadioGroupBase,
-  MdRadioModule,
-} from '@angular/material/radio';
-import {
-  MD_SELECT_SCROLL_STRATEGY,
-  MD_SELECT_SCROLL_STRATEGY_PROVIDER,
-  MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdSelect,
-  MdSelectBase,
-  MdSelectChange,
-  MdSelectModule,
-  MdSelectTrigger,
-} from '@angular/material/select';
-import {
-  MdDrawer,
-  MdDrawerContainer,
-  MdDrawerToggleResult,
-  MdSidenav,
-  MdSidenavContainer,
-  MdSidenavModule,
-} from '@angular/material/sidenav';
-import {
-  MD_SLIDE_TOGGLE_VALUE_ACCESSOR,
-  MdSlideToggle,
-  MdSlideToggleBase,
-  MdSlideToggleChange,
-  MdSlideToggleModule,
-} from '@angular/material/slide-toggle';
-import {
-  MD_SLIDER_VALUE_ACCESSOR,
-  MdSlider,
-  MdSliderBase,
-  MdSliderChange,
-  MdSliderModule,
-} from '@angular/material/slider';
-import {
-  MD_SNACK_BAR_DATA,
-  MdSnackBar,
-  MdSnackBarConfig,
-  MdSnackBarContainer,
-  MdSnackBarModule,
-  MdSnackBarRef,
-} from '@angular/material/snack-bar';
-import {
-  MdSort,
-  MdSortable,
-  MdSortHeader,
-  MdSortHeaderIntl,
-  MdSortModule,
-} from '@angular/material/sort';
-import {
-  MdCell,
-  MdCellDef,
-  MdColumnDef,
-  MdHeaderCell,
-  MdHeaderCellDef,
-  MdHeaderRow,
-  MdRow,
-  MdTable,
-  MdTableModule,
-} from '@angular/material/table';
-import {
-  MdInkBar,
-  MdTab,
-  MdTabBody,
-  MdTabBodyOriginState,
-  MdTabBodyPositionState,
-  MdTabChangeEvent,
-  MdTabGroup,
-  MdTabGroupBase,
-  MdTabHeader,
-  MdTabHeaderPosition,
-  MdTabLabel,
-  MdTabLabelWrapper,
-  MdTabLink,
-  MdTabNav,
-  MdTabsModule,
-} from '@angular/material/tabs';
-import {MdToolbar, MdToolbarBase, MdToolbarModule, MdToolbarRow} from '@angular/material/toolbar';
-import {
-  MD_TOOLTIP_SCROLL_STRATEGY,
-  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER,
-  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdTooltip,
-  MdTooltipModule,
-} from '@angular/material/tooltip';
-
-/* tslint:disable:max-line-length */
-export {MD_AUTOCOMPLETE_SCROLL_STRATEGY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY};
-export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER};
-export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MD_AUTOCOMPLETE_VALUE_ACCESSOR as MAT_AUTOCOMPLETE_VALUE_ACCESSOR};
-export {MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR};
-export {MD_CHECKBOX_CONTROL_VALUE_ACCESSOR as MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR};
-export {MD_CHECKBOX_REQUIRED_VALIDATOR as MAT_CHECKBOX_REQUIRED_VALIDATOR};
-export {MD_DATE_FORMATS as MAT_DATE_FORMATS};
-export {MD_DATEPICKER_SCROLL_STRATEGY as MAT_DATEPICKER_SCROLL_STRATEGY};
-export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER};
-export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MD_DATEPICKER_VALIDATORS as MAT_DATEPICKER_VALIDATORS};
-export {MD_DATEPICKER_VALUE_ACCESSOR as MAT_DATEPICKER_VALUE_ACCESSOR};
-export {MD_DIALOG_DATA as MAT_DIALOG_DATA};
-export {MD_DIALOG_SCROLL_STRATEGY as MAT_DIALOG_SCROLL_STRATEGY};
-export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER};
-export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MD_ERROR_GLOBAL_OPTIONS as MAT_ERROR_GLOBAL_OPTIONS};
-export {MD_MENU_DEFAULT_OPTIONS as MAT_MENU_DEFAULT_OPTIONS};
-export {MD_NATIVE_DATE_FORMATS as MAT_NATIVE_DATE_FORMATS};
-export {MD_PLACEHOLDER_GLOBAL_OPTIONS as MAT_PLACEHOLDER_GLOBAL_OPTIONS};
-export {MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR as MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR};
-export {MD_RIPPLE_GLOBAL_OPTIONS as MAT_RIPPLE_GLOBAL_OPTIONS};
-export {MD_SELECT_SCROLL_STRATEGY as MAT_SELECT_SCROLL_STRATEGY};
-export {MD_SELECT_SCROLL_STRATEGY_PROVIDER as MAT_SELECT_SCROLL_STRATEGY_PROVIDER};
-export {MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MD_SLIDE_TOGGLE_VALUE_ACCESSOR as MAT_SLIDE_TOGGLE_VALUE_ACCESSOR};
-export {MD_SLIDER_VALUE_ACCESSOR as MAT_SLIDER_VALUE_ACCESSOR};
-export {MD_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA};
-export {MD_TOOLTIP_SCROLL_STRATEGY as MAT_TOOLTIP_SCROLL_STRATEGY};
-export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER};
-export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MdAccordion as MatAccordion};
-export {MdAccordionDisplayMode as MatAccordionDisplayMode};
-export {MdAnchor as MatAnchor};
-export {MdAutocomplete as MatAutocomplete};
-export {MdAutocompleteModule as MatAutocompleteModule};
-export {MdAutocompleteTrigger as MatAutocompleteTrigger};
-export {MdBasicChip as MatBasicChip};
-export {MdButton as MatButton};
-export {MdButtonBase as MatButtonBase};
-export {MdButtonCssMatStyler as MatButtonCssMatStyler};
-export {MdButtonModule as MatButtonModule};
-export {MdButtonToggle as MatButtonToggle};
-export {MdButtonToggleChange as MatButtonToggleChange};
-export {MdButtonToggleGroup as MatButtonToggleGroup};
-export {MdButtonToggleGroupBase as MatButtonToggleGroupBase};
-export {MdButtonToggleGroupMultiple as MatButtonToggleGroupMultiple};
-export {MdButtonToggleModule as MatButtonToggleModule};
-export {MdCalendar as MatCalendar};
-export {MdCalendarBody as MatCalendarBody};
-export {MdCalendarCell as MatCalendarCell};
-export {MdCard as MatCard};
-export {MdCardActions as MatCardActions};
-export {MdCardAvatar as MatCardAvatar};
-export {MdCardContent as MatCardContent};
-export {MdCardFooter as MatCardFooter};
-export {MdCardHeader as MatCardHeader};
-export {MdCardImage as MatCardImage};
-export {MdCardLgImage as MatCardLgImage};
-export {MdCardMdImage as MatCardMatImage};
-export {MdCardModule as MatCardModule};
-export {MdCardSmImage as MatCardSmImage};
-export {MdCardSubtitle as MatCardSubtitle};
-export {MdCardTitle as MatCardTitle};
-export {MdCardTitleGroup as MatCardTitleGroup};
-export {MdCardXlImage as MatCardXlImage};
-export {MdCell as MatCell};
-export {MdCellDef as MatCellDef};
-export {MdCheckbox as MatCheckbox};
-export {MdCheckboxBase as MatCheckboxBase};
-export {MdCheckboxChange as MatCheckboxChange};
-export {MdCheckboxModule as MatCheckboxModule};
-export {MdCheckboxRequiredValidator as MatCheckboxRequiredValidator};
-export {MdChip as MatChip};
-export {MdChipBase as MatChipBase};
-export {MdChipEvent as MatChipEvent};
-export {MdChipInput as MatChipInput};
-export {MdChipInputEvent as MatChipInputEvent};
-export {MdChipList as MatChipList};
-export {MdChipRemove as MatChipRemove};
-export {MdChipsModule as MatChipsModule};
-export {MdColumnDef as MatColumnDef};
-export {MdCommonModule as MatCommonModule};
-export {MdDateFormats as MatDateFormats};
-export {MdDatepicker as MatDatepicker};
-export {MdDatepickerContent as MatDatepickerContent};
-export {MdDatepickerInput as MatDatepickerInput};
-export {MdDatepickerInputEvent as MatDatepickerInputEvent};
-export {MdDatepickerIntl as MatDatepickerIntl};
-export {MdDatepickerModule as MatDatepickerModule};
-export {MdDatepickerToggle as MatDatepickerToggle};
-export {MdDialog as MatDialog};
-export {MdDialogActions as MatDialogActions};
-export {MdDialogClose as MatDialogClose};
-export {MdDialogConfig as MatDialogConfig};
-export {MdDialogContainer as MatDialogContainer};
-export {MdDialogContent as MatDialogContent};
-export {MdDialogModule as MatDialogModule};
-export {MdDialogRef as MatDialogRef};
-export {MdDialogTitle as MatDialogTitle};
-export {MdDividerCssMatStyler as MatDividerCssMatStyler};
-export {MdDrawerToggleResult as MatDrawerToggleResult};
-export {MdDrawer as MatDrawer};
-export {MdDrawerContainer as MatDrawerContainer};
-export {MdExpansionModule as MatExpansionModule};
-export {MdExpansionPanel as MatExpansionPanel};
-export {MdExpansionPanelActionRow as MatExpansionPanelActionRow};
-export {MdExpansionPanelDescription as MatExpansionPanelDescription};
-export {MdExpansionPanelHeader as MatExpansionPanelHeader};
-export {MdExpansionPanelState as MatExpansionPanelState};
-export {MdExpansionPanelTitle as MatExpansionPanelTitle};
-export {MdFab as MatFab};
-export {MdGridList as MatGridList};
-export {MdGridListModule as MatGridListModule};
-export {MdGridTile as MatGridTile};
-export {MdHeaderCell as MatHeaderCell};
-export {MdHeaderCellDef as MatHeaderCellDef};
-export {MdHeaderRow as MatHeaderRow};
-export {MdIcon as MatIcon};
-export {MdIconBase as MatIconBase};
-export {MdIconButtonCssMatStyler as MatIconButtonCssMatStyler};
-export {MdIconModule as MatIconModule};
-export {MdIconRegistry as MatIconRegistry};
-export {MdInkBar as MatInkBar};
-export {MdInput as MatInput};
-export {MdInputModule as MatInputModule};
-export {MdLine as MatLine};
-export {MdLineModule as MatLineModule};
-export {MdLineSetter as MatLineSetter};
-export {MdList as MatList};
-export {MdListAvatarCssMatStyler as MatListAvatarCssMatStyler};
-export {MdListBase as MatListBase};
-export {MdListCssMatStyler as MatListCssMatStyler};
-export {MdListDivider as MatListDivider};
-export {MdListIconCssMatStyler as MatListIconCssMatStyler};
-export {MdListItem as MatListItem};
-export {MdListItemBase as MatListItemBase};
-export {MdListModule as MatListModule};
-export {MdListOption as MatListOption};
-export {MdListOptionBase as MatListOptionBase};
-export {MdListSubheaderCssMatStyler as MatListSubheaderCssMatStyler};
-export {MdMenu as MatMenu};
-export {MdMenuDefaultOptions as MatMenuDefaultOptions};
-export {MdMenuItem as MatMenuItem};
-export {MdMenuModule as MatMenuModule};
-export {MdMenuPanel as MatMenuPanel};
-export {MdMenuTrigger as MatMenuTrigger};
-export {MdMiniFab as MatMiniFab};
-export {MdMonthView as MatMonthView};
-export {MdNativeDateModule as MatNativeDateModule};
-export {MdNavListCssMatStyler as MatNavListCssMatStyler};
-export {MdOptgroup as MatOptgroup};
-export {MdOptgroupBase as MatOptgroupBase};
-export {MdOption as MatOption};
-export {MdOptionModule as MatOptionModule};
-export {MdOptionSelectionChange as MatOptionSelectionChange};
-export {MdPaginator as MatPaginator};
-export {MdPaginatorIntl as MatPaginatorIntl};
-export {MdPaginatorModule as MatPaginatorModule};
-export {MdProgressBar as MatProgressBar};
-export {MdProgressBarModule as MatProgressBarModule};
-export {MdProgressSpinner as MatProgressSpinner};
-export {MdProgressSpinnerBase as MatProgressSpinnerBase};
-export {MdProgressSpinnerCssMatStyler as MatProgressSpinnerCssMatStyler};
-export {MdProgressSpinnerModule as MatProgressSpinnerModule};
-export {MdPseudoCheckbox as MatPseudoCheckbox};
-export {MdPseudoCheckboxModule as MatPseudoCheckboxModule};
-export {MdPseudoCheckboxState as MatPseudoCheckboxState};
-export {MdRadioButton as MatRadioButton};
-export {MdRadioButtonBase as MatRadioButtonBase};
-export {MdRadioChange as MatRadioChange};
-export {MdRadioGroup as MatRadioGroup};
-export {MdRadioGroupBase as MatRadioGroupBase};
-export {MdRadioModule as MatRadioModule};
-export {MdRaisedButtonCssMatStyler as MatRaisedButtonCssMatStyler};
-export {MdRipple as MatRipple};
-export {MdRippleModule as MatRippleModule};
-export {MdRow as MatRow};
-export {MdSelect as MatSelect};
-export {MdSelectBase as MatSelectBase};
-export {MdSelectChange as MatSelectChange};
-export {MdSelectionList as MatSelectionList};
-export {MdSelectionListBase as MatSelectionListBase};
-export {MdSelectionListOptionEvent as MatSelectionListOptionEvent};
-export {MdSelectModule as MatSelectModule};
-export {MdSelectTrigger as MatSelectTrigger};
-export {MdSidenav as MatSidenav};
-export {MdSidenavContainer as MatSidenavContainer};
-export {MdSidenavModule as MatSidenavModule};
-export {MdSlider as MatSlider};
-export {MdSliderBase as MatSliderBase};
-export {MdSliderChange as MatSliderChange};
-export {MdSliderModule as MatSliderModule};
-export {MdSlideToggle as MatSlideToggle};
-export {MdSlideToggleBase as MatSlideToggleBase};
-export {MdSlideToggleChange as MatSlideToggleChange};
-export {MdSlideToggleModule as MatSlideToggleModule};
-export {MdSnackBar as MatSnackBar};
-export {MdSnackBarConfig as MatSnackBarConfig};
-export {MdSnackBarContainer as MatSnackBarContainer};
-export {MdSnackBarModule as MatSnackBarModule};
-export {MdSnackBarRef as MatSnackBarRef};
-export {MdSort as MatSort};
-export {MdSortable as MatSortable};
-export {MdSortHeader as MatSortHeader};
-export {MdSortHeaderIntl as MatSortHeaderIntl};
-export {MdSortModule as MatSortModule};
-export {MdSpinner as MatSpinner};
-export {MdTab as MatTab};
-export {MdTabBody as MatTabBody};
-export {MdTabBodyOriginState as MatTabBodyOriginState};
-export {MdTabBodyPositionState as MatTabBodyPositionState};
-export {MdTabChangeEvent as MatTabChangeEvent};
-export {MdTabGroup as MatTabGroup};
-export {MdTabGroupBase as MatTabGroupBase};
-export {MdTabHeader as MatTabHeader};
-export {MdTabHeaderPosition as MatTabHeaderPosition};
-export {MdTabLabel as MatTabLabel};
-export {MdTabLabelWrapper as MatTabLabelWrapper};
-export {MdTable as MatTable};
-export {MdTableModule as MatTableModule};
-export {MdTabLink as MatTabLink};
-export {MdTabNav as MatTabNav};
-export {MdTabsModule as MatTabsModule};
-export {MdTextareaAutosize as MatTextareaAutosize};
-export {MdToolbar as MatToolbar};
-export {MdToolbarBase as MatToolbarBase};
-export {MdToolbarModule as MatToolbarModule};
-export {MdToolbarRow as MatToolbarRow};
-export {MdTooltip as MatTooltip};
-export {MdTooltipModule as MatTooltipModule};
-export {MdYearView as MatYearView};
-export {MdFormFieldModule as MatFormFieldModule};
-export {MdError as MatError};
-export {MdFormField as MatFormField};
-export {MdFormFieldControl as MatFormFieldControl};
-export {MdHint as MatHint};
-export {MdPlaceholder as MatPlaceholder};
-export {MdPrefix as MatPrefix};
-export {MdSuffix as MatSuffix};
diff --git a/src/lib/menu/mat-exports.ts b/src/lib/menu/mat-exports.ts
new file mode 100644
index 000000000000..1c123fbebf03
--- /dev/null
+++ b/src/lib/menu/mat-exports.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {
+  MD_MENU_DEFAULT_OPTIONS,
+  MdMenu,
+  MdMenuDefaultOptions,
+  MdMenuItem,
+  MdMenuPanel,
+  MdMenuTrigger,
+} from './menu';
+import {MdMenuModule} from './menu-module';
+
+
+export {MD_MENU_DEFAULT_OPTIONS as MAT_MENU_DEFAULT_OPTIONS};
+export {MdMenu as MatMenu};
+export {MdMenuDefaultOptions as MatMenuDefaultOptions};
+export {MdMenuItem as MatMenuItem};
+export {MdMenuModule as MatMenuModule};
+export {MdMenuPanel as MatMenuPanel};
+export {MdMenuTrigger as MatMenuTrigger};
diff --git a/src/lib/menu/menu-module.ts b/src/lib/menu/menu-module.ts
new file mode 100644
index 000000000000..2ebfabe5a916
--- /dev/null
+++ b/src/lib/menu/menu-module.ts
@@ -0,0 +1,40 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule} from '@angular/material/core';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {MdMenu, MD_MENU_DEFAULT_OPTIONS} from './menu-directive';
+import {MdMenuItem} from './menu-item';
+import {MdMenuTrigger, MD_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
+import {MdRippleModule} from '@angular/material/core';
+
+
+@NgModule({
+  imports: [
+    OverlayModule,
+    CommonModule,
+    MdRippleModule,
+    MdCommonModule,
+  ],
+  exports: [MdMenu, MdMenuItem, MdMenuTrigger, MdCommonModule],
+  declarations: [MdMenu, MdMenuItem, MdMenuTrigger],
+  providers: [
+    MD_MENU_SCROLL_STRATEGY_PROVIDER,
+    {
+      provide: MD_MENU_DEFAULT_OPTIONS,
+      useValue: {
+        overlapTrigger: true,
+        xPosition: 'after',
+        yPosition: 'below',
+      },
+    }
+  ],
+})
+export class MdMenuModule {}
diff --git a/src/lib/menu/public_api.ts b/src/lib/menu/public_api.ts
index e058148b93e2..21d9f21df158 100644
--- a/src/lib/menu/public_api.ts
+++ b/src/lib/menu/public_api.ts
@@ -6,40 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '@angular/material/core';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {MdMenu, MD_MENU_DEFAULT_OPTIONS} from './menu-directive';
-import {MdMenuItem} from './menu-item';
-import {MdMenuTrigger, MD_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
-import {MdRippleModule} from '@angular/material/core';
-
-
-@NgModule({
-  imports: [
-    OverlayModule,
-    CommonModule,
-    MdRippleModule,
-    MdCommonModule,
-  ],
-  exports: [MdMenu, MdMenuItem, MdMenuTrigger, MdCommonModule],
-  declarations: [MdMenu, MdMenuItem, MdMenuTrigger],
-  providers: [
-    MD_MENU_SCROLL_STRATEGY_PROVIDER,
-    {
-      provide: MD_MENU_DEFAULT_OPTIONS,
-      useValue: {
-        overlapTrigger: true,
-        xPosition: 'after',
-        yPosition: 'below',
-      },
-    }
-  ],
-})
-export class MdMenuModule {}
-
-
+export * from './menu-module';
 export * from './menu';
 export {MD_MENU_SCROLL_STRATEGY} from './menu-trigger';
 export {fadeInItems, transformMenu} from './menu-animations';
+export * from './mat-exports';
diff --git a/src/lib/paginator/mat-exports.ts b/src/lib/paginator/mat-exports.ts
new file mode 100644
index 000000000000..26c46461f0bb
--- /dev/null
+++ b/src/lib/paginator/mat-exports.ts
@@ -0,0 +1,16 @@
+/**
+ * @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 {MdPaginator} from './paginator';
+import {MdPaginatorIntl} from './paginator-intl';
+import {MdPaginatorModule} from './paginator-module';
+
+
+export {MdPaginator as MatPaginator};
+export {MdPaginatorIntl as MatPaginatorIntl};
+export {MdPaginatorModule as MatPaginatorModule};
diff --git a/src/lib/paginator/paginator-module.ts b/src/lib/paginator/paginator-module.ts
new file mode 100644
index 000000000000..a9873e73e2da
--- /dev/null
+++ b/src/lib/paginator/paginator-module.ts
@@ -0,0 +1,29 @@
+/**
+ * @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 {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdButtonModule} from '@angular/material/button';
+import {MdSelectModule} from '@angular/material/select';
+import {MdTooltipModule} from '@angular/material/tooltip';
+import {MdPaginator} from './paginator';
+import {MdPaginatorIntl} from './paginator-intl';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdButtonModule,
+    MdSelectModule,
+    MdTooltipModule,
+  ],
+  exports: [MdPaginator],
+  declarations: [MdPaginator],
+  providers: [MdPaginatorIntl],
+})
+export class MdPaginatorModule {}
diff --git a/src/lib/paginator/public_api.ts b/src/lib/paginator/public_api.ts
index a3d7cd62f646..f8689f8d2280 100644
--- a/src/lib/paginator/public_api.ts
+++ b/src/lib/paginator/public_api.ts
@@ -6,28 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MdButtonModule} from '@angular/material/button';
-import {MdSelectModule} from '@angular/material/select';
-import {MdTooltipModule} from '@angular/material/tooltip';
-import {MdPaginator} from './paginator';
-import {MdPaginatorIntl} from './paginator-intl';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdButtonModule,
-    MdSelectModule,
-    MdTooltipModule,
-  ],
-  exports: [MdPaginator],
-  declarations: [MdPaginator],
-  providers: [MdPaginatorIntl],
-})
-export class MdPaginatorModule {}
-
-
+export * from './paginator-module';
 export * from './paginator';
 export * from './paginator-intl';
+export * from './mat-exports';
diff --git a/src/lib/progress-bar/mat-exports.ts b/src/lib/progress-bar/mat-exports.ts
new file mode 100644
index 000000000000..7550fc80e7df
--- /dev/null
+++ b/src/lib/progress-bar/mat-exports.ts
@@ -0,0 +1,14 @@
+/**
+ * @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 {MdProgressBar} from './progress-bar';
+import {MdProgressBarModule} from './progress-bar-module';
+
+
+export {MdProgressBar as MatProgressBar};
+export {MdProgressBarModule as MatProgressBarModule};
diff --git a/src/lib/progress-bar/progress-bar-module.ts b/src/lib/progress-bar/progress-bar-module.ts
new file mode 100644
index 000000000000..c67dbcd654b7
--- /dev/null
+++ b/src/lib/progress-bar/progress-bar-module.ts
@@ -0,0 +1,20 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule} from '@angular/material/core';
+import {MdProgressBar} from './progress-bar';
+
+
+@NgModule({
+  imports: [CommonModule, MdCommonModule],
+  exports: [MdProgressBar, MdCommonModule],
+  declarations: [MdProgressBar],
+})
+export class MdProgressBarModule {}
diff --git a/src/lib/progress-bar/public_api.ts b/src/lib/progress-bar/public_api.ts
index 40218edb4439..e4284632b898 100644
--- a/src/lib/progress-bar/public_api.ts
+++ b/src/lib/progress-bar/public_api.ts
@@ -6,18 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '@angular/material/core';
-import {MdProgressBar} from './progress-bar';
-
-
-@NgModule({
-  imports: [CommonModule, MdCommonModule],
-  exports: [MdProgressBar, MdCommonModule],
-  declarations: [MdProgressBar],
-})
-export class MdProgressBarModule {}
-
-
+export * from './progress-bar-module';
 export * from './progress-bar';
+export * from './mat-exports';
diff --git a/src/lib/progress-spinner/mat-exports.ts b/src/lib/progress-spinner/mat-exports.ts
new file mode 100644
index 000000000000..6b1c3708aa8d
--- /dev/null
+++ b/src/lib/progress-spinner/mat-exports.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {
+  MdProgressSpinner,
+  MdProgressSpinnerBase,
+  MdProgressSpinnerCssMatStyler,
+  MdSpinner,
+} from './progress-spinner';
+import {MdProgressSpinnerModule} from './progress-spinner-module';
+
+
+export {MdProgressSpinner as MatProgressSpinner};
+export {MdProgressSpinnerBase as MatProgressSpinnerBase};
+export {MdProgressSpinnerCssMatStyler as MatProgressSpinnerCssMatStyler};
+export {MdProgressSpinnerModule as MatProgressSpinnerModule};
+export {MdSpinner as MatSpinner};
diff --git a/src/lib/progress-spinner/progress-spinner-module.ts b/src/lib/progress-spinner/progress-spinner-module.ts
new file mode 100644
index 000000000000..cb106eaee75b
--- /dev/null
+++ b/src/lib/progress-spinner/progress-spinner-module.ts
@@ -0,0 +1,32 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {
+  MdProgressSpinner,
+  MdSpinner,
+  MdProgressSpinnerCssMatStyler,
+} from './progress-spinner';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [
+    MdProgressSpinner,
+    MdSpinner,
+    MdCommonModule,
+    MdProgressSpinnerCssMatStyler
+  ],
+  declarations: [
+    MdProgressSpinner,
+    MdSpinner,
+    MdProgressSpinnerCssMatStyler
+  ],
+})
+export class MdProgressSpinnerModule {}
diff --git a/src/lib/progress-spinner/public_api.ts b/src/lib/progress-spinner/public_api.ts
index 94453fd891ed..563453f03d91 100644
--- a/src/lib/progress-spinner/public_api.ts
+++ b/src/lib/progress-spinner/public_api.ts
@@ -6,30 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {
-  MdProgressSpinner,
-  MdSpinner,
-  MdProgressSpinnerCssMatStyler,
-} from './progress-spinner';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [
-    MdProgressSpinner,
-    MdSpinner,
-    MdCommonModule,
-    MdProgressSpinnerCssMatStyler
-  ],
-  declarations: [
-    MdProgressSpinner,
-    MdSpinner,
-    MdProgressSpinnerCssMatStyler
-  ],
-})
-class MdProgressSpinnerModule {}
-
-export {MdProgressSpinnerModule};
+export * from './progress-spinner-module';
 export * from './progress-spinner';
+export * from './mat-exports';
diff --git a/src/lib/public_api.ts b/src/lib/public_api.ts
index b38675d877ba..526918c24de5 100644
--- a/src/lib/public_api.ts
+++ b/src/lib/public_api.ts
@@ -6,15 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of Angular Material.
- */
-
 export * from './version';
-
-
 export * from '@angular/material/autocomplete';
 export * from '@angular/material/button';
 export * from '@angular/material/button-toggle';
@@ -46,4 +38,3 @@ export * from '@angular/material/table';
 export * from '@angular/material/tabs';
 export * from '@angular/material/toolbar';
 export * from '@angular/material/tooltip';
-export * from './mat-exports';
diff --git a/src/lib/radio/mat-exports.ts b/src/lib/radio/mat-exports.ts
new file mode 100644
index 000000000000..75ef35bdb6f4
--- /dev/null
+++ b/src/lib/radio/mat-exports.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {
+  MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR,
+  MdRadioButton,
+  MdRadioButtonBase,
+  MdRadioChange,
+  MdRadioGroup,
+  MdRadioGroupBase,
+} from './radio';
+import {MdRadioModule} from './radio-module';
+
+
+export {MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR as MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR};
+export {MdRadioButton as MatRadioButton};
+export {MdRadioButtonBase as MatRadioButtonBase};
+export {MdRadioChange as MatRadioChange};
+export {MdRadioGroup as MatRadioGroup};
+export {MdRadioGroupBase as MatRadioGroupBase};
+export {MdRadioModule as MatRadioModule};
diff --git a/src/lib/radio/public_api.ts b/src/lib/radio/public_api.ts
index d434c542fcb2..0d89666ce7db 100644
--- a/src/lib/radio/public_api.ts
+++ b/src/lib/radio/public_api.ts
@@ -6,24 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
-import {
-  MdRippleModule,
-  MdCommonModule,
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
-} from '@angular/material/core';
-import {MdRadioGroup, MdRadioButton} from './radio';
-import {A11yModule} from '@angular/cdk/a11y';
-
-@NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule, A11yModule],
-  exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
-  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER],
-  declarations: [MdRadioGroup, MdRadioButton],
-})
-export class MdRadioModule {}
-
-
+export * from './radio-module';
 export * from './radio';
+export * from './mat-exports';
diff --git a/src/lib/radio/radio-module.ts b/src/lib/radio/radio-module.ts
new file mode 100644
index 000000000000..114970a7ff10
--- /dev/null
+++ b/src/lib/radio/radio-module.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
+import {
+  MdRippleModule,
+  MdCommonModule,
+  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
+} from '@angular/material/core';
+import {MdRadioGroup, MdRadioButton} from './radio';
+import {A11yModule} from '@angular/cdk/a11y';
+
+@NgModule({
+  imports: [CommonModule, MdRippleModule, MdCommonModule, A11yModule],
+  exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER],
+  declarations: [MdRadioGroup, MdRadioButton],
+})
+export class MdRadioModule {}
diff --git a/src/lib/select/mat-exports.ts b/src/lib/select/mat-exports.ts
new file mode 100644
index 000000000000..4028df76cc0b
--- /dev/null
+++ b/src/lib/select/mat-exports.ts
@@ -0,0 +1,28 @@
+/**
+ * @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 {
+  MD_SELECT_SCROLL_STRATEGY,
+  MD_SELECT_SCROLL_STRATEGY_PROVIDER,
+  MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdSelect,
+  MdSelectBase,
+  MdSelectChange,
+  MdSelectTrigger,
+} from './select';
+import {MdSelectModule} from './select-module';
+
+
+export {MD_SELECT_SCROLL_STRATEGY as MAT_SELECT_SCROLL_STRATEGY};
+export {MD_SELECT_SCROLL_STRATEGY_PROVIDER as MAT_SELECT_SCROLL_STRATEGY_PROVIDER};
+export {MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY};
+export {MdSelect as MatSelect};
+export {MdSelectBase as MatSelectBase};
+export {MdSelectChange as MatSelectChange};
+export {MdSelectModule as MatSelectModule};
+export {MdSelectTrigger as MatSelectTrigger};
diff --git a/src/lib/select/public_api.ts b/src/lib/select/public_api.ts
index 71d19e278024..ff3282c457e2 100644
--- a/src/lib/select/public_api.ts
+++ b/src/lib/select/public_api.ts
@@ -6,26 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MdSelect, MdSelectTrigger, MD_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
-import {MdCommonModule, MdOptionModule} from '@angular/material/core';
-import {OverlayModule} from '@angular/cdk/overlay';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    OverlayModule,
-    MdOptionModule,
-    MdCommonModule,
-  ],
-  exports: [MdSelect, MdSelectTrigger, MdOptionModule, MdCommonModule],
-  declarations: [MdSelect, MdSelectTrigger],
-  providers: [MD_SELECT_SCROLL_STRATEGY_PROVIDER]
-})
-export class MdSelectModule {}
-
-
+export * from './select-module';
 export * from './select';
 export {fadeInContent, transformPanel, transformPlaceholder} from './select-animations';
+export * from './mat-exports';
diff --git a/src/lib/select/select-module.ts b/src/lib/select/select-module.ts
new file mode 100644
index 000000000000..0b0c397b3680
--- /dev/null
+++ b/src/lib/select/select-module.ts
@@ -0,0 +1,27 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MdSelect, MdSelectTrigger, MD_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
+import {MdCommonModule, MdOptionModule} from '@angular/material/core';
+import {OverlayModule} from '@angular/cdk/overlay';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    OverlayModule,
+    MdOptionModule,
+    MdCommonModule,
+  ],
+  exports: [MdSelect, MdSelectTrigger, MdOptionModule, MdCommonModule],
+  declarations: [MdSelect, MdSelectTrigger],
+  providers: [MD_SELECT_SCROLL_STRATEGY_PROVIDER]
+})
+export class MdSelectModule {}
diff --git a/src/lib/sidenav/mat-exports.ts b/src/lib/sidenav/mat-exports.ts
new file mode 100644
index 000000000000..6257189d29bd
--- /dev/null
+++ b/src/lib/sidenav/mat-exports.ts
@@ -0,0 +1,19 @@
+/**
+ * @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 {MdDrawer, MdDrawerContainer, MdDrawerToggleResult} from './drawer';
+import {MdSidenav, MdSidenavContainer} from './sidenav';
+import {MdSidenavModule} from './sidenav-module';
+
+
+export {MdDrawerToggleResult as MatDrawerToggleResult};
+export {MdDrawer as MatDrawer};
+export {MdDrawerContainer as MatDrawerContainer};
+export {MdSidenav as MatSidenav};
+export {MdSidenavContainer as MatSidenavContainer};
+export {MdSidenavModule as MatSidenavModule};
diff --git a/src/lib/sidenav/public_api.ts b/src/lib/sidenav/public_api.ts
index 948fed606daa..7b5e4bfa1b28 100644
--- a/src/lib/sidenav/public_api.ts
+++ b/src/lib/sidenav/public_api.ts
@@ -6,22 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {A11yModule} from '@angular/cdk/a11y';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {MdCommonModule} from '@angular/material/core';
-import {MdDrawer, MdDrawerContainer} from './drawer';
-import {MdSidenav, MdSidenavContainer} from './sidenav';
-
-
-@NgModule({
-  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
-  exports: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav, MdCommonModule],
-  declarations: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav],
-})
-export class MdSidenavModule {}
-
-
+export * from './sidenav-module';
 export * from './drawer';
 export * from './sidenav';
+export * from './mat-exports';
diff --git a/src/lib/sidenav/sidenav-module.ts b/src/lib/sidenav/sidenav-module.ts
new file mode 100644
index 000000000000..16f14d9d98fc
--- /dev/null
+++ b/src/lib/sidenav/sidenav-module.ts
@@ -0,0 +1,23 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {A11yModule} from '@angular/cdk/a11y';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {MdCommonModule} from '@angular/material/core';
+import {MdDrawer, MdDrawerContainer} from './drawer';
+import {MdSidenav, MdSidenavContainer} from './sidenav';
+
+
+@NgModule({
+  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
+  exports: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav, MdCommonModule],
+  declarations: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav],
+})
+export class MdSidenavModule {}
diff --git a/src/lib/slide-toggle/mat-exports.ts b/src/lib/slide-toggle/mat-exports.ts
new file mode 100644
index 000000000000..3772ee2c686b
--- /dev/null
+++ b/src/lib/slide-toggle/mat-exports.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {
+  MD_SLIDE_TOGGLE_VALUE_ACCESSOR,
+  MdSlideToggle,
+  MdSlideToggleBase,
+  MdSlideToggleChange,
+} from './slide-toggle';
+import {MdSlideToggleModule} from './slide-toggle-module';
+
+
+export {MD_SLIDE_TOGGLE_VALUE_ACCESSOR as MAT_SLIDE_TOGGLE_VALUE_ACCESSOR};
+export {MdSlideToggle as MatSlideToggle};
+export {MdSlideToggleBase as MatSlideToggleBase};
+export {MdSlideToggleChange as MatSlideToggleChange};
+export {MdSlideToggleModule as MatSlideToggleModule};
diff --git a/src/lib/slide-toggle/public_api.ts b/src/lib/slide-toggle/public_api.ts
index 9ad294e0f0d0..31a809696319 100644
--- a/src/lib/slide-toggle/public_api.ts
+++ b/src/lib/slide-toggle/public_api.ts
@@ -6,28 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ObserversModule} from '@angular/cdk/observers';
-import {PlatformModule} from '@angular/cdk/platform';
-import {NgModule} from '@angular/core';
-import {
-  GestureConfig,
-  MdCommonModule,
-  MdRippleModule,
-} from '@angular/material/core';
-import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {A11yModule} from '@angular/cdk/a11y';
-import {MdSlideToggle} from './slide-toggle';
-
-
-@NgModule({
-  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule, A11yModule],
-  exports: [MdSlideToggle, MdCommonModule],
-  declarations: [MdSlideToggle],
-  providers: [
-    {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}
-  ],
-})
-export class MdSlideToggleModule {}
-
-
+export * from './slide-toggle-module';
 export * from './slide-toggle';
+export * from './mat-exports';
diff --git a/src/lib/slide-toggle/slide-toggle-module.ts b/src/lib/slide-toggle/slide-toggle-module.ts
new file mode 100644
index 000000000000..218e6c36b121
--- /dev/null
+++ b/src/lib/slide-toggle/slide-toggle-module.ts
@@ -0,0 +1,30 @@
+/**
+ * @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 {ObserversModule} from '@angular/cdk/observers';
+import {PlatformModule} from '@angular/cdk/platform';
+import {NgModule} from '@angular/core';
+import {
+  GestureConfig,
+  MdCommonModule,
+  MdRippleModule,
+} from '@angular/material/core';
+import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {A11yModule} from '@angular/cdk/a11y';
+import {MdSlideToggle} from './slide-toggle';
+
+
+@NgModule({
+  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule, A11yModule],
+  exports: [MdSlideToggle, MdCommonModule],
+  declarations: [MdSlideToggle],
+  providers: [
+    {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}
+  ],
+})
+export class MdSlideToggleModule {}
diff --git a/src/lib/slider/mat-exports.ts b/src/lib/slider/mat-exports.ts
new file mode 100644
index 000000000000..99bad0cf9260
--- /dev/null
+++ b/src/lib/slider/mat-exports.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {
+  MD_SLIDER_VALUE_ACCESSOR,
+  MdSlider,
+  MdSliderBase,
+  MdSliderChange,
+} from './slider';
+import {MdSliderModule} from './slider-module';
+
+
+export {MD_SLIDER_VALUE_ACCESSOR as MAT_SLIDER_VALUE_ACCESSOR};
+export {MdSlider as MatSlider};
+export {MdSliderBase as MatSliderBase};
+export {MdSliderChange as MatSliderChange};
+export {MdSliderModule as MatSliderModule};
diff --git a/src/lib/slider/public_api.ts b/src/lib/slider/public_api.ts
index 4af4cafbdd60..96bbf656a58d 100644
--- a/src/lib/slider/public_api.ts
+++ b/src/lib/slider/public_api.ts
@@ -6,22 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule, GestureConfig} from '@angular/material/core';
-import {MdSlider} from './slider';
-import {BidiModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
-
-
-@NgModule({
-  imports: [CommonModule, MdCommonModule, BidiModule, A11yModule],
-  exports: [MdSlider, MdCommonModule],
-  declarations: [MdSlider],
-  providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
-})
-export class MdSliderModule {}
-
-
+export * from './slider-module';
 export * from './slider';
+export * from './mat-exports';
diff --git a/src/lib/slider/slider-module.ts b/src/lib/slider/slider-module.ts
new file mode 100644
index 000000000000..2d669c54d4ab
--- /dev/null
+++ b/src/lib/slider/slider-module.ts
@@ -0,0 +1,24 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule, GestureConfig} from '@angular/material/core';
+import {MdSlider} from './slider';
+import {BidiModule} from '@angular/material/core';
+import {A11yModule} from '@angular/cdk/a11y';
+
+
+@NgModule({
+  imports: [CommonModule, MdCommonModule, BidiModule, A11yModule],
+  exports: [MdSlider, MdCommonModule],
+  declarations: [MdSlider],
+  providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
+})
+export class MdSliderModule {}
diff --git a/src/lib/snack-bar/mat-exports.ts b/src/lib/snack-bar/mat-exports.ts
new file mode 100644
index 000000000000..04dd5838aed8
--- /dev/null
+++ b/src/lib/snack-bar/mat-exports.ts
@@ -0,0 +1,21 @@
+/**
+ * @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 {MdSnackBar} from './snack-bar';
+import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
+import {MdSnackBarContainer} from './snack-bar-container';
+import {MdSnackBarModule} from './snack-bar-module';
+import {MdSnackBarRef} from './snack-bar-ref';
+
+
+export {MD_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA};
+export {MdSnackBar as MatSnackBar};
+export {MdSnackBarConfig as MatSnackBarConfig};
+export {MdSnackBarContainer as MatSnackBarContainer};
+export {MdSnackBarModule as MatSnackBarModule};
+export {MdSnackBarRef as MatSnackBarRef};
diff --git a/src/lib/snack-bar/public_api.ts b/src/lib/snack-bar/public_api.ts
index db641fd145ad..6799827122dd 100644
--- a/src/lib/snack-bar/public_api.ts
+++ b/src/lib/snack-bar/public_api.ts
@@ -6,34 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
-import {LIVE_ANNOUNCER_PROVIDER} from '@angular/cdk/a11y';
-import {MdCommonModule} from '@angular/material/core';
-import {MdSnackBar} from './snack-bar';
-import {MdSnackBarContainer} from './snack-bar-container';
-import {SimpleSnackBar} from './simple-snack-bar';
-
-
-@NgModule({
-  imports: [
-    OverlayModule,
-    PortalModule,
-    CommonModule,
-    MdCommonModule,
-  ],
-  exports: [MdSnackBarContainer, MdCommonModule],
-  declarations: [MdSnackBarContainer, SimpleSnackBar],
-  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
-  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
-})
-export class MdSnackBarModule {}
-
-
+export * from './snack-bar-module';
 export * from './snack-bar';
 export * from './snack-bar-container';
 export * from './snack-bar-config';
 export * from './snack-bar-ref';
 export * from './simple-snack-bar';
+export * from './mat-exports';
diff --git a/src/lib/snack-bar/snack-bar-module.ts b/src/lib/snack-bar/snack-bar-module.ts
new file mode 100644
index 000000000000..d436a4da504c
--- /dev/null
+++ b/src/lib/snack-bar/snack-bar-module.ts
@@ -0,0 +1,32 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {PortalModule} from '@angular/cdk/portal';
+import {LIVE_ANNOUNCER_PROVIDER} from '@angular/cdk/a11y';
+import {MdCommonModule} from '@angular/material/core';
+import {MdSnackBar} from './snack-bar';
+import {MdSnackBarContainer} from './snack-bar-container';
+import {SimpleSnackBar} from './simple-snack-bar';
+
+
+@NgModule({
+  imports: [
+    OverlayModule,
+    PortalModule,
+    CommonModule,
+    MdCommonModule,
+  ],
+  exports: [MdSnackBarContainer, MdCommonModule],
+  declarations: [MdSnackBarContainer, SimpleSnackBar],
+  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
+  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
+})
+export class MdSnackBarModule {}
diff --git a/src/lib/sort/mat-exports.ts b/src/lib/sort/mat-exports.ts
new file mode 100644
index 000000000000..44a7b1ccb49c
--- /dev/null
+++ b/src/lib/sort/mat-exports.ts
@@ -0,0 +1,19 @@
+/**
+ * @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 {MdSort, MdSortable} from './sort';
+import {MdSortHeader} from './sort-header';
+import {MdSortHeaderIntl} from './sort-header-intl';
+import {MdSortModule} from './sort-module';
+
+
+export {MdSort as MatSort};
+export {MdSortable as MatSortable};
+export {MdSortHeader as MatSortHeader};
+export {MdSortHeaderIntl as MatSortHeaderIntl};
+export {MdSortModule as MatSortModule};
diff --git a/src/lib/sort/public_api.ts b/src/lib/sort/public_api.ts
index 7d1ed5454b68..a9cb88a5c038 100644
--- a/src/lib/sort/public_api.ts
+++ b/src/lib/sort/public_api.ts
@@ -6,21 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdSortHeader} from './sort-header';
-import {MdSort} from './sort';
-import {MdSortHeaderIntl} from './sort-header-intl';
-import {CommonModule} from '@angular/common';
-
+export * from './sort-module';
 export * from './sort-direction';
 export * from './sort-header';
 export * from './sort-header-intl';
 export * from './sort';
-
-@NgModule({
-  imports: [CommonModule],
-  exports: [MdSort, MdSortHeader],
-  declarations: [MdSort, MdSortHeader],
-  providers: [MdSortHeaderIntl]
-})
-export class MdSortModule {}
+export * from './mat-exports';
diff --git a/src/lib/sort/sort-module.ts b/src/lib/sort/sort-module.ts
new file mode 100644
index 000000000000..3f8cb960f55c
--- /dev/null
+++ b/src/lib/sort/sort-module.ts
@@ -0,0 +1,22 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdSortHeader} from './sort-header';
+import {MdSort} from './sort';
+import {MdSortHeaderIntl} from './sort-header-intl';
+import {CommonModule} from '@angular/common';
+
+
+@NgModule({
+  imports: [CommonModule],
+  exports: [MdSort, MdSortHeader],
+  declarations: [MdSort, MdSortHeader],
+  providers: [MdSortHeaderIntl]
+})
+export class MdSortModule {}
diff --git a/src/lib/stepper/mat-exports.ts b/src/lib/stepper/mat-exports.ts
new file mode 100644
index 000000000000..f561023416b9
--- /dev/null
+++ b/src/lib/stepper/mat-exports.ts
@@ -0,0 +1,29 @@
+/**
+ * @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 {
+  MdHorizontalStepper,
+  MdStep,
+  MdStepper,
+  MdVerticalStepper,
+} from './stepper';
+import {MdStepHeader} from './step-header';
+import {MdStepLabel} from './step-label';
+import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+import {MdStepperModule} from './stepper-module';
+
+
+export {MdStep as MatStep};
+export {MdStepHeader as MatStepHeader};
+export {MdStepLabel as MatStepLabel};
+export {MdStepper as MatStepper};
+export {MdHorizontalStepper as MatHorizontalStepper};
+export {MdStepperModule as MatStepperModule};
+export {MdVerticalStepper as MatVerticalStepper};
+export {MdStepperPrevious as MatStepperPrevious};
+export {MdStepperNext as MatStepperNext};
diff --git a/src/lib/stepper/public_api.ts b/src/lib/stepper/public_api.ts
index 298427d9eb63..f55f0ffc768d 100644
--- a/src/lib/stepper/public_api.ts
+++ b/src/lib/stepper/public_api.ts
@@ -6,45 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PortalModule} from '@angular/cdk/portal';
-import {CdkStepperModule} from '@angular/cdk/stepper';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MdButtonModule} from '@angular/material/button';
-import {MdCommonModule} from '@angular/material/core';
-import {MdIconModule} from '@angular/material/icon';
-import {MdStepHeader} from './step-header';
-import {MdStepLabel} from './step-label';
-import {MdHorizontalStepper, MdStep, MdStepper, MdVerticalStepper} from './stepper';
-import {MdStepperNext, MdStepperPrevious} from './stepper-button';
-
-
-@NgModule({
-  imports: [
-    MdCommonModule,
-    CommonModule,
-    PortalModule,
-    MdButtonModule,
-    CdkStepperModule,
-    MdIconModule
-  ],
-  exports: [
-    MdCommonModule,
-    MdHorizontalStepper,
-    MdVerticalStepper,
-    MdStep,
-    MdStepLabel,
-    MdStepper,
-    MdStepperNext,
-    MdStepperPrevious,
-    MdStepHeader
-  ],
-  declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
-    MdStepperNext, MdStepperPrevious, MdStepHeader],
-})
-export class MdStepperModule {}
-
+export * from './stepper-module';
 export * from './step-label';
 export * from './stepper';
 export * from './stepper-button';
 export * from './step-header';
+export * from './mat-exports';
diff --git a/src/lib/stepper/stepper-module.ts b/src/lib/stepper/stepper-module.ts
new file mode 100644
index 000000000000..5737a20e61e8
--- /dev/null
+++ b/src/lib/stepper/stepper-module.ts
@@ -0,0 +1,45 @@
+/**
+ * @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 {PortalModule} from '@angular/cdk/portal';
+import {CdkStepperModule} from '@angular/cdk/stepper';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdButtonModule} from '@angular/material/button';
+import {MdCommonModule} from '@angular/material/core';
+import {MdIconModule} from '@angular/material/icon';
+import {MdStepHeader} from './step-header';
+import {MdStepLabel} from './step-label';
+import {MdHorizontalStepper, MdStep, MdStepper, MdVerticalStepper} from './stepper';
+import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+
+
+@NgModule({
+  imports: [
+    MdCommonModule,
+    CommonModule,
+    PortalModule,
+    MdButtonModule,
+    CdkStepperModule,
+    MdIconModule
+  ],
+  exports: [
+    MdCommonModule,
+    MdHorizontalStepper,
+    MdVerticalStepper,
+    MdStep,
+    MdStepLabel,
+    MdStepper,
+    MdStepperNext,
+    MdStepperPrevious,
+    MdStepHeader
+  ],
+  declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
+    MdStepperNext, MdStepperPrevious, MdStepHeader],
+})
+export class MdStepperModule {}
diff --git a/src/lib/table/mat-exports.ts b/src/lib/table/mat-exports.ts
new file mode 100644
index 000000000000..9554e6695834
--- /dev/null
+++ b/src/lib/table/mat-exports.ts
@@ -0,0 +1,23 @@
+/**
+ * @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 {MdCell, MdCellDef, MdColumnDef, MdHeaderCell, MdHeaderCellDef} from './cell';
+import {MdHeaderRow, MdRow} from './row';
+import {MdTable} from './table';
+import {MdTableModule} from './table-module';
+
+
+export {MdCell as MatCell};
+export {MdCellDef as MatCellDef};
+export {MdColumnDef as MatColumnDef};
+export {MdHeaderCell as MatHeaderCell};
+export {MdHeaderCellDef as MatHeaderCellDef};
+export {MdHeaderRow as MatHeaderRow};
+export {MdRow as MatRow};
+export {MdTable as MatTable};
+export {MdTableModule as MatTableModule};
diff --git a/src/lib/table/public_api.ts b/src/lib/table/public_api.ts
index 80517d4dde91..8626940dc2e6 100644
--- a/src/lib/table/public_api.ts
+++ b/src/lib/table/public_api.ts
@@ -6,27 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdTable} from './table';
-import {CdkTableModule} from '@angular/cdk/table';
-import {MdCell, MdHeaderCell, MdCellDef, MdHeaderCellDef, MdColumnDef} from './cell';
-import {MdHeaderRow, MdRow, MdHeaderRowDef, MdRowDef, MatHeaderRowDef, MatRowDef} from './row';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '@angular/material/core';
-
+export * from './table-module';
 export * from './cell';
 export * from './table';
 export * from './row';
-
-@NgModule({
-  imports: [CdkTableModule, CommonModule, MdCommonModule],
-  exports: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
-    MdHeaderRowDef, MdRowDef,
-    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
-    MatHeaderRowDef, MatRowDef],
-  declarations: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
-    MdHeaderRowDef, MdRowDef,
-    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
-    MatHeaderRowDef, MatRowDef],
-})
-export class MdTableModule {}
+export * from './mat-exports';
diff --git a/src/lib/table/table-module.ts b/src/lib/table/table-module.ts
new file mode 100644
index 000000000000..791d0317b60d
--- /dev/null
+++ b/src/lib/table/table-module.ts
@@ -0,0 +1,28 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdTable} from './table';
+import {CdkTableModule} from '@angular/cdk/table';
+import {MdCell, MdHeaderCell, MdCellDef, MdHeaderCellDef, MdColumnDef} from './cell';
+import {MdHeaderRow, MdRow, MdHeaderRowDef, MdRowDef, MatHeaderRowDef, MatRowDef} from './row';
+import {CommonModule} from '@angular/common';
+import {MdCommonModule} from '@angular/material/core';
+
+@NgModule({
+  imports: [CdkTableModule, CommonModule, MdCommonModule],
+  exports: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
+    MdHeaderRowDef, MdRowDef,
+    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
+    MatHeaderRowDef, MatRowDef],
+  declarations: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
+    MdHeaderRowDef, MdRowDef,
+    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
+    MatHeaderRowDef, MatRowDef],
+})
+export class MdTableModule {}
diff --git a/src/lib/tabs/mat-exports.ts b/src/lib/tabs/mat-exports.ts
new file mode 100644
index 000000000000..b859f73cff3e
--- /dev/null
+++ b/src/lib/tabs/mat-exports.ts
@@ -0,0 +1,34 @@
+/**
+ * @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 {MdInkBar} from './ink-bar';
+import {MdTab} from './tab';
+import {MdTabBody, MdTabBodyOriginState, MdTabBodyPositionState} from './tab-body';
+import {MdTabChangeEvent, MdTabGroup, MdTabGroupBase, MdTabHeaderPosition} from './tab-group';
+import {MdTabHeader} from './tab-header';
+import {MdTabLabel} from './tab-label';
+import {MdTabLabelWrapper} from './tab-label-wrapper';
+import {MdTabLink, MdTabNav} from './tab-nav-bar/index';
+import {MdTabsModule} from './tabs-module';
+
+
+export {MdInkBar as MatInkBar};
+export {MdTab as MatTab};
+export {MdTabBody as MatTabBody};
+export {MdTabBodyOriginState as MatTabBodyOriginState};
+export {MdTabBodyPositionState as MatTabBodyPositionState};
+export {MdTabChangeEvent as MatTabChangeEvent};
+export {MdTabGroup as MatTabGroup};
+export {MdTabGroupBase as MatTabGroupBase};
+export {MdTabHeader as MatTabHeader};
+export {MdTabHeaderPosition as MatTabHeaderPosition};
+export {MdTabLabel as MatTabLabel};
+export {MdTabLabelWrapper as MatTabLabelWrapper};
+export {MdTabLink as MatTabLink};
+export {MdTabNav as MatTabNav};
+export {MdTabsModule as MatTabsModule};
diff --git a/src/lib/tabs/public_api.ts b/src/lib/tabs/public_api.ts
index 1821ae41243e..75d1ff5c1acc 100644
--- a/src/lib/tabs/public_api.ts
+++ b/src/lib/tabs/public_api.ts
@@ -6,56 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ObserversModule} from '@angular/cdk/observers';
-import {PortalModule} from '@angular/cdk/portal';
-import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MdCommonModule, MdRippleModule} from '@angular/material/core';
-import {MdInkBar} from './ink-bar';
-import {MdTab} from './tab';
-import {MdTabBody} from './tab-body';
-import {MdTabGroup} from './tab-group';
-import {MdTabHeader} from './tab-header';
-import {MdTabLabel} from './tab-label';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
-import {MdTabLink, MdTabNav} from './tab-nav-bar/tab-nav-bar';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    MdCommonModule,
-    PortalModule,
-    MdRippleModule,
-    ObserversModule,
-    ScrollDispatchModule,
-  ],
-  // Don't export all components because some are only to be used internally.
-  exports: [
-    MdCommonModule,
-    MdTabGroup,
-    MdTabLabel,
-    MdTab,
-    MdTabNav,
-    MdTabLink,
-  ],
-  declarations: [
-    MdTabGroup,
-    MdTabLabel,
-    MdTab,
-    MdInkBar,
-    MdTabLabelWrapper,
-    MdTabNav,
-    MdTabLink,
-    MdTabBody,
-    MdTabHeader
-  ],
-  providers: [VIEWPORT_RULER_PROVIDER],
-})
-export class MdTabsModule {}
-
-
+export * from './tabs-module';
 export * from './tab-group';
 export {MdInkBar} from './ink-bar';
 export {MdTabBody, MdTabBodyOriginState, MdTabBodyPositionState} from './tab-body';
@@ -65,3 +16,4 @@ export {MdTab} from './tab';
 export {MdTabLabel} from './tab-label';
 export {MdTabNav, MdTabLink} from './tab-nav-bar/index';
 
+export * from './mat-exports';
diff --git a/src/lib/tabs/tabs-module.ts b/src/lib/tabs/tabs-module.ts
new file mode 100644
index 000000000000..ee93f03ec4f4
--- /dev/null
+++ b/src/lib/tabs/tabs-module.ts
@@ -0,0 +1,56 @@
+/**
+ * @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 {ObserversModule} from '@angular/cdk/observers';
+import {PortalModule} from '@angular/cdk/portal';
+import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdCommonModule, MdRippleModule} from '@angular/material/core';
+import {MdInkBar} from './ink-bar';
+import {MdTab} from './tab';
+import {MdTabBody} from './tab-body';
+import {MdTabGroup} from './tab-group';
+import {MdTabHeader} from './tab-header';
+import {MdTabLabel} from './tab-label';
+import {MdTabLabelWrapper} from './tab-label-wrapper';
+import {MdTabLink, MdTabNav} from './tab-nav-bar/tab-nav-bar';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    MdCommonModule,
+    PortalModule,
+    MdRippleModule,
+    ObserversModule,
+    ScrollDispatchModule,
+  ],
+  // Don't export all components because some are only to be used internally.
+  exports: [
+    MdCommonModule,
+    MdTabGroup,
+    MdTabLabel,
+    MdTab,
+    MdTabNav,
+    MdTabLink,
+  ],
+  declarations: [
+    MdTabGroup,
+    MdTabLabel,
+    MdTab,
+    MdInkBar,
+    MdTabLabelWrapper,
+    MdTabNav,
+    MdTabLink,
+    MdTabBody,
+    MdTabHeader
+  ],
+  providers: [VIEWPORT_RULER_PROVIDER],
+})
+export class MdTabsModule {}
diff --git a/src/lib/toolbar/mat-exports.ts b/src/lib/toolbar/mat-exports.ts
new file mode 100644
index 000000000000..3e69041d0ebd
--- /dev/null
+++ b/src/lib/toolbar/mat-exports.ts
@@ -0,0 +1,16 @@
+/**
+ * @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 {MdToolbar, MdToolbarBase, MdToolbarRow} from './toolbar';
+import {MdToolbarModule} from './toolbar-module';
+
+
+export {MdToolbar as MatToolbar};
+export {MdToolbarBase as MatToolbarBase};
+export {MdToolbarModule as MatToolbarModule};
+export {MdToolbarRow as MatToolbarRow};
diff --git a/src/lib/toolbar/public_api.ts b/src/lib/toolbar/public_api.ts
index 011492c6388f..24b5e4c62462 100644
--- a/src/lib/toolbar/public_api.ts
+++ b/src/lib/toolbar/public_api.ts
@@ -6,17 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MdToolbar, MdToolbarRow} from './toolbar';
-
-
-@NgModule({
-  imports: [MdCommonModule],
-  exports: [MdToolbar, MdToolbarRow, MdCommonModule],
-  declarations: [MdToolbar, MdToolbarRow],
-})
-export class MdToolbarModule {}
-
-
+export * from './toolbar-module';
 export * from './toolbar';
+export * from './mat-exports';
diff --git a/src/lib/toolbar/toolbar-module.ts b/src/lib/toolbar/toolbar-module.ts
new file mode 100644
index 000000000000..b4eee3b54a58
--- /dev/null
+++ b/src/lib/toolbar/toolbar-module.ts
@@ -0,0 +1,19 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {MdToolbar, MdToolbarRow} from './toolbar';
+
+
+@NgModule({
+  imports: [MdCommonModule],
+  exports: [MdToolbar, MdToolbarRow, MdCommonModule],
+  declarations: [MdToolbar, MdToolbarRow],
+})
+export class MdToolbarModule {}
diff --git a/src/lib/tooltip/mat-exports.ts b/src/lib/tooltip/mat-exports.ts
new file mode 100644
index 000000000000..080519017a01
--- /dev/null
+++ b/src/lib/tooltip/mat-exports.ts
@@ -0,0 +1,23 @@
+/**
+ * @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 {
+  MD_TOOLTIP_SCROLL_STRATEGY,
+  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER,
+  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  MdTooltip,
+} from './tooltip';
+import {MdTooltipModule} from './tooltip-module';
+
+
+/* tslint:disable:max-line-length */
+export {MdTooltip as MatTooltip};
+export {MdTooltipModule as MatTooltipModule};
+export {MD_TOOLTIP_SCROLL_STRATEGY as MAT_TOOLTIP_SCROLL_STRATEGY};
+export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER};
+export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY};
diff --git a/src/lib/tooltip/public_api.ts b/src/lib/tooltip/public_api.ts
index db8e168c0701..2de9d7df0b3d 100644
--- a/src/lib/tooltip/public_api.ts
+++ b/src/lib/tooltip/public_api.ts
@@ -6,29 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {A11yModule, ARIA_DESCRIBER_PROVIDER} from '@angular/cdk/a11y';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PlatformModule} from '@angular/cdk/platform';
-import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, MdTooltip, TooltipComponent} from './tooltip';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    OverlayModule,
-    MdCommonModule,
-    PlatformModule,
-    A11yModule,
-  ],
-  exports: [MdTooltip, TooltipComponent, MdCommonModule],
-  declarations: [MdTooltip, TooltipComponent],
-  entryComponents: [TooltipComponent],
-  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
-})
-export class MdTooltipModule {}
-
-
+export * from './tooltip-module';
 export * from './tooltip';
+export * from './mat-exports';
diff --git a/src/lib/tooltip/tooltip-module.ts b/src/lib/tooltip/tooltip-module.ts
new file mode 100644
index 000000000000..3ea824d9d0f9
--- /dev/null
+++ b/src/lib/tooltip/tooltip-module.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 {A11yModule, ARIA_DESCRIBER_PROVIDER} from '@angular/cdk/a11y';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {PlatformModule} from '@angular/cdk/platform';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MdCommonModule} from '@angular/material/core';
+import {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, MdTooltip, TooltipComponent} from './tooltip';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    OverlayModule,
+    MdCommonModule,
+    PlatformModule,
+    A11yModule,
+  ],
+  exports: [MdTooltip, TooltipComponent, MdCommonModule],
+  declarations: [MdTooltip, TooltipComponent],
+  entryComponents: [TooltipComponent],
+  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
+})
+export class MdTooltipModule {}
diff --git a/tools/package-tools/secondary-entry-points.ts b/tools/package-tools/secondary-entry-points.ts
index d94d1e251deb..6b002f6269f6 100644
--- a/tools/package-tools/secondary-entry-points.ts
+++ b/tools/package-tools/secondary-entry-points.ts
@@ -48,7 +48,7 @@ export function getSecondaryEntryPointsForPackage(pkg: BuildPackage) {
     .split('\n')
     .filter(n => n)
     .map(importStatement => importStatement.match(importRegex)![1])
-    .filter(n => nodeLookup.has(n))
+    .filter(n => nodeLookup.has(n) && n !== node.name)
     .map(depName => nodeLookup.get(depName)!) || [];
   });
 

From 3293a6d085b06bb0d90f9046f77a81a9411eaf4a Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 20 Sep 2017 15:49:57 -0700
Subject: [PATCH 114/575] compat(chip): add mat-compatible chip input event
 (#7184)

---
 src/lib/chips/chip-input.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 1c8aa79e6424..14684c9b0762 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -68,6 +68,8 @@ export class MdChipInput {
   @Output('mdChipInputTokenEnd')
   chipEnd = new EventEmitter<MdChipInputEvent>();
 
+  @Output('matChipInputTokenEnd') _matChipInputTokenEnd = this.chipEnd;
+
   @Input('matChipInputFor')
   set matChipList(value: MdChipList) { this.chipList = value; }
 

From 2b0315d3a267bc083db17580ff05ca5281280b13 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 20 Sep 2017 15:58:55 -0700
Subject: [PATCH 115/575] feat: add `preserveWhitespaces: false` to all
 components (#7115)

Also adds lint check to enforce its presence
---
 src/cdk/stepper/stepper.ts                               | 3 ++-
 src/cdk/table/row.ts                                     | 2 ++
 src/cdk/table/table.ts                                   | 1 +
 src/demo-app/a11y/a11y.ts                                | 1 +
 src/demo-app/a11y/icon/icon-a11y.ts                      | 1 +
 src/demo-app/autocomplete/autocomplete-demo.ts           | 3 ++-
 src/demo-app/demo-app/demo-app.ts                        | 2 ++
 src/demo-app/expansion/expansion-demo.ts                 | 1 +
 src/demo-app/icon/icon-demo.ts                           | 1 +
 src/demo-app/overlay/overlay-demo.ts                     | 1 +
 src/demo-app/sidenav/sidenav-demo.ts                     | 1 +
 src/demo-app/snack-bar/snack-bar-demo.ts                 | 1 +
 src/demo-app/tabs/tabs-demo.ts                           | 1 +
 src/demo-app/tooltip/tooltip-demo.ts                     | 1 +
 src/lib/autocomplete/autocomplete.ts                     | 1 +
 src/lib/button-toggle/button-toggle.ts                   | 1 +
 src/lib/button/button.ts                                 | 2 ++
 src/lib/card/card.ts                                     | 3 +++
 src/lib/checkbox/checkbox.ts                             | 1 +
 src/lib/chips/chip-list.ts                               | 1 +
 src/lib/core/option/optgroup.ts                          | 1 +
 src/lib/core/option/option.ts                            | 1 +
 .../core/selection/pseudo-checkbox/pseudo-checkbox.ts    | 1 +
 src/lib/datepicker/calendar-body.ts                      | 1 +
 src/lib/datepicker/calendar.ts                           | 1 +
 src/lib/datepicker/datepicker-toggle.ts                  | 1 +
 src/lib/datepicker/datepicker.ts                         | 2 ++
 src/lib/datepicker/month-view.ts                         | 1 +
 src/lib/datepicker/year-view.ts                          | 1 +
 src/lib/dialog/dialog-container.ts                       | 1 +
 src/lib/expansion/expansion-panel-header.ts              | 1 +
 src/lib/expansion/expansion-panel.ts                     | 1 +
 src/lib/form-field/form-field.ts                         | 1 +
 src/lib/grid-list/grid-list.ts                           | 1 +
 src/lib/grid-list/grid-tile.ts                           | 2 ++
 src/lib/icon/icon.ts                                     | 1 +
 src/lib/list/list.ts                                     | 2 ++
 src/lib/list/selection-list.ts                           | 2 ++
 src/lib/menu/menu-directive.ts                           | 1 +
 src/lib/menu/menu-item.ts                                | 1 +
 src/lib/paginator/paginator.ts                           | 1 +
 src/lib/progress-bar/progress-bar.ts                     | 1 +
 src/lib/progress-spinner/progress-spinner.ts             | 2 ++
 src/lib/radio/radio.ts                                   | 1 +
 src/lib/select/select.ts                                 | 1 +
 src/lib/sidenav/drawer.ts                                | 2 ++
 src/lib/sidenav/sidenav.ts                               | 2 ++
 src/lib/slide-toggle/slide-toggle.ts                     | 1 +
 src/lib/slider/slider.ts                                 | 1 +
 src/lib/snack-bar/simple-snack-bar.ts                    | 1 +
 src/lib/snack-bar/snack-bar-container.ts                 | 1 +
 src/lib/sort/sort-header.ts                              | 1 +
 src/lib/stepper/step-header.ts                           | 1 +
 src/lib/stepper/stepper.ts                               | 9 ++++++---
 src/lib/table/row.ts                                     | 2 ++
 src/lib/table/table.ts                                   | 1 +
 src/lib/tabs/tab-body.ts                                 | 1 +
 src/lib/tabs/tab-group.ts                                | 1 +
 src/lib/tabs/tab-header.ts                               | 1 +
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts                  | 1 +
 src/lib/tabs/tab.ts                                      | 1 +
 src/lib/toolbar/toolbar.ts                               | 3 ++-
 src/lib/tooltip/tooltip.ts                               | 1 +
 src/material-examples/sidenav-fab/sidenav-fab-example.ts | 1 +
 .../slider-configurable/slider-configurable-example.ts   | 1 +
 tslint.json                                              | 3 ++-
 66 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index eb0b5b9b4449..30b12781b759 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -60,7 +60,8 @@ export class StepperSelectionEvent {
   moduleId: module.id,
   selector: 'cdk-step',
   templateUrl: 'step.html',
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class CdkStep {
   /** Template for step label if it exists. */
diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 037cdeae5e5e..5be5dc7742d7 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -150,6 +150,7 @@ export class CdkCellOutlet {
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class CdkHeaderRow { }
 
@@ -164,5 +165,6 @@ export class CdkHeaderRow { }
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class CdkRow { }
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 791fc39a483a..e00568d29961 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -76,6 +76,7 @@ export const CDK_TABLE_TEMPLATE = `
     'class': 'cdk-table',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CdkTable<T> implements CollectionViewer {
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 644430399887..f522717c5b2e 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -13,6 +13,7 @@ export class AccessibilityHome {}
   templateUrl: 'a11y.html',
   styleUrls: ['a11y.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class AccessibilityDemo {
   @ViewChild('maincontent') mainContent: ElementRef;
diff --git a/src/demo-app/a11y/icon/icon-a11y.ts b/src/demo-app/a11y/icon/icon-a11y.ts
index dfac7d4c04ea..9a5ae09bd96e 100644
--- a/src/demo-app/a11y/icon/icon-a11y.ts
+++ b/src/demo-app/a11y/icon/icon-a11y.ts
@@ -6,6 +6,7 @@ import {MdSnackBar} from '@angular/material';
   selector: 'icon-a11y',
   templateUrl: 'icon-a11y.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class IconAccessibilityDemo {
   constructor(private snackBar: MdSnackBar) {}
diff --git a/src/demo-app/autocomplete/autocomplete-demo.ts b/src/demo-app/autocomplete/autocomplete-demo.ts
index a138a007df82..dc5a486e80f7 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.ts
+++ b/src/demo-app/autocomplete/autocomplete-demo.ts
@@ -18,7 +18,8 @@ export interface StateGroup {
   selector: 'autocomplete-demo',
   templateUrl: 'autocomplete-demo.html',
   styleUrls: ['autocomplete-demo.css'],
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class AutocompleteDemo {
   stateCtrl: FormControl;
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 4d43f5711873..93a647f91978 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -17,6 +17,7 @@ import {OverlayContainer} from '@angular/cdk/overlay';
   selector: 'entry-app',
   template: '<router-outlet></router-outlet>',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class EntryApp {}
 
@@ -41,6 +42,7 @@ export class Home {}
   templateUrl: 'demo-app.html',
   styleUrls: ['demo-app.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class DemoApp {
   dark = false;
diff --git a/src/demo-app/expansion/expansion-demo.ts b/src/demo-app/expansion/expansion-demo.ts
index 868c04e564b5..e3ae3dee100d 100644
--- a/src/demo-app/expansion/expansion-demo.ts
+++ b/src/demo-app/expansion/expansion-demo.ts
@@ -6,6 +6,7 @@ import {Component, ViewEncapsulation} from '@angular/core';
   styleUrls: ['expansion-demo.css'],
   templateUrl: 'expansion-demo.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class ExpansionDemo {
   displayMode: string = 'default';
diff --git a/src/demo-app/icon/icon-demo.ts b/src/demo-app/icon/icon-demo.ts
index 67faa801d2a9..e5975d672a2d 100644
--- a/src/demo-app/icon/icon-demo.ts
+++ b/src/demo-app/icon/icon-demo.ts
@@ -8,6 +8,7 @@ import {MdIconRegistry} from '@angular/material';
   templateUrl: 'icon-demo.html',
   styleUrls: ['icon-demo.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class IconDemo {
   constructor(mdIconRegistry: MdIconRegistry, sanitizer: DomSanitizer) {
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index 1cf11b4796aa..1406c4b286d9 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -23,6 +23,7 @@ import {
   templateUrl: 'overlay-demo.html',
   styleUrls: ['overlay-demo.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class OverlayDemo {
   nextPosition: number = 0;
diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts
index 5d72a469a5df..60be081c2a85 100644
--- a/src/demo-app/sidenav/sidenav-demo.ts
+++ b/src/demo-app/sidenav/sidenav-demo.ts
@@ -7,6 +7,7 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'sidenav-demo.html',
   styleUrls: ['sidenav-demo.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class SidenavDemo {
   invert = false;
diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 6f905ce052ba..8138d60796a1 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -13,6 +13,7 @@ import {
   styleUrls: ['snack-bar-demo.css'],
   templateUrl: 'snack-bar-demo.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class SnackBarDemo {
   message: string = 'Snack Bar opened.';
diff --git a/src/demo-app/tabs/tabs-demo.ts b/src/demo-app/tabs/tabs-demo.ts
index d5eedce2ef86..84e442de1e7a 100644
--- a/src/demo-app/tabs/tabs-demo.ts
+++ b/src/demo-app/tabs/tabs-demo.ts
@@ -7,6 +7,7 @@ import {Observable} from 'rxjs/Observable';
   templateUrl: 'tabs-demo.html',
   styleUrls: ['tabs-demo.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class TabsDemo {
   // Nav bar demo
diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts
index 95b79d9f49b9..6839192a7118 100644
--- a/src/demo-app/tooltip/tooltip-demo.ts
+++ b/src/demo-app/tooltip/tooltip-demo.ts
@@ -8,6 +8,7 @@ import {TooltipPosition} from '@angular/material';
   templateUrl: 'tooltip-demo.html',
   styleUrls: ['tooltip-demo.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class TooltipDemo {
   position: TooltipPosition = 'below';
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index e9041dee1533..24c29d411fd7 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -43,6 +43,7 @@ export class MdAutocompleteSelectedEvent {
   templateUrl: 'autocomplete.html',
   styleUrls: ['autocomplete.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   exportAs: 'mdAutocomplete, matAutocomplete',
   host: {
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index a38023fedfa5..cb45c07dec00 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -262,6 +262,7 @@ export class MdButtonToggleGroupMultiple extends _MdButtonToggleGroupMixinBase
   templateUrl: 'button-toggle.html',
   styleUrls: ['button-toggle.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     '[class.mat-button-toggle-standalone]': '!buttonToggleGroup && !buttonToggleGroupMultiple',
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 208a16f04d89..ebfb6960d120 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -128,6 +128,7 @@ export const _MdButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(Md
   styleUrls: ['button.css'],
   inputs: ['disabled', 'disableRipple', 'color'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdButton extends _MdButtonMixinBase
@@ -201,6 +202,7 @@ export class MdButton extends _MdButtonMixinBase
   templateUrl: 'button.html',
   styleUrls: ['button.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdAnchor extends MdButton {
diff --git a/src/lib/card/card.ts b/src/lib/card/card.ts
index 71ef6e192435..2ec494d2b118 100644
--- a/src/lib/card/card.ts
+++ b/src/lib/card/card.ts
@@ -155,6 +155,7 @@ export class MdCardAvatar {}
   templateUrl: 'card.html',
   styleUrls: ['card.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card'}
 })
@@ -171,6 +172,7 @@ export class MdCard {}
   selector: 'md-card-header, mat-card-header',
   templateUrl: 'card-header.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card-header'}
 })
@@ -187,6 +189,7 @@ export class MdCardHeader {}
   selector: 'md-card-title-group, mat-card-title-group',
   templateUrl: 'card-title-group.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card-title-group'}
 })
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index c94975d72c76..fa32e27a6f45 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -106,6 +106,7 @@ export const _MdCheckboxMixinBase =
   providers: [MD_CHECKBOX_CONTROL_VALUE_ACCESSOR],
   inputs: ['disabled', 'disableRipple', 'color'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAccessor, AfterViewInit,
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 0643aeb9978c..fdd510ca2e05 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -83,6 +83,7 @@ export class MdChipListChange {
   providers: [{provide: MdFormFieldControl, useExisting: MdChipList}],
   styleUrls: ['chips.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor,
diff --git a/src/lib/core/option/optgroup.ts b/src/lib/core/option/optgroup.ts
index 0a2937eb979b..f904895ac8d2 100644
--- a/src/lib/core/option/optgroup.ts
+++ b/src/lib/core/option/optgroup.ts
@@ -25,6 +25,7 @@ let _uniqueOptgroupIdCounter = 0;
   selector: 'md-optgroup, mat-optgroup',
   templateUrl: 'optgroup.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['disabled'],
   host: {
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index 09730a275466..ebb95a93330f 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -57,6 +57,7 @@ export class MdOptionSelectionChange {
   },
   templateUrl: 'option.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdOption {
diff --git a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
index a47534db61fe..db3e5331b153 100644
--- a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
+++ b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
@@ -26,6 +26,7 @@ export type MdPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
 @Component({
   moduleId: module.id,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   selector: 'md-pseudo-checkbox, mat-pseudo-checkbox',
   styleUrls: ['pseudo-checkbox.css'],
diff --git a/src/lib/datepicker/calendar-body.ts b/src/lib/datepicker/calendar-body.ts
index 3dfa45a8513f..c6a2d70d2bd0 100644
--- a/src/lib/datepicker/calendar-body.ts
+++ b/src/lib/datepicker/calendar-body.ts
@@ -41,6 +41,7 @@ export class MdCalendarCell {
     'class': 'mat-calendar-body',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdCalendarBody {
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index fd4cb3f5fa1f..32a43d5f39c2 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -57,6 +57,7 @@ import {MdDatepickerIntl} from './datepicker-intl';
     'class': 'mat-calendar',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdCalendar<D> implements AfterContentInit, OnDestroy {
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index 44698e2fbd10..006ee0cb7520 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -32,6 +32,7 @@ import {of as observableOf} from 'rxjs/observable/of';
     'class': 'mat-datepicker-toggle',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdDatepickerToggle<D> implements OnChanges, OnDestroy {
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index df5c6190499e..0688d645f788 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -85,6 +85,7 @@ export const MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
     '(keydown)': '_handleKeydown($event)',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdDatepickerContent<D> implements AfterContentInit {
@@ -120,6 +121,7 @@ export class MdDatepickerContent<D> implements AfterContentInit {
   template: '',
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdDatepicker<D> implements OnDestroy {
   /** The date to open the calendar to initially. */
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index 379d2edc1c18..9cb2914578e0 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -34,6 +34,7 @@ const DAYS_PER_WEEK = 7;
   selector: 'md-month-view',
   templateUrl: 'month-view.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdMonthView<D> implements AfterContentInit {
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index 81560fbf93ee..8bf750b7776c 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -31,6 +31,7 @@ import {createMissingDateImplError} from './datepicker-errors';
   selector: 'md-year-view, mat-year-view',
   templateUrl: 'year-view.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdYearView<D> implements AfterContentInit {
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 40e48f3c4e05..0fc71833df46 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -50,6 +50,7 @@ export function throwMdDialogContentAlreadyAttachedError() {
   templateUrl: 'dialog-container.html',
   styleUrls: ['dialog.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   animations: [
     trigger('slideDialog', [
       // Note: The `enter` animation doesn't transition to something like `translate3d(0, 0, 0)
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index afdfad08d6af..e18cfe61a67b 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -46,6 +46,7 @@ import {Subscription} from 'rxjs/Subscription';
   styleUrls: ['./expansion-panel-header.css'],
   templateUrl: './expansion-panel-header.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     'class': 'mat-expansion-panel-header',
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 8b76f72970ec..5ed09e2fcf79 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -58,6 +58,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
   selector: 'md-expansion-panel, mat-expansion-panel',
   templateUrl: './expansion-panel.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['disabled', 'expanded'],
   host: {
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index e986fd30d8b2..c0644f2abdae 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -83,6 +83,7 @@ let nextUniqueId = 0;
     '(click)': '_control.focus()',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 
diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
index 5a5581995835..bfa2c9a802b3 100644
--- a/src/lib/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -45,6 +45,7 @@ const MD_FIT_MODE = 'fit';
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdGridList implements OnInit, AfterContentChecked {
   /** Number of columns being rendered. */
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index 72b1d9427ca6..62443ef026e6 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -30,6 +30,7 @@ import {coerceToNumber} from './grid-list-measure';
   templateUrl: 'grid-tile.html',
   styleUrls: ['grid-list.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdGridTile {
@@ -63,6 +64,7 @@ export class MdGridTile {
   templateUrl: 'grid-tile-text.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdGridTileText implements AfterContentInit {
   /**
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index b10ddcf96953..f27d46ea5d29 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -69,6 +69,7 @@ export const _MdIconMixinBase = mixinColor(MdIconBase);
     'class': 'mat-icon',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdIcon extends _MdIconMixinBase implements OnChanges, OnInit, CanColor {
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index ef345319f1f2..06051afc267a 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -52,6 +52,7 @@ export class MdListDivider {}
   styleUrls: ['list.css'],
   inputs: ['disableRipple'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdList extends _MdListMixinBase implements CanDisableRipple {}
@@ -129,6 +130,7 @@ export class MdListSubheaderCssMatStyler {}
   inputs: ['disableRipple'],
   templateUrl: 'list-item.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdListItem extends _MdListItemMixinBase implements AfterContentInit, CanDisableRipple {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index df76d6ec39e0..852eaf74d137 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -81,6 +81,7 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   },
   templateUrl: 'list-option.html',
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
 })
@@ -201,6 +202,7 @@ export class MdListOption extends _MdListOptionMixinBase
   template: '<ng-content></ng-content>',
   styleUrls: ['list.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdSelectionList extends _MdSelectionListMixinBase
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 3c673254278f..594de4d5e5e0 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -62,6 +62,7 @@ const MD_MENU_BASE_ELEVATION = 2;
   styleUrls: ['menu.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   animations: [
     transformMenu,
     fadeInItems
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index a0745fe3baf5..b801dc6c2940 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -43,6 +43,7 @@ export const _MdMenuItemMixinBase = mixinDisabled(MdMenuItemBase);
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   templateUrl: 'menu-item.html',
   exportAs: 'mdMenuItem, matMenuItem',
 })
diff --git a/src/lib/paginator/paginator.ts b/src/lib/paginator/paginator.ts
index b4c04903558f..a0903e392cbf 100644
--- a/src/lib/paginator/paginator.ts
+++ b/src/lib/paginator/paginator.ts
@@ -57,6 +57,7 @@ export class PageEvent {
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdPaginator implements OnInit, OnDestroy {
   private _initialized: boolean;
diff --git a/src/lib/progress-bar/progress-bar.ts b/src/lib/progress-bar/progress-bar.ts
index 83e3a4ead8f1..36bdc00aa7d5 100644
--- a/src/lib/progress-bar/progress-bar.ts
+++ b/src/lib/progress-bar/progress-bar.ts
@@ -33,6 +33,7 @@ import {Component, ChangeDetectionStrategy, Input, ViewEncapsulation} from '@ang
   styleUrls: ['progress-bar.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdProgressBar {
   /** Color of the progress bar. */
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index ee4ec891a231..136a18335815 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -82,6 +82,7 @@ export const _MdProgressSpinnerMixinBase = mixinColor(MdProgressSpinnerBase, 'pr
   styleUrls: ['progress-spinner.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdProgressSpinner extends _MdProgressSpinnerMixinBase
     implements OnDestroy, CanColor {
@@ -289,6 +290,7 @@ export class MdProgressSpinner extends _MdProgressSpinnerMixinBase
   styleUrls: ['progress-spinner.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdSpinner extends MdProgressSpinner {
   constructor(elementRef: ElementRef, ngZone: NgZone, renderer: Renderer2) {
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index c30a1ddd848e..652a70154129 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -326,6 +326,7 @@ export const _MdRadioButtonMixinBase = mixinColor(mixinDisableRipple(MdRadioButt
   styleUrls: ['radio.css'],
   inputs: ['color', 'disableRipple'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   host: {
     'class': 'mat-radio-button',
     '[class.mat-radio-checked]': 'checked',
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index d7a20d8fc639..8601e3066dcb 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -178,6 +178,7 @@ export class MdSelectTrigger {}
   styleUrls: ['select.css'],
   inputs: ['color', 'disabled', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     'role': 'listbox',
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index ea4d0af73d96..52271e625fc7 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -89,6 +89,7 @@ export class MdDrawerToggleResult {
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdDrawer implements AfterContentInit, OnDestroy {
   private _focusTrap: FocusTrap;
@@ -313,6 +314,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   @ContentChildren(MdDrawer) _drawers: QueryList<MdDrawer>;
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index 05f65c0e3af3..12e8b925bcfa 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -50,6 +50,7 @@ import {animate, state, style, transition, trigger} from '@angular/animations';
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdSidenav extends MdDrawer {}
 
@@ -67,6 +68,7 @@ export class MdSidenav extends MdDrawer {}
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdSidenavContainer extends MdDrawerContainer {
   @ContentChildren(MdSidenav) _drawers;
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index d7b6b2b895c6..d9e9c74233ea 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -76,6 +76,7 @@ export const _MdSlideToggleMixinBase =
   providers: [MD_SLIDE_TOGGLE_VALUE_ACCESSOR],
   inputs: ['disabled', 'disableRipple', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy, AfterContentInit,
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 0f78a906429d..25dda65e0354 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -127,6 +127,7 @@ export const _MdSliderMixinBase = mixinColor(mixinDisabled(MdSliderBase), 'accen
   styleUrls: ['slider.css'],
   inputs: ['disabled', 'color'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdSlider extends _MdSliderMixinBase
diff --git a/src/lib/snack-bar/simple-snack-bar.ts b/src/lib/snack-bar/simple-snack-bar.ts
index d2db0ef2e206..e0236fd0e4c8 100644
--- a/src/lib/snack-bar/simple-snack-bar.ts
+++ b/src/lib/snack-bar/simple-snack-bar.ts
@@ -21,6 +21,7 @@ import {MD_SNACK_BAR_DATA} from './snack-bar-config';
   templateUrl: 'simple-snack-bar.html',
   styleUrls: ['simple-snack-bar.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     'class': 'mat-simple-snackbar',
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 0828b73cd12d..79688edc6731 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -56,6 +56,7 @@ export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
   styleUrls: ['snack-bar-container.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   host: {
     'role': 'alert',
     'class': 'mat-snack-bar-container',
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index de8d3628a01e..5547cce09be1 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -52,6 +52,7 @@ const SORT_ANIMATION_TRANSITION =
     '[class.mat-sort-header-sorted]': '_isSorted()',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     trigger('indicator', [
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 10176b3c2424..d610db9a73b3 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -22,6 +22,7 @@ import {MdStepLabel} from './step-label';
     'role': 'tab',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
 })
 export class MdStepHeader {
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 3ffab445a85b..6c2098e5e065 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -41,7 +41,8 @@ export const _MdStepper = CdkStepper;
   selector: 'md-step, mat-step',
   templateUrl: 'step.html',
   providers: [{provide: MD_ERROR_GLOBAL_OPTIONS, useExisting: MdStep}],
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdStep extends _MdStep implements ErrorOptions {
   /** Content for step label given by <ng-template matStepLabel> or <ng-template mdStepLabel>. */
@@ -104,7 +105,8 @@ export class MdStepper extends _MdStepper {
     ])
   ],
   providers: [{provide: MdStepper, useExisting: MdHorizontalStepper}],
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdHorizontalStepper extends MdStepper { }
 
@@ -127,6 +129,7 @@ export class MdHorizontalStepper extends MdStepper { }
     ])
   ],
   providers: [{provide: MdStepper, useExisting: MdVerticalStepper}],
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdVerticalStepper extends MdStepper { }
diff --git a/src/lib/table/row.ts b/src/lib/table/row.ts
index 48fbf4cb8d6d..20857c9ca12a 100644
--- a/src/lib/table/row.ts
+++ b/src/lib/table/row.ts
@@ -70,6 +70,7 @@ export class MatRowDef extends _MdCdkRowDef { }
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdHeaderRow extends _MdHeaderRow { }
 
@@ -84,5 +85,6 @@ export class MdHeaderRow extends _MdHeaderRow { }
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdRow extends _MdRow { }
diff --git a/src/lib/table/table.ts b/src/lib/table/table.ts
index fd452d1f953a..d0ecc92bede3 100644
--- a/src/lib/table/table.ts
+++ b/src/lib/table/table.ts
@@ -24,6 +24,7 @@ export const _MdTable = CdkTable;
     'class': 'mat-table',
   },
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdTable<T> extends _MdTable<T> { }
diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index ce54ea95778c..7af7a6e8593f 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -62,6 +62,7 @@ export type MdTabBodyOriginState = 'left' | 'right';
   templateUrl: 'tab-body.html',
   styleUrls: ['tab-body.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     'class': 'mat-tab-body',
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 1521c92382ac..5a7297cd89c3 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -62,6 +62,7 @@ export const _MdTabGroupMixinBase = mixinColor(mixinDisableRipple(MdTabGroupBase
   templateUrl: 'tab-group.html',
   styleUrls: ['tab-group.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['color', 'disableRipple'],
   host: {
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 638c53a268f7..b92d9d15a77d 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -68,6 +68,7 @@ export const _MdTabHeaderMixinBase = mixinDisableRipple(MdTabHeaderBase);
   styleUrls: ['tab-header.css'],
   inputs: ['disableRipple'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     'class': 'mat-tab-header',
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 44a22aa7b18c..506f0564f818 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -68,6 +68,7 @@ export const _MdTabNavMixinBase = mixinDisableRipple(mixinColor(MdTabNavBase, 'p
   styleUrls: ['tab-nav-bar.css'],
   host: {'class': 'mat-tab-nav-bar'},
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, CanColor,
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index f848e33f0443..a8499dba0e29 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -37,6 +37,7 @@ export const _MdTabMixinBase = mixinDisabled(MdTabBase);
   inputs: ['disabled'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   exportAs: 'mdTab, matTab',
 })
 export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChanges, OnDestroy {
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index 19bdad5ff463..de05bc8d1257 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -42,7 +42,8 @@ export const _MdToolbarMixinBase = mixinColor(MdToolbarBase);
     'role': 'toolbar'
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
-  encapsulation: ViewEncapsulation.None
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class MdToolbar extends _MdToolbarMixinBase implements CanColor {
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index d9fab238996e..296150f34526 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -416,6 +416,7 @@ export type TooltipVisibility = 'initial' | 'visible' | 'hidden';
   templateUrl: 'tooltip.html',
   styleUrls: ['tooltip.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     trigger('state', [
diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.ts b/src/material-examples/sidenav-fab/sidenav-fab-example.ts
index cd228e86f61a..4af25f478ac0 100644
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.ts
+++ b/src/material-examples/sidenav-fab/sidenav-fab-example.ts
@@ -8,5 +8,6 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'sidenav-fab-example.html',
   styleUrls: ['sidenav-fab-example.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class SidenavFabExample {}
diff --git a/src/material-examples/slider-configurable/slider-configurable-example.ts b/src/material-examples/slider-configurable/slider-configurable-example.ts
index 80f206709907..caee9ab54cb9 100644
--- a/src/material-examples/slider-configurable/slider-configurable-example.ts
+++ b/src/material-examples/slider-configurable/slider-configurable-example.ts
@@ -8,6 +8,7 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'slider-configurable-example.html',
   styleUrls: ['slider-configurable-example.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class SliderConfigurableExample {
   autoTicks = false;
diff --git a/tslint.json b/tslint.json
index 527240dfd8ef..2e40ca7b22e9 100644
--- a/tslint.json
+++ b/tslint.json
@@ -90,7 +90,8 @@
     "validate-decorators": [true, {
       "Component": {
         "encapsulation": "\\.None$",
-        "moduleId": "^module\\.id$"
+        "moduleId": "^module\\.id$",
+        "preserveWhitespaces": "false$"
       }
     }, "src/+(lib|cdk)/**/!(*.spec).ts"],
     "require-license-banner": [

From a944f6e0f230ba715b61cf2faab9230c921d2c49 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 20 Sep 2017 16:04:41 -0700
Subject: [PATCH 116/575] feat(overlay): replace OverlayContainer themeClass w/
 addClass/removeClass methods (#6975)

BREAKING CHANGE: Now that the Overlay is part of the cdk rather than Angular Material directly,
the `themeClass` property has been removed. To add a class to the
overlay for theming, you can do
```ts
overlayContainer.getContainerElement().classList.add('my-theme-class');
```
---
 guides/theming.md                         |  7 ++--
 src/cdk/overlay/overlay-container.spec.ts | 17 +++++++++
 src/cdk/overlay/overlay-container.ts      | 26 +-------------
 src/cdk/overlay/overlay.spec.ts           | 44 -----------------------
 src/demo-app/demo-app/demo-app.ts         |  4 +--
 5 files changed, 22 insertions(+), 76 deletions(-)

diff --git a/guides/theming.md b/guides/theming.md
index 8e4ccc89b90e..22a103bd0380 100644
--- a/guides/theming.md
+++ b/guides/theming.md
@@ -169,7 +169,7 @@ Since certain components (e.g. menu, select, dialog, etc.) are inside of a globa
 an additional step is required for those components to be affected by the theme's css class selector
 (`.unicorn-dark-theme` in the example above).
 
-To do this, you can specify a `themeClass` on the global overlay container. For the example above,
+To do this, you can add the appropriate class to the global overlay container. For the example above,
 this would look like:
 ```ts
 import {OverlayContainer} from '@angular/material';
@@ -179,14 +179,11 @@ import {OverlayContainer} from '@angular/material';
 })
 export class UnicornCandyAppModule {
   constructor(overlayContainer: OverlayContainer) {
-    overlayContainer.themeClass = 'unicorn-dark-theme';
+    overlayContainer.getContainerElement().classList.add('unicorn-dark-theme');
   }
 }
 ```
 
-The `themeClass` of the `OverlayContainer` can be changed at any time to change the active theme
-class.
-
 #### Theming only certain components
 The `angular-material-theme` mixin will output styles for [all components in the library](https://github.com/angular/material2/blob/master/src/lib/core/theming/_all-theme.scss).
 If you are only using a subset of the components (or if you want to change the theme for specific
diff --git a/src/cdk/overlay/overlay-container.spec.ts b/src/cdk/overlay/overlay-container.spec.ts
index 06f02e7d99dc..e2b8648c4376 100644
--- a/src/cdk/overlay/overlay-container.spec.ts
+++ b/src/cdk/overlay/overlay-container.spec.ts
@@ -26,6 +26,10 @@ describe('OverlayContainer', () => {
     overlayContainer = oc;
   }));
 
+  afterEach(() => {
+    overlayContainer.ngOnDestroy();
+  });
+
   it('should remove the overlay container element from the DOM on destruction', () => {
     const fixture = TestBed.createComponent(TestComponentWithTemplatePortals);
 
@@ -43,6 +47,19 @@ describe('OverlayContainer', () => {
     expect(document.querySelector('.cdk-overlay-container'))
         .toBeNull('Expected the overlay container *not* to be in the DOM after destruction');
   });
+
+  it('should add and remove css classes from the container element', () => {
+    overlayContainer.getContainerElement().classList.add('commander-shepard');
+
+    const containerElement = document.querySelector('.cdk-overlay-container')!;
+    expect(containerElement.classList.contains('commander-shepard'))
+        .toBe(true, 'Expected the overlay container to have class "commander-shepard"');
+
+    overlayContainer.getContainerElement().classList.remove('commander-shepard');
+
+    expect(containerElement.classList.contains('commander-shepard'))
+        .toBe(false, 'Expected the overlay container not to have class "commander-shepard"');
+  });
 });
 
 /** Test-bed component that contains a TempatePortal and an ElementRef. */
diff --git a/src/cdk/overlay/overlay-container.ts b/src/cdk/overlay/overlay-container.ts
index 048e1d1adcde..4b3422d66986 100644
--- a/src/cdk/overlay/overlay-container.ts
+++ b/src/cdk/overlay/overlay-container.ts
@@ -17,26 +17,6 @@ import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
 export class OverlayContainer implements OnDestroy {
   protected _containerElement: HTMLElement;
 
-  private _themeClass: string;
-
-  /**
-   * Base theme to be applied to all overlay-based components.
-   */
-  get themeClass(): string { return this._themeClass; }
-  set themeClass(value: string) {
-    if (this._containerElement) {
-      if (this._themeClass) {
-        this._containerElement.classList.remove(this._themeClass);
-      }
-
-      if (value) {
-        this._containerElement.classList.add(value);
-      }
-    }
-
-    this._themeClass = value;
-  }
-
   ngOnDestroy() {
     if (this._containerElement && this._containerElement.parentNode) {
       this._containerElement.parentNode.removeChild(this._containerElement);
@@ -44,7 +24,7 @@ export class OverlayContainer implements OnDestroy {
   }
 
   /**
-   * This method returns the overlay container element.  It will lazily
+   * This method returns the overlay container element. It will lazily
    * create the element the first time  it is called to facilitate using
    * the container in non-browser environments.
    * @returns the container element
@@ -62,10 +42,6 @@ export class OverlayContainer implements OnDestroy {
     let container = document.createElement('div');
     container.classList.add('cdk-overlay-container');
 
-    if (this._themeClass) {
-      container.classList.add(this._themeClass);
-    }
-
     document.body.appendChild(container);
     this._containerElement = container;
   }
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index 8b1e3c4e2120..e1f1cf22123c 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -469,44 +469,6 @@ describe('Overlay', () => {
   });
 });
 
-describe('OverlayContainer theming', () => {
-  let overlayContainer: OverlayContainer;
-  let overlayContainerElement: HTMLElement;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({ imports: [OverlayContainerThemingTestModule] });
-    TestBed.compileComponents();
-  }));
-
-  beforeEach(inject([OverlayContainer], (o: OverlayContainer) => {
-    overlayContainer = o;
-    overlayContainerElement = overlayContainer.getContainerElement();
-  }));
-
-  afterEach(() => {
-    overlayContainerElement.parentNode!.removeChild(overlayContainerElement);
-  });
-
-  it('should be able to set a theme on the overlay container', () => {
-    overlayContainer.themeClass = 'my-theme';
-    expect(overlayContainerElement.classList).toContain('my-theme');
-  });
-
-  it('should clear any previously-set themes when a new theme is set', () => {
-    overlayContainer.themeClass = 'initial-theme';
-    expect(overlayContainerElement.classList).toContain('initial-theme');
-
-    overlayContainer.themeClass = 'new-theme';
-    expect(overlayContainerElement.classList).not.toContain('initial-theme');
-    expect(overlayContainerElement.classList).toContain('new-theme');
-  });
-
-  it('should not throw when switching from a blank theme', () => {
-    overlayContainer.themeClass = '';
-    expect(() => overlayContainer.themeClass = 'new-theme').not.toThrow();
-  });
-});
-
 /** Simple component for testing ComponentPortal. */
 @Component({
   selector: 'pizza',
@@ -534,12 +496,6 @@ const TEST_COMPONENTS = [PizzaMsg, TestComponentWithTemplatePortals];
 })
 class OverlayTestModule { }
 
-/** Component for testing the overlay container theming. */
-@NgModule({
-  imports: [OverlayModule, PortalModule],
-})
-class OverlayContainerThemingTestModule { }
-
 class FakePositionStrategy implements PositionStrategy {
   element: HTMLElement;
 
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 93a647f91978..26d96a4ee0e0 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -109,10 +109,10 @@ export class DemoApp {
 
     if (this.dark) {
       this._renderer.addClass(this._element.nativeElement, darkThemeClass);
-      this._overlayContainer.themeClass = darkThemeClass;
+      this._overlayContainer.getContainerElement().classList.add(darkThemeClass);
     } else {
       this._renderer.removeClass(this._element.nativeElement, darkThemeClass);
-      this._overlayContainer.themeClass = '';
+      this._overlayContainer.getContainerElement().classList.remove(darkThemeClass);
     }
   }
 }

From 1cfce8d9ab047d447465bd4e233fd26893830328 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 20 Sep 2017 16:05:04 -0700
Subject: [PATCH 117/575] fix(overlay): rename OverlayState to OverlayConfig
 (#6972)

BREAKING CHANGE: OverlayState has been renamed to OverlayConfig
---
 .../{overlay-state.ts => overlay-config.ts}   | 14 +++-------
 src/cdk/overlay/overlay-directives.ts         |  6 ++---
 src/cdk/overlay/overlay-ref.ts                |  6 ++---
 src/cdk/overlay/overlay.spec.ts               | 26 +++++++++----------
 src/cdk/overlay/overlay.ts                    |  6 ++---
 src/cdk/overlay/public_api.ts                 |  2 +-
 .../scroll/block-scroll-strategy.spec.ts      |  6 ++---
 .../scroll/close-scroll-strategy.spec.ts      |  6 ++---
 .../scroll/reposition-scroll-strategy.spec.ts |  6 ++---
 src/cdk/overlay/scroll/scroll-strategy.md     | 10 +++----
 src/demo-app/overlay/overlay-demo.ts          | 12 ++++-----
 src/lib/autocomplete/autocomplete-trigger.ts  |  6 ++---
 src/lib/datepicker/datepicker.ts              |  4 +--
 src/lib/dialog/dialog.ts                      |  6 ++---
 src/lib/menu/menu-trigger.ts                  |  8 +++---
 src/lib/snack-bar/snack-bar.ts                |  4 +--
 src/lib/tooltip/tooltip.ts                    |  4 +--
 17 files changed, 62 insertions(+), 70 deletions(-)
 rename src/cdk/overlay/{overlay-state.ts => overlay-config.ts} (86%)

diff --git a/src/cdk/overlay/overlay-state.ts b/src/cdk/overlay/overlay-config.ts
similarity index 86%
rename from src/cdk/overlay/overlay-state.ts
rename to src/cdk/overlay/overlay-config.ts
index 702468b90315..b314847d65cb 100644
--- a/src/cdk/overlay/overlay-state.ts
+++ b/src/cdk/overlay/overlay-config.ts
@@ -12,11 +12,8 @@ import {ScrollStrategy} from './scroll/scroll-strategy';
 import {NoopScrollStrategy} from './scroll/noop-scroll-strategy';
 
 
-/**
- * OverlayState is a bag of values for either the initial configuration or current state of an
- * overlay.
- */
-export class OverlayState {
+/** OverlayConfig captures the initial configuration used when opening an overlay. */
+export class OverlayConfig {
   /** Strategy with which to position the overlay. */
   positionStrategy?: PositionStrategy;
 
@@ -53,14 +50,9 @@ export class OverlayState {
   /** The direction of the text in the overlay panel. */
   direction?: Direction = 'ltr';
 
-  constructor(state?: OverlayState) {
+  constructor(state?: OverlayConfig) {
     if (state) {
       Object.keys(state).forEach(key => this[key] = state[key]);
     }
   }
-
-  // TODO(jelbourn): configuration still to add
-  // - focus trap
-  // - disable pointer events
-  // - z-index
 }
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 76bfe87d841c..1e1c3abcd9f1 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -28,7 +28,7 @@ import {ESCAPE} from '@angular/cdk/keycodes';
 import {TemplatePortal} from '@angular/cdk/portal';
 import {Overlay} from './overlay';
 import {OverlayRef} from './overlay-ref';
-import {OverlayState} from './overlay-state';
+import {OverlayConfig} from './overlay-config';
 import {
   // This import is only used to define a generic type. The current TypeScript version incorrectly
   // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
@@ -271,9 +271,9 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
   }
 
   /** Builds the overlay config based on the directive's inputs */
-  private _buildConfig(): OverlayState {
+  private _buildConfig(): OverlayConfig {
     const positionStrategy = this._position = this._createPositionStrategy();
-    const overlayConfig = new OverlayState({
+    const overlayConfig = new OverlayConfig({
       positionStrategy,
       scrollStrategy: this.scrollStrategy,
       hasBackdrop: this.hasBackdrop
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 352485df4203..8d1eae2687f1 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -8,7 +8,7 @@
 
 import {NgZone} from '@angular/core';
 import {PortalHost, Portal} from '@angular/cdk/portal';
-import {OverlayState} from './overlay-state';
+import {OverlayConfig} from './overlay-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 
@@ -26,7 +26,7 @@ export class OverlayRef implements PortalHost {
   constructor(
       private _portalHost: PortalHost,
       private _pane: HTMLElement,
-      private _state: OverlayState,
+      private _state: OverlayConfig,
       private _ngZone: NgZone) {
 
     if (_state.scrollStrategy) {
@@ -154,7 +154,7 @@ export class OverlayRef implements PortalHost {
   /**
    * Gets the current state config of the overlay.
    */
-  getState(): OverlayState {
+  getState(): OverlayConfig {
     return this._state;
   }
 
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index e1f1cf22123c..6763e9432262 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -11,7 +11,7 @@ import {
   OverlayContainer,
   OverlayModule,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   PositionStrategy,
   ScrollStrategy,
 } from './index';
@@ -133,7 +133,7 @@ describe('Overlay', () => {
   });
 
   it('should set the direction', () => {
-    const state = new OverlayState({direction: 'rtl'});
+    const state = new OverlayConfig({direction: 'rtl'});
 
     overlay.create(state).attach(componentPortal);
 
@@ -152,7 +152,7 @@ describe('Overlay', () => {
   });
 
   it('should emit the attachment event after everything is added to the DOM', () => {
-    let state = new OverlayState({hasBackdrop: true});
+    let state = new OverlayConfig({hasBackdrop: true});
     let overlayRef = overlay.create(state);
 
     overlayRef.attachments().subscribe(() => {
@@ -220,10 +220,10 @@ describe('Overlay', () => {
   });
 
   describe('positioning', () => {
-    let state: OverlayState;
+    let state: OverlayConfig;
 
     beforeEach(() => {
-      state = new OverlayState();
+      state = new OverlayConfig();
     });
 
     it('should apply the positioning strategy', () => {
@@ -236,10 +236,10 @@ describe('Overlay', () => {
   });
 
   describe('size', () => {
-    let state: OverlayState;
+    let state: OverlayConfig;
 
     beforeEach(() => {
-      state = new OverlayState();
+      state = new OverlayConfig();
     });
 
     it('should apply the width set in the config', () => {
@@ -320,10 +320,10 @@ describe('Overlay', () => {
   });
 
   describe('backdrop', () => {
-    let config: OverlayState;
+    let config: OverlayConfig;
 
     beforeEach(() => {
-      config = new OverlayState();
+      config = new OverlayConfig();
       config.hasBackdrop = true;
     });
 
@@ -411,7 +411,7 @@ describe('Overlay', () => {
 
   describe('panelClass', () => {
     it('should apply a custom overlay pane class', () => {
-      const config = new OverlayState({panelClass: 'custom-panel-class'});
+      const config = new OverlayConfig({panelClass: 'custom-panel-class'});
 
       overlay.create(config).attach(componentPortal);
       viewContainerFixture.detectChanges();
@@ -421,7 +421,7 @@ describe('Overlay', () => {
     });
 
     it('should be able to apply multiple classes', () => {
-      const config = new OverlayState({panelClass: ['custom-class-one', 'custom-class-two']});
+      const config = new OverlayConfig({panelClass: ['custom-class-one', 'custom-class-two']});
 
       overlay.create(config).attach(componentPortal);
       viewContainerFixture.detectChanges();
@@ -435,12 +435,12 @@ describe('Overlay', () => {
 
   describe('scroll strategy', () => {
     let fakeScrollStrategy: FakeScrollStrategy;
-    let config: OverlayState;
+    let config: OverlayConfig;
     let overlayRef: OverlayRef;
 
     beforeEach(() => {
       fakeScrollStrategy = new FakeScrollStrategy();
-      config = new OverlayState({scrollStrategy: fakeScrollStrategy});
+      config = new OverlayConfig({scrollStrategy: fakeScrollStrategy});
       overlayRef = overlay.create(config);
     });
 
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 3af90a695d1b..1de3690e71f0 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -14,7 +14,7 @@ import {
   NgZone,
 } from '@angular/core';
 import {DomPortalHost} from '@angular/cdk/portal';
-import {OverlayState} from './overlay-state';
+import {OverlayConfig} from './overlay-config';
 import {OverlayRef} from './overlay-ref';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
 import {OverlayContainer} from './overlay-container';
@@ -25,7 +25,7 @@ import {ScrollStrategyOptions} from './scroll/index';
 let nextUniqueId = 0;
 
 /** The default state for newly created overlays. */
-let defaultState = new OverlayState();
+let defaultState = new OverlayConfig();
 
 
 /**
@@ -51,7 +51,7 @@ export class Overlay {
    * @param state State to apply to the overlay.
    * @returns Reference to the created overlay.
    */
-  create(state: OverlayState = defaultState): OverlayRef {
+  create(state: OverlayConfig = defaultState): OverlayRef {
     const pane = this._createPaneElement();
     const portalHost = this._createPortalHost(pane);
     return new OverlayRef(portalHost, pane, state, this._ngZone);
diff --git a/src/cdk/overlay/public_api.ts b/src/cdk/overlay/public_api.ts
index f376b761e4ab..cd7cea149563 100644
--- a/src/cdk/overlay/public_api.ts
+++ b/src/cdk/overlay/public_api.ts
@@ -40,7 +40,7 @@ export {Overlay} from './overlay';
 export {OverlayContainer} from './overlay-container';
 export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
 export {OverlayRef} from './overlay-ref';
-export {OverlayState} from './overlay-state';
+export {OverlayConfig} from './overlay-config';
 export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
 export {ViewportRuler} from '@angular/cdk/scrolling';
 export {ComponentType} from '@angular/cdk/portal';
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
index b7eefac45c2e..ef2d9e131f8b 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
@@ -3,7 +3,7 @@ import {async, inject, TestBed} from '@angular/core/testing';
 import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
 import {Platform} from '@angular/cdk/platform';
 import {ViewportRuler} from '@angular/cdk/scrolling';
-import {Overlay, OverlayContainer, OverlayModule, OverlayRef, OverlayState} from '../index';
+import {Overlay, OverlayContainer, OverlayModule, OverlayRef, OverlayConfig} from '../index';
 
 
 describe('BlockScrollStrategy', () => {
@@ -23,9 +23,9 @@ describe('BlockScrollStrategy', () => {
   }));
 
   beforeEach(inject([Overlay, ViewportRuler], (overlay: Overlay, viewportRuler: ViewportRuler) => {
-    let overlayState = new OverlayState({scrollStrategy: overlay.scrollStrategies.block()});
+    let overlayConfig = new OverlayConfig({scrollStrategy: overlay.scrollStrategies.block()});
 
-    overlayRef = overlay.create(overlayState);
+    overlayRef = overlay.create(overlayConfig);
     componentPortal = new ComponentPortal(FocacciaMsg);
 
     viewport = viewportRuler;
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
index d2b686eb4e95..995a241d665f 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
@@ -5,7 +5,7 @@ import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   Overlay,
-  OverlayState,
+  OverlayConfig,
   OverlayRef,
   OverlayModule,
   OverlayContainer,
@@ -33,8 +33,8 @@ describe('CloseScrollStrategy', () => {
   }));
 
   beforeEach(inject([Overlay], (overlay: Overlay) => {
-    let overlayState = new OverlayState({scrollStrategy: overlay.scrollStrategies.close()});
-    overlayRef = overlay.create(overlayState);
+    let overlayConfig = new OverlayConfig({scrollStrategy: overlay.scrollStrategies.close()});
+    overlayRef = overlay.create(overlayConfig);
     componentPortal = new ComponentPortal(MozarellaMsg);
   }));
 
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
index 9405f3752855..042089de1db3 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
@@ -7,7 +7,7 @@ import {
   OverlayContainer,
   OverlayModule,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   ScrollDispatcher,
 } from '../index';
 
@@ -33,8 +33,8 @@ describe('RepositionScrollStrategy', () => {
   }));
 
   beforeEach(inject([Overlay], (overlay: Overlay) => {
-    let overlayState = new OverlayState({scrollStrategy: overlay.scrollStrategies.reposition()});
-    overlayRef = overlay.create(overlayState);
+    let overlayConfig = new OverlayConfig({scrollStrategy: overlay.scrollStrategies.reposition()});
+    overlayRef = overlay.create(overlayConfig);
     componentPortal = new ComponentPortal(PastaMsg);
   }));
 
diff --git a/src/cdk/overlay/scroll/scroll-strategy.md b/src/cdk/overlay/scroll/scroll-strategy.md
index 72d912d1cec2..35c259832259 100644
--- a/src/cdk/overlay/scroll/scroll-strategy.md
+++ b/src/cdk/overlay/scroll/scroll-strategy.md
@@ -7,15 +7,15 @@ recalculate the position, close the overlay, block scrolling, etc.
 
 ## Usage
 To associate an overlay with a scroll strategy, you have to pass in a function, that returns a
-scroll strategy, to the `OverlayState`. By default, all overlays will use the `noop` strategy which
+scroll strategy, to the `OverlayConfig`. By default, all overlays will use the `noop` strategy which
 doesn't do anything. The other available strategies are `reposition`, `block` and `close`:
 
 ```ts
-let overlayState = new OverlayState({
+let overlayConfig = new OverlayConfig({
   scrollStrategy: overlay.scrollStrategies.block()
 });
 
-this._overlay.create(overlayState).attach(yourPortal);
+this._overlay.create(overlayConfig).attach(yourPortal);
 ```
 
 ## Creating a custom scroll strategy
@@ -35,6 +35,6 @@ export class CustomScrollStrategy implements ScrollStrategy {
   // your implementation
 }
 
-overlayState.scrollStrategy = new CustomScrollStrategy();
-this._overlay.create(overlayState).attach(yourPortal);
+overlayConfig.scrollStrategy = new CustomScrollStrategy();
+this._overlay.create(overlayConfig).attach(yourPortal);
 ```
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index 1406c4b286d9..88467b3242dc 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -1,4 +1,4 @@
-import {Overlay, OverlayOrigin, OverlayState} from '@angular/cdk/overlay';
+import {Overlay, OverlayOrigin, OverlayConfig} from '@angular/cdk/overlay';
 import {
   ComponentPortal,
   // This import is only used to define a generic type. The current TypeScript version incorrectly
@@ -38,7 +38,7 @@ export class OverlayDemo {
   constructor(public overlay: Overlay, public viewContainerRef: ViewContainerRef) { }
 
   openRotiniPanel() {
-    let config = new OverlayState();
+    let config = new OverlayConfig();
 
     config.positionStrategy = this.overlay.position()
         .global()
@@ -52,7 +52,7 @@ export class OverlayDemo {
   }
 
   openFusilliPanel() {
-    let config = new OverlayState();
+    let config = new OverlayConfig();
 
     config.positionStrategy = this.overlay.position()
         .global()
@@ -73,7 +73,7 @@ export class OverlayDemo {
             {originX: 'start', originY: 'bottom'},
             {overlayX: 'start', overlayY: 'top'} );
 
-    let config = new OverlayState({positionStrategy: strategy});
+    let config = new OverlayConfig({positionStrategy: strategy});
     let overlayRef = this.overlay.create(config);
 
     overlayRef.attach(new ComponentPortal(SpagettiPanel, this.viewContainerRef));
@@ -86,14 +86,14 @@ export class OverlayDemo {
             {originX: 'start', originY: 'bottom'},
             {overlayX: 'end', overlayY: 'top'} );
 
-    let config = new OverlayState({positionStrategy: strategy});
+    let config = new OverlayConfig({positionStrategy: strategy});
     let overlayRef = this.overlay.create(config);
 
     overlayRef.attach(this.tortelliniTemplate);
   }
 
   openPanelWithBackdrop() {
-    let config = new OverlayState({
+    let config = new OverlayConfig({
       hasBackdrop: true,
       backdropClass: 'cdk-overlay-transparent-backdrop',
       positionStrategy: this.overlay.position().global().centerHorizontally()
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 972b78fe9823..89e8d3487b90 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -12,7 +12,7 @@ import {
   ConnectedPositionStrategy,
   Overlay,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   PositionStrategy,
   RepositionScrollStrategy,
   ScrollStrategy,
@@ -464,8 +464,8 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     this._panelOpen = true;
   }
 
-  private _getOverlayConfig(): OverlayState {
-    return new OverlayState({
+  private _getOverlayConfig(): OverlayConfig {
+    return new OverlayConfig({
       positionStrategy: this._getOverlayPosition(),
       scrollStrategy: this._scrollStrategy(),
       width: this._getHostWidth(),
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 0688d645f788..91e4581af1eb 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -12,7 +12,7 @@ import {ESCAPE} from '@angular/cdk/keycodes';
 import {
   Overlay,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   PositionStrategy,
   RepositionScrollStrategy,
   ScrollStrategy,
@@ -331,7 +331,7 @@ export class MdDatepicker<D> implements OnDestroy {
 
   /** Create the popup. */
   private _createPopup(): void {
-    const overlayState = new OverlayState({
+    const overlayState = new OverlayConfig({
       positionStrategy: this._createPopupPositionStrategy(),
       hasBackdrop: true,
       backdropClass: 'md-overlay-transparent-backdrop',
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 86865578919c..5ff66f717a0b 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -11,7 +11,7 @@ import {
   BlockScrollStrategy,
   Overlay,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, TemplatePortal} from '@angular/cdk/portal';
@@ -181,8 +181,8 @@ export class MdDialog {
    * @param dialogConfig The dialog configuration.
    * @returns The overlay configuration.
    */
-  private _getOverlayState(dialogConfig: MdDialogConfig): OverlayState {
-    const state = new OverlayState({
+  private _getOverlayState(dialogConfig: MdDialogConfig): OverlayConfig {
+    const state = new OverlayConfig({
       positionStrategy: this._overlay.position().global(),
       scrollStrategy: this._scrollStrategy(),
       panelClass: dialogConfig.panelClass,
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 9c3b8cfa700c..09d2e9c63764 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -14,7 +14,7 @@ import {
   HorizontalConnectionPos,
   Overlay,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   RepositionScrollStrategy,
   ScrollStrategy,
   VerticalConnectionPos,
@@ -317,10 +317,10 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
 
   /**
    * This method builds the configuration object needed to create the overlay, the OverlayState.
-   * @returns OverlayState
+   * @returns OverlayConfig
    */
-  private _getOverlayConfig(): OverlayState {
-    return new OverlayState({
+  private _getOverlayConfig(): OverlayConfig {
+    return new OverlayConfig({
       positionStrategy: this._getPosition(),
       hasBackdrop: !this.triggersSubmenu(),
       backdropClass: 'cdk-overlay-transparent-backdrop',
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index a4ed737b2add..e4e3a13a3d86 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentRef, Injectable, Injector, Optional, SkipSelf } from '@angular/core';
-import {Overlay, OverlayRef, OverlayState} from '@angular/cdk/overlay';
+import {Overlay, OverlayRef, OverlayConfig} from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType} from '@angular/cdk/portal';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
 import {PortalInjector} from '@angular/material/core';
@@ -153,7 +153,7 @@ export class MdSnackBar {
    * @param config The user-specified snack bar config.
    */
   private _createOverlay(config: MdSnackBarConfig): OverlayRef {
-    const state = new OverlayState();
+    const state = new OverlayConfig();
     state.direction = config.direction;
 
     let positionStrategy = this._overlay.position().global();
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 296150f34526..8fcfabef129f 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -16,7 +16,7 @@ import {
   Overlay,
   OverlayConnectionPosition,
   OverlayRef,
-  OverlayState,
+  OverlayConfig,
   RepositionScrollStrategy,
   ScrollStrategy,
 } from '@angular/cdk/overlay';
@@ -309,7 +309,7 @@ export class MdTooltip implements OnDestroy {
       }
     });
 
-    const config = new OverlayState({
+    const config = new OverlayConfig({
       direction: this._dir ? this._dir.value : 'ltr',
       positionStrategy: strategy,
       panelClass: TOOLTIP_PANEL_CLASS,

From 3ddf65b72f530ce13aa754e870229da126386d7b Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 20 Sep 2017 16:05:34 -0700
Subject: [PATCH 118/575] fix(table): gracefully handle undefined/null columns
 (#6862)

---
 src/cdk/table/row.ts        |  4 ++--
 src/cdk/table/table.spec.ts | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 5be5dc7742d7..a15f379679c5 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -42,8 +42,8 @@ export abstract class BaseRowDef {
 
   ngOnChanges(changes: SimpleChanges): void {
     // Create a new columns differ if one does not yet exist. Initialize it based on initial value
-    // of the columns property.
-    const columns = changes['columns'].currentValue;
+    // of the columns property or an empty array if none is provided.
+    const columns = changes['columns'].currentValue || [];
     if (!this._columnsDiffer && columns) {
       this._columnsDiffer = this._differs.find(columns).create();
       this._columnsDiffer.diff(columns);
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index a07b92833488..548b1c794367 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -30,6 +30,7 @@ describe('CdkTable', () => {
         DuplicateColumnDefNameCdkTableApp,
         MissingColumnDefCdkTableApp,
         CrazyColumnNameCdkTableApp,
+        UndefinedColumnsCdkTableApp,
       ],
     }).compileComponents();
   }));
@@ -133,6 +134,21 @@ describe('CdkTable', () => {
         .toThrowError(getTableUnknownColumnError('column_a').message);
   });
 
+  it('should not throw an error if columns are undefined on initialization', () => {
+    const undefinedColumnsFixture = TestBed.createComponent(UndefinedColumnsCdkTableApp);
+    undefinedColumnsFixture.detectChanges();
+
+    tableElement = undefinedColumnsFixture.nativeElement.querySelector('cdk-table');
+
+    expect(getHeaderRow(tableElement)).toBeNull('Should be no header without cells');
+
+    // Rows should be empty since there are no columns to display.
+    const rows = getRows(tableElement);
+    expect(rows[0].textContent).toBe('');
+    expect(rows[1].textContent).toBe('');
+    expect(rows[2].textContent).toBe('');
+  });
+
   it('should be able to dynamically add/remove column definitions', () => {
     const dynamicColumnDefFixture = TestBed.createComponent(DynamicColumnDefinitionsCdkTableApp);
     dynamicColumnDefFixture.detectChanges();
@@ -753,6 +769,24 @@ class MissingColumnDefCdkTableApp {
   dataSource: FakeDataSource = new FakeDataSource();
 }
 
+@Component({
+  template: `
+    <cdk-table [dataSource]="dataSource">
+      <ng-container cdkColumnDef="column_a">
+        <cdk-header-cell *cdkHeaderCellDef> Column A</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.a}}</cdk-cell>
+      </ng-container>
+
+      <cdk-header-row *cdkHeaderRowDef="undefinedColumns"></cdk-header-row>
+      <cdk-row *cdkRowDef="let row; columns: undefinedColumns"></cdk-row>
+    </cdk-table>
+  `
+})
+class UndefinedColumnsCdkTableApp {
+  undefinedColumns;
+  dataSource: FakeDataSource = new FakeDataSource();
+}
+
 @Component({
   template: `
     <cdk-table [dataSource]="dataSource">

From 602a861621b2bcdb79f4e87bd8167e8c87aee307 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 21 Sep 2017 01:06:08 +0200
Subject: [PATCH 119/575] fix(form-field): placeholder not floating if
 autofilled (#6839)

If a form-field value is set through autofill, the floating placeholder should float and not overlay the form-field value. This doesn't work in Chrome because the `.mat-form-field-autofill-float` class doesn't exist and can't be set on the form-field control anyway.

Fixes #6837
---
 src/lib/form-field/_form-field-theme.scss | 4 ++--
 src/lib/form-field/form-field.scss        | 2 +-
 src/lib/input/input.ts                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 6c3be808cdfd..9576bfa0e29a 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -49,7 +49,7 @@
     }
   }
 
-  .mat-form-field-autofill-float:-webkit-autofill + .mat-form-field-placeholder,
+  .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder,
   .mat-focused .mat-form-field-placeholder.mat-form-field-float {
     .mat-form-field-required-marker {
       color: $required-placeholder-color;
@@ -184,7 +184,7 @@
     border-top: $infix-margin-top solid transparent;
   }
 
-  .mat-form-field-autofill-float {
+  .mat-form-field-autofill-control {
     &:-webkit-autofill + .mat-form-field-placeholder-wrapper .mat-form-field-float {
       @include _mat-form-field-placeholder-floating(
           $subscript-font-scale, $infix-padding, $infix-margin-top);
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 15694919e78f..449f60ecb7db 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -65,7 +65,7 @@ $mat-form-field-underline-height: 1px !default;
 // This is necessary because these browsers do not actually fire any events when a form auto-fill is
 // occurring. Once the autofill is committed, a change event happen and the regular md-form-field
 // classes take over to fulfill this behaviour. Assumes the autofill is non-empty.
-.mat-form-field-autofill-float:-webkit-autofill + .mat-form-field-placeholder-wrapper {
+.mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper {
   // The control is still technically empty at this point, so we need to hide non-floating
   // placeholders to prevent overlapping with the autofilled value.
   .mat-form-field-placeholder {
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index c3a3c72f3d07..6f02784aee05 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -52,7 +52,7 @@ let nextUniqueId = 0;
 @Directive({
   selector: `input[mdInput], textarea[mdInput], input[matInput], textarea[matInput]`,
   host: {
-    'class': 'mat-input-element',
+    'class': 'mat-input-element mat-form-field-autofill-control',
     // Native input properties that are overwritten by Angular inputs need to be synced with
     // the native input element. Otherwise property bindings for those don't work.
     '[id]': 'id',

From d2ceb2c755e20252f02fda11dc4eef55d20f4bbe Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 20 Sep 2017 16:06:40 -0700
Subject: [PATCH 120/575] fix(datepicker): allow ISO 8601 strings as inputs
 (#7091)

---
 src/lib/core/datetime/date-adapter.ts         | 12 +++--
 .../core/datetime/native-date-adapter.spec.ts |  8 +++
 src/lib/core/datetime/native-date-adapter.ts  | 23 +++++++-
 src/lib/datepicker/calendar.ts                | 21 ++++++--
 .../datepicker/coerce-date-property.spec.ts   | 54 +++++++++++++++++++
 src/lib/datepicker/coerce-date-property.ts    | 35 ++++++++++++
 src/lib/datepicker/datepicker-input.ts        | 30 ++++++-----
 src/lib/datepicker/datepicker.spec.ts         | 49 ++++++++++++++++-
 src/lib/datepicker/datepicker.ts              |  3 +-
 src/lib/datepicker/month-view.ts              | 19 +++----
 src/lib/datepicker/public_api.ts              |  1 +
 src/lib/datepicker/year-view.ts               | 15 +++---
 .../adapter/moment-date-adapter.spec.ts       | 10 +++-
 .../adapter/moment-date-adapter.ts            |  7 ++-
 14 files changed, 244 insertions(+), 43 deletions(-)
 create mode 100644 src/lib/datepicker/coerce-date-property.spec.ts
 create mode 100644 src/lib/datepicker/coerce-date-property.ts

diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index 86369f8c85bf..ec645c214882 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -164,12 +164,18 @@ export abstract class DateAdapter<D> {
   abstract addCalendarDays(date: D, days: number): D;
 
   /**
-   * Gets the RFC 3339 compatible date string (https://tools.ietf.org/html/rfc3339)  for the given
-   * date.
+   * Gets the RFC 3339 compatible string (https://tools.ietf.org/html/rfc3339) for the given date.
    * @param date The date to get the ISO date string for.
    * @returns The ISO date string date string.
    */
-  abstract getISODateString(date: D): string;
+  abstract toIso8601(date: D): string;
+
+  /**
+   * Creates a date from an RFC 3339 compatible string (https://tools.ietf.org/html/rfc3339).
+   * @param iso8601String The ISO date string to create a date from
+   * @returns The date created from the ISO date string.
+   */
+  abstract fromIso8601(iso8601String: string): D | null;
 
   /**
    * Checks whether the given object is considered a date instance by this DateAdapter.
diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index cc03629e724e..7ed61ee3753b 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -331,6 +331,14 @@ describe('NativeDateAdapter', () => {
     let d = '1/1/2017';
     expect(adapter.isDateInstance(d)).toBe(false);
   });
+
+  it('should create dates from valid ISO strings', () => {
+    expect(adapter.fromIso8601('1985-04-12T23:20:50.52Z')).not.toBeNull();
+    expect(adapter.fromIso8601('1996-12-19T16:39:57-08:00')).not.toBeNull();
+    expect(adapter.fromIso8601('1937-01-01T12:00:27.87+00:20')).not.toBeNull();
+    expect(adapter.fromIso8601('1990-13-31T23:59:00Z')).toBeNull();
+    expect(adapter.fromIso8601('1/1/2017')).toBeNull();
+  });
 });
 
 
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index 6eb459c17206..af5fc07637bc 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -38,6 +38,15 @@ const DEFAULT_DAY_OF_WEEK_NAMES = {
 };
 
 
+/**
+ * Matches strings that have the form of a valid RFC 3339 string
+ * (https://tools.ietf.org/html/rfc3339). Note that the string may not actually be a valid date
+ * because the regex will match strings an with out of bounds month, date, etc.
+ */
+const ISO_8601_REGEX =
+    /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|(?:(?:\+|-)\d{2}:\d{2}))$/;
+
+
 /** Creates an array and fills it with values. */
 function range<T>(length: number, valueFunction: (index: number) => T): T[] {
   const valuesArray = Array(length);
@@ -202,7 +211,7 @@ export class NativeDateAdapter extends DateAdapter<Date> {
         this.getYear(date), this.getMonth(date), this.getDate(date) + days);
   }
 
-  getISODateString(date: Date): string {
+  toIso8601(date: Date): string {
     return [
       date.getUTCFullYear(),
       this._2digit(date.getUTCMonth() + 1),
@@ -210,6 +219,18 @@ export class NativeDateAdapter extends DateAdapter<Date> {
     ].join('-');
   }
 
+  fromIso8601(iso8601String: string): Date | null {
+    // The `Date` constructor accepts formats other than ISO 8601, so we need to make sure the
+    // string is the right format first.
+    if (ISO_8601_REGEX.test(iso8601String)) {
+      let d = new Date(iso8601String);
+      if (this.isValid(d)) {
+        return d;
+      }
+    }
+    return null;
+  }
+
   isDateInstance(obj: any) {
     return obj instanceof Date;
   }
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index 32a43d5f39c2..eb47eb20a616 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -40,6 +40,7 @@ import {
 } from '@angular/material/core';
 import {first} from 'rxjs/operator/first';
 import {Subscription} from 'rxjs/Subscription';
+import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MdDatepickerIntl} from './datepicker-intl';
 
@@ -64,19 +65,31 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
   private _intlChanges: Subscription;
 
   /** A date representing the period (month or year) to start the calendar in. */
-  @Input() startAt: D;
+  @Input()
+  get startAt(): D | null { return this._startAt; }
+  set startAt(value: D | null) { this._startAt = coerceDateProperty(this._dateAdapter, value); }
+  private _startAt: D | null;
 
   /** Whether the calendar should be started in month or year view. */
   @Input() startView: 'month' | 'year' = 'month';
 
   /** The currently selected date. */
-  @Input() selected: D | null;
+  @Input()
+  get selected(): D | null { return this._selected; }
+  set selected(value: D | null) { this._selected = coerceDateProperty(this._dateAdapter, value); }
+  private _selected: D | null;
 
   /** The minimum selectable date. */
-  @Input() minDate: D | null;
+  @Input()
+  get minDate(): D | null { return this._minDate; }
+  set minDate(value: D | null) { this._minDate = coerceDateProperty(this._dateAdapter, value); }
+  private _minDate: D | null;
 
   /** The maximum selectable date. */
-  @Input() maxDate: D | null;
+  @Input()
+  get maxDate(): D | null { return this._maxDate; }
+  set maxDate(value: D | null) { this._maxDate = coerceDateProperty(this._dateAdapter, value); }
+  private _maxDate: D | null;
 
   /** A function used to filter which dates are selectable. */
   @Input() dateFilter: (date: D) => boolean;
diff --git a/src/lib/datepicker/coerce-date-property.spec.ts b/src/lib/datepicker/coerce-date-property.spec.ts
new file mode 100644
index 000000000000..52c15b36655e
--- /dev/null
+++ b/src/lib/datepicker/coerce-date-property.spec.ts
@@ -0,0 +1,54 @@
+import {async, inject, TestBed} from '@angular/core/testing';
+import {DateAdapter, JAN, MdNativeDateModule} from '@angular/material/core';
+import {coerceDateProperty} from './index';
+
+
+describe('coerceDateProperty', () => {
+  let adapter: DateAdapter<Date>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MdNativeDateModule],
+    });
+
+    TestBed.compileComponents();
+  }));
+
+  beforeEach(inject([DateAdapter], (dateAdapter: DateAdapter<Date>) => {
+    adapter = dateAdapter;
+  }));
+
+  it('should pass through existing date', () => {
+    const d = new Date(2017, JAN, 1);
+    expect(coerceDateProperty(adapter, d)).toBe(d);
+  });
+
+  it('should pass through invalid date', () => {
+    const d = new Date(NaN);
+    expect(coerceDateProperty(adapter, d)).toBe(d);
+  });
+
+  it('should pass through null and undefined', () => {
+    expect(coerceDateProperty(adapter, null)).toBeNull();
+    expect(coerceDateProperty(adapter, undefined)).toBeUndefined();
+  });
+
+  it('should coerce empty string to null', () => {
+    expect(coerceDateProperty(adapter, '')).toBe(null);
+  });
+
+  it('should coerce ISO 8601 string to date', () => {
+    let isoString = '2017-01-01T00:00:00Z';
+    expect(coerceDateProperty(adapter, isoString)).toEqual(new Date(isoString));
+  });
+
+  it('should throw when given a number', () => {
+    expect(() => coerceDateProperty(adapter, 5)).toThrow();
+    expect(() => coerceDateProperty(adapter, 0)).toThrow();
+  });
+
+  it('should throw when given a string with incorrect format', () => {
+    expect(() => coerceDateProperty(adapter, '1/1/2017')).toThrow();
+    expect(() => coerceDateProperty(adapter, 'hello')).toThrow();
+  });
+});
diff --git a/src/lib/datepicker/coerce-date-property.ts b/src/lib/datepicker/coerce-date-property.ts
new file mode 100644
index 000000000000..08fb8ffbb9a6
--- /dev/null
+++ b/src/lib/datepicker/coerce-date-property.ts
@@ -0,0 +1,35 @@
+/**
+ * @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 {DateAdapter} from '@angular/material/core';
+
+
+/**
+ * Function that attempts to coerce a value to a date using a DateAdapter. Date instances, null,
+ * and undefined will be passed through. Empty strings will be coerced to null. Valid ISO 8601
+ * strings (https://www.ietf.org/rfc/rfc3339.txt) will be coerced to dates. All other values will
+ * result in an error being thrown.
+ * @param adapter The date adapter to use for coercion
+ * @param value The value to coerce.
+ * @return A date object coerced from the value.
+ * @throws Throws when the value cannot be coerced.
+ */
+export function coerceDateProperty<D>(adapter: DateAdapter<D>, value: any): D | null {
+  if (typeof value === 'string') {
+    if (value == '') {
+      value = null;
+    } else {
+      value = adapter.fromIso8601(value) || value;
+    }
+  }
+  if (value == null || adapter.isDateInstance(value)) {
+    return value;
+  }
+  throw Error(`Datepicker: Value must be either a date object recognized by the DateAdapter or ` +
+              `an ISO 8601 string. Instead got: ${value}`);
+}
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index ee97403108b7..6116ad87c219 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -34,6 +34,7 @@ import {
 import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
 import {MdFormField} from '@angular/material/form-field';
 import {Subscription} from 'rxjs/Subscription';
+import {coerceDateProperty} from './coerce-date-property';
 import {MdDatepicker} from './datepicker';
 import {createMissingDateImplError} from './datepicker-errors';
 
@@ -74,8 +75,8 @@ export class MdDatepickerInputEvent<D> {
   host: {
     '[attr.aria-haspopup]': 'true',
     '[attr.aria-owns]': '(_datepicker?.opened && _datepicker.id) || null',
-    '[attr.min]': 'min ? _dateAdapter.getISODateString(min) : null',
-    '[attr.max]': 'max ? _dateAdapter.getISODateString(max) : null',
+    '[attr.min]': 'min ? _dateAdapter.toIso8601(min) : null',
+    '[attr.max]': 'max ? _dateAdapter.toIso8601(max) : null',
     '[disabled]': 'disabled',
     '(input)': '_onInput($event.target.value)',
     '(change)': '_onChange()',
@@ -122,9 +123,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     return this._value;
   }
   set value(value: D | null) {
-    if (value != null && !this._dateAdapter.isDateInstance(value)) {
-      throw Error('Datepicker: value not recognized as a date object by DateAdapter.');
-    }
+    value = coerceDateProperty(this._dateAdapter, value);
     this._lastValueValid = !value || this._dateAdapter.isValid(value);
     value = this._getValidDateOrNull(value);
 
@@ -142,7 +141,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   @Input()
   get min(): D | null { return this._min; }
   set min(value: D | null) {
-    this._min = value;
+    this._min = coerceDateProperty(this._dateAdapter, value);
     this._validatorOnChange();
   }
   private _min: D | null;
@@ -151,7 +150,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   @Input()
   get max(): D | null { return this._max; }
   set max(value: D | null) {
-    this._max = value;
+    this._max = coerceDateProperty(this._dateAdapter, value);
     this._validatorOnChange();
   }
   private _max: D | null;
@@ -199,21 +198,24 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
 
   /** The form control validator for the min date. */
   private _minValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    return (!this.min || !control.value ||
-        this._dateAdapter.compareDate(this.min, control.value) <= 0) ?
-        null : {'mdDatepickerMin': {'min': this.min, 'actual': control.value}};
+    const controlValue = coerceDateProperty(this._dateAdapter, control.value);
+    return (!this.min || !controlValue ||
+        this._dateAdapter.compareDate(this.min, controlValue) <= 0) ?
+        null : {'mdDatepickerMin': {'min': this.min, 'actual': controlValue}};
   }
 
   /** The form control validator for the max date. */
   private _maxValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    return (!this.max || !control.value ||
-        this._dateAdapter.compareDate(this.max, control.value) >= 0) ?
-        null : {'mdDatepickerMax': {'max': this.max, 'actual': control.value}};
+    const controlValue = coerceDateProperty(this._dateAdapter, control.value);
+    return (!this.max || !controlValue ||
+        this._dateAdapter.compareDate(this.max, controlValue) >= 0) ?
+        null : {'mdDatepickerMax': {'max': this.max, 'actual': controlValue}};
   }
 
   /** The form control validator for the date filter. */
   private _filterValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    return !this._dateFilter || !control.value || this._dateFilter(control.value) ?
+    const controlValue = coerceDateProperty(this._dateAdapter, control.value);
+    return !this._dateFilter || !controlValue || this._dateFilter(controlValue) ?
         null : {'mdDatepickerFilter': true};
   }
 
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index c488d6492710..a5f4a93f99b9 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -12,6 +12,8 @@ import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {
   DEC,
   JAN,
+  JUL,
+  JUN,
   MAT_DATE_LOCALE,
   MdNativeDateModule,
   NativeDateModule,
@@ -47,6 +49,7 @@ describe('MdDatepicker', () => {
           DatepickerWithChangeAndInputEvents,
           DatepickerWithFilterAndValidation,
           DatepickerWithFormControl,
+          DatepickerWithISOStrings,
           DatepickerWithMinAndMaxValidation,
           DatepickerWithNgModel,
           DatepickerWithStartAt,
@@ -270,8 +273,9 @@ describe('MdDatepicker', () => {
       it('should throw when given wrong data type', () => {
         testComponent.date = '1/1/2017' as any;
 
-        expect(() => fixture.detectChanges())
-            .toThrowError(/Datepicker: value not recognized as a date object by DateAdapter\./);
+        expect(() => fixture.detectChanges()).toThrowError(
+            'Datepicker: Value must be either a date object recognized by the DateAdapter or an ' +
+            'ISO 8601 string. Instead got: 1/1/2017');
 
         testComponent.date = null;
       });
@@ -865,6 +869,32 @@ describe('MdDatepicker', () => {
         expect(testComponent.onDateInput).toHaveBeenCalled();
       });
     });
+
+    describe('with ISO 8601 strings as input', () => {
+      let fixture: ComponentFixture<DatepickerWithISOStrings>;
+      let testComponent: DatepickerWithISOStrings;
+
+      beforeEach(async(() => {
+        fixture = TestBed.createComponent(DatepickerWithISOStrings);
+        testComponent = fixture.componentInstance;
+      }));
+
+      afterEach(async(() => {
+        testComponent.datepicker.close();
+        fixture.detectChanges();
+      }));
+
+      it('should coerce ISO strings', async(() => {
+        expect(() => fixture.detectChanges()).not.toThrow();
+        fixture.whenStable().then(() => {
+          fixture.detectChanges();
+          expect(testComponent.datepicker.startAt).toEqual(new Date(2017, JUL, 1));
+          expect(testComponent.datepickerInput.value).toEqual(new Date(2017, JUN, 1));
+          expect(testComponent.datepickerInput.min).toEqual(new Date(2017, JAN, 1));
+          expect(testComponent.datepickerInput.max).toEqual(new Date(2017, DEC, 31));
+        });
+      }));
+    });
   });
 
   describe('with missing DateAdapter and MD_DATE_FORMATS', () => {
@@ -1179,3 +1209,18 @@ class DatepickerWithi18n {
   @ViewChild('d') datepicker: MdDatepicker<Date>;
   @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
 }
+
+@Component({
+  template: `
+    <input [mdDatepicker]="d" [(ngModel)]="value" [min]="min" [max]="max">
+    <md-datepicker #d [startAt]="startAt"></md-datepicker>
+  `
+})
+class DatepickerWithISOStrings {
+  value = new Date(2017, JUN, 1).toISOString();
+  min = new Date(2017, JAN, 1).toISOString();
+  max = new Date (2017, DEC, 31).toISOString();
+  startAt = new Date(2017, JUL, 1).toISOString();
+  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+}
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 91e4581af1eb..babc5311a12c 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -42,6 +42,7 @@ import {DOCUMENT} from '@angular/platform-browser';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {MdCalendar} from './calendar';
+import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MdDatepickerInput} from './datepicker-input';
 
@@ -131,7 +132,7 @@ export class MdDatepicker<D> implements OnDestroy {
     // selected value is.
     return this._startAt || (this._datepickerInput ? this._datepickerInput.value : null);
   }
-  set startAt(date: D | null) { this._startAt = date; }
+  set startAt(date: D | null) { this._startAt = coerceDateProperty(this._dateAdapter, date); }
   private _startAt: D | null;
 
   /** The view that the calendar should start in. */
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index 9cb2914578e0..32c9befd32f6 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -19,6 +19,7 @@ import {
 } from '@angular/core';
 import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
 import {MdCalendarCell} from './calendar-body';
+import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 
 
@@ -45,7 +46,7 @@ export class MdMonthView<D> implements AfterContentInit {
   get activeDate(): D { return this._activeDate; }
   set activeDate(value: D) {
     let oldActiveDate = this._activeDate;
-    this._activeDate = value || this._dateAdapter.today();
+    this._activeDate = coerceDateProperty(this._dateAdapter, value) || this._dateAdapter.today();
     if (!this._hasSameMonthAndYear(oldActiveDate, this._activeDate)) {
       this._init();
     }
@@ -54,12 +55,12 @@ export class MdMonthView<D> implements AfterContentInit {
 
   /** The currently selected date. */
   @Input()
-  get selected(): D { return this._selected; }
-  set selected(value: D) {
-    this._selected = value;
-    this._selectedDate = this._getDateInCurrentMonth(this.selected);
+  get selected(): D | null { return this._selected; }
+  set selected(value: D | null) {
+    this._selected = coerceDateProperty(this._dateAdapter, value);
+    this._selectedDate = this._getDateInCurrentMonth(this._selected);
   }
-  private _selected: D;
+  private _selected: D | null;
 
   /** A function used to filter which dates are selectable. */
   @Input() dateFilter: (date: D) => boolean;
@@ -172,13 +173,13 @@ export class MdMonthView<D> implements AfterContentInit {
    * Gets the date in this month that the given Date falls on.
    * Returns null if the given Date is in another month.
    */
-  private _getDateInCurrentMonth(date: D): number | null {
-    return this._hasSameMonthAndYear(date, this.activeDate) ?
+  private _getDateInCurrentMonth(date: D | null): number | null {
+    return date && this._hasSameMonthAndYear(date, this.activeDate) ?
         this._dateAdapter.getDate(date) : null;
   }
 
   /** Checks whether the 2 dates are non-null and fall within the same month of the same year. */
-  private _hasSameMonthAndYear(d1: D, d2: D): boolean {
+  private _hasSameMonthAndYear(d1: D | null, d2: D | null): boolean {
     return !!(d1 && d2 && this._dateAdapter.getMonth(d1) == this._dateAdapter.getMonth(d2) &&
               this._dateAdapter.getYear(d1) == this._dateAdapter.getYear(d2));
   }
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public_api.ts
index eb90e45ffc2b..89d5bac6d09b 100644
--- a/src/lib/datepicker/public_api.ts
+++ b/src/lib/datepicker/public_api.ts
@@ -9,6 +9,7 @@
 export * from './datepicker-module';
 export * from './calendar';
 export * from './calendar-body';
+export * from './coerce-date-property';
 export * from './datepicker';
 export * from './datepicker-input';
 export * from './datepicker-intl';
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index 8bf750b7776c..db7699df0491 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -19,6 +19,7 @@ import {
 } from '@angular/core';
 import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
 import {MdCalendarCell} from './calendar-body';
+import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 
 
@@ -40,7 +41,7 @@ export class MdYearView<D> implements AfterContentInit {
   get activeDate(): D { return this._activeDate; }
   set activeDate(value: D) {
     let oldActiveDate = this._activeDate;
-    this._activeDate = value || this._dateAdapter.today();
+    this._activeDate = coerceDateProperty(this._dateAdapter, value) || this._dateAdapter.today();
     if (this._dateAdapter.getYear(oldActiveDate) != this._dateAdapter.getYear(this._activeDate)) {
       this._init();
     }
@@ -49,12 +50,12 @@ export class MdYearView<D> implements AfterContentInit {
 
   /** The currently selected date. */
   @Input()
-  get selected(): D { return this._selected; }
-  set selected(value: D) {
-    this._selected = value;
-    this._selectedMonth = this._getMonthInCurrentYear(this.selected);
+  get selected(): D | null { return this._selected; }
+  set selected(value: D | null) {
+    this._selected = coerceDateProperty(this._dateAdapter, value);
+    this._selectedMonth = this._getMonthInCurrentYear(this._selected);
   }
-  private _selected: D;
+  private _selected: D | null;
 
   /** A function used to filter which dates are selectable. */
   @Input() dateFilter: (date: D) => boolean;
@@ -118,7 +119,7 @@ export class MdYearView<D> implements AfterContentInit {
    * Gets the month in this year that the given Date falls on.
    * Returns null if the given Date is in another year.
    */
-  private _getMonthInCurrentYear(date: D) {
+  private _getMonthInCurrentYear(date: D | null) {
     return date && this._dateAdapter.getYear(date) == this._dateAdapter.getYear(this.activeDate) ?
         this._dateAdapter.getMonth(date) : null;
   }
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
index c8330e8f1eaf..032b5c4c47bf 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
@@ -309,6 +309,14 @@ describe('MomentDateAdapter', () => {
     expect(adapter.isDateInstance(d)).toBe(false);
   });
 
+  it('should create dates from valid ISO strings', () => {
+    expect(adapter.fromIso8601('1985-04-12T23:20:50.52Z')).not.toBeNull();
+    expect(adapter.fromIso8601('1996-12-19T16:39:57-08:00')).not.toBeNull();
+    expect(adapter.fromIso8601('1937-01-01T12:00:27.87+00:20')).not.toBeNull();
+    expect(adapter.fromIso8601('1990-13-31T23:59:00Z')).toBeNull();
+    expect(adapter.fromIso8601('1/1/2017')).toBeNull();
+  });
+
   it('setLocale should not modify global moment locale', () => {
     expect(moment.locale()).toBe('en');
     adapter.setLocale('ja-JP');
@@ -342,7 +350,7 @@ describe('MomentDateAdapter', () => {
     adapter.addCalendarDays(date, 1);
     adapter.addCalendarMonths(date, 1);
     adapter.addCalendarYears(date, 1);
-    adapter.getISODateString(date);
+    adapter.toIso8601(date);
     adapter.isDateInstance(date);
     adapter.isValid(date);
     expect(date.locale()).toBe('en');
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.ts b/src/material-moment-adapter/adapter/moment-date-adapter.ts
index a941eec54354..cbf42b5b2199 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.ts
@@ -170,10 +170,15 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
     return this.clone(date).add({days});
   }
 
-  getISODateString(date: Moment): string {
+  toIso8601(date: Moment): string {
     return this.clone(date).format();
   }
 
+  fromIso8601(iso8601String: string): Moment | null {
+    let d = moment(iso8601String, moment.ISO_8601).locale(this.locale);
+    return this.isValid(d) ? d : null;
+  }
+
   isDateInstance(obj: any): boolean {
     return moment.isMoment(obj);
   }

From 2b61eb6f97cd628c1fb4ee680557583ebd834972 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 20 Sep 2017 16:11:18 -0700
Subject: [PATCH 121/575] fix(datepicker): backdrop class should be mat-
 (#7056)

---
 src/lib/datepicker/datepicker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index babc5311a12c..9f711fcea5dc 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -335,7 +335,7 @@ export class MdDatepicker<D> implements OnDestroy {
     const overlayState = new OverlayConfig({
       positionStrategy: this._createPopupPositionStrategy(),
       hasBackdrop: true,
-      backdropClass: 'md-overlay-transparent-backdrop',
+      backdropClass: 'mat-overlay-transparent-backdrop',
       direction: this._dir ? this._dir.value : 'ltr',
       scrollStrategy: this._scrollStrategy()
     });

From fdf68ba5677a1ed63b173ec1abf8e487fa3b29e3 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Wed, 20 Sep 2017 18:18:19 -0500
Subject: [PATCH 122/575] chore(chips): update chip output names for
 consistency (#7156)

Related to #6677
---
 src/lib/chips/chip-list.ts |  2 +-
 src/lib/chips/chip.spec.ts | 24 +++++++++-----
 src/lib/chips/chip.ts      | 64 +++++++++++++++++++++++++++++---------
 src/lib/chips/chips.md     |  2 +-
 4 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index fdd510ca2e05..975208299ec2 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -278,7 +278,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
 
   /** Combined stream of all of the child chips' selection change events. */
   get chipSelectionChanges(): Observable<MdChipSelectionChange> {
-    return merge(...this.chips.map(chip => chip.onSelectionChange));
+    return merge(...this.chips.map(chip => chip.selectionChange));
   }
 
   /** Combined stream of all of the child chips' focus change events. */
diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
index cb8b6f506658..240ceec898d6 100644
--- a/src/lib/chips/chip.spec.ts
+++ b/src/lib/chips/chip.spec.ts
@@ -121,7 +121,7 @@ describe('Chips', () => {
 
         expect(chipNativeElement.classList).toContain('mat-chip-selected');
         expect(testComponent.chipSelectionChange)
-          .toHaveBeenCalledWith({source: chipInstance, isUserInput: false});
+          .toHaveBeenCalledWith({source: chipInstance, isUserInput: false, selected: true});
       });
 
       it('allows removal', () => {
@@ -144,7 +144,17 @@ describe('Chips', () => {
 
         it('should selects/deselects the currently focused chip on SPACE', () => {
           const SPACE_EVENT: KeyboardEvent = createKeyboardEvent('keydown', SPACE) as KeyboardEvent;
-          const CHIP_EVENT: MdChipSelectionChange = {source: chipInstance, isUserInput: true};
+          const CHIP_SELECTED_EVENT: MdChipSelectionChange = {
+            source: chipInstance,
+            isUserInput: true,
+            selected: true
+          };
+
+          const CHIP_DESELECTED_EVENT: MdChipSelectionChange = {
+            source: chipInstance,
+            isUserInput: true,
+            selected: false
+          };
 
           spyOn(testComponent, 'chipSelectionChange');
 
@@ -154,7 +164,7 @@ describe('Chips', () => {
 
           expect(chipInstance.selected).toBeTruthy();
           expect(testComponent.chipSelectionChange).toHaveBeenCalledTimes(1);
-          expect(testComponent.chipSelectionChange).toHaveBeenCalledWith(CHIP_EVENT);
+          expect(testComponent.chipSelectionChange).toHaveBeenCalledWith(CHIP_SELECTED_EVENT);
 
           // Use the spacebar to deselect the chip
           chipInstance._handleKeydown(SPACE_EVENT);
@@ -162,7 +172,7 @@ describe('Chips', () => {
 
           expect(chipInstance.selected).toBeFalsy();
           expect(testComponent.chipSelectionChange).toHaveBeenCalledTimes(2);
-          expect(testComponent.chipSelectionChange).toHaveBeenCalledWith(CHIP_EVENT);
+          expect(testComponent.chipSelectionChange).toHaveBeenCalledWith(CHIP_DESELECTED_EVENT);
         });
 
         it('should have correct aria-selected', () => {
@@ -280,9 +290,9 @@ describe('Chips', () => {
       <div *ngIf="shouldShow">
         <md-chip [selectable]="selectable" [removable]="removable"
                  [color]="color" [selected]="selected" [disabled]="disabled"
-                 (focus)="chipFocus($event)" (destroy)="chipDestroy($event)"
-                 (onSelectionChange)="chipSelectionChange($event)"
-                 (remove)="chipRemove($event)">
+                 (focus)="chipFocus($event)" (destroyed)="chipDestroy($event)"
+                 (selectionChange)="chipSelectionChange($event)"
+                 (removed)="chipRemove($event)">
           {{name}}
         </md-chip>
       </div>
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 26ab43c56e4c..a7cdfaebb43b 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -34,7 +34,7 @@ export interface MdChipEvent {
 
 /** Event object emitted by MdChip when selected or deselected. */
 export class MdChipSelectionChange {
-  constructor(public source: MdChip, public isUserInput = false) { }
+  constructor(public source: MdChip, public selected: boolean, public isUserInput = false) { }
 }
 
 
@@ -98,7 +98,11 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   get selected(): boolean { return this._selected; }
   set selected(value: boolean) {
     this._selected = coerceBooleanProperty(value);
-    this.onSelectionChange.emit({source: this, isUserInput: false});
+    this.selectionChange.emit({
+      source: this,
+      isUserInput: false,
+      selected: value
+    });
   }
 
   /** The value of the chip. Defaults to the content inside <md-chip> tags. */
@@ -132,13 +136,25 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   _onBlur = new Subject<MdChipEvent>();
 
   /** Emitted when the chip is selected or deselected. */
-  @Output() onSelectionChange = new EventEmitter<MdChipSelectionChange>();
+  @Output() selectionChange = new EventEmitter<MdChipSelectionChange>();
 
   /** Emitted when the chip is destroyed. */
-  @Output() destroy = new EventEmitter<MdChipEvent>();
+  @Output() destroyed = new EventEmitter<MdChipEvent>();
+
+  /**
+   * Emitted when the chip is destroyed.
+   * @deprecated Use 'destroyed' instead.
+   */
+  @Output() destroy = this.destroyed;
 
   /** Emitted when a chip is to be removed. */
-  @Output('remove') onRemove = new EventEmitter<MdChipEvent>();
+  @Output() removed = new EventEmitter<MdChipEvent>();
+
+  /**
+   * Emitted when a chip is to be removed.
+   * @deprecated Use `removed` instead.
+   */
+  @Output('remove') onRemove = this.removed;
 
   get ariaSelected(): string | null {
     return this.selectable ? this.selected.toString() : null;
@@ -149,32 +165,50 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   }
 
   ngOnDestroy(): void {
-    this.destroy.emit({chip: this});
+    this.destroyed.emit({chip: this});
   }
 
   /** Selects the chip. */
   select(): void {
     this._selected = true;
-    this.onSelectionChange.emit({source: this, isUserInput: false});
+    this.selectionChange.emit({
+      source: this,
+      isUserInput: false,
+      selected: true
+    });
   }
 
   /** Deselects the chip. */
   deselect(): void {
     this._selected = false;
-    this.onSelectionChange.emit({source: this, isUserInput: false});
+    this.selectionChange.emit({
+      source: this,
+      isUserInput: false,
+      selected: false
+    });
   }
 
   /** Select this chip and emit selected event */
-  selectViaInteraction() {
+  selectViaInteraction(): void {
     this._selected = true;
     // Emit select event when selected changes.
-    this.onSelectionChange.emit({source: this, isUserInput: true});
+    this.selectionChange.emit({
+      source: this,
+      isUserInput: true,
+      selected: true
+    });
   }
 
   /** Toggles the current selected state of this chip. */
   toggleSelected(isUserInput: boolean = false): boolean {
     this._selected = !this.selected;
-    this.onSelectionChange.emit({source: this, isUserInput});
+
+    this.selectionChange.emit({
+      source: this,
+      isUserInput,
+      selected: this._selected
+    });
+
     return this.selected;
   }
 
@@ -192,7 +226,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
    */
   remove(): void {
     if (this.removable) {
-      this.onRemove.emit({chip: this});
+      this.removed.emit({chip: this});
     }
   }
 
@@ -210,7 +244,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   }
 
   /** Handle custom key presses. */
-  _handleKeydown(event: KeyboardEvent) {
+  _handleKeydown(event: KeyboardEvent): void {
     if (this.disabled) {
       return;
     }
@@ -235,7 +269,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
     }
   }
 
-  _blur() {
+  _blur(): void {
     this._hasFocus = false;
     this._onBlur.next({chip: this});
   }
@@ -266,7 +300,7 @@ export class MdChipRemove {
   constructor(protected _parentChip: MdChip) {}
 
   /** Calls the parent chip's public `remove()` method if applicable. */
-  _handleClick() {
+  _handleClick(): void {
     if (this._parentChip.removable) {
       this._parentChip.remove();
     }
diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 6b7760f77ac1..db4dfdeef6be 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -23,7 +23,7 @@ Chips can be selected via the `selected` property. Selection can be disabled by
 `selectable` to `false` on the `<md-chip-list>`.
 
 Whenever the selection state changes, a `ChipSelectionChange` event will be emitted via 
-`(onSelectionChange)`.
+`(selectionChange)`.
 
 ### Disabled chips
 Individual chips may be disabled by applying the `disabled` attribute to the chip. When disabled,

From 3025b30abff8e486ca7975a6f8c2d2f5afc52aad Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 20 Sep 2017 16:39:26 -0700
Subject: [PATCH 123/575] chore: use "export *" for overlay-config (#7218)

---
 src/cdk/overlay/public_api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cdk/overlay/public_api.ts b/src/cdk/overlay/public_api.ts
index cd7cea149563..bc93276afde6 100644
--- a/src/cdk/overlay/public_api.ts
+++ b/src/cdk/overlay/public_api.ts
@@ -36,11 +36,11 @@ export const OVERLAY_PROVIDERS: Provider[] = [
 export class OverlayModule {}
 
 
+export * from './overlay-config';
 export {Overlay} from './overlay';
 export {OverlayContainer} from './overlay-container';
 export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
 export {OverlayRef} from './overlay-ref';
-export {OverlayConfig} from './overlay-config';
 export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
 export {ViewportRuler} from '@angular/cdk/scrolling';
 export {ComponentType} from '@angular/cdk/portal';

From 8436f8c582c11e95f7c7c1e5361650fea260e183 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 20 Sep 2017 20:21:31 -0700
Subject: [PATCH 124/575] fix(datepicker): allow date or datetime strings in
 fromIso8601 (#7220)

---
 src/lib/core/datetime/native-date-adapter.spec.ts | 3 +++
 src/lib/core/datetime/native-date-adapter.ts      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index 7ed61ee3753b..8ec5202fa151 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -336,8 +336,11 @@ describe('NativeDateAdapter', () => {
     expect(adapter.fromIso8601('1985-04-12T23:20:50.52Z')).not.toBeNull();
     expect(adapter.fromIso8601('1996-12-19T16:39:57-08:00')).not.toBeNull();
     expect(adapter.fromIso8601('1937-01-01T12:00:27.87+00:20')).not.toBeNull();
+    expect(adapter.fromIso8601('2017-01-01')).not.toBeNull();
+    expect(adapter.fromIso8601('2017-01-01T00:00:00')).not.toBeNull();
     expect(adapter.fromIso8601('1990-13-31T23:59:00Z')).toBeNull();
     expect(adapter.fromIso8601('1/1/2017')).toBeNull();
+    expect(adapter.fromIso8601('2017-01-01T')).toBeNull();
   });
 });
 
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index af5fc07637bc..8c672c477f61 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -44,7 +44,7 @@ const DEFAULT_DAY_OF_WEEK_NAMES = {
  * because the regex will match strings an with out of bounds month, date, etc.
  */
 const ISO_8601_REGEX =
-    /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|(?:(?:\+|-)\d{2}:\d{2}))$/;
+    /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|(?:(?:\+|-)\d{2}:\d{2}))?)?$/;
 
 
 /** Creates an array and fills it with values. */

From f2419bf769550fc806e1bf990d9e91597c8417e5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 21 Sep 2017 19:45:28 +0200
Subject: [PATCH 125/575] chore: bump to Angular 4.4.3 (#7195)

Bumps the minimum Angular version to 4.4.3 to fix some errors in the stepper.

BREAKING CHANGE: Material now requires at least Angular 4.4.3.
---
 package-lock.json                        | 159 ++++++++++-------------
 package.json                             |  24 ++--
 src/cdk/package.json                     |   4 +-
 src/lib/package.json                     |   4 +-
 src/material-examples/package.json       |   6 +-
 src/material-moment-adapter/package.json |   2 +-
 tools/dashboard/package.json             |  22 ++--
 tools/screenshot-test/package.json       |  20 +--
 8 files changed, 109 insertions(+), 132 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2159d5291ac..261f668ec5a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,108 +5,85 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.0-RC.0.tgz",
-      "integrity": "sha1-z9WTfOEeq6A64+vXeLCHG3dTlmU=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.3.tgz",
+      "integrity": "sha1-OWxKW/sihH+eRYJFuplfnBMMDPM=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/common": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.0-RC.0.tgz",
-      "integrity": "sha1-rS0IU6YtLoe7oL3WWI2m+l8tq7g=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.3.tgz",
+      "integrity": "sha1-+SrGiwK+xfDm02A6hDKU3JbJYHQ=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.0-RC.0.tgz",
-      "integrity": "sha1-oiqet9DP0EwBVYtLb/FE5PIENO4=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.3.tgz",
+      "integrity": "sha1-jwEWPa19s0CEl9mdOHVUtrGFrWY=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.0-RC.0.tgz",
-      "integrity": "sha1-0trwhngqKAIQBVoiH2DRYrT+Yno=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz",
+      "integrity": "sha1-GDr4HxQRhrjWYLBkKVktQLdUCko=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.3.6",
+        "@angular/tsc-wrapped": "4.4.3",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
-      },
-      "dependencies": {
-        "@angular/tsc-wrapped": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz",
-          "integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=",
-          "dev": true,
-          "requires": {
-            "tsickle": "0.21.6"
-          }
-        },
-        "tsickle": {
-          "version": "0.21.6",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz",
-          "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=",
-          "dev": true,
-          "requires": {
-            "minimist": "1.2.0",
-            "mkdirp": "0.5.1",
-            "source-map": "0.5.6",
-            "source-map-support": "0.4.15"
-          }
-        }
       }
     },
     "@angular/core": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.0-RC.0.tgz",
-      "integrity": "sha1-bxsF1Y2+guLNMpzT3AZm82xgw48=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.3.tgz",
+      "integrity": "sha1-5x0rB76qy6tIq39R1OIobqXXDhU=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/forms": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.0-RC.0.tgz",
-      "integrity": "sha1-LG1b231G/m6wQW4WGWK0JyZcP3s=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.3.tgz",
+      "integrity": "sha1-JbQburWL8dqHJBHIUXwQ18U3PY4=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.0-RC.0.tgz",
-      "integrity": "sha1-a6qUX6OhgqbOgqFRr2X8FIn14bE=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.3.tgz",
+      "integrity": "sha1-tVftJBRKrMRLE2zUd+hNL1eAiQM=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.0-RC.0.tgz",
-      "integrity": "sha1-t8W4tjiFZMdLBRD4dQ4tdJJBPO4=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.3.tgz",
+      "integrity": "sha1-I/mkW9Pcf0TZeHf7+OYDLez8ncs=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.0-RC.0.tgz",
-      "integrity": "sha1-dP6kqPvYljMgnyrwygpxp6Vp2DU=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz",
+      "integrity": "sha1-5B3dglJDJ3UxDqtZQM3Y3wYY8IQ=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-server": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.0-RC.0.tgz",
-      "integrity": "sha1-Dch10TyFEwqBVSJp3hHBmreDytM=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.3.tgz",
+      "integrity": "sha1-5l3OneVNbKZknMmJTFx6Mke6r0w=",
       "dev": true,
       "requires": {
         "parse5": "3.0.2",
@@ -115,18 +92,18 @@
       }
     },
     "@angular/router": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.0-RC.0.tgz",
-      "integrity": "sha1-72wHXxZkqf5nf6VCM0cH5nBGHuA=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.3.tgz",
+      "integrity": "sha1-JsyUd1o4YJRq6vHC6PYPTUTpCZE=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.4.0-RC.0",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.0-RC.0.tgz",
-      "integrity": "sha1-xXZeYDDjQzHowAfF0RYotfCxi3I=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz",
+      "integrity": "sha1-LT84IQodTbA/yG3PHglYErhc0Rk=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
@@ -698,16 +675,6 @@
         "@types/node": "7.0.34"
       }
     },
-    "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"
-      }
-    },
     "abab": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
@@ -2319,8 +2286,8 @@
       "integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
         "is-text-path": "1.0.1",
+        "JSONStream": "1.3.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.1.1",
@@ -4588,7 +4555,6 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.21",
-        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -4606,6 +4572,7 @@
         "fstream-ignore": "1.0.5",
         "inquirer": "0.12.0",
         "jsonschema": "1.1.1",
+        "JSONStream": "1.3.1",
         "jsonwebtoken": "5.7.0",
         "lodash": "4.17.4",
         "open": "0.0.5",
@@ -9203,16 +9170,6 @@
         "through2": "0.6.5"
       },
       "dependencies": {
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -9225,6 +9182,16 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -9289,6 +9256,16 @@
       "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk=",
       "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"
+      }
+    },
     "jsonwebtoken": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
@@ -13589,6 +13566,15 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -13622,15 +13608,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "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"
-      }
-    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
diff --git a/package.json b/package.json
index e71ff898154b..d8e8e9be7164 100644
--- a/package.json
+++ b/package.json
@@ -25,13 +25,13 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": "~4.4.1",
-    "@angular/common": "~4.4.1",
-    "@angular/compiler": "~4.4.1",
-    "@angular/core": "~4.4.1",
-    "@angular/forms": "~4.4.1",
-    "@angular/http": "~4.4.1",
-    "@angular/platform-browser": "~4.4.1",
+    "@angular/animations": "~4.4.3",
+    "@angular/common": "~4.4.3",
+    "@angular/compiler": "~4.4.3",
+    "@angular/core": "~4.4.3",
+    "@angular/forms": "~4.4.3",
+    "@angular/http": "~4.4.3",
+    "@angular/platform-browser": "~4.4.3",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
     "systemjs": "0.19.43",
@@ -40,11 +40,11 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.4.1",
-    "@angular/platform-browser-dynamic": "~4.4.1",
-    "@angular/platform-server": "~4.4.1",
-    "@angular/router": "~4.4.1",
-    "@angular/tsc-wrapped": "~4.4.1",
+    "@angular/compiler-cli": "~4.4.3",
+    "@angular/platform-browser-dynamic": "~4.4.3",
+    "@angular/platform-server": "~4.4.3",
+    "@angular/router": "~4.4.3",
+    "@angular/tsc-wrapped": "~4.4.3",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^3.0.1",
diff --git a/src/cdk/package.json b/src/cdk/package.json
index abbd68d5d494..58d20d0c69d9 100644
--- a/src/cdk/package.json
+++ b/src/cdk/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular/core": "^4.4.1",
-    "@angular/common": "^4.4.1"
+    "@angular/core": "^4.4.3",
+    "@angular/common": "^4.4.3"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/lib/package.json b/src/lib/package.json
index 5bee54b1f6a6..0f65801d568d 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -23,8 +23,8 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/cdk": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.4.1",
-    "@angular/common": "^4.4.1"
+    "@angular/core": "^4.4.3",
+    "@angular/common": "^4.4.3"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/material-examples/package.json b/src/material-examples/package.json
index 6c952f6a9b14..bc7eb5584a7b 100644
--- a/src/material-examples/package.json
+++ b/src/material-examples/package.json
@@ -24,9 +24,9 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/cdk": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.4.1",
-    "@angular/common": "^4.4.1",
-    "@angular/http": "^4.4.1",
+    "@angular/core": "^4.4.3",
+    "@angular/common": "^4.4.3",
+    "@angular/http": "^4.4.3",
     "@angular/material": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
diff --git a/src/material-moment-adapter/package.json b/src/material-moment-adapter/package.json
index 991f53045c92..607510a6bb14 100644
--- a/src/material-moment-adapter/package.json
+++ b/src/material-moment-adapter/package.json
@@ -17,7 +17,7 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/material": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.4.1",
+    "@angular/core": "^4.4.3",
     "moment": "^2.18.1"
   },
   "dependencies": {
diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index 80d727acacbc..008835a36a6e 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -10,17 +10,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.2.6",
+    "@angular/animations": "^4.4.3",
     "@angular/cdk": "github:angular/cdk-builds",
-    "@angular/common": "^4.2.6",
-    "@angular/compiler": "^4.2.6",
-    "@angular/core": "^4.2.6",
-    "@angular/forms": "^4.2.6",
-    "@angular/http": "^4.2.6",
+    "@angular/common": "^4.4.3",
+    "@angular/compiler": "^4.4.3",
+    "@angular/core": "^4.4.3",
+    "@angular/forms": "^4.4.3",
+    "@angular/http": "^4.4.3",
     "@angular/material": "github:angular/material2-builds",
-    "@angular/platform-browser": "^4.2.6",
-    "@angular/platform-browser-dynamic": "^4.2.6",
-    "@angular/router": "^4.2.6",
+    "@angular/platform-browser": "^4.4.3",
+    "@angular/platform-browser-dynamic": "^4.4.3",
+    "@angular/router": "^4.4.3",
     "@swimlane/ngx-charts": "^6.0.0",
     "angularfire2": "^4.0.0-rc.1",
     "core-js": "^2.4.1",
@@ -31,8 +31,8 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.2.0",
-    "@angular/compiler-cli": "^4.2.6",
-    "@angular/language-service": "^4.2.6",
+    "@angular/compiler-cli": "^4.4.3",
+    "@angular/language-service": "^4.4.3",
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "ts-node": "~3.0.4",
diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index 485555b28bc7..056395a1c5d0 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -11,16 +11,16 @@
   "dependencies": {
     "@angular/animations": "^4.0.2",
     "@angular/cdk": "angular/cdk-builds",
-    "@angular/common": "^4.3.0",
-    "@angular/compiler": "^4.3.0",
-    "@angular/compiler-cli": "^4.3.0",
-    "@angular/core": "^4.3.0",
-    "@angular/forms": "^4.3.0",
-    "@angular/http": "^4.3.0",
+    "@angular/common": "^4.4.3",
+    "@angular/compiler": "^4.4.3",
+    "@angular/compiler-cli": "^4.4.3",
+    "@angular/core": "^4.4.3",
+    "@angular/forms": "^4.4.3",
+    "@angular/http": "^4.4.3",
     "@angular/material": "angular/material2-builds",
-    "@angular/platform-browser": "^4.3.0",
-    "@angular/platform-browser-dynamic": "^4.3.0",
-    "@angular/router": "^4.3.0",
+    "@angular/platform-browser": "^4.4.3",
+    "@angular/platform-browser-dynamic": "^4.4.3",
+    "@angular/router": "^4.4.3",
     "core-js": "^2.4.1",
     "firebase": "^3.7.6",
     "rxjs": "^5.0.1",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.0.0",
-    "@angular/compiler-cli": "^4.3.0",
+    "@angular/compiler-cli": "^4.4.3",
     "@types/node": "^6.0.42",
     "ts-node": "1.2.1",
     "typescript": "~2.2.1"

From 7fe37e580192959f989884372453d486a86ffed5 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Thu, 21 Sep 2017 11:20:07 -0700
Subject: [PATCH 126/575] chore: use mat in internal templates (#7219)

---
 src/lib/button/button.html                    |  8 ++---
 src/lib/button/button.ts                      |  2 ++
 src/lib/checkbox/checkbox.html                |  8 ++---
 src/lib/checkbox/checkbox.ts                  |  3 +-
 src/lib/core/option/option.html               | 12 +++----
 src/lib/core/option/option.ts                 |  5 ++-
 src/lib/core/ripple/ripple.ts                 |  2 +-
 src/lib/datepicker/calendar.html              | 31 +++----------------
 src/lib/datepicker/calendar.ts                |  2 +-
 src/lib/datepicker/datepicker-content.html    |  4 +--
 src/lib/datepicker/datepicker-toggle.html     |  6 ++--
 src/lib/datepicker/datepicker-toggle.ts       |  2 ++
 src/lib/datepicker/datepicker.spec.ts         |  4 +--
 src/lib/datepicker/datepicker.ts              |  3 +-
 src/lib/datepicker/month-view.html            |  2 +-
 src/lib/datepicker/month-view.ts              |  6 +++-
 src/lib/datepicker/year-view.html             |  2 +-
 src/lib/list/list-item.html                   |  6 ++--
 src/lib/list/list-option.html                 | 10 +++---
 src/lib/list/list.ts                          |  3 +-
 src/lib/list/selection-list.ts                |  2 +-
 src/lib/menu/menu-item.html                   |  2 +-
 src/lib/menu/menu-item.ts                     |  3 +-
 src/lib/paginator/paginator.html              | 20 ++++++------
 src/lib/paginator/paginator.ts                |  4 +--
 .../progress-spinner/progress-spinner.html    |  2 +-
 src/lib/radio/radio.html                      |  8 ++---
 src/lib/radio/radio.ts                        |  3 +-
 src/lib/slide-toggle/slide-toggle.html        |  8 ++---
 src/lib/slide-toggle/slide-toggle.ts          | 16 +++++++---
 src/lib/stepper/step-header.html              |  4 +--
 src/lib/stepper/step-header.ts                |  2 +-
 src/lib/stepper/stepper-horizontal.html       |  4 +--
 src/lib/stepper/stepper-vertical.html         |  4 +--
 src/lib/stepper/stepper.spec.ts               |  4 +--
 src/lib/stepper/stepper.ts                    |  4 ++-
 src/lib/tabs/tab-group.html                   | 12 +++----
 src/lib/tabs/tab-group.spec.ts                |  2 +-
 src/lib/tabs/tab-group.ts                     |  8 +++--
 src/lib/tabs/tab-header.html                  |  6 ++--
 src/lib/tabs/tab-header.ts                    |  8 +++--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.html     |  2 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts       |  3 +-
 src/lib/tabs/tab.html                         |  2 +-
 src/lib/toolbar/toolbar.html                  |  4 +--
 src/lib/toolbar/toolbar.ts                    |  3 +-
 46 files changed, 133 insertions(+), 128 deletions(-)

diff --git a/src/lib/button/button.html b/src/lib/button/button.html
index d198d21ca429..e7caa601203c 100644
--- a/src/lib/button/button.html
+++ b/src/lib/button/button.html
@@ -1,7 +1,7 @@
 <span class="mat-button-wrapper"><ng-content></ng-content></span>
-<div md-ripple class="mat-button-ripple"
+<div mat-ripple class="mat-button-ripple"
      [class.mat-button-ripple-round]="_isRoundButton || _isIconButton"
-     [mdRippleDisabled]="_isRippleDisabled()"
-     [mdRippleCentered]="_isIconButton"
-     [mdRippleTrigger]="_getHostElement()"></div>
+     [matRippleDisabled]="_isRippleDisabled()"
+     [matRippleCentered]="_isIconButton"
+     [matRippleTrigger]="_getHostElement()"></div>
 <div class="mat-button-focus-overlay"></div>
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index ebfb6960d120..d11c1776b299 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -24,6 +24,7 @@ import {
   CanColor,
   CanDisable,
   CanDisableRipple,
+  MATERIAL_COMPATIBILITY_MODE,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple
@@ -130,6 +131,7 @@ export const _MdButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(Md
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdButton extends _MdButtonMixinBase
     implements OnDestroy, CanDisable, CanColor, CanDisableRipple {
diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index b6067c6e0833..f1185ea34a3f 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -15,10 +15,10 @@
            [attr.aria-labelledby]="ariaLabelledby"
            (change)="_onInteractionEvent($event)"
            (click)="_onInputClick($event)">
-    <div md-ripple class="mat-checkbox-ripple"
-         [mdRippleTrigger]="label"
-         [mdRippleDisabled]="_isRippleDisabled()"
-         [mdRippleCentered]="true"></div>
+    <div mat-ripple class="mat-checkbox-ripple"
+         [matRippleTrigger]="label"
+         [matRippleDisabled]="_isRippleDisabled()"
+         [matRippleCentered]="true"></div>
     <div class="mat-checkbox-frame"></div>
     <div class="mat-checkbox-background">
       <svg version="1.1"
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index fa32e27a6f45..86096cd2861d 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -26,7 +26,7 @@ import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {
   CanColor,
   CanDisable,
-  CanDisableRipple,
+  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
   MdRipple,
   mixinColor,
   mixinDisabled,
@@ -104,6 +104,7 @@ export const _MdCheckboxMixinBase =
     '[class.mat-checkbox-label-before]': 'labelPosition == "before"',
   },
   providers: [MD_CHECKBOX_CONTROL_VALUE_ACCESSOR],
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
   inputs: ['disabled', 'disableRipple', 'color'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
diff --git a/src/lib/core/option/option.html b/src/lib/core/option/option.html
index 9b5b23e354b2..a9b7b2e63374 100644
--- a/src/lib/core/option/option.html
+++ b/src/lib/core/option/option.html
@@ -1,12 +1,10 @@
-<span [ngSwitch]="_isCompatibilityMode" *ngIf="multiple">
-  <mat-pseudo-checkbox class="mat-option-pseudo-checkbox" *ngSwitchCase="true"
+<span *ngIf="multiple">
+  <mat-pseudo-checkbox class="mat-option-pseudo-checkbox"
       [state]="selected ? 'checked' : ''" [disabled]="disabled"></mat-pseudo-checkbox>
-  <md-pseudo-checkbox class="mat-option-pseudo-checkbox" *ngSwitchDefault
-      [state]="selected ? 'checked' : ''" [disabled]="disabled"></md-pseudo-checkbox>
 </span>
 
 <ng-content></ng-content>
-<div class="mat-option-ripple" md-ripple
-     [mdRippleTrigger]="_getHostElement()"
-     [mdRippleDisabled]="disabled || disableRipple">
+<div class="mat-option-ripple" mat-ripple
+     [matRippleTrigger]="_getHostElement()"
+     [matRippleDisabled]="disabled || disableRipple">
 </div>
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index ebb95a93330f..baf7353f70b1 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -13,7 +13,6 @@ import {
   Input,
   Output,
   ViewEncapsulation,
-  Inject,
   Optional,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -59,6 +58,7 @@ export class MdOptionSelectionChange {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdOption {
   private _selected: boolean = false;
@@ -107,8 +107,7 @@ export class MdOption {
   constructor(
     private _element: ElementRef,
     private _changeDetectorRef: ChangeDetectorRef,
-    @Optional() public readonly group: MdOptgroup,
-    @Optional() @Inject(MATERIAL_COMPATIBILITY_MODE) public _isCompatibilityMode: boolean) {}
+    @Optional() public readonly group: MdOptgroup) {}
 
   /**
    * Whether or not the option is currently active and ready to be selected.
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index c232ec2fb02e..5b25c0a829f1 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -137,7 +137,7 @@ export class MdRipple implements OnChanges, OnDestroy {
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes['trigger'] && this.trigger) {
+    if ((changes['trigger'] || changes['_matRippleTrigger']) && this.trigger) {
       this._rippleRenderer.setTriggerElement(this.trigger);
     }
 
diff --git a/src/lib/datepicker/calendar.html b/src/lib/datepicker/calendar.html
index 5bed9b3e0cf0..71d227291bd1 100644
--- a/src/lib/datepicker/calendar.html
+++ b/src/lib/datepicker/calendar.html
@@ -1,17 +1,6 @@
 <div class="mat-calendar-header">
   <div class="mat-calendar-controls">
-    <!--
-      TODO(mmalerba): Clean up duplicated compatibility mode code when we have a better way to do
-      this.
-    -->
-
-    <!-- Check for compatibility mode and use correct prefix for md-button. -->
-    <button *ngIf="!_isCompatibilityMode" md-button class="mat-calendar-period-button"
-            (click)="_currentPeriodClicked()"  [attr.aria-label]="_periodButtonLabel">
-      {{_periodButtonText}}
-      <div class="mat-calendar-arrow" [class.mat-calendar-invert]="!_monthView"></div>
-    </button>
-    <button *ngIf="_isCompatibilityMode" mat-button class="mat-calendar-period-button"
+    <button mat-button class="mat-calendar-period-button"
             (click)="_currentPeriodClicked()"  [attr.aria-label]="_periodButtonLabel">
       {{_periodButtonText}}
       <div class="mat-calendar-arrow" [class.mat-calendar-invert]="!_monthView"></div>
@@ -19,22 +8,12 @@
 
     <div class="mat-calendar-spacer"></div>
 
-    <!-- Check for compatibility mode and use correct prefix for md-icon-button. -->
-    <button *ngIf="!_isCompatibilityMode" md-icon-button class="mat-calendar-previous-button"
-            [disabled]="!_previousEnabled()" (click)="_previousClicked()"
-            [attr.aria-label]="_prevButtonLabel">
-    </button>
-    <button *ngIf="_isCompatibilityMode" mat-icon-button class="mat-calendar-previous-button"
+    <button mat-icon-button class="mat-calendar-previous-button"
             [disabled]="!_previousEnabled()" (click)="_previousClicked()"
             [attr.aria-label]="_prevButtonLabel">
     </button>
 
-    <!-- Check for compatibility mode and use correct prefix for md-icon-button. -->
-    <button *ngIf="!_isCompatibilityMode" md-icon-button class="mat-calendar-next-button"
-            [disabled]="!_nextEnabled()" (click)="_nextClicked()"
-            [attr.aria-label]="_nextButtonLabel">
-    </button>
-    <button *ngIf="_isCompatibilityMode" mat-icon-button class="mat-calendar-next-button"
+    <button mat-icon-button class="mat-calendar-next-button"
             [disabled]="!_nextEnabled()" (click)="_nextClicked()"
             [attr.aria-label]="_nextButtonLabel">
     </button>
@@ -52,11 +31,11 @@
       (userSelection)="_userSelected()">
   </md-month-view>
 
-  <md-year-view
+  <mat-year-view
       *ngSwitchDefault
       [activeDate]="_activeDate"
       [selected]="selected"
       [dateFilter]="_dateFilterForViews"
       (selectedChange)="_monthSelected($event)">
-  </md-year-view>
+  </mat-year-view>
 </div>
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index eb47eb20a616..b66adc2ff4f3 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -60,6 +60,7 @@ import {MdDatepickerIntl} from './datepicker-intl';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdCalendar<D> implements AfterContentInit, OnDestroy {
   private _intlChanges: Subscription;
@@ -146,7 +147,6 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
   constructor(private _elementRef: ElementRef,
               private _intl: MdDatepickerIntl,
               private _ngZone: NgZone,
-              @Optional() @Inject(MATERIAL_COMPATIBILITY_MODE) public _isCompatibilityMode: boolean,
               @Optional() private _dateAdapter: DateAdapter<D>,
               @Optional() @Inject(MD_DATE_FORMATS) private _dateFormats: MdDateFormats,
               changeDetectorRef: ChangeDetectorRef) {
diff --git a/src/lib/datepicker/datepicker-content.html b/src/lib/datepicker/datepicker-content.html
index 90fcc91b6097..fea716d55f61 100644
--- a/src/lib/datepicker/datepicker-content.html
+++ b/src/lib/datepicker/datepicker-content.html
@@ -1,4 +1,4 @@
-<md-calendar cdkTrapFocus
+<mat-calendar cdkTrapFocus
     [id]="datepicker.id"
     [startAt]="datepicker.startAt"
     [startView]="datepicker.startView"
@@ -8,4 +8,4 @@
     [selected]="datepicker._selected"
     (selectedChange)="datepicker._select($event)"
     (userSelection)="datepicker.close()">
-</md-calendar>
+</mat-calendar>
diff --git a/src/lib/datepicker/datepicker-toggle.html b/src/lib/datepicker/datepicker-toggle.html
index 3335c2912d64..57546536b130 100644
--- a/src/lib/datepicker/datepicker-toggle.html
+++ b/src/lib/datepicker/datepicker-toggle.html
@@ -1,10 +1,10 @@
-<button md-icon-button type="button" [attr.aria-label]="_intl.openCalendarLabel"
+<button mat-icon-button type="button" [attr.aria-label]="_intl.openCalendarLabel"
         [disabled]="disabled" (click)="_open($event)">
-  <md-icon>
+  <mat-icon>
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="100%" height="100%"
          fill="currentColor" style="vertical-align: top" focusable="false">
       <path d="M0 0h24v24H0z" fill="none"/>
       <path d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z"/>
     </svg>
-  </md-icon>
+  </mat-icon>
 </button>
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index 006ee0cb7520..5968934ff4fc 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -22,6 +22,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
+import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 
 
 @Component({
@@ -34,6 +35,7 @@ import {of as observableOf} from 'rxjs/observable/of';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdDatepickerToggle<D> implements OnChanges, OnDestroy {
   private _stateChanges = Subscription.EMPTY;
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index a5f4a93f99b9..cd0834f951d5 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -249,7 +249,7 @@ describe('MdDatepicker', () => {
 
         let ownedElement = document.getElementById(ownedElementId);
         expect(ownedElement).not.toBeNull();
-        expect((ownedElement as Element).tagName.toLowerCase()).toBe('md-calendar');
+        expect((ownedElement as Element).tagName.toLowerCase()).toBe('mat-calendar');
       });
 
       it('input should aria-owns calendar after opened in touch mode', () => {
@@ -267,7 +267,7 @@ describe('MdDatepicker', () => {
 
         let ownedElement = document.getElementById(ownedElementId);
         expect(ownedElement).not.toBeNull();
-        expect((ownedElement as Element).tagName.toLowerCase()).toBe('md-calendar');
+        expect((ownedElement as Element).tagName.toLowerCase()).toBe('mat-calendar');
       });
 
       it('should throw when given wrong data type', () => {
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 9f711fcea5dc..d0873f7f1980 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -36,7 +36,7 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import {DateAdapter} from '@angular/material/core';
+import {DateAdapter, MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 import {MdDialog, MdDialogRef} from '@angular/material/dialog';
 import {DOCUMENT} from '@angular/platform-browser';
 import {Subject} from 'rxjs/Subject';
@@ -88,6 +88,7 @@ export const MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdDatepickerContent<D> implements AfterContentInit {
   datepicker: MdDatepicker<D>;
diff --git a/src/lib/datepicker/month-view.html b/src/lib/datepicker/month-view.html
index 4688b323ee8f..a371beaebdd7 100644
--- a/src/lib/datepicker/month-view.html
+++ b/src/lib/datepicker/month-view.html
@@ -3,7 +3,7 @@
     <tr><th *ngFor="let day of _weekdays" [attr.aria-label]="day.long">{{day.narrow}}</th></tr>
     <tr><th class="mat-calendar-table-header-divider" colspan="7" aria-hidden="true"></th></tr>
   </thead>
-  <tbody md-calendar-body
+  <tbody mat-calendar-body
          role="grid"
          [label]="_monthLabel"
          [rows]="_weeks"
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index 32c9befd32f6..6030f1a45de4 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -17,7 +17,10 @@ import {
   Output,
   ViewEncapsulation,
 } from '@angular/core';
-import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
+import {
+  DateAdapter, MATERIAL_COMPATIBILITY_MODE, MD_DATE_FORMATS,
+  MdDateFormats
+} from '@angular/material/core';
 import {MdCalendarCell} from './calendar-body';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
@@ -37,6 +40,7 @@ const DAYS_PER_WEEK = 7;
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdMonthView<D> implements AfterContentInit {
   /**
diff --git a/src/lib/datepicker/year-view.html b/src/lib/datepicker/year-view.html
index 4fd34e0c3b89..ca50a5b1cd64 100644
--- a/src/lib/datepicker/year-view.html
+++ b/src/lib/datepicker/year-view.html
@@ -2,7 +2,7 @@
   <thead class="mat-calendar-table-header">
     <tr><th class="mat-calendar-table-header-divider" colspan="4"></th></tr>
   </thead>
-  <tbody md-calendar-body
+  <tbody mat-calendar-body
          role="grid"
          allowDisabledSelection="true"
          [label]="_yearLabel"
diff --git a/src/lib/list/list-item.html b/src/lib/list/list-item.html
index aef6a78c83ee..4550bc470c2d 100644
--- a/src/lib/list/list-item.html
+++ b/src/lib/list/list-item.html
@@ -1,7 +1,7 @@
 <div class="mat-list-item-content">
-  <div class="mat-list-item-ripple" md-ripple
-       [mdRippleTrigger]="_getHostElement()"
-       [mdRippleDisabled]="_isRippleDisabled()">
+  <div class="mat-list-item-ripple" mat-ripple
+       [matRippleTrigger]="_getHostElement()"
+       [matRippleDisabled]="_isRippleDisabled()">
   </div>
 
   <ng-content
diff --git a/src/lib/list/list-option.html b/src/lib/list/list-option.html
index be563650414c..4b6fb2aa5df4 100644
--- a/src/lib/list/list-option.html
+++ b/src/lib/list/list-option.html
@@ -2,14 +2,14 @@
   [class.mat-list-item-content-reverse]="checkboxPosition == 'after'"
   [class.mat-list-item-disabled]="disabled">
 
-  <div md-ripple
+  <div mat-ripple
     class="mat-list-item-ripple"
-    [mdRippleTrigger]="_getHostElement()"
-    [mdRippleDisabled]="_isRippleDisabled()"></div>
+    [matRippleTrigger]="_getHostElement()"
+    [matRippleDisabled]="_isRippleDisabled()"></div>
 
-  <md-pseudo-checkbox #autocheckbox
+  <mat-pseudo-checkbox #autocheckbox
     [state]="selected ? 'checked' : 'unchecked'"
-    [disabled]="disabled"></md-pseudo-checkbox>
+    [disabled]="disabled"></mat-pseudo-checkbox>
 
   <div class="mat-list-text"><ng-content></ng-content></div>
 
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 06051afc267a..183b8c81dd80 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -19,7 +19,7 @@ import {
   ViewEncapsulation,
   ChangeDetectionStrategy,
 } from '@angular/core';
-import {MdLine, MdLineSetter} from '@angular/material/core';
+import {MATERIAL_COMPATIBILITY_MODE, MdLine, MdLineSetter} from '@angular/material/core';
 import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 
 // Boilerplate for applying mixins to MdList.
@@ -132,6 +132,7 @@ export class MdListSubheaderCssMatStyler {}
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdListItem extends _MdListItemMixinBase implements AfterContentInit, CanDisableRipple {
   private _lineSetter: MdLineSetter;
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 852eaf74d137..2603911a4905 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -83,7 +83,7 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdListOption extends _MdListOptionMixinBase
     implements AfterContentInit, OnDestroy, FocusableOption, CanDisableRipple {
diff --git a/src/lib/menu/menu-item.html b/src/lib/menu/menu-item.html
index 86e13ecab855..ab3465eb526b 100644
--- a/src/lib/menu/menu-item.html
+++ b/src/lib/menu/menu-item.html
@@ -1,3 +1,3 @@
 <ng-content></ng-content>
-<div class="mat-menu-ripple" *ngIf="!disabled" md-ripple [mdRippleTrigger]="_getHostElement()">
+<div class="mat-menu-ripple" *ngIf="!disabled" mat-ripple [matRippleTrigger]="_getHostElement()">
 </div>
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index b801dc6c2940..fe9ff3dcbb55 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -14,7 +14,7 @@ import {
   OnDestroy,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanDisable, mixinDisabled} from '@angular/material/core';
+import {CanDisable, MATERIAL_COMPATIBILITY_MODE, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
 // Boilerplate for applying mixins to MdMenuItem.
@@ -46,6 +46,7 @@ export const _MdMenuItemMixinBase = mixinDisabled(MdMenuItemBase);
   preserveWhitespaces: false,
   templateUrl: 'menu-item.html',
   exportAs: 'mdMenuItem, matMenuItem',
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdMenuItem extends _MdMenuItemMixinBase implements FocusableOption, CanDisable,
   OnDestroy {
diff --git a/src/lib/paginator/paginator.html b/src/lib/paginator/paginator.html
index 515ab7981244..700efb48faaf 100644
--- a/src/lib/paginator/paginator.html
+++ b/src/lib/paginator/paginator.html
@@ -3,15 +3,15 @@
     {{_intl.itemsPerPageLabel}}
   </div>
 
-  <md-select *ngIf="_displayedPageSizeOptions.length > 1"
+  <mat-select *ngIf="_displayedPageSizeOptions.length > 1"
              class="mat-paginator-page-size-select"
              [value]="pageSize"
              [aria-label]="_intl.itemsPerPageLabel"
              (change)="_changePageSize($event.value)">
-    <md-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
+    <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
       {{pageSizeOption}}
-    </md-option>
-  </md-select>
+    </mat-option>
+  </mat-select>
 
   <div *ngIf="_displayedPageSizeOptions.length <= 1">{{pageSize}}</div>
 </div>
@@ -20,21 +20,21 @@
   {{_intl.getRangeLabel(pageIndex, pageSize, length)}}
 </div>
 
-<button md-icon-button type="button" 
+<button mat-icon-button type="button"
         class="mat-paginator-navigation-previous"
         (click)="previousPage()"
         [attr.aria-label]="_intl.previousPageLabel"
-        [mdTooltip]="_intl.previousPageLabel"
-        [mdTooltipPosition]="'above'"
+        [matTooltip]="_intl.previousPageLabel"
+        [matTooltipPosition]="'above'"
         [disabled]="!hasPreviousPage()">
   <div class="mat-paginator-increment"></div>
 </button>
-<button md-icon-button type="button" 
+<button mat-icon-button type="button"
         class="mat-paginator-navigation-next"
         (click)="nextPage()"
         [attr.aria-label]="_intl.nextPageLabel"
-        [mdTooltip]="_intl.nextPageLabel"
-        [mdTooltipPosition]="'above'"
+        [matTooltip]="_intl.nextPageLabel"
+        [matTooltipPosition]="'above'"
         [disabled]="!hasNextPage()">
   <div class="mat-paginator-decrement"></div>
 </button>
diff --git a/src/lib/paginator/paginator.ts b/src/lib/paginator/paginator.ts
index a0903e392cbf..22391029aaf9 100644
--- a/src/lib/paginator/paginator.ts
+++ b/src/lib/paginator/paginator.ts
@@ -52,9 +52,7 @@ export class PageEvent {
   host: {
     'class': 'mat-paginator',
   },
-  providers: [
-    {provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}
-  ],
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
diff --git a/src/lib/progress-spinner/progress-spinner.html b/src/lib/progress-spinner/progress-spinner.html
index 3379dc08262a..bb27e80f90b6 100644
--- a/src/lib/progress-spinner/progress-spinner.html
+++ b/src/lib/progress-spinner/progress-spinner.html
@@ -1,6 +1,6 @@
 <!--
   preserveAspectRatio of xMidYMid meet as the center of the viewport is the circle's
-  center. The center of the circle will remain at the center of the md-progress-spinner
+  center. The center of the circle will remain at the center of the mat-progress-spinner
   element containing the SVG. `focusable="false"` prevents IE from allowing the user to
   tab into the SVG element.
 -->
diff --git a/src/lib/radio/radio.html b/src/lib/radio/radio.html
index 2b455fd41516..c6280776061d 100644
--- a/src/lib/radio/radio.html
+++ b/src/lib/radio/radio.html
@@ -5,10 +5,10 @@
   <div class="mat-radio-container">
     <div class="mat-radio-outer-circle"></div>
     <div class="mat-radio-inner-circle"></div>
-    <div md-ripple class="mat-radio-ripple"
-         [mdRippleTrigger]="label"
-         [mdRippleDisabled]="_isRippleDisabled()"
-         [mdRippleCentered]="true"></div>
+    <div mat-ripple class="mat-radio-ripple"
+         [matRippleTrigger]="label"
+         [matRippleDisabled]="_isRippleDisabled()"
+         [matRippleCentered]="true"></div>
   </div>
 
   <input #input class="mat-radio-input cdk-visually-hidden" type="radio"
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 652a70154129..406dd39f715a 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -31,7 +31,7 @@ import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
 import {
   RippleRef,
   UniqueSelectionDispatcher,
-  MdRipple,
+  MdRipple, MATERIAL_COMPATIBILITY_MODE,
 } from '@angular/material/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {mixinDisabled, CanDisable} from '@angular/material/core';
@@ -338,6 +338,7 @@ export const _MdRadioButtonMixinBase = mixinColor(mixinDisableRipple(MdRadioButt
     '(focus)': '_inputElement.nativeElement.focus()',
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdRadioButton extends _MdRadioButtonMixinBase
     implements OnInit, AfterViewInit, OnDestroy, CanColor, CanDisableRipple {
diff --git a/src/lib/slide-toggle/slide-toggle.html b/src/lib/slide-toggle/slide-toggle.html
index b5125b3e90b3..14060bd6d693 100644
--- a/src/lib/slide-toggle/slide-toggle.html
+++ b/src/lib/slide-toggle/slide-toggle.html
@@ -22,10 +22,10 @@
 
       <div class="mat-slide-toggle-thumb"></div>
 
-      <div class="mat-slide-toggle-ripple" md-ripple
-           [mdRippleTrigger]="label"
-           [mdRippleCentered]="true"
-           [mdRippleDisabled]="disableRipple || disabled">
+      <div class="mat-slide-toggle-ripple" mat-ripple
+           [matRippleTrigger]="label"
+           [matRippleCentered]="true"
+           [matRippleDisabled]="disableRipple || disabled">
       </div>
 
     </div>
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index d9e9c74233ea..114bf16e3184 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -26,15 +26,20 @@ import {Platform} from '@angular/cdk/platform';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
   applyCssTransform,
+  CanColor,
+  CanDisable,
+  CanDisableRipple,
   HammerInput,
+  HasTabIndex,
+  MATERIAL_COMPATIBILITY_MODE,
   MdRipple,
+  mixinColor,
+  mixinDisabled,
+  mixinDisableRipple,
+  mixinTabIndex,
   RippleRef,
 } from '@angular/material/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {mixinDisabled, CanDisable} from '@angular/material/core';
-import {CanColor, mixinColor} from '@angular/material/core';
-import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
-import {HasTabIndex, mixinTabIndex} from '@angular/material/core';
 import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for slide-toggle components.
@@ -74,10 +79,11 @@ export const _MdSlideToggleMixinBase =
   templateUrl: 'slide-toggle.html',
   styleUrls: ['slide-toggle.css'],
   providers: [MD_SLIDE_TOGGLE_VALUE_ACCESSOR],
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
   inputs: ['disabled', 'disableRipple', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy, AfterContentInit,
     ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple {
diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index b385c5b43974..57b983544512 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -2,8 +2,8 @@
      [class.mat-step-icon-not-touched]="icon == 'number' && !selected"
      [ngSwitch]="icon">
   <span *ngSwitchCase="'number'">{{index + 1}}</span>
-  <md-icon *ngSwitchCase="'edit'">create</md-icon>
-  <md-icon *ngSwitchCase="'done'">done</md-icon>
+  <mat-icon *ngSwitchCase="'edit'">create</mat-icon>
+  <mat-icon *ngSwitchCase="'done'">done</mat-icon>
 </div>
 <div class="mat-step-label"
      [class.mat-step-label-active]="active">
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index d610db9a73b3..be0390fc7b58 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -23,7 +23,7 @@ import {MdStepLabel} from './step-label';
   },
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
-  providers: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: false}],
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdStepHeader {
   /** Icon for the given step. */
diff --git a/src/lib/stepper/stepper-horizontal.html b/src/lib/stepper/stepper-horizontal.html
index 8b32e92e93a3..905f8dee8034 100644
--- a/src/lib/stepper/stepper-horizontal.html
+++ b/src/lib/stepper/stepper-horizontal.html
@@ -1,6 +1,6 @@
 <div class="mat-horizontal-stepper-header-container">
   <ng-container *ngFor="let step of _steps; let i = index; let isLast = last">
-    <md-step-header  class="mat-horizontal-stepper-header"
+    <mat-step-header  class="mat-horizontal-stepper-header"
                      (click)="step.select()"
                      (keydown)="_onKeydown($event)"
                      [tabIndex]="_focusIndex === i ? 0 : -1"
@@ -13,7 +13,7 @@
                      [selected]="selectedIndex === i"
                      [active]="step.completed || selectedIndex === i"
                      [optional]="step.optional">
-    </md-step-header>
+    </mat-step-header>
     <div *ngIf="!isLast" class="mat-stepper-horizontal-line"></div>
   </ng-container>
 </div>
diff --git a/src/lib/stepper/stepper-vertical.html b/src/lib/stepper/stepper-vertical.html
index bccd9bf5f4df..29a2f16f16fb 100644
--- a/src/lib/stepper/stepper-vertical.html
+++ b/src/lib/stepper/stepper-vertical.html
@@ -1,5 +1,5 @@
 <div class="mat-step" *ngFor="let step of _steps; let i = index; let isLast = last">
-  <md-step-header  class="mat-vertical-stepper-header"
+  <mat-step-header  class="mat-vertical-stepper-header"
                    (click)="step.select()"
                    (keydown)="_onKeydown($event)"
                    [tabIndex]="_focusIndex == i ? 0 : -1"
@@ -12,7 +12,7 @@
                    [selected]="selectedIndex === i"
                    [active]="step.completed || selectedIndex === i"
                    [optional]="step.optional">
-  </md-step-header>
+  </mat-step-header>
 
   <div class="mat-vertical-content-container" [class.mat-stepper-vertical-line]="!isLast">
     <div class="mat-vertical-stepper-content" role="tabpanel"
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index db0f539358e1..5662e317bc89 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -514,7 +514,7 @@ function assertCorrectKeyboardInteraction(fixture: ComponentFixture<any>,
 /** Asserts that step selection change using stepper buttons does not focus step header. */
 function assertStepHeaderFocusNotCalled(fixture: ComponentFixture<any>) {
   let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
-  let stepHeaderEl = fixture.debugElement.queryAll(By.css('md-step-header'))[1].nativeElement;
+  let stepHeaderEl = fixture.debugElement.queryAll(By.css('mat-step-header'))[1].nativeElement;
   let nextButtonNativeEl = fixture.debugElement
       .queryAll(By.directive(MdStepperNext))[0].nativeElement;
   spyOn(stepHeaderEl, 'focus');
@@ -577,7 +577,7 @@ function assertLinearStepperValidity(stepHeaderEl: HTMLElement,
 /** Asserts that step header focus is blurred if the step cannot be selected upon header click. */
 function assertStepHeaderBlurred(fixture: ComponentFixture<any>) {
   let stepHeaderEl = fixture.debugElement
-      .queryAll(By.css('md-step-header'))[1].nativeElement;
+      .queryAll(By.css('mat-step-header'))[1].nativeElement;
   spyOn(stepHeaderEl, 'blur');
   stepHeaderEl.click();
   fixture.detectChanges();
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 6c2098e5e065..1472de27a0fa 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -26,7 +26,7 @@ import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
 import {
   defaultErrorStateMatcher,
   ErrorOptions,
-  ErrorStateMatcher,
+  ErrorStateMatcher, MATERIAL_COMPATIBILITY_MODE,
   MD_ERROR_GLOBAL_OPTIONS,
 } from '@angular/material/core';
 import {MdStepHeader} from './step-header';
@@ -107,6 +107,7 @@ export class MdStepper extends _MdStepper {
   providers: [{provide: MdStepper, useExisting: MdHorizontalStepper}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdHorizontalStepper extends MdStepper { }
 
@@ -129,6 +130,7 @@ export class MdHorizontalStepper extends MdStepper { }
     ])
   ],
   providers: [{provide: MdStepper, useExisting: MdVerticalStepper}],
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
diff --git a/src/lib/tabs/tab-group.html b/src/lib/tabs/tab-group.html
index b352fa088a9c..baef20dfb1b8 100644
--- a/src/lib/tabs/tab-group.html
+++ b/src/lib/tabs/tab-group.html
@@ -1,9 +1,9 @@
-<md-tab-header #tabHeader
+<mat-tab-header #tabHeader
                [selectedIndex]="selectedIndex"
                [disableRipple]="disableRipple"
                (indexFocused)="_focusChanged($event)"
                (selectFocusedIndex)="selectedIndex = $event">
-  <div class="mat-tab-label" role="tab" mdTabLabelWrapper md-ripple
+  <div class="mat-tab-label" role="tab" matTabLabelWrapper mat-ripple
        *ngFor="let tab of _tabs; let i = index"
        [id]="_getTabLabelId(i)"
        [tabIndex]="selectedIndex == i ? 0 : -1"
@@ -11,7 +11,7 @@
        [attr.aria-selected]="selectedIndex == i"
        [class.mat-tab-label-active]="selectedIndex == i"
        [disabled]="tab.disabled"
-       [mdRippleDisabled]="disableRipple"
+       [matRippleDisabled]="disableRipple"
        (click)="tabHeader.focusIndex = selectedIndex = i">
 
     <!-- If there is a label template, use it. -->
@@ -22,10 +22,10 @@
     <!-- If there is not a label template, fall back to the text label. -->
     <ng-template [ngIf]="!tab.templateLabel">{{tab.textLabel}}</ng-template>
   </div>
-</md-tab-header>
+</mat-tab-header>
 
 <div class="mat-tab-body-wrapper" #tabBodyWrapper>
-  <md-tab-body role="tabpanel"
+  <mat-tab-body role="tabpanel"
                *ngFor="let tab of _tabs; let i = index"
                [id]="_getTabContentId(i)"
                [attr.aria-labelledby]="_getTabLabelId(i)"
@@ -35,5 +35,5 @@
                [origin]="tab.origin"
                (onCentered)="_removeTabBodyWrapperHeight()"
                (onCentering)="_setTabBodyWrapperHeight($event)">
-  </md-tab-body>
+  </mat-tab-body>
 </div>
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index a82befc61f89..651f465319e4 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -372,7 +372,7 @@ describe('MdTabGroup', () => {
     expect(tabLabelElement.classList.contains('mat-tab-label-active')).toBe(true);
 
     let tabContentElement = fixture.debugElement
-        .query(By.css(`md-tab-body:nth-of-type(${expectedIndex + 1})`)).nativeElement;
+        .query(By.css(`mat-tab-body:nth-of-type(${expectedIndex + 1})`)).nativeElement;
     expect(tabContentElement.classList.contains('mat-tab-body-active')).toBe(true);
   }
 
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 5a7297cd89c3..a80bc765b5b6 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -28,7 +28,10 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
 import {MdTab} from './tab';
 import {merge} from 'rxjs/observable/merge';
-import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
+import {
+  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
+  mixinDisableRipple
+} from '@angular/material/core';
 import {CanColor, mixinColor, ThemePalette} from '@angular/material/core';
 
 
@@ -69,7 +72,8 @@ export const _MdTabGroupMixinBase = mixinColor(mixinDisableRipple(MdTabGroupBase
     'class': 'mat-tab-group',
     '[class.mat-tab-group-dynamic-height]': 'dynamicHeight',
     '[class.mat-tab-group-inverted-header]': 'headerPosition === "below"',
-  }
+  },
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit,
     AfterContentChecked, AfterViewChecked, OnDestroy, CanColor, CanDisableRipple {
diff --git a/src/lib/tabs/tab-header.html b/src/lib/tabs/tab-header.html
index 62a15bb6bed6..79f964eda21a 100644
--- a/src/lib/tabs/tab-header.html
+++ b/src/lib/tabs/tab-header.html
@@ -1,6 +1,6 @@
 <div class="mat-tab-header-pagination mat-tab-header-pagination-before mat-elevation-z4"
      aria-hidden="true"
-     md-ripple [mdRippleDisabled]="_disableScrollBefore || disableRipple"
+     mat-ripple [matRippleDisabled]="_disableScrollBefore || disableRipple"
      [class.mat-tab-header-pagination-disabled]="_disableScrollBefore"
      (click)="_scrollHeader('before')">
   <div class="mat-tab-header-pagination-chevron"></div>
@@ -12,13 +12,13 @@
     <div class="mat-tab-labels">
       <ng-content></ng-content>
     </div>
-    <md-ink-bar></md-ink-bar>
+    <mat-ink-bar></mat-ink-bar>
   </div>
 </div>
 
 <div class="mat-tab-header-pagination mat-tab-header-pagination-after mat-elevation-z4"
      aria-hidden="true"
-     md-ripple [mdRippleDisabled]="_disableScrollAfter || disableRipple"
+     mat-ripple [matRippleDisabled]="_disableScrollAfter || disableRipple"
      [class.mat-tab-header-pagination-disabled]="_disableScrollAfter"
      (click)="_scrollHeader('after')">
   <div class="mat-tab-header-pagination-chevron"></div>
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index b92d9d15a77d..782c20284083 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -27,7 +27,10 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
+import {
+  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
+  mixinDisableRipple
+} from '@angular/material/core';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
@@ -74,7 +77,8 @@ export const _MdTabHeaderMixinBase = mixinDisableRipple(MdTabHeaderBase);
     'class': 'mat-tab-header',
     '[class.mat-tab-header-pagination-controls-enabled]': '_showPaginationControls',
     '[class.mat-tab-header-rtl]': "_getLayoutDirection() == 'rtl'",
-  }
+  },
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdTabHeader extends _MdTabHeaderMixinBase
     implements AfterContentChecked, AfterContentInit, OnDestroy, CanDisableRipple {
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.html b/src/lib/tabs/tab-nav-bar/tab-nav-bar.html
index cf26352743fd..d842ff7060db 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.html
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.html
@@ -1,5 +1,5 @@
 <div class="mat-tab-links" (cdkObserveContent)="_alignInkBar()">
   <ng-content></ng-content>
-  <md-ink-bar></md-ink-bar>
+  <mat-ink-bar></mat-ink-bar>
 </div>
 
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 506f0564f818..99eb7ecf993f 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -33,7 +33,7 @@ import {
 import {
   CanColor,
   CanDisable,
-  CanDisableRipple,
+  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
   MD_RIPPLE_GLOBAL_OPTIONS,
   MdRipple,
   mixinColor,
@@ -70,6 +70,7 @@ export const _MdTabNavMixinBase = mixinDisableRipple(mixinColor(MdTabNavBase, 'p
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, CanColor,
     CanDisableRipple, OnDestroy {
diff --git a/src/lib/tabs/tab.html b/src/lib/tabs/tab.html
index 398c819fa896..99442c1f1e37 100644
--- a/src/lib/tabs/tab.html
+++ b/src/lib/tabs/tab.html
@@ -1,4 +1,4 @@
-<!-- Create a template for the content of the <md-tab> so that we can grab a reference to this
+<!-- Create a template for the content of the <mat-tab> so that we can grab a reference to this
     TemplateRef and use it in a Portal to render the tab content in the appropriate place in the
     tab-group. -->
 <ng-template><ng-content></ng-content></ng-template>
diff --git a/src/lib/toolbar/toolbar.html b/src/lib/toolbar/toolbar.html
index e81e16e5d708..88eed7dbff08 100644
--- a/src/lib/toolbar/toolbar.html
+++ b/src/lib/toolbar/toolbar.html
@@ -1,6 +1,6 @@
 <div class="mat-toolbar-layout">
-  <md-toolbar-row>
+  <mat-toolbar-row>
     <ng-content></ng-content>
-  </md-toolbar-row>
+  </mat-toolbar-row>
   <ng-content select="md-toolbar-row, mat-toolbar-row"></ng-content>
 </div>
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index de05bc8d1257..42c852af0460 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -14,7 +14,7 @@ import {
   ElementRef,
   Renderer2,
 } from '@angular/core';
-import {CanColor, mixinColor} from '@angular/material/core';
+import {CanColor, MATERIAL_COMPATIBILITY_MODE, mixinColor} from '@angular/material/core';
 
 
 @Directive({
@@ -44,6 +44,7 @@ export const _MdToolbarMixinBase = mixinColor(MdToolbarBase);
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
 export class MdToolbar extends _MdToolbarMixinBase implements CanColor {
 

From f9b5ccd5373308f570e7c5bddca319a29ad050a4 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 21 Sep 2017 12:11:09 -0700
Subject: [PATCH 127/575] fix: remove cdk re-exports from @angular/material
 (#7112)

---
 src/{lib/core => cdk}/a11y/_a11y.scss         |  0
 src/cdk/a11y/focus-monitor.spec.ts            | 10 ++--
 src/cdk/a11y/focus-monitor.ts                 |  4 +-
 src/cdk/a11y/focus-trap.spec.ts               |  6 +-
 src/cdk/a11y/interactivity-checker.spec.ts    |  3 +-
 src/cdk/a11y/list-key-manager.spec.ts         |  8 +--
 .../core => cdk}/portal/portal-injector.ts    |  0
 src/cdk/portal/public_api.ts                  |  1 +
 src/demo-app/snack-bar/snack-bar-demo.ts      |  6 +-
 src/lib/autocomplete/autocomplete.spec.ts     | 30 +++++-----
 src/lib/button-toggle/button-toggle.scss      |  1 -
 src/lib/button/button.scss                    |  2 +-
 src/lib/card/card.scss                        |  2 +-
 src/lib/chips/chip-input.spec.ts              | 14 ++---
 src/lib/chips/chip-input.ts                   | 11 +---
 src/lib/chips/chip-list.spec.ts               | 13 +----
 src/lib/chips/chip-list.ts                    | 15 ++---
 src/lib/chips/chip.spec.ts                    | 11 ++--
 src/lib/chips/chip.ts                         | 57 +++++++++++--------
 src/lib/chips/chips.scss                      |  2 +-
 src/lib/core/_core.scss                       |  2 +-
 src/lib/core/a11y/README.md                   |  1 -
 .../core/a11y/activedescendant-key-manager.ts |  9 ---
 src/lib/core/a11y/fake-mousedown.ts           |  9 ---
 src/lib/core/a11y/focus-key-manager.ts        |  9 ---
 src/lib/core/a11y/focus-trap.ts               | 19 -------
 src/lib/core/a11y/index.ts                    |  9 ---
 src/lib/core/a11y/interactivity-checker.ts    |  9 ---
 src/lib/core/a11y/list-key-manager.ts         |  9 ---
 src/lib/core/a11y/live-announcer.ts           | 15 -----
 src/lib/core/bidi/dir.ts                      | 10 ----
 src/lib/core/bidi/directionality.ts           | 15 -----
 src/lib/core/bidi/index.ts                    | 16 ------
 .../core/compatibility/compatibility.spec.ts  |  4 +-
 .../core/datetime/native-date-adapter.spec.ts |  8 +--
 src/lib/core/keyboard/keycodes.ts             | 27 ---------
 src/lib/core/option/_option.scss              |  2 +-
 src/lib/core/option/option.ts                 | 12 ++--
 src/lib/core/overlay/index.ts                 |  9 ---
 src/lib/core/platform/features.ts             |  9 ---
 src/lib/core/platform/index.ts                | 11 ----
 src/lib/core/platform/platform.ts             |  9 ---
 src/lib/core/portal/README.md                 |  1 -
 src/lib/core/portal/dom-portal-host.ts        |  8 ---
 src/lib/core/portal/portal-directives.ts      |  9 ---
 src/lib/core/portal/portal.ts                 | 15 -----
 src/lib/core/public_api.ts                    | 10 ----
 src/lib/core/ripple/_ripple.scss              |  2 +-
 src/lib/core/rxjs/index.ts                    | 10 ----
 src/lib/core/rxjs/rx-chain.spec.ts            | 41 -------------
 src/lib/core/rxjs/rx-chain.ts                 |  9 ---
 src/lib/core/rxjs/rx-operators.ts             | 47 ---------------
 src/lib/core/style/index.ts                   | 16 ------
 src/lib/datepicker/calendar.spec.ts           | 38 ++++++++-----
 src/lib/dialog/dialog.scss                    |  2 +-
 src/lib/dialog/dialog.ts                      |  5 +-
 src/lib/expansion/expansion-panel-header.ts   | 26 ++++-----
 src/lib/form-field/form-field-module.ts       |  4 +-
 src/lib/icon/icon-registry.ts                 | 10 +---
 src/lib/icon/icon.ts                          |  6 +-
 src/lib/input/input-module.ts                 |  8 +--
 src/lib/input/input.spec.ts                   | 28 ++++-----
 src/lib/list/selection-list.spec.ts           | 10 ++--
 src/lib/list/selection-list.ts                |  6 +-
 src/lib/menu/menu-directive.ts                | 29 +++++-----
 src/lib/menu/menu.scss                        |  2 +-
 src/lib/select/select.scss                    |  2 +-
 src/lib/sidenav/drawer.scss                   |  2 +-
 src/lib/sidenav/drawer.ts                     |  5 +-
 src/lib/slide-toggle/slide-toggle.scss        |  2 +-
 src/lib/slider/slider-module.ts               |  8 +--
 src/lib/slider/slider.spec.ts                 | 19 ++++---
 src/lib/snack-bar/snack-bar-container.scss    |  2 +-
 src/lib/snack-bar/snack-bar.ts                | 11 ++--
 src/lib/sort/sort.spec.ts                     | 17 +++---
 src/lib/stepper/stepper.spec.ts               | 15 ++---
 src/lib/tabs/tab-body.spec.ts                 | 11 ++--
 src/lib/tabs/tab.ts                           |  5 +-
 src/lib/tooltip/tooltip.scss                  |  2 +-
 79 files changed, 249 insertions(+), 613 deletions(-)
 rename src/{lib/core => cdk}/a11y/_a11y.scss (100%)
 rename src/{lib/core => cdk}/portal/portal-injector.ts (100%)
 delete mode 100644 src/lib/core/a11y/README.md
 delete mode 100644 src/lib/core/a11y/activedescendant-key-manager.ts
 delete mode 100644 src/lib/core/a11y/fake-mousedown.ts
 delete mode 100644 src/lib/core/a11y/focus-key-manager.ts
 delete mode 100644 src/lib/core/a11y/focus-trap.ts
 delete mode 100644 src/lib/core/a11y/index.ts
 delete mode 100644 src/lib/core/a11y/interactivity-checker.ts
 delete mode 100644 src/lib/core/a11y/list-key-manager.ts
 delete mode 100644 src/lib/core/a11y/live-announcer.ts
 delete mode 100644 src/lib/core/bidi/dir.ts
 delete mode 100644 src/lib/core/bidi/directionality.ts
 delete mode 100644 src/lib/core/bidi/index.ts
 delete mode 100644 src/lib/core/keyboard/keycodes.ts
 delete mode 100644 src/lib/core/overlay/index.ts
 delete mode 100644 src/lib/core/platform/features.ts
 delete mode 100644 src/lib/core/platform/index.ts
 delete mode 100755 src/lib/core/platform/platform.ts
 delete mode 100644 src/lib/core/portal/README.md
 delete mode 100644 src/lib/core/portal/dom-portal-host.ts
 delete mode 100644 src/lib/core/portal/portal-directives.ts
 delete mode 100644 src/lib/core/portal/portal.ts
 delete mode 100644 src/lib/core/rxjs/index.ts
 delete mode 100644 src/lib/core/rxjs/rx-chain.spec.ts
 delete mode 100644 src/lib/core/rxjs/rx-chain.ts
 delete mode 100644 src/lib/core/rxjs/rx-operators.ts

diff --git a/src/lib/core/a11y/_a11y.scss b/src/cdk/a11y/_a11y.scss
similarity index 100%
rename from src/lib/core/a11y/_a11y.scss
rename to src/cdk/a11y/_a11y.scss
diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts
index a2b8fbfbb5a8..41370ab208ce 100644
--- a/src/cdk/a11y/focus-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor.spec.ts
@@ -1,10 +1,10 @@
-import {ComponentFixture, inject, TestBed, fakeAsync, tick} from '@angular/core/testing';
-import {Component, Renderer2} from '@angular/core';
-import {A11yModule} from './index';
-import {By} from '@angular/platform-browser';
 import {TAB} from '@angular/cdk/keycodes';
-import {FocusOrigin, FocusMonitor, TOUCH_BUFFER_MS} from './focus-monitor';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component, Renderer2} from '@angular/core';
+import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
+import {A11yModule} from './index';
 
 
 describe('FocusMonitor', () => {
diff --git a/src/cdk/a11y/focus-monitor.ts b/src/cdk/a11y/focus-monitor.ts
index 6ed78b200df3..d3a5fd61c68a 100644
--- a/src/cdk/a11y/focus-monitor.ts
+++ b/src/cdk/a11y/focus-monitor.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Platform} from '@angular/cdk/platform';
 import {
   Directive,
   ElementRef,
@@ -18,11 +19,10 @@ import {
   Renderer2,
   SkipSelf,
 } from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
 import {Observable} from 'rxjs/Observable';
+import {of as observableOf} from 'rxjs/observable/of';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {of as observableOf} from 'rxjs/observable/of';
 
 
 // This is the value used by AngularJS Material. Through trial and error (on iPhone 6S) they found
diff --git a/src/cdk/a11y/focus-trap.spec.ts b/src/cdk/a11y/focus-trap.spec.ts
index 28d07e46842c..4ccae5688498 100644
--- a/src/cdk/a11y/focus-trap.spec.ts
+++ b/src/cdk/a11y/focus-trap.spec.ts
@@ -1,8 +1,8 @@
-import {ComponentFixture, TestBed, async} from '@angular/core/testing';
+import {Platform} from '@angular/cdk/platform';
 import {Component, ViewChild} from '@angular/core';
-import {FocusTrapFactory, FocusTrapDirective, FocusTrap} from './focus-trap';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FocusTrap, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
 import {InteractivityChecker} from './interactivity-checker';
-import {Platform} from '../platform/platform';
 
 
 describe('FocusTrap', () => {
diff --git a/src/cdk/a11y/interactivity-checker.spec.ts b/src/cdk/a11y/interactivity-checker.spec.ts
index 3f28acb8b905..23473eb5ded6 100644
--- a/src/cdk/a11y/interactivity-checker.spec.ts
+++ b/src/cdk/a11y/interactivity-checker.spec.ts
@@ -1,5 +1,6 @@
+import {Platform} from '@angular/cdk/platform';
 import {InteractivityChecker} from './interactivity-checker';
-import {Platform} from '../platform/platform';
+
 
 describe('InteractivityChecker', () => {
   let testContainerElement: HTMLElement;
diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index 499b5a628266..012fa45d8e9b 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -1,11 +1,11 @@
+import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
+import {first} from '@angular/cdk/rxjs';
 import {QueryList} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
+import {createKeyboardEvent} from '../testing/event-objects';
+import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
 import {FocusKeyManager} from './focus-key-manager';
-import {DOWN_ARROW, UP_ARROW, TAB} from '../keycodes/keycodes';
 import {ListKeyManager} from './list-key-manager';
-import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
-import {createKeyboardEvent} from '../testing/event-objects';
-import {first} from '../rxjs/index';
 
 
 class FakeFocusable {
diff --git a/src/lib/core/portal/portal-injector.ts b/src/cdk/portal/portal-injector.ts
similarity index 100%
rename from src/lib/core/portal/portal-injector.ts
rename to src/cdk/portal/portal-injector.ts
diff --git a/src/cdk/portal/public_api.ts b/src/cdk/portal/public_api.ts
index 3006ee0af57d..253d39a60f41 100644
--- a/src/cdk/portal/public_api.ts
+++ b/src/cdk/portal/public_api.ts
@@ -9,3 +9,4 @@
 export * from './portal';
 export * from './dom-portal-host';
 export * from './portal-directives';
+export * from './portal-injector';
diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 8138d60796a1..334959021f81 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -1,12 +1,13 @@
+import {Dir} from '@angular/cdk/bidi';
 import {Component, ViewEncapsulation} from '@angular/core';
 import {
   MdSnackBar,
   MdSnackBarConfig,
   MdSnackBarHorizontalPosition,
   MdSnackBarVerticalPosition,
-  Dir,
 } from '@angular/material';
 
+
 @Component({
   moduleId: module.id,
   selector: 'snack-bar-demo',
@@ -25,7 +26,8 @@ export class SnackBarDemo {
   horizontalPosition: MdSnackBarHorizontalPosition = 'center';
   verticalPosition: MdSnackBarVerticalPosition = 'bottom';
 
-  constructor(public snackBar: MdSnackBar, private dir: Dir) { }
+  constructor(public snackBar: MdSnackBar, private dir: Dir) {
+  }
 
   open() {
     let config = new MdSnackBarConfig();
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 308382a9c0f9..e4886f42dd1d 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1,4 +1,9 @@
-import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {OverlayContainer} from '@angular/cdk/overlay';
+import {map, RxChain, startWith} from '@angular/cdk/rxjs';
+import {ScrollDispatcher} from '@angular/cdk/scrolling';
+import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -8,28 +13,23 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
+import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MdOption} from '@angular/material/core';
+import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
-import {OverlayContainer} from '@angular/cdk/overlay';
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {map, RxChain, startWith} from '@angular/cdk/rxjs';
-import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
+import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
+import {Subscription} from 'rxjs/Subscription';
+import {MdInputModule} from '../input/index';
 import {
   getMdAutocompleteMissingPanelError,
   MdAutocomplete,
   MdAutocompleteModule,
-  MdAutocompleteTrigger,
   MdAutocompleteSelectedEvent,
+  MdAutocompleteTrigger,
 } from './index';
-import {MdInputModule} from '../input/index';
-import {Subscription} from 'rxjs/Subscription';
-import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/material/core';
-import {MdOption} from '@angular/material/core';
-import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
-import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
 
 
 describe('MdAutocomplete', () => {
diff --git a/src/lib/button-toggle/button-toggle.scss b/src/lib/button-toggle/button-toggle.scss
index d77f94181edc..ea408e5505bb 100644
--- a/src/lib/button-toggle/button-toggle.scss
+++ b/src/lib/button-toggle/button-toggle.scss
@@ -1,4 +1,3 @@
-@import '../core/a11y/a11y';
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
 @import '../core/style/layout-common';
diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index 89bf063c6bf7..277c0be3f9a7 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -1,7 +1,7 @@
 // TODO(jelbourn): Measure perf benefits for translate3d and will-change.
 // TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser.
 @import 'button-base';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
 
 .mat-button, .mat-icon-button {
diff --git a/src/lib/card/card.scss b/src/lib/card/card.scss
index b1745820a26e..584fef8af43c 100644
--- a/src/lib/card/card.scss
+++ b/src/lib/card/card.scss
@@ -1,6 +1,6 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 
 $mat-card-default-padding: 24px !default;
diff --git a/src/lib/chips/chip-input.spec.ts b/src/lib/chips/chip-input.spec.ts
index b50edcd4dbb9..62e9fd498a2b 100644
--- a/src/lib/chips/chip-input.spec.ts
+++ b/src/lib/chips/chip-input.spec.ts
@@ -1,13 +1,13 @@
-import {async, TestBed, ComponentFixture} from '@angular/core/testing';
-import {MdChipsModule} from './index';
+import {Directionality} from '@angular/cdk/bidi';
+import {ENTER} from '@angular/cdk/keycodes';
+import {PlatformModule} from '@angular/cdk/platform';
+import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
-import {PlatformModule} from '../core/platform/index';
-import {MdChipInput, MdChipInputEvent} from './chip-input';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {Directionality} from '@angular/material/core';
-import {createKeyboardEvent} from '@angular/cdk/testing';
+import {MdChipInput, MdChipInputEvent} from './chip-input';
+import {MdChipsModule} from './index';
 
-import {ENTER} from '@angular/material/core';
 
 const COMMA = 188;
 
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 14684c9b0762..716d4d710b32 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -6,17 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  Directive,
-  ElementRef,
-  Output,
-  EventEmitter,
-  Input,
-} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {ENTER} from '@angular/material/core';
+import {ENTER} from '@angular/cdk/keycodes';
+import {Directive, ElementRef, EventEmitter, Input, Output,} from '@angular/core';
 import {MdChipList} from './chip-list';
 
+
 export interface MdChipInputEvent {
   input: HTMLInputElement;
   value: string;
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 947c59071f10..e4ef2f7d2de0 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -1,22 +1,13 @@
 import {FocusKeyManager} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
+import {BACKSPACE, DELETE, ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE, TAB} from '@angular/cdk/keycodes';
 import {createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {
-  BACKSPACE,
-  DELETE,
-  Directionality,
-  ENTER,
-  LEFT_ARROW,
-  RIGHT_ARROW,
-  SPACE,
-  TAB,
-} from '@angular/material/core';
 import {MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-
 import {MdInputModule} from '../input/index';
 import {MdChip} from './chip';
 import {MdChipInputEvent} from './chip-input';
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 975208299ec2..caa58d318872 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -5,14 +5,17 @@
  * 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 {FocusKeyManager} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
+import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW,} from '@angular/cdk/keycodes';
 import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
-  ChangeDetectorRef,
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ContentChildren,
   ElementRef,
@@ -28,21 +31,11 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
-import {
-  BACKSPACE,
-  DELETE,
-  Directionality,
-  LEFT_ARROW,
-  RIGHT_ARROW,
-  UP_ARROW
-} from '@angular/material/core';
 import {MdFormFieldControl} from '@angular/material/form-field';
-
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-
 import {MdChip, MdChipEvent, MdChipSelectionChange} from './chip';
 import {MdChipInput} from './chip-input';
 
diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
index 240ceec898d6..51ade187196a 100644
--- a/src/lib/chips/chip.spec.ts
+++ b/src/lib/chips/chip.spec.ts
@@ -1,10 +1,11 @@
+import {Directionality} from '@angular/cdk/bidi';
+import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
+import {createKeyboardEvent} from '@angular/cdk/testing';
+import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {Component, DebugElement}  from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {createKeyboardEvent} from '@angular/cdk/testing';
-import {MdChipList, MdChip, MdChipEvent, MdChipsModule, MdChipSelectionChange} from './index';
-import {SPACE, DELETE, BACKSPACE} from '@angular/material/core';
-import {Directionality} from '@angular/material/core';
+import {MdChip, MdChipEvent, MdChipList, MdChipSelectionChange, MdChipsModule} from './index';
+
 
 describe('Chips', () => {
   let fixture: ComponentFixture<any>;
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index a7cdfaebb43b..003e1b9807a1 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -8,6 +8,7 @@
 
 import {FocusableOption} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
 import {
   Directive,
   ElementRef,
@@ -17,17 +18,10 @@ import {
   Output,
   Renderer2,
 } from '@angular/core';
-import {
-  BACKSPACE,
-  CanColor,
-  CanDisable,
-  DELETE,
-  mixinColor,
-  mixinDisabled,
-  SPACE,
-} from '@angular/material/core';
+import {CanColor, CanDisable, mixinColor, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
+
 export interface MdChipEvent {
   chip: MdChip;
 }
@@ -41,8 +35,10 @@ export class MdChipSelectionChange {
 // Boilerplate for applying mixins to MdChip.
 /** @docs-private */
 export class MdChipBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {
+  }
 }
+
 export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary');
 
 
@@ -52,9 +48,10 @@ export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary')
  */
 @Directive({
   selector: `md-basic-chip, [md-basic-chip], mat-basic-chip, [mat-basic-chip]`,
-  host: {'class': 'mat-basic-chip'}
+  host: {'class': 'mat-basic-chip'},
 })
-export class MdBasicChip { }
+export class MdBasicChip {
+}
 
 /**
  * Material design styled Chip component. Used inside the MdChipList component.
@@ -80,7 +77,7 @@ export class MdBasicChip { }
 
 })
 export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestroy, CanColor,
-  CanDisable {
+    CanDisable {
 
   protected _value: any;
 
@@ -95,7 +92,9 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
 
   /** Whether the chip is selected. */
   @Input()
-  get selected(): boolean { return this._selected; }
+  get selected(): boolean {
+    return this._selected;
+  }
   set selected(value: boolean) {
     this._selected = coerceBooleanProperty(value);
     this.selectionChange.emit({
@@ -104,7 +103,6 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       selected: value
     });
   }
-
   /** The value of the chip. Defaults to the content inside <md-chip> tags. */
   @Input()
   get value(): any {
@@ -112,22 +110,30 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       ? this._value
       : this._elementRef.nativeElement.textContent;
   }
-  set value(newValue: any) { this._value = newValue; }
+  set value(newValue: any) { this._value = newValue;}
 
   /**
    * Whether or not the chips are selectable. When a chip is not selectable,
    * changes to it's selected state are always ignored.
    */
-  @Input()
-  get selectable(): boolean { return this._selectable; }
-  set selectable(value: boolean) { this._selectable = coerceBooleanProperty(value); }
+  @Input() get selectable(): boolean {
+    return this._selectable;}
+
+
+  set selectable(value: boolean) {
+    this._selectable = coerceBooleanProperty(value);
+  }
 
   /**
    * Determines whether or not the chip displays the remove styling and emits (remove) events.
    */
-  @Input()
-  get removable(): boolean { return this._removable; }
-  set removable(value: boolean) { this._removable = coerceBooleanProperty(value); }
+  @Input() get removable(): boolean {
+    return this._removable;}
+
+
+  set removable(value: boolean) {
+    this._removable = coerceBooleanProperty(value);
+  }
 
   /** Emits when the chip is focused. */
   _onFocus = new Subject<MdChipEvent>();
@@ -293,11 +299,12 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   selector: '[mdChipRemove], [matChipRemove]',
   host: {
     'class': 'mat-chip-remove',
-    '(click)': '_handleClick($event)'
-  }
+    '(click)': '_handleClick($event)',
+  },
 })
 export class MdChipRemove {
-  constructor(protected _parentChip: MdChip) {}
+  constructor(protected _parentChip: MdChip) {
+  }
 
   /** Calls the parent chip's public `remove()` method if applicable. */
   _handleClick(): void {
diff --git a/src/lib/chips/chips.scss b/src/lib/chips/chips.scss
index 478caf88d71f..fc1b13a851b5 100644
--- a/src/lib/chips/chips.scss
+++ b/src/lib/chips/chips.scss
@@ -1,4 +1,4 @@
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/elevation';
 
 $mat-chip-vertical-padding: 7px;
diff --git a/src/lib/core/_core.scss b/src/lib/core/_core.scss
index b13dd35b4ea4..7ae874518a80 100644
--- a/src/lib/core/_core.scss
+++ b/src/lib/core/_core.scss
@@ -1,9 +1,9 @@
 // We can use relative imports for imports from the cdk because we bundle everything
 // up into a single flat scss file for material.
 @import '../../cdk/overlay/overlay';
+@import '../../cdk/a11y/a11y';
 
 // Core styles that can be used to apply material design treatments to any element.
-@import 'a11y/a11y';
 @import 'style/elevation';
 @import 'ripple/ripple';
 @import 'option/option';
diff --git a/src/lib/core/a11y/README.md b/src/lib/core/a11y/README.md
deleted file mode 100644
index 45e45eac659a..000000000000
--- a/src/lib/core/a11y/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See [cdk/a11y](../../../cdk/a11y/README.md)
diff --git a/src/lib/core/a11y/activedescendant-key-manager.ts b/src/lib/core/a11y/activedescendant-key-manager.ts
deleted file mode 100644
index 8ccabcab6c6a..000000000000
--- a/src/lib/core/a11y/activedescendant-key-manager.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {ActiveDescendantKeyManager, Highlightable} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/fake-mousedown.ts b/src/lib/core/a11y/fake-mousedown.ts
deleted file mode 100644
index f3d2b68e6827..000000000000
--- a/src/lib/core/a11y/fake-mousedown.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {isFakeMousedownFromScreenReader} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/focus-key-manager.ts b/src/lib/core/a11y/focus-key-manager.ts
deleted file mode 100644
index 0a603e1eba27..000000000000
--- a/src/lib/core/a11y/focus-key-manager.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {FocusKeyManager, FocusableOption} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/focus-trap.ts b/src/lib/core/a11y/focus-trap.ts
deleted file mode 100644
index 7ee2f473073b..000000000000
--- a/src/lib/core/a11y/focus-trap.ts
+++ /dev/null
@@ -1,19 +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
- */
-
-export {
-  FocusTrap,
-  FocusTrapFactory,
-  FocusTrapDeprecatedDirective,
-  FocusTrapDirective
-} from '@angular/cdk/a11y';
-
-
-
-
-
diff --git a/src/lib/core/a11y/index.ts b/src/lib/core/a11y/index.ts
deleted file mode 100644
index 50ef493946c2..000000000000
--- a/src/lib/core/a11y/index.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {A11yModule} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/interactivity-checker.ts b/src/lib/core/a11y/interactivity-checker.ts
deleted file mode 100644
index def5fa2b1511..000000000000
--- a/src/lib/core/a11y/interactivity-checker.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {InteractivityChecker} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/list-key-manager.ts b/src/lib/core/a11y/list-key-manager.ts
deleted file mode 100644
index 8710826427ee..000000000000
--- a/src/lib/core/a11y/list-key-manager.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {ListKeyManagerOption, ListKeyManager} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/live-announcer.ts b/src/lib/core/a11y/live-announcer.ts
deleted file mode 100644
index 7965fd4cf102..000000000000
--- a/src/lib/core/a11y/live-announcer.ts
+++ /dev/null
@@ -1,15 +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
- */
-
-export {
-  AriaLivePoliteness,
-  LIVE_ANNOUNCER_ELEMENT_TOKEN,
-  LiveAnnouncer,
-  LIVE_ANNOUNCER_PROVIDER_FACTORY,
-  LIVE_ANNOUNCER_PROVIDER
-} from '@angular/cdk/a11y';
diff --git a/src/lib/core/bidi/dir.ts b/src/lib/core/bidi/dir.ts
deleted file mode 100644
index a264ca5780cb..000000000000
--- a/src/lib/core/bidi/dir.ts
+++ /dev/null
@@ -1,10 +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
- */
-
-export {Dir} from '@angular/cdk/bidi';
-
diff --git a/src/lib/core/bidi/directionality.ts b/src/lib/core/bidi/directionality.ts
deleted file mode 100644
index 00f584c8c8ff..000000000000
--- a/src/lib/core/bidi/directionality.ts
+++ /dev/null
@@ -1,15 +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
- */
-
-export {
-  Direction,
-  DIR_DOCUMENT,
-  Directionality,
-  DIRECTIONALITY_PROVIDER_FACTORY,
-  DIRECTIONALITY_PROVIDER,
-} from '@angular/cdk/bidi';
diff --git a/src/lib/core/bidi/index.ts b/src/lib/core/bidi/index.ts
deleted file mode 100644
index df77755789b3..000000000000
--- a/src/lib/core/bidi/index.ts
+++ /dev/null
@@ -1,16 +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
- */
-
-export {
-  Directionality,
-  DIRECTIONALITY_PROVIDER,
-  DIR_DOCUMENT,
-  Direction,
-  Dir,
-  BidiModule,
-} from '@angular/cdk/bidi';
diff --git a/src/lib/core/compatibility/compatibility.spec.ts b/src/lib/core/compatibility/compatibility.spec.ts
index 091dad452dfd..b22fe0a9055a 100644
--- a/src/lib/core/compatibility/compatibility.spec.ts
+++ b/src/lib/core/compatibility/compatibility.spec.ts
@@ -90,10 +90,10 @@ describe('Style compatibility', () => {
 
 
 @Component({ template: `<md-checkbox>Hungry</md-checkbox>` })
-class ComponentWithMdCheckbox { }
+export class ComponentWithMdCheckbox { }
 
 @Component({ template: `<mat-checkbox>Hungry</mat-checkbox>` })
-class ComponentWithMatCheckbox { }
+export class ComponentWithMatCheckbox { }
 
 
 @NgModule({
diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index 8ec5202fa151..92371ee0742f 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -1,8 +1,8 @@
-import {TestBed, async, inject} from '@angular/core/testing';
-import {NativeDateAdapter, NativeDateModule, DateAdapter, MAT_DATE_LOCALE} from './index';
-import {Platform} from '../platform/index';
-import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
+import {Platform} from '@angular/cdk/platform';
 import {LOCALE_ID} from '@angular/core';
+import {async, inject, TestBed} from '@angular/core/testing';
+import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
+import {DateAdapter, MAT_DATE_LOCALE, NativeDateAdapter, NativeDateModule} from './index';
 
 const SUPPORTS_INTL = typeof Intl != 'undefined';
 
diff --git a/src/lib/core/keyboard/keycodes.ts b/src/lib/core/keyboard/keycodes.ts
deleted file mode 100644
index 3aef9a4baa83..000000000000
--- a/src/lib/core/keyboard/keycodes.ts
+++ /dev/null
@@ -1,27 +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
- */
-
-
-export {
-  UP_ARROW,
-  DOWN_ARROW,
-  RIGHT_ARROW,
-  LEFT_ARROW,
-  PAGE_UP,
-  PAGE_DOWN,
-  HOME,
-  END,
-  ENTER,
-  SPACE,
-  TAB,
-  ESCAPE,
-  BACKSPACE,
-  DELETE,
-  A,
-  Z,
-} from '@angular/cdk/keycodes';
diff --git a/src/lib/core/option/_option.scss b/src/lib/core/option/_option.scss
index 4bd536b08e3f..bf9e20c2d3f5 100644
--- a/src/lib/core/option/_option.scss
+++ b/src/lib/core/option/_option.scss
@@ -1,6 +1,6 @@
 @import '../style/menu-common';
 @import '../style/vendor-prefixes';
-@import '../a11y/a11y';
+@import '../../../cdk/a11y/a11y';
 @import '../style/layout-common';
 
 /**
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index baf7353f70b1..8174c0b5f9fc 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -6,20 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ENTER, SPACE} from '@angular/cdk/keycodes';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ElementRef,
   EventEmitter,
   Input,
-  Output,
-  ViewEncapsulation,
   Optional,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
+  Output,
   QueryList,
+  ViewEncapsulation,
 } from '@angular/core';
-import {ENTER, SPACE} from '../keyboard/keycodes';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {MATERIAL_COMPATIBILITY_MODE} from '../compatibility/compatibility';
 import {MdOptgroup} from './optgroup';
 
diff --git a/src/lib/core/overlay/index.ts b/src/lib/core/overlay/index.ts
deleted file mode 100644
index 621bec001c17..000000000000
--- a/src/lib/core/overlay/index.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export * from '@angular/cdk/overlay';
diff --git a/src/lib/core/platform/features.ts b/src/lib/core/platform/features.ts
deleted file mode 100644
index 04844f624ef6..000000000000
--- a/src/lib/core/platform/features.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {getSupportedInputTypes} from '@angular/cdk/platform';
diff --git a/src/lib/core/platform/index.ts b/src/lib/core/platform/index.ts
deleted file mode 100644
index e8f8a33331cc..000000000000
--- a/src/lib/core/platform/index.ts
+++ /dev/null
@@ -1,11 +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
- */
-
-export {PlatformModule} from '@angular/cdk/platform';
-export * from './platform';
-export * from './features';
diff --git a/src/lib/core/platform/platform.ts b/src/lib/core/platform/platform.ts
deleted file mode 100755
index 648567b59d24..000000000000
--- a/src/lib/core/platform/platform.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {Platform} from '@angular/cdk/platform';
diff --git a/src/lib/core/portal/README.md b/src/lib/core/portal/README.md
deleted file mode 100644
index f9e84739173a..000000000000
--- a/src/lib/core/portal/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See [cdk/portal](../../../cdk/portal/portal.md)
diff --git a/src/lib/core/portal/dom-portal-host.ts b/src/lib/core/portal/dom-portal-host.ts
deleted file mode 100644
index 45424d674bbd..000000000000
--- a/src/lib/core/portal/dom-portal-host.ts
+++ /dev/null
@@ -1,8 +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
- */
-export {DomPortalHost} from '@angular/cdk/portal';
diff --git a/src/lib/core/portal/portal-directives.ts b/src/lib/core/portal/portal-directives.ts
deleted file mode 100644
index e2eed6c434aa..000000000000
--- a/src/lib/core/portal/portal-directives.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {TemplatePortalDirective, PortalHostDirective, PortalModule} from '@angular/cdk/portal';
diff --git a/src/lib/core/portal/portal.ts b/src/lib/core/portal/portal.ts
deleted file mode 100644
index 91ac14adaeab..000000000000
--- a/src/lib/core/portal/portal.ts
+++ /dev/null
@@ -1,15 +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
- */
-
-export {
-  Portal,
-  PortalHost,
-  BasePortalHost,
-  ComponentPortal,
-  TemplatePortal
-} from '@angular/cdk/portal';
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public_api.ts
index e0d835d549e8..4a540f7e1cf6 100644
--- a/src/lib/core/public_api.ts
+++ b/src/lib/core/public_api.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './a11y/index';
 export * from './animation/animation';
-export * from './bidi/index';
 export * from './common-behaviors/index';
 export * from './compatibility/compatibility';
 export * from './coordination/unique-selection-dispatcher';
@@ -16,18 +14,10 @@ export * from './datetime/index';
 export * from './error/error-options';
 export * from './gestures/gesture-annotations';
 export * from './gestures/gesture-config';
-export * from './keyboard/keycodes';
 export * from './line/line';
 export * from './option/index';
-export * from './overlay/index';
 export * from './placeholder/placeholder-options';
-export * from './platform/index';
-export * from './portal/portal';
-export * from './portal/dom-portal-host';
-export * from './portal/portal-directives';
-export * from './portal/portal-injector';
 export * from './ripple/index';
-export * from './rxjs/index';
 export * from './selection/index';
 export * from './style/index';
 export * from './util/object-extend';
diff --git a/src/lib/core/ripple/_ripple.scss b/src/lib/core/ripple/_ripple.scss
index 47623e1497fc..257df0e8ba69 100644
--- a/src/lib/core/ripple/_ripple.scss
+++ b/src/lib/core/ripple/_ripple.scss
@@ -1,5 +1,5 @@
 @import '../theming/theming';
-@import '../a11y/a11y';
+@import '../../../cdk/a11y/a11y';
 
 $mat-ripple-color-opacity: 0.1;
 
diff --git a/src/lib/core/rxjs/index.ts b/src/lib/core/rxjs/index.ts
deleted file mode 100644
index a6f22e575d8e..000000000000
--- a/src/lib/core/rxjs/index.ts
+++ /dev/null
@@ -1,10 +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
- */
-
-export * from './rx-chain';
-export * from './rx-operators';
diff --git a/src/lib/core/rxjs/rx-chain.spec.ts b/src/lib/core/rxjs/rx-chain.spec.ts
deleted file mode 100644
index e9bc10ec5401..000000000000
--- a/src/lib/core/rxjs/rx-chain.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {Observable} from 'rxjs/Observable';
-import {of as observableOf} from 'rxjs/observable/of';
-import {RxChain, map, filter, first} from './index';
-
-describe('RxChain', () => {
-  it('should call all of the operators in the chain', () => {
-    let operators = { map, filter, first };
-
-    spyOn(operators, 'map');
-    spyOn(operators, 'filter');
-    spyOn(operators, 'first');
-
-    RxChain.from(observableOf(1, 2, 3))
-      .call(operators.map, i => i * 2)
-      .call(operators.filter, i => i % 2 === 0)
-      .call(operators.first);
-
-    expect(operators.map).toHaveBeenCalled();
-    expect(operators.filter).toHaveBeenCalled();
-    expect(operators.first).toHaveBeenCalled();
-  });
-
-  it('should be able to subscribe', () => {
-    const spy = jasmine.createSpy('subscription spy');
-
-    RxChain.from(observableOf(1, 2))
-      .call(map, i => i * 2)
-      .call(first)
-      .subscribe(spy);
-
-    expect(spy).toHaveBeenCalledWith(2);
-  });
-
-  it('should be able to return the result observable', () => {
-    const chain = RxChain.from(observableOf(1, 2))
-      .call(map, i => i * 2)
-      .call(first);
-
-    expect(chain.result() instanceof Observable).toBe(true);
-  });
-});
diff --git a/src/lib/core/rxjs/rx-chain.ts b/src/lib/core/rxjs/rx-chain.ts
deleted file mode 100644
index fa3f771efcf7..000000000000
--- a/src/lib/core/rxjs/rx-chain.ts
+++ /dev/null
@@ -1,9 +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
- */
-
-export {RxChain} from '@angular/cdk/rxjs';
diff --git a/src/lib/core/rxjs/rx-operators.ts b/src/lib/core/rxjs/rx-operators.ts
deleted file mode 100644
index 864b6be10b2f..000000000000
--- a/src/lib/core/rxjs/rx-operators.ts
+++ /dev/null
@@ -1,47 +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
- */
-
-export {
-  StrictRxChain,
-  FinallyBrand,
-  CatchBrand,
-  DoBrand,
-  MapBrand,
-  FilterBrand,
-  ShareBrand,
-  FirstBrand,
-  SwitchMapBrand,
-  StartWithBrand,
-  DebounceTimeBrand,
-  AuditTimeBrand,
-  TakeUntilBrand,
-  finallyOperatorType,
-  catchOperatorType,
-  doOperatorType,
-  mapOperatorType,
-  filterOperatorType,
-  shareOperatorType,
-  firstOperatorType,
-  switchMapOperatorType,
-  startWithOperatorType,
-  debounceTimeOperatorType,
-  auditTimeOperatorType,
-  takeUntilOperatorType,
-  finallyOperator,
-  catchOperator,
-  doOperator,
-  map,
-  filter,
-  share,
-  first,
-  switchMap,
-  startWith,
-  debounceTime,
-  auditTime,
-  takeUntil,
-} from '@angular/cdk/rxjs';
diff --git a/src/lib/core/style/index.ts b/src/lib/core/style/index.ts
index 54ed99b4b68a..c97f88c2e49e 100644
--- a/src/lib/core/style/index.ts
+++ b/src/lib/core/style/index.ts
@@ -6,20 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {A11yModule} from '@angular/cdk/a11y';
-
-/** @deprecated */
-@NgModule({
-  imports: [A11yModule],
-  exports: [A11yModule],
-})
-export class StyleModule {}
-
-export {
-  CdkMonitorFocus,
-  FocusMonitor,
-  FOCUS_MONITOR_PROVIDER,
-  FocusOrigin,
-} from '@angular/cdk/a11y';
 export * from './apply-transform';
diff --git a/src/lib/datepicker/calendar.spec.ts b/src/lib/datepicker/calendar.spec.ts
index 867a44c7616a..686fa406de13 100644
--- a/src/lib/datepicker/calendar.spec.ts
+++ b/src/lib/datepicker/calendar.spec.ts
@@ -1,11 +1,3 @@
-import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
-import {Component} from '@angular/core';
-import {MdCalendar} from './calendar';
-import {By} from '@angular/platform-browser';
-import {MdMonthView} from './month-view';
-import {MdYearView} from './year-view';
-import {MdCalendarBody} from './calendar-body';
-import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 import {
   DOWN_ARROW,
   END,
@@ -15,13 +7,33 @@ import {
   PAGE_DOWN,
   PAGE_UP,
   RIGHT_ARROW,
-  UP_ARROW
+  UP_ARROW,
+} from '@angular/cdk/keycodes';
+import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component} from '@angular/core';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
+import {
+  AUG,
+  DEC,
+  FEB,
+  JAN,
+  JUL,
+  JUN,
+  MAR,
+  MAY,
+  MdNativeDateModule,
+  NoConflictStyleCompatibilityMode,
+  NOV,
+  SEP,
 } from '@angular/material/core';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdNativeDateModule} from '@angular/material/core';
-import {NoConflictStyleCompatibilityMode} from '@angular/material/core';
+import {By} from '@angular/platform-browser';
 import {MdButtonModule} from '../button/index';
-import {AUG, DEC, FEB, JAN, JUL, NOV, MAR, MAY, JUN, SEP} from '@angular/material/core';
+import {MdCalendar} from './calendar';
+import {MdCalendarBody} from './calendar-body';
+import {MdDatepickerIntl} from './datepicker-intl';
+import {MdMonthView} from './month-view';
+import {MdYearView} from './year-view';
+
 
 describe('MdCalendar', () => {
   beforeEach(async(() => {
diff --git a/src/lib/dialog/dialog.scss b/src/lib/dialog/dialog.scss
index 8ef8eea9df4c..2f04aec0b4cb 100644
--- a/src/lib/dialog/dialog.scss
+++ b/src/lib/dialog/dialog.scss
@@ -1,6 +1,6 @@
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 
 $mat-dialog-padding: 24px !default;
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 5ff66f717a0b..0fa02226f787 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -14,7 +14,7 @@ import {
   OverlayConfig,
   ScrollStrategy,
 } from '@angular/cdk/overlay';
-import {ComponentPortal, ComponentType, TemplatePortal} from '@angular/cdk/portal';
+import {ComponentPortal, ComponentType, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
 import {startWith} from '@angular/cdk/rxjs';
 import {Location} from '@angular/common';
 import {
@@ -27,7 +27,7 @@ import {
   SkipSelf,
   TemplateRef,
 } from '@angular/core';
-import {extendObject, PortalInjector} from '@angular/material/core';
+import {extendObject} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {defer} from 'rxjs/observable/defer';
 import {Subject} from 'rxjs/Subject';
@@ -35,6 +35,7 @@ import {MdDialogConfig} from './dialog-config';
 import {MdDialogContainer} from './dialog-container';
 import {MdDialogRef} from './dialog-ref';
 
+
 export const MD_DIALOG_DATA = new InjectionToken<any>('MdDialogData');
 
 
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index e18cfe61a67b..3b0799fef527 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -6,31 +6,25 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, state, style, transition, trigger} from '@angular/animations';
+import {FocusMonitor} from '@angular/cdk/a11y';
+import {ENTER, SPACE} from '@angular/cdk/keycodes';
+import {filter} from '@angular/cdk/rxjs';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   Directive,
+  ElementRef,
   Host,
-  ViewEncapsulation,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
+  Input,
   OnDestroy,
   Renderer2,
-  ElementRef,
-  Input,
+  ViewEncapsulation,
 } from '@angular/core';
-import {
-  trigger,
-  state,
-  style,
-  transition,
-  animate,
-} from '@angular/animations';
-import {SPACE, ENTER} from '@angular/material/core';
-import {MdExpansionPanel, EXPANSION_PANEL_ANIMATION_TIMING} from './expansion-panel';
-import {filter} from '@angular/material/core';
-import {FocusMonitor} from '@angular/cdk/a11y';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
+import {EXPANSION_PANEL_ANIMATION_TIMING, MdExpansionPanel} from './expansion-panel';
 
 
 /**
diff --git a/src/lib/form-field/form-field-module.ts b/src/lib/form-field/form-field-module.ts
index 6cb8d7ccdea8..46f51cd12a8e 100644
--- a/src/lib/form-field/form-field-module.ts
+++ b/src/lib/form-field/form-field-module.ts
@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
+import {PlatformModule} from '@angular/cdk/platform';
 import {MdError} from './error';
 import {MdFormField} from './form-field';
 import {MdHint} from './hint';
 import {MdPlaceholder} from './placeholder';
 import {MdPrefix} from './prefix';
 import {MdSuffix} from './suffix';
-import {CommonModule} from '@angular/common';
-import {PlatformModule} from '@angular/material/core';
 
 
 @NgModule({
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 3507ef0f30f0..7ff669fc292d 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -6,22 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {catchOperator, doOperator, finallyOperator, map, RxChain, share} from '@angular/cdk/rxjs';
 import {Injectable, Optional, SecurityContext, SkipSelf} from '@angular/core';
 import {Http} from '@angular/http';
-import {
-  catchOperator,
-  doOperator,
-  finallyOperator,
-  map,
-  RxChain,
-  share,
-} from '@angular/material/core';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
 import {forkJoin} from 'rxjs/observable/forkJoin';
 import {of as observableOf} from 'rxjs/observable/of';
 import {_throw as observableThrow} from 'rxjs/observable/throw';
 
+
 /**
  * Returns an exception to be thrown in the case when attempting to
  * load an icon with a name that cannot be found.
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index f27d46ea5d29..f5a001d0ee01 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {first} from '@angular/cdk/rxjs';
 import {
+  Attribute,
   ChangeDetectionStrategy,
   Component,
   ElementRef,
@@ -16,11 +18,9 @@ import {
   Renderer2,
   SimpleChanges,
   ViewEncapsulation,
-  Attribute,
 } from '@angular/core';
-import {MdIconRegistry} from './icon-registry';
 import {CanColor, mixinColor} from '@angular/material/core';
-import {first} from '@angular/material/core';
+import {MdIconRegistry} from './icon-registry';
 
 
 // Boilerplate for applying mixins to MdIcon.
diff --git a/src/lib/input/input-module.ts b/src/lib/input/input-module.ts
index 0e6f22491e62..c114e4d0c2fe 100644
--- a/src/lib/input/input-module.ts
+++ b/src/lib/input/input-module.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdInput} from './input';
-import {MdTextareaAutosize} from './autosize';
+import {PlatformModule} from '@angular/cdk/platform';
 import {CommonModule} from '@angular/common';
-import {PlatformModule} from '@angular/material/core';
+import {NgModule} from '@angular/core';
 import {MdFormFieldModule} from '@angular/material/form-field';
+import {MdTextareaAutosize} from './autosize';
+import {MdInput} from './input';
 
 
 @NgModule({
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index a960c88017e3..ba534a980a7e 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -1,5 +1,7 @@
+import {Platform, PlatformModule} from '@angular/cdk/platform';
+import {createFakeEvent, dispatchFakeEvent, wrappedErrorMessage} from '@angular/cdk/testing';
+import {ChangeDetectionStrategy, Component, ViewChild} from '@angular/core';
 import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
-import {Component, ViewChild, ChangeDetectionStrategy} from '@angular/core';
 import {
   FormControl,
   FormGroup,
@@ -7,24 +9,24 @@ import {
   FormsModule,
   NgForm,
   ReactiveFormsModule,
-  Validators
+  Validators,
 } from '@angular/forms';
-import {By} from '@angular/platform-browser';
-import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdInputModule} from './index';
-import {MdInput} from './input';
-import {Platform} from '@angular/material/core';
-import {PlatformModule} from '@angular/material/core';
-import {wrappedErrorMessage, dispatchFakeEvent, createFakeEvent} from '@angular/cdk/testing';
 import {
-  MdFormField,
-  MdFormFieldModule,
+  MD_ERROR_GLOBAL_OPTIONS,
+  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  showOnDirtyErrorStateMatcher,
+} from '@angular/material/core';
+import {
   getMdFormFieldDuplicatedHintError,
   getMdFormFieldMissingControlError,
   getMdFormFieldPlaceholderConflictError,
+  MdFormField,
+  MdFormFieldModule,
 } from '@angular/material/form-field';
-import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from '@angular/material/core';
-import {MD_ERROR_GLOBAL_OPTIONS, showOnDirtyErrorStateMatcher} from '@angular/material/core';
+import {By} from '@angular/platform-browser';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {MdInputModule} from './index';
+import {MdInput} from './input';
 
 describe('MdInput without forms', function () {
   beforeEach(async(() => {
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 623cde717a65..bb3752c3fdd9 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -1,10 +1,10 @@
-import {async, TestBed, ComponentFixture, inject} from '@angular/core/testing';
+import {DOWN_ARROW, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {Platform} from '@angular/cdk/platform';
+import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdSelectionList, MdListOption, MdListModule} from './index';
-import {createKeyboardEvent} from '@angular/cdk/testing';
-import {UP_ARROW, DOWN_ARROW, SPACE} from '@angular/material/core';
-import {Platform} from '@angular/material/core';
+import {MdListModule, MdListOption, MdSelectionList} from './index';
 
 
 describe('MdSelectionList', () => {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 2603911a4905..5cd645a33c1d 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -9,6 +9,8 @@
 import {FocusableOption, FocusKeyManager} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
+import {SPACE} from '@angular/cdk/keycodes';
+import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -35,10 +37,6 @@ import {
   MdLineSetter,
   mixinDisabled,
   mixinDisableRipple,
-  RxChain,
-  SPACE,
-  startWith,
-  switchMap,
 } from '@angular/material/core';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 594de4d5e5e0..aa7d1c8dfef1 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -6,11 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {AnimationEvent} from '@angular/animations';
+import {FocusKeyManager} from '@angular/cdk/a11y';
+import {Direction} from '@angular/cdk/bidi';
+import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
+import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
+  ChangeDetectionStrategy,
   Component,
   ContentChildren,
+  ElementRef,
   EventEmitter,
+  Inject,
+  InjectionToken,
   Input,
   OnDestroy,
   Output,
@@ -18,24 +27,16 @@ import {
   TemplateRef,
   ViewChild,
   ViewEncapsulation,
-  ElementRef,
-  ChangeDetectionStrategy,
-  InjectionToken,
-  Inject,
 } from '@angular/core';
-import {AnimationEvent} from '@angular/animations';
-import {MenuPositionX, MenuPositionY} from './menu-positions';
+import {Observable} from 'rxjs/Observable';
+import {merge} from 'rxjs/observable/merge';
+import {Subscription} from 'rxjs/Subscription';
+import {fadeInItems, transformMenu} from './menu-animations';
 import {throwMdMenuInvalidPositionX, throwMdMenuInvalidPositionY} from './menu-errors';
 import {MdMenuItem} from './menu-item';
-import {FocusKeyManager} from '@angular/cdk/a11y';
 import {MdMenuPanel} from './menu-panel';
-import {Subscription} from 'rxjs/Subscription';
-import {transformMenu, fadeInItems} from './menu-animations';
-import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/material/core';
-import {merge} from 'rxjs/observable/merge';
-import {Observable} from 'rxjs/Observable';
-import {Direction} from '@angular/cdk/bidi';
-import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
+import {MenuPositionX, MenuPositionY} from './menu-positions';
+
 
 /** Default `md-menu` options that can be overridden. */
 export interface MdMenuDefaultOptions {
diff --git a/src/lib/menu/menu.scss b/src/lib/menu/menu.scss
index 04cfcc38a1fa..5fcc8a889650 100644
--- a/src/lib/menu/menu.scss
+++ b/src/lib/menu/menu.scss
@@ -3,7 +3,7 @@
 @import '../core/style/button-common';
 @import '../core/style/layout-common';
 @import '../core/style/menu-common';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
 
 $mat-menu-vertical-padding: 8px !default;
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 9b57b49d63ea..1056cef91149 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -2,7 +2,7 @@
 @import '../core/style/list-common';
 @import '../core/style/variables';
 @import '../core/style/vendor-prefixes';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-select-trigger-height: 30px !default;
 $mat-select-trigger-min-width: 112px !default;
diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index 26800af1f258..9d46906c21fd 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -1,7 +1,7 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
 @import '../core/style/layout-common';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 // stylelint-disable max-line-length
 // Mixin that creates a new stacking context.
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 52271e625fc7..ef241cacd3fa 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -10,6 +10,7 @@ import {animate, AnimationEvent, state, style, transition, trigger} from '@angul
 import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ESCAPE} from '@angular/cdk/keycodes';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -28,9 +29,11 @@ import {
   Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
-import {ESCAPE, first, startWith, takeUntil} from '@angular/material/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
+import {first} from 'rxjs/operator/first';
+import {startWith} from 'rxjs/operator/startWith';
+import {takeUntil} from 'rxjs/operator/takeUntil';
 import {Subscription} from 'rxjs/Subscription';
 
 
diff --git a/src/lib/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss
index 62f3298d78a4..8fd0e11da000 100644
--- a/src/lib/slide-toggle/slide-toggle.scss
+++ b/src/lib/slide-toggle/slide-toggle.scss
@@ -2,7 +2,7 @@
 @import '../core/ripple/ripple';
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-slide-toggle-thumb-size: 20px !default;
 $mat-slide-toggle-bar-border-radius: 8px !default;
diff --git a/src/lib/slider/slider-module.ts b/src/lib/slider/slider-module.ts
index 2d669c54d4ab..979859b91a12 100644
--- a/src/lib/slider/slider-module.ts
+++ b/src/lib/slider/slider-module.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {A11yModule} from '@angular/cdk/a11y';
+import {BidiModule} from '@angular/cdk/bidi';
+import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
+import {GestureConfig, MdCommonModule} from '@angular/material/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule, GestureConfig} from '@angular/material/core';
 import {MdSlider} from './slider';
-import {BidiModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
 
 
 @NgModule({
diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index e8962601f00b..72e0ef7d9a06 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -1,11 +1,6 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {Component, DebugElement, ViewChild} from '@angular/core';
-import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {MdSlider, MdSliderModule} from './index';
-import {TestGestureConfig} from './test-gesture-config';
-import {BidiModule} from '@angular/material/core';
+import {BidiModule} from '@angular/cdk/bidi';
 import {
+  BACKSPACE,
   DOWN_ARROW,
   END,
   HOME,
@@ -14,9 +9,15 @@ import {
   PAGE_UP,
   RIGHT_ARROW,
   UP_ARROW,
-  BACKSPACE
-} from '@angular/material/core';
+} from '@angular/cdk/keycodes';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component, DebugElement, ViewChild} from '@angular/core';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {MdSlider, MdSliderModule} from './index';
+import {TestGestureConfig} from './test-gesture-config';
+
 
 describe('MdSlider without forms', () => {
   let gestureConfig: TestGestureConfig;
diff --git a/src/lib/snack-bar/snack-bar-container.scss b/src/lib/snack-bar/snack-bar-container.scss
index 164040d9b079..72e1ae221690 100644
--- a/src/lib/snack-bar/snack-bar-container.scss
+++ b/src/lib/snack-bar/snack-bar-container.scss
@@ -1,4 +1,4 @@
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-snack-bar-padding: 14px 24px !default;
 $mat-snack-bar-min-width: 288px !default;
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index e4e3a13a3d86..293e2c903e95 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -6,16 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentRef, Injectable, Injector, Optional, SkipSelf } from '@angular/core';
-import {Overlay, OverlayRef, OverlayConfig} from '@angular/cdk/overlay';
-import {ComponentPortal, ComponentType} from '@angular/cdk/portal';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {PortalInjector} from '@angular/material/core';
+import {Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
+import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/portal';
+import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
 import {extendObject} from '@angular/material/core';
+import {SimpleSnackBar} from './simple-snack-bar';
 import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
-import {MdSnackBarRef} from './snack-bar-ref';
 import {MdSnackBarContainer} from './snack-bar-container';
-import {SimpleSnackBar} from './simple-snack-bar';
+import {MdSnackBarRef} from './snack-bar-ref';
 
 
 /**
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index d4a5d40b53b1..36038f4d0d70 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -1,19 +1,20 @@
-import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
+import {CollectionViewer, DataSource} from '@angular/cdk/collections';
+import {CdkTableModule} from '@angular/cdk/table';
+import {dispatchMouseEvent, wrappedErrorMessage} from '@angular/cdk/testing';
 import {Component, ElementRef, ViewChild} from '@angular/core';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdSort, MdSortHeader, Sort, SortDirection, MdSortModule, MdSortHeaderIntl} from './index';
-import {DataSource, CollectionViewer} from '@angular/cdk/collections';
-import {CdkTableModule} from '@angular/cdk/table';
 import {Observable} from 'rxjs/Observable';
+import {map} from 'rxjs/operator/map';
+import {MdTableModule} from '../table/index';
+import {MdSort, MdSortHeader, MdSortHeaderIntl, MdSortModule, Sort, SortDirection} from './index';
 import {
   getMdSortDuplicateMdSortableIdError,
   getMdSortHeaderMissingIdError,
-  getMdSortHeaderNotContainedWithinMdSortError
+  getMdSortHeaderNotContainedWithinMdSortError,
 } from './sort-errors';
-import {wrappedErrorMessage, dispatchMouseEvent} from '@angular/cdk/testing';
-import {map} from '@angular/material/core';
-import {MdTableModule} from '../table/index';
+
 
 describe('MdSort', () => {
   let fixture: ComponentFixture<SimpleMdSortApp>;
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 5662e317bc89..ec042211fd71 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -1,14 +1,15 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {Directionality} from '@angular/cdk/bidi';
+import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
+import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
-import {MdStepperModule} from './index';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
+import {MdStepperModule} from './index';
+import {MdHorizontalStepper, MdStepper, MdVerticalStepper} from './stepper';
 import {MdStepperNext, MdStepperPrevious} from './stepper-button';
-import {dispatchKeyboardEvent} from '@angular/cdk/testing';
-import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
-import {MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
-import {Directionality} from '@angular/material/core';
+
 
 const VALID_REGEX = /valid/;
 
diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts
index bd7592f97a36..cead88350898 100644
--- a/src/lib/tabs/tab-body.spec.ts
+++ b/src/lib/tabs/tab-body.spec.ts
@@ -1,12 +1,11 @@
-import {Component, ViewChild, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {PortalModule, TemplatePortal} from '@angular/cdk/portal';
 import {CommonModule} from '@angular/common';
-import {PortalModule} from '@angular/cdk/portal';
-import {async, ComponentFixture, TestBed, flushMicrotasks, fakeAsync} from '@angular/core/testing';
+import {Component, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
+import {async, ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
+import {MdRippleModule} from '@angular/material/core';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {Direction, Directionality} from '@angular/material/core';
-import {TemplatePortal} from '@angular/material/core';
 import {MdTabBody} from './tab-body';
-import {MdRippleModule} from '@angular/material/core';
 
 
 describe('MdTabBody', () => {
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index a8499dba0e29..852c9aa84d92 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TemplatePortal} from '@angular/material/core';
+import {TemplatePortal} from '@angular/cdk/portal';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -22,8 +22,9 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
-import {MdTabLabel} from './tab-label';
 import {Subject} from 'rxjs/Subject';
+import {MdTabLabel} from './tab-label';
+
 
 // Boilerplate for applying mixins to MdTab.
 /** @docs-private */
diff --git a/src/lib/tooltip/tooltip.scss b/src/lib/tooltip/tooltip.scss
index 1b69d057673f..e3bb19b162ab 100644
--- a/src/lib/tooltip/tooltip.scss
+++ b/src/lib/tooltip/tooltip.scss
@@ -1,5 +1,5 @@
 @import '../core/style/variables';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-tooltip-horizontal-padding: 8px;
 $mat-tooltip-max-width: 250px;

From d914cc4ea13ae7080fd0afe5bb55159caff7796e Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Thu, 21 Sep 2017 12:20:52 -0700
Subject: [PATCH 128/575] feat(select): make select work inside form-field
 (#6488)

---
 src/demo-app/a11y/select/select-a11y.html     | 100 ++-
 src/demo-app/baseline/baseline-demo.html      |  18 +-
 src/demo-app/dialog/dialog-demo.html          |  12 +-
 src/demo-app/select/select-demo.html          | 105 ++-
 src/demo-app/select/select-demo.scss          |   4 +
 src/demo-app/snack-bar/snack-bar-demo.html    |  26 +-
 src/lib/chips/chip-list.ts                    |   9 +
 src/lib/core/option/_option.scss              |   8 +
 src/lib/core/option/option.html               |   3 +-
 src/lib/form-field/_form-field-theme.scss     |  33 +-
 src/lib/form-field/form-field-control.ts      |  14 +-
 src/lib/form-field/form-field.html            |   5 +-
 src/lib/form-field/form-field.scss            |  46 +-
 src/lib/form-field/form-field.ts              |  16 +-
 src/lib/input/input.spec.ts                   |  24 +-
 src/lib/input/input.ts                        |  13 +-
 src/lib/paginator/paginator.html              |  19 +-
 src/lib/select/_select-theme.scss             |  64 +-
 src/lib/select/public_api.ts                  |   2 +-
 src/lib/select/select-animations.ts           |  19 -
 src/lib/select/select.html                    |  39 +-
 src/lib/select/select.md                      |  47 +-
 src/lib/select/select.scss                    | 115 +--
 src/lib/select/select.spec.ts                 | 846 ++++++++++--------
 src/lib/select/select.ts                      | 351 ++++----
 .../select-form/select-form-example.html      |  12 +-
 .../select-overview-example.html              |  12 +-
 .../tooltip-position-example.html             |  18 +-
 .../kitchen-sink/kitchen-sink.html            |  12 +-
 29 files changed, 1038 insertions(+), 954 deletions(-)

diff --git a/src/demo-app/a11y/select/select-a11y.html b/src/demo-app/a11y/select/select-a11y.html
index 26599933be10..4ca8f71378dd 100644
--- a/src/demo-app/a11y/select/select-a11y.html
+++ b/src/demo-app/a11y/select/select-a11y.html
@@ -2,71 +2,89 @@
   <h2>Single selection</h2>
   <p>Select your favorite color</p>
 
-  <md-select placeholder="Colors" [(ngModel)]="selectedColor">
-    <md-option *ngFor="let color of colors" [value]="color.value">
-      {{ color.label }}
-    </md-option>
-  </md-select>
+  <md-form-field>
+    <md-select placeholder="Colors" [(ngModel)]="selectedColor">
+      <md-option *ngFor="let color of colors" [value]="color.value">
+        {{ color.label }}
+      </md-option>
+    </md-select>
+  </md-form-field>
 </section>
 
 <section>
   <h2>Multiple selection</h2>
   <p>Pick toppings for your pizza</p>
 
-  <md-select placeholder="Toppings" [(ngModel)]="selectedTopping" multiple>
-    <md-option *ngFor="let topping of toppings" [value]="topping.value">
-      {{ topping.label }}
-    </md-option>
-  </md-select>
+  <md-form-field>
+    <md-select placeholder="Toppings" [(ngModel)]="selectedTopping" multiple>
+      <md-option *ngFor="let topping of toppings" [value]="topping.value">
+        {{ topping.label }}
+      </md-option>
+    </md-select>
+  </md-form-field>
 </section>
 
 <section>
   <h2>Grouped options</h2>
   <p>Pick your Pokemon</p>
 
-  <md-select placeholder="Pokemon" [(ngModel)]="selectedPokemon">
-    <md-optgroup *ngFor="let group of pokemon" [label]="group.label">
-      <md-option *ngFor="let creature of group.pokemon" [value]="creature.value">
-        {{ creature.label }}
-      </md-option>
-    </md-optgroup>
-  </md-select>
+  <md-form-field>
+    <md-select placeholder="Pokemon" [(ngModel)]="selectedPokemon">
+      <md-optgroup *ngFor="let group of pokemon" [label]="group.label">
+        <md-option *ngFor="let creature of group.pokemon" [value]="creature.value">
+          {{ creature.label }}
+        </md-option>
+      </md-optgroup>
+    </md-select>
+  </md-form-field>
 </section>
 
 <section>
   <h2>Colors</h2>
 
   <div class="select-a11y-spacer">
-    <md-select placeholder="ZIP code" color="primary">
-      <md-option value="2000">2000</md-option>
-      <md-option value="2100">2100</md-option>
-    </md-select>
+    <md-form-field  color="primary">
+      <md-select placeholder="ZIP code">
+        <md-option value="2000">2000</md-option>
+        <md-option value="2100">2100</md-option>
+      </md-select>
+    </md-form-field>
 
-    <md-select placeholder="State" color="accent">
-      <md-option value="alaska">Alaska</md-option>
-      <md-option value="alabama">Alabama</md-option>
-    </md-select>
+    <md-form-field color="accent">
+      <md-select placeholder="State">
+        <md-option value="alaska">Alaska</md-option>
+        <md-option value="alabama">Alabama</md-option>
+      </md-select>
+    </md-form-field>
 
-    <md-select placeholder="Language" color="warn">
-      <md-option value="english">English</md-option>
-      <md-option value="spanish">Spanish</md-option>
-    </md-select>
+    <md-form-field color="warn">
+      <md-select placeholder="Language">
+        <md-option value="english">English</md-option>
+        <md-option value="spanish">Spanish</md-option>
+      </md-select>
+    </md-form-field>
   </div>
 
   <div class="select-a11y-spacer">
-    <md-select placeholder="Digimon" color="primary" multiple>
-      <md-option value="mihiramon">Mihiramon</md-option>
-      <md-option value="sandiramon">Sandiramon</md-option>
-    </md-select>
+    <md-form-field color="primary">
+      <md-select placeholder="Digimon" multiple>
+        <md-option value="mihiramon">Mihiramon</md-option>
+        <md-option value="sandiramon">Sandiramon</md-option>
+      </md-select>
+    </md-form-field>
 
-    <md-select placeholder="Drink" color="accent" multiple>
-      <md-option value="water">Water</md-option>
-      <md-option value="coke">Coke</md-option>
-    </md-select>
+    <md-form-field color="accent">
+      <md-select placeholder="Drink" multiple>
+        <md-option value="water">Water</md-option>
+        <md-option value="coke">Coke</md-option>
+      </md-select>
+    </md-form-field>
 
-    <md-select placeholder="Theme" color="warn" multiple>
-      <md-option value="light">Light</md-option>
-      <md-option value="dark">Dark</md-option>
-    </md-select>
+    <md-form-field color="warn">
+      <md-select placeholder="Theme" multiple>
+        <md-option value="light">Light</md-option>
+        <md-option value="dark">Dark</md-option>
+      </md-select>
+    </md-form-field>
   </div>
 </section>
diff --git a/src/demo-app/baseline/baseline-demo.html b/src/demo-app/baseline/baseline-demo.html
index fa30ca0d8aaf..ba4568cb36d5 100644
--- a/src/demo-app/baseline/baseline-demo.html
+++ b/src/demo-app/baseline/baseline-demo.html
@@ -14,9 +14,12 @@
       <input mdInput placeholder="Input" value="Text Input">
     </md-form-field>
     | Text 5 |
-    <md-select placeholder="Select">
-      <md-option value="option">Option</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="This placeholder is really really really long">
+        <md-option value="option">Option</md-option>
+        <md-option value="long">This option is really really really long</md-option>
+      </md-select>
+    </md-form-field>
     | Text 6 |
     <md-form-field>
       <textarea mdInput placeholder="Input" mdTextareaAutosize>Textarea&#10;Line 2</textarea>
@@ -42,9 +45,12 @@ <h1>
         <input mdInput placeholder="Input" value="Text Input">
       </md-form-field>
       | Text 5 |
-      <md-select placeholder="Select">
-        <md-option value="option">Option</md-option>
-      </md-select>
+      <md-form-field>
+        <md-select placeholder="This placeholder is really really really long">
+          <md-option value="option">Option</md-option>
+          <md-option value="long">This option is really really really long</md-option>
+        </md-select>
+      </md-form-field>
       | Text 6 |
       <md-form-field>
         <textarea mdInput placeholder="Input" mdTextareaAutosize>Textarea&#10;Line 2</textarea>
diff --git a/src/demo-app/dialog/dialog-demo.html b/src/demo-app/dialog/dialog-demo.html
index 37efd6e028f7..e5d40ad94b34 100644
--- a/src/demo-app/dialog/dialog-demo.html
+++ b/src/demo-app/dialog/dialog-demo.html
@@ -56,11 +56,13 @@ <h2>Dialog backdrop</h2>
     <h2>Other options</h2>
 
     <p>
-      <md-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
-        <md-option>Start</md-option>
-        <md-option value="end">End</md-option>
-        <md-option value="center">Center</md-option>
-      </md-select>
+      <md-form-field>
+        <md-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
+          <md-option>Start</md-option>
+          <md-option value="end">End</md-option>
+          <md-option value="center">Center</md-option>
+        </md-select>
+      </md-form-field>
     </p>
 
     <p>
diff --git a/src/demo-app/select/select-demo.html b/src/demo-app/select/select-demo.html
index 8fad21eb8a7c..c673924d5933 100644
--- a/src/demo-app/select/select-demo.html
+++ b/src/demo-app/select/select-demo.html
@@ -6,13 +6,18 @@
   <md-card>
     <md-card-subtitle>ngModel</md-card-subtitle>
 
-    <md-select placeholder="Drink" [color]="drinksTheme" [(ngModel)]="currentDrink" [required]="drinksRequired"
-      [disabled]="drinksDisabled" [floatPlaceholder]="floatPlaceholder" #drinkControl="ngModel">
-      <md-option>None</md-option>
-      <md-option *ngFor="let drink of drinks" [value]="drink.value" [disabled]="drink.disabled">
-        {{ drink.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field [floatPlaceholder]="floatPlaceholder" [color]="drinksTheme">
+      <md-select placeholder="Drink" [(ngModel)]="currentDrink" [required]="drinksRequired"
+        [disabled]="drinksDisabled" #drinkControl="ngModel">
+        <md-option>None</md-option>
+        <md-option *ngFor="let drink of drinks" [value]="drink.value" [disabled]="drink.disabled">
+          {{ drink.viewValue }}
+        </md-option>
+      </md-select>
+      <md-icon mdPrefix class="demo-drink-icon">local_drink</md-icon>
+      <md-hint>Pick a drink!</md-hint>
+      <md-error>You must make a selection</md-error>
+    </md-form-field>
     <p> Value: {{ currentDrink }} </p>
     <p> Touched: {{ drinkControl.touched }} </p>
     <p> Dirty: {{ drinkControl.dirty }} </p>
@@ -28,7 +33,9 @@
     <p>
       <label for="drinks-theme">Theme:</label>
       <select [(ngModel)]="drinksTheme" id="drinks-theme">
-        <option *ngFor="let theme of availableThemes" [value]="theme.value">{{ theme.name }}</option>
+        <option *ngFor="let theme of availableThemes" [value]="theme.value">
+          {{theme.name}}
+        </option>
       </select>
     </p>
 
@@ -42,12 +49,14 @@
     <md-card-subtitle>Multiple selection</md-card-subtitle>
 
     <md-card-content>
-      <md-select multiple [color]="pokemonTheme" placeholder="Pokemon" [(ngModel)]="currentPokemon"
-        [required]="pokemonRequired" [disabled]="pokemonDisabled" #pokemonControl="ngModel">
-        <md-option *ngFor="let creature of pokemon" [value]="creature.value">
-          {{ creature.viewValue }}
-        </md-option>
-      </md-select>
+      <md-form-field [color]="pokemonTheme">
+        <md-select multiple placeholder="Pokemon" [(ngModel)]="currentPokemon"
+          [required]="pokemonRequired" [disabled]="pokemonDisabled" #pokemonControl="ngModel">
+          <md-option *ngFor="let creature of pokemon" [value]="creature.value">
+            {{ creature.viewValue }}
+          </md-option>
+        </md-select>
+      </md-form-field>
       <p> Value: {{ currentPokemon }} </p>
       <p> Touched: {{ pokemonControl.touched }} </p>
       <p> Dirty: {{ pokemonControl.dirty }} </p>
@@ -68,12 +77,14 @@
   <md-card>
     <md-card-subtitle>Without Angular forms</md-card-subtitle>
 
-    <md-select placeholder="Digimon" [(value)]="currentDigimon">
-      <md-option>None</md-option>
-      <md-option *ngFor="let creature of digimon" [value]="creature.value">
-        {{ creature.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Digimon" [(value)]="currentDigimon">
+        <md-option>None</md-option>
+        <md-option *ngFor="let creature of digimon" [value]="creature.value">
+          {{ creature.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
 
     <p>Value: {{ currentDigimon }}</p>
 
@@ -85,14 +96,16 @@
     <md-card-subtitle>Option groups</md-card-subtitle>
 
     <md-card-content>
-      <md-select placeholder="Pokemon" [(ngModel)]="currentPokemonFromGroup">
-        <md-optgroup *ngFor="let group of pokemonGroups" [label]="group.name"
-          [disabled]="group.disabled">
-          <md-option *ngFor="let creature of group.pokemon" [value]="creature.value">
-            {{ creature.viewValue }}
-          </md-option>
-        </md-optgroup>
-      </md-select>
+      <md-form-field>
+        <md-select placeholder="Pokemon" [(ngModel)]="currentPokemonFromGroup">
+          <md-optgroup *ngFor="let group of pokemonGroups" [label]="group.name"
+            [disabled]="group.disabled">
+            <md-option *ngFor="let creature of group.pokemon" [value]="creature.value">
+              {{ creature.viewValue }}
+            </md-option>
+          </md-optgroup>
+        </md-select>
+      </md-form-field>
     </md-card-content>
   </md-card>
 
@@ -100,15 +113,17 @@
   <md-card>
     <md-card-subtitle>compareWith</md-card-subtitle>
     <md-card-content>
-      <md-select placeholder="Drink" [color]="drinksTheme"
-                 [(ngModel)]="currentDrinkObject"
-                 [required]="drinkObjectRequired"
-                 [compareWith]="compareByValue ? compareDrinkObjectsByValue : compareByReference"
-                 #drinkObjectControl="ngModel">
-        <md-option *ngFor="let drink of drinks" [value]="drink" [disabled]="drink.disabled">
-          {{ drink.viewValue }}
-        </md-option>
-      </md-select>
+      <md-form-field [color]="drinksTheme">
+        <md-select placeholder="Drink"
+                   [(ngModel)]="currentDrinkObject"
+                   [required]="drinkObjectRequired"
+                   [compareWith]="compareByValue ? compareDrinkObjectsByValue : compareByReference"
+                   #drinkObjectControl="ngModel">
+          <md-option *ngFor="let drink of drinks" [value]="drink" [disabled]="drink.disabled">
+            {{ drink.viewValue }}
+          </md-option>
+        </md-select>
+      </md-form-field>
       <p> Value: {{ currentDrinkObject | json }} </p>
       <p> Touched: {{ drinkObjectControl.touched }} </p>
       <p> Dirty: {{ drinkObjectControl.dirty }} </p>
@@ -130,9 +145,11 @@
       <md-card-subtitle>formControl</md-card-subtitle>
 
       <md-card-content>
-        <md-select placeholder="Food i would like to eat" [formControl]="foodControl">
-          <md-option *ngFor="let food of foods" [value]="food.value"> {{ food.viewValue }}</md-option>
-        </md-select>
+        <md-form-field>
+          <md-select placeholder="Food i would like to eat" [formControl]="foodControl">
+            <md-option *ngFor="let food of foods" [value]="food.value"> {{ food.viewValue }}</md-option>
+          </md-select>
+        </md-form-field>
         <p> Value: {{ foodControl.value }} </p>
         <p> Touched: {{ foodControl.touched }} </p>
         <p> Dirty: {{ foodControl.dirty }} </p>
@@ -149,9 +166,11 @@
       <md-card-subtitle>Change event</md-card-subtitle>
 
       <md-card-content>
-        <md-select placeholder="Starter Pokemon" (change)="latestChangeEvent = $event">
-          <md-option *ngFor="let creature of pokemon" [value]="creature.value">{{ creature.viewValue }}</md-option>
-        </md-select>
+        <md-form-field>
+          <md-select placeholder="Starter Pokemon" (change)="latestChangeEvent = $event">
+            <md-option *ngFor="let creature of pokemon" [value]="creature.value">{{ creature.viewValue }}</md-option>
+          </md-select>
+        </md-form-field>
 
         <p> Change event value: {{ latestChangeEvent?.value }} </p>
       </md-card-content>
diff --git a/src/demo-app/select/select-demo.scss b/src/demo-app/select/select-demo.scss
index 8380da8d2be2..f87b50cbe96b 100644
--- a/src/demo-app/select/select-demo.scss
+++ b/src/demo-app/select/select-demo.scss
@@ -7,4 +7,8 @@
     margin: 24px;
   }
 
+  .demo-drink-icon {
+    vertical-align: bottom;
+    padding-right: 0.25em;
+  }
 }
diff --git a/src/demo-app/snack-bar/snack-bar-demo.html b/src/demo-app/snack-bar/snack-bar-demo.html
index 4d0634e59b74..c2f8171c1cc4 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.html
+++ b/src/demo-app/snack-bar/snack-bar-demo.html
@@ -5,17 +5,21 @@ <h1>SnackBar demo</h1>
   </div>
   <div>
     <div>Position in page: </div>
-    <md-select [(ngModel)]="horizontalPosition">
-      <md-option value="start">Start</md-option>
-      <md-option value="end">End</md-option>
-      <md-option value="left">Left</md-option>
-      <md-option value="right">Right</md-option>
-      <md-option value="center">Center</md-option>
-    </md-select>
-    <md-select [(ngModel)]="verticalPosition">
-      <md-option value="top">Top</md-option>
-      <md-option value="bottom">Bottom</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select [(ngModel)]="horizontalPosition">
+        <md-option value="start">Start</md-option>
+        <md-option value="end">End</md-option>
+        <md-option value="left">Left</md-option>
+        <md-option value="right">Right</md-option>
+        <md-option value="center">Center</md-option>
+      </md-select>
+    </md-form-field>
+    <md-form-field>
+      <md-select [(ngModel)]="verticalPosition">
+        <md-option value="top">Top</md-option>
+        <md-option value="bottom">Bottom</md-option>
+      </md-select>
+    </md-form-field>
   </div>
   <div>
     <md-checkbox [(ngModel)]="action">
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index caa58d318872..487dceacdf3c 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -81,6 +81,7 @@ export class MdChipListChange {
 })
 export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor,
     AfterContentInit, OnInit, OnDestroy {
+  readonly controlType = 'mat-chip-list';
 
   /**
    * Stream that emits whenever the state of the input changes such that the wrapping `MdFormField`
@@ -238,6 +239,10 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
     return (!this._chipInput || this._chipInput.empty) && this.chips.length === 0;
   }
 
+  get shouldPlaceholderFloat(): boolean {
+    return this.empty;
+  }
+
   /** Whether this chip-list is disabled. */
   @Input()
   get disabled() { return this.ngControl ? this.ngControl.disabled : this._disabled; }
@@ -387,6 +392,10 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
     this.stateChanges.next();
   }
 
+  onContainerClick() {
+    this.focus();
+  }
+
   /**
    * Focuses the the first non-disabled chip in this chip list, or the associated input when there
    * are no eligible chips.
diff --git a/src/lib/core/option/_option.scss b/src/lib/core/option/_option.scss
index bf9e20c2d3f5..109f1ecc3d99 100644
--- a/src/lib/core/option/_option.scss
+++ b/src/lib/core/option/_option.scss
@@ -29,6 +29,14 @@
     }
   }
 
+  // Collapses unwanted whitespace created by newlines in code like the following:
+  // <md-option>
+  //   {{value}}
+  // </md-option>
+  .mat-option-text {
+    display: inline-block;
+  }
+
   .mat-option-ripple {
     @include mat-fill;
 
diff --git a/src/lib/core/option/option.html b/src/lib/core/option/option.html
index a9b7b2e63374..7bf76128c4aa 100644
--- a/src/lib/core/option/option.html
+++ b/src/lib/core/option/option.html
@@ -3,7 +3,8 @@
       [state]="selected ? 'checked' : ''" [disabled]="disabled"></mat-pseudo-checkbox>
 </span>
 
-<ng-content></ng-content>
+<span class="mat-option-text"><ng-content></ng-content></span>
+
 <div class="mat-option-ripple" mat-ripple
      [matRippleTrigger]="_getHostElement()"
      [matRippleDisabled]="disabled || disableRipple">
diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 9576bfa0e29a..010b6b368ce5 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -14,7 +14,7 @@
 
   // Placeholder colors. Required is used for the `*` star shown in the placeholder.
   $placeholder-color: mat-color($foreground, secondary-text);
-  $floating-placeholder-color: mat-color($primary);
+  $focused-placeholder-color: mat-color($primary);
   $required-placeholder-color: mat-color($accent);
 
   // Underline colors.
@@ -38,7 +38,7 @@
   }
 
   .mat-focused .mat-form-field-placeholder {
-    color: $floating-placeholder-color;
+    color: $focused-placeholder-color;
 
     &.mat-accent {
       color: $underline-color-accent;
@@ -49,11 +49,8 @@
     }
   }
 
-  .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder,
-  .mat-focused .mat-form-field-placeholder.mat-form-field-float {
-    .mat-form-field-required-marker {
-      color: $required-placeholder-color;
-    }
+  .mat-focused .mat-form-field-required-marker {
+    color: $required-placeholder-color;
   }
 
   .mat-form-field-underline {
@@ -84,7 +81,7 @@
       color: $underline-color-warn;
 
       &.mat-accent,
-      &.mat-form-field-float .mat-form-field-required-marker {
+      .mat-form-field-required-marker {
         color: $underline-color-warn;
       }
     }
@@ -109,8 +106,7 @@
              translateZ(0.001px);
   // The tricks above used to smooth out the animation on chrome and firefox actually make things
   // worse on IE, so we don't include them in the IE version.
-  -ms-transform: translateY(-$infix-margin-top - $infix-padding)
-  scale($font-scale);
+  -ms-transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale);
 
   width: 100% / $font-scale;
 }
@@ -184,11 +180,17 @@
     border-top: $infix-margin-top solid transparent;
   }
 
-  .mat-form-field-autofill-control {
-    &:-webkit-autofill + .mat-form-field-placeholder-wrapper .mat-form-field-float {
+  .mat-form-field-can-float {
+    &.mat-form-field-should-float .mat-form-field-placeholder {
       @include _mat-form-field-placeholder-floating(
           $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
+
+    .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
+        .mat-form-field-placeholder {
+      @include _mat-form-field-placeholder-floating(
+              $subscript-font-scale, $infix-padding, $infix-margin-top);
+    }
   }
 
   .mat-form-field-placeholder-wrapper {
@@ -198,13 +200,6 @@
 
   .mat-form-field-placeholder {
     top: $infix-margin-top + $infix-padding;
-
-    // Show the placeholder above the control when it's not empty, or focused.
-    &.mat-form-field-float:not(.mat-form-field-empty),
-    .mat-focused &.mat-form-field-float {
-      @include _mat-form-field-placeholder-floating($subscript-font-scale,
-          $infix-padding, $infix-margin-top);
-    }
   }
 
   .mat-form-field-underline {
diff --git a/src/lib/form-field/form-field-control.ts b/src/lib/form-field/form-field-control.ts
index 98a6ea02089b..8bbf3b6cf12c 100644
--- a/src/lib/form-field/form-field-control.ts
+++ b/src/lib/form-field/form-field-control.ts
@@ -36,6 +36,9 @@ export abstract class MdFormFieldControl<T> {
   /** Whether the control is empty. */
   readonly empty: boolean;
 
+  /** Whether the `MdFormField` label should try to float. */
+  readonly shouldPlaceholderFloat: boolean;
+
   /** Whether the control is required. */
   readonly required: boolean;
 
@@ -45,9 +48,16 @@ export abstract class MdFormFieldControl<T> {
   /** Whether the control is in an error state. */
   readonly errorState: boolean;
 
+  /**
+   * An optional name for the control type that can be used to distinguish `md-form-field` elements
+   * based on their control type. The form field will add a class,
+   * `mat-form-field-type-{{controlType}}` to its root element.
+   */
+  readonly controlType?: string;
+
   /** Sets the list of element IDs that currently describe this control. */
   abstract setDescribedByIds(ids: string[]): void;
 
-  /** Focuses this control. */
-  abstract focus(): void;
+  /** Handles a click on the control's container. */
+  abstract onContainerClick(event: MouseEvent): void;
 }
diff --git a/src/lib/form-field/form-field.html b/src/lib/form-field/form-field.html
index 223cb79d0922..4bf46aec7a8a 100644
--- a/src/lib/form-field/form-field.html
+++ b/src/lib/form-field/form-field.html
@@ -1,5 +1,6 @@
 <div class="mat-input-wrapper mat-form-field-wrapper">
-  <div class="mat-input-flex mat-form-field-flex" #connectionContainer>
+  <div class="mat-input-flex mat-form-field-flex" #connectionContainer
+       (click)="_control.onContainerClick && _control.onContainerClick($event)">
     <div class="mat-input-prefix mat-form-field-prefix" *ngIf="_prefixChildren.length">
       <ng-content select="[mdPrefix], [matPrefix]"></ng-content>
     </div>
@@ -15,8 +16,6 @@
                [attr.aria-owns]="_control.id"
                [class.mat-empty]="_control.empty && !_shouldAlwaysFloat"
                [class.mat-form-field-empty]="_control.empty && !_shouldAlwaysFloat"
-               [class.mat-float]="_canPlaceholderFloat"
-               [class.mat-form-field-float]="_canPlaceholderFloat"
                [class.mat-accent]="color == 'accent'"
                [class.mat-warn]="color == 'warn'"
                #placeholder
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 449f60ecb7db..33de45151f6e 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -59,23 +59,7 @@ $mat-form-field-underline-height: 1px !default;
   display: block;
   position: relative;
   flex: auto;
-}
-
-// Pseudo-class for Chrome and Safari auto-fill to move the placeholder to the floating position.
-// This is necessary because these browsers do not actually fire any events when a form auto-fill is
-// occurring. Once the autofill is committed, a change event happen and the regular md-form-field
-// classes take over to fulfill this behaviour. Assumes the autofill is non-empty.
-.mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper {
-  // The control is still technically empty at this point, so we need to hide non-floating
-  // placeholders to prevent overlapping with the autofilled value.
-  .mat-form-field-placeholder {
-    display: none;
-  }
-
-  .mat-form-field-float {
-    display: block;
-    transition: none;
-  }
+  min-width: 0;
 }
 
 // Used to hide the placeholder overflow on IE, since IE doesn't take transform into account when
@@ -120,12 +104,6 @@ $mat-form-field-underline-height: 1px !default;
   // Hide the placeholder initially, and only show it when it's floating or the control is empty.
   display: none;
 
-  &.mat-form-field-empty,
-  &.mat-form-field-float:not(.mat-form-field-empty),
-  .mat-focused &.mat-form-field-float {
-    display: block;
-  }
-
   [dir='rtl'] & {
     transform-origin: 100% 0;
     left: auto;
@@ -133,6 +111,28 @@ $mat-form-field-underline-height: 1px !default;
   }
 }
 
+.mat-form-field-empty.mat-form-field-placeholder,
+.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-placeholder {
+  display: block;
+}
+
+// Pseudo-class for Chrome and Safari auto-fill to move the placeholder to the floating position.
+// This is necessary because these browsers do not actually fire any events when a form auto-fill is
+// occurring. Once the autofill is committed, a change event happen and the regular md-form-field
+// classes take over to fulfill this behaviour.
+.mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
+    .mat-form-field-placeholder {
+  // The form field will be considered empty if it is autofilled, and therefore the placeholder will
+  // be shown. Therefore we need to override it to hidden...
+  display: none;
+
+  // ...and re-show it only if it's able to float.
+  .mat-form-field-can-float & {
+    display: block;
+    transition: none;
+  }
+}
+
 // Disable the placeholder animation when the control is not empty (this prevents placeholder
 // animating up when the value is set programmatically).
 .mat-form-field-placeholder:not(.mat-form-field-empty) {
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index c0644f2abdae..8d320f2f7fbc 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -22,7 +22,7 @@ import {
   Inject,
   Input,
   Optional,
-  QueryList,
+  QueryList, Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -72,7 +72,12 @@ let nextUniqueId = 0;
     'class': 'mat-input-container mat-form-field',
     '[class.mat-input-invalid]': '_control.errorState',
     '[class.mat-form-field-invalid]': '_control.errorState',
+    '[class.mat-form-field-can-float]': '_canPlaceholderFloat',
+    '[class.mat-form-field-should-float]': '_control.shouldPlaceholderFloat || _shouldAlwaysFloat',
     '[class.mat-focused]': '_control.focused',
+    '[class.mat-primary]': 'color == "primary"',
+    '[class.mat-accent]': 'color == "accent"',
+    '[class.mat-warn]': 'color == "warn"',
     '[class.ng-untouched]': '_shouldForward("untouched")',
     '[class.ng-touched]': '_shouldForward("touched")',
     '[class.ng-pristine]': '_shouldForward("pristine")',
@@ -80,7 +85,6 @@ let nextUniqueId = 0;
     '[class.ng-valid]': '_shouldForward("valid")',
     '[class.ng-invalid]': '_shouldForward("invalid")',
     '[class.ng-pending]': '_shouldForward("pending")',
-    '(click)': '_control.focus()',
   },
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
@@ -155,7 +159,9 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
   @ContentChildren(MdSuffix) _suffixChildren: QueryList<MdSuffix>;
 
   constructor(
-      public _elementRef: ElementRef, private _changeDetectorRef: ChangeDetectorRef,
+      public _elementRef: ElementRef,
+      private _renderer: Renderer2,
+      private _changeDetectorRef: ChangeDetectorRef,
       @Optional() @Inject(MD_PLACEHOLDER_GLOBAL_OPTIONS) placeholderOptions: PlaceholderOptions) {
     this._placeholderOptions = placeholderOptions ? placeholderOptions : {};
     this.floatPlaceholder = this._placeholderOptions.float || 'auto';
@@ -163,6 +169,10 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
 
   ngAfterContentInit() {
     this._validateControlChild();
+    if (this._control.controlType) {
+      this._renderer.addClass(
+          this._elementRef.nativeElement, `mat-form-field-type-${this._control.controlType}`);
+    }
 
     // Subscribe to changes in the child control state in order to update the form field UI.
     startWith.call(this._control.stateChanges, null).subscribe(() => {
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index ba534a980a7e..5c083fdd825b 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -529,16 +529,16 @@ describe('MdInput without forms', function () {
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
-    let labelEl = fixture.debugElement.query(By.css('label')).nativeElement;
+    let formFieldEl = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
-    expect(labelEl.classList).not.toContain('mat-form-field-empty');
-    expect(labelEl.classList).toContain('mat-form-field-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-can-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-should-float');
 
     fixture.componentInstance.shouldFloat = 'auto';
     fixture.detectChanges();
 
-    expect(labelEl.classList).toContain('mat-form-field-empty');
-    expect(labelEl.classList).toContain('mat-form-field-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-can-float');
+    expect(formFieldEl.classList).not.toContain('mat-form-field-should-float');
 
     // Update the value of the input.
     inputEl.value = 'Text';
@@ -546,8 +546,8 @@ describe('MdInput without forms', function () {
     // Fake behavior of the `(input)` event which should trigger a change detection.
     fixture.detectChanges();
 
-    expect(labelEl.classList).not.toContain('mat-form-field-empty');
-    expect(labelEl.classList).toContain('mat-form-field-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-can-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-should-float');
   });
 
   it('should always float the placeholder when floatPlaceholder is set to true', () => {
@@ -555,10 +555,10 @@ describe('MdInput without forms', function () {
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
-    let labelEl = fixture.debugElement.query(By.css('label')).nativeElement;
+    let formFieldEl = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
-    expect(labelEl.classList).not.toContain('mat-form-field-empty');
-    expect(labelEl.classList).toContain('mat-form-field-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-can-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-should-float');
 
     fixture.detectChanges();
 
@@ -568,8 +568,8 @@ describe('MdInput without forms', function () {
     // Fake behavior of the `(input)` event which should trigger a change detection.
     fixture.detectChanges();
 
-    expect(labelEl.classList).not.toContain('mat-form-field-empty');
-    expect(labelEl.classList).toContain('mat-form-field-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-can-float');
+    expect(formFieldEl.classList).toContain('mat-form-field-should-float');
   });
 
 
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 6f02784aee05..85b47dce9dc5 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -55,7 +55,7 @@ let nextUniqueId = 0;
     'class': 'mat-input-element mat-form-field-autofill-control',
     // Native input properties that are overwritten by Angular inputs need to be synced with
     // the native input element. Otherwise property bindings for those don't work.
-    '[id]': 'id',
+    '[attr.id]': 'id',
     '[placeholder]': 'placeholder',
     '[disabled]': 'disabled',
     '[required]': 'required',
@@ -92,6 +92,9 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
    */
   stateChanges = new Subject<void>();
 
+  /** A name for this control that can be used by `md-form-field`. */
+  controlType = 'mat-input';
+
   /** Whether the element is disabled. */
   @Input()
   get disabled() { return this.ngControl ? this.ngControl.disabled : this._disabled; }
@@ -129,6 +132,7 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
   @Input() errorStateMatcher: ErrorStateMatcher;
 
   /** The input element's value. */
+  @Input()
   get value() { return this._elementRef.nativeElement.value; }
   set value(value: string) {
     if (value !== this.value) {
@@ -197,6 +201,8 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
     }
   }
 
+  focus() { this._elementRef.nativeElement.focus(); }
+
   /** Callback for the cases where the focused state of the input changes. */
   _focusChanged(isFocused: boolean) {
     if (isFocused !== this.focused) {
@@ -278,9 +284,12 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
         !this._isBadInput();
   }
 
+  // Implemented as part of MdFormFieldControl.
+  get shouldPlaceholderFloat(): boolean { return this.focused || !this.empty; }
+
   // Implemented as part of MdFormFieldControl.
   setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
 
   // Implemented as part of MdFormFieldControl.
-  focus() { this._elementRef.nativeElement.focus(); }
+  onContainerClick() { this.focus(); }
 }
diff --git a/src/lib/paginator/paginator.html b/src/lib/paginator/paginator.html
index 700efb48faaf..06297e5fb288 100644
--- a/src/lib/paginator/paginator.html
+++ b/src/lib/paginator/paginator.html
@@ -3,15 +3,16 @@
     {{_intl.itemsPerPageLabel}}
   </div>
 
-  <mat-select *ngIf="_displayedPageSizeOptions.length > 1"
-             class="mat-paginator-page-size-select"
-             [value]="pageSize"
-             [aria-label]="_intl.itemsPerPageLabel"
-             (change)="_changePageSize($event.value)">
-    <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
-      {{pageSizeOption}}
-    </mat-option>
-  </mat-select>
+  <mat-form-field *ngIf="_displayedPageSizeOptions.length > 1">
+    <mat-select class="mat-paginator-page-size-select"
+               [value]="pageSize"
+               [aria-label]="_intl.itemsPerPageLabel"
+               (change)="_changePageSize($event.value)">
+      <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
+        {{pageSizeOption}}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
 
   <div *ngIf="_displayedPageSizeOptions.length <= 1">{{pageSize}}</div>
 </div>
diff --git a/src/lib/select/_select-theme.scss b/src/lib/select/_select-theme.scss
index de7432ff3c30..685f8f2b82a1 100644
--- a/src/lib/select/_select-theme.scss
+++ b/src/lib/select/_select-theme.scss
@@ -3,17 +3,6 @@
 @import '../core/style/form-common';
 @import '../core/typography/typography-utils';
 
-@mixin _mat-select-inner-content-theme($palette) {
-  $color: mat-color($palette);
-
-  .mat-select-trigger, .mat-select-arrow {
-    color: $color;
-  }
-
-  .mat-select-underline {
-    background-color: $color;
-  }
-}
 
 @mixin mat-select-theme($theme) {
   $foreground: map-get($theme, foreground);
@@ -22,25 +11,9 @@
   $accent: map-get($theme, accent);
   $warn: map-get($theme, warn);
   $is-dark-theme: map-get($theme, is-dark);
-  $underline-color: mat-color($foreground, divider, if($is-dark-theme, 0.7, 0.42));
-
-  .mat-select-trigger,
-  .mat-select-arrow {
-    color: mat-color($foreground, secondary-text);
-  }
-
-  .mat-select-underline {
-    background-color: $underline-color;
-  }
-
-  [aria-disabled='true'] .mat-select-underline {
-    // Since this is a dotted line, we need to make it slightly darker to get it to stand out.
-    @include mat-control-disabled-underline($underline-color);
-  }
 
   .mat-select-disabled .mat-select-value,
-  .mat-select-arrow,
-  .mat-select-trigger {
+  .mat-select-arrow {
     color: mat-color($foreground, secondary-text);
   }
 
@@ -58,35 +31,44 @@
     }
   }
 
-  .mat-select:focus:not(.mat-select-disabled) {
-    &.mat-primary {
-      @include _mat-select-inner-content-theme($primary);
-    }
+  .mat-form-field {
+    &.mat-focused {
+      &.mat-primary .mat-select-arrow {
+        color: mat-color($primary);
+      }
+
+      &.mat-accent .mat-select-arrow {
+        color: mat-color($accent);
+      }
 
-    &.mat-accent {
-      @include _mat-select-inner-content-theme($accent);
+      &.mat-warn .mat-select-arrow {
+        color: mat-color($warn);
+      }
     }
 
-    &.mat-select-required .mat-select-placeholder::after {
+    .mat-select.mat-select-invalid .mat-select-arrow {
       color: mat-color($warn);
     }
+
+    .mat-select.mat-select-disabled .mat-select-arrow {
+      color: mat-color($foreground, secondary-text);
+    }
   }
 
-  .mat-select:focus:not(.mat-select-disabled).mat-warn, .mat-select-invalid {
-    @include _mat-select-inner-content-theme($warn);
+  .mat-select.mat-select-disabled .mat-select-arrow {
+    color: mat-color($warn);
   }
 }
 
 @mixin mat-select-typography($config) {
-  $trigger-font-size: mat-font-size($config, subheading-2);
+  // The unit-less line-height from the font config.
+  $line-height: mat-line-height($config, input);
 
   .mat-select {
-    // Reserve enough space for the floating placeholder.
-    padding-top: $trigger-font-size;
     font-family: mat-font-family($config);
   }
 
   .mat-select-trigger {
-    font-size: $trigger-font-size;
+    height: $line-height * 1em;
   }
 }
diff --git a/src/lib/select/public_api.ts b/src/lib/select/public_api.ts
index ff3282c457e2..01ccc2f3e727 100644
--- a/src/lib/select/public_api.ts
+++ b/src/lib/select/public_api.ts
@@ -8,5 +8,5 @@
 
 export * from './select-module';
 export * from './select';
-export {fadeInContent, transformPanel, transformPlaceholder} from './select-animations';
+export * from './select-animations';
 export * from './mat-exports';
diff --git a/src/lib/select/select-animations.ts b/src/lib/select/select-animations.ts
index e92230508043..2813519212ef 100644
--- a/src/lib/select/select-animations.ts
+++ b/src/lib/select/select-animations.ts
@@ -22,25 +22,6 @@ import {
  * The values below match the implementation of the AngularJS Material md-select animation.
  */
 
-/**
- * This animation shrinks the placeholder text to 75% of its normal size and translates
- * it to either the top left corner (ltr) or top right corner (rtl) of the trigger,
- * depending on the text direction of the application.
- */
-export const transformPlaceholder: AnimationTriggerMetadata = trigger('transformPlaceholder', [
-  state('floating-ltr', style({
-    top: '-22px',
-    left: '-2px',
-    transform: 'scale(0.75)'
-  })),
-  state('floating-rtl', style({
-    top: '-22px',
-    left: '2px',
-    transform: 'scale(0.75)'
-  })),
-  transition('* => *', animate('400ms cubic-bezier(0.25, 0.8, 0.25, 1)'))
-]);
-
 /**
  * This animation transforms the select's overlay panel on and off the page.
  *
diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index e3c5823eea05..9379f0980a2e 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -1,26 +1,22 @@
-<div
-  cdk-overlay-origin
-  class="mat-select-trigger"
-  aria-hidden="true"
-  (click)="toggle()"
-  #origin="cdkOverlayOrigin"
-  #trigger>
-  <span
-    class="mat-select-placeholder"
-    [class.mat-floating-placeholder]="_hasValue()"
-    [@transformPlaceholder]="_getPlaceholderAnimationState()"
-    [style.opacity]="_getPlaceholderOpacity()"
-    [style.width.px]="_selectedValueWidth">{{ placeholder }}</span>
-
-  <span class="mat-select-value" *ngIf="_hasValue()">
-    <span class="mat-select-value-text" [ngSwitch]="!!customTrigger">
+<div cdk-overlay-origin
+     class="mat-select-trigger"
+     aria-hidden="true"
+     (click)="toggle()"
+     #origin="cdkOverlayOrigin"
+     #trigger>
+  <div class="mat-select-value">
+    <!--
+      TODO(mmalerba): &nbsp; is currently broken in components with preserveWhitespace: false, so we
+      evaluate it as a JS string binding instead. Change back to &nbsp; once it works again.
+    -->
+    <ng-container *ngIf="empty">{{'\xa0'}}</ng-container>
+    <span class="mat-select-value-text" *ngIf="!empty" [ngSwitch]="!!customTrigger">
       <span *ngSwitchDefault>{{ triggerValue }}</span>
       <ng-content select="md-select-trigger, mat-select-trigger" *ngSwitchCase="true"></ng-content>
     </span>
-  </span>
+  </div>
 
-  <span class="mat-select-arrow"></span>
-  <span class="mat-select-underline"></span>
+  <div class="mat-select-arrow-wrapper"><div class="mat-select-arrow"></div></div>
 </div>
 
 <ng-template
@@ -31,7 +27,7 @@
   [origin]="origin"
   [open]="panelOpen"
   [positions]="_positions"
-  [minWidth]="_triggerWidth"
+  [minWidth]="_triggerRect?.width"
   [offsetY]="_offsetY"
   (backdropClick)="close()"
   (attach)="_onAttached()"
@@ -44,7 +40,8 @@
     (@transformPanel.done)="_onPanelDone()"
     (keydown)="_handlePanelKeydown($event)"
     [style.transformOrigin]="_transformOrigin"
-    [class.mat-select-panel-done-animating]="_panelDoneAnimating">
+    [class.mat-select-panel-done-animating]="_panelDoneAnimating"
+    [style.font-size.px]="_triggerFontSize">
 
     <div class="mat-select-content" [@fadeInContent]="'showing'" (@fadeInContent.done)="_onFadeInDone()">
       <ng-content></ng-content>
diff --git a/src/lib/select/select.md b/src/lib/select/select.md
index 787c97235e3b..389060fb44c0 100644
--- a/src/lib/select/select.md
+++ b/src/lib/select/select.md
@@ -1,6 +1,7 @@
 `<md-select>` is a form control for selecting a value from a set of options, similar to the native
 `<select>` element. You can read more about selects in the
-[Material Design spec](https://material.google.com/components/menus.html).
+[Material Design spec](https://material.google.com/components/menus.html). It is designed to work
+inside of an `<md-form-field>` element.
 
 <!-- example(select-overview) -->
 
@@ -12,9 +13,11 @@ binding to it.
 
 *my-comp.html*
 ```html
-<md-select placeholder="State">
-   <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-</md-select>
+<md-form-field>
+  <md-select placeholder="State">
+    <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
+  </md-select>
+</md-form-field>
 ```
 
 ### Getting and setting the select value
@@ -24,9 +27,11 @@ any of the form directives from the core `FormsModule` or `ReactiveFormsModule`:
 
 *my-comp.html*
 ```html
-<md-select placeholder="State" [(ngModel)]="myState">
-   <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-</md-select>
+<md-form-field>
+  <md-select placeholder="State" [(ngModel)]="myState">
+    <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
+  </md-select>
+</md-form-field>
 ```
 
 *my-comp.ts*
@@ -43,10 +48,12 @@ If you want one of your options to reset the select's value, you can omit specif
 
 *my-comp.html*
 ```html
-<md-select placeholder="State">
-   <md-option>None</md-option>
-   <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-</md-select>
+<md-form-field>
+  <md-select placeholder="State">
+    <md-option>None</md-option>
+    <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
+  </md-select>
+</md-form-field>
 ```
 
 ### Setting a static placeholder
@@ -57,9 +64,11 @@ It's possible to turn off the placeholder's floating animation using the `floatP
 - `'always'`: This makes the placeholder permanently float above the input. It will not animate up or down.
 
 ```html
-<md-select placeholder="State" [(ngModel)]="myState" floatPlaceholder="never">
-   <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-</md-select>
+<md-form-field floatPlaceholder="never">
+  <md-select placeholder="State" [(ngModel)]="myState">
+  <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
+  </md-select>
+</md-form-field>
 ```
 
 Global default placeholder options can be specified by setting the `MD_PLACEHOLDER_GLOBAL_OPTIONS` provider. This setting will apply to all components that support the floating placeholder.
@@ -76,10 +85,12 @@ Global default placeholder options can be specified by setting the `MD_PLACEHOLD
 If you want to display a custom trigger label inside a select, you can use the `md-select-trigger` element:
 
 ```html
-<md-select placeholder="Favorite food" #select="mdSelect">
-  <md-select-trigger>You have selected: {{ select.selected?.viewValue }}</md-select-trigger>
-  <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-</md-select>
+<md-form-field>
+  <md-select placeholder="Favorite food" #select="mdSelect">
+    <md-select-trigger>You have selected: {{ select.selected?.viewValue }}</md-select-trigger>
+    <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
+  </md-select>
+</md-form-field>
 ```
 
 Here are the available global options:
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 1056cef91149..e3eb9f2c6f32 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -4,23 +4,21 @@
 @import '../core/style/vendor-prefixes';
 @import '../../cdk/a11y/a11y';
 
-$mat-select-trigger-height: 30px !default;
-$mat-select-trigger-min-width: 112px !default;
 $mat-select-arrow-size: 5px !default;
 $mat-select-arrow-margin: 4px !default;
 $mat-select-panel-max-height: 256px !default;
-$mat-select-trigger-underline-height: 1px !default;
+$mat-select-item-height: 3em !default;
+
+$mat-select-placeholder-arrow-space: 2 * ($mat-select-arrow-size + $mat-select-arrow-margin);
 
 .mat-select {
   display: inline-block;
+  width: 100%;
   outline: none;
 }
 
 .mat-select-trigger {
-  display: flex;
-  align-items: center;
-  height: $mat-select-trigger-height;
-  min-width: $mat-select-trigger-min-width;
+  display: inline-table;
   cursor: pointer;
   position: relative;
   box-sizing: border-box;
@@ -31,84 +29,21 @@ $mat-select-trigger-underline-height: 1px !default;
   }
 }
 
-.mat-select-underline {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: $mat-select-trigger-underline-height;
-
-  .mat-select:focus & {
-    height: $mat-select-trigger-underline-height * 2;
-  }
-
-  .mat-select-disabled & {
-    background-color: transparent;
-    background-position: 0 bottom;
-  }
-}
-
-.mat-select-placeholder {
-  position: relative;
-  padding: 0 2px;
-  transform-origin: left top;
-  flex-grow: 1;
-
-  // These values are duplicated from animation code in order to
-  // allow placeholders to sometimes float without animating,
-  // for example when the value is set programmatically.
-  // TODO(kara): Change when animations API supports skipping animation.
-  &.mat-floating-placeholder {
-    top: -22px;
-    left: -2px;
-    text-align: left;
-    transform: scale(0.75);
-  }
-
-  [dir='rtl'] & {
-    transform-origin: right top;
-
-    &.mat-floating-placeholder {
-      left: 2px;
-      text-align: right;
-    }
-  }
-
-  // TODO: Double-check accessibility of this style
-  .mat-select-required &::after {
-    content: ' *';
-  }
-}
-
 .mat-select-value {
-  position: absolute;
-  max-width: calc(100% - #{($mat-select-arrow-size + $mat-select-arrow-margin) * 2});
-  flex-grow: 1;
-
-  // Firefox and some versions of IE incorrectly keep absolutely
-  // positioned children of flex containers in the flex flow when calculating
-  // position. This has been fixed for Firefox 52, slated for early 2017.
-  // Bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=874718
-  //
-  // In the meantime, we must adjust the position to fit the top, left, and bottom edge of the
-  // containing trigger element. In doing so, we can use align-items: center to allow the text to
-  // correctly position itself in the middle of the container.
-  top: 0;
-  left: 0;
-  bottom: 0;
-
-  display: flex;
-  align-items: center;
-
-  [dir='rtl'] & {
-    left: auto;
-    right: 0;
-  }
+  display: table-cell;
+  max-width: 0;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .mat-select-value-text {
   @include mat-truncate-line();
-  line-height: $mat-select-trigger-height;
+}
+
+.mat-select-arrow-wrapper {
+  display: table-cell;
+  vertical-align: middle;
 }
 
 .mat-select-arrow {
@@ -131,3 +66,23 @@ $mat-select-trigger-underline-height: 1px !default;
     outline: solid 1px;
   }
 }
+
+// Override optgroup and option to scale based on font-size of the trigger.
+.mat-select-panel {
+  .mat-optgroup-label,
+  .mat-option {
+    font-size: inherit;
+    line-height: $mat-select-item-height;
+    height: $mat-select-item-height;
+  }
+}
+
+.mat-form-field-type-mat-select {
+  .mat-form-field-flex {
+    cursor: pointer;
+  }
+
+  .mat-form-field-placeholder {
+    width: calc(100% - #{$mat-select-placeholder-arrow-space});
+  }
+}
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index b774081a9c11..b894b50a1a3c 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -1,3 +1,9 @@
+import {Directionality} from '@angular/cdk/bidi';
+import {DOWN_ARROW, END, ENTER, HOME, SPACE, TAB, UP_ARROW} from '@angular/cdk/keycodes';
+import {OverlayContainer} from '@angular/cdk/overlay';
+import {Platform} from '@angular/cdk/platform';
+import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
+import {dispatchFakeEvent, dispatchKeyboardEvent, wrappedErrorMessage} from '@angular/cdk/testing';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -7,6 +13,7 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
+import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
 import {
   ControlValueAccessor,
   FormControl,
@@ -17,16 +24,17 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
+import {
+  extendObject,
+  FloatPlaceholderType,
+  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  MdOption
+} from '@angular/material/core';
+import {MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
-import {Directionality} from '@angular/cdk/bidi';
-import {DOWN_ARROW, END, ENTER, HOME, SPACE, TAB, UP_ARROW} from '@angular/cdk/keycodes';
-import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
-import {OverlayContainer} from '@angular/cdk/overlay';
-import {dispatchFakeEvent, dispatchKeyboardEvent, wrappedErrorMessage} from '@angular/cdk/testing';
-import {Subject} from 'rxjs/Subject';
 import {map} from 'rxjs/operator/map';
+import {Subject} from 'rxjs/Subject';
 import {MdSelectModule} from './index';
 import {MdSelect} from './select';
 import {
@@ -34,12 +42,6 @@ import {
   getMdSelectNonArrayValueError,
   getMdSelectNonFunctionValueError
 } from './select-errors';
-import {MdOption} from '@angular/material/core';
-import {
-  FloatPlaceholderType,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS
-} from '@angular/material/core';
-import {extendObject} from '@angular/material/core';
 
 
 describe('MdSelect', () => {
@@ -50,7 +52,13 @@ describe('MdSelect', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSelectModule, ReactiveFormsModule, FormsModule, NoopAnimationsModule],
+      imports: [
+        MdFormFieldModule,
+        MdSelectModule,
+        ReactiveFormsModule,
+        FormsModule,
+        NoopAnimationsModule
+      ],
       declarations: [
         BasicSelect,
         NgModelSelect,
@@ -333,16 +341,19 @@ describe('MdSelect', () => {
   describe('selection logic', () => {
     let fixture: ComponentFixture<BasicSelect>;
     let trigger: HTMLElement;
+    let formField: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
 
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     });
 
-    it('should display placeholder if no option is selected', () => {
-      expect(trigger.textContent!.trim()).toEqual('Food');
+    it('should not float placeholder if no option is selected', () => {
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(false, 'placeholder should not be floating');
     });
 
     it('should focus the first option if no option is selected', async(() => {
@@ -462,13 +473,10 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const value = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
-      const placeholder =
-        fixture.debugElement.query(By.css('.mat-select-placeholder')).nativeElement;
 
-      expect(placeholder.textContent).toContain('Food');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(true, 'placeholder should be floating');
       expect(value.textContent).toContain('Steak');
-      expect(trigger.textContent).toContain('Food');
-      expect(trigger.textContent).toContain('Steak');
     });
 
     it('should focus the selected option if an option is selected', async(() => {
@@ -544,6 +552,8 @@ describe('MdSelect', () => {
 
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicSelect);
+      fixture.detectChanges();
+      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
     });
 
     it('should take an initial view value with reactive forms', () => {
@@ -565,34 +575,29 @@ describe('MdSelect', () => {
               `Expected option with the control's initial value to be selected.`);
     });
 
-    beforeEach(() => {
-      fixture.detectChanges();
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    });
-
     it('should set the view value from the form', () => {
       let value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value).toBeNull('Expected trigger to start with empty value.');
+      expect(value.nativeElement.textContent.trim()).toBe('');
 
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
       value = fixture.debugElement.query(By.css('.mat-select-value'));
       expect(value.nativeElement.textContent)
-        .toContain('Pizza', `Expected trigger to be populated by the control's new value.`);
+          .toContain('Pizza', `Expected trigger to be populated by the control's new value.`);
 
       trigger.click();
       fixture.detectChanges();
 
       const options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList)
-        .toContain('mat-selected', `Expected option with the control's new value to be selected.`);
+          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+      expect(options[1].classList).toContain('mat-selected',
+          `Expected option with the control's new value to be selected.`);
     });
 
     it('should update the form value when the view changes', () => {
       expect(fixture.componentInstance.control.value)
-        .toEqual(null, `Expected the control's value to be null initially.`);
+        .toEqual(null, `Expected the control's value to be empty initially.`);
 
       trigger.click();
       fixture.detectChanges();
@@ -613,7 +618,8 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value).toBe(null, `Expected trigger to be cleared when option value is not found.`);
+      expect(value.nativeElement.textContent.trim())
+          .toBe('', `Expected trigger to be cleared when option value is not found.`);
       expect(trigger.textContent)
           .not.toContain('Pizza', `Expected trigger to be cleared when option value is not found.`);
 
@@ -635,7 +641,8 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value).toBe(null, `Expected trigger to be cleared when option value is not found.`);
+      expect(value.nativeElement.textContent.trim())
+          .toBe('', `Expected trigger to be cleared when option value is not found.`);
       expect(trigger.textContent)
           .not.toContain('Pizza', `Expected trigger to be cleared when option value is not found.`);
 
@@ -705,18 +712,16 @@ describe('MdSelect', () => {
 
 
     it('should set an asterisk after the placeholder if the control is required', () => {
-      const placeholder =
-        fixture.debugElement.query(By.css('.mat-select-placeholder')).nativeElement;
-      const initialContent =  getComputedStyle(placeholder, '::after').getPropertyValue('content');
-
-      // must support both default cases to work in all browsers in Saucelabs
-      expect(initialContent === 'none' || initialContent === '')
-        .toBe(true, `Expected placeholder not to have an asterisk, as control was not required.`);
+      let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+      expect(requiredMarker)
+        .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
 
       fixture.componentInstance.isRequired = true;
       fixture.detectChanges();
-      expect(getComputedStyle(placeholder, '::after').getPropertyValue('content'))
-        .toContain('*', `Expected placeholder to have an asterisk, as control was required.`);
+
+      requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+      expect(requiredMarker)
+          .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
     });
 
     it('should be able to programmatically select a falsy option', () => {
@@ -870,7 +875,6 @@ describe('MdSelect', () => {
   });
 
   describe('disabled behavior', () => {
-
     it('should disable itself when control is disabled programmatically', () => {
       const fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
@@ -952,7 +956,7 @@ describe('MdSelect', () => {
       spyOn(fixture.componentInstance.customAccessor, 'writeValue');
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.customAccessor.select._control)
+      expect(fixture.componentInstance.customAccessor.select.ngControl)
           .toBe(null, 'Expected md-select NOT to inherit control from parent value accessor.');
       expect(fixture.componentInstance.customAccessor.writeValue).toHaveBeenCalled();
     });
@@ -962,52 +966,32 @@ describe('MdSelect', () => {
   describe('animations', () => {
     let fixture: ComponentFixture<BasicSelect>;
     let trigger: HTMLElement;
+    let formField: HTMLElement;
 
     beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
 
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     }));
 
     it('should float the placeholder when the panel is open and unselected', () => {
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState())
-          .toEqual('', 'Expected placeholder to initially have a normal position.');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(false, 'Expected placeholder to initially have a normal position.');
 
       trigger.click();
       fixture.detectChanges();
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState())
-          .toEqual('floating-ltr', 'Expected placeholder to animate up to floating position.');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(true, 'Expected placeholder to animate up to floating position.');
 
       const backdrop =
         overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
       backdrop.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState())
-          .toEqual('', 'Expected placeholder to animate back down to normal position.');
-    });
-
-    it('should float the placeholder without animation when value is set', () => {
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
-
-      const placeholderEl =
-          fixture.debugElement.query(By.css('.mat-select-placeholder')).nativeElement;
-
-      expect(placeholderEl.classList)
-          .toContain('mat-floating-placeholder', 'Expected placeholder to display as floating.');
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState())
-          .toEqual('', 'Expected animation state to be empty to avoid animation.');
-    });
-
-    it('should use the floating-rtl state when the dir is rtl', () => {
-      dir.value = 'rtl';
-
-      trigger.click();
-      fixture.detectChanges();
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState())
-          .toEqual('floating-rtl');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(false, 'Expected placeholder to animate back down to normal position.');
     });
 
     it('should add a class to the panel when the menu is done animating', fakeAsync(() => {
@@ -1023,19 +1007,20 @@ describe('MdSelect', () => {
 
       expect(panel.classList).toContain('mat-select-panel-done-animating');
     }));
-
   });
 
   describe('positioning', () => {
     let fixture: ComponentFixture<BasicSelect>;
     let trigger: HTMLElement;
     let select: HTMLElement;
+    let formField: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       select = fixture.debugElement.query(By.css('md-select')).nativeElement;
+      formField = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
     });
 
     /**
@@ -1051,11 +1036,16 @@ describe('MdSelect', () => {
       const overlayTop = overlayPane.getBoundingClientRect().top;
       const options = overlayPane.querySelectorAll('md-option');
       const optionTop = options[index].getBoundingClientRect().top;
+      const triggerFontSize = parseInt(window.getComputedStyle(trigger)['font-size']);
+      const triggerLineHeightEm = 1.125;
+
+      // Extra trigger height beyond the font size caused by the fact that the line-height is
+      // greater than 1em.
+      const triggerExtraLineSpaceAbove = (1 - triggerLineHeightEm) * triggerFontSize / 2;
 
-      // The option text should align with the trigger text. Because each option is 18px
-      // larger in height than the trigger, the option needs to be adjusted up 9 pixels.
       expect(Math.floor(optionTop))
-          .toEqual(Math.floor(triggerTop - 9), `Expected trigger to align with option ${index}.`);
+          .toBe(Math.floor(triggerTop - triggerFontSize - triggerExtraLineSpaceAbove),
+              `Expected trigger to align with option ${index}.`);
 
       // For the animation to start at the option's center, its origin must be the distance
       // from the top of the overlay to the option top + half the option height (48/2 = 24).
@@ -1068,16 +1058,14 @@ describe('MdSelect', () => {
     }
 
     describe('ample space to open', () => {
-
       beforeEach(() => {
         // these styles are necessary because we are first testing the overlay's position
         // if there is room for it to open to its full extent in either direction.
-        select.style.position = 'fixed';
-        select.style.top = '285px';
-        select.style.left = '20px';
+        formField.style.position = 'fixed';
+        formField.style.top = '285px';
+        formField.style.left = '20px';
       });
 
-
       it('should align the first option with the trigger text if no option is selected', () => {
         trigger.click();
         fixture.detectChanges();
@@ -1145,7 +1133,7 @@ describe('MdSelect', () => {
         checkTriggerAlignedWithOption(7);
       });
 
-      it('should account for preceding label groups when aligning the option', () => {
+      it('should account for preceding label groups when aligning the option', async(() => {
         fixture.destroy();
 
         let groupFixture = TestBed.createComponent(SelectWithGroups);
@@ -1153,9 +1141,9 @@ describe('MdSelect', () => {
         trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
         select = groupFixture.debugElement.query(By.css('md-select')).nativeElement;
 
-        select.style.position = 'fixed';
-        select.style.top = '200px';
-        select.style.left = '100px';
+        formField.style.position = 'fixed';
+        formField.style.top = '200px';
+        formField.style.left = '100px';
 
         // Select an option in the third group, which has a couple of group labels before it.
         groupFixture.componentInstance.control.setValue('vulpix-7');
@@ -1166,29 +1154,59 @@ describe('MdSelect', () => {
 
         const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        // The selected option should be scrolled to the center of the panel.
-        // This will be its original offset from the scrollTop - half the panel height + half the
-        // option height. 10 (option index + 3 group labels before it) * 48 (option height) = 480px.
-        // 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
-        expect(Math.floor(scrollContainer.scrollTop))
-            .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
-
-        checkTriggerAlignedWithOption(7, groupFixture.componentInstance.select);
-      });
-
+        fixture.whenStable().then(() => {
+          // The selected option should be scrolled to the center of the panel.
+          // This will be its original offset from the scrollTop - half the panel height + half the
+          // option height. 10 (option index + 3 group labels before it) * 48 (option height) =
+          // 480px. 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
+          expect(Math.floor(scrollContainer.scrollTop))
+              .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
+
+          checkTriggerAlignedWithOption(7, groupFixture.componentInstance.select);
+        });
+      }));
     });
 
     describe('limited space to open vertically', () => {
-
       beforeEach(() => {
-        select.style.position = 'fixed';
-        select.style.left = '20px';
+        formField.style.position = 'fixed';
+        formField.style.left = '20px';
       });
 
-      it('should adjust position of centered option if there is little space above', () => {
-        // Push the select to a position with not quite enough space on the top to open
-        // with the option completely centered (needs 113px at least: 256/2 - 48/2 + 9)
-        select.style.top = '85px';
+      it('should adjust position of centered option if there is little space above', async(() => {
+        const selectMenuHeight = 256;
+        const selectMenuViewportPadding = 8;
+        const selectItemHeight = 48;
+        const selectedIndex = 4;
+        const fontSize = 16;
+        const lineHeightEm = 1.125;
+        const expectedExtraScroll = 5;
+
+        // Trigger element height.
+        const triggerHeight = fontSize * lineHeightEm;
+
+        // Ideal space above selected item in order to center it.
+        const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
+
+        // Actual space above selected item.
+        const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
+
+        // Ideal scroll position to center.
+        const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
+
+        // Top-most select-position that allows for perfect centering.
+        const topMostPositionForPerfectCentering =
+            idealSpaceAboveSelectedItem + selectMenuViewportPadding +
+            (selectItemHeight - triggerHeight) / 2;
+
+        // Position of select relative to top edge of md-form-field.
+        const formFieldTopSpace =
+            trigger.getBoundingClientRect().top - formField.getBoundingClientRect().top;
+
+        const formFieldTop =
+            topMostPositionForPerfectCentering - formFieldTopSpace - expectedExtraScroll;
+
+        formField.style.top = `${formFieldTop}px`;
 
         // Select an option in the middle of the list
         fixture.componentInstance.control.setValue('chips-4');
@@ -1199,42 +1217,81 @@ describe('MdSelect', () => {
 
         const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        // Scroll should adjust by the difference between the top space available (85px + 8px
-        // viewport padding = 77px) and the height of the panel above the option (113px).
-        // 113px - 93px = 20px difference + original scrollTop 88px = 108px
-        expect(scrollContainer.scrollTop)
-            .toEqual(108, `Expected panel to adjust scroll position to fit in viewport.`);
+        fixture.whenStable().then(() => {
+          expect(scrollContainer.scrollTop)
+              .toEqual(idealScrollTop + 5,
+                  `Expected panel to adjust scroll position to fit in viewport.`);
 
-        checkTriggerAlignedWithOption(4);
-      });
+          checkTriggerAlignedWithOption(4);
+        });
+      }));
+
+      it('should adjust position of centered option if there is little space below', async(() => {
+        const selectMenuHeight = 256;
+        const selectMenuViewportPadding = 8;
+        const selectItemHeight = 48;
+        const selectedIndex = 4;
+        const fontSize = 16;
+        const lineHeightEm = 1.125;
+        const expectedExtraScroll = 5;
+
+        // Trigger element height.
+        const triggerHeight = fontSize * lineHeightEm;
+
+        // Ideal space above selected item in order to center it.
+        const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
+
+        // Actual space above selected item.
+        const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
+
+        // Ideal scroll position to center.
+        const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
+
+        // Bottom-most select-position that allows for perfect centering.
+        const bottomMostPositionForPerfectCentering =
+            idealSpaceAboveSelectedItem + selectMenuViewportPadding +
+            (selectItemHeight - triggerHeight) / 2;
+
+        // Position of select relative to bottom edge of md-form-field:
+        const formFieldBottomSpace =
+            formField.getBoundingClientRect().bottom - trigger.getBoundingClientRect().bottom;
+
+        const formFieldBottom =
+            bottomMostPositionForPerfectCentering - formFieldBottomSpace - expectedExtraScroll;
 
-      it('should adjust position of centered option if there is little space below', () => {
         // Push the select to a position with not quite enough space on the bottom to open
         // with the option completely centered (needs 113px at least: 256/2 - 48/2 + 9)
-        select.style.bottom = '56px';
+        formField.style.bottom = `${formFieldBottom}px`;
 
         // Select an option in the middle of the list
         fixture.componentInstance.control.setValue('chips-4');
         fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          fixture.detectChanges();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+          trigger.click();
+          fixture.detectChanges();
 
-        // Scroll should adjust by the difference between the bottom space available
-        // (56px from the bottom of the screen - 8px padding = 48px)
-        // and the height of the panel below the option (113px).
-        // 113px - 48px = 75px difference. Original scrollTop 88px - 75px = 23px
-        expect(Math.ceil(scrollContainer.scrollTop))
-            .toEqual(23, `Expected panel to adjust scroll position to fit in viewport.`);
+          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        checkTriggerAlignedWithOption(4);
-      });
+          fixture.whenStable().then(() => {
+            // Scroll should adjust by the difference between the bottom space available
+            // (56px from the bottom of the screen - 8px padding = 48px)
+            // and the height of the panel below the option (113px).
+            // 113px - 48px = 75px difference. Original scrollTop 88px - 75px = 23px
+            expect(scrollContainer.scrollTop)
+                .toEqual(idealScrollTop - expectedExtraScroll,
+                    `Expected panel to adjust scroll position to fit in viewport.`);
+
+            checkTriggerAlignedWithOption(4);
+          });
+        });
+      }));
 
       it('should fall back to "above" positioning if scroll adjustment will not help', () => {
         // Push the select to a position with not enough space on the bottom to open
-        select.style.bottom = '56px';
+        formField.style.bottom = '56px';
         fixture.detectChanges();
 
         // Select an option that cannot be scrolled any farther upward
@@ -1262,7 +1319,7 @@ describe('MdSelect', () => {
 
       it('should fall back to "below" positioning if scroll adjustment will not help', () => {
         // Push the select to a position with not enough space on the top to open
-        select.style.top = '85px';
+        formField.style.top = '85px';
 
         // Select an option that cannot be scrolled any farther downward
         fixture.componentInstance.control.setValue('sushi-7');
@@ -1290,12 +1347,12 @@ describe('MdSelect', () => {
 
     describe('limited space to open horizontally', () => {
       beforeEach(() => {
-        select.style.position = 'absolute';
-        select.style.top = '200px';
+        formField.style.position = 'absolute';
+        formField.style.top = '200px';
       });
 
       it('should stay within the viewport when overflowing on the left in ltr', fakeAsync(() => {
-        select.style.left = '-100px';
+        formField.style.left = '-100px';
         trigger.click();
         tick(400);
         fixture.detectChanges();
@@ -1308,7 +1365,7 @@ describe('MdSelect', () => {
 
       it('should stay within the viewport when overflowing on the left in rtl', fakeAsync(() => {
         dir.value = 'rtl';
-        select.style.left = '-100px';
+        formField.style.left = '-100px';
         trigger.click();
         tick(400);
         fixture.detectChanges();
@@ -1320,7 +1377,7 @@ describe('MdSelect', () => {
       }));
 
       it('should stay within the viewport when overflowing on the right in ltr', fakeAsync(() => {
-        select.style.right = '-100px';
+        formField.style.right = '-100px';
         trigger.click();
         tick(400);
         fixture.detectChanges();
@@ -1335,7 +1392,7 @@ describe('MdSelect', () => {
 
       it('should stay within the viewport when overflowing on the right in rtl', fakeAsync(() => {
         dir.value = 'rtl';
-        select.style.right = '-100px';
+        formField.style.right = '-100px';
         trigger.click();
         tick(400);
         fixture.detectChanges();
@@ -1349,7 +1406,7 @@ describe('MdSelect', () => {
       }));
 
       it('should keep the position within the viewport on repeat openings', async(() => {
-        select.style.left = '-100px';
+        formField.style.left = '-100px';
         trigger.click();
         fixture.detectChanges();
 
@@ -1369,7 +1426,6 @@ describe('MdSelect', () => {
               `Expected select panel continue being inside the viewport.`);
         });
       }));
-
     });
 
     describe('when scrolled', () => {
@@ -1389,8 +1445,8 @@ describe('MdSelect', () => {
         setScrollTop(0);
 
         // Give the select enough horizontal space to open
-        select.style.marginLeft = '20px';
-        select.style.marginRight = '20px';
+        formField.style.marginLeft = '20px';
+        formField.style.marginRight = '20px';
       });
 
       it('should align the first option properly when scrolled', () => {
@@ -1493,14 +1549,12 @@ describe('MdSelect', () => {
         expect(Math.floor(overlayTop))
             .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
       });
-
     });
 
     describe('x-axis positioning', () => {
-
       beforeEach(() => {
-        select.style.position = 'fixed';
-        select.style.left = '30px';
+        formField.style.position = 'fixed';
+        formField.style.left = '30px';
       });
 
       it('should align the trigger and the selected option on the x-axis in ltr', fakeAsync(() => {
@@ -1544,11 +1598,12 @@ describe('MdSelect', () => {
       beforeEach(() => {
         multiFixture = TestBed.createComponent(MultiSelect);
         multiFixture.detectChanges();
+        formField = multiFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
         trigger = multiFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
         select = multiFixture.debugElement.query(By.css('md-select')).nativeElement;
 
-        select.style.position = 'fixed';
-        select.style.left = '60px';
+        formField.style.position = 'fixed';
+        formField.style.left = '60px';
       });
 
       it('should adjust for the checkbox in ltr', async(() => {
@@ -1560,9 +1615,9 @@ describe('MdSelect', () => {
           const firstOptionLeft =
               document.querySelector('.cdk-overlay-pane md-option')!.getBoundingClientRect().left;
 
-          // 48px accounts for the checkbox size, margin and the panel's padding.
+          // 44px accounts for the checkbox size, margin and the panel's padding.
           expect(Math.floor(firstOptionLeft))
-              .toEqual(Math.floor(triggerLeft - 48),
+              .toEqual(Math.floor(triggerLeft - 44),
                   `Expected trigger label to align along x-axis, accounting for the checkbox.`);
         });
       }));
@@ -1577,9 +1632,9 @@ describe('MdSelect', () => {
         const firstOptionRight =
             document.querySelector('.cdk-overlay-pane md-option')!.getBoundingClientRect().right;
 
-        // 48px accounts for the checkbox size, margin and the panel's padding.
+        // 44px accounts for the checkbox size, margin and the panel's padding.
         expect(Math.floor(firstOptionRight))
-            .toEqual(Math.floor(triggerRight + 48),
+            .toEqual(Math.floor(triggerRight + 44),
                 `Expected trigger label to align along x-axis, accounting for the checkbox.`);
       }));
     });
@@ -1590,11 +1645,12 @@ describe('MdSelect', () => {
       beforeEach(() => {
         groupFixture = TestBed.createComponent(SelectWithGroups);
         groupFixture.detectChanges();
+        formField = groupFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
         trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
         select = groupFixture.debugElement.query(By.css('md-select')).nativeElement;
 
-        select.style.position = 'fixed';
-        select.style.left = '60px';
+        formField.style.position = 'fixed';
+        formField.style.left = '60px';
       });
 
       it('should adjust for the group padding in ltr', fakeAsync(() => {
@@ -1648,26 +1704,42 @@ describe('MdSelect', () => {
           expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 16));
         }));
 
-      it('should align the first option to the trigger, if nothing is selected', fakeAsync(() => {
-        trigger.click();
-        groupFixture.detectChanges();
+      it('should align the first option to the trigger, if nothing is selected', async(() => {
+        // Push down the form field so there is space for the item to completely align.
+        formField.style.top = '100px';
 
-        const triggerTop = trigger.getBoundingClientRect().top;
+        const menuItemHeight = 48;
+        const triggerFontSize = 16;
+        const triggerLineHeightEm = 1.125;
+        const triggerHeight = triggerFontSize * triggerLineHeightEm;
 
-        const option = overlayContainerElement.querySelector('.cdk-overlay-pane md-option');
-        const optionTop = option ? option.getBoundingClientRect().top : 0;
+        trigger.click();
+        groupFixture.detectChanges();
 
-        // Since the option is 18px higher than the trigger, it needs to be adjusted by 9px.
-        expect(Math.floor(optionTop))
-            .toBe(Math.floor(triggerTop - 9), 'Expected trigger to align with the first option.');
+        fixture.whenStable().then(() => {
+          const triggerTop = trigger.getBoundingClientRect().top;
+
+          const option = overlayContainerElement.querySelector('.cdk-overlay-pane md-option');
+          const optionTop = option ? option.getBoundingClientRect().top : 0;
+
+          // There appears to be a small rounding error on IE, so we verify that the value is close,
+          // not exact.
+          let platform = new Platform();
+          if (platform.TRIDENT) {
+            let difference =
+                Math.abs(optionTop + (menuItemHeight - triggerHeight) / 2 - triggerTop);
+            expect(difference)
+                .toBeLessThan(0.1, 'Expected trigger to align with the first option.');
+          } else {
+            expect(optionTop + (menuItemHeight - triggerHeight) / 2)
+                .toBe(triggerTop, 'Expected trigger to align with the first option.');
+          }
+        });
       }));
-
     });
-
   });
 
   describe('accessibility', () => {
-
     describe('for select', () => {
       let fixture: ComponentFixture<BasicSelect>;
       let select: HTMLElement;
@@ -2124,13 +2196,10 @@ describe('MdSelect', () => {
         });
 
       }));
-
     });
-
   });
 
   describe('special cases', () => {
-
     it('should handle nesting in an ngIf', async(() => {
       const fixture = TestBed.createComponent(NgIfSelect);
       fixture.detectChanges();
@@ -2185,7 +2254,6 @@ describe('MdSelect', () => {
         expect(() => fixture.detectChanges()).not.toThrow();
       }));
 
-
     it('should not throw when the triggerValue is accessed when there is no selected value', () => {
       const fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
@@ -2229,25 +2297,26 @@ describe('MdSelect', () => {
 
   describe('floatPlaceholder option', () => {
     let fixture: ComponentFixture<FloatPlaceholderSelect>;
+    let formField: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(FloatPlaceholderSelect);
+      fixture.detectChanges();
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     });
 
     it('should be able to disable the floating placeholder', () => {
-      let placeholder = fixture.debugElement.query(By.css('.mat-select-placeholder')).nativeElement;
-
       fixture.componentInstance.floatPlaceholder = 'never';
       fixture.detectChanges();
 
-      expect(placeholder.style.opacity).toBe('1');
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState()).toBeFalsy();
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(false, 'Floating placeholder should be disabled');
 
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
-      expect(placeholder.style.opacity).toBe('0');
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState()).toBeFalsy();
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(false, 'Floating placeholder should be disabled');
     });
 
     it('should be able to always float the placeholder', () => {
@@ -2256,7 +2325,10 @@ describe('MdSelect', () => {
       fixture.componentInstance.floatPlaceholder = 'always';
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.select._getPlaceholderAnimationState()).toBe('floating-ltr');
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(true, 'Placeholder should be able to float');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(true, 'Placeholder should be floating');
     });
 
     it ('should default to global floating placeholder type', () => {
@@ -2265,6 +2337,7 @@ describe('MdSelect', () => {
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
         imports: [
+          MdFormFieldModule,
           MdSelectModule,
           ReactiveFormsModule,
           FormsModule,
@@ -2279,8 +2352,12 @@ describe('MdSelect', () => {
       fixture = TestBed.createComponent(FloatPlaceholderSelect);
       fixture.componentInstance.floatPlaceholder = null;
       fixture.detectChanges();
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
-      expect(fixture.componentInstance.select.floatPlaceholder).toBe('always');
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(true, 'Placeholder should be able to float');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(true, 'Placeholder should be floating');
     });
   });
 
@@ -2362,25 +2439,29 @@ describe('MdSelect', () => {
       expect(testInstance.control.value).toEqual([]);
     });
 
-    it('should update the label', () => {
+    it('should update the label', async(() => {
       trigger.click();
       fixture.detectChanges();
 
-      const options = overlayContainerElement.querySelectorAll('md-option') as
-          NodeListOf<HTMLElement>;
+      fixture.whenStable().then(() => {
+        const options = overlayContainerElement.querySelectorAll('md-option') as
+            NodeListOf<HTMLElement>;
 
-      options[0].click();
-      options[2].click();
-      options[5].click();
-      fixture.detectChanges();
+        options[0].click();
+        options[2].click();
+        options[5].click();
+        fixture.detectChanges();
 
-      expect(trigger.textContent).toContain('Steak, Tacos, Eggs');
+        expect(trigger.textContent).toContain('Steak, Tacos, Eggs');
 
-      options[2].click();
-      fixture.detectChanges();
+        options[2].click();
+        fixture.detectChanges();
 
-      expect(trigger.textContent).toContain('Steak, Eggs');
-    });
+        fixture.whenStable().then(() => {
+          expect(trigger.textContent).toContain('Steak, Eggs');
+        });
+      });
+    }));
 
     it('should be able to set the selected value by taking an array', () => {
       trigger.click();
@@ -2434,38 +2515,42 @@ describe('MdSelect', () => {
       expect(testInstance.select.panelOpen).toBe(true);
     });
 
-    it('should sort the selected options based on their order in the panel', () => {
+    it('should sort the selected options based on their order in the panel', async(() => {
       trigger.click();
       fixture.detectChanges();
 
-      const options = overlayContainerElement.querySelectorAll('md-option') as
-          NodeListOf<HTMLElement>;
+      fixture.whenStable().then(() => {
+        const options = overlayContainerElement.querySelectorAll('md-option') as
+            NodeListOf<HTMLElement>;
 
-      options[2].click();
-      options[0].click();
-      options[1].click();
-      fixture.detectChanges();
+        options[2].click();
+        options[0].click();
+        options[1].click();
+        fixture.detectChanges();
 
-      expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
-      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
-    });
+        expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
+        expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
+      });
+    }));
 
-    it('should sort the selected options in reverse in rtl', () => {
+    it('should sort the selected options in reverse in rtl', async(() => {
       dir.value = 'rtl';
       trigger.click();
       fixture.detectChanges();
 
-      const options = overlayContainerElement.querySelectorAll('md-option') as
-          NodeListOf<HTMLElement>;
+      fixture.whenStable().then(() => {
+        const options = overlayContainerElement.querySelectorAll('md-option') as
+            NodeListOf<HTMLElement>;
 
-      options[2].click();
-      options[0].click();
-      options[1].click();
-      fixture.detectChanges();
+        options[2].click();
+        options[0].click();
+        options[1].click();
+        fixture.detectChanges();
 
-      expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
-      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
-    });
+        expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
+        expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
+      });
+    }));
 
     it('should sort the values, that get set via the model, based on the panel order', () => {
       trigger.click();
@@ -2533,40 +2618,6 @@ describe('MdSelect', () => {
       selectElement = fixture.debugElement.query(By.css('.mat-select')).nativeElement;
     }));
 
-    it('should default to the primary theme', () => {
-      expect(fixture.componentInstance.select.color).toBe('primary');
-      expect(selectElement.classList).toContain('mat-primary');
-    });
-
-    it('should be able to override the theme', () => {
-      fixture.componentInstance.theme = 'accent';
-      fixture.detectChanges();
-
-      expect(fixture.componentInstance.select.color).toBe('accent');
-      expect(selectElement.classList).toContain('mat-accent');
-      expect(selectElement.classList).not.toContain('mat-primary');
-    });
-
-    it('should not be able to set a blank theme', () => {
-      fixture.componentInstance.theme = '';
-      fixture.detectChanges();
-
-      expect(fixture.componentInstance.select.color).toBe('primary');
-      expect(selectElement.classList).toContain('mat-primary');
-    });
-
-    it('should pass the theme to the panel', () => {
-      fixture.componentInstance.theme = 'warn';
-      fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
-      fixture.detectChanges();
-
-      const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
-
-      expect(fixture.componentInstance.select.color).toBe('warn');
-      expect(selectElement.classList).toContain('mat-warn');
-      expect(panel.classList).toContain('mat-warn');
-    });
-
     it('should allow the user to customize the label', () => {
       fixture.destroy();
 
@@ -2581,28 +2632,30 @@ describe('MdSelect', () => {
       expect(label.textContent).toContain('azziP',
           'Expected the displayed text to be "Pizza" in reverse.');
     });
-
   });
 
   describe('reset values', () => {
     let fixture: ComponentFixture<ResetValuesSelect>;
     let trigger: HTMLElement;
-    let placeholder: HTMLElement;
+    let formField: HTMLElement;
     let options: NodeListOf<HTMLElement>;
 
-    beforeEach(() => {
+    beforeEach(async(() => {
       fixture = TestBed.createComponent(ResetValuesSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      placeholder = fixture.debugElement.query(By.css('.mat-select-placeholder')).nativeElement;
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
       trigger.click();
       fixture.detectChanges();
-      options = overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
 
-      options[0].click();
-      fixture.detectChanges();
-    });
+      fixture.whenStable().then(() => {
+        options = overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+
+        options[0].click();
+        fixture.detectChanges();
+      });
+    }));
 
     it('should reset when an option with an undefined value is selected', () => {
       options[4].click();
@@ -2610,7 +2663,7 @@ describe('MdSelect', () => {
 
       expect(fixture.componentInstance.control.value).toBeUndefined();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(placeholder.classList).not.toContain('mat-floating-placeholder');
+      expect(formField.classList).not.toContain('mat-form-field-should-float');
       expect(trigger.textContent).not.toContain('Undefined');
     });
 
@@ -2620,7 +2673,7 @@ describe('MdSelect', () => {
 
       expect(fixture.componentInstance.control.value).toBeNull();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(placeholder.classList).not.toContain('mat-floating-placeholder');
+      expect(formField.classList).not.toContain('mat-form-field-should-float');
       expect(trigger.textContent).not.toContain('Null');
     });
 
@@ -2630,7 +2683,7 @@ describe('MdSelect', () => {
 
       expect(fixture.componentInstance.control.value).toBeUndefined();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(placeholder.classList).not.toContain('mat-floating-placeholder');
+      expect(formField.classList).not.toContain('mat-form-field-should-float');
       expect(trigger.textContent).not.toContain('None');
     });
 
@@ -2640,19 +2693,19 @@ describe('MdSelect', () => {
 
       expect(fixture.componentInstance.control.value).toBe(false);
       expect(fixture.componentInstance.select.selected).toBeTruthy();
-      expect(placeholder.classList).toContain('mat-floating-placeholder');
+      expect(formField.classList).toContain('mat-form-field-should-float');
       expect(trigger.textContent).toContain('Falsy');
     });
 
     it('should not consider the reset values as selected when resetting the form control', () => {
-      expect(placeholder.classList).toContain('mat-floating-placeholder');
+      expect(formField.classList).toContain('mat-form-field-should-float');
 
       fixture.componentInstance.control.reset();
       fixture.detectChanges();
 
       expect(fixture.componentInstance.control.value).toBeNull();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(placeholder.classList).not.toContain('mat-floating-placeholder');
+      expect(formField.classList).not.toContain('mat-formf-field-should-float');
       expect(trigger.textContent).not.toContain('Null');
       expect(trigger.textContent).not.toContain('Undefined');
     });
@@ -2727,7 +2780,6 @@ describe('MdSelect', () => {
       expect(select.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to true.');
     });
-
   });
 
   describe('compareWith behavior', () => {
@@ -2796,24 +2848,23 @@ describe('MdSelect', () => {
           fixture.detectChanges();
         }).toThrowError(wrappedErrorMessage(getMdSelectNonFunctionValueError()));
       });
-
     });
-
   });
-
 });
 
 @Component({
   selector: 'basic-select',
   template: `
     <div [style.height.px]="heightAbove"></div>
-    <md-select placeholder="Food" [formControl]="control" [required]="isRequired"
-      [tabIndex]="tabIndexOverride" [aria-label]="ariaLabel" [aria-labelledby]="ariaLabelledby"
-      [panelClass]="panelClass" [disableRipple]="disableRipple">
-      <md-option *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [formControl]="control" [required]="isRequired"
+        [tabIndex]="tabIndexOverride" [aria-label]="ariaLabel" [aria-labelledby]="ariaLabelledby"
+        [panelClass]="panelClass" [disableRipple]="disableRipple">
+        <md-option *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
     <div [style.height.px]="heightBelow"></div>
   `
 })
@@ -2845,9 +2896,11 @@ class BasicSelect {
 @Component({
   selector: 'ng-model-select',
   template: `
-    <md-select placeholder="Food" ngModel [disabled]="isDisabled">
-      <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" ngModel [disabled]="isDisabled">
+        <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class NgModelSelect {
@@ -2865,14 +2918,18 @@ class NgModelSelect {
 @Component({
   selector: 'many-selects',
   template: `
-    <md-select placeholder="First">
-      <md-option value="one">one</md-option>
-      <md-option value="two">two</md-option>
-    </md-select>
-    <md-select placeholder="Second">
-      <md-option value="three">three</md-option>
-      <md-option value="four">four</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="First">
+        <md-option value="one">one</md-option>
+        <md-option value="two">two</md-option>
+      </md-select>
+    </md-form-field>
+    <md-form-field>
+      <md-select placeholder="Second">
+        <md-option value="three">three</md-option>
+        <md-option value="four">four</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class ManySelects {}
@@ -2881,11 +2938,13 @@ class ManySelects {}
   selector: 'ng-if-select',
   template: `
     <div *ngIf="isShowing">
-      <md-select placeholder="Food I want to eat right now" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">
-          {{ food.viewValue }}
-        </md-option>
-      </md-select>
+      <md-form-field>
+        <md-select placeholder="Food I want to eat right now" [formControl]="control">
+          <md-option *ngFor="let food of foods" [value]="food.value">
+            {{ food.viewValue }}
+          </md-option>
+        </md-select>
+      </md-form-field>
     </div>
   `,
 })
@@ -2904,9 +2963,11 @@ class NgIfSelect {
 @Component({
   selector: 'select-with-change-event',
   template: `
-    <md-select (change)="changeListener($event)">
-      <md-option *ngFor="let food of foods" [value]="food">{{ food }}</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select (change)="changeListener($event)">
+        <md-option *ngFor="let food of foods" [value]="food">{{ food }}</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class SelectWithChangeEvent {
@@ -2927,11 +2988,13 @@ class SelectWithChangeEvent {
 @Component({
   selector: 'select-init-without-options',
   template: `
-    <md-select placeholder="Food I want to eat right now" [formControl]="control">
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food I want to eat right now" [formControl]="control">
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class SelectInitWithoutOptions {
@@ -2952,9 +3015,7 @@ class SelectInitWithoutOptions {
 
 @Component({
   selector: 'custom-select-accessor',
-  template: `
-    <md-select></md-select>
-  `,
+  template: `<md-form-field><md-select></md-select></md-form-field>`,
   providers: [{
     provide: NG_VALUE_ACCESSOR,
     useExisting: CustomSelectAccessor,
@@ -2971,10 +3032,7 @@ class CustomSelectAccessor implements ControlValueAccessor {
 
 @Component({
   selector: 'comp-with-custom-select',
-  template: `
-    <custom-select-accessor [formControl]="ctrl">
-    </custom-select-accessor>
-  `,
+  template: `<custom-select-accessor [formControl]="ctrl"></custom-select-accessor>`,
   providers: [{
     provide: NG_VALUE_ACCESSOR,
     useExisting: CustomSelectAccessor,
@@ -2989,7 +3047,9 @@ class CompWithCustomSelect {
 @Component({
   selector: 'select-infinite-loop',
   template: `
-    <md-select [(ngModel)]="value"></md-select>
+    <md-form-field>
+      <md-select [(ngModel)]="value"></md-select>
+    </md-form-field>
     <throws-error-on-init></throws-error-on-init>
   `
 })
@@ -3011,11 +3071,13 @@ export class ThrowsErrorOnInit implements OnInit {
   selector: 'basic-select-on-push',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <md-select placeholder="Food" [formControl]="control">
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [formControl]="control">
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectOnPush {
@@ -3031,11 +3093,13 @@ class BasicSelectOnPush {
   selector: 'basic-select-on-push-preselected',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <md-select placeholder="Food" [formControl]="control">
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [formControl]="control">
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectOnPushPreselected {
@@ -3050,12 +3114,13 @@ class BasicSelectOnPushPreselected {
 @Component({
   selector: 'floating-placeholder-select',
   template: `
-    <md-select placeholder="Food I want to eat right now" [formControl]="control"
-      [floatPlaceholder]="floatPlaceholder">
+    <md-form-field [floatPlaceholder]="floatPlaceholder">
+      <md-select placeholder="Food I want to eat right now" [formControl]="control">
         <md-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
         </md-option>
       </md-select>
+    </md-form-field>
     `,
 })
 class FloatPlaceholderSelect {
@@ -3073,9 +3138,11 @@ class FloatPlaceholderSelect {
 @Component({
   selector: 'multi-select',
   template: `
-    <md-select multiple placeholder="Food" [formControl]="control">
-      <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select multiple placeholder="Food" [formControl]="control">
+        <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class MultiSelect {
@@ -3097,16 +3164,16 @@ class MultiSelect {
 
 @Component({
   selector: 'select-with-plain-tabindex',
-  template: `
-    <md-select tabindex="5"></md-select>
-  `
+  template: `<md-form-field><md-select tabindex="5"></md-select></md-form-field>`
 })
 class SelectWithPlainTabindex { }
 
 @Component({
   selector: 'select-early-sibling-access',
   template: `
-    <md-select #select="mdSelect"></md-select>
+    <md-form-field>
+      <md-select #select="mdSelect"></md-select>
+    </md-form-field>
     <div *ngIf="select.selected"></div>
   `
 })
@@ -3115,9 +3182,11 @@ class SelectEarlyAccessSibling { }
 @Component({
   selector: 'basic-select-initially-hidden',
   template: `
-    <md-select [style.display]="isVisible ? 'block' : 'none'">
-      <md-option value="value">There are no other options</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select [style.display]="isVisible ? 'block' : 'none'">
+        <md-option value="value">There are no other options</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectInitiallyHidden {
@@ -3127,9 +3196,11 @@ class BasicSelectInitiallyHidden {
 @Component({
   selector: 'basic-select-no-placeholder',
   template: `
-    <md-select>
-      <md-option value="value">There are no other options</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select>
+        <md-option value="value">There are no other options</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectNoPlaceholder { }
@@ -3137,10 +3208,12 @@ class BasicSelectNoPlaceholder { }
 @Component({
   selector: 'basic-select-with-theming',
   template: `
-    <md-select placeholder="Food" [color]="theme">
-      <md-option value="steak-0">Steak</md-option>
-      <md-option value="pizza-1">Pizza</md-option>
-    </md-select>
+    <md-form-field [color]="theme">
+      <md-select placeholder="Food">
+        <md-option value="steak-0">Steak</md-option>
+        <md-option value="pizza-1">Pizza</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectWithTheming {
@@ -3152,13 +3225,14 @@ class BasicSelectWithTheming {
 @Component({
   selector: 'reset-values-select',
   template: `
-    <md-select placeholder="Food" [formControl]="control">
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-
-      <md-option>None</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [formControl]="control">
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+        <md-option>None</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class ResetValuesSelect {
@@ -3177,9 +3251,11 @@ class ResetValuesSelect {
 
 @Component({
   template: `
-    <md-select [formControl]="control">
-      <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select [formControl]="control">
+        <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class FalsyValueSelect {
@@ -3195,17 +3271,17 @@ class FalsyValueSelect {
 @Component({
   selector: 'select-with-groups',
   template: `
-    <md-select placeholder="Pokemon" [formControl]="control">
-      <md-optgroup *ngFor="let group of pokemonTypes" [label]="group.name"
-        [disabled]="group.disabled">
-
-        <md-option *ngFor="let pokemon of group.pokemon" [value]="pokemon.value">
-          {{ pokemon.viewValue }}
-        </md-option>
-      </md-optgroup>
-
-      <md-option value="mime-11">Mr. Mime</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Pokemon" [formControl]="control">
+        <md-optgroup *ngFor="let group of pokemonTypes" [label]="group.name"
+          [disabled]="group.disabled">
+          <md-option *ngFor="let pokemon of group.pokemon" [value]="pokemon.value">
+            {{ pokemon.viewValue }}
+          </md-option>
+        </md-optgroup>
+        <md-option value="mime-11">Mr. Mime</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class SelectWithGroups {
@@ -3251,7 +3327,13 @@ class SelectWithGroups {
 
 
 @Component({
-  template: `<form><md-select [(ngModel)]="value"></md-select></form>`
+  template: `
+    <form>
+      <md-form-field>
+        <md-select [(ngModel)]="value"></md-select>
+      </md-form-field>
+    </form>
+  `
 })
 class InvalidSelectInForm {
   value: any;
@@ -3261,10 +3343,12 @@ class InvalidSelectInForm {
 @Component({
   template: `
     <form [formGroup]="formGroup">
-      <md-select placeholder="Food" formControlName="food">
-        <md-option value="steak-0">Steak</md-option>
-        <md-option value="pizza-1">Pizza</md-option>
-      </md-select>
+      <md-form-field>
+        <md-select placeholder="Food" formControlName="food">
+          <md-option value="steak-0">Steak</md-option>
+          <md-option value="pizza-1">Pizza</md-option>
+        </md-select>
+      </md-form-field>
     </form>
   `
 })
@@ -3279,11 +3363,13 @@ class SelectInsideFormGroup {
 
 @Component({
   template: `
-    <md-select placeholder="Food" [(value)]="selectedFood">
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [(value)]="selectedFood">
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectWithoutForms {
@@ -3299,11 +3385,13 @@ class BasicSelectWithoutForms {
 
 @Component({
   template: `
-    <md-select placeholder="Food" [(value)]="selectedFood">
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [(value)]="selectedFood">
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectWithoutFormsPreselected {
@@ -3318,11 +3406,13 @@ class BasicSelectWithoutFormsPreselected {
 
 @Component({
   template: `
-    <md-select placeholder="Food" [(value)]="selectedFoods" multiple>
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [(value)]="selectedFoods" multiple>
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class BasicSelectWithoutFormsMultiple {
@@ -3340,14 +3430,16 @@ class BasicSelectWithoutFormsMultiple {
 @Component({
   selector: 'select-with-custom-trigger',
   template: `
-    <md-select placeholder="Food" [formControl]="control" #select="mdSelect">
-      <md-select-trigger>
-        {{ select.selected?.viewValue.split('').reverse().join('') }}
-      </md-select-trigger>
-      <md-option *ngFor="let food of foods" [value]="food.value">
-        {{ food.viewValue }}
-      </md-option>
-    </md-select>
+    <md-form-field>
+      <md-select placeholder="Food" [formControl]="control" #select="mdSelect">
+        <md-select-trigger>
+          {{ select.selected?.viewValue.split('').reverse().join('') }}
+        </md-select-trigger>
+        <md-option *ngFor="let food of foods" [value]="food.value">
+          {{ food.viewValue }}
+        </md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class SelectWithCustomTrigger {
@@ -3362,10 +3454,12 @@ class SelectWithCustomTrigger {
 @Component({
   selector: 'ng-model-compare-with',
   template: `
-    <md-select [ngModel]="selectedFood" (ngModelChange)="setFoodByCopy($event)"
-               [compareWith]="comparator">
-      <md-option *ngFor="let food of foods" [value]="food">{{ food.viewValue }}</md-option>
-    </md-select>
+    <md-form-field>
+      <md-select [ngModel]="selectedFood" (ngModelChange)="setFoodByCopy($event)"
+                 [compareWith]="comparator">
+        <md-option *ngFor="let food of foods" [value]="food">{{ food.viewValue }}</md-option>
+      </md-select>
+    </md-form-field>
   `
 })
 class NgModelCompareWithSelect {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8601e3066dcb..1b164472f319 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -18,8 +18,7 @@ import {
   ScrollStrategy,
   ViewportRuler,
 } from '@angular/cdk/overlay';
-import {Platform} from '@angular/cdk/platform';
-import {filter, startWith} from '@angular/cdk/rxjs';
+import {filter, first, startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   Attribute,
@@ -35,6 +34,7 @@ import {
   InjectionToken,
   Input,
   isDevMode,
+  NgZone,
   OnDestroy,
   OnInit,
   Optional,
@@ -47,76 +47,56 @@ import {
 } from '@angular/core';
 import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
 import {
-  CanColor,
   CanDisable,
-  FloatPlaceholderType,
   HasTabIndex,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS,
   MdOptgroup,
   MdOption,
   MdOptionSelectionChange,
-  mixinColor,
   mixinDisabled,
   mixinTabIndex,
-  PlaceholderOptions,
 } from '@angular/material/core';
+import {MdFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
+import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {fadeInContent, transformPanel, transformPlaceholder} from './select-animations';
+import {fadeInContent, transformPanel} from './select-animations';
 import {
   getMdSelectDynamicMultipleError,
   getMdSelectNonArrayValueError,
   getMdSelectNonFunctionValueError,
 } from './select-errors';
 
+
+let nextUniqueId = 0;
+
 /**
  * The following style constants are necessary to save here in order
  * to properly calculate the alignment of the selected option over
  * the trigger element.
  */
 
-/** The fixed height of every option element (option, group header etc.). */
-export const SELECT_ITEM_HEIGHT = 48;
-
 /** The max height of the select's overlay panel */
 export const SELECT_PANEL_MAX_HEIGHT = 256;
 
-/** The max number of options visible at once in the select panel. */
-export const SELECT_MAX_OPTIONS_DISPLAYED =
-    Math.floor(SELECT_PANEL_MAX_HEIGHT / SELECT_ITEM_HEIGHT);
-
-/** The fixed height of the select's trigger element. */
-export const SELECT_TRIGGER_HEIGHT = 30;
-
-/**
- * Must adjust for the difference in height between the option and the trigger,
- * so the text will align on the y axis.
- */
-export const SELECT_OPTION_HEIGHT_ADJUSTMENT = (SELECT_ITEM_HEIGHT - SELECT_TRIGGER_HEIGHT) / 2;
-
 /** The panel's padding on the x-axis */
 export const SELECT_PANEL_PADDING_X = 16;
 
 /** The panel's x axis padding if it is indented (e.g. there is an option group). */
 export const SELECT_PANEL_INDENT_PADDING_X = SELECT_PANEL_PADDING_X * 2;
 
+/** The height of the select items in `em` units. */
+export const SELECT_ITEM_HEIGHT_EM = 3;
+
 /**
  * Distance between the panel edge and the option text in
  * multi-selection mode.
  *
- * (SELECT_PADDING * 1.75) + 20 = 48
- * The padding is multiplied by 1.75 because the checkbox's margin is half the padding, and
- * the browser adds ~4px, because we're using inline elements.
+ * (SELECT_PANEL_PADDING_X * 1.5) + 20 = 44
+ * The padding is multiplied by 1.5 because the checkbox's margin is half the padding.
  * The checkbox width is 20px.
  */
-export const SELECT_MULTIPLE_PANEL_PADDING_X = SELECT_PANEL_PADDING_X * 1.75 + 20;
-
-/**
- * The panel's padding on the y-axis. This padding indicates there are more
- * options available if you scroll.
- */
-export const SELECT_PANEL_PADDING_Y = 16;
+export const SELECT_MULTIPLE_PANEL_PADDING_X = SELECT_PANEL_PADDING_X * 1.5 + 20;
 
 /**
  * The select panel will only "fit" inside the viewport if it is positioned at
@@ -124,13 +104,6 @@ export const SELECT_PANEL_PADDING_Y = 16;
  */
 export const SELECT_PANEL_VIEWPORT_PADDING = 8;
 
-/**
- * Default minimum width of the trigger based on the CSS.
- * Used as a fallback for server-side rendering.
- * @docs-private
- */
-const SELECT_TRIGGER_MIN_WIDTH = 112;
-
 /** Injection token that determines the scroll handling while a select is open. */
 export const MD_SELECT_SCROLL_STRATEGY =
     new InjectionToken<() => ScrollStrategy>('md-select-scroll-strategy');
@@ -158,8 +131,7 @@ export class MdSelectChange {
 export class MdSelectBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdSelectMixinBase =
-  mixinTabIndex(mixinColor(mixinDisabled(MdSelectBase), 'primary'));
+export const _MdSelectMixinBase = mixinTabIndex(mixinDisabled(MdSelectBase));
 
 
 /**
@@ -176,36 +148,39 @@ export class MdSelectTrigger {}
   selector: 'md-select, mat-select',
   templateUrl: 'select.html',
   styleUrls: ['select.css'],
-  inputs: ['color', 'disabled', 'tabIndex'],
+  inputs: ['disabled', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     'role': 'listbox',
+    '[attr.id]': 'id',
     '[attr.tabindex]': 'tabIndex',
     '[attr.aria-label]': '_ariaLabel',
     '[attr.aria-labelledby]': 'ariaLabelledby',
     '[attr.aria-required]': 'required.toString()',
     '[attr.aria-disabled]': 'disabled.toString()',
-    '[attr.aria-invalid]': '_isErrorState()',
+    '[attr.aria-invalid]': 'errorState',
     '[attr.aria-owns]': '_optionIds',
     '[attr.aria-multiselectable]': 'multiple',
+    '[attr.aria-describedby]': '_ariaDescribedby || null',
     '[class.mat-select-disabled]': 'disabled',
-    '[class.mat-select-invalid]': '_isErrorState()',
+    '[class.mat-select-invalid]': 'errorState',
     '[class.mat-select-required]': 'required',
     'class': 'mat-select',
     '(keydown)': '_handleClosedKeydown($event)',
+    '(focus)': '_onFocus()',
     '(blur)': '_onBlur()',
   },
   animations: [
-    transformPlaceholder,
     transformPanel,
     fadeInContent
   ],
+  providers: [{provide: MdFormFieldControl, useExisting: MdSelect}],
   exportAs: 'mdSelect, matSelect',
 })
 export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
-    ControlValueAccessor, CanColor, CanDisable, HasTabIndex {
+    ControlValueAccessor, CanDisable, HasTabIndex, MdFormFieldControl<any> {
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
@@ -233,30 +208,24 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   /** Comparison function to specify which option is displayed. Defaults to object equality. */
   private _compareWith = (o1: any, o2: any) => o1 === o2;
 
-  /** Deals with the selection logic. */
-  _selectionModel: SelectionModel<MdOption>;
+  /** Unique id for this input. */
+  private _uid = `mat-select-${nextUniqueId++}`;
 
-  /** The animation state of the placeholder. */
-  private _placeholderState = '';
+  /** The last measured value for the trigger's client bounding rect. */
+  _triggerRect: ClientRect;
 
-  /** Deals with configuring placeholder options */
-  private _placeholderOptions: PlaceholderOptions;
+  /** The aria-describedby attribute on the select for improved a11y. */
+  _ariaDescribedby: string;
 
-  /**
-   * The width of the trigger. Must be saved to set the min width of the overlay panel
-   * and the width of the selected value.
-   */
-  _triggerWidth: number;
+  /** The cached font-size of the trigger element. */
+  _triggerFontSize = 0;
+
+  /** Deals with the selection logic. */
+  _selectionModel: SelectionModel<MdOption>;
 
   /** Manages keyboard events for options in the panel. */
   _keyManager: FocusKeyManager<MdOption>;
 
-  /**
-   * The width of the selected option's value. Must be set programmatically
-   * to ensure its overflow is clipped, as it's absolutely positioned.
-   */
-  _selectedValueWidth: number;
-
   /** View -> model callback called when value changes */
   _onChange: (value: any) => void = () => {};
 
@@ -303,6 +272,18 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     },
   ];
 
+  /**
+   * Stream that emits whenever the state of the select changes such that the wrapping `MdFormField`
+   * needs to run change detection.
+   */
+  stateChanges = new Subject<void>();
+
+  /** Whether the select is focused. */
+  focused = false;
+
+  /** A name for this control that can be used by `md-form-field`. */
+  controlType = 'mat-select';
+
   /** Trigger that opens the select. */
   @ViewChild('trigger') trigger: ElementRef;
 
@@ -326,15 +307,16 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   get placeholder() { return this._placeholder; }
   set placeholder(value: string) {
     this._placeholder = value;
-
-    // Must wait to record the trigger width to ensure placeholder width is included.
-    Promise.resolve(null).then(() => this._setTriggerWidth());
+    this.stateChanges.next();
   }
 
   /** Whether the component is required. */
   @Input()
   get required() { return this._required; }
-  set required(value: any) { this._required = coerceBooleanProperty(value); }
+  set required(value: any) {
+    this._required = coerceBooleanProperty(value);
+    this.stateChanges.next();
+  }
 
   /** Whether the user should be allowed to select multiple options. */
   @Input()
@@ -365,14 +347,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     }
   }
 
-  /** Whether to float the placeholder text. */
-  @Input()
-  get floatPlaceholder(): FloatPlaceholderType { return this._floatPlaceholder; }
-  set floatPlaceholder(value: FloatPlaceholderType) {
-    this._floatPlaceholder = value || this._placeholderOptions.float || 'auto';
-  }
-  private _floatPlaceholder: FloatPlaceholderType;
-
   /** Value of the select control. */
   @Input()
   get value() { return this._value; }
@@ -397,6 +371,15 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   /** Input that can be used to specify the `aria-labelledby` attribute. */
   @Input('aria-labelledby') ariaLabelledby: string = '';
 
+  /** Unique id of the element. */
+  @Input()
+  get id() { return this._id; }
+  set id(value: string) {
+    this._id = value || this._uid;
+    this.stateChanges.next();
+  }
+  private _id: string;
+
   /** Combined stream of all of the child options' change events. */
   get optionSelectionChanges(): Observable<MdOptionSelectionChange> {
     return merge(...this.options.map(option => option.onSelectionChange));
@@ -421,30 +404,31 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   constructor(
     private _viewportRuler: ViewportRuler,
     private _changeDetectorRef: ChangeDetectorRef,
-    private _platform: Platform,
+    private _ngZone: NgZone,
     renderer: Renderer2,
     elementRef: ElementRef,
     @Optional() private _dir: Directionality,
     @Optional() private _parentForm: NgForm,
     @Optional() private _parentFormGroup: FormGroupDirective,
-    @Self() @Optional() public _control: NgControl,
+    @Self() @Optional() public ngControl: NgControl,
     @Attribute('tabindex') tabIndex: string,
-    @Optional() @Inject(MD_PLACEHOLDER_GLOBAL_OPTIONS) placeholderOptions: PlaceholderOptions,
     @Inject(MD_SELECT_SCROLL_STRATEGY) private _scrollStrategyFactory) {
 
     super(renderer, elementRef);
 
-    if (this._control) {
-      this._control.valueAccessor = this;
+    if (this.ngControl) {
+      this.ngControl.valueAccessor = this;
     }
 
     this.tabIndex = parseInt(tabIndex) || 0;
-    this._placeholderOptions = placeholderOptions ? placeholderOptions : {};
-    this.floatPlaceholder = this._placeholderOptions.float || 'auto';
+
+    // Force setter to be called in case id was not specified.
+    this.id = this.id;
   }
 
   ngOnInit() {
     this._selectionModel = new SelectionModel<MdOption>(this.multiple, undefined, false);
+    this.stateChanges.next();
   }
 
   ngAfterContentInit() {
@@ -473,25 +457,28 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
       return;
     }
 
-    if (!this._triggerWidth) {
-      this._setTriggerWidth();
-    }
+    this._triggerRect = this.trigger.nativeElement.getBoundingClientRect();
+    // Note: The computed font-size will be a string pixel value (e.g. "16px").
+    // `parseInt` ignores the trailing 'px' and converts this to a number.
+    this._triggerFontSize = parseInt(getComputedStyle(this.trigger.nativeElement)['font-size']);
 
     this._calculateOverlayPosition();
-    this._placeholderState = this._floatPlaceholderState();
     this._panelOpen = true;
     this._changeDetectorRef.markForCheck();
+
+    // Set the font size on the panel element once it exists.
+    first.call(this._ngZone.onStable).subscribe(() => {
+      if (this._triggerFontSize && this.overlayDir.overlayRef &&
+          this.overlayDir.overlayRef.overlayElement) {
+        this.overlayDir.overlayRef.overlayElement.style.fontSize = `${this._triggerFontSize}px`;
+      }
+    });
   }
 
   /** Closes the overlay panel and focuses the host element. */
   close(): void {
     if (this._panelOpen) {
       this._panelOpen = false;
-
-      if (this._selectionModel.isEmpty()) {
-        this._placeholderState = '';
-      }
-
       this._changeDetectorRef.markForCheck();
       this.focus();
     }
@@ -540,6 +527,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   setDisabledState(isDisabled: boolean): void {
     this.disabled = isDisabled;
     this._changeDetectorRef.markForCheck();
+    this.stateChanges.next();
   }
 
   /** Whether or not the overlay panel is open. */
@@ -577,17 +565,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     return this._dir ? this._dir.value === 'rtl' : false;
   }
 
-  /**
-   * Sets the width of the trigger element. This is necessary to match
-   * the overlay width to the trigger width.
-   */
-  private _setTriggerWidth(): void {
-    this._triggerWidth = this._platform.isBrowser ? this._getTriggerRect().width :
-        SELECT_TRIGGER_MIN_WIDTH;
-
-    this._changeDetectorRef.markForCheck();
-  }
-
   /** Handles the keyboard interactions of a closed select. */
   _handleClosedKeydown(event: KeyboardEvent): void {
     if (!this.disabled) {
@@ -636,14 +613,23 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     this._changeDetectorRef.markForCheck();
   }
 
+  _onFocus() {
+    if (!this.disabled) {
+      this.focused = true;
+      this.stateChanges.next();
+    }
+  }
+
   /**
    * Calls the touched callback only if the panel is closed. Otherwise, the trigger will
    * "blur" to the panel when it opens, causing a false positive.
    */
   _onBlur() {
     if (!this.disabled && !this.panelOpen) {
+      this.focused = false;
       this._onTouched();
       this._changeDetectorRef.markForCheck();
+      this.stateChanges.next();
     }
   }
 
@@ -656,14 +642,14 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   }
 
   /** Whether the select has a value. */
-  _hasValue(): boolean {
-    return this._selectionModel && this._selectionModel.hasValue();
+  get empty(): boolean {
+    return !this._selectionModel || this._selectionModel.isEmpty();
   }
 
   /** Whether the select is in an error state. */
-  _isErrorState(): boolean {
-    const isInvalid = this._control && this._control.invalid;
-    const isTouched = this._control && this._control.touched;
+  get errorState(): boolean {
+    const isInvalid = this.ngControl && this.ngControl.invalid;
+    const isTouched = this.ngControl && this.ngControl.touched;
     const isSubmitted = (this._parentFormGroup && this._parentFormGroup.submitted) ||
         (this._parentForm && this._parentForm.submitted);
 
@@ -685,7 +671,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     // Defer setting the value in order to avoid the "Expression
     // has changed after it was checked" errors from Angular.
     Promise.resolve().then(() => {
-      this._setSelectionByValue(this._control ? this._control.value : this._value);
+      this._setSelectionByValue(this.ngControl ? this.ngControl.value : this._value);
     });
   }
 
@@ -715,12 +701,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
       }
     }
 
-    this._setValueWidth();
-
-    if (this._selectionModel.isEmpty()) {
-      this._placeholderState = '';
-    }
-
     this._changeDetectorRef.markForCheck();
   }
 
@@ -745,6 +725,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     if (correspondingOption) {
       isUserInput ? correspondingOption._selectViaInteraction() : correspondingOption.select();
       this._selectionModel.select(correspondingOption);
+      this.stateChanges.next();
     }
 
     return correspondingOption;
@@ -762,10 +743,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
         option.deselect();
       }
     });
-  }
-
-  private _getTriggerRect(): ClientRect {
-    return this.trigger.nativeElement.getBoundingClientRect();
+    this.stateChanges.next();
   }
 
   /** Sets up a key manager to listen to keyboard events on the overlay panel. */
@@ -788,7 +766,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     this._optionSubscription = filter.call(this.optionSelectionChanges,
       event => event.isUserInput).subscribe(event => {
         this._onSelect(event.source);
-        this._setValueWidth();
 
         if (!this.multiple) {
           this.close();
@@ -803,6 +780,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     // TODO(crisbeto): handle blank/null options inside multi-select.
     if (this.multiple) {
       this._selectionModel.toggle(option);
+      this.stateChanges.next();
       wasSelected ? option.deselect() : option.select();
       this._sortValues();
     } else {
@@ -812,6 +790,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
         this._propagateChanges(option.value);
       } else {
         this._selectionModel.select(option);
+        this.stateChanges.next();
       }
     }
 
@@ -833,6 +812,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
           this._selectionModel.select(option);
         }
       });
+      this.stateChanges.next();
     }
   }
 
@@ -855,6 +835,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     this._onChange(valueToEmit);
     this.change.emit(new MdSelectChange(this, valueToEmit));
     this.valueChange.emit(valueToEmit);
+    this._changeDetectorRef.markForCheck();
   }
 
   /** Records option IDs to pass to the aria-owns property. */
@@ -880,15 +861,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
       this.options.forEach(option => option.disableRipple = this.disableRipple);
     }
   }
-  /**
-   * Must set the width of the selected option's value programmatically
-   * because it is absolutely positioned and otherwise will not clip
-   * overflow. The selection arrow is 9px wide, add 4px of padding = 13
-   */
-  private _setValueWidth() {
-    this._selectedValueWidth = this._triggerWidth - 13;
-    this._changeDetectorRef.markForCheck();
-  }
 
   /**
    * Focuses the selected item. If no option is selected, it will focus
@@ -916,34 +888,27 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   /** Calculates the scroll position and x- and y-offsets of the overlay panel. */
   private _calculateOverlayPosition(): void {
+    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+
     const items = this._getItemCount();
-    const panelHeight = Math.min(items * SELECT_ITEM_HEIGHT, SELECT_PANEL_MAX_HEIGHT);
-    const scrollContainerHeight = items * SELECT_ITEM_HEIGHT;
+    const panelHeight = Math.min(items * itemHeight, SELECT_PANEL_MAX_HEIGHT);
+    const scrollContainerHeight = items * itemHeight;
 
     // The farthest the panel can be scrolled before it hits the bottom
     const maxScroll = scrollContainerHeight - panelHeight;
 
-    if (this._hasValue()) {
-      let selectedOptionOffset = this._getOptionIndex(this._selectionModel.selected[0])!;
+    // If no value is selected we open the popup to the first item.
+    let selectedOptionOffset =
+        this.empty ? 0 : this._getOptionIndex(this._selectionModel.selected[0])!;
 
-      selectedOptionOffset += MdOption.countGroupLabelsBeforeOption(selectedOptionOffset,
-          this.options, this.optionGroups);
+    selectedOptionOffset += MdOption.countGroupLabelsBeforeOption(selectedOptionOffset,
+        this.options, this.optionGroups);
 
-      // We must maintain a scroll buffer so the selected option will be scrolled to the
-      // center of the overlay panel rather than the top.
-      const scrollBuffer = panelHeight / 2;
-      this._scrollTop = this._calculateOverlayScroll(selectedOptionOffset, scrollBuffer, maxScroll);
-      this._offsetY = this._calculateOverlayOffsetY(selectedOptionOffset, scrollBuffer, maxScroll);
-    } else {
-      // If no option is selected, the panel centers on the first option. In this case,
-      // we must only adjust for the height difference between the option element
-      // and the trigger element, then multiply it by -1 to ensure the panel moves
-      // in the correct direction up the page.
-      let groupLabels = MdOption.countGroupLabelsBeforeOption(0, this.options, this.optionGroups);
-
-      this._offsetY = (SELECT_ITEM_HEIGHT - SELECT_TRIGGER_HEIGHT) / 2 * -1 -
-          (groupLabels * SELECT_ITEM_HEIGHT);
-    }
+    // We must maintain a scroll buffer so the selected option will be scrolled to the
+    // center of the overlay panel rather than the top.
+    const scrollBuffer = panelHeight / 2;
+    this._scrollTop = this._calculateOverlayScroll(selectedOptionOffset, scrollBuffer, maxScroll);
+    this._offsetY = this._calculateOverlayOffsetY(selectedOptionOffset, scrollBuffer, maxScroll);
 
     this._checkOverlayWithinViewport(maxScroll);
   }
@@ -957,8 +922,9 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
    */
   _calculateOverlayScroll(selectedIndex: number, scrollBuffer: number,
                           maxScroll: number): number {
-    const optionOffsetFromScrollTop = SELECT_ITEM_HEIGHT * selectedIndex;
-    const halfOptionHeight = SELECT_ITEM_HEIGHT / 2;
+    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const optionOffsetFromScrollTop = itemHeight * selectedIndex;
+    const halfOptionHeight = itemHeight / 2;
 
     // Starts at the optionOffsetFromScrollTop, which scrolls the option to the top of the
     // scroll container, then subtracts the scroll buffer to scroll the option down to
@@ -968,28 +934,6 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     return clampValue(0, optimalScrollPosition, maxScroll);
   }
 
-  /**
-   * Figures out the appropriate animation state for the placeholder.
-   */
-  _getPlaceholderAnimationState(): string {
-    if (this.floatPlaceholder === 'never') {
-      return '';
-    }
-
-    if (this.floatPlaceholder === 'always') {
-      return this._floatPlaceholderState();
-    }
-
-    return this._placeholderState;
-  }
-
-  /**
-   * Determines the CSS `opacity` of the placeholder element.
-   */
-  _getPlaceholderOpacity(): string {
-    return (this.floatPlaceholder !== 'never' || this._selectionModel.isEmpty()) ? '1' : '0';
-  }
-
   /** Returns the aria-label of the select component. */
   get _ariaLabel(): string | null {
     // If an ariaLabelledby value has been set, the select should not overwrite the
@@ -1050,31 +994,38 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
    */
   private _calculateOverlayOffsetY(selectedIndex: number, scrollBuffer: number,
                                   maxScroll: number): number {
+    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const optionHeightAdjustment = (itemHeight - this._triggerRect.height) / 2;
+    const maxOptionsDisplayed = Math.floor(SELECT_PANEL_MAX_HEIGHT / itemHeight);
     let optionOffsetFromPanelTop: number;
 
     if (this._scrollTop === 0) {
-      optionOffsetFromPanelTop = selectedIndex * SELECT_ITEM_HEIGHT;
+      optionOffsetFromPanelTop = selectedIndex * itemHeight;
     } else if (this._scrollTop === maxScroll) {
-      const firstDisplayedIndex = this._getItemCount() - SELECT_MAX_OPTIONS_DISPLAYED;
+      const firstDisplayedIndex = this._getItemCount() - maxOptionsDisplayed;
       const selectedDisplayIndex = selectedIndex - firstDisplayedIndex;
 
+      // The first item is partially out of the viewport. Therefore we need to calculate what
+      // portion of it is shown in the viewport and account for it in our offset.
+      let partialItemHeight =
+          itemHeight - (this._getItemCount() * itemHeight - SELECT_PANEL_MAX_HEIGHT) % itemHeight;
+
       // Because the panel height is longer than the height of the options alone,
       // there is always extra padding at the top or bottom of the panel. When
       // scrolled to the very bottom, this padding is at the top of the panel and
       // must be added to the offset.
-      optionOffsetFromPanelTop =
-          selectedDisplayIndex * SELECT_ITEM_HEIGHT + SELECT_PANEL_PADDING_Y;
+      optionOffsetFromPanelTop = selectedDisplayIndex * itemHeight + partialItemHeight;
     } else {
       // If the option was scrolled to the middle of the panel using a scroll buffer,
       // its offset will be the scroll buffer minus the half height that was added to
       // center it.
-      optionOffsetFromPanelTop = scrollBuffer - SELECT_ITEM_HEIGHT / 2;
+      optionOffsetFromPanelTop = scrollBuffer - itemHeight / 2;
     }
 
     // The final offset is the option's offset from the top, adjusted for the height
     // difference, multiplied by -1 to ensure that the overlay moves in the correct
     // direction up the page.
-    return optionOffsetFromPanelTop * -1 - SELECT_OPTION_HEIGHT_ADJUSTMENT;
+    return optionOffsetFromPanelTop * -1 - optionHeightAdjustment;
   }
 
   /**
@@ -1084,17 +1035,17 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
    * sets the offset back to 0 to allow the fallback position to take over.
    */
   private _checkOverlayWithinViewport(maxScroll: number): void {
+    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
     const viewportRect = this._viewportRuler.getViewportRect();
-    const triggerRect = this._getTriggerRect();
 
-    const topSpaceAvailable = triggerRect.top - SELECT_PANEL_VIEWPORT_PADDING;
+    const topSpaceAvailable = this._triggerRect.top - SELECT_PANEL_VIEWPORT_PADDING;
     const bottomSpaceAvailable =
-        viewportRect.height - triggerRect.bottom - SELECT_PANEL_VIEWPORT_PADDING;
+        viewportRect.height - this._triggerRect.bottom - SELECT_PANEL_VIEWPORT_PADDING;
 
     const panelHeightTop = Math.abs(this._offsetY);
     const totalPanelHeight =
-        Math.min(this._getItemCount() * SELECT_ITEM_HEIGHT, SELECT_PANEL_MAX_HEIGHT);
-    const panelHeightBottom = totalPanelHeight - panelHeightTop - triggerRect.height;
+        Math.min(this._getItemCount() * itemHeight, SELECT_PANEL_MAX_HEIGHT);
+    const panelHeightBottom = totalPanelHeight - panelHeightTop - this._triggerRect.height;
 
     if (panelHeightBottom > bottomSpaceAvailable) {
       this._adjustPanelUp(panelHeightBottom, bottomSpaceAvailable);
@@ -1107,7 +1058,8 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   /** Adjusts the overlay panel up to fit in the viewport. */
   private _adjustPanelUp(panelHeightBottom: number, bottomSpaceAvailable: number) {
-    const distanceBelowViewport = panelHeightBottom - bottomSpaceAvailable;
+    // Browsers ignore fractional scroll offsets, so we need to round.
+    const distanceBelowViewport = Math.round(panelHeightBottom - bottomSpaceAvailable);
 
     // Scrolls the panel up by the distance it was extending past the boundary, then
     // adjusts the offset by that amount to move the panel up into the viewport.
@@ -1128,7 +1080,8 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   /** Adjusts the overlay panel down to fit in the viewport. */
   private _adjustPanelDown(panelHeightTop: number, topSpaceAvailable: number,
                            maxScroll: number) {
-    const distanceAboveViewport = panelHeightTop - topSpaceAvailable;
+    // Browsers ignore fractional scroll offsets, so we need to round.
+    const distanceAboveViewport = Math.round(panelHeightTop - topSpaceAvailable);
 
     // Scrolls the panel down by the distance it was extending past the boundary, then
     // adjusts the offset by that amount to move the panel down into the viewport.
@@ -1149,16 +1102,12 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   /** Sets the transform origin point based on the selected option. */
   private _getOriginBasedOnOption(): string {
-    const originY =
-        Math.abs(this._offsetY) - SELECT_OPTION_HEIGHT_ADJUSTMENT + SELECT_ITEM_HEIGHT / 2;
+    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const optionHeightAdjustment = (itemHeight - this._triggerRect.height) / 2;
+    const originY = Math.abs(this._offsetY) - optionHeightAdjustment + itemHeight / 2;
     return `50% ${originY}px 0px`;
   }
 
-  /** Figures out the floating placeholder state value. */
-  private _floatPlaceholderState(): string {
-    return this._isRtl() ? 'floating-rtl' : 'floating-ltr';
-  }
-
   /** Handles the user pressing the arrow keys on a closed select.  */
   private _handleArrowKey(event: KeyboardEvent): void {
     if (this._multiple) {
@@ -1187,6 +1136,18 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   private _getItemCount(): number {
     return this.options.length + this.optionGroups.length;
   }
+
+  // Implemented as part of MdFormFieldControl.
+  setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
+
+  // Implemented as part of MdFormFieldControl.
+  onContainerClick() {
+    this.focus();
+    this.open();
+  }
+
+  // Implemented as part of MdFormFieldControl.
+  get shouldPlaceholderFloat() { return this._panelOpen || !this.empty; }
 }
 
 /** Clamps a value n between min and max values. */
diff --git a/src/material-examples/select-form/select-form-example.html b/src/material-examples/select-form/select-form-example.html
index 6dea33cc5963..31252dd70a66 100644
--- a/src/material-examples/select-form/select-form-example.html
+++ b/src/material-examples/select-form/select-form-example.html
@@ -1,9 +1,11 @@
 <form>
-  <md-select placeholder="Favorite food" [(ngModel)]="selectedValue" name="food">
-    <md-option *ngFor="let food of foods" [value]="food.value">
-      {{food.viewValue}}
-    </md-option>
-  </md-select>
+  <md-form-field>
+    <md-select placeholder="Favorite food" [(ngModel)]="selectedValue" name="food">
+      <md-option *ngFor="let food of foods" [value]="food.value">
+        {{food.viewValue}}
+      </md-option>
+    </md-select>
+  </md-form-field>
 
   <p> Selected value: {{selectedValue}} </p>
 </form>
diff --git a/src/material-examples/select-overview/select-overview-example.html b/src/material-examples/select-overview/select-overview-example.html
index a4017ca5c242..bf3897383572 100644
--- a/src/material-examples/select-overview/select-overview-example.html
+++ b/src/material-examples/select-overview/select-overview-example.html
@@ -1,5 +1,7 @@
-<md-select placeholder="Favorite food">
-  <md-option *ngFor="let food of foods" [value]="food.value">
-    {{ food.viewValue }}
-  </md-option>
-</md-select>
+<md-form-field>
+  <md-select placeholder="Favorite food">
+    <md-option *ngFor="let food of foods" [value]="food.value">
+      {{ food.viewValue }}
+    </md-option>
+  </md-select>
+</md-form-field>
diff --git a/src/material-examples/tooltip-position/tooltip-position-example.html b/src/material-examples/tooltip-position/tooltip-position-example.html
index 156a5bf68492..2187a60c71f4 100644
--- a/src/material-examples/tooltip-position/tooltip-position-example.html
+++ b/src/material-examples/tooltip-position/tooltip-position-example.html
@@ -1,11 +1,13 @@
 <div class="example-tooltip-host" mdTooltip="Tooltip!" [mdTooltipPosition]="position">
   <span>Show tooltip</span>
-  <md-select class="example-select" [(ngModel)]="position">
-    <md-option value="before">Before</md-option>
-    <md-option value="after">After</md-option>
-    <md-option value="above">Above</md-option>
-    <md-option value="below">Below</md-option>
-    <md-option value="left">Left</md-option>
-    <md-option value="right">Right</md-option>
-  </md-select>
+  <md-form-field>
+    <md-select class="example-select" [(ngModel)]="position">
+      <md-option value="before">Before</md-option>
+      <md-option value="after">After</md-option>
+      <md-option value="above">Above</md-option>
+      <md-option value="below">Below</md-option>
+      <md-option value="left">Left</md-option>
+      <md-option value="right">Right</md-option>
+    </md-select>
+  </md-form-field>
 </div>
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 4509dc2142cd..988a6d2cb34d 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -159,11 +159,13 @@ <h3>Standalone radios</h3>
 <md-radio-button name="onions" disabled>Red</md-radio-button>
 
 <h2>Select</h2>
-<md-select value="ceramic">
-  <md-option value="glass">Glass</md-option>
-  <md-option value="ceramic">Ceramic</md-option>
-  <md-option value="steel">Steel</md-option>
-</md-select>
+<md-form-field>
+  <md-select value="ceramic">
+    <md-option value="glass">Glass</md-option>
+    <md-option value="ceramic">Ceramic</md-option>
+    <md-option value="steel">Steel</md-option>
+  </md-select>
+</md-form-field>
 
 <h2>Sidenav</h2>
 <md-sidenav-container>

From dbae36035dfe7bbfa5153bcc899b433d2d2ca374 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 21 Sep 2017 22:26:57 +0200
Subject: [PATCH 129/575] chore: linting and TS errors (#7235)

Fixes a few linting errors in master and a TS error.
---
 src/lib/chips/chip-input.ts                            |  2 +-
 src/lib/chips/chip-list.ts                             |  2 +-
 src/lib/chips/chip.ts                                  | 10 +++++++---
 .../chips-input/chips-input-example.ts                 |  3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 716d4d710b32..c4c61ae2856f 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -8,7 +8,7 @@
 
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ENTER} from '@angular/cdk/keycodes';
-import {Directive, ElementRef, EventEmitter, Input, Output,} from '@angular/core';
+import {Directive, ElementRef, EventEmitter, Input, Output} from '@angular/core';
 import {MdChipList} from './chip-list';
 
 
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 487dceacdf3c..5555824873d6 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -10,7 +10,7 @@ import {FocusKeyManager} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
-import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW,} from '@angular/cdk/keycodes';
+import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW} from '@angular/cdk/keycodes';
 import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 003e1b9807a1..5b2690816e30 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -110,14 +110,17 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       ? this._value
       : this._elementRef.nativeElement.textContent;
   }
-  set value(newValue: any) { this._value = newValue;}
+  set value(newValue: any) {
+    this._value = newValue;
+  }
 
   /**
    * Whether or not the chips are selectable. When a chip is not selectable,
    * changes to it's selected state are always ignored.
    */
   @Input() get selectable(): boolean {
-    return this._selectable;}
+    return this._selectable;
+  }
 
 
   set selectable(value: boolean) {
@@ -128,7 +131,8 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
    * Determines whether or not the chip displays the remove styling and emits (remove) events.
    */
   @Input() get removable(): boolean {
-    return this._removable;}
+    return this._removable;
+  }
 
 
   set removable(value: boolean) {
diff --git a/src/material-examples/chips-input/chips-input-example.ts b/src/material-examples/chips-input/chips-input-example.ts
index 0e96d0862e05..89adf943c181 100644
--- a/src/material-examples/chips-input/chips-input-example.ts
+++ b/src/material-examples/chips-input/chips-input-example.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {MdChipInputEvent, ENTER} from '@angular/material';
+import {MdChipInputEvent} from '@angular/material';
+import {ENTER} from '@angular/cdk/keycodes';
 
 const COMMA = 188;
 

From 61579bc42bdbc4d8dd4950114cb66cf9d1585f5c Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Thu, 21 Sep 2017 13:47:09 -0700
Subject: [PATCH 130/575] feat(sidenav): Add support for fixed sidenavs (#6712)

---
 src/demo-app/demo-app/demo-app.ts       |  21 ++--
 src/demo-app/demo-app/demo-module.ts    |  99 ++++++++--------
 src/demo-app/demo-app/routes.ts         |  99 ++++++++--------
 src/demo-app/drawer/drawer-demo.html    |  87 ++++++++++++++
 src/demo-app/drawer/drawer-demo.scss    |   7 ++
 src/demo-app/drawer/drawer-demo.ts      |  14 +++
 src/demo-app/sidenav/sidenav-demo.html  | 147 ++++++++++--------------
 src/demo-app/sidenav/sidenav-demo.scss  |  28 +++--
 src/demo-app/sidenav/sidenav-demo.ts    |  12 +-
 src/lib/sidenav/drawer-container.html   |   8 +-
 src/lib/sidenav/drawer-transitions.scss |   2 +-
 src/lib/sidenav/drawer.html             |   1 -
 src/lib/sidenav/drawer.scss             |  25 ++--
 src/lib/sidenav/drawer.spec.ts          |   2 +
 src/lib/sidenav/drawer.ts               | 129 ++++++++++++++++-----
 src/lib/sidenav/sidenav-container.html  |  10 ++
 src/lib/sidenav/sidenav-module.ts       |  27 ++++-
 src/lib/sidenav/sidenav.spec.ts         |  67 +++++++++++
 src/lib/sidenav/sidenav.ts              |  68 +++++++++--
 19 files changed, 592 insertions(+), 261 deletions(-)
 create mode 100644 src/demo-app/drawer/drawer-demo.html
 create mode 100644 src/demo-app/drawer/drawer-demo.scss
 create mode 100644 src/demo-app/drawer/drawer-demo.ts
 delete mode 100644 src/lib/sidenav/drawer.html
 create mode 100644 src/lib/sidenav/sidenav-container.html
 create mode 100644 src/lib/sidenav/sidenav.spec.ts

diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 26d96a4ee0e0..f1f9fa5cd178 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -1,10 +1,5 @@
-import {
-  Component,
-  ViewEncapsulation,
-  ElementRef,
-  Renderer2,
-} from '@angular/core';
 import {OverlayContainer} from '@angular/cdk/overlay';
+import {Component, ElementRef, Renderer2, ViewEncapsulation} from '@angular/core';
 
 /**
  * The entry app for demo site. Routes under `accessibility` will use AccessibilityDemo component,
@@ -48,22 +43,25 @@ export class DemoApp {
   dark = false;
   navItems = [
     {name: 'Autocomplete', route: '/autocomplete'},
-    {name: 'Button', route: '/button'},
     {name: 'Button Toggle', route: '/button-toggle'},
+    {name: 'Button', route: '/button'},
     {name: 'Card', route: '/card'},
-    {name: 'Chips', route: '/chips'},
     {name: 'Checkbox', route: '/checkbox'},
+    {name: 'Chips', route: '/chips'},
     {name: 'Datepicker', route: '/datepicker'},
     {name: 'Dialog', route: '/dialog'},
+    {name: 'Drawer', route: '/drawer'},
     {name: 'Expansion Panel', route: '/expansion'},
+    {name: 'Focus Origin', route: '/focus-origin'},
     {name: 'Gestures', route: '/gestures'},
     {name: 'Grid List', route: '/grid-list'},
     {name: 'Icon', route: '/icon'},
     {name: 'Input', route: '/input'},
     {name: 'List', route: '/list'},
-    {name: 'Menu', route: '/menu'},
     {name: 'Live Announcer', route: '/live-announcer'},
+    {name: 'Menu', route: '/menu'},
     {name: 'Overlay', route: '/overlay'},
+    {name: 'Platform', route: '/platform'},
     {name: 'Portal', route: '/portal'},
     {name: 'Progress Bar', route: '/progress-bar'},
     {name: 'Progress Spinner', route: '/progress-spinner'},
@@ -71,16 +69,15 @@ export class DemoApp {
     {name: 'Ripple', route: '/ripple'},
     {name: 'Select', route: '/select'},
     {name: 'Sidenav', route: '/sidenav'},
-    {name: 'Slider', route: '/slider'},
     {name: 'Slide Toggle', route: '/slide-toggle'},
+    {name: 'Slider', route: '/slider'},
     {name: 'Snack Bar', route: '/snack-bar'},
     {name: 'Stepper', route: '/stepper'},
+    {name: 'Style', route: '/style'},
     {name: 'Table', route: '/table'},
     {name: 'Tabs', route: '/tabs'},
     {name: 'Toolbar', route: '/toolbar'},
     {name: 'Tooltip', route: '/tooltip'},
-    {name: 'Platform', route: '/platform'},
-    {name: 'Focus Origin', route: '/focus-origin'},
     {name: 'Typography', route: '/typography'}
   ];
 
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index 59a632277ee1..80e21dbe5c26 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -1,52 +1,50 @@
-import {NgModule} from '@angular/core';
+import {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
 import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
-import {DemoApp, Home} from './demo-app';
-import {DEMO_APP_ROUTES} from './routes';
-import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
-import {ContentElementDialog, DialogDemo, IFrameDialog, JazzDialog} from '../dialog/dialog-demo';
-import {RippleDemo} from '../ripple/ripple-demo';
-import {IconDemo} from '../icon/icon-demo';
-import {GesturesDemo} from '../gestures/gestures-demo';
+import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
+import {BaselineDemo} from '../baseline/baseline-demo';
+import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
+import {ButtonDemo} from '../button/button-demo';
 import {CardDemo} from '../card/card-demo';
+import {CheckboxDemo, MdCheckboxDemoNestedChecklist} from '../checkbox/checkbox-demo';
 import {ChipsDemo} from '../chips/chips-demo';
-import {RadioDemo} from '../radio/radio-demo';
-import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
-import {ProgressSpinnerDemo} from '../progress-spinner/progress-spinner-demo';
-import {TooltipDemo} from '../tooltip/tooltip-demo';
-import {ListDemo} from '../list/list-demo';
-import {BaselineDemo} from '../baseline/baseline-demo';
+import {DatepickerDemo} from '../datepicker/datepicker-demo';
+import {DemoMaterialModule} from '../demo-material-module';
+import {ContentElementDialog, DialogDemo, IFrameDialog, JazzDialog} from '../dialog/dialog-demo';
+import {DrawerDemo} from '../drawer/drawer-demo';
+import {ExpansionDemo} from '../expansion/expansion-demo';
+import {FocusOriginDemo} from '../focus-origin/focus-origin-demo';
+import {GesturesDemo} from '../gestures/gestures-demo';
 import {GridListDemo} from '../grid-list/grid-list-demo';
+import {IconDemo} from '../icon/icon-demo';
+import {InputDemo} from '../input/input-demo';
+import {ListDemo} from '../list/list-demo';
 import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
+import {MenuDemo} from '../menu/menu-demo';
 import {OverlayDemo, RotiniPanel, SpagettiPanel} from '../overlay/overlay-demo';
-import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo';
-import {ToolbarDemo} from '../toolbar/toolbar-demo';
-import {ButtonDemo} from '../button/button-demo';
-import {CheckboxDemo, MdCheckboxDemoNestedChecklist} from '../checkbox/checkbox-demo';
+import {PlatformDemo} from '../platform/platform-demo';
+import {PortalDemo, ScienceJoke} from '../portal/portal-demo';
+import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
+import {ProgressSpinnerDemo} from '../progress-spinner/progress-spinner-demo';
+import {RadioDemo} from '../radio/radio-demo';
+import {RippleDemo} from '../ripple/ripple-demo';
 import {SelectDemo} from '../select/select-demo';
-import {SliderDemo} from '../slider/slider-demo';
 import {SidenavDemo} from '../sidenav/sidenav-demo';
+import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo';
+import {SliderDemo} from '../slider/slider-demo';
 import {SnackBarDemo} from '../snack-bar/snack-bar-demo';
-import {PortalDemo, ScienceJoke} from '../portal/portal-demo';
-import {MenuDemo} from '../menu/menu-demo';
-import {FoggyTabContent, RainyTabContent, SunnyTabContent, TabsDemo} from '../tabs/tabs-demo';
-import {PlatformDemo} from '../platform/platform-demo';
-import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
-import {InputDemo} from '../input/input-demo';
-import {FocusOriginDemo} from '../focus-origin/focus-origin-demo';
-import {TableDemo} from '../table/table-demo';
-import {PeopleDatabase} from '../table/people-database';
-import {DatepickerDemo} from '../datepicker/datepicker-demo';
-import {TypographyDemo} from '../typography/typography-demo';
-import {ExpansionDemo} from '../expansion/expansion-demo';
 import {StepperDemo} from '../stepper/stepper-demo';
-import {DemoMaterialModule} from '../demo-material-module';
-import {
-  FullscreenOverlayContainer,
-  OverlayContainer,
-} from '@angular/cdk/overlay';
+import {PeopleDatabase} from '../table/people-database';
+import {TableDemo} from '../table/table-demo';
 import {TableHeaderDemo} from '../table/table-header-demo';
+import {FoggyTabContent, RainyTabContent, SunnyTabContent, TabsDemo} from '../tabs/tabs-demo';
+import {ToolbarDemo} from '../toolbar/toolbar-demo';
+import {TooltipDemo} from '../tooltip/tooltip-demo';
+import {TypographyDemo} from '../typography/typography-demo';
+import {DemoApp, Home} from './demo-app';
+import {DEMO_APP_ROUTES} from './routes';
 
 @NgModule({
   imports: [
@@ -62,29 +60,34 @@ import {TableHeaderDemo} from '../table/table-header-demo';
     ButtonDemo,
     ButtonToggleDemo,
     CardDemo,
-    ChipsDemo,
     CheckboxDemo,
+    ChipsDemo,
+    ContentElementDialog,
     DatepickerDemo,
     DemoApp,
     DialogDemo,
+    DrawerDemo,
+    ExpansionDemo,
+    FocusOriginDemo,
+    FoggyTabContent,
     GesturesDemo,
     GridListDemo,
     Home,
     IconDemo,
+    IFrameDialog,
     InputDemo,
     JazzDialog,
-    ContentElementDialog,
-    IFrameDialog,
     ListDemo,
     LiveAnnouncerDemo,
     MdCheckboxDemoNestedChecklist,
     MenuDemo,
-    SnackBarDemo,
     OverlayDemo,
+    PlatformDemo,
     PortalDemo,
     ProgressBarDemo,
     ProgressSpinnerDemo,
     RadioDemo,
+    RainyTabContent,
     RippleDemo,
     RotiniPanel,
     ScienceJoke,
@@ -92,30 +95,26 @@ import {TableHeaderDemo} from '../table/table-header-demo';
     SidenavDemo,
     SliderDemo,
     SlideToggleDemo,
+    SnackBarDemo,
     SpagettiPanel,
     StepperDemo,
-    FocusOriginDemo,
+    SunnyTabContent,
+    TableDemo,
     TableHeaderDemo,
+    TabsDemo,
     ToolbarDemo,
     TooltipDemo,
-    TableDemo,
-    TabsDemo,
-    SunnyTabContent,
-    RainyTabContent,
-    FoggyTabContent,
-    PlatformDemo,
     TypographyDemo,
-    ExpansionDemo,
   ],
   providers: [
     {provide: OverlayContainer, useClass: FullscreenOverlayContainer},
     PeopleDatabase
   ],
   entryComponents: [
-    DemoApp,
-    JazzDialog,
     ContentElementDialog,
+    DemoApp,
     IFrameDialog,
+    JazzDialog,
     RotiniPanel,
     ScienceJoke,
     SpagettiPanel,
diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts
index 7ee134565fdb..cebe53bdb29e 100644
--- a/src/demo-app/demo-app/routes.ts
+++ b/src/demo-app/demo-app/routes.ts
@@ -1,85 +1,86 @@
 import {Routes} from '@angular/router';
-import {Home} from './demo-app';
-import {ButtonDemo} from '../button/button-demo';
+import {AccessibilityDemo} from '../a11y/a11y';
+import {ACCESSIBILITY_DEMO_ROUTES} from '../a11y/routes';
+import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
 import {BaselineDemo} from '../baseline/baseline-demo';
 import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
-import {TabsDemo} from '../tabs/tabs-demo';
-import {GridListDemo} from '../grid-list/grid-list-demo';
+import {ButtonDemo} from '../button/button-demo';
+import {CardDemo} from '../card/card-demo';
+import {CheckboxDemo} from '../checkbox/checkbox-demo';
+import {ChipsDemo} from '../chips/chips-demo';
+import {DatepickerDemo} from '../datepicker/datepicker-demo';
+import {DialogDemo} from '../dialog/dialog-demo';
+import {DrawerDemo} from '../drawer/drawer-demo';
+import {ExpansionDemo} from '../expansion/expansion-demo';
+import {FocusOriginDemo} from '../focus-origin/focus-origin-demo';
 import {GesturesDemo} from '../gestures/gestures-demo';
-import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
-import {ListDemo} from '../list/list-demo';
+import {GridListDemo} from '../grid-list/grid-list-demo';
 import {IconDemo} from '../icon/icon-demo';
-import {ToolbarDemo} from '../toolbar/toolbar-demo';
-import {CheckboxDemo} from '../checkbox/checkbox-demo';
+import {InputDemo} from '../input/input-demo';
+import {ListDemo} from '../list/list-demo';
+import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
+import {MenuDemo} from '../menu/menu-demo';
 import {OverlayDemo} from '../overlay/overlay-demo';
+import {PlatformDemo} from '../platform/platform-demo';
 import {PortalDemo} from '../portal/portal-demo';
 import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
 import {ProgressSpinnerDemo} from '../progress-spinner/progress-spinner-demo';
+import {RadioDemo} from '../radio/radio-demo';
+import {RippleDemo} from '../ripple/ripple-demo';
 import {SelectDemo} from '../select/select-demo';
 import {SidenavDemo} from '../sidenav/sidenav-demo';
 import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo';
 import {SliderDemo} from '../slider/slider-demo';
-import {RadioDemo} from '../radio/radio-demo';
-import {CardDemo} from '../card/card-demo';
-import {ChipsDemo} from '../chips/chips-demo';
-import {MenuDemo} from '../menu/menu-demo';
-import {RippleDemo} from '../ripple/ripple-demo';
-import {DialogDemo} from '../dialog/dialog-demo';
-import {TooltipDemo} from '../tooltip/tooltip-demo';
 import {SnackBarDemo} from '../snack-bar/snack-bar-demo';
-import {TABS_DEMO_ROUTES} from '../tabs/routes';
-import {PlatformDemo} from '../platform/platform-demo';
-import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
-import {InputDemo} from '../input/input-demo';
-import {FocusOriginDemo} from '../focus-origin/focus-origin-demo';
-import {DatepickerDemo} from '../datepicker/datepicker-demo';
+import {StepperDemo} from '../stepper/stepper-demo';
 import {TableDemo} from '../table/table-demo';
+import {TABS_DEMO_ROUTES} from '../tabs/routes';
+import {TabsDemo} from '../tabs/tabs-demo';
+import {ToolbarDemo} from '../toolbar/toolbar-demo';
+import {TooltipDemo} from '../tooltip/tooltip-demo';
 import {TypographyDemo} from '../typography/typography-demo';
-import {ExpansionDemo} from '../expansion/expansion-demo';
-import {StepperDemo} from '../stepper/stepper-demo';
-import {DemoApp} from './demo-app';
-import {AccessibilityDemo} from '../a11y/a11y';
-import {ACCESSIBILITY_DEMO_ROUTES} from '../a11y/routes';
+import {DemoApp, Home} from './demo-app';
 
 export const DEMO_APP_ROUTES: Routes = [
   {path: '', component: DemoApp, children: [
     {path: '', component: Home},
     {path: 'autocomplete', component: AutocompleteDemo},
+    {path: 'baseline', component: BaselineDemo},
     {path: 'button', component: ButtonDemo},
+    {path: 'button-toggle', component: ButtonToggleDemo},
     {path: 'card', component: CardDemo},
+    {path: 'checkbox', component: CheckboxDemo},
     {path: 'chips', component: ChipsDemo},
-    {path: 'table', component: TableDemo},
     {path: 'datepicker', component: DatepickerDemo},
+    {path: 'dialog', component: DialogDemo},
+    {path: 'drawer', component: DrawerDemo},
+    {path: 'expansion', component: ExpansionDemo},
+    {path: 'focus-origin', component: FocusOriginDemo},
+    {path: 'gestures', component: GesturesDemo},
+    {path: 'grid-list', component: GridListDemo},
+    {path: 'icon', component: IconDemo},
+    {path: 'input', component: InputDemo},
+    {path: 'list', component: ListDemo},
+    {path: 'live-announcer', component: LiveAnnouncerDemo},
+    {path: 'menu', component: MenuDemo},
+    {path: 'overlay', component: OverlayDemo},
+    {path: 'platform', component: PlatformDemo},
+    {path: 'portal', component: PortalDemo},
+    {path: 'progress-bar', component: ProgressBarDemo},
+    {path: 'progress-spinner', component: ProgressSpinnerDemo},
     {path: 'radio', component: RadioDemo},
+    {path: 'ripple', component: RippleDemo},
     {path: 'select', component: SelectDemo},
     {path: 'sidenav', component: SidenavDemo},
     {path: 'slide-toggle', component: SlideToggleDemo},
     {path: 'slider', component: SliderDemo},
-    {path: 'progress-spinner', component: ProgressSpinnerDemo},
-    {path: 'progress-bar', component: ProgressBarDemo},
-    {path: 'portal', component: PortalDemo},
-    {path: 'overlay', component: OverlayDemo},
-    {path: 'checkbox', component: CheckboxDemo},
-    {path: 'input', component: InputDemo},
-    {path: 'toolbar', component: ToolbarDemo},
-    {path: 'icon', component: IconDemo},
-    {path: 'list', component: ListDemo},
-    {path: 'menu', component: MenuDemo},
-    {path: 'live-announcer', component: LiveAnnouncerDemo},
-    {path: 'gestures', component: GesturesDemo},
-    {path: 'grid-list', component: GridListDemo},
+    {path: 'snack-bar', component: SnackBarDemo},
+    {path: 'stepper', component: StepperDemo},
+    {path: 'table', component: TableDemo},
     {path: 'tabs', component: TabsDemo, children: TABS_DEMO_ROUTES},
-    {path: 'button-toggle', component: ButtonToggleDemo},
-    {path: 'baseline', component: BaselineDemo},
-    {path: 'ripple', component: RippleDemo},
-    {path: 'dialog', component: DialogDemo},
+    {path: 'toolbar', component: ToolbarDemo},
     {path: 'tooltip', component: TooltipDemo},
-    {path: 'snack-bar', component: SnackBarDemo},
-    {path: 'platform', component: PlatformDemo},
-    {path: 'focus-origin', component: FocusOriginDemo},
     {path: 'typography', component: TypographyDemo},
-    {path: 'expansion', component: ExpansionDemo},
-    {path: 'stepper', component: StepperDemo}
   ]}
 ];
 
diff --git a/src/demo-app/drawer/drawer-demo.html b/src/demo-app/drawer/drawer-demo.html
new file mode 100644
index 000000000000..3a2dddc4d1d2
--- /dev/null
+++ b/src/demo-app/drawer/drawer-demo.html
@@ -0,0 +1,87 @@
+<h2>Basic Use Case</h2>
+
+<md-drawer-container class="demo-drawer-container">
+  <md-drawer #start (open)="myinput.focus()" mode="side">
+    Start Side Drawer
+    <br>
+    <button md-button (click)="start.close()">Close</button>
+    <br>
+    <button md-button (click)="end.open()">Open End Side</button>
+    <br>
+    <button md-button
+            (click)="start.mode = (start.mode == 'push' ? 'over' : (start.mode == 'over' ? 'side' : 'push'))">Toggle Mode</button>
+    <div>Mode: {{start.mode}}</div>
+    <br>
+    <input #myinput>
+  </md-drawer>
+
+  <md-drawer #end position="end">
+    End Side Drawer
+    <br>
+    <button md-button (click)="end.close()">Close</button>
+  </md-drawer>
+
+  <div class="demo-drawer-content">
+    <h1>My Content</h1>
+
+    <div>
+      <header>Drawer</header>
+      <button md-button (click)="start.toggle()">Toggle Start Side Drawer</button>
+      <button md-button (click)="end.toggle()">Toggle End Side Drawer</button>
+    </div>
+
+    <button md-button>HELLO</button>
+    <button md-raised-button class="mat-primary">HELLO</button>
+    <button md-fab class="mat-accent">HI</button>
+  </div>
+</md-drawer-container>
+
+<h2>Drawer Already Opened</h2>
+
+<md-drawer-container class="demo-drawer-container">
+  <md-drawer #start2 opened mode="side">
+    Drawer
+  </md-drawer>
+
+  <div class="demo-drawer-content">
+    <button md-button (click)="start2.toggle()">Toggle Start Side Drawer</button>
+  </div>
+</md-drawer-container>
+
+<h2>Dynamic Position Drawer</h2>
+
+<md-drawer-container class="demo-drawer-container">
+  <md-drawer #dynamicPosDrawer1 mode="side" [position]="invert ? 'end' : 'start'">Start</md-drawer>
+  <md-drawer #dynamicPosDrawer2 mode="side" [position]="invert ? 'start' : 'end'">End</md-drawer>
+
+  <div class="demo-drawer-content">
+    <button (click)="dynamicPosDrawer1.toggle(); dynamicPosDrawer2.toggle()">
+      Toggle drawers
+    </button>
+    <button (click)="invert = !invert">Change sides</button>
+  </div>
+</md-drawer-container>
+
+<h2>Drawer with focus attributes</h2>
+
+<md-drawer-container class="demo-drawer-container">
+  <md-drawer #focusDrawer>
+    <md-nav-list>
+      <a md-list-item routerLink>Link</a>
+      <a md-list-item routerLink cdk-focus-region-start>Focus region start</a>
+      <a md-list-item routerLink>Link</a>
+      <a md-list-item routerLink cdk-focus-initial>Initially focused</a>
+      <a md-list-item routerLink cdk-focus-region-end>Focus region end</a>
+      <a md-list-item routerLink>Link</a>
+    </md-nav-list>
+  </md-drawer>
+
+  <div class="demo-drawer-content">
+    <h1>My Content</h1>
+
+    <div>
+      <header>Drawer</header>
+      <button md-button (click)="focusDrawer.toggle()">Toggle Drawer</button>
+    </div>
+  </div>
+</md-drawer-container>
diff --git a/src/demo-app/drawer/drawer-demo.scss b/src/demo-app/drawer/drawer-demo.scss
new file mode 100644
index 000000000000..1bf747c0615b
--- /dev/null
+++ b/src/demo-app/drawer/drawer-demo.scss
@@ -0,0 +1,7 @@
+.demo-drawer-container {
+  border: 3px solid black;
+}
+
+.demo-drawer-content {
+  padding: 15px;
+}
diff --git a/src/demo-app/drawer/drawer-demo.ts b/src/demo-app/drawer/drawer-demo.ts
new file mode 100644
index 000000000000..87a740988f7e
--- /dev/null
+++ b/src/demo-app/drawer/drawer-demo.ts
@@ -0,0 +1,14 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'drawer-demo',
+  templateUrl: 'drawer-demo.html',
+  styleUrls: ['drawer-demo.css'],
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+})
+export class DrawerDemo {
+  invert = false;
+}
diff --git a/src/demo-app/sidenav/sidenav-demo.html b/src/demo-app/sidenav/sidenav-demo.html
index bdddd69c381a..fdc13d483172 100644
--- a/src/demo-app/sidenav/sidenav-demo.html
+++ b/src/demo-app/sidenav/sidenav-demo.html
@@ -1,87 +1,60 @@
-<h2>Basic Use Case</h2>
-
-<md-sidenav-container class="demo-sidenav-container">
-  <md-sidenav #start (open)="myinput.focus()" mode="side">
-    Start Side Drawer
-    <br>
-    <button md-button (click)="start.close()">Close</button>
-    <br>
-    <button md-button (click)="end.open()">Open End Side</button>
-    <br>
-    <button md-button
-            (click)="start.mode = (start.mode == 'push' ? 'over' : (start.mode == 'over' ? 'side' : 'push'))">Toggle Mode</button>
-    <div>Mode: {{start.mode}}</div>
-    <br>
-    <input #myinput>
-  </md-sidenav>
-
-  <md-sidenav #end position="end">
-    End Side Drawer
-    <br>
-    <button md-button (click)="end.close()">Close</button>
-  </md-sidenav>
-
-  <div class="demo-sidenav-content">
-    <h1>My Content</h1>
-
-    <div>
-      <header>Sidenav</header>
-      <button md-button (click)="start.toggle()">Toggle Start Side Drawer</button>
-      <button md-button (click)="end.toggle()">Toggle End Side Drawer</button>
-    </div>
-
-    <button md-button>HELLO</button>
-    <button md-raised-button class="mat-primary">HELLO</button>
-    <button md-fab class="mat-accent">HI</button>
-  </div>
-</md-sidenav-container>
-
-<h2>Sidenav Already Opened</h2>
-
-<md-sidenav-container class="demo-sidenav-container">
-  <md-sidenav #start2 opened mode="side">
-    Drawer
-  </md-sidenav>
-
-  <div class="demo-sidenav-content">
-    <button md-button (click)="start2.toggle()">Toggle Start Side Drawer</button>
-  </div>
-</md-sidenav-container>
-
-<h2>Dynamic Position Sidenav</h2>
-
-<md-sidenav-container class="demo-sidenav-container">
-  <md-sidenav #dynamicPosSidenav1 mode="side" [position]="invert ? 'end' : 'start'">Start</md-sidenav>
-  <md-sidenav #dynamicPosSidenav2 mode="side" [position]="invert ? 'start' : 'end'">End</md-sidenav>
-
-  <div class="demo-sidenav-content">
-    <button (click)="dynamicPosSidenav1.toggle(); dynamicPosSidenav2.toggle()">
-      Toggle sidenavs
-    </button>
-    <button (click)="invert = !invert">Change sides</button>
-  </div>
-</md-sidenav-container>
-
-<h2>Sidenav with focus attributes</h2>
-
-<md-sidenav-container class="demo-sidenav-container">
-  <md-sidenav #focusSidenav>
-    <md-nav-list>
-      <a md-list-item routerLink>Link</a>
-      <a md-list-item routerLink cdk-focus-region-start>Focus region start</a>
-      <a md-list-item routerLink>Link</a>
-      <a md-list-item routerLink cdk-focus-initial>Initially focused</a>
-      <a md-list-item routerLink cdk-focus-region-end>Focus region end</a>
-      <a md-list-item routerLink>Link</a>
-    </md-nav-list>
-  </md-sidenav>
-
-  <div class="demo-sidenav-content">
-    <h1>My Content</h1>
-
-    <div>
-      <header>Sidenav</header>
-      <button md-button (click)="focusSidenav.toggle()">Toggle Drawer</button>
-    </div>
-  </div>
-</md-sidenav-container>
+<button md-raised-button (click)="isLaunched = true" *ngIf="!isLaunched" color="primary">
+  Launch Fullscreen Sidenav Demo
+</button>
+
+<div class="demo-sidenav-area" *ngIf="isLaunched">
+  <md-toolbar *ngIf="showHeader && !coverHeader">Header</md-toolbar>
+  <md-sidenav-container>
+    <md-sidenav #start (open)="myinput.focus()" [mode]="mode"
+                [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
+      Start Side Sidenav
+      <br>
+      <button md-button (click)="start.close()">Close</button>
+      <br>
+      <button md-button (click)="end.open()">Open End Side</button>
+      <br>
+      <button md-button (click)="modeIndex = (modeIndex + 1) % 3">Toggle Mode</button>
+      <div>Mode: {{start.mode}}</div>
+      <br>
+      <input #myinput>
+      <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
+    </md-sidenav>
+
+    <md-sidenav #end position="end"
+                [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
+      End Side Sidenav
+      <br>
+      <button md-button (click)="end.close()">Close</button>
+      <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
+    </md-sidenav>
+
+    <md-sidenav-content>
+      <md-toolbar *ngIf="showHeader && coverHeader">Header</md-toolbar>
+      <div class="demo-sidenav-content">
+        <div>
+          <button md-raised-button (click)="isLaunched = false">
+            Exit Fullscreen Sidenav Demo
+          </button>
+        </div>
+
+        <div>
+          <h3>Sidenav</h3>
+          <button md-button (click)="start.toggle()">Toggle Start Side Sidenav</button>
+          <button md-button (click)="end.toggle()">Toggle End Side Sidenav</button>
+          <md-checkbox [(ngModel)]="fixed">Fixed mode</md-checkbox>
+          <md-checkbox [(ngModel)]="coverHeader">Sidenav covers header/footer</md-checkbox>
+        </div>
+
+        <div>
+          <h3>Header / Footer</h3>
+          <md-checkbox [(ngModel)]="showHeader">Show header</md-checkbox>
+          <md-checkbox [(ngModel)]="showFooter">Show footer</md-checkbox>
+        </div>
+
+        <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
+      </div>
+      <md-toolbar *ngIf="showFooter && coverHeader">Footer</md-toolbar>
+    </md-sidenav-content>
+  </md-sidenav-container>
+  <md-toolbar *ngIf="showFooter && !coverHeader">Footer</md-toolbar>
+</div>
diff --git a/src/demo-app/sidenav/sidenav-demo.scss b/src/demo-app/sidenav/sidenav-demo.scss
index a04b3bb58124..b9b359f85460 100644
--- a/src/demo-app/sidenav/sidenav-demo.scss
+++ b/src/demo-app/sidenav/sidenav-demo.scss
@@ -1,11 +1,25 @@
-.demo-sidenav-container {
-  border: 3px solid black;
+.demo-sidenav-area {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  flex-direction: column;
 
-  .mat-sidenav-focus-trap > .cdk-focus-trap-content {
-    padding: 10px;
+  .mat-toolbar {
+    flex: 0;
+  }
+
+  .mat-sidenav-container {
+    flex: 1;
   }
-}
 
-.demo-sidenav-content {
-  padding: 15px;
+  .demo-sidenav-content {
+    padding: 32px;
+  }
+
+  .demo-filler-content {
+    padding: 60px;
+  }
 }
diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts
index 60be081c2a85..37a8873aad82 100644
--- a/src/demo-app/sidenav/sidenav-demo.ts
+++ b/src/demo-app/sidenav/sidenav-demo.ts
@@ -7,8 +7,16 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'sidenav-demo.html',
   styleUrls: ['sidenav-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class SidenavDemo {
-  invert = false;
+  isLaunched = false;
+  fillerContent = Array(30);
+  fixed = false;
+  coverHeader = false;
+  showHeader = false;
+  showFooter = false;
+  modeIndex = 0;
+  get mode() { return ['side', 'over', 'push'][this.modeIndex]; }
+  get fixedTop() { return this.fixed && this.showHeader && !this.coverHeader ? 64 : 0; }
+  get fixedBottom() { return this.fixed && this.showFooter && !this.coverHeader ? 64 : 0; }
 }
diff --git a/src/lib/sidenav/drawer-container.html b/src/lib/sidenav/drawer-container.html
index f305c0545a87..a7f8457f08ca 100644
--- a/src/lib/sidenav/drawer-container.html
+++ b/src/lib/sidenav/drawer-container.html
@@ -1,8 +1,10 @@
 <div class="mat-drawer-backdrop" (click)="_onBackdropClicked()"
      [class.mat-drawer-shown]="_isShowingBackdrop()"></div>
 
-<ng-content select="md-drawer, mat-drawer, md-sidenav, mat-sidenav"></ng-content>
+<ng-content select="md-drawer, mat-drawer"></ng-content>
 
-<div class="mat-drawer-content" [ngStyle]="_styles" cdk-scrollable>
+<ng-content select="md-drawer-content, mat-drawer-content">
+</ng-content>
+<md-drawer-content *ngIf="!_content">
   <ng-content></ng-content>
-</div>
+</md-drawer-content>
diff --git a/src/lib/sidenav/drawer-transitions.scss b/src/lib/sidenav/drawer-transitions.scss
index f14d83784f24..7be6e763b610 100644
--- a/src/lib/sidenav/drawer-transitions.scss
+++ b/src/lib/sidenav/drawer-transitions.scss
@@ -6,7 +6,7 @@
     transition: {
       duration: $swift-ease-out-duration;
       timing-function: $swift-ease-out-timing-function;
-      property: transform, margin-left, margin-right;
+      property: margin-left, margin-right;
     }
   }
 
diff --git a/src/lib/sidenav/drawer.html b/src/lib/sidenav/drawer.html
deleted file mode 100644
index 6dbc74306383..000000000000
--- a/src/lib/sidenav/drawer.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-content></ng-content>
diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index 9d46906c21fd..d3efaa66d351 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -3,15 +3,21 @@
 @import '../core/style/layout-common';
 @import '../../cdk/a11y/a11y';
 
+$mat-drawer-content-z-index: 1;
+$mat-drawer-side-drawer-z-index: 2;
+$mat-drawer-backdrop-z-index: 3;
+$mat-drawer-over-drawer-z-index: 4;
+
 // stylelint-disable max-line-length
 // Mixin that creates a new stacking context.
 // see https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Positioning/Understanding_z_index/The_stacking_context
 // stylelint-enable
-@mixin mat-drawer-stacking-context() {
+@mixin mat-drawer-stacking-context($z-index:1) {
   position: relative;
 
-  // Use a transform to create a new stacking context.
-  transform: translate3d(0, 0, 0);
+  // Use a z-index to create a new stacking context. (We can't use transform because it breaks fixed
+  // positioning inside of the transformed element).
+  z-index: $z-index;
 }
 
 .mat-drawer-container {
@@ -47,7 +53,7 @@
 
   // Because of the new stacking context, the z-index stack is new and we can use our own
   // numbers.
-  z-index: 2;
+  z-index: $mat-drawer-backdrop-z-index;
 
   // We use 'visibility: hidden | visible' because 'display: none' will not animate any
   // transitions, while visibility will interpolate transitions properly.
@@ -65,7 +71,7 @@
 }
 
 .mat-drawer-content {
-  @include mat-drawer-stacking-context();
+  @include mat-drawer-stacking-context($mat-drawer-content-z-index);
 
   display: block;
   height: 100%;
@@ -73,7 +79,7 @@
 }
 
 .mat-drawer {
-  @include mat-drawer-stacking-context();
+  @include mat-drawer-stacking-context($mat-drawer-over-drawer-z-index);
 
   display: block;
   position: absolute;
@@ -83,12 +89,11 @@
   min-width: 5vw;
   outline: 0;
   box-sizing: border-box;
-  height: 100%;
   overflow-y: auto; // TODO(kara): revisit scrolling behavior for drawers
   transform: translate3d(-100%, 0, 0);
 
   &.mat-drawer-side {
-    z-index: 1;
+    z-index: $mat-drawer-side-drawer-z-index;
   }
 
   &.mat-drawer-end {
@@ -114,3 +119,7 @@
     }
   }
 }
+
+.mat-sidenav-fixed {
+  position: fixed;
+}
diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index 6d0a5171a06b..d858a6a2d8a1 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -76,6 +76,8 @@ describe('MdDrawer', () => {
 
     it('should emit the backdropClick event when the backdrop is clicked', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicTestApp);
+      fixture.detectChanges();
+
       let testComponent: BasicTestApp = fixture.debugElement.componentInstance;
       let openButtonElement = fixture.debugElement.query(By.css('.open')).nativeElement;
 
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index ef241cacd3fa..3d306303fac0 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -16,9 +16,11 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  ContentChild,
   ContentChildren,
   ElementRef,
   EventEmitter,
+  forwardRef,
   Inject,
   Input,
   NgZone,
@@ -34,6 +36,7 @@ import {merge} from 'rxjs/observable/merge';
 import {first} from 'rxjs/operator/first';
 import {startWith} from 'rxjs/operator/startWith';
 import {takeUntil} from 'rxjs/operator/takeUntil';
+import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 
 
@@ -51,6 +54,42 @@ export class MdDrawerToggleResult {
   constructor(public type: 'open' | 'close', public animationFinished: boolean) {}
 }
 
+
+@Component({
+  moduleId: module.id,
+  selector: 'md-drawer-content, mat-drawer-content',
+  template: '<ng-content></ng-content>',
+  host: {
+    'class': 'mat-drawer-content',
+    '[style.marginLeft.px]': '_margins.left',
+    '[style.marginRight.px]': '_margins.right',
+  },
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+})
+export class MdDrawerContent implements AfterContentInit {
+  /**
+   * Margins to be applied to the content. These are used to push / shrink the drawer content when a
+   * drawer is open. We use margin rather than transform even for push mode because transform breaks
+   * fixed position elements inside of the transformed element.
+   */
+  _margins: {left: number, right: number} = {left: 0, right: 0};
+
+  constructor(
+      private _changeDetectorRef: ChangeDetectorRef,
+      @Inject(forwardRef(() => MdDrawerContainer)) private _container: MdDrawerContainer) {
+  }
+
+  ngAfterContentInit() {
+    this._container._contentMargins.subscribe(margins => {
+      this._margins = margins;
+      this._changeDetectorRef.markForCheck();
+    });
+  }
+}
+
+
 /**
  * <md-drawer> component.
  *
@@ -61,7 +100,7 @@ export class MdDrawerToggleResult {
 @Component({
   moduleId: module.id,
   selector: 'md-drawer, mat-drawer',
-  templateUrl: 'drawer.html',
+  template: '<ng-content></ng-content>',
   animations: [
     trigger('transform', [
       state('open, open-instant', style({
@@ -121,7 +160,13 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   set align(value) { this.position = value; }
 
   /** Mode of the drawer; one of 'over', 'push' or 'side'. */
-  @Input() mode: 'over' | 'push' | 'side' = 'over';
+  @Input()
+  get mode() { return this._mode; }
+  set mode(value) {
+    this._mode = value;
+    this._modeChanged.next();
+  }
+  private _mode: 'over' | 'push' | 'side' = 'over';
 
   /** Whether the drawer can be closed with the escape key or by clicking on the backdrop. */
   @Input()
@@ -160,6 +205,12 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   /** @deprecated */
   @Output('align-changed') onAlignChanged = new EventEmitter<void>();
 
+  /**
+   * An observable that emits when the drawer mode changes. This is used by the drawer container to
+   * to know when to when the mode changes so it can adapt the margins on the content.
+   */
+  _modeChanged = new Subject();
+
   get isFocusTrapEnabled() {
     // The focus trap is only enabled when the drawer is open in any mode other than side.
     return this.opened && this.mode !== 'side';
@@ -298,6 +349,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   }
 }
 
+
 /**
  * <md-drawer-container> component.
  *
@@ -322,6 +374,8 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
 export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   @ContentChildren(MdDrawer) _drawers: QueryList<MdDrawer>;
 
+  @ContentChild(MdDrawerContent) _content: MdDrawerContent;
+
   /** The drawer child with the `start` position. */
   get start() { return this._start; }
 
@@ -347,8 +401,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   /** Subscription to the Directionality change EventEmitter. */
   private _dirChangeSubscription = Subscription.EMPTY;
 
-  /** Inline styles to be applied to the container. */
-  _styles: { marginLeft: string; marginRight: string; transform: string; };
+  _contentMargins = new Subject<{left: number, right: number}>();
 
   constructor(@Optional() private _dir: Directionality, private _element: ElementRef,
               private _renderer: Renderer2, private _ngZone: NgZone,
@@ -366,6 +419,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
       this._drawers.forEach((drawer: MdDrawer) => {
         this._watchDrawerToggle(drawer);
         this._watchDrawerPosition(drawer);
+        this._watchDrawerMode(drawer);
       });
     });
   }
@@ -394,7 +448,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
       // Set the transition class on the container so that the animations occur. This should not
       // be set initially because animations should only be triggered via a change in state.
       this._renderer.addClass(this._element.nativeElement, 'mat-drawer-transition');
-      this._updateStyles();
+      this._updateContentMargins();
       this._changeDetectorRef.markForCheck();
     });
 
@@ -421,6 +475,16 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
     });
   }
 
+  /** Subscribes to changes in drawer mode so we can run change detection. */
+  private _watchDrawerMode(drawer: MdDrawer): void {
+    if (drawer) {
+      takeUntil.call(drawer._modeChanged, this._drawers.changes).subscribe(() => {
+        this._updateContentMargins();
+        this._changeDetectorRef.markForCheck();
+      });
+    }
+  }
+
   /** Toggles the 'mat-drawer-opened' class on the main 'md-drawer-container' element. */
   private _setContainerClass(isAdd: boolean): void {
     if (isAdd) {
@@ -483,29 +547,40 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   }
 
   /**
-   * Return the width of the drawer, if it's in the proper mode and opened.
-   * This may relayout the view, so do not call this often.
-   * @param drawer
-   * @param mode
+   * Recalculates and updates the inline styles for the content. Note that this should be used
+   * sparingly, because it causes a reflow.
    */
-  private _getDrawerEffectiveWidth(drawer: MdDrawer, mode: string): number {
-    return (this._isDrawerOpen(drawer) && drawer.mode == mode) ? drawer._width : 0;
-  }
+  private _updateContentMargins() {
+    // 1. For drawers in `over` mode, they don't affect the content.
+    // 2. For drawers in `side` mode they should shrink the content. We do this by adding to the
+    //    left margin (for left drawer) or right margin (for right the drawer).
+    // 3. For drawers in `push` mode the should shift the content without resizing it. We do this by
+    //    adding to the left or right margin and simultaneously subtracting the same amount of
+    //    margin from the other side.
+
+    let left = 0;
+    let right = 0;
+
+    if (this._left && this._left.opened) {
+      if (this._left.mode == 'side') {
+        left += this._left._width;
+      } else if (this._left.mode == 'push') {
+        let width = this._left._width;
+        left += width;
+        right -= width;
+      }
+    }
 
-  /**
-   * Recalculates and updates the inline styles. Note that this
-   * should be used sparingly, because it causes a reflow.
-   */
-  private _updateStyles() {
-    const marginLeft = this._left ? this._getDrawerEffectiveWidth(this._left, 'side') : 0;
-    const marginRight = this._right ? this._getDrawerEffectiveWidth(this._right, 'side') : 0;
-    const leftWidth = this._left ? this._getDrawerEffectiveWidth(this._left, 'push') : 0;
-    const rightWidth = this._right ? this._getDrawerEffectiveWidth(this._right, 'push') : 0;
-
-    this._styles = {
-      marginLeft: `${marginLeft}px`,
-      marginRight: `${marginRight}px`,
-      transform: `translate3d(${leftWidth - rightWidth}px, 0, 0)`
-    };
+    if (this._right && this._right.opened) {
+      if (this._right.mode == 'side') {
+        right += this._right._width;
+      } else if (this._right.mode == 'push') {
+        let width = this._right._width;
+        right += width;
+        left -= width;
+      }
+    }
+
+    this._contentMargins.next({left, right});
   }
 }
diff --git a/src/lib/sidenav/sidenav-container.html b/src/lib/sidenav/sidenav-container.html
new file mode 100644
index 000000000000..7068bbdf4382
--- /dev/null
+++ b/src/lib/sidenav/sidenav-container.html
@@ -0,0 +1,10 @@
+<div class="mat-drawer-backdrop" (click)="_onBackdropClicked()"
+     [class.mat-drawer-shown]="_isShowingBackdrop()"></div>
+
+<ng-content select="md-sidenav, mat-sidenav"></ng-content>
+
+<ng-content select="md-sidenav-content, mat-sidenav-content">
+</ng-content>
+<md-sidenav-content *ngIf="!_content">
+  <ng-content></ng-content>
+</md-sidenav-content>
diff --git a/src/lib/sidenav/sidenav-module.ts b/src/lib/sidenav/sidenav-module.ts
index 16f14d9d98fc..577f9205826c 100644
--- a/src/lib/sidenav/sidenav-module.ts
+++ b/src/lib/sidenav/sidenav-module.ts
@@ -6,18 +6,33 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
 import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
 import {MdCommonModule} from '@angular/material/core';
-import {MdDrawer, MdDrawerContainer} from './drawer';
-import {MdSidenav, MdSidenavContainer} from './sidenav';
+import {MdDrawer, MdDrawerContainer, MdDrawerContent} from './drawer';
+import {MdSidenav, MdSidenavContainer, MdSidenavContent} from './sidenav';
 
 
 @NgModule({
   imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
-  exports: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav, MdCommonModule],
-  declarations: [MdDrawerContainer, MdDrawer, MdSidenavContainer, MdSidenav],
+  exports: [
+    MdCommonModule,
+    MdDrawer,
+    MdDrawerContainer,
+    MdDrawerContent,
+    MdSidenav,
+    MdSidenavContainer,
+    MdSidenavContent,
+  ],
+  declarations: [
+    MdDrawer,
+    MdDrawerContainer,
+    MdDrawerContent,
+    MdSidenav,
+    MdSidenavContainer,
+    MdSidenavContent,
+  ],
 })
 export class MdSidenavModule {}
diff --git a/src/lib/sidenav/sidenav.spec.ts b/src/lib/sidenav/sidenav.spec.ts
new file mode 100644
index 000000000000..0de4571a2638
--- /dev/null
+++ b/src/lib/sidenav/sidenav.spec.ts
@@ -0,0 +1,67 @@
+import {Component} from '@angular/core';
+import {async, TestBed, ComponentFixture} from '@angular/core/testing';
+import {MdSidenav, MdSidenavModule} from './index';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {By} from '@angular/platform-browser';
+
+
+describe('MdSidenav', () => {
+  let fixture: ComponentFixture<SidenavWithFixedPosition>;
+  let sidenavEl: HTMLElement;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [MdSidenavModule, NoopAnimationsModule],
+      declarations: [SidenavWithFixedPosition],
+    });
+
+    TestBed.compileComponents();
+
+    fixture = TestBed.createComponent(SidenavWithFixedPosition);
+    fixture.detectChanges();
+
+    sidenavEl = fixture.debugElement.query(By.directive(MdSidenav)).nativeElement;
+  }));
+
+  it('should be fixed position when in fixed mode', () => {
+    expect(sidenavEl.classList).toContain('mat-sidenav-fixed');
+
+    fixture.componentInstance.fixed = false;
+    fixture.detectChanges();
+
+    expect(sidenavEl.classList).not.toContain('mat-sidenav-fixed');
+  });
+
+  it('should set fixed bottom and top when in fixed mode', () => {
+    expect(sidenavEl.style.top).toBe('20px');
+    expect(sidenavEl.style.bottom).toBe('30px');
+
+    fixture.componentInstance.fixed = false;
+    fixture.detectChanges();
+
+    expect(sidenavEl.style.top).toBeFalsy();
+    expect(sidenavEl.style.bottom).toBeFalsy();
+  });
+});
+
+
+@Component({
+  template: `
+    <md-sidenav-container>
+      <md-sidenav
+          #drawer
+          [fixedInViewport]="fixed"
+          [fixedTopGap]="fixedTop"
+          [fixedBottomGap]="fixedBottom">
+        Drawer.
+      </md-sidenav>
+      <md-sidenav-content>
+        Some content.
+      </md-sidenav-content>
+    </md-sidenav-container>`,
+})
+class SidenavWithFixedPosition {
+  fixed = true;
+  fixedTop = 20;
+  fixedBottom = 30;
+}
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index 12e8b925bcfa..aff0a5b25137 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -7,19 +7,42 @@
  */
 
 import {
-  ChangeDetectionStrategy,
-  Component,
-  ContentChildren,
+  ChangeDetectionStrategy, ChangeDetectorRef,
+  Component, ContentChild,
+  ContentChildren, forwardRef, Inject, Input,
   ViewEncapsulation
 } from '@angular/core';
-import {MdDrawer, MdDrawerContainer} from './drawer';
+import {MdDrawer, MdDrawerContainer, MdDrawerContent} from './drawer';
 import {animate, state, style, transition, trigger} from '@angular/animations';
+import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'md-sidenav-content, mat-sidenav-content',
+  template: '<ng-content></ng-content>',
+  host: {
+    'class': 'mat-drawer-content mat-sidenav-content',
+    '[style.marginLeft.px]': '_margins.left',
+    '[style.marginRight.px]': '_margins.right',
+  },
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+})
+export class MdSidenavContent extends MdDrawerContent {
+  constructor(
+      changeDetectorRef: ChangeDetectorRef,
+      @Inject(forwardRef(() => MdSidenavContainer)) container: MdSidenavContainer) {
+    super(changeDetectorRef, container);
+  }
+}
 
 
 @Component({
   moduleId: module.id,
   selector: 'md-sidenav, mat-sidenav',
-  templateUrl: 'drawer.html',
+  template: '<ng-content></ng-content>',
   animations: [
     trigger('transform', [
       state('open, open-instant', style({
@@ -36,6 +59,7 @@ import {animate, state, style, transition, trigger} from '@angular/animations';
   ],
   host: {
     'class': 'mat-drawer mat-sidenav',
+    'tabIndex': '-1',
     '[@transform]': '_animationState',
     '(@transform.start)': '_onAnimationStart()',
     '(@transform.done)': '_onAnimationEnd($event)',
@@ -46,19 +70,45 @@ import {animate, state, style, transition, trigger} from '@angular/animations';
     '[class.mat-drawer-over]': 'mode === "over"',
     '[class.mat-drawer-push]': 'mode === "push"',
     '[class.mat-drawer-side]': 'mode === "side"',
-    'tabIndex': '-1',
+    '[class.mat-sidenav-fixed]': 'fixedInViewport',
+    '[style.top.px]': 'fixedInViewport ? fixedTopGap : null',
+    '[style.bottom.px]': 'fixedInViewport ? fixedBottomGap : null',
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdSidenav extends MdDrawer {}
+export class MdSidenav extends MdDrawer {
+  /** Whether the sidenav is fixed in the viewport. */
+  @Input()
+  get fixedInViewport() { return this._fixedInViewport; }
+  set fixedInViewport(value) { this._fixedInViewport = coerceBooleanProperty(value); }
+  private _fixedInViewport = false;
+
+  /**
+   * The gap between the top of the sidenav and the top of the viewport when the sidenav is in fixed
+   * mode.
+   */
+  @Input()
+  get fixedTopGap() { return this._fixedTopGap; }
+  set fixedTopGap(value) { this._fixedTopGap = coerceNumberProperty(value); }
+  private _fixedTopGap = 0;
+
+  /**
+   * The gap between the bottom of the sidenav and the bottom of the viewport when the sidenav is in
+   * fixed mode.
+   */
+  @Input()
+  get fixedBottomGap() { return this._fixedBottomGap; }
+  set fixedBottomGap(value) { this._fixedBottomGap = coerceNumberProperty(value); }
+  private _fixedBottomGap = 0;
+}
 
 
 @Component({
   moduleId: module.id,
   selector: 'md-sidenav-container, mat-sidenav-container',
-  templateUrl: 'drawer-container.html',
+  templateUrl: 'sidenav-container.html',
   styleUrls: [
     'drawer.css',
     'drawer-transitions.css',
@@ -72,4 +122,6 @@ export class MdSidenav extends MdDrawer {}
 })
 export class MdSidenavContainer extends MdDrawerContainer {
   @ContentChildren(MdSidenav) _drawers;
+
+  @ContentChild(MdSidenavContent) _content;
 }

From 3571f68a2de0833ee4741af8a0eb24d1da174f38 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 21 Sep 2017 15:18:57 -0700
Subject: [PATCH 131/575] chore: add changelog for beta.11 (#7239)

---
 CHANGELOG.md                                  | 136 ++++++++++++++++++
 package-lock.json                             |  62 ++++----
 .../stepper-overview-example.html             |   1 -
 tools/dgeni/index.js                          |   1 +
 4 files changed, 168 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e330f4ecb0c..530770803df0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,139 @@
+<a name="2.0.0-beta.11"></a>
+# [2.0.0-beta.11 carapace-parapet](https://github.com/angular/material2/compare/2.0.0-beta.10...2.0.0-beta.11) (2017-09-21)
+
+
+### Highlights
+* Each `@angular/material` component is now bundled into its own javascript file. This will allow
+tools like webpack to more easily load _only_ the components being used in an application.
+* New stepper component! The base behavior lives in `@angular/cdk` with Material Design flavors in
+`@angular/material`.
+
+
+### Breaking changes
+
+* Angular Material now requires **Angular 4.4.3 or greater**
+* `MaterialModule` has been removed. ([cf1ece0](https://github.com/angular/material2/commit/cf1ece0)) (#6803)
+[See the deprecation notice from beta.3 for more information](https://github.com/angular/material2/blob/master/CHANGELOG.md#materialmodule).
+* `MdCoreModule` has been removed. Most of its functionality has been moved to `@angular/cdk` over
+the last few releases.
+* `FocusOriginMonitor` has been renamed to `FocusMonitor` and moved to `@angular/cdk`.
+* **chip-list:**  The outputs `select` and `deselect` have been removed in favor of a single
+  `onSelectionChange` output.
+* **overlay:** OverlayState has been renamed to OverlayConfig
+* **overlay:** Now that the Overlay is part of the cdk rather than Angular Material directly,
+the `themeClass` property has been removed. To add a class to the
+overlay for theming, you can do
+```ts
+overlayContainer.getContainerElement().classList.add('my-theme-class');
+```
+* DateAdapter method `getISODateString` has been renamed to `toIso8601` and a new method
+`fromIso8601` has been added.
+
+
+### Deprecation of "md" prefix.
+
+In earlier betas, we've had a compatibility mode that allowed people to use either "md" or "mat"
+as the selector for Angular Material components. This was created so that these components could
+live side-by-side with [AngularJS Material](https://material.angularjs.org) without CSS from
+the two libraries colliding.
+
+For beta.11, we've made the decision to deprecate the "md" prefix completely and use "mat" moving
+forward. This affects all class names, properties, inputs, outputs, and selectors (CSS classes were
+changed back in February). The "md" prefixes will be removed in the next beta release.
+
+[You can automatically update your projects with the angular-material-prefix-updater tool.](https://www.npmjs.com/package/angular-material-prefix-updater)
+Check out the tool's page for instructions on how to run.
+
+#### Why are we doing this?
+We like the "md" prefix too! We added compatibility mode in order to keep "md" around, but over
+time we found that there were too many downsides to continue supporting both prefixes at the same
+time:
+* Many users found the fact that the CSS used "mat" while templates used "md" confusing.
+* Users in compatibility mode found that having "mat" in their templates while TypeScript class
+names remained "Md" to be unfriendly.
+* Making both prefixes available consistently through templates required [adding many
+getters/setters that aliased the "true" property](https://github.com/angular/material2/blob/1cfce8d9ab047d447465bd4e233fd26893830328/src/lib/tooltip/tooltip.ts#L171-L198).
+This ends up increasing payload size and complexity of the source code.
+* Compatiblity mode itself used [broad directive selectors](https://github.com/angular/material2/blob/87318bc7c83d249036837376609ea099e5aea2d9/src/lib/core/compatibility/compatibility.ts#L107-L187)
+to enforce that only one prefix was used at a time. This causes a problem where this broad selector
+prevents Angular from throwing an error if an application uses a component without importing its
+`NgModule`.
+
+#### Why not change the styles in AngularJS Material?
+We explored this option early on (before creating compatibility mode). We found that changing the
+library's styles such that they wouldn't affect the Angular Material components would increase
+the specificity. This would have been a significant breaking change, as it would have potentially
+broken countless custom styles that relied on a particular specificity working.
+
+
+### Bug Fixes
+
+* **autocomplete,select:** inconsistent disabled option coloring ([#6640](https://github.com/angular/material2/issues/6640)) ([454781d](https://github.com/angular/material2/commit/454781d)), closes [#6638](https://github.com/angular/material2/issues/6638)
+* **autosize:** not resizing on programmatic changes ([#6654](https://github.com/angular/material2/issues/6654)) ([89fea50](https://github.com/angular/material2/commit/89fea50)), closes [#5247](https://github.com/angular/material2/issues/5247)
+* **button-toggle:** border radius ignored if option is selected ([#6699](https://github.com/angular/material2/issues/6699)) ([82e14f8](https://github.com/angular/material2/commit/82e14f8)), closes [#6689](https://github.com/angular/material2/issues/6689)
+* **checkbox:** label content should not wrap ([#6674](https://github.com/angular/material2/issues/6674)) ([9acab86](https://github.com/angular/material2/commit/9acab86)), closes [#6671](https://github.com/angular/material2/issues/6671)
+* **chips:** set appropriate aria-orientation ([#6464](https://github.com/angular/material2/issues/6464)) ([a37aa6a](https://github.com/angular/material2/commit/a37aa6a))
+* **datepicker:** allow date or datetime strings in fromIso8601 ([#7220](https://github.com/angular/material2/issues/7220)) ([8436f8c](https://github.com/angular/material2/commit/8436f8c))
+* **datepicker:** allow ISO 8601 strings as inputs ([#7091](https://github.com/angular/material2/issues/7091)) ([d2ceb2c](https://github.com/angular/material2/commit/d2ceb2c))
+* **datepicker:** backdrop class should be mat- ([#7056](https://github.com/angular/material2/issues/7056)) ([2b61eb6](https://github.com/angular/material2/commit/2b61eb6))
+* **datepicker:** Create a new injection token to avoid overriding LOCALE_ID ([#6708](https://github.com/angular/material2/issues/6708)) ([2635cad](https://github.com/angular/material2/commit/2635cad))
+* **datepicker:** fix wrong datepicker-input value for non MM/DD/YYYY locales ([#6798](https://github.com/angular/material2/issues/6798)) ([29399b8](https://github.com/angular/material2/commit/29399b8))
+* **datepicker:** makes sure the datepickerInput is registered ([#7049](https://github.com/angular/material2/issues/7049)) ([e4d48d7](https://github.com/angular/material2/commit/e4d48d7))
+* **datepicker:** toggle not reacting to disabled state changes in datepicker or input ([#6964](https://github.com/angular/material2/issues/6964)) ([85993d3](https://github.com/angular/material2/commit/85993d3))
+* **expansion-panel:** dark theme header hover color ([#6616](https://github.com/angular/material2/issues/6616)) ([21c68ad](https://github.com/angular/material2/commit/21c68ad))
+* **form-field:** add aria-owns to label element ([#6683](https://github.com/angular/material2/issues/6683)) ([4191b4d](https://github.com/angular/material2/commit/4191b4d))
+* **form-field:** placeholder not floating if autofilled ([#6839](https://github.com/angular/material2/issues/6839)) ([602a861](https://github.com/angular/material2/commit/602a861)), closes [#6837](https://github.com/angular/material2/issues/6837)
+* **grid-list:** avoid unnecessary calc declarations ([#6745](https://github.com/angular/material2/issues/6745)) ([255611b](https://github.com/angular/material2/commit/255611b))
+* **grid-list:** styles not cleared when switching to a different styling mode ([#6660](https://github.com/angular/material2/issues/6660)) ([87d607e](https://github.com/angular/material2/commit/87d607e)), closes [#4047](https://github.com/angular/material2/issues/4047)
+* **input:** remove resize handle from non-textarea inputs ([#6768](https://github.com/angular/material2/issues/6768)) ([1272f03](https://github.com/angular/material2/commit/1272f03)), closes [#6757](https://github.com/angular/material2/issues/6757)
+* **list:** subheader margin being overwritten by typography ([#6735](https://github.com/angular/material2/issues/6735)) ([efe483a](https://github.com/angular/material2/commit/efe483a))
+* **menu:** multiple close events for a single close ([#6961](https://github.com/angular/material2/issues/6961)) ([1cccd4b](https://github.com/angular/material2/commit/1cccd4b))
+* **menu:** nested menu hover not working when trigger is added lazily ([#6807](https://github.com/angular/material2/issues/6807)) ([6b5100b](https://github.com/angular/material2/commit/6b5100b)), closes [#6731](https://github.com/angular/material2/issues/6731)
+* **menu:** nested trigger staying highlighted after click ([#6853](https://github.com/angular/material2/issues/6853)) ([04bf3d1](https://github.com/angular/material2/commit/04bf3d1)), closes [#6838](https://github.com/angular/material2/issues/6838)
+* **overlay:** rename OverlayState to OverlayConfig ([#6972](https://github.com/angular/material2/issues/6972)) ([1cfce8d](https://github.com/angular/material2/commit/1cfce8d))
+* **progress-bar:** query mode not reversing direction in rtl ([#6922](https://github.com/angular/material2/issues/6922)) ([8a21881](https://github.com/angular/material2/commit/8a21881))
+* **select:** extra whitespace around placeholder ([#6955](https://github.com/angular/material2/issues/6955)) ([9fe6386](https://github.com/angular/material2/commit/9fe6386)), closes [#6923](https://github.com/angular/material2/issues/6923)
+* **selection-list:** do not coerece option value to boolean ([#6983](https://github.com/angular/material2/issues/6983)) ([dfe01f2](https://github.com/angular/material2/commit/dfe01f2))
+* **selection-list:** proper style for disabled options ([#6829](https://github.com/angular/material2/issues/6829)) ([547d11f](https://github.com/angular/material2/commit/547d11f))
+* **slide-toggle:** remove side-margin if slide-toggle label is empty ([#6881](https://github.com/angular/material2/issues/6881)) ([a1ec81a](https://github.com/angular/material2/commit/a1ec81a)), closes [#6868](https://github.com/angular/material2/issues/6868)
+* **slide-toggle:** support native tabindex attribute ([#6613](https://github.com/angular/material2/issues/6613)) ([8f9f3c8](https://github.com/angular/material2/commit/8f9f3c8))
+* **slider:** thumb disappearing on disabled element with thumb label ([#6641](https://github.com/angular/material2/issues/6641)) ([8243b16](https://github.com/angular/material2/commit/8243b16)), closes [#6631](https://github.com/angular/material2/issues/6631)
+* **slider:** update styles when focus and dir change ([#6700](https://github.com/angular/material2/issues/6700)) ([8c49422](https://github.com/angular/material2/commit/8c49422))
+* **slider, drawer:** unsubscribe from directionaly change subject ([#6907](https://github.com/angular/material2/issues/6907)) ([a7ce31e](https://github.com/angular/material2/commit/a7ce31e)), closes [#6892](https://github.com/angular/material2/issues/6892) [#6903](https://github.com/angular/material2/issues/6903)
+* **snack-bar:** animation not starting for subsequent snack bars ([#6649](https://github.com/angular/material2/issues/6649)) ([730e7ae](https://github.com/angular/material2/commit/730e7ae)), closes [#6222](https://github.com/angular/material2/issues/6222)
+* **sort:** reverse directions and better animation ([#6802](https://github.com/angular/material2/issues/6802)) ([6fa9e6f](https://github.com/angular/material2/commit/6fa9e6f))
+* **table:** gracefully handle undefined/null columns ([#6862](https://github.com/angular/material2/issues/6862)) ([3ddf65b](https://github.com/angular/material2/commit/3ddf65b))
+* **tabs:** fix infinite tab loop ([#6663](https://github.com/angular/material2/issues/6663)) ([67e02b0](https://github.com/angular/material2/commit/67e02b0)), closes [#4639](https://github.com/angular/material2/issues/4639)
+* **tabs:** tab spacing on desktop incorrect ([#6681](https://github.com/angular/material2/issues/6681)) ([b678119](https://github.com/angular/material2/commit/b678119)), closes [#3347](https://github.com/angular/material2/issues/3347)
+* **tooltip:** closing immediately when triggered on click ([#6590](https://github.com/angular/material2/issues/6590)) ([bcd026f](https://github.com/angular/material2/commit/bcd026f))
+* **tooltip:** ensure tooltip never passes undefined message to ([#7018](https://github.com/angular/material2/issues/7018)) ([f6d1078](https://github.com/angular/material2/commit/f6d1078))
+* add `mat` exportAs and class aliases ([#7106](https://github.com/angular/material2/issues/7106)) ([a96b545](https://github.com/angular/material2/commit/a96b545))
+* **tooltip:** error on trigger escape presses while closed ([#7028](https://github.com/angular/material2/issues/7028)) ([dcf3b27](https://github.com/angular/material2/commit/dcf3b27)), closes [#7009](https://github.com/angular/material2/issues/7009)
+
+### Features
+
+* **chip-list:** implement FormFieldControl and ControlValueAccessor ([#6686](https://github.com/angular/material2/issues/6686)) ([7a42706](https://github.com/angular/material2/commit/7a42706))
+* **datepicker:** Add Moment.js adapter ([#6860](https://github.com/angular/material2/issues/6860)) ([9545427](https://github.com/angular/material2/commit/9545427))
+* **dialog:** add afterOpen to MdDialogRef ([#6887](https://github.com/angular/material2/issues/6887)) ([27cbe47](https://github.com/angular/material2/commit/27cbe47))
+* **expansion-panel:** allow for the panel header height to be customized ([#6643](https://github.com/angular/material2/issues/6643)) ([11e2239](https://github.com/angular/material2/commit/11e2239)), closes [#5641](https://github.com/angular/material2/issues/5641)
+* **overlay:** replace OverlayContainer themeClass w/ addClass/removeClass methods ([#6975](https://github.com/angular/material2/issues/6975)) ([a944f6e](https://github.com/angular/material2/commit/a944f6e))
+* **selection-list:** add selectAll and deselectAll functions ([#6971](https://github.com/angular/material2/issues/6971)) ([dc9679d](https://github.com/angular/material2/commit/dc9679d)), closes [#6969](https://github.com/angular/material2/issues/6969)
+* **sort:** add sorting indicator animation ([#5831](https://github.com/angular/material2/issues/5831)) ([70bd5fc](https://github.com/angular/material2/commit/70bd5fc))
+* **stepper:** Add e2e test ([#6776](https://github.com/angular/material2/issues/6776)) ([bef6271](https://github.com/angular/material2/commit/bef6271))
+* **stepper:** add moduleId to components ([#6780](https://github.com/angular/material2/issues/6780)) ([f375f92](https://github.com/angular/material2/commit/f375f92))
+* **stepper:** Address previous comments + add directionality support ([#6775](https://github.com/angular/material2/issues/6775)) ([c396596](https://github.com/angular/material2/commit/c396596))
+* **stepper:** initial version of stepper ([#6594](https://github.com/angular/material2/issues/6594)) ([87318bc](https://github.com/angular/material2/commit/87318bc))
+* **viewport-ruler:** add common window resize handler ([#6680](https://github.com/angular/material2/issues/6680)) ([881630f](https://github.com/angular/material2/commit/881630f))
+* add `preserveWhitespaces: false` to all components ([#7115](https://github.com/angular/material2/issues/7115)) ([2b0315d](https://github.com/angular/material2/commit/2b0315d))
+* move FocusMonitor into cdk ([#6921](https://github.com/angular/material2/issues/6921)) ([6cfe5c4](https://github.com/angular/material2/commit/6cfe5c4))
+
+
+### Performance Improvements
+
+* **dialog:** avoid repaintin dialog content element on scroll ([#6890](https://github.com/angular/material2/issues/6890)) ([51396d0](https://github.com/angular/material2/commit/51396d0)), closes [#6878](https://github.com/angular/material2/issues/6878)
+* memory leak when subscribing to zone events ([#6918](https://github.com/angular/material2/issues/6918)) ([f6c9172](https://github.com/angular/material2/commit/f6c9172)), closes [#6905](https://github.com/angular/material2/issues/6905)
+
+
 <a name="2.0.0-beta.10"></a>
 # [2.0.0-beta.10 découpage-panjandrum](https://github.com/angular/material2/compare/2.0.0-beta.8...2.0.0-beta.10) (2017-08-29)
 
diff --git a/package-lock.json b/package-lock.json
index 261f668ec5a4..6cf8c6caee81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -675,6 +675,16 @@
         "@types/node": "7.0.34"
       }
     },
+    "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"
+      }
+    },
     "abab": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
@@ -2286,8 +2296,8 @@
       "integrity": "sha1-4ye1MZThp61dxjR57pCZpSsCSGU=",
       "dev": true,
       "requires": {
-        "is-text-path": "1.0.1",
         "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.1.1",
@@ -4555,6 +4565,7 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.21",
+        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -4572,7 +4583,6 @@
         "fstream-ignore": "1.0.5",
         "inquirer": "0.12.0",
         "jsonschema": "1.1.1",
-        "JSONStream": "1.3.1",
         "jsonwebtoken": "5.7.0",
         "lodash": "4.17.4",
         "open": "0.0.5",
@@ -9170,6 +9180,16 @@
         "through2": "0.6.5"
       },
       "dependencies": {
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -9182,16 +9202,6 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -9256,16 +9266,6 @@
       "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk=",
       "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"
-      }
-    },
     "jsonwebtoken": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
@@ -13566,15 +13566,6 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -13608,6 +13599,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "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"
+      }
+    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
diff --git a/src/material-examples/stepper-overview/stepper-overview-example.html b/src/material-examples/stepper-overview/stepper-overview-example.html
index 4e4408a1bec0..adff42f6f8ba 100644
--- a/src/material-examples/stepper-overview/stepper-overview-example.html
+++ b/src/material-examples/stepper-overview/stepper-overview-example.html
@@ -1,4 +1,3 @@
-<button (click)="isLinear=!isLinear" id="toggle-linear">Enable linear</button>
 <md-horizontal-stepper [linear]="isLinear">
   <md-step [stepControl]="firstFormGroup">
     <form [formGroup]="firstFormGroup">
diff --git a/tools/dgeni/index.js b/tools/dgeni/index.js
index e5a105470b65..a5b6d765a510 100644
--- a/tools/dgeni/index.js
+++ b/tools/dgeni/index.js
@@ -121,6 +121,7 @@ let apiDocsPackage = new DgeniPackage('material2-api-docs', dgeniPackageDeps)
     'lib/slider/index.ts',
     'lib/snack-bar/index.ts',
     'lib/sort/index.ts',
+    'lib/stepper/index.ts',
     'lib/table/index.ts',
     'lib/tabs/index.ts',
     'lib/toolbar/index.ts',

From 20a23f16e8ac1ced29172709cc837fa500b6377b Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Thu, 28 Sep 2017 13:45:03 -0700
Subject: [PATCH 132/575] fix: remove all md prefixes (#7241)

---
 CODING_STANDARDS.md                           |  16 +-
 e2e/components/button-toggle-e2e.spec.ts      |   2 +-
 e2e/components/card-e2e.spec.ts               |   4 +-
 e2e/components/dialog-e2e.spec.ts             |  20 +-
 e2e/components/grid-list-e2e.spec.ts          |   4 +-
 e2e/components/list-e2e.spec.ts               |   4 +-
 e2e/components/menu-e2e.spec.ts               |   2 +-
 e2e/components/progress-bar-e2e.spec.ts       |   8 +-
 e2e/components/progress-spinner-e2e.spec.ts   |   6 +-
 e2e/components/sidenav-e2e.spec.ts            |   2 +-
 e2e/components/slide-toggle-e2e.spec.ts       |   2 +-
 e2e/components/stepper-e2e.spec.ts            |  14 +-
 e2e/components/tabs-e2e.spec.ts               |   4 +-
 e2e/components/toolbar-e2e.spec.ts            |   4 +-
 guides/cdk-table.md                           |   2 +-
 guides/customizing-component-styles.md        |   2 +-
 guides/getting-started.md                     |  16 +-
 guides/theming.md                             |   2 +-
 package-lock.json                             |   4 +-
 src/cdk/a11y/interactivity-checker.spec.ts    |   4 +-
 src/cdk/bidi/directionality.ts                |   2 +-
 src/cdk/collections/selection.ts              |   2 +-
 src/cdk/observers/observe-content.spec.ts     |   4 +-
 src/cdk/observers/observe-content.ts          |   6 +-
 src/cdk/overlay/overlay-directives.ts         |  14 +-
 src/cdk/overlay/public_api.ts                 |   4 +-
 .../overlay/scroll/close-scroll-strategy.ts   |   4 +-
 .../scroll/reposition-scroll-strategy.ts      |   4 +-
 src/cdk/overlay/scroll/scroll-strategy.ts     |   2 +-
 src/cdk/table/row.ts                          |   2 +-
 src/cdk/table/table.ts                        |   2 +-
 .../a11y/autocomplete/autocomplete-a11y.html  |  14 +-
 .../button-toggle/button-toggle-a11y.html     |  74 +--
 src/demo-app/a11y/button/button-a11y.html     |  40 +-
 src/demo-app/a11y/button/button-a11y.ts       |   4 +-
 src/demo-app/a11y/card/card-a11y.html         |  84 +--
 src/demo-app/a11y/card/card-a11y.ts           |   4 +-
 src/demo-app/a11y/checkbox/checkbox-a11y.html |  22 +-
 src/demo-app/a11y/chips/chips-a11y.html       |  62 +-
 src/demo-app/a11y/chips/chips-a11y.ts         |   6 +-
 .../a11y/datepicker/datepicker-a11y.html      | 114 ++--
 src/demo-app/a11y/dialog/dialog-a11y.html     |   8 +-
 src/demo-app/a11y/dialog/dialog-a11y.ts       |   6 +-
 .../a11y/dialog/dialog-address-form-a11y.html |  64 +-
 .../a11y/dialog/dialog-fruit-a11y.html        |  10 +-
 .../a11y/dialog/dialog-neptune-a11y.html      |  16 +-
 .../dialog/dialog-neptune-iframe-a11y.html    |  12 +-
 .../a11y/dialog/dialog-welcome-a11y.html      |   2 +-
 .../a11y/grid-list/grid-list-a11y.html        |  40 +-
 src/demo-app/a11y/icon/icon-a11y.html         |  12 +-
 src/demo-app/a11y/icon/icon-a11y.ts           |   4 +-
 src/demo-app/a11y/input/input-a11y.html       |  62 +-
 src/demo-app/a11y/menu/menu-a11y.html         |  44 +-
 .../a11y/progress-bar/progress-bar-a11y.html  |  14 +-
 .../progress-spinner-a11y.html                |  12 +-
 src/demo-app/a11y/radio/radio-a11y.html       |  32 +-
 src/demo-app/a11y/select/select-a11y.html     | 112 ++--
 .../a11y/slide-toggle/slide-toggle-a11y.html  |  14 +-
 .../a11y/slide-toggle/slide-toggle-a11y.ts    |   4 +-
 src/demo-app/a11y/slider/slider-a11y.html     |  12 +-
 .../a11y/snack-bar/snack-bar-a11y.html        |   4 +-
 src/demo-app/a11y/snack-bar/snack-bar-a11y.ts |   4 +-
 src/demo-app/a11y/tabs/tabs-a11y.html         |  14 +-
 src/demo-app/a11y/toolbar/toolbar-a11y.html   |  24 +-
 src/demo-app/a11y/tooltip/tooltip-a11y.html   |  36 +-
 .../autocomplete/autocomplete-demo.html       |  94 +--
 src/demo-app/baseline/baseline-demo.html      |  84 +--
 .../button-toggle/button-toggle-demo.html     |  60 +-
 src/demo-app/button/button-demo.html          | 122 ++--
 src/demo-app/card/card-demo.html              |  98 +--
 src/demo-app/checkbox/checkbox-demo.html      |  20 +-
 src/demo-app/checkbox/checkbox-demo.ts        |   6 +-
 src/demo-app/checkbox/nested-checklist.html   |   8 +-
 src/demo-app/chips/chips-demo.html            | 154 ++---
 src/demo-app/chips/chips-demo.scss            |   2 +-
 src/demo-app/chips/chips-demo.ts              |   4 +-
 src/demo-app/datepicker/datepicker-demo.html  | 106 +--
 src/demo-app/datepicker/datepicker-demo.scss  |   2 +-
 src/demo-app/datepicker/datepicker-demo.ts    |   6 +-
 src/demo-app/demo-app/demo-app.html           |  34 +-
 src/demo-app/demo-app/demo-module.ts          |   4 +-
 src/demo-app/demo-material-module.ts          | 126 ++--
 src/demo-app/dialog/dialog-demo.html          |  86 +--
 src/demo-app/dialog/dialog-demo.ts            |  50 +-
 src/demo-app/drawer/drawer-demo.html          |  74 +--
 src/demo-app/expansion/expansion-demo.html    |  82 +--
 src/demo-app/expansion/expansion-demo.scss    |   2 +-
 src/demo-app/grid-list/grid-list-demo.html    | 142 ++--
 src/demo-app/icon/icon-demo.html              |  22 +-
 src/demo-app/icon/icon-demo.ts                |   8 +-
 src/demo-app/index.html                       |   2 +-
 src/demo-app/input/input-demo.html            | 496 +++++++-------
 src/demo-app/list/list-demo.html              | 156 ++---
 .../live-announcer/live-announcer-demo.html   |   2 +-
 src/demo-app/menu/menu-demo.html              | 200 +++---
 .../progress-bar/progress-bar-demo.html       |  34 +-
 .../progress-bar/progress-bar-demo.scss       |   2 +-
 .../progress-spinner-demo.html                |  30 +-
 src/demo-app/radio/radio-demo.html            |  38 +-
 src/demo-app/ripple/ripple-demo.html          |  66 +-
 src/demo-app/ripple/ripple-demo.ts            |   4 +-
 src/demo-app/select/select-demo.html          | 204 +++---
 src/demo-app/select/select-demo.ts            |   4 +-
 src/demo-app/sidenav/sidenav-demo.html        |  48 +-
 .../slide-toggle/slide-toggle-demo.html       |  18 +-
 .../slide-toggle/slide-toggle-demo.scss       |   2 +-
 src/demo-app/slider/slider-demo.html          |  50 +-
 src/demo-app/snack-bar/snack-bar-demo.html    |  56 +-
 src/demo-app/snack-bar/snack-bar-demo.ts      |  16 +-
 src/demo-app/stepper/stepper-demo.html        | 258 ++++----
 src/demo-app/table/person-data-source.ts      |   6 +-
 src/demo-app/table/table-demo.html            |  86 +--
 src/demo-app/table/table-demo.scss            |   2 +-
 src/demo-app/table/table-demo.ts              |   6 +-
 src/demo-app/table/table-header-demo.html     |  16 +-
 src/demo-app/tabs/tabs-demo.html              | 170 ++---
 src/demo-app/toolbar/toolbar-demo.html        |  50 +-
 src/demo-app/tooltip/tooltip-demo.html        |  58 +-
 src/e2e-app/button/button-e2e.html            |  18 +-
 src/e2e-app/checkbox/checkbox-e2e.html        |   2 +-
 src/e2e-app/dialog/dialog-e2e.ts              |  10 +-
 src/e2e-app/e2e-app-module.ts                 |  68 +-
 src/e2e-app/e2e-app/e2e-app.html              |  46 +-
 src/e2e-app/fullscreen/fullscreen-e2e.ts      |   8 +-
 src/e2e-app/grid-list/grid-list-e2e.html      |  12 +-
 src/e2e-app/icon/icon-e2e.html                |   2 +-
 src/e2e-app/index.html                        |   2 +-
 src/e2e-app/input/input-e2e.html              |  24 +-
 src/e2e-app/menu/menu-e2e.html                |  40 +-
 .../progress-bar/progress-bar-e2e.html        |   8 +-
 src/e2e-app/progress-bar/progress-bar-e2e.ts  |   2 +-
 .../progress-spinner-e2e.html                 |   6 +-
 src/e2e-app/radio/radio-e2e.html              |  10 +-
 src/e2e-app/sidenav/sidenav-e2e.html          |   6 +-
 .../slide-toggle/slide-toggle-e2e.html        |   4 +-
 src/e2e-app/tabs/tabs-e2e.html                |  22 +-
 src/lib/autocomplete/autocomplete-module.ts   |  18 +-
 src/lib/autocomplete/autocomplete-trigger.ts  |  69 +-
 src/lib/autocomplete/autocomplete.md          |  48 +-
 src/lib/autocomplete/autocomplete.scss        |   2 +-
 src/lib/autocomplete/autocomplete.spec.ts     | 240 +++----
 src/lib/autocomplete/autocomplete.ts          |  30 +-
 src/lib/autocomplete/mat-exports.ts           |  27 -
 src/lib/autocomplete/public_api.ts            |   2 +-
 .../button-toggle/_button-toggle-theme.scss   |   2 +-
 src/lib/button-toggle/button-toggle-module.ts |  18 +-
 src/lib/button-toggle/button-toggle.md        |  10 +-
 src/lib/button-toggle/button-toggle.spec.ts   | 130 ++--
 src/lib/button-toggle/button-toggle.ts        |  68 +-
 src/lib/button-toggle/mat-exports.ts          |  26 -
 src/lib/button-toggle/public_api.ts           |   2 +-
 src/lib/button/_button-theme.scss             |   4 +-
 src/lib/button/button-module.ts               |  52 +-
 src/lib/button/button.html                    |   2 +-
 src/lib/button/button.md                      |  14 +-
 src/lib/button/button.spec.ts                 |  58 +-
 src/lib/button/button.ts                      |  65 +-
 src/lib/button/mat-exports.ts                 |  29 -
 src/lib/button/public_api.ts                  |   2 +-
 src/lib/card/card-header.html                 |   7 +-
 src/lib/card/card-module.ts                   |  70 +-
 src/lib/card/card-title-group.html            |   5 +-
 src/lib/card/card.html                        |   2 +-
 src/lib/card/card.md                          |  46 +-
 src/lib/card/card.ts                          |  72 +--
 src/lib/card/mat-exports.ts                   |  42 --
 src/lib/card/public_api.ts                    |   2 +-
 src/lib/checkbox/checkbox-module.ts           |  14 +-
 .../checkbox/checkbox-required-validator.ts   |  16 +-
 src/lib/checkbox/checkbox.html                |   2 +-
 src/lib/checkbox/checkbox.md                  |  14 +-
 src/lib/checkbox/checkbox.spec.ts             |  94 +--
 src/lib/checkbox/checkbox.ts                  |  45 +-
 src/lib/checkbox/mat-exports.ts               |  28 -
 src/lib/checkbox/public_api.ts                |   2 +-
 src/lib/chips/chip-input.spec.ts              |  28 +-
 src/lib/chips/chip-input.ts                   |  30 +-
 src/lib/chips/chip-list.spec.ts               | 142 ++--
 src/lib/chips/chip-list.ts                    |  66 +-
 src/lib/chips/chip-remove.spec.ts             |   8 +-
 src/lib/chips/chip.spec.ts                    |  46 +-
 src/lib/chips/chip.ts                         |  59 +-
 src/lib/chips/chips-module.ts                 |  12 +-
 src/lib/chips/chips.md                        |  50 +-
 src/lib/chips/mat-exports.ts                  |  24 -
 src/lib/chips/public_api.ts                   |   2 +-
 src/lib/core/_core.scss                       |   2 +-
 .../core/common-behaviors/common-module.ts    |   6 +-
 src/lib/core/common-behaviors/index.ts        |   2 +-
 .../core/compatibility/compatibility.spec.ts  | 104 ---
 src/lib/core/compatibility/compatibility.ts   |  40 +-
 src/lib/core/datetime/date-formats.ts         |   4 +-
 src/lib/core/datetime/index.ts                |   8 +-
 src/lib/core/datetime/native-date-formats.ts  |   4 +-
 src/lib/core/error/error-options.ts           |   3 +-
 src/lib/core/line/line.ts                     |  20 +-
 src/lib/core/mat-exports.ts                   |  49 --
 src/lib/core/option/_option.scss              |   4 +-
 src/lib/core/option/index.ts                  |  16 +-
 src/lib/core/option/optgroup.html             |   2 +-
 src/lib/core/option/optgroup.ts               |  12 +-
 src/lib/core/option/option.spec.ts            |  12 +-
 src/lib/core/option/option.ts                 |  28 +-
 .../core/placeholder/placeholder-options.ts   |   4 +-
 src/lib/core/public_api.ts                    |   2 +-
 src/lib/core/ripple/README.md                 |  24 +-
 src/lib/core/ripple/_ripple.scss              |   2 +-
 src/lib/core/ripple/index.ts                  |  14 +-
 src/lib/core/ripple/ripple.spec.ts            |  42 +-
 src/lib/core/ripple/ripple.ts                 |  61 +-
 src/lib/core/selection/index.ts               |   8 +-
 .../pseudo-checkbox/pseudo-checkbox.ts        |  10 +-
 src/lib/core/style/_menu-common.scss          |   2 +-
 src/lib/datepicker/calendar-body.spec.ts      |  16 +-
 src/lib/datepicker/calendar-body.ts           |  10 +-
 src/lib/datepicker/calendar.html              |   4 +-
 src/lib/datepicker/calendar.spec.ts           |  84 +--
 src/lib/datepicker/calendar.ts                |  20 +-
 .../datepicker/coerce-date-property.spec.ts   |   4 +-
 src/lib/datepicker/datepicker-content.scss    |  46 +-
 src/lib/datepicker/datepicker-errors.ts       |   4 +-
 src/lib/datepicker/datepicker-input.ts        |  76 +--
 src/lib/datepicker/datepicker-intl.ts         |   2 +-
 src/lib/datepicker/datepicker-module.ts       |  72 +--
 src/lib/datepicker/datepicker-toggle.ts       |  22 +-
 src/lib/datepicker/datepicker.md              |  84 +--
 src/lib/datepicker/datepicker.spec.ts         | 203 +++---
 src/lib/datepicker/datepicker.ts              |  65 +-
 src/lib/datepicker/mat-exports.ts             |  48 --
 src/lib/datepicker/month-view.spec.ts         |  22 +-
 src/lib/datepicker/month-view.ts              |  22 +-
 src/lib/datepicker/public_api.ts              |   2 +-
 src/lib/datepicker/year-view.spec.ts          |  24 +-
 src/lib/datepicker/year-view.ts               |  18 +-
 src/lib/dialog/dialog-config.ts               |   4 +-
 src/lib/dialog/dialog-container.ts            |  14 +-
 src/lib/dialog/dialog-content-directives.ts   |  36 +-
 src/lib/dialog/dialog-module.ts               |  46 +-
 src/lib/dialog/dialog-ref.ts                  |  10 +-
 src/lib/dialog/dialog.md                      |  46 +-
 src/lib/dialog/dialog.spec.ts                 | 152 ++---
 src/lib/dialog/dialog.ts                      |  80 +--
 src/lib/dialog/mat-exports.ts                 |  40 --
 src/lib/dialog/public_api.ts                  |   2 +-
 src/lib/expansion/accordion.spec.ts           |  20 +-
 src/lib/expansion/accordion.ts                |  10 +-
 src/lib/expansion/expansion-module.ts         |  40 +-
 src/lib/expansion/expansion-panel-header.html |   4 +-
 src/lib/expansion/expansion-panel-header.ts   |  28 +-
 src/lib/expansion/expansion-panel.html        |   4 +-
 src/lib/expansion/expansion-panel.ts          |  30 +-
 src/lib/expansion/expansion.md                |  68 +-
 src/lib/expansion/expansion.spec.ts           |  26 +-
 src/lib/expansion/mat-exports.ts              |  31 -
 src/lib/expansion/public_api.ts               |  18 +-
 src/lib/form-field/error.ts                   |   4 +-
 src/lib/form-field/form-field-control.ts      |  10 +-
 src/lib/form-field/form-field-errors.ts       |  10 +-
 src/lib/form-field/form-field-module.ts       |  38 +-
 src/lib/form-field/form-field.html            |  12 +-
 src/lib/form-field/form-field.scss            |   2 +-
 src/lib/form-field/form-field.ts              |  68 +-
 src/lib/form-field/hint.ts                    |   4 +-
 src/lib/form-field/mat-exports.ts             |  28 -
 src/lib/form-field/placeholder.ts             |   6 +-
 src/lib/form-field/prefix.ts                  |   4 +-
 src/lib/form-field/public_api.ts              |   2 +-
 src/lib/form-field/suffix.ts                  |   4 +-
 src/lib/grid-list/grid-list-module.ts         |  40 +-
 src/lib/grid-list/grid-list.md                |  12 +-
 src/lib/grid-list/grid-list.spec.ts           | 176 ++---
 src/lib/grid-list/grid-list.ts                |  16 +-
 src/lib/grid-list/grid-tile-text.html         |   4 +-
 src/lib/grid-list/grid-tile.ts                |  28 +-
 src/lib/grid-list/mat-exports.ts              |  16 -
 src/lib/grid-list/public_api.ts               |   4 +-
 src/lib/grid-list/tile-coordinator.ts         |  10 +-
 src/lib/grid-list/tile-styler.ts              |  32 +-
 src/lib/icon/icon-module.ts                   |  12 +-
 src/lib/icon/icon-registry.ts                 |  44 +-
 src/lib/icon/icon.md                          |  38 +-
 src/lib/icon/icon.spec.ts                     | 144 ++---
 src/lib/icon/icon.ts                          |  38 +-
 src/lib/icon/mat-exports.ts                   |  17 -
 src/lib/icon/public_api.ts                    |   2 +-
 src/lib/input/autosize.spec.ts                |  26 +-
 src/lib/input/autosize.ts                     |  19 +-
 src/lib/input/input-errors.ts                 |   4 +-
 src/lib/input/input-module.ts                 |  24 +-
 src/lib/input/input.md                        |  58 +-
 src/lib/input/input.spec.ts                   | 606 +++++++++---------
 src/lib/input/input.ts                        |  38 +-
 src/lib/input/mat-exports.ts                  |  16 -
 src/lib/input/public_api.ts                   |   2 +-
 src/lib/list/list-item.html                   |   6 +-
 src/lib/list/list-module.ts                   |  82 +--
 src/lib/list/list.md                          | 146 ++---
 src/lib/list/list.spec.ts                     | 140 ++--
 src/lib/list/list.ts                          |  69 +-
 src/lib/list/mat-exports.ts                   |  48 --
 src/lib/list/public_api.ts                    |   2 +-
 src/lib/list/selection-list.spec.ts           | 124 ++--
 src/lib/list/selection-list.ts                |  62 +-
 src/lib/menu/mat-exports.ts                   |  26 -
 src/lib/menu/menu-animations.ts               |   2 +-
 src/lib/menu/menu-directive.ts                |  46 +-
 src/lib/menu/menu-errors.ts                   |  18 +-
 src/lib/menu/menu-item.ts                     |  19 +-
 src/lib/menu/menu-module.ts                   |  24 +-
 src/lib/menu/menu-panel.ts                    |   4 +-
 src/lib/menu/menu-trigger.ts                  |  71 +-
 src/lib/menu/menu.md                          |  82 +--
 src/lib/menu/menu.spec.ts                     | 188 +++---
 src/lib/menu/menu.ts                          |   8 +-
 src/lib/menu/public_api.ts                    |   4 +-
 src/lib/paginator/mat-exports.ts              |  16 -
 src/lib/paginator/paginator-intl.ts           |   4 +-
 src/lib/paginator/paginator-module.ts         |  24 +-
 src/lib/paginator/paginator.md                |   6 +-
 src/lib/paginator/paginator.spec.ts           |  66 +-
 src/lib/paginator/paginator.ts                |  10 +-
 src/lib/paginator/public_api.ts               |   2 +-
 src/lib/progress-bar/mat-exports.ts           |  14 -
 src/lib/progress-bar/progress-bar-module.ts   |  12 +-
 src/lib/progress-bar/progress-bar.md          |   2 +-
 src/lib/progress-bar/progress-bar.scss        |   6 +-
 src/lib/progress-bar/progress-bar.spec.ts     |  20 +-
 src/lib/progress-bar/progress-bar.ts          |   6 +-
 src/lib/progress-bar/public_api.ts            |   2 +-
 src/lib/progress-spinner/mat-exports.ts       |  22 -
 .../progress-spinner-module.ts                |  26 +-
 src/lib/progress-spinner/progress-spinner.md  |   4 +-
 .../progress-spinner/progress-spinner.spec.ts |  46 +-
 src/lib/progress-spinner/progress-spinner.ts  |  24 +-
 src/lib/progress-spinner/public_api.ts        |   2 +-
 src/lib/radio/mat-exports.ts                  |  26 -
 src/lib/radio/public_api.ts                   |   2 +-
 src/lib/radio/radio-module.ts                 |  14 +-
 src/lib/radio/radio.md                        |  12 +-
 src/lib/radio/radio.spec.ts                   |  94 +--
 src/lib/radio/radio.ts                        |  95 +--
 src/lib/select/mat-exports.ts                 |  28 -
 src/lib/select/public_api.ts                  |   1 -
 src/lib/select/select-animations.ts           |   4 +-
 src/lib/select/select-errors.ts               |   6 +-
 src/lib/select/select-module.ts               |  16 +-
 src/lib/select/select.html                    |   2 +-
 src/lib/select/select.md                      |  68 +-
 src/lib/select/select.spec.ts                 | 537 ++++++++--------
 src/lib/select/select.ts                      | 108 ++--
 src/lib/sidenav/README.md                     |  64 +-
 src/lib/sidenav/drawer-container.html         |   8 +-
 src/lib/sidenav/drawer.scss                   |   2 +-
 src/lib/sidenav/drawer.spec.ts                | 106 +--
 src/lib/sidenav/drawer.ts                     |  70 +-
 src/lib/sidenav/mat-exports.ts                |  19 -
 src/lib/sidenav/public_api.ts                 |   2 +-
 src/lib/sidenav/sidenav-container.html        |   8 +-
 src/lib/sidenav/sidenav-module.ts             |  36 +-
 src/lib/sidenav/sidenav.md                    |  40 +-
 src/lib/sidenav/sidenav.spec.ts               |  20 +-
 src/lib/sidenav/sidenav.ts                    |  20 +-
 src/lib/slide-toggle/mat-exports.ts           |  22 -
 src/lib/slide-toggle/public_api.ts            |   2 +-
 src/lib/slide-toggle/slide-toggle-module.ts   |  14 +-
 src/lib/slide-toggle/slide-toggle.md          |  14 +-
 src/lib/slide-toggle/slide-toggle.spec.ts     |  58 +-
 src/lib/slide-toggle/slide-toggle.ts          |  36 +-
 src/lib/slider/mat-exports.ts                 |  22 -
 src/lib/slider/public_api.ts                  |   2 +-
 src/lib/slider/slider-module.ts               |  12 +-
 src/lib/slider/slider.md                      |  14 +-
 src/lib/slider/slider.spec.ts                 | 136 ++--
 src/lib/slider/slider.ts                      |  34 +-
 src/lib/snack-bar/mat-exports.ts              |  21 -
 src/lib/snack-bar/public_api.ts               |   2 +-
 src/lib/snack-bar/simple-snack-bar.ts         |   8 +-
 src/lib/snack-bar/snack-bar-config.ts         |  20 +-
 src/lib/snack-bar/snack-bar-container.ts      |   6 +-
 src/lib/snack-bar/snack-bar-module.ts         |  18 +-
 src/lib/snack-bar/snack-bar-ref.ts            |   8 +-
 src/lib/snack-bar/snack-bar.md                |  16 +-
 src/lib/snack-bar/snack-bar.spec.ts           | 100 +--
 src/lib/snack-bar/snack-bar.ts                |  44 +-
 src/lib/sort/mat-exports.ts                   |  19 -
 src/lib/sort/public_api.ts                    |   2 +-
 src/lib/sort/sort-errors.ts                   |  12 +-
 src/lib/sort/sort-header-intl.ts              |   4 +-
 src/lib/sort/sort-header.ts                   |  26 +-
 src/lib/sort/sort-module.ts                   |  14 +-
 src/lib/sort/sort.md                          |  18 +-
 src/lib/sort/sort.spec.ts                     | 217 ++++---
 src/lib/sort/sort.ts                          |  75 +--
 src/lib/stepper/mat-exports.ts                |  29 -
 src/lib/stepper/public_api.ts                 |   2 +-
 src/lib/stepper/step-header.ts                |  18 +-
 src/lib/stepper/step-label.ts                 |   6 +-
 src/lib/stepper/stepper-button.ts             |  18 +-
 src/lib/stepper/stepper-module.ts             |  44 +-
 src/lib/stepper/stepper.md                    |  86 +--
 src/lib/stepper/stepper.spec.ts               | 307 ++++-----
 src/lib/stepper/stepper.ts                    |  51 +-
 src/lib/table/cell.ts                         |  49 +-
 src/lib/table/mat-exports.ts                  |  23 -
 src/lib/table/public_api.ts                   |   2 +-
 src/lib/table/row.ts                          |  40 +-
 src/lib/table/table-module.ts                 |  22 +-
 src/lib/table/table.md                        |  12 +-
 src/lib/table/table.spec.ts                   |  44 +-
 src/lib/table/table.ts                        |   6 +-
 src/lib/tabs/ink-bar.ts                       |   4 +-
 src/lib/tabs/mat-exports.ts                   |  34 -
 src/lib/tabs/public_api.ts                    |  16 +-
 src/lib/tabs/tab-body.spec.ts                 |  42 +-
 src/lib/tabs/tab-body.ts                      |  14 +-
 src/lib/tabs/tab-group.scss                   |   2 +-
 src/lib/tabs/tab-group.spec.ts                | 150 ++---
 src/lib/tabs/tab-group.ts                     |  70 +-
 src/lib/tabs/tab-header.spec.ts               | 112 ++--
 src/lib/tabs/tab-header.ts                    |  26 +-
 src/lib/tabs/tab-label-wrapper.ts             |  12 +-
 src/lib/tabs/tab-label.ts                     |   6 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts  |  22 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts       |  47 +-
 src/lib/tabs/tab.ts                           |  20 +-
 src/lib/tabs/tabs-module.ts                   |  54 +-
 src/lib/tabs/tabs.md                          |  40 +-
 src/lib/toolbar/mat-exports.ts                |  16 -
 src/lib/toolbar/public_api.ts                 |   2 +-
 src/lib/toolbar/toolbar-module.ts             |  12 +-
 src/lib/toolbar/toolbar.html                  |   2 +-
 src/lib/toolbar/toolbar.md                    |  24 +-
 src/lib/toolbar/toolbar.spec.ts               |  10 +-
 src/lib/toolbar/toolbar.ts                    |  21 +-
 src/lib/tooltip/mat-exports.ts                |  23 -
 src/lib/tooltip/public_api.ts                 |   2 +-
 src/lib/tooltip/tooltip-module.ts             |  14 +-
 src/lib/tooltip/tooltip.md                    |   8 +-
 src/lib/tooltip/tooltip.spec.ts               |  46 +-
 src/lib/tooltip/tooltip.ts                    |  77 +--
 .../autocomplete-display-example.html         |  14 +-
 .../autocomplete-filter-example.html          |  14 +-
 .../autocomplete-overview-example.html        |  18 +-
 .../autocomplete-simple-example.html          |  14 +-
 .../button-overview-example.html              |   2 +-
 .../button-toggle-exclusive-example.html      |  28 +-
 .../button-toggle-overview-example.html       |   2 +-
 .../button-types/button-types-example.html    |  76 +--
 .../card-fancy/card-fancy-example.html        |  28 +-
 .../card-overview/card-overview-example.html  |   2 +-
 .../checkbox-configurable-example.html        |  34 +-
 .../checkbox-overview-example.html            |   2 +-
 .../chips-input/chips-input-example.html      |  24 +-
 .../chips-input/chips-input-example.ts        |   4 +-
 .../chips-overview-example.html               |  12 +-
 .../chips-stacked/chips-stacked-example.css   |   2 +-
 .../chips-stacked/chips-stacked-example.html  |   8 +-
 .../datepicker-api-example.html               |  10 +-
 .../datepicker-filter-example.html            |  10 +-
 .../datepicker-min-max-example.html           |  10 +-
 .../datepicker-overview-example.html          |  10 +-
 .../datepicker-start-view-example.html        |  10 +-
 .../datepicker-touch-example.html             |  10 +-
 .../dialog-content-example-dialog.html        |  14 +-
 .../dialog-content-example.html               |   2 +-
 .../dialog-content/dialog-content-example.ts  |   4 +-
 .../dialog-data-example-dialog.html           |   4 +-
 .../dialog-data/dialog-data-example.html      |   2 +-
 .../dialog-data/dialog-data-example.ts        |   6 +-
 .../dialog-elements-example-dialog.html       |   8 +-
 .../dialog-elements-example.html              |   2 +-
 .../dialog-elements-example.ts                |   4 +-
 .../dialog-overview-example-dialog.html       |  16 +-
 .../dialog-overview-example.html              |   8 +-
 .../dialog-overview-example.ts                |   8 +-
 .../expansion-overview-example.html           |  28 +-
 .../expansion-steps-example.html              | 106 +--
 .../grid-list-dynamic-example.html            |   8 +-
 .../grid-list-overview-example.css            |   2 +-
 .../grid-list-overview-example.html           |  12 +-
 .../icon-overview/icon-overview-example.html  |   2 +-
 .../icon-svg-example/icon-svg-example.html    |   2 +-
 .../icon-svg-example/icon-svg-example.ts      |   4 +-
 .../input-clearable-example.html              |  10 +-
 .../input-errors/input-errors-example.html    |  14 +-
 .../input-form/input-form-example.html        |  50 +-
 .../input-hint/input-hint-example.html        |  10 +-
 .../input-overview-example.html               |   6 +-
 .../input-prefix-suffix-example.html          |  10 +-
 .../list-overview/list-overview-example.html  |  10 +-
 .../list-sections/list-sections-example.html  |  30 +-
 .../list-selection-example.html               |   8 +-
 src/material-examples/material-module.ts      |  74 +--
 .../menu-icons/menu-icons-example.html        |  20 +-
 .../menu-overview/menu-overview-example.html  |  10 +-
 .../nested-menu/nested-menu-example.html      |  82 +--
 .../paginator-configurable-example.html       |  22 +-
 .../paginator-configurable-example.ts         |   4 +-
 .../paginator-overview-example.html           |   4 +-
 .../progress-bar-configurable-example.html    |  60 +-
 .../progress-bar-overview-example.html        |   2 +-
 ...progress-spinner-configurable-example.html |  50 +-
 .../progress-spinner-overview-example.html    |   2 +-
 .../radio-ng-model-example.html               |   8 +-
 .../radio-overview-example.html               |   8 +-
 .../select-form/select-form-example.html      |  12 +-
 .../select-overview-example.html              |  12 +-
 .../sidenav-fab/sidenav-fab-example.css       |   4 +-
 .../sidenav-fab/sidenav-fab-example.html      |  16 +-
 .../sidenav-overview-example.html             |  10 +-
 .../slide-toggle-configurable-example.html    |  40 +-
 .../slide-toggle-forms-example.css            |   2 +-
 .../slide-toggle-forms-example.html           |  14 +-
 .../slide-toggle-overview-example.html        |   2 +-
 .../slider-configurable-example.html          |  64 +-
 .../slider-overview-example.css               |   2 +-
 .../slider-overview-example.html              |   2 +-
 .../snack-bar-component-example.html          |   2 +-
 .../snack-bar-component-example.ts            |   4 +-
 .../snack-bar-overview-example.html           |  14 +-
 .../snack-bar-overview-example.ts             |   4 +-
 .../sort-overview/sort-overview-example.html  |  12 +-
 .../stepper-overview-example.html             |  42 +-
 .../table-basic/table-basic-example.html      |  32 +-
 .../table-filtering-example.html              |  38 +-
 .../table-http/table-http-example.html        |  44 +-
 .../table-http/table-http-example.ts          |  10 +-
 .../table-overview-example.html               |  62 +-
 .../table-overview/table-overview-example.ts  |  10 +-
 .../table-pagination-example.html             |  36 +-
 .../table-pagination-example.ts               |   6 +-
 .../table-sorting/table-sorting-example.html  |  32 +-
 .../table-sorting/table-sorting-example.ts    |   6 +-
 .../tabs-overview/tabs-overview-example.html  |   8 +-
 .../tabs-template-label-example.html          |  30 +-
 .../toolbar-multirow-example.html             |  18 +-
 .../toolbar-overview-example.html             |   2 +-
 .../tooltip-overview-example.html             |   2 +-
 .../tooltip-position-example.html             |  22 +-
 src/material-moment-adapter/adapter/index.ts  |   8 +-
 .../adapter/moment-date-formats.ts            |   4 +-
 .../kitchen-sink/kitchen-sink.html            | 302 ++++-----
 .../kitchen-sink/kitchen-sink.ts              | 120 ++--
 test/protractor.conf.js                       |   4 +-
 .../app/coverage-chart/coverage-chart.html    |   2 +-
 tools/dashboard/src/app/dashboard-app.html    |  24 +-
 tools/dashboard/src/app/dashboard-module.ts   |   8 +-
 .../src/app/payload-chart/payload-chart.html  |   2 +-
 tools/dgeni/processors/categorizer.js         |   2 +-
 .../src/app/nav/nav.component.html            |   8 +-
 .../src/app/pixacto.dashboard.module.ts       |  18 +-
 .../src/app/result/result.component.html      |  42 +-
 .../src/app/viewer/viewer.component.html      |  34 +-
 .../src/app/viewer/viewer.component.ts        |   4 +-
 554 files changed, 8545 insertions(+), 9735 deletions(-)
 delete mode 100644 src/lib/autocomplete/mat-exports.ts
 delete mode 100644 src/lib/button-toggle/mat-exports.ts
 delete mode 100644 src/lib/button/mat-exports.ts
 delete mode 100644 src/lib/card/mat-exports.ts
 delete mode 100644 src/lib/checkbox/mat-exports.ts
 delete mode 100644 src/lib/chips/mat-exports.ts
 delete mode 100644 src/lib/core/mat-exports.ts
 delete mode 100644 src/lib/datepicker/mat-exports.ts
 delete mode 100644 src/lib/dialog/mat-exports.ts
 delete mode 100644 src/lib/expansion/mat-exports.ts
 delete mode 100644 src/lib/form-field/mat-exports.ts
 delete mode 100644 src/lib/grid-list/mat-exports.ts
 delete mode 100644 src/lib/icon/mat-exports.ts
 delete mode 100644 src/lib/input/mat-exports.ts
 delete mode 100644 src/lib/list/mat-exports.ts
 delete mode 100644 src/lib/menu/mat-exports.ts
 delete mode 100644 src/lib/paginator/mat-exports.ts
 delete mode 100644 src/lib/progress-bar/mat-exports.ts
 delete mode 100644 src/lib/progress-spinner/mat-exports.ts
 delete mode 100644 src/lib/radio/mat-exports.ts
 delete mode 100644 src/lib/select/mat-exports.ts
 delete mode 100644 src/lib/sidenav/mat-exports.ts
 delete mode 100644 src/lib/slide-toggle/mat-exports.ts
 delete mode 100644 src/lib/slider/mat-exports.ts
 delete mode 100644 src/lib/snack-bar/mat-exports.ts
 delete mode 100644 src/lib/sort/mat-exports.ts
 delete mode 100644 src/lib/stepper/mat-exports.ts
 delete mode 100644 src/lib/table/mat-exports.ts
 delete mode 100644 src/lib/tabs/mat-exports.ts
 delete mode 100644 src/lib/toolbar/mat-exports.ts
 delete mode 100644 src/lib/tooltip/mat-exports.ts

diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
index aff6f30f3c25..b9cde2891ae0 100644
--- a/CODING_STANDARDS.md
+++ b/CODING_STANDARDS.md
@@ -49,16 +49,16 @@ In HTML code, use `<!-- ... -->` comments, which will be stripped when packaging
 
 For example, rather than doing this:
 ```html
-<md-button>Basic button</md-button>
-<md-button class="mat-fab">FAB</md-button>
-<md-button class="mat-icon-button">pony</md-button>
+<mat-button>Basic button</mat-button>
+<mat-button class="mat-fab">FAB</mat-button>
+<mat-button class="mat-icon-button">pony</mat-button>
 ```
 
 do this:
 ```html
-<md-button>Basic button</md-button>
-<md-fab>FAB</md-fab>
-<md-icon-button>pony</md-icon-button>
+<mat-button>Basic button</mat-button>
+<mat-fab>FAB</mat-fab>
+<mat-icon-button>pony</mat-icon-button>
 ```
 
 #### Prefer small, focused modules
@@ -191,7 +191,7 @@ and the return value:
    * @param config Dialog configuration options.
    * @returns Reference to the newly-opened dialog.
    */
-  open<T>(component: ComponentType<T>, config?: MdDialogConfig): MdDialogRef<T> { ... }
+  open<T>(component: ComponentType<T>, config?: MatDialogConfig): MatDialogRef<T> { ... }
 ```
 
 Boolean properties and return values should use "Whether..." as opposed to "True if...":
@@ -229,7 +229,7 @@ class UniqueSelectionDispatcher { }
 Avoid suffixing a class with "Service", as it communicates nothing about what the class does. Try to
 think of the class name as a person's job title.
 
-Classes that correspond to a directive with an `md-` prefix should also be prefixed with `Md`.
+Classes that correspond to a directive with an `mat-` prefix should also be prefixed with `Mat`.
 CDK classes should only have a `Cdk` prefix when the class is a directive with a `cdk` selector
 prefix.
 
diff --git a/e2e/components/button-toggle-e2e.spec.ts b/e2e/components/button-toggle-e2e.spec.ts
index 8f8b1b3e60c0..b302ee63b556 100644
--- a/e2e/components/button-toggle-e2e.spec.ts
+++ b/e2e/components/button-toggle-e2e.spec.ts
@@ -6,7 +6,7 @@ describe('button-toggle', () => {
   beforeEach(() => browser.get('/button-toggle'));
 
   it('should show a button-toggle', async () => {
-    expect(element(by.tagName('md-button-toggle'))).toBeDefined();
+    expect(element(by.tagName('mat-button-toggle'))).toBeDefined();
     screenshot();
   });
 
diff --git a/e2e/components/card-e2e.spec.ts b/e2e/components/card-e2e.spec.ts
index aac7d38abd39..14f0cd6e3b6b 100644
--- a/e2e/components/card-e2e.spec.ts
+++ b/e2e/components/card-e2e.spec.ts
@@ -1,12 +1,12 @@
 import {browser, by, element} from 'protractor';
 import {screenshot} from '../screenshot';
 
-describe('md-card', () => {
+describe('mat-card', () => {
 
   beforeEach(() => browser.get('/cards'));
 
   it('should show a card', async () => {
-    const card = element(by.tagName('md-card'));
+    const card = element(by.tagName('mat-card'));
     expect(card).toBeDefined();
 
     screenshot('fancy card example');
diff --git a/e2e/components/dialog-e2e.spec.ts b/e2e/components/dialog-e2e.spec.ts
index d3887c7e0649..b5a9b3ab0a45 100644
--- a/e2e/components/dialog-e2e.spec.ts
+++ b/e2e/components/dialog-e2e.spec.ts
@@ -14,7 +14,7 @@ describe('dialog', () => {
 
   it('should open a dialog', () => {
     element(by.id('default')).click();
-    expectToExist('md-dialog-container');
+    expectToExist('mat-dialog-container');
     screenshot('simple dialog opened');
   });
 
@@ -29,7 +29,7 @@ describe('dialog', () => {
 
     await waitForDialog();
     clickOnBackrop();
-    expectToExist('md-dialog-container', false);
+    expectToExist('mat-dialog-container', false);
   });
 
   it('should close by pressing escape', async () => {
@@ -37,7 +37,7 @@ describe('dialog', () => {
 
     await waitForDialog();
     pressKeys(Key.ESCAPE);
-    expectToExist('md-dialog-container', false);
+    expectToExist('mat-dialog-container', false);
   });
 
   it('should close by pressing escape when the first tabbable element has lost focus',
@@ -45,9 +45,9 @@ describe('dialog', () => {
       element(by.id('default')).click();
 
       await waitForDialog();
-      clickElementAtPoint('md-dialog-container', { x: 0, y: 0 });
+      clickElementAtPoint('mat-dialog-container', { x: 0, y: 0 });
       pressKeys(Key.ESCAPE);
-      expectToExist('md-dialog-container', false);
+      expectToExist('mat-dialog-container', false);
     });
 
   it('should close by clicking on the "close" button', async () => {
@@ -55,14 +55,14 @@ describe('dialog', () => {
 
     await waitForDialog();
     element(by.id('close')).click();
-    expectToExist('md-dialog-container', false);
+    expectToExist('mat-dialog-container', false);
   });
 
   it('should focus the first focusable element', async () => {
     element(by.id('default')).click();
 
     await waitForDialog();
-    expectFocusOn('md-dialog-container input');
+    expectFocusOn('mat-dialog-container input');
   });
 
   it('should restore focus to the element that opened the dialog', async () => {
@@ -88,7 +88,7 @@ describe('dialog', () => {
 
     await waitForDialog();
     clickOnBackrop();
-    expectToExist('md-dialog-container');
+    expectToExist('mat-dialog-container');
   });
 
   it('should be able to prevent closing by pressing escape', async () => {
@@ -96,11 +96,11 @@ describe('dialog', () => {
 
     await waitForDialog();
     pressKeys(Key.ESCAPE);
-    expectToExist('md-dialog-container');
+    expectToExist('mat-dialog-container');
   });
 
   function waitForDialog() {
-    return waitForElement('md-dialog-container');
+    return waitForElement('mat-dialog-container');
   }
 
   function clickOnBackrop() {
diff --git a/e2e/components/grid-list-e2e.spec.ts b/e2e/components/grid-list-e2e.spec.ts
index a70c8176c8ee..d4f0858099fa 100644
--- a/e2e/components/grid-list-e2e.spec.ts
+++ b/e2e/components/grid-list-e2e.spec.ts
@@ -6,11 +6,11 @@ describe('grid-list', () => {
   beforeEach(() => browser.get('/grid-list'));
 
   it('should render a grid list container', () => {
-    expectToExist('md-grid-list');
+    expectToExist('mat-grid-list');
     screenshot();
   });
 
   it('should render list items inside the grid list container', () => {
-    expectToExist('md-grid-list md-grid-tile');
+    expectToExist('mat-grid-list mat-grid-tile');
   });
 });
diff --git a/e2e/components/list-e2e.spec.ts b/e2e/components/list-e2e.spec.ts
index bdb541373d8f..e0016fd6fa4b 100644
--- a/e2e/components/list-e2e.spec.ts
+++ b/e2e/components/list-e2e.spec.ts
@@ -6,11 +6,11 @@ describe('list', () => {
   beforeEach(() => browser.get('/list'));
 
   it('should render a list container', () => {
-    expectToExist('md-list');
+    expectToExist('mat-list');
     screenshot();
   });
 
   it('should render list items inside the list container', () => {
-    expectToExist('md-list md-list-item');
+    expectToExist('mat-list mat-list-item');
   });
 });
diff --git a/e2e/components/menu-e2e.spec.ts b/e2e/components/menu-e2e.spec.ts
index f9e442180c1a..f1b3a3dec680 100644
--- a/e2e/components/menu-e2e.spec.ts
+++ b/e2e/components/menu-e2e.spec.ts
@@ -207,7 +207,7 @@ export class MenuPage {
   trigger = () => element(by.id('trigger'));
   triggerTwo = () => element(by.id('trigger-two'));
   backdrop = () => element(by.css('.cdk-overlay-backdrop'));
-  items = (index: number) => element.all(by.css('[md-menu-item]')).get(index);
+  items = (index: number) => element.all(by.css('[mat-menu-item]')).get(index);
   textArea = () => element(by.id('text'));
   beforeTrigger = () => element(by.id('before-t'));
   aboveTrigger = () => element(by.id('above-t'));
diff --git a/e2e/components/progress-bar-e2e.spec.ts b/e2e/components/progress-bar-e2e.spec.ts
index aa62334f7235..3bf454764820 100644
--- a/e2e/components/progress-bar-e2e.spec.ts
+++ b/e2e/components/progress-bar-e2e.spec.ts
@@ -5,18 +5,18 @@ describe('progress-bar', () => {
   beforeEach(() => browser.get('/progress-bar'));
 
   it('should render a determinate progress bar', () => {
-    expectToExist('md-progress-bar[mode="determinate"]');
+    expectToExist('mat-progress-bar[mode="determinate"]');
   });
 
   it('should render a buffer progress bar', () => {
-    expectToExist('md-progress-bar[mode="buffer"]');
+    expectToExist('mat-progress-bar[mode="buffer"]');
   });
 
   it('should render a query progress bar', () => {
-    expectToExist('md-progress-bar[mode="query"]');
+    expectToExist('mat-progress-bar[mode="query"]');
   });
 
   it('should render a indeterminate progress bar', () => {
-    expectToExist('md-progress-bar[mode="indeterminate"]');
+    expectToExist('mat-progress-bar[mode="indeterminate"]');
   });
 });
diff --git a/e2e/components/progress-spinner-e2e.spec.ts b/e2e/components/progress-spinner-e2e.spec.ts
index a8e5238cb9ae..c415636ef8db 100644
--- a/e2e/components/progress-spinner-e2e.spec.ts
+++ b/e2e/components/progress-spinner-e2e.spec.ts
@@ -4,14 +4,14 @@ describe('progress-spinner', () => {
   beforeEach(() => browser.get('/progress-spinner'));
 
   it('should render a determinate progress spinner', () => {
-    expect(element(by.css('md-progress-spinner')).isPresent()).toBe(true);
+    expect(element(by.css('mat-progress-spinner')).isPresent()).toBe(true);
   });
 
   it('should render an indeterminate progress spinner', () => {
-    expect(element(by.css('md-progress-spinner[mode="indeterminate"]')).isPresent()).toBe(true);
+    expect(element(by.css('mat-progress-spinner[mode="indeterminate"]')).isPresent()).toBe(true);
   });
 
   it('should render a spinner', () => {
-    expect(element(by.css('md-spinner')).isPresent()).toBe(true);
+    expect(element(by.css('mat-spinner')).isPresent()).toBe(true);
   });
 });
diff --git a/e2e/components/sidenav-e2e.spec.ts b/e2e/components/sidenav-e2e.spec.ts
index 445d8bf63b76..9f90e4403652 100644
--- a/e2e/components/sidenav-e2e.spec.ts
+++ b/e2e/components/sidenav-e2e.spec.ts
@@ -6,7 +6,7 @@ describe('sidenav', () => {
 
     beforeEach(() => {
       browser.get('/sidenav');
-      sidenav = element(by.tagName('md-sidenav'));
+      sidenav = element(by.tagName('mat-sidenav'));
     });
 
     it('should be closed', () => {
diff --git a/e2e/components/slide-toggle-e2e.spec.ts b/e2e/components/slide-toggle-e2e.spec.ts
index 2780cb91a008..a8c232d06d54 100644
--- a/e2e/components/slide-toggle-e2e.spec.ts
+++ b/e2e/components/slide-toggle-e2e.spec.ts
@@ -10,7 +10,7 @@ describe('slide-toggle', () => {
   beforeEach(() => browser.get('slide-toggle'));
 
   it('should render a slide-toggle', () => {
-    expectToExist('md-slide-toggle');
+    expectToExist('mat-slide-toggle');
     screenshot();
   });
 
diff --git a/e2e/components/stepper-e2e.spec.ts b/e2e/components/stepper-e2e.spec.ts
index cd9b4b3d8211..d4745dcbde0d 100644
--- a/e2e/components/stepper-e2e.spec.ts
+++ b/e2e/components/stepper-e2e.spec.ts
@@ -10,8 +10,8 @@ describe('stepper', () => {
   beforeEach(() => browser.get('/stepper'));
 
   it('should render a stepper', () => {
-    expectToExist('md-horizontal-stepper');
-    screenshot('md-horizontal-stepper');
+    expectToExist('mat-horizontal-stepper');
+    screenshot('mat-horizontal-stepper');
   });
 
   describe('basic behavior', () => {
@@ -19,13 +19,13 @@ describe('stepper', () => {
       const previousButton = element.all(by.buttonText('Back'));
       const nextButton = element.all(by.buttonText('Next'));
 
-      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('1\nFill out your name');
 
       screenshot('start');
       nextButton.get(0).click();
 
-      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('2\nFill out your address');
 
       await browser.wait(ExpectedConditions.not(
@@ -34,7 +34,7 @@ describe('stepper', () => {
 
       previousButton.get(0).click();
 
-      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('1\nFill out your name');
 
       await browser.wait(ExpectedConditions.not(
@@ -43,7 +43,7 @@ describe('stepper', () => {
     });
 
     it('should change focus with keyboard interaction', () => {
-      let stepHeaders = element.all(by.css('md-step-header'));
+      let stepHeaders = element.all(by.css('mat-step-header'));
       stepHeaders.get(0).click();
 
       expectFocusOn(stepHeaders.get(0));
@@ -77,7 +77,7 @@ describe('stepper', () => {
       let nextButton = element.all(by.buttonText('Next'));
       nextButton.get(0).click();
 
-      expect(element(by.css('md-step-header[aria-selected="true"]')).getText())
+      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('1\nFill out your name');
     });
   });
diff --git a/e2e/components/tabs-e2e.spec.ts b/e2e/components/tabs-e2e.spec.ts
index a2df986deed6..8fc2971b85d5 100644
--- a/e2e/components/tabs-e2e.spec.ts
+++ b/e2e/components/tabs-e2e.spec.ts
@@ -19,9 +19,9 @@ describe('tabs', () => {
 
     beforeEach(() => {
       browser.get('/tabs');
-      tabGroup = element(by.css('md-tab-group'));
+      tabGroup = element(by.css('mat-tab-group'));
       tabLabels = element.all(by.css('.mat-tab-label'));
-      tabBodies = element.all(by.css('md-tab-body'));
+      tabBodies = element.all(by.css('mat-tab-body'));
     });
 
     it('should change tabs when the label is clicked', async () => {
diff --git a/e2e/components/toolbar-e2e.spec.ts b/e2e/components/toolbar-e2e.spec.ts
index 6b03e4abcb56..eaabb2c36aaa 100644
--- a/e2e/components/toolbar-e2e.spec.ts
+++ b/e2e/components/toolbar-e2e.spec.ts
@@ -1,12 +1,12 @@
 import {browser, by, element} from 'protractor';
 import {screenshot} from '../screenshot';
 
-describe('md-toolbar', () => {
+describe('mat-toolbar', () => {
 
   beforeEach(() => browser.get('/toolbar'));
 
   it('should show a toolbar', async () => {
-    expect(element(by.tagName('md-toolbar'))).toBeDefined();
+    expect(element(by.tagName('mat-toolbar'))).toBeDefined();
 
     screenshot('multiple toolbar components');
   });
diff --git a/guides/cdk-table.md b/guides/cdk-table.md
index 08a7027b3bfd..365ac59234c7 100644
--- a/guides/cdk-table.md
+++ b/guides/cdk-table.md
@@ -7,7 +7,7 @@ built. Because it enforces no opinions on these matters, developers have full co
 interaction patterns associated with the table.
 
 For a Material Design styled table, see the
-[documentation for `<md-table>`](https://material.angular.io/components/table) which builds on
+[documentation for `<mat-table>`](https://material.angular.io/components/table) which builds on
 top of the CDK data-table.
 
 <!-- example(cdk-table-basic) -->
diff --git a/guides/customizing-component-styles.md b/guides/customizing-component-styles.md
index a5db1a459e51..5a3a641578ac 100644
--- a/guides/customizing-component-styles.md
+++ b/guides/customizing-component-styles.md
@@ -30,7 +30,7 @@ You can read more about specificity and how it is calculated on the
 
 ##### Component location
 
-Some Angular Material components, specifically overlay-based ones like MdDialog, MdSnackbar, etc.,
+Some Angular Material components, specifically overlay-based ones like MatDialog, MatSnackbar, etc.,
 do not exist as children of your component. Often they are injected elsewhere in the DOM. This is
 important to keep in mind, since even using high specificity and shadow-piercing selectors will
 not target elements that are not direct children of your component. Global styles are recommended
diff --git a/guides/getting-started.md b/guides/getting-started.md
index d7d28ba9b550..21d9d8172e97 100644
--- a/guides/getting-started.md
+++ b/guides/getting-started.md
@@ -55,11 +55,11 @@ export class PizzaPartyAppModule { }
 Import the NgModule for each component you want to use: 
 
 ```ts
-import {MdButtonModule, MdCheckboxModule} from '@angular/material';
+import {MatButtonModule, MatCheckboxModule} from '@angular/material';
 
 @NgModule({
   ...
-  imports: [MdButtonModule, MdCheckboxModule],
+  imports: [MatButtonModule, MatCheckboxModule],
   ...
 })
 export class PizzaPartyAppModule { }
@@ -70,11 +70,11 @@ Angular Material components that you will use in your application. You can then
 include this module wherever you'd like to use the components.
 
 ```ts
-import {MdButtonModule, MdCheckboxModule} from '@angular/material';
+import {MatButtonModule, MatCheckboxModule} from '@angular/material';
 
 @NgModule({
-  imports: [MdButtonModule, MdCheckboxModule],
-  exports: [MdButtonModule, MdCheckboxModule],
+  imports: [MatButtonModule, MatCheckboxModule],
+  exports: [MatButtonModule, MatCheckboxModule],
 })
 export class MyOwnCustomMaterialModule { }
 ```
@@ -100,7 +100,7 @@ For more information on theming and instructions on how to create a custom theme
 
 ### Step 5: Gesture Support
 
-Some components (`md-slide-toggle`, `md-slider`, `mdTooltip`) rely on
+Some components (`mat-slide-toggle`, `mat-slider`, `matTooltip`) rely on
 [HammerJS](http://hammerjs.github.io/) for gestures. In order to get the full feature-set of these
 components, HammerJS must be loaded into the application.
 
@@ -120,7 +120,7 @@ import 'hammerjs';
 
 ### Step 6 (Optional): Add Material Icons
 
-If you want to use the `md-icon` component with the official 
+If you want to use the `mat-icon` component with the official 
 [Material Design Icons](https://material.io/icons/), load the icon font in your `index.html`.
 
 ```html
@@ -130,7 +130,7 @@ If you want to use the `md-icon` component with the official
 For more information on using Material Icons, check out the
 [Material Icons Guide](https://google.github.io/material-design-icons/).
 
-Note that `md-icon` supports any font or svg icons; using Material Icons is one of many options.
+Note that `mat-icon` supports any font or svg icons; using Material Icons is one of many options.
 
 
 ### Appendix: Configuring SystemJS
diff --git a/guides/theming.md b/guides/theming.md
index 22a103bd0380..aca2e50fc65c 100644
--- a/guides/theming.md
+++ b/guides/theming.md
@@ -46,7 +46,7 @@ The actual path will depend on your server setup.
 
 You can also concatenate the file with the rest of your application's css.
 
-Finally, if your app's content **is not** placed inside of a `md-sidenav-container` element, you
+Finally, if your app's content **is not** placed inside of a `mat-sidenav-container` element, you
 need to add the `mat-app-background` class to your wrapper element (for example the `body`). This
 ensures that the proper theme background is applied to your page.
 
diff --git a/package-lock.json b/package-lock.json
index 6cf8c6caee81..064d1fcfb498 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5247,7 +5247,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -15735,7 +15735,7 @@
     "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==",
+      "integrity": "sha1-F2n0tVHu3OQZ8FBd6uLiZ2NULTc=",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
diff --git a/src/cdk/a11y/interactivity-checker.spec.ts b/src/cdk/a11y/interactivity-checker.spec.ts
index 23473eb5ded6..e5fcdc61950d 100644
--- a/src/cdk/a11y/interactivity-checker.spec.ts
+++ b/src/cdk/a11y/interactivity-checker.spec.ts
@@ -21,7 +21,7 @@ describe('InteractivityChecker', () => {
 
   describe('isDisabled', () => {
     it('should return true for disabled elements', () => {
-      let elements = createElements('input', 'textarea', 'select', 'button', 'md-checkbox');
+      let elements = createElements('input', 'textarea', 'select', 'button', 'mat-checkbox');
       elements.forEach(el => el.setAttribute('disabled', ''));
       appendElements(elements);
 
@@ -32,7 +32,7 @@ describe('InteractivityChecker', () => {
     });
 
     it('should return false for elements without disabled', () => {
-      let elements = createElements('input', 'textarea', 'select', 'button', 'md-checkbox');
+      let elements = createElements('input', 'textarea', 'select', 'button', 'mat-checkbox');
       appendElements(elements);
 
       elements.forEach(el => {
diff --git a/src/cdk/bidi/directionality.ts b/src/cdk/bidi/directionality.ts
index 76c6985aa61c..c04962b3c85d 100644
--- a/src/cdk/bidi/directionality.ts
+++ b/src/cdk/bidi/directionality.ts
@@ -29,7 +29,7 @@ export type Direction = 'ltr' | 'rtl';
  * We also can't re-provide the DOCUMENT token from platform-brower because the unit tests
  * themselves use things like `querySelector` in test code.
  */
-export const DIR_DOCUMENT = new InjectionToken<Document>('md-dir-doc');
+export const DIR_DOCUMENT = new InjectionToken<Document>('mat-dir-doc');
 
 /**
  * The directionality (LTR / RTL) context for the application (or a subtree of it).
diff --git a/src/cdk/collections/selection.ts b/src/cdk/collections/selection.ts
index b2c199cfc9ef..c249544d4a33 100644
--- a/src/cdk/collections/selection.ts
+++ b/src/cdk/collections/selection.ts
@@ -165,7 +165,7 @@ export class SelectionModel<T> {
 }
 
 /**
- * Describes an event emitted when the value of a MdSelectionModel has changed.
+ * Describes an event emitted when the value of a MatSelectionModel has changed.
  * @docs-private
  */
 export class SelectionChange<T> {
diff --git a/src/cdk/observers/observe-content.spec.ts b/src/cdk/observers/observe-content.spec.ts
index 4f05369ea9c3..99e655470843 100644
--- a/src/cdk/observers/observe-content.spec.ts
+++ b/src/cdk/observers/observe-content.spec.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {async, TestBed, ComponentFixture, fakeAsync, tick} from '@angular/core/testing';
-import {ObserversModule, MdMutationObserverFactory} from './observe-content';
+import {ObserversModule, MatMutationObserverFactory} from './observe-content';
 
 // TODO(elad): `ProxyZone` doesn't seem to capture the events raised by
 // `MutationObserver` and needs to be investigated
@@ -61,7 +61,7 @@ describe('Observe content', () => {
         imports: [ObserversModule],
         declarations: [ComponentWithDebouncedListener],
         providers: [{
-          provide: MdMutationObserverFactory,
+          provide: MatMutationObserverFactory,
           useValue: {
             create: function(callback: Function) {
               callbacks.push(callback);
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index 04871646290c..c0b8dff10ecb 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -26,7 +26,7 @@ import {RxChain, debounceTime} from '@angular/cdk/rxjs';
  * @docs-private
  */
 @Injectable()
-export class MdMutationObserverFactory {
+export class MatMutationObserverFactory {
   create(callback): MutationObserver | null {
     return typeof MutationObserver === 'undefined' ? null : new MutationObserver(callback);
   }
@@ -52,7 +52,7 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
   @Input() debounce: number;
 
   constructor(
-    private _mutationObserverFactory: MdMutationObserverFactory,
+    private _mutationObserverFactory: MatMutationObserverFactory,
     private _elementRef: ElementRef,
     private _ngZone: NgZone) { }
 
@@ -95,6 +95,6 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
 @NgModule({
   exports: [ObserveContent],
   declarations: [ObserveContent],
-  providers: [MdMutationObserverFactory]
+  providers: [MatMutationObserverFactory]
 })
 export class ObserversModule {}
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 1e1c3abcd9f1..bda7b7661274 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -52,20 +52,20 @@ const defaultPositionList = [
 ];
 
 /** Injection token that determines the scroll handling while the connected overlay is open. */
-export const MD_CONNECTED_OVERLAY_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-connected-overlay-scroll-strategy');
+export const MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-connected-overlay-scroll-strategy');
 
 /** @docs-private */
-export function MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition();
 }
 
 /** @docs-private */
-export const MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_CONNECTED_OVERLAY_SCROLL_STRATEGY,
+export const MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 
@@ -236,7 +236,7 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
       private _renderer: Renderer2,
       templateRef: TemplateRef<any>,
       viewContainerRef: ViewContainerRef,
-      @Inject(MD_CONNECTED_OVERLAY_SCROLL_STRATEGY) private _scrollStrategy,
+      @Inject(MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY) private _scrollStrategy,
       @Optional() private _dir: Directionality) {
     this._templatePortal = new TemplatePortal(templateRef, viewContainerRef);
   }
diff --git a/src/cdk/overlay/public_api.ts b/src/cdk/overlay/public_api.ts
index bc93276afde6..ec4c15d534bf 100644
--- a/src/cdk/overlay/public_api.ts
+++ b/src/cdk/overlay/public_api.ts
@@ -11,7 +11,7 @@ import {Overlay} from './overlay';
 import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {
   ConnectedOverlayDirective,
-  MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
+  MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
   OverlayOrigin,
 } from './overlay-directives';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
@@ -24,7 +24,7 @@ export const OVERLAY_PROVIDERS: Provider[] = [
   OverlayPositionBuilder,
   VIEWPORT_RULER_PROVIDER,
   OVERLAY_CONTAINER_PROVIDER,
-  MD_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
+  MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
 ];
 
 @NgModule({
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts
index 7f6b6bf10d73..7d445ac49953 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ScrollStrategy, getMdScrollStrategyAlreadyAttachedError} from './scroll-strategy';
+import {ScrollStrategy, getMatScrollStrategyAlreadyAttachedError} from './scroll-strategy';
 import {OverlayRef} from '../overlay-ref';
 import {Subscription} from 'rxjs/Subscription';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
@@ -23,7 +23,7 @@ export class CloseScrollStrategy implements ScrollStrategy {
 
   attach(overlayRef: OverlayRef) {
     if (this._overlayRef) {
-      throw getMdScrollStrategyAlreadyAttachedError();
+      throw getMatScrollStrategyAlreadyAttachedError();
     }
 
     this._overlayRef = overlayRef;
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
index 69128998b801..9ef899cf384d 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import {Subscription} from 'rxjs/Subscription';
-import {ScrollStrategy, getMdScrollStrategyAlreadyAttachedError} from './scroll-strategy';
+import {ScrollStrategy, getMatScrollStrategyAlreadyAttachedError} from './scroll-strategy';
 import {OverlayRef} from '../overlay-ref';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 
@@ -31,7 +31,7 @@ export class RepositionScrollStrategy implements ScrollStrategy {
 
   attach(overlayRef: OverlayRef) {
     if (this._overlayRef) {
-      throw getMdScrollStrategyAlreadyAttachedError();
+      throw getMatScrollStrategyAlreadyAttachedError();
     }
 
     this._overlayRef = overlayRef;
diff --git a/src/cdk/overlay/scroll/scroll-strategy.ts b/src/cdk/overlay/scroll/scroll-strategy.ts
index d9a6bf533247..fe49d67e45f3 100644
--- a/src/cdk/overlay/scroll/scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy.ts
@@ -21,6 +21,6 @@ export interface ScrollStrategy {
 /**
  * Returns an error to be thrown when attempting to attach an already-attached scroll strategy.
  */
-export function getMdScrollStrategyAlreadyAttachedError(): Error {
+export function getMatScrollStrategyAlreadyAttachedError(): Error {
   return Error(`Scroll strategy has already been attached.`);
 }
diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index a15f379679c5..989355a209dd 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -21,7 +21,7 @@ import {
 import {CdkCellDef} from './cell';
 
 /**
- * The row template that can be used by the md-table. Should not be used outside of the
+ * The row template that can be used by the mat-table. Should not be used outside of the
  * material library.
  */
 export const CDK_ROW_TEMPLATE = `<ng-container cdkCellOutlet></ng-container>`;
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index e00568d29961..a76b8afed00d 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -57,7 +57,7 @@ export class HeaderRowPlaceholder {
 }
 
 /**
- * The table template that can be used by the md-table. Should not be used outside of the
+ * The table template that can be used by the mat-table. Should not be used outside of the
  * material library.
  */
 export const CDK_TABLE_TEMPLATE = `
diff --git a/src/demo-app/a11y/autocomplete/autocomplete-a11y.html b/src/demo-app/a11y/autocomplete/autocomplete-a11y.html
index f2a6ee6c926c..e84762443315 100644
--- a/src/demo-app/a11y/autocomplete/autocomplete-a11y.html
+++ b/src/demo-app/a11y/autocomplete/autocomplete-a11y.html
@@ -1,15 +1,15 @@
 <section>
   <h2>Filtering and selection</h2>
   <p>Select your favorite state</p>
-  <md-form-field>
-    <input mdInput placeholder="Search for a state" [mdAutocomplete]="autocomplete"
+  <mat-form-field>
+    <input matInput placeholder="Search for a state" [matAutocomplete]="autocomplete"
       [(ngModel)]="value" (ngModelChange)="filteredStates = filter(value)">
-    <md-autocomplete #autocomplete="mdAutocomplete">
-      <md-option *ngFor="let state of filteredStates" [value]="state.name">
+    <mat-autocomplete #autocomplete="matAutocomplete">
+      <mat-option *ngFor="let state of filteredStates" [value]="state.name">
         <span>{{ state.name }}</span>
-      </md-option>
-    </md-autocomplete>
-  </md-form-field>
+      </mat-option>
+    </mat-autocomplete>
+  </mat-form-field>
 
   <p>Selected value: {{ value }}</p>
 </section>
diff --git a/src/demo-app/a11y/button-toggle/button-toggle-a11y.html b/src/demo-app/a11y/button-toggle/button-toggle-a11y.html
index 8f6677b7284f..4286a815e610 100644
--- a/src/demo-app/a11y/button-toggle/button-toggle-a11y.html
+++ b/src/demo-app/a11y/button-toggle/button-toggle-a11y.html
@@ -1,62 +1,62 @@
 <section>
   <h2>Single button toggle</h2>
-  <md-button-toggle>Yes</md-button-toggle>
+  <mat-button-toggle>Yes</mat-button-toggle>
 </section>
 
 <section>
   <h2>Button toggles with icons</h2>
-  <md-button-toggle-group name="alignment" aria-label="Alignments">
-    <md-button-toggle value="left" aria-label="Align left">
-      <md-icon>format_align_left</md-icon>
-    </md-button-toggle>
-    <md-button-toggle value="center" aria-label="Align center">
-      <md-icon>format_align_center</md-icon>
-    </md-button-toggle>
-    <md-button-toggle value="right" aria-label="Align right">
-      <md-icon>format_align_right</md-icon>
-    </md-button-toggle>
-    <md-button-toggle value="justify" aria-label="Align justify">
-      <md-icon>format_align_justify</md-icon>
-    </md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group name="alignment" aria-label="Alignments">
+    <mat-button-toggle value="left" aria-label="Align left">
+      <mat-icon>format_align_left</mat-icon>
+    </mat-button-toggle>
+    <mat-button-toggle value="center" aria-label="Align center">
+      <mat-icon>format_align_center</mat-icon>
+    </mat-button-toggle>
+    <mat-button-toggle value="right" aria-label="Align right">
+      <mat-icon>format_align_right</mat-icon>
+    </mat-button-toggle>
+    <mat-button-toggle value="justify" aria-label="Align justify">
+      <mat-icon>format_align_justify</mat-icon>
+    </mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
 
 <section>
   <h2>Multi-selection button toggle group</h2>
-  <md-button-toggle-group multiple aria-label="Groceries">
-    <md-button-toggle>Flour</md-button-toggle>
-    <md-button-toggle>Eggs</md-button-toggle>
-    <md-button-toggle>Sugar</md-button-toggle>
-    <md-button-toggle>Milk</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group multiple aria-label="Groceries">
+    <mat-button-toggle>Flour</mat-button-toggle>
+    <mat-button-toggle>Eggs</mat-button-toggle>
+    <mat-button-toggle>Sugar</mat-button-toggle>
+    <mat-button-toggle>Milk</mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
 
 <section>
   <h2>Exclusive selection button toggle group</h2>
-  <md-button-toggle-group name="pies" [(ngModel)]="favoritePie"  aria-label="Pies">
-    <md-button-toggle *ngFor="let pie of pieOptions" [value]="pie">
+  <mat-button-toggle-group name="pies" [(ngModel)]="favoritePie"  aria-label="Pies">
+    <mat-button-toggle *ngFor="let pie of pieOptions" [value]="pie">
       {{pie}}
-    </md-button-toggle>
-  </md-button-toggle-group>
+    </mat-button-toggle>
+  </mat-button-toggle-group>
   <p>Your favorite type of pie is: {{favoritePie}}</p>
 </section>
 
 <section>
   <h2>Disabled button toggle group</h2>
-  <md-button-toggle-group [disabled]="true" aria-label="Groceries">
-    <md-button-toggle>Flour</md-button-toggle>
-    <md-button-toggle>Eggs</md-button-toggle>
-    <md-button-toggle>Sugar</md-button-toggle>
-    <md-button-toggle>Milk</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group [disabled]="true" aria-label="Groceries">
+    <mat-button-toggle>Flour</mat-button-toggle>
+    <mat-button-toggle>Eggs</mat-button-toggle>
+    <mat-button-toggle>Sugar</mat-button-toggle>
+    <mat-button-toggle>Milk</mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
 
 <section>
   <h2>Vertical button toggle group</h2>
-  <md-button-toggle-group multiple [vertical]="true" aria-label="Groceries">
-    <md-button-toggle>Flour</md-button-toggle>
-    <md-button-toggle>Eggs</md-button-toggle>
-    <md-button-toggle>Sugar</md-button-toggle>
-    <md-button-toggle>Milk</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group multiple [vertical]="true" aria-label="Groceries">
+    <mat-button-toggle>Flour</mat-button-toggle>
+    <mat-button-toggle>Eggs</mat-button-toggle>
+    <mat-button-toggle>Sugar</mat-button-toggle>
+    <mat-button-toggle>Milk</mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
\ No newline at end of file
diff --git a/src/demo-app/a11y/button/button-a11y.html b/src/demo-app/a11y/button/button-a11y.html
index 999a9c1e7b44..71c5a7d8a086 100644
--- a/src/demo-app/a11y/button/button-a11y.html
+++ b/src/demo-app/a11y/button/button-a11y.html
@@ -3,50 +3,50 @@
     <h2>Button elements</h2>
     <p>Click on the buttons to increase the button counter.</p>
     <p>Current number of clicks: {{counter}}</p>
-    <button md-button (click)="increase()">Check</button>
-    <button md-raised-button (click)="increase()">Pitch</button>
-    <button md-fab (click)="increase()"
+    <button mat-button (click)="increase()">Check</button>
+    <button mat-raised-button (click)="increase()">Pitch</button>
+    <button mat-fab (click)="increase()"
             aria-label="Activate floating action style button to increase the button counter">
-      <md-icon class="md-24">plus_one</md-icon>
+      <mat-icon class="md-24">plus_one</mat-icon>
     </button>
-    <button md-mini-fab (click)="increase()"
+    <button mat-mini-fab (click)="increase()"
             aria-label="Mini floating action button to increase the button counter by 1">
-      <md-icon class="md-24">plus_one</md-icon>
+      <mat-icon class="md-24">plus_one</mat-icon>
     </button>
-    <button md-icon-button (click)="increase()"
+    <button mat-icon-button (click)="increase()"
             aria-label="Icon button to increase the button counter by 1">
-      <md-icon class="md-24">plus_one</md-icon>
+      <mat-icon class="md-24">plus_one</mat-icon>
     </button>
   </section>
 
   <section>
     <h2>Anchor elements</h2>
-    <a href="http://www.google.com" md-button color="primary">Google search</a>
-    <a href="https://www.youtube.com/" md-raised-button>YouTube</a>
-    <a href="http://www.google.com" md-fab
+    <a href="http://www.google.com" mat-button color="primary">Google search</a>
+    <a href="https://www.youtube.com/" mat-raised-button>YouTube</a>
+    <a href="http://www.google.com" mat-fab
        aria-label="Activate floating action style google search link">
-      <md-icon class="md-24">search</md-icon>
+      <mat-icon class="md-24">search</mat-icon>
     </a>
-    <a href="http://www.google.com" md-mini-fab
+    <a href="http://www.google.com" mat-mini-fab
        aria-label="Activate mini floating action style google search link">
-      <md-icon class="md-24">search</md-icon>
+      <mat-icon class="md-24">search</mat-icon>
     </a>
-    <a href="http://www.google.com" md-icon-button
+    <a href="http://www.google.com" mat-icon-button
        aria-label="Activate icon style google search link">
-      <md-icon class="md-24">search</md-icon>
+      <mat-icon class="md-24">search</mat-icon>
     </a>
   </section>
 
   <section>
     <h2>Buttons in different colors</h2>
-    <button md-button color="primary" (click)="openSnackBar('Color is primary.')">Primary</button>
-    <button md-button color="accent" (click)="openSnackBar('Color is accent.')">Accent</button>
-    <button md-button color="warn" (click)="openSnackBar('Color is warn.')">Warn</button>
+    <button mat-button color="primary" (click)="openSnackBar('Color is primary.')">Primary</button>
+    <button mat-button color="accent" (click)="openSnackBar('Color is accent.')">Accent</button>
+    <button mat-button color="warn" (click)="openSnackBar('Color is warn.')">Warn</button>
   </section>
 
   <section>
     <h2>Disabled button</h2>
     <p>The following "cancel" button is disabled</p>
-    <button md-button [disabled]="true">Cancel</button>
+    <button mat-button [disabled]="true">Cancel</button>
   </section>
 </div>
diff --git a/src/demo-app/a11y/button/button-a11y.ts b/src/demo-app/a11y/button/button-a11y.ts
index aab2e3858c75..8a9398858a89 100644
--- a/src/demo-app/a11y/button/button-a11y.ts
+++ b/src/demo-app/a11y/button/button-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -10,7 +10,7 @@ import {MdSnackBar} from '@angular/material';
 export class ButtonAccessibilityDemo {
   counter: number = 0;
 
-  constructor(public snackBar: MdSnackBar) {}
+  constructor(public snackBar: MatSnackBar) {}
 
   openSnackBar(message: string) {
     this.snackBar.open(message,  '',  {
diff --git a/src/demo-app/a11y/card/card-a11y.html b/src/demo-app/a11y/card/card-a11y.html
index 6a1961f088ce..c896216f530c 100644
--- a/src/demo-app/a11y/card/card-a11y.html
+++ b/src/demo-app/a11y/card/card-a11y.html
@@ -1,8 +1,8 @@
 <section>
   <h2>Dogs group</h2>
   <p>Showing a card with a group of content</p>
-  <md-card class="example-card" role="group">
-    <md-card-content>
+  <mat-card class="example-card" role="group">
+    <mat-card-content>
       <p>Herding Group</p>
       <p>Hound Group</p>
       <p>Non-Sporting Group</p>
@@ -12,25 +12,25 @@ <h2>Dogs group</h2>
       <p>Working Group</p>
       <p>Foundation Stock Service</p>
       <p>Miscellaneous Class</p>
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 </section>
 
 <section>
   <h2>Husky</h2>
   <p>Showing a card with title only</p>
-  <md-card class="example-card">
+  <mat-card class="example-card">
     Siberian Husky
-  </md-card>
+  </mat-card>
 </section>
 
 <section>
   <h2>Malamute</h2>
   <p>Showing a Card with title and subtitle. </p>
-  <md-card class="example-card">
-    <md-card-title>Alaskan Malamute</md-card-title>
-    <md-card-subtitle>Dog breed</md-card-subtitle>
-  </md-card>
+  <mat-card class="example-card">
+    <mat-card-title>Alaskan Malamute</mat-card-title>
+    <mat-card-subtitle>Dog breed</mat-card-subtitle>
+  </mat-card>
 </section>
 
 
@@ -39,55 +39,55 @@ <h2>German Shepherd</h2>
   <p>
     Showing a card with title, subtitle, and a footer.
   </p>
-  <md-card class="example-card">
-    <md-card-subtitle>Dog breed</md-card-subtitle>
-    <md-card-title>German Shepherd</md-card-title>
-    <md-card-content>
+  <mat-card class="example-card">
+    <mat-card-subtitle>Dog breed</mat-card-subtitle>
+    <mat-card-title>German Shepherd</mat-card-title>
+    <mat-card-content>
       The German Shepherd is a breed of medium to large-sized working dog that originated in
       Germany. The breed's officially recognized name is German Shepherd Dog in the English
       language. The breed is also known as the Alsatian in Britain and Ireland.
-    </md-card-content>
-    <md-card-footer>
+    </mat-card-content>
+    <mat-card-footer>
       People also search for Rottweiler, Siberian Husky, Labrador Retriever, Doberman Pinscher
-    </md-card-footer>
-  </md-card>
+    </mat-card-footer>
+  </mat-card>
 </section>
 
 <section>
   <h2>Dachshund</h2>
   <p>Showing a card with title, subtitle, and avatar as header and a card image.</p>
-  <md-card class="example-card">
-    <md-card-header>
-      <img md-card-avatar src="a11y/card/assets/dachshund-avatar.jpg" aria-label="Dachshund avatar">
-      <md-card-title>Dachshund</md-card-title>
-      <md-card-subtitle>Dog breed</md-card-subtitle>
-    </md-card-header>
-    <img md-card-image src="a11y/card/assets/dachshund.jpg"
+  <mat-card class="example-card">
+    <mat-card-header>
+      <img mat-card-avatar src="a11y/card/assets/dachshund-avatar.jpg" aria-label="Dachshund avatar">
+      <mat-card-title>Dachshund</mat-card-title>
+      <mat-card-subtitle>Dog breed</mat-card-subtitle>
+    </mat-card-header>
+    <img mat-card-image src="a11y/card/assets/dachshund.jpg"
          aria-label="Dachshund">
-    <md-card-content>
+    <mat-card-content>
       The dachshund is a short-legged, long-bodied, hound-type dog breed.
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 </section>
 
 <section>
   <h2>Shiba Inu</h2>
   <p>Showing a card with header, content, image, and two action buttons: "share" and "like".</p>
-  <md-card class="example-card">
-    <md-card-header>
-      <img md-card-avatar src="a11y/card/assets/shiba-inu-avatar.jpg" aria-label="Shiba Inu avatar">
-      <md-card-title>Shiba Inu</md-card-title>
-      <md-card-subtitle>Dog Breed</md-card-subtitle>
-    </md-card-header>
-    <img md-card-image  src="a11y/card/assets/shiba-inu.jpg" aria-label="Shiba Inu">
-    <md-card-content>
+  <mat-card class="example-card">
+    <mat-card-header>
+      <img mat-card-avatar src="a11y/card/assets/shiba-inu-avatar.jpg" aria-label="Shiba Inu avatar">
+      <mat-card-title>Shiba Inu</mat-card-title>
+      <mat-card-subtitle>Dog Breed</mat-card-subtitle>
+    </mat-card-header>
+    <img mat-card-image  src="a11y/card/assets/shiba-inu.jpg" aria-label="Shiba Inu">
+    <mat-card-content>
       The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan.
       A small, agile dog that copes very well with mountainous terrain, the Shiba Inu was originally
       bred for hunting.
-    </md-card-content>
-    <md-card-actions align="end">
-      <button md-button (click)="openSnackbar('Liked Shiba Inu')">like</button>
-      <button md-button (click)="openSnackbar('Shared Shiba Inu')">share</button>
-    </md-card-actions>
-  </md-card>
+    </mat-card-content>
+    <mat-card-actions align="end">
+      <button mat-button (click)="openSnackbar('Liked Shiba Inu')">like</button>
+      <button mat-button (click)="openSnackbar('Shared Shiba Inu')">share</button>
+    </mat-card-actions>
+  </mat-card>
 </section>
diff --git a/src/demo-app/a11y/card/card-a11y.ts b/src/demo-app/a11y/card/card-a11y.ts
index 613d72d3af4f..1794ec63212b 100644
--- a/src/demo-app/a11y/card/card-a11y.ts
+++ b/src/demo-app/a11y/card/card-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -10,7 +10,7 @@ import {MdSnackBar} from '@angular/material';
 export class CardAccessibilityDemo {
   showProgress: boolean = false;
 
-  constructor(private snackBar: MdSnackBar) {}
+  constructor(private snackBar: MatSnackBar) {}
 
   openSnackbar(message: string) {
     this.snackBar.open(message, '', {duration: 2000});
diff --git a/src/demo-app/a11y/checkbox/checkbox-a11y.html b/src/demo-app/a11y/checkbox/checkbox-a11y.html
index 56eca75a04f6..ecf6a3e8aa2e 100644
--- a/src/demo-app/a11y/checkbox/checkbox-a11y.html
+++ b/src/demo-app/a11y/checkbox/checkbox-a11y.html
@@ -1,34 +1,34 @@
 <section>
   <h2>Checkbox without label</h2>
-  <md-checkbox aria-label="A single checkbox with no label example"></md-checkbox>
+  <mat-checkbox aria-label="A single checkbox with no label example"></mat-checkbox>
 </section>
 <section>
   <h2>Standalone checkbox</h2>
   <div>
-    <md-checkbox>Yes, I agree to the terms and conditions</md-checkbox>
+    <mat-checkbox>Yes, I agree to the terms and conditions</mat-checkbox>
   </div>
   <div>
-    <md-checkbox [disabled]="true">No, I do not agree to the terms and conditions</md-checkbox>
+    <mat-checkbox [disabled]="true">No, I do not agree to the terms and conditions</mat-checkbox>
   </div>
   <div>
-    <md-checkbox [indeterminate]="true">A partially done task</md-checkbox>
+    <mat-checkbox [indeterminate]="true">A partially done task</mat-checkbox>
   </div>
 </section>
 
 <section>
   <h2>Nested checklist</h2>
     <div *ngFor="let task of tasks">
-      <md-checkbox [(ngModel)]="task.completed"
+      <mat-checkbox [(ngModel)]="task.completed"
                    [checked]="allComplete(task)"
                    [indeterminate]="someComplete(task.subtasks)"
                    (change)="setAllCompleted(task.subtasks, $event.checked)">
         {{task.name}}
-      </md-checkbox>
+      </mat-checkbox>
       <div class="sub-list">
         <div *ngFor="let subtask of task.subtasks">
-          <md-checkbox [(ngModel)]="subtask.completed">
+          <mat-checkbox [(ngModel)]="subtask.completed">
             {{subtask.name}}
-          </md-checkbox>
+          </mat-checkbox>
         </div>
       </div>
     </div>
@@ -36,7 +36,7 @@ <h2>Nested checklist</h2>
 
 <section>
   <h2>Colored checkboxes</h2>
-  <md-checkbox color="primary">Primary</md-checkbox>
-  <md-checkbox color="accent">Accent</md-checkbox>
-  <md-checkbox color="warn">Warn</md-checkbox>
+  <mat-checkbox color="primary">Primary</mat-checkbox>
+  <mat-checkbox color="accent">Accent</mat-checkbox>
+  <mat-checkbox color="warn">Warn</mat-checkbox>
 </section>
diff --git a/src/demo-app/a11y/chips/chips-a11y.html b/src/demo-app/a11y/chips/chips-a11y.html
index 466003f84aec..481039952be2 100644
--- a/src/demo-app/a11y/chips/chips-a11y.html
+++ b/src/demo-app/a11y/chips/chips-a11y.html
@@ -1,57 +1,57 @@
 <section>
   <h2>Basic chips</h2>
-  <md-chip-list>
-    <md-chip>Carnation</md-chip>
-    <md-chip>Irises</md-chip>
-    <md-chip>Buttercup</md-chip>
-  </md-chip-list>
+  <mat-chip-list>
+    <mat-chip>Carnation</mat-chip>
+    <mat-chip>Irises</mat-chip>
+    <mat-chip>Buttercup</mat-chip>
+  </mat-chip-list>
 
 </section>
 
 <section>
   <h2>Unstyled chips</h2>
 
-  <md-chip-list>
-    <md-basic-chip>Husky </md-basic-chip>
-    <md-basic-chip>Golden Retriever </md-basic-chip>
-    <md-basic-chip>Border Collie </md-basic-chip>
-  </md-chip-list>
+  <mat-chip-list>
+    <mat-basic-chip>Husky </mat-basic-chip>
+    <mat-basic-chip>Golden Retriever </mat-basic-chip>
+    <mat-basic-chip>Border Collie </mat-basic-chip>
+  </mat-chip-list>
 </section>
 
 <section>
   <h2>Removable chips in a form field</h2>
 
-  <md-form-field>
-    <md-chip-list mdPrefix #chipList>
-      <md-chip *ngFor="let person of people" [color]="color" (remove)="remove(person)">
+  <mat-form-field>
+    <mat-chip-list matPrefix #chipList>
+      <mat-chip *ngFor="let person of people" [color]="color" (remove)="remove(person)">
         {{person.name}}
-        <md-icon mdChipRemove>cancel</md-icon>
-      </md-chip>
-    </md-chip-list>
-    <input mdInput placeholder="New Contributor..."
+        <mat-icon matChipRemove>cancel</mat-icon>
+      </mat-chip>
+    </mat-chip-list>
+    <input matInput placeholder="New Contributor..."
            aria-label="New contributor"
-           [mdChipInputFor]="chipList"
-           [mdChipInputAddOnBlur]="addOnBlur"
-           (mdChipInputTokenEnd)="add($event)" />
-  </md-form-field>
+           [matChipInputFor]="chipList"
+           [matChipInputAddOnBlur]="addOnBlur"
+           (matChipInputTokenEnd)="add($event)" />
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Colored chips</h2>
   <p>This example is good for contrast-radio checking.</p>
-  <md-chip-list>
-    <md-chip color="primary" selected="true">Primary</md-chip>
-    <md-chip color="accent" selected="true">Accent</md-chip>
-    <md-chip color="warn" selected="true">Warn</md-chip>
-  </md-chip-list>
+  <mat-chip-list>
+    <mat-chip color="primary" selected="true">Primary</mat-chip>
+    <mat-chip color="accent" selected="true">Accent</mat-chip>
+    <mat-chip color="warn" selected="true">Warn</mat-chip>
+  </mat-chip-list>
 </section>
 
 
 <section>
   <h2>Stacked chips</h2>
-  <md-chip-list class="mat-chip-list-stacked">
-    <md-chip [selectable]="false">Lemon</md-chip>
-    <md-chip [selectable]="false">Lime</md-chip>
-    <md-chip [selectable]="false">Grapefruit</md-chip>
-  </md-chip-list>
+  <mat-chip-list class="mat-chip-list-stacked">
+    <mat-chip [selectable]="false">Lemon</mat-chip>
+    <mat-chip [selectable]="false">Lime</mat-chip>
+    <mat-chip [selectable]="false">Grapefruit</mat-chip>
+  </mat-chip-list>
 </section>
diff --git a/src/demo-app/a11y/chips/chips-a11y.ts b/src/demo-app/a11y/chips/chips-a11y.ts
index ca356a88de27..19388f77ef77 100644
--- a/src/demo-app/a11y/chips/chips-a11y.ts
+++ b/src/demo-app/a11y/chips/chips-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdChipInputEvent, MdSnackBar} from '@angular/material';
+import {MatChipInputEvent, MatSnackBar} from '@angular/material';
 
 
 export interface Person {
@@ -36,13 +36,13 @@ export class ChipsAccessibilityDemo {
     { name: 'Warn', color: 'warn' }
   ];
 
-  constructor(public snackBar: MdSnackBar) {}
+  constructor(public snackBar: MatSnackBar) {}
 
   displayMessage(message: string): void {
     this.message = message;
   }
 
-  add(event: MdChipInputEvent): void {
+  add(event: MatChipInputEvent): void {
     let input = event.input;
     let value = event.value;
 
diff --git a/src/demo-app/a11y/datepicker/datepicker-a11y.html b/src/demo-app/a11y/datepicker/datepicker-a11y.html
index aef7740b4bb8..ad89bde33077 100644
--- a/src/demo-app/a11y/datepicker/datepicker-a11y.html
+++ b/src/demo-app/a11y/datepicker/datepicker-a11y.html
@@ -1,112 +1,112 @@
 <section>
   <h2>Choose a date (e.g. choose your date of birth)</h2>
-  <md-form-field>
-    <input mdInput
-           [mdDatepicker]="birthdayPicker"
+  <mat-form-field>
+    <input matInput
+           [matDatepicker]="birthdayPicker"
            [(ngModel)]="birthday"
            #birthdayModel="ngModel"
            [max]="maxBirthday"
            required
            placeholder="Date of birth">
-    <md-datepicker-toggle mdSuffix [for]="birthdayPicker"></md-datepicker-toggle>
-    <md-datepicker #birthdayPicker startView="year"></md-datepicker>
-    <md-error *ngIf="birthdayModel.hasError('required')">
+    <mat-datepicker-toggle matSuffix [for]="birthdayPicker"></mat-datepicker-toggle>
+    <mat-datepicker #birthdayPicker startView="year"></mat-datepicker>
+    <mat-error *ngIf="birthdayModel.hasError('required')">
       Please choose a date.
-    </md-error>
-    <md-error *ngIf="birthdayModel.hasError('mdDatepickerMax')">
+    </mat-error>
+    <mat-error *ngIf="birthdayModel.hasError('matDatepickerMax')">
       Please choose an earlier date.
-    </md-error>
-  </md-form-field>
+    </mat-error>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Choose a date with touch UI (e.g. choose a payment date on mobile)</h2>
   <p>When would you like to schedule your payment?</p>
-  <md-form-field>
-    <input mdInput
-           [mdDatepicker]="paymentPicker"
+  <mat-form-field>
+    <input matInput
+           [matDatepicker]="paymentPicker"
            [(ngModel)]="paymentDate"
            #paymentDateModel="ngModel"
            [min]="minPaymentDate"
            required
            aria-label="Payment date">
-    <md-datepicker-toggle mdSuffix [for]="paymentPicker"></md-datepicker-toggle>
-    <md-datepicker #paymentPicker></md-datepicker>
-    <md-error *ngIf="paymentDateModel.hasError('required')">
+    <mat-datepicker-toggle matSuffix [for]="paymentPicker"></mat-datepicker-toggle>
+    <mat-datepicker #paymentPicker></mat-datepicker>
+    <mat-error *ngIf="paymentDateModel.hasError('required')">
       Please choose a date.
-    </md-error>
-    <md-error *ngIf="paymentDateModel.hasError('mdDatepickerMin')">
+    </mat-error>
+    <mat-error *ngIf="paymentDateModel.hasError('matDatepickerMin')">
       Please choose a later date.
-    </md-error>
-  </md-form-field>
+    </mat-error>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Choose date with startAt, min and max (e.g. schedule a departing and returning flight)</h2>
-  <md-form-field>
-    <input mdInput
-           [mdDatepicker]="departPicker"
+  <mat-form-field>
+    <input matInput
+           [matDatepicker]="departPicker"
            [(ngModel)]="departDate"
            #departDateModel="ngModel"
            [min]="minTripDate"
            [max]="maxTripDate"
            required
            placeholder="Departure date">
-    <md-datepicker-toggle mdSuffix [for]="departPicker"></md-datepicker-toggle>
-    <md-datepicker #departPicker [startAt]="startTripDate"></md-datepicker>
-    <md-error *ngIf="departDateModel.hasError('required')">
+    <mat-datepicker-toggle matSuffix [for]="departPicker"></mat-datepicker-toggle>
+    <mat-datepicker #departPicker [startAt]="startTripDate"></mat-datepicker>
+    <mat-error *ngIf="departDateModel.hasError('required')">
       Please choose a date.
-    </md-error>
-    <md-error *ngIf="departDateModel.hasError('mdDatepickerMin')">
+    </mat-error>
+    <mat-error *ngIf="departDateModel.hasError('matDatepickerMin')">
       Please choose a later date.
-    </md-error>
-    <md-error *ngIf="departDateModel.hasError('mdDatepickerMax')">
+    </mat-error>
+    <mat-error *ngIf="departDateModel.hasError('matDatepickerMax')">
       Please choose an earlier date.
-    </md-error>
-  </md-form-field>
-  <md-form-field>
-    <input mdInput
-           [mdDatepicker]="returnPicker"
+    </mat-error>
+  </mat-form-field>
+  <mat-form-field>
+    <input matInput
+           [matDatepicker]="returnPicker"
            [(ngModel)]="returnDate"
            #returnDateModel="ngModel"
            [min]="departDate || minTripDate"
            [max]="maxTripDate"
            placeholder="Return date">
-    <md-datepicker-toggle mdSuffix [for]="returnPicker"></md-datepicker-toggle>
-    <md-datepicker #returnPicker [startAt]="startTripDate"></md-datepicker>
-    <md-error *ngIf="returnDateModel.hasError('mdDatepickerMin') && !departDate">
+    <mat-datepicker-toggle matSuffix [for]="returnPicker"></mat-datepicker-toggle>
+    <mat-datepicker #returnPicker [startAt]="startTripDate"></mat-datepicker>
+    <mat-error *ngIf="returnDateModel.hasError('matDatepickerMin') && !departDate">
       Please choose a later date.
-    </md-error>
-    <md-error *ngIf="returnDateModel.hasError('mdDatepickerMin') && departDate">
+    </mat-error>
+    <mat-error *ngIf="returnDateModel.hasError('matDatepickerMin') && departDate">
       Please choose a date after your departure.
-    </md-error>
-    <md-error *ngIf="returnDateModel.hasError('mdDatepickerMax')">
+    </mat-error>
+    <mat-error *ngIf="returnDateModel.hasError('matDatepickerMax')">
       Please choose an earlier date.
-    </md-error>
-  </md-form-field>
+    </mat-error>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Choose date with date filter (e.g. schedule a doctor appointment)</h2>
-  <md-form-field>
-    <input mdInput
-           [mdDatepicker]="appointmentPicker"
+  <mat-form-field>
+    <input matInput
+           [matDatepicker]="appointmentPicker"
            [(ngModel)]="appointmentDate"
            #appointmentDateModel="ngModel"
            [min]="minAppointmentDate"
            [max]="maxAppointmentDate"
-           [mdDatepickerFilter]="weekdaysOnly"
+           [matDatepickerFilter]="weekdaysOnly"
            required
            placeholder="Appointment date">
-    <md-datepicker-toggle mdSuffix [for]="appointmentPicker"></md-datepicker-toggle>
-    <md-datepicker #appointmentPicker></md-datepicker>
-    <md-error *ngIf="appointmentDateModel.hasError('required')">
+    <mat-datepicker-toggle matSuffix [for]="appointmentPicker"></mat-datepicker-toggle>
+    <mat-datepicker #appointmentPicker></mat-datepicker>
+    <mat-error *ngIf="appointmentDateModel.hasError('required')">
       Please choose a date.
-    </md-error>
-    <md-error *ngIf="appointmentDateModel.hasError('mdDatepickerMin') ||
-                     appointmentDateModel.hasError('mdDatepickerMax') ||
-                     appointmentDateModel.hasError('mdDatepickerFilter')">
+    </mat-error>
+    <mat-error *ngIf="appointmentDateModel.hasError('matDatepickerMin') ||
+                     appointmentDateModel.hasError('matDatepickerMax') ||
+                     appointmentDateModel.hasError('matDatepickerFilter')">
       No appointments available on this date.
-    </md-error>
-  </md-form-field>
+    </mat-error>
+  </mat-form-field>
 </section>
diff --git a/src/demo-app/a11y/dialog/dialog-a11y.html b/src/demo-app/a11y/dialog/dialog-a11y.html
index e1593db566ad..150980cc9def 100644
--- a/src/demo-app/a11y/dialog/dialog-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-a11y.html
@@ -1,13 +1,13 @@
 <section>
   <h2>Welcome message</h2>
   <p>Activate the button to see a welcome dialog with a simple message and a close button.</p>
-  <button md-button (click)="openWelcomeDialog()">Welcome</button>
+  <button mat-button (click)="openWelcomeDialog()">Welcome</button>
 </section>
 
 <section>
   <h2>Choose a fruit</h2>
   <p>Active the button to choose apple or peach in a dialog.</p>
-  <button md-button (click)="openFruitDialog()">Fruit</button>
+  <button mat-button (click)="openFruitDialog()">Fruit</button>
   <p *ngIf="fruitSelectedOption">
     You chose: {{fruitSelectedOption}}
   </p>
@@ -19,7 +19,7 @@ <h2>Neptune</h2>
     Active the button to see a dialog showing information of Neptune.
     A Wikipedia page can be opened either in a new tab or in a stacked dialog.
   </p>
-  <button md-button (click)="openNeptuneDialog()">Learn Neptune</button>
+  <button mat-button (click)="openNeptuneDialog()">Learn Neptune</button>
 </section>
 
 <section>
@@ -27,5 +27,5 @@ <h2>Address form</h2>
   <p>
     Active the button to fill out shipping address information in a dialog.
   </p>
-  <button md-button (click)="openAddressDialog()">Add address</button>
+  <button mat-button (click)="openAddressDialog()">Add address</button>
 </section>
diff --git a/src/demo-app/a11y/dialog/dialog-a11y.ts b/src/demo-app/a11y/dialog/dialog-a11y.ts
index 73fb3fe565fc..4798798d45ae 100644
--- a/src/demo-app/a11y/dialog/dialog-a11y.ts
+++ b/src/demo-app/a11y/dialog/dialog-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdDialog} from '@angular/material';
+import {MatDialog} from '@angular/material';
 
 
 @Component({
@@ -11,7 +11,7 @@ import {MdDialog} from '@angular/material';
 export class DialogAccessibilityDemo {
   fruitSelectedOption: string = '';
 
-  constructor(public dialog: MdDialog) {}
+  constructor(public dialog: MatDialog) {}
 
   openFruitDialog() {
     let dialogRef = this.dialog.open(DialogFruitExampleDialog);
@@ -53,7 +53,7 @@ export class DialogWelcomeExampleDialog {}
   templateUrl: './dialog-neptune-a11y.html'
 })
 export class DialogNeptuneExampleDialog {
-  constructor(public dialog: MdDialog) { }
+  constructor(public dialog: MatDialog) { }
 
   showInStackedDialog() {
     this.dialog.open(DialogNeptuneIFrameDialog);
diff --git a/src/demo-app/a11y/dialog/dialog-address-form-a11y.html b/src/demo-app/a11y/dialog/dialog-address-form-a11y.html
index fd3a29c9fa53..8a95e7a89be5 100644
--- a/src/demo-app/a11y/dialog/dialog-address-form-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-address-form-a11y.html
@@ -1,45 +1,45 @@
-<h2 md-dialog-title>Company</h2>
+<h2 mat-dialog-title>Company</h2>
 
-<md-dialog-content>
+<mat-dialog-content>
   <form class="example-form">
-    <md-form-field class="example-full-width">
-      <input mdInput placeholder="Company (disabled)" disabled value="Google">
-    </md-form-field>
+    <mat-form-field class="example-full-width">
+      <input matInput placeholder="Company (disabled)" disabled value="Google">
+    </mat-form-field>
 
     <table class="example-full-width" cellspacing="0"><tr>
-      <td><md-form-field class="example-full-width">
-        <input mdInput placeholder="First name">
-      </md-form-field></td>
-      <td><md-form-field class="example-full-width">
-        <input mdInput placeholder="Long Last Name That Will Be Truncated">
-      </md-form-field></td>
+      <td><mat-form-field class="example-full-width">
+        <input matInput placeholder="First name">
+      </mat-form-field></td>
+      <td><mat-form-field class="example-full-width">
+        <input matInput placeholder="Long Last Name That Will Be Truncated">
+      </mat-form-field></td>
     </tr></table>
 
     <p>
-      <md-form-field class="example-full-width">
-        <textarea mdInput placeholder="Address">1600 Amphitheatre Pkwy</textarea>
-      </md-form-field>
-      <md-form-field class="example-full-width">
-        <textarea mdInput placeholder="Address 2"></textarea>
-      </md-form-field>
+      <mat-form-field class="example-full-width">
+        <textarea matInput placeholder="Address">1600 Amphitheatre Pkwy</textarea>
+      </mat-form-field>
+      <mat-form-field class="example-full-width">
+        <textarea matInput placeholder="Address 2"></textarea>
+      </mat-form-field>
     </p>
 
     <table class="example-full-width" cellspacing="0"><tr>
-      <td><md-form-field class="example-full-width">
-        <input mdInput placeholder="City">
-      </md-form-field></td>
-      <td><md-form-field class="example-full-width">
-        <input mdInput placeholder="State">
-      </md-form-field></td>
-      <td><md-form-field class="example-full-width">
-        <input mdInput #postalCode maxlength="5" placeholder="Postal Code" value="94043">
-        <md-hint align="end">{{postalCode.value.length}} / 5</md-hint>
-      </md-form-field></td>
+      <td><mat-form-field class="example-full-width">
+        <input matInput placeholder="City">
+      </mat-form-field></td>
+      <td><mat-form-field class="example-full-width">
+        <input matInput placeholder="State">
+      </mat-form-field></td>
+      <td><mat-form-field class="example-full-width">
+        <input matInput #postalCode maxlength="5" placeholder="Postal Code" value="94043">
+        <mat-hint align="end">{{postalCode.value.length}} / 5</mat-hint>
+      </mat-form-field></td>
     </tr></table>
   </form>
-</md-dialog-content>
+</mat-dialog-content>
 
-<md-dialog-actions>
-  <button md-raised-button color="primary" md-dialog-close>Submit</button>
-  <button md-raised-button md-dialog-close>Close</button>
-</md-dialog-actions>
+<mat-dialog-actions>
+  <button mat-raised-button color="primary" mat-dialog-close>Submit</button>
+  <button mat-raised-button mat-dialog-close>Close</button>
+</mat-dialog-actions>
diff --git a/src/demo-app/a11y/dialog/dialog-fruit-a11y.html b/src/demo-app/a11y/dialog/dialog-fruit-a11y.html
index f3086a812c28..cb303d41d829 100644
--- a/src/demo-app/a11y/dialog/dialog-fruit-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-fruit-a11y.html
@@ -1,6 +1,6 @@
-<h2 md-dialog-title>Fruit</h2>
-<div md-dialog-content>Which would you like to choose?</div>
-<div md-dialog-actions>
-  <button md-button md-dialog-close="apple" aria-label="Apple">Apple</button>
-  <button md-button md-dialog-close="peach" aria-label="Peach">Peach</button>
+<h2 mat-dialog-title>Fruit</h2>
+<div mat-dialog-content>Which would you like to choose?</div>
+<div mat-dialog-actions>
+  <button mat-button mat-dialog-close="apple" aria-label="Apple">Apple</button>
+  <button mat-button mat-dialog-close="peach" aria-label="Peach">Peach</button>
 </div>
diff --git a/src/demo-app/a11y/dialog/dialog-neptune-a11y.html b/src/demo-app/a11y/dialog/dialog-neptune-a11y.html
index e247e83c7714..fd9e67a2e941 100644
--- a/src/demo-app/a11y/dialog/dialog-neptune-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-neptune-a11y.html
@@ -1,6 +1,6 @@
-<h2 md-dialog-title>Neptune</h2>
+<h2 mat-dialog-title>Neptune</h2>
 
-<md-dialog-content>
+<mat-dialog-content>
   <img src="https://upload.wikimedia.org/wikipedia/commons/5/56/Neptune_Full.jpg"
        alt="Neptune"/>
 
@@ -13,15 +13,15 @@ <h2 md-dialog-title>Neptune</h2>
     astronomical units (4.50×109 km). It is named after the Roman god of the sea and has the
     astronomical symbol ♆, a stylised version of the god Neptune's trident.
   </p>
-</md-dialog-content>
+</mat-dialog-content>
 
-<md-dialog-actions>
-  <button md-raised-button color="primary" md-dialog-close>Close</button>
+<mat-dialog-actions>
+  <button mat-raised-button color="primary" mat-dialog-close>Close</button>
 
-  <a md-button color="primary" href="https://en.wikipedia.org/wiki/Neptune" target="_blank">
+  <a mat-button color="primary" href="https://en.wikipedia.org/wiki/Neptune" target="_blank">
     Read more on Wikipedia
   </a>
 
-  <button md-button color="secondary" (click)="showInStackedDialog()">
+  <button mat-button color="secondary" (click)="showInStackedDialog()">
     Show in dialog</button>
-</md-dialog-actions>
+</mat-dialog-actions>
diff --git a/src/demo-app/a11y/dialog/dialog-neptune-iframe-a11y.html b/src/demo-app/a11y/dialog/dialog-neptune-iframe-a11y.html
index a51b3ad5a958..da7cf120ad29 100644
--- a/src/demo-app/a11y/dialog/dialog-neptune-iframe-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-neptune-iframe-a11y.html
@@ -1,9 +1,9 @@
-<h2 md-dialog-title>Neptune</h2>
+<h2 mat-dialog-title>Neptune</h2>
 
-<md-dialog-content>
+<mat-dialog-content>
   <iframe frameborder="0" src="https://en.wikipedia.org/wiki/Neptune"></iframe>
-</md-dialog-content>
+</mat-dialog-content>
 
-<md-dialog-actions>
-  <button md-raised-button color="primary" md-dialog-close>Close</button>
-</md-dialog-actions>
+<mat-dialog-actions>
+  <button mat-raised-button color="primary" mat-dialog-close>Close</button>
+</mat-dialog-actions>
diff --git a/src/demo-app/a11y/dialog/dialog-welcome-a11y.html b/src/demo-app/a11y/dialog/dialog-welcome-a11y.html
index 25c8355f7f5f..f1d0cf3074f6 100644
--- a/src/demo-app/a11y/dialog/dialog-welcome-a11y.html
+++ b/src/demo-app/a11y/dialog/dialog-welcome-a11y.html
@@ -10,4 +10,4 @@ <h2>Welcome to Angular Material dialog demo page!</h2>
   be accessible, enabling people with disabilities to participate equally on the Web.
 </p>
 
-<button md-button color="primary" md-dialog-close>Close</button>
+<button mat-button color="primary" mat-dialog-close>Close</button>
diff --git a/src/demo-app/a11y/grid-list/grid-list-a11y.html b/src/demo-app/a11y/grid-list/grid-list-a11y.html
index 0316771a2c52..3627a0948176 100644
--- a/src/demo-app/a11y/grid-list/grid-list-a11y.html
+++ b/src/demo-app/a11y/grid-list/grid-list-a11y.html
@@ -1,42 +1,42 @@
 <section>
   <h2>Types of coffee (fix-height grid-list)</h2>
-  <md-grid-list role="list" [cols]="fixedCols" [rowHeight]="fixedRowHeight">
-    <md-grid-tile *ngFor="let tile of tiles" [colspan]="tile.cols" [rowspan]="tile.rows"
+  <mat-grid-list role="list" [cols]="fixedCols" [rowHeight]="fixedRowHeight">
+    <mat-grid-tile *ngFor="let tile of tiles" [colspan]="tile.cols" [rowspan]="tile.rows"
                   [style.background]="tile.color" role="listitem">
       {{tile.text}}
-    </md-grid-tile>
-  </md-grid-list>
+    </mat-grid-tile>
+  </mat-grid-list>
 </section>
 
 <section>
   <h2>Types of coffee (ratio-height grid list)</h2>
-  <md-grid-list role="list" cols="2" [rowHeight]="ratio" gutterSize="4px">
-    <md-grid-tile *ngFor="let tile of tiles" [style.background]="'lightblue'" role="listitem">
+  <mat-grid-list role="list" cols="2" [rowHeight]="ratio" gutterSize="4px">
+    <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'lightblue'" role="listitem">
       {{tile.text}}
-    </md-grid-tile>
-  </md-grid-list>
+    </mat-grid-tile>
+  </mat-grid-list>
 </section>
 
 <section>
   <h2>Types of coffee (fit-height grid list)</h2>
-  <md-grid-list role="list" cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
+  <mat-grid-list role="list" cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
                 [style.height]="fitListHeight">
-    <md-grid-tile *ngFor="let tile of tiles" role="listitem" [style.background]="'#F1EBBA'">
+    <mat-grid-tile *ngFor="let tile of tiles" role="listitem" [style.background]="'#F1EBBA'">
       {{tile.text}}
-    </md-grid-tile>
-  </md-grid-list>
+    </mat-grid-tile>
+  </mat-grid-list>
 </section>
 
 <section>
   <h2>Angular team dogs (Grid list with header and footer)</h2>
-  <md-grid-list role="list" cols="3" rowHeight="200px">
-    <md-grid-tile *ngFor="let dog of dogs" role="listitem">
-      <md-grid-tile-header>{{dog.name}}</md-grid-tile-header>
+  <mat-grid-list role="list" cols="3" rowHeight="200px">
+    <mat-grid-tile *ngFor="let dog of dogs" role="listitem">
+      <mat-grid-tile-header>{{dog.name}}</mat-grid-tile-header>
       <img alt="Photo of {{dog.name}}"
            src="https://material.angularjs.org/material2_assets/ngconf/{{dog.name}}.png">
-      <md-grid-tile-footer>
-        <span md-line>Human: {{dog.human}}</span>
-      </md-grid-tile-footer>
-    </md-grid-tile>
-  </md-grid-list>
+      <mat-grid-tile-footer>
+        <span mat-line>Human: {{dog.human}}</span>
+      </mat-grid-tile-footer>
+    </mat-grid-tile>
+  </mat-grid-list>
 </section>
diff --git a/src/demo-app/a11y/icon/icon-a11y.html b/src/demo-app/a11y/icon/icon-a11y.html
index 3b8bc223aa41..9c01019db4f8 100644
--- a/src/demo-app/a11y/icon/icon-a11y.html
+++ b/src/demo-app/a11y/icon/icon-a11y.html
@@ -1,30 +1,30 @@
 <section>
   <h2>Fingerprint status</h2>
   <p>Showing a status message with a purely decorative icon</p>
-  <md-icon color="primary">fingerprint</md-icon>
+  <mat-icon color="primary">fingerprint</mat-icon>
   Your fingerprint was recorded!
 </section>
 
 <section>
   <h2>Delete icon button </h2>
   <p>Showing a button with interactive icon which can perform an action</p>
-  <button md-icon-button aria-label="Delete" (click)="deleteIcon()">
-    <md-icon color="accent">delete</md-icon>
+  <button mat-icon-button aria-label="Delete" (click)="deleteIcon()">
+    <mat-icon color="accent">delete</mat-icon>
   </button>
 </section>
 
 <section>
   <h2>Home link </h2>
   <p>Showing a link with interactive icon</p>
-  <a md-icon-button aria-label="Home" href="http://www.google.com">
-    <md-icon color="warn">home</md-icon>
+  <a mat-icon-button aria-label="Home" href="http://www.google.com">
+    <mat-icon color="warn">home</mat-icon>
   </a>
 </section>
 
 <section>
   <h2>Done status </h2>
   <p>Showing a status indicator with an indicator icon</p>
-  <md-icon color="primary">done</md-icon>
+  <mat-icon color="primary">done</mat-icon>
   <span class="cdk-visually-hidden">Done</span>
   Tasks
 </section>
diff --git a/src/demo-app/a11y/icon/icon-a11y.ts b/src/demo-app/a11y/icon/icon-a11y.ts
index 9a5ae09bd96e..9d5d92acee14 100644
--- a/src/demo-app/a11y/icon/icon-a11y.ts
+++ b/src/demo-app/a11y/icon/icon-a11y.ts
@@ -1,5 +1,5 @@
 import {Component, ViewEncapsulation} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -9,7 +9,7 @@ import {MdSnackBar} from '@angular/material';
   preserveWhitespaces: false,
 })
 export class IconAccessibilityDemo {
-  constructor(private snackBar: MdSnackBar) {}
+  constructor(private snackBar: MatSnackBar) {}
 
   deleteIcon() {
     this.snackBar.open('Item deleted', '', {duration: 2000});
diff --git a/src/demo-app/a11y/input/input-a11y.html b/src/demo-app/a11y/input/input-a11y.html
index dabc8dc3b78a..8129ee38d788 100644
--- a/src/demo-app/a11y/input/input-a11y.html
+++ b/src/demo-app/a11y/input/input-a11y.html
@@ -1,57 +1,57 @@
 <section>
   <h2>Basic input box (e.g. name field)</h2>
-  <md-form-field floatPlaceholder="never">
-    <input mdInput placeholder="First name" [(ngModel)]="firstName">
-  </md-form-field>
-  <md-form-field floatPlaceholder="never">
-    <input mdInput placeholder="Last name" [(ngModel)]="lastName">
-  </md-form-field>
+  <mat-form-field floatPlaceholder="never">
+    <input matInput placeholder="First name" [(ngModel)]="firstName">
+  </mat-form-field>
+  <mat-form-field floatPlaceholder="never">
+    <input matInput placeholder="Last name" [(ngModel)]="lastName">
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Input with hint (e.g. password field)</h2>
-  <md-form-field hideRequiredMarker>
-    <input mdInput [type]="passwordType" placeholder="Password" [(ngModel)]="password" required
+  <mat-form-field hideRequiredMarker>
+    <input matInput [type]="passwordType" placeholder="Password" [(ngModel)]="password" required
            #passwordModel="ngModel">
-    <button md-icon-button mdSuffix [attr.aria-label]="passwordToggleLabel"
+    <button mat-icon-button matSuffix [attr.aria-label]="passwordToggleLabel"
             (click)="showPassword = !showPassword">
-      <md-icon>{{passwordToggleIcon}}</md-icon>
+      <mat-icon>{{passwordToggleIcon}}</mat-icon>
     </button>
-    <md-hint>Hint: favorite color</md-hint>
-    <md-error *ngIf="passwordModel.hasError('required')">You must enter your password.</md-error>
-  </md-form-field>
+    <mat-hint>Hint: favorite color</mat-hint>
+    <mat-error *ngIf="passwordModel.hasError('required')">You must enter your password.</mat-error>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Input with error message (e.g. email field)</h2>
-  <md-form-field>
-    <input mdInput type="email" placeholder="Email" [(ngModel)]="email" required email
+  <mat-form-field>
+    <input matInput type="email" placeholder="Email" [(ngModel)]="email" required email
            #emailModel="ngModel">
-    <md-error *ngIf="emailModel.hasError('required')">You must enter your email.</md-error>
-    <md-error *ngIf="emailModel.hasError('email')">Not a valid email address.</md-error>
-  </md-form-field>
+    <mat-error *ngIf="emailModel.hasError('required')">You must enter your email.</mat-error>
+    <mat-error *ngIf="emailModel.hasError('email')">Not a valid email address.</mat-error>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Input with prefix & suffix (e.g. currency converter)</h2>
-  <md-form-field floatPlaceholder="always">
-    <input mdInput type="number" placeholder="USD" [(ngModel)]="usd">
-    <span mdPrefix>$</span>
-  </md-form-field>
+  <mat-form-field floatPlaceholder="always">
+    <input matInput type="number" placeholder="USD" [(ngModel)]="usd">
+    <span matPrefix>$</span>
+  </mat-form-field>
   =
-  <md-form-field floatPlaceholder="always">
-    <input mdInput type="number" placeholder="JPY" [(ngModel)]="jpy">
-    <span mdPrefix>‎¥‎</span>
-  </md-form-field>
+  <mat-form-field floatPlaceholder="always">
+    <input matInput type="number" placeholder="JPY" [(ngModel)]="jpy">
+    <span matPrefix>‎¥‎</span>
+  </mat-form-field>
   (as of 7/31/2017)
 </section>
 
 <section>
   <h2>Textarea input (e.g.  comment box)</h2>
-  <md-form-field>
-    <textarea mdInput aria-label="Comment" [(ngModel)]="comment" mdTextareaAutosize
+  <mat-form-field>
+    <textarea matInput aria-label="Comment" [(ngModel)]="comment" matTextareaAutosize
               [maxlength]="commentMax" #commentModel="ngModel"></textarea>
-    <md-hint>Leave us a comment!</md-hint>
-    <md-hint align="end">{{commentCount}}/{{commentMax}}</md-hint>
-  </md-form-field>
+    <mat-hint>Leave us a comment!</mat-hint>
+    <mat-hint align="end">{{commentCount}}/{{commentMax}}</mat-hint>
+  </mat-form-field>
 </section>
diff --git a/src/demo-app/a11y/menu/menu-a11y.html b/src/demo-app/a11y/menu/menu-a11y.html
index 250143c1a87d..0b810c70e2f7 100644
--- a/src/demo-app/a11y/menu/menu-a11y.html
+++ b/src/demo-app/a11y/menu/menu-a11y.html
@@ -2,52 +2,52 @@
   
   <section>
     <h2>Icon Trigger</h2>
-    <md-menu #menu1="mdMenu">
-      <button md-menu-item> Settings </button>
-      <button md-menu-item> Help </button>
-    </md-menu>
+    <mat-menu #menu1="matMenu">
+      <button mat-menu-item> Settings </button>
+      <button mat-menu-item> Help </button>
+    </mat-menu>
 
-    <button md-icon-button [mdMenuTriggerFor]="menu1" aria-label="Open Menu">
-      <md-icon>more_vert</md-icon>
+    <button mat-icon-button [matMenuTriggerFor]="menu1" aria-label="Open Menu">
+      <mat-icon>more_vert</mat-icon>
     </button>
   </section>
 
   <section>
     <h2>Menu with Icons</h2>
-    <button md-icon-button [mdMenuTriggerFor]="menu2" aria-label="Open Menu">
-      <md-icon>more_vert</md-icon>
+    <button mat-icon-button [matMenuTriggerFor]="menu2" aria-label="Open Menu">
+      <mat-icon>more_vert</mat-icon>
     </button>
 
-    <md-menu #menu2="mdMenu">
-      <button md-menu-item>
-        <md-icon>dialpad</md-icon>
+    <mat-menu #menu2="matMenu">
+      <button mat-menu-item>
+        <mat-icon>dialpad</mat-icon>
         <span>Redial</span>
       </button>
-      <button md-menu-item>
-        <md-icon>voicemail</md-icon>
+      <button mat-menu-item>
+        <mat-icon>voicemail</mat-icon>
         <span>Check voicemail</span>
       </button>
-      <button md-menu-item>
-        <md-icon>notifications_off</md-icon>
+      <button mat-menu-item>
+        <mat-icon>notifications_off</mat-icon>
         <span>Disable alerts</span>
       </button>
-    </md-menu>
+    </mat-menu>
   </section>
 
   <section>
     <h2>Menu with links</h2>
-    <button md-icon-button [mdMenuTriggerFor]="menu2" aria-label="Learn more about Angular">
-      <md-icon>more_vert</md-icon>
+    <button mat-icon-button [matMenuTriggerFor]="menu2" aria-label="Learn more about Angular">
+      <mat-icon>more_vert</mat-icon>
     </button>
     
-    <md-menu #menu2="mdMenu">
-      <a href="http://angular.io" md-menu-item>
+    <mat-menu #menu2="matMenu">
+      <a href="http://angular.io" mat-menu-item>
         Angular
       </a>
-      <a href="http://material.angular.io" md-menu-item>
+      <a href="http://material.angular.io" mat-menu-item>
         Angular Material
       </a>
-    </md-menu>
+    </mat-menu>
   </section>
 
 </div>
diff --git a/src/demo-app/a11y/progress-bar/progress-bar-a11y.html b/src/demo-app/a11y/progress-bar/progress-bar-a11y.html
index 60c14531c45d..416f7e64e237 100644
--- a/src/demo-app/a11y/progress-bar/progress-bar-a11y.html
+++ b/src/demo-app/a11y/progress-bar/progress-bar-a11y.html
@@ -1,24 +1,24 @@
 <section>
   <h2>Survey progress (Determinate progress bar)</h2>
-  <md-progress-bar mode="determinate" [value]="surveyProgress" color="primary"
+  <mat-progress-bar mode="determinate" [value]="surveyProgress" color="primary"
                    aria-label="Survey progress">
-  </md-progress-bar>
+  </mat-progress-bar>
 </section>
 
 <section>
   <h2>Video progress (Progress bar with buffer) </h2>
-  <md-progress-bar [value]="videoPlayValue" [bufferValue]="videoBufferValue" mode="buffer"
+  <mat-progress-bar [value]="videoPlayValue" [bufferValue]="videoBufferValue" mode="buffer"
                    color="primary" aria-label="Video progress">
-  </md-progress-bar>
+  </mat-progress-bar>
 </section>
 
 <section>
   <h2>Loading content progress (Indeterminate progress bar)</h2>
-    <md-progress-bar mode="indeterminate" color="warn" aria-label="Loading content">
-    </md-progress-bar>
+    <mat-progress-bar mode="indeterminate" color="warn" aria-label="Loading content">
+    </mat-progress-bar>
 </section>
 
 <section>
   <h2>Search progress (Query progress bar)</h2>
-  <md-progress-bar mode="query" color="accent" aria-label="Searching"></md-progress-bar>
+  <mat-progress-bar mode="query" color="accent" aria-label="Searching"></mat-progress-bar>
 </section>
diff --git a/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.html b/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.html
index ea7809a443eb..acf69bb60136 100644
--- a/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.html
+++ b/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.html
@@ -1,16 +1,16 @@
 <section>
   <h2>Loading indicator (Indeterminate progress spinner)</h2>
-  <md-spinner color="indeterminate" [strokeWidth]="1" aria-label="Loading"></md-spinner>
-  <md-spinner color="accent" aria-label="Loading"></md-spinner>
+  <mat-spinner color="indeterminate" [strokeWidth]="1" aria-label="Loading"></mat-spinner>
+  <mat-spinner color="accent" aria-label="Loading"></mat-spinner>
 </section>
 
 <section>
   <h2>Portion of pizza eaten (Determinate progress spinner) </h2>
-  <md-progress-spinner [strokeWidth]="1" color="primary"
+  <mat-progress-spinner [strokeWidth]="1" color="primary"
                        [value]="portionValue" aria-label="Portion of pizza eaten">
-  </md-progress-spinner>
-  <md-progress-spinner color="warn" [value]="portionValue"
+  </mat-progress-spinner>
+  <mat-progress-spinner color="warn" [value]="portionValue"
                        aria-label="Portion of pizza eaten">
-  </md-progress-spinner>
+  </mat-progress-spinner>
 
 </section>
diff --git a/src/demo-app/a11y/radio/radio-a11y.html b/src/demo-app/a11y/radio/radio-a11y.html
index 7ae213f85fed..8a349a95f967 100644
--- a/src/demo-app/a11y/radio/radio-a11y.html
+++ b/src/demo-app/a11y/radio/radio-a11y.html
@@ -1,19 +1,19 @@
 <section>
   <h2>Radio buttons in group</h2>
-  <md-radio-group name="seasons" [(ngModel)]="favoriteSeason" aria-label="Seasons">
-    <md-radio-button *ngFor="let season of seasonOptions" [value]="season">
+  <mat-radio-group name="seasons" [(ngModel)]="favoriteSeason" aria-label="Seasons">
+    <mat-radio-button *ngFor="let season of seasonOptions" [value]="season">
       {{season}}
-    </md-radio-button>
-  </md-radio-group>
+    </mat-radio-button>
+  </mat-radio-group>
 </section>
 
 <section>
   <h2>Radio buttons with align-end label position</h2>
-  <md-radio-group name="bread" align="end" aria-label="Breads">
-    <md-radio-button value="toast">Toast</md-radio-button>
-    <md-radio-button value="biscuit">Biscuit</md-radio-button>
-    <md-radio-button value="bagel">Bagel</md-radio-button>
-  </md-radio-group>
+  <mat-radio-group name="bread" align="end" aria-label="Breads">
+    <mat-radio-button value="toast">Toast</mat-radio-button>
+    <mat-radio-button value="biscuit">Biscuit</mat-radio-button>
+    <mat-radio-button value="bagel">Bagel</mat-radio-button>
+  </mat-radio-group>
 </section>
 
 <section>
@@ -22,15 +22,15 @@ <h2>Disabled radio buttons</h2>
     This section contains three radio buttons for "Yes", "No", and "Maybe".
     The "Maybe" radio button is disabled.
   </p>
-  <md-radio-button name="disable">Yes</md-radio-button>
-  <md-radio-button name="disable">No</md-radio-button>
-  <md-radio-button name="disable" [disabled]="true">Maybe</md-radio-button>
+  <mat-radio-button name="disable">Yes</mat-radio-button>
+  <mat-radio-button name="disable">No</mat-radio-button>
+  <mat-radio-button name="disable" [disabled]="true">Maybe</mat-radio-button>
 </section>
 
 <section>
   <h2>Radio buttons with different colors</h2>
-  <md-radio-button name="color">Default (accent)</md-radio-button>
-  <md-radio-button name="color" color="primary">Primary</md-radio-button>
-  <md-radio-button name="color" color="accent">Accent</md-radio-button>
-  <md-radio-button name="color" color="warn">Warn</md-radio-button>
+  <mat-radio-button name="color">Default (accent)</mat-radio-button>
+  <mat-radio-button name="color" color="primary">Primary</mat-radio-button>
+  <mat-radio-button name="color" color="accent">Accent</mat-radio-button>
+  <mat-radio-button name="color" color="warn">Warn</mat-radio-button>
 </section>
diff --git a/src/demo-app/a11y/select/select-a11y.html b/src/demo-app/a11y/select/select-a11y.html
index 4ca8f71378dd..829809d74987 100644
--- a/src/demo-app/a11y/select/select-a11y.html
+++ b/src/demo-app/a11y/select/select-a11y.html
@@ -2,89 +2,89 @@
   <h2>Single selection</h2>
   <p>Select your favorite color</p>
 
-  <md-form-field>
-    <md-select placeholder="Colors" [(ngModel)]="selectedColor">
-      <md-option *ngFor="let color of colors" [value]="color.value">
+  <mat-form-field>
+    <mat-select placeholder="Colors" [(ngModel)]="selectedColor">
+      <mat-option *ngFor="let color of colors" [value]="color.value">
         {{ color.label }}
-      </md-option>
-    </md-select>
-  </md-form-field>
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Multiple selection</h2>
   <p>Pick toppings for your pizza</p>
 
-  <md-form-field>
-    <md-select placeholder="Toppings" [(ngModel)]="selectedTopping" multiple>
-      <md-option *ngFor="let topping of toppings" [value]="topping.value">
+  <mat-form-field>
+    <mat-select placeholder="Toppings" [(ngModel)]="selectedTopping" multiple>
+      <mat-option *ngFor="let topping of toppings" [value]="topping.value">
         {{ topping.label }}
-      </md-option>
-    </md-select>
-  </md-form-field>
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Grouped options</h2>
   <p>Pick your Pokemon</p>
 
-  <md-form-field>
-    <md-select placeholder="Pokemon" [(ngModel)]="selectedPokemon">
-      <md-optgroup *ngFor="let group of pokemon" [label]="group.label">
-        <md-option *ngFor="let creature of group.pokemon" [value]="creature.value">
+  <mat-form-field>
+    <mat-select placeholder="Pokemon" [(ngModel)]="selectedPokemon">
+      <mat-optgroup *ngFor="let group of pokemon" [label]="group.label">
+        <mat-option *ngFor="let creature of group.pokemon" [value]="creature.value">
           {{ creature.label }}
-        </md-option>
-      </md-optgroup>
-    </md-select>
-  </md-form-field>
+        </mat-option>
+      </mat-optgroup>
+    </mat-select>
+  </mat-form-field>
 </section>
 
 <section>
   <h2>Colors</h2>
 
   <div class="select-a11y-spacer">
-    <md-form-field  color="primary">
-      <md-select placeholder="ZIP code">
-        <md-option value="2000">2000</md-option>
-        <md-option value="2100">2100</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field  color="primary">
+      <mat-select placeholder="ZIP code">
+        <mat-option value="2000">2000</mat-option>
+        <mat-option value="2100">2100</mat-option>
+      </mat-select>
+    </mat-form-field>
 
-    <md-form-field color="accent">
-      <md-select placeholder="State">
-        <md-option value="alaska">Alaska</md-option>
-        <md-option value="alabama">Alabama</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field color="accent">
+      <mat-select placeholder="State">
+        <mat-option value="alaska">Alaska</mat-option>
+        <mat-option value="alabama">Alabama</mat-option>
+      </mat-select>
+    </mat-form-field>
 
-    <md-form-field color="warn">
-      <md-select placeholder="Language">
-        <md-option value="english">English</md-option>
-        <md-option value="spanish">Spanish</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field color="warn">
+      <mat-select placeholder="Language">
+        <mat-option value="english">English</mat-option>
+        <mat-option value="spanish">Spanish</mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 
   <div class="select-a11y-spacer">
-    <md-form-field color="primary">
-      <md-select placeholder="Digimon" multiple>
-        <md-option value="mihiramon">Mihiramon</md-option>
-        <md-option value="sandiramon">Sandiramon</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field color="primary">
+      <mat-select placeholder="Digimon" multiple>
+        <mat-option value="mihiramon">Mihiramon</mat-option>
+        <mat-option value="sandiramon">Sandiramon</mat-option>
+      </mat-select>
+    </mat-form-field>
 
-    <md-form-field color="accent">
-      <md-select placeholder="Drink" multiple>
-        <md-option value="water">Water</md-option>
-        <md-option value="coke">Coke</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field color="accent">
+      <mat-select placeholder="Drink" multiple>
+        <mat-option value="water">Water</mat-option>
+        <mat-option value="coke">Coke</mat-option>
+      </mat-select>
+    </mat-form-field>
 
-    <md-form-field color="warn">
-      <md-select placeholder="Theme" multiple>
-        <md-option value="light">Light</md-option>
-        <md-option value="dark">Dark</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field color="warn">
+      <mat-select placeholder="Theme" multiple>
+        <mat-option value="light">Light</mat-option>
+        <mat-option value="dark">Dark</mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
 </section>
diff --git a/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.html b/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.html
index 3fe2d1ef16be..80ae889df807 100644
--- a/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.html
+++ b/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.html
@@ -1,28 +1,28 @@
 <section>
   <h2>Receive email update</h2>
   <p>Showing a toggle to manage whether receive email update.</p>
-  <md-slide-toggle color="primary" [(ngModel)]="emailToggle">
+  <mat-slide-toggle color="primary" [(ngModel)]="emailToggle">
     Receive email update
-  </md-slide-toggle>
+  </mat-slide-toggle>
 </section>
 
 <section>
   <h2>Music</h2>
   <p>Showing a disabled toggle to control music on/off status.</p>
-  <md-slide-toggle color="accent" [disabled]="true" [(ngModel)]="musicToggle">
+  <mat-slide-toggle color="accent" [disabled]="true" [(ngModel)]="musicToggle">
     Music {{musicToggle ? 'on' : 'off'}}   (disabled)
-  </md-slide-toggle>
+  </mat-slide-toggle>
 </section>
 
 <section>
   <h2>Terms and conditions</h2>
   <p>Showing a required toggle to accept terms and conditions in a form.</p>
   <form #form="ngForm" (ngSubmit)="onFormSubmit()" ngNativeValidate>
-    <md-slide-toggle name="termsToggle" required ngModel>
+    <mat-slide-toggle name="termsToggle" required ngModel>
       I agree to terms and conditions
-    </md-slide-toggle>
+    </mat-slide-toggle>
     <p>
-      <button md-raised-button type="submit">Submit</button>
+      <button mat-raised-button type="submit">Submit</button>
     </p>
   </form>
 </section>
diff --git a/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts b/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts
index 6975bcfcd8ba..58c3ff2c6a3f 100644
--- a/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts
+++ b/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 
 @Component({
@@ -12,7 +12,7 @@ export class SlideToggleAccessibilityDemo {
   termsToggle: boolean = false;
   musicToggle: boolean = false;
 
-  constructor(private snackBar: MdSnackBar) {}
+  constructor(private snackBar: MatSnackBar) {}
 
   onFormSubmit() {
     this.snackBar.open('Terms and condistions accepted!', '', {duration: 2000});
diff --git a/src/demo-app/a11y/slider/slider-a11y.html b/src/demo-app/a11y/slider/slider-a11y.html
index b4d31868b510..baa781c32f0c 100644
--- a/src/demo-app/a11y/slider/slider-a11y.html
+++ b/src/demo-app/a11y/slider/slider-a11y.html
@@ -5,15 +5,15 @@ <h2>Continuous slider (e.g. color component sliders)</h2>
     <div class="demo-color-sliders">
       <div>
         <label class="demo-color-label" for="r-slider">Red</label>
-        <md-slider id="r-slider" min="0" max="255" [(ngModel)]="red"></md-slider>
+        <mat-slider id="r-slider" min="0" max="255" [(ngModel)]="red"></mat-slider>
       </div>
       <div>
         <label class="demo-color-label" for="g-slider">Green</label>
-        <md-slider id="g-slider" min="0" max="255" [(ngModel)]="green"></md-slider>
+        <mat-slider id="g-slider" min="0" max="255" [(ngModel)]="green"></mat-slider>
       </div>
       <div>
         <label class="demo-color-label" for="b-slider">Blue</label>
-        <md-slider id="b-slider" min="0" max="255" [(ngModel)]="blue"></md-slider>
+        <mat-slider id="b-slider" min="0" max="255" [(ngModel)]="blue"></mat-slider>
       </div>
     </div>
   <div class="demo-color-swatch" [style.background]="swatchBackground"></div>
@@ -23,7 +23,7 @@ <h2>Continuous slider (e.g. color component sliders)</h2>
 <section>
   <h2>Discrete slider (e.g. rate a product)</h2>
   <p>Please rate our product on a scale of 1 (not satisfied) to 5 (extremely satisfied).</p>
-  <md-slider min="1" max="5" tickInterval="1" thumbLabel aria-label="Rating"></md-slider>
+  <mat-slider min="1" max="5" tickInterval="1" thumbLabel aria-label="Rating"></mat-slider>
 </section>
 
 <section>
@@ -31,9 +31,9 @@ <h2>Vertical slider (e.g. volume control)</h2>
   <p>Use the slider to adjust the volume.</p>
   <div class="demo-volume-container">
     <label for="vol-slider">
-      <md-icon aria-hidden>volume_up</md-icon>
+      <mat-icon aria-hidden>volume_up</mat-icon>
       <span class="cdk-visually-hidden">Volume</span>
     </label>
-    <md-slider id="vol-slider" min="0" max="100" vertical inverted></md-slider>
+    <mat-slider id="vol-slider" min="0" max="100" vertical inverted></mat-slider>
   </div>
 </section>
diff --git a/src/demo-app/a11y/snack-bar/snack-bar-a11y.html b/src/demo-app/a11y/snack-bar/snack-bar-a11y.html
index 0065282adccb..45e955476faf 100644
--- a/src/demo-app/a11y/snack-bar/snack-bar-a11y.html
+++ b/src/demo-app/a11y/snack-bar/snack-bar-a11y.html
@@ -1,7 +1,7 @@
 <section>
   <h2>Notification</h2>
   <p>Showing a notification by snack bar without showing actions</p>
-  <button md-raised-button color="primary" (click)="openNotificationSnackBar()">
+  <button mat-raised-button color="primary" (click)="openNotificationSnackBar()">
     Support
   </button>
 </section>
@@ -9,5 +9,5 @@ <h2>Notification</h2>
 <section>
   <h2>Disco party </h2>
   <p>Showing a notification by snack bar with a dismiss button</p>
-  <button md-button (click)="openDiscoPartySnackBar()">Disco</button>
+  <button mat-button (click)="openDiscoPartySnackBar()">Disco</button>
 </section>
diff --git a/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts b/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts
index 8a4953fc8061..b36ad0bc69b1 100644
--- a/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts
+++ b/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -7,7 +7,7 @@ import {MdSnackBar} from '@angular/material';
   templateUrl: 'snack-bar-a11y.html',
 })
 export class SnackBarAccessibilityDemo {
-  constructor(private snackBar: MdSnackBar) {}
+  constructor(private snackBar: MatSnackBar) {}
 
   openDiscoPartySnackBar() {
     this.snackBar.open('Disco party!', 'Dismiss', {duration: 5000});
diff --git a/src/demo-app/a11y/tabs/tabs-a11y.html b/src/demo-app/a11y/tabs/tabs-a11y.html
index af66c3b2889e..d391431dc90a 100644
--- a/src/demo-app/a11y/tabs/tabs-a11y.html
+++ b/src/demo-app/a11y/tabs/tabs-a11y.html
@@ -2,8 +2,8 @@
   <h2>Weather</h2>
   <p>Switch tabs to navigate</p>
 
-  <nav md-tab-nav-bar aria-label="weather navigation links">
-    <a md-tab-link
+  <nav mat-tab-nav-bar aria-label="weather navigation links">
+    <a mat-tab-link
        *ngFor="let tabLink of tabLinks; let i = index"
        [routerLink]="tabLink.link"
        routerLinkActive #rla="routerLinkActive"
@@ -18,9 +18,9 @@ <h2>Weather</h2>
   <h2>Dog breeds</h2>
   <p>Dynamic height tabs</p>
 
-  <md-tab-group class="demo-tab-group" dynamicHeight>
-    <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
-      <ng-template md-tab-label>{{tab.label}}</ng-template>
+  <mat-tab-group class="demo-tab-group" dynamicHeight>
+    <mat-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
+      <ng-template mat-tab-label>{{tab.label}}</ng-template>
       <div class="tab-content">
         {{tab.content}}
         <br>
@@ -57,7 +57,7 @@ <h2>Dog breeds</h2>
           <br>
         </div>
       </div>
-    </md-tab>
-  </md-tab-group>
+    </mat-tab>
+  </mat-tab-group>
 </section>
 
diff --git a/src/demo-app/a11y/toolbar/toolbar-a11y.html b/src/demo-app/a11y/toolbar/toolbar-a11y.html
index d50e35d6ccc3..064da06c75d9 100644
--- a/src/demo-app/a11y/toolbar/toolbar-a11y.html
+++ b/src/demo-app/a11y/toolbar/toolbar-a11y.html
@@ -1,40 +1,40 @@
 <div class="demo-toolbar">
   <section>
     <h2>Basic Toolbar with Text  (e.g. Only display app’s name)</h2>
-    <md-toolbar role="heading">
+    <mat-toolbar role="heading">
       <h1>My App</h1>
-    </md-toolbar>
+    </mat-toolbar>
     <p>Hello World!</p>
   </section>
 
   <section>
     <h2>Multiple Lines Toolbar</h2>
-    <md-toolbar>
+    <mat-toolbar>
       <h1>Settings</h1>
-    </md-toolbar>
-    <md-toolbar>
+    </mat-toolbar>
+    <mat-toolbar>
       <h1>Profile</h1>
-    </md-toolbar>
+    </mat-toolbar>
     <p>My profile</p>
   </section>
 
   <section>
     <h2>Toolbar with favorite icon</h2>
-    <md-toolbar>
+    <mat-toolbar>
       <h1>My App</h1>
       <span class="example-spacer"></span>
-      <button md-button>
-        <md-icon aria-label="favorite">favorite</md-icon>
+      <button mat-button>
+        <mat-icon aria-label="favorite">favorite</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
     <p>Hello World!</p>
   </section>
 
   <section>
     <h2>Toolbar colors</h2>
-    <md-toolbar color="primary">
+    <mat-toolbar color="primary">
       <h1>My App</h1>
-    </md-toolbar>
+    </mat-toolbar>
     <p>Hello World!</p>
   </section>
 </div>
diff --git a/src/demo-app/a11y/tooltip/tooltip-a11y.html b/src/demo-app/a11y/tooltip/tooltip-a11y.html
index 14c2307cd09b..699f019dfcee 100644
--- a/src/demo-app/a11y/tooltip/tooltip-a11y.html
+++ b/src/demo-app/a11y/tooltip/tooltip-a11y.html
@@ -1,14 +1,14 @@
 <section>
   <h2>Mouse over or tab to trigger a tooltip</h2>
   <p>Mouse over or focus the button to show and hide the tooltip</p>
-  <button md-raised-button mdTooltip="This is an example of a tooltip">What is this?</button>
+  <button mat-raised-button matTooltip="This is an example of a tooltip">What is this?</button>
 </section>
 
 
 <section>
   <h2>Click to trigger a tooltip</h2>
-  <button md-raised-button (click)="tooltip.toggle(); $event.stopPropagation()">Toggle the tooltip</button>
-  <button md-raised-button mdTooltip="This is a tooltip that shows on click" #tooltip="mdTooltip">I have a tooltip</button>
+  <button mat-raised-button (click)="tooltip.toggle(); $event.stopPropagation()">Toggle the tooltip</button>
+  <button mat-raised-button matTooltip="This is a tooltip that shows on click" #tooltip="matTooltip">I have a tooltip</button>
 </section>
 
 
@@ -16,30 +16,30 @@ <h2>Click to trigger a tooltip</h2>
   <h2>Different tooltip positions</h2>
 
   <button
-    md-raised-button
-    mdTooltip="This tooltip appears below the trigger"
-    mdTooltipPosition="below">Below</button>
+    mat-raised-button
+    matTooltip="This tooltip appears below the trigger"
+    matTooltipPosition="below">Below</button>
 
   <button
-    md-raised-button
-    mdTooltip="This tooltip appears above the trigger"
-    mdTooltipPosition="above">Above</button>
+    mat-raised-button
+    matTooltip="This tooltip appears above the trigger"
+    matTooltipPosition="above">Above</button>
 
   <button
-    md-raised-button
-    mdTooltip="This tooltip appears to the left of the trigger"
-    mdTooltipPosition="left">Left</button>
+    mat-raised-button
+    matTooltip="This tooltip appears to the left of the trigger"
+    matTooltipPosition="left">Left</button>
 
   <button
-    md-raised-button
-    mdTooltip="This tooltip appears to the right of the trigger"
-    mdTooltipPosition="right">Right</button>
+    mat-raised-button
+    matTooltip="This tooltip appears to the right of the trigger"
+    matTooltipPosition="right">Right</button>
 </section>
 
 <section>
   <h2>Delayed tooltip</h2>
   <button
-    md-raised-button
-    mdTooltip="This tooltip will show up after a delay"
-    [mdTooltipShowDelay]="2000">What is this?</button>
+    mat-raised-button
+    matTooltip="This tooltip will show up after a delay"
+    [matTooltipShowDelay]="2000">What is this?</button>
 </section>
diff --git a/src/demo-app/autocomplete/autocomplete-demo.html b/src/demo-app/autocomplete/autocomplete-demo.html
index 5ca27f2a5d0b..e31478d10b25 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.html
+++ b/src/demo-app/autocomplete/autocomplete-demo.html
@@ -1,87 +1,87 @@
 Space above cards: <input type="number" [formControl]="topHeightCtrl">
 <div [style.height.px]="topHeightCtrl.value"></div>
 <div class="demo-autocomplete">
-  <md-card>
+  <mat-card>
     Reactive length: {{ reactiveStates.length }}
     <div>Reactive value: {{ stateCtrl.value | json }}</div>
     <div>Reactive dirty: {{ stateCtrl.dirty }}</div>
 
-    <md-form-field floatPlaceholder="never">
-      <input mdInput placeholder="State" [mdAutocomplete]="reactiveAuto" [formControl]="stateCtrl">
-      <md-autocomplete #reactiveAuto="mdAutocomplete" [displayWith]="displayFn">
-        <md-option *ngFor="let state of reactiveStates | async" [value]="state">
+    <mat-form-field floatPlaceholder="never">
+      <input matInput placeholder="State" [matAutocomplete]="reactiveAuto" [formControl]="stateCtrl">
+      <mat-autocomplete #reactiveAuto="matAutocomplete" [displayWith]="displayFn">
+        <mat-option *ngFor="let state of reactiveStates | async" [value]="state">
           <span>{{ state.name }}</span>
           <span class="demo-secondary-text"> ({{state.code}}) </span>
-        </md-option>
-      </md-autocomplete>
-    </md-form-field>
+        </mat-option>
+      </mat-autocomplete>
+    </mat-form-field>
 
-    <md-card-actions>
-      <button md-button (click)="stateCtrl.reset()">RESET</button>
-      <button md-button (click)="stateCtrl.setValue(states[10])">SET VALUE</button>
-      <button md-button (click)="stateCtrl.enabled ? stateCtrl.disable() : stateCtrl.enable()">
+    <mat-card-actions>
+      <button mat-button (click)="stateCtrl.reset()">RESET</button>
+      <button mat-button (click)="stateCtrl.setValue(states[10])">SET VALUE</button>
+      <button mat-button (click)="stateCtrl.enabled ? stateCtrl.disable() : stateCtrl.enable()">
         TOGGLE DISABLED
       </button>
-    </md-card-actions>
+    </mat-card-actions>
 
-  </md-card>
+  </mat-card>
 
-  <md-card>
+  <mat-card>
 
     <div>Template-driven value (currentState): {{ currentState }}</div>
     <div>Template-driven dirty: {{ modelDir ? modelDir.dirty : false }}</div>
 
     <!-- Added an ngIf below to test that autocomplete works with ngIf -->
-    <md-form-field *ngIf="true">
-      <input mdInput placeholder="State" [mdAutocomplete]="tdAuto" [(ngModel)]="currentState"
+    <mat-form-field *ngIf="true">
+      <input matInput placeholder="State" [matAutocomplete]="tdAuto" [(ngModel)]="currentState"
         (ngModelChange)="tdStates = filterStates(currentState)" [disabled]="tdDisabled">
-      <md-autocomplete #tdAuto="mdAutocomplete">
-        <md-option *ngFor="let state of tdStates" [value]="state.name">
+      <mat-autocomplete #tdAuto="matAutocomplete">
+        <mat-option *ngFor="let state of tdStates" [value]="state.name">
           <span>{{ state.name }}</span>
-        </md-option>
-      </md-autocomplete>
-    </md-form-field>
+        </mat-option>
+      </mat-autocomplete>
+    </mat-form-field>
 
-    <md-card-actions>
-      <button md-button (click)="modelDir.reset()">RESET</button>
-      <button md-button (click)="currentState='California'">SET VALUE</button>
-      <button md-button (click)="tdDisabled=!tdDisabled">
+    <mat-card-actions>
+      <button mat-button (click)="modelDir.reset()">RESET</button>
+      <button mat-button (click)="currentState='California'">SET VALUE</button>
+      <button mat-button (click)="tdDisabled=!tdDisabled">
         TOGGLE DISABLED
       </button>
-    </md-card-actions>
+    </mat-card-actions>
 
-  </md-card>
+  </mat-card>
 
-  <md-card>
+  <mat-card>
     <div>Option groups (currentGroupedState): {{ currentGroupedState }}</div>
 
-    <md-input-container>
+    <mat-input-container>
       <input
-        mdInput
+        matInput
         placeholder="State"
-        [mdAutocomplete]="groupedAuto"
+        [matAutocomplete]="groupedAuto"
         [(ngModel)]="currentGroupedState"
         (ngModelChange)="filteredGroupedStates = filterStateGroups(currentGroupedState)">
-    </md-input-container>
-  </md-card>
+    </mat-input-container>
+  </mat-card>
 </div>
 
-<md-autocomplete #reactiveAuto="mdAutocomplete" [displayWith]="displayFn">
-  <md-option *ngFor="let state of reactiveStates | async" [value]="state">
+<mat-autocomplete #reactiveAuto="matAutocomplete" [displayWith]="displayFn">
+  <mat-option *ngFor="let state of reactiveStates | async" [value]="state">
     <span>{{ state.name }}</span>
     <span class="demo-secondary-text"> ({{state.code}}) </span>
-  </md-option>
-</md-autocomplete>
+  </mat-option>
+</mat-autocomplete>
 
-<md-autocomplete #tdAuto="mdAutocomplete">
-  <md-option *ngFor="let state of tdStates" [value]="state.name">
+<mat-autocomplete #tdAuto="matAutocomplete">
+  <mat-option *ngFor="let state of tdStates" [value]="state.name">
     <span>{{ state.name }}</span>
-  </md-option>
-</md-autocomplete>
+  </mat-option>
+</mat-autocomplete>
 
-<md-autocomplete #groupedAuto="mdAutocomplete">
-  <md-optgroup *ngFor="let group of filteredGroupedStates"
+<mat-autocomplete #groupedAuto="matAutocomplete">
+  <mat-optgroup *ngFor="let group of filteredGroupedStates"
     [label]="'States starting with ' + group.letter">
-    <md-option *ngFor="let state of group.states" [value]="state.name">{{ state.name }}</md-option>
-  </md-optgroup>
-</md-autocomplete>
+    <mat-option *ngFor="let state of group.states" [value]="state.name">{{ state.name }}</mat-option>
+  </mat-optgroup>
+</mat-autocomplete>
diff --git a/src/demo-app/baseline/baseline-demo.html b/src/demo-app/baseline/baseline-demo.html
index ba4568cb36d5..8a695ce1c7f4 100644
--- a/src/demo-app/baseline/baseline-demo.html
+++ b/src/demo-app/baseline/baseline-demo.html
@@ -1,61 +1,61 @@
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Basic Forms</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Basic Forms</mat-toolbar>
+  <mat-card-content>
     Text Before |
-    <md-checkbox>Checkbox Label</md-checkbox>
+    <mat-checkbox>Checkbox Label</mat-checkbox>
     | Text 1 |
-    <md-radio-button value="option_1">Radio 1</md-radio-button>
+    <mat-radio-button value="option_1">Radio 1</mat-radio-button>
     | Text 2 |
-    <md-radio-button value="option_2">Radio 2</md-radio-button>
+    <mat-radio-button value="option_2">Radio 2</mat-radio-button>
     | Text 3 |
-    <md-radio-button value="option_3">Radio 3</md-radio-button>
+    <mat-radio-button value="option_3">Radio 3</mat-radio-button>
     | Text 4 |
-    <md-form-field>
-      <input mdInput placeholder="Input" value="Text Input">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Input" value="Text Input">
+    </mat-form-field>
     | Text 5 |
-    <md-form-field>
-      <md-select placeholder="This placeholder is really really really long">
-        <md-option value="option">Option</md-option>
-        <md-option value="long">This option is really really really long</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select placeholder="This placeholder is really really really long">
+        <mat-option value="option">Option</mat-option>
+        <mat-option value="long">This option is really really really long</mat-option>
+      </mat-select>
+    </mat-form-field>
     | Text 6 |
-    <md-form-field>
-      <textarea mdInput placeholder="Input" mdTextareaAutosize>Textarea&#10;Line 2</textarea>
-    </md-form-field>
+    <mat-form-field>
+      <textarea matInput placeholder="Input" matTextareaAutosize>Textarea&#10;Line 2</textarea>
+    </mat-form-field>
     | Text After
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Headers</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Headers</mat-toolbar>
+  <mat-card-content>
     <h1>
       Text Before |
-      <md-checkbox>Checkbox Label</md-checkbox>
+      <mat-checkbox>Checkbox Label</mat-checkbox>
       | Text 1 |
-      <md-radio-button value="option_1">Radio 1</md-radio-button>
+      <mat-radio-button value="option_1">Radio 1</mat-radio-button>
       | Text 2 |
-      <md-radio-button value="option_2">Radio 2</md-radio-button>
+      <mat-radio-button value="option_2">Radio 2</mat-radio-button>
       | Text 3 |
-      <md-radio-button value="option_3">Radio 3</md-radio-button>
+      <mat-radio-button value="option_3">Radio 3</mat-radio-button>
       | Text 4 |
-      <md-form-field>
-        <input mdInput placeholder="Input" value="Text Input">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput placeholder="Input" value="Text Input">
+      </mat-form-field>
       | Text 5 |
-      <md-form-field>
-        <md-select placeholder="This placeholder is really really really long">
-          <md-option value="option">Option</md-option>
-          <md-option value="long">This option is really really really long</md-option>
-        </md-select>
-      </md-form-field>
+      <mat-form-field>
+        <mat-select placeholder="This placeholder is really really really long">
+          <mat-option value="option">Option</mat-option>
+          <mat-option value="long">This option is really really really long</mat-option>
+        </mat-select>
+      </mat-form-field>
       | Text 6 |
-      <md-form-field>
-        <textarea mdInput placeholder="Input" mdTextareaAutosize>Textarea&#10;Line 2</textarea>
-      </md-form-field>
+      <mat-form-field>
+        <textarea matInput placeholder="Input" matTextareaAutosize>Textarea&#10;Line 2</textarea>
+      </mat-form-field>
       | Text After
     </h1>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
diff --git a/src/demo-app/button-toggle/button-toggle-demo.html b/src/demo-app/button-toggle/button-toggle-demo.html
index 0d158c21ecc3..3d81775b284e 100644
--- a/src/demo-app/button-toggle/button-toggle-demo.html
+++ b/src/demo-app/button-toggle/button-toggle-demo.html
@@ -1,57 +1,57 @@
 <p>
-  <md-checkbox (change)="isVertical = $event.checked">Show Button Toggles Vertical</md-checkbox>
+  <mat-checkbox (change)="isVertical = $event.checked">Show Button Toggles Vertical</mat-checkbox>
 </p>
 
 <p>
-  <md-checkbox (change)="isDisabled = $event.checked">Disable Button Toggle Items</md-checkbox>
+  <mat-checkbox (change)="isDisabled = $event.checked">Disable Button Toggle Items</mat-checkbox>
 </p>
 
 <h1>Exclusive Selection</h1>
 
 <section class="demo-section">
-  <md-button-toggle-group name="alignment" [vertical]="isVertical">
-    <md-button-toggle value="left"><md-icon>format_align_left</md-icon></md-button-toggle>
-    <md-button-toggle value="center"><md-icon>format_align_center</md-icon></md-button-toggle>
-    <md-button-toggle value="right"><md-icon>format_align_right</md-icon></md-button-toggle>
-    <md-button-toggle value="justify" [disabled]="isDisabled"><md-icon>format_align_justify</md-icon></md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group name="alignment" [vertical]="isVertical">
+    <mat-button-toggle value="left"><mat-icon>format_align_left</mat-icon></mat-button-toggle>
+    <mat-button-toggle value="center"><mat-icon>format_align_center</mat-icon></mat-button-toggle>
+    <mat-button-toggle value="right"><mat-icon>format_align_right</mat-icon></mat-button-toggle>
+    <mat-button-toggle value="justify" [disabled]="isDisabled"><mat-icon>format_align_justify</mat-icon></mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
 
 <h1>Disabled Group</h1>
 
 <section class="demo-section">
-  <md-button-toggle-group name="checkbox" [vertical]="isVertical" [disabled]="isDisabled">
-    <md-button-toggle value="bold">
-      <md-icon class="md-24">format_bold</md-icon>
-    </md-button-toggle>
-    <md-button-toggle value="italic">
-      <md-icon class="md-24">format_italic</md-icon>
-    </md-button-toggle>
-    <md-button-toggle value="underline">
-      <md-icon class="md-24">format_underline</md-icon>
-    </md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group name="checkbox" [vertical]="isVertical" [disabled]="isDisabled">
+    <mat-button-toggle value="bold">
+      <mat-icon class="md-24">format_bold</mat-icon>
+    </mat-button-toggle>
+    <mat-button-toggle value="italic">
+      <mat-icon class="md-24">format_italic</mat-icon>
+    </mat-button-toggle>
+    <mat-button-toggle value="underline">
+      <mat-icon class="md-24">format_underline</mat-icon>
+    </mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
 
 <h1>Multiple Selection</h1>
 <section class="demo-section">
-  <md-button-toggle-group multiple [vertical]="isVertical">
-    <md-button-toggle>Flour</md-button-toggle>
-    <md-button-toggle>Eggs</md-button-toggle>
-    <md-button-toggle>Sugar</md-button-toggle>
-    <md-button-toggle [disabled]="isDisabled">Milk</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group multiple [vertical]="isVertical">
+    <mat-button-toggle>Flour</mat-button-toggle>
+    <mat-button-toggle>Eggs</mat-button-toggle>
+    <mat-button-toggle>Sugar</mat-button-toggle>
+    <mat-button-toggle [disabled]="isDisabled">Milk</mat-button-toggle>
+  </mat-button-toggle-group>
 </section>
 
 <h1>Single Toggle</h1>
-<md-button-toggle>Yes</md-button-toggle>
+<mat-button-toggle>Yes</mat-button-toggle>
 
 <h1>Dynamic Exclusive Selection</h1>
 <section class="demo-section">
-  <md-button-toggle-group name="pies" [(ngModel)]="favoritePie" [vertical]="isVertical">
-    <md-button-toggle *ngFor="let pie of pieOptions" [value]="pie">
+  <mat-button-toggle-group name="pies" [(ngModel)]="favoritePie" [vertical]="isVertical">
+    <mat-button-toggle *ngFor="let pie of pieOptions" [value]="pie">
       {{pie}}
-    </md-button-toggle>
-  </md-button-toggle-group>
+    </mat-button-toggle>
+  </mat-button-toggle-group>
   <p>Your favorite type of pie is: {{favoritePie}}</p>
 </section>
diff --git a/src/demo-app/button/button-demo.html b/src/demo-app/button/button-demo.html
index 98a31e38b9a1..38ffdfd83e83 100644
--- a/src/demo-app/button/button-demo.html
+++ b/src/demo-app/button/button-demo.html
@@ -1,113 +1,113 @@
 <div class="demo-button">
   <section>
-    <button md-button>flat</button>
-    <button md-raised-button>raised</button>
-    <button md-fab>
-      <md-icon class="md-24">check</md-icon>
+    <button mat-button>flat</button>
+    <button mat-raised-button>raised</button>
+    <button mat-fab>
+      <mat-icon class="md-24">check</mat-icon>
     </button>
-    <button md-fab>Btn</button>
-    <a md-fab routerLink=".">Link</a>
-    <a md-fab routerLink="."><md-icon class="md-24">check</md-icon></a>
-    <button md-mini-fab>
-      <md-icon class="md-24">check</md-icon>
+    <button mat-fab>Btn</button>
+    <a mat-fab routerLink=".">Link</a>
+    <a mat-fab routerLink="."><mat-icon class="md-24">check</mat-icon></a>
+    <button mat-mini-fab>
+      <mat-icon class="md-24">check</mat-icon>
     </button>
-    <button md-mini-fab>Btn</button>
-    <a md-mini-fab routerLink=".">Link</a>
+    <button mat-mini-fab>Btn</button>
+    <a mat-mini-fab routerLink=".">Link</a>
   </section>
 
   <section>
-    <a href="http://www.google.com" md-button color="primary">SEARCH</a>
-    <a href="http://www.google.com" md-raised-button>SEARCH</a>
-    <a href="http://www.google.com" md-fab>
-      <md-icon class="md-24">check</md-icon>
+    <a href="http://www.google.com" mat-button color="primary">SEARCH</a>
+    <a href="http://www.google.com" mat-raised-button>SEARCH</a>
+    <a href="http://www.google.com" mat-fab>
+      <mat-icon class="md-24">check</mat-icon>
     </a>
-    <a href="http://www.google.com" md-mini-fab>
-      <md-icon class="md-24">check</md-icon>
+    <a href="http://www.google.com" mat-mini-fab>
+      <mat-icon class="md-24">check</mat-icon>
     </a>
   </section>
 
   <section>
-    <button md-button color="primary">primary</button>
-    <button md-button color="accent">accent</button>
-    <button md-button color="warn">warn</button>
+    <button mat-button color="primary">primary</button>
+    <button mat-button color="accent">accent</button>
+    <button mat-button color="warn">warn</button>
   </section>
 
   <section>
-    <button md-raised-button color="primary">primary</button>
-    <button md-raised-button color="accent">accent</button>
-    <button md-raised-button color="warn">warn</button>
+    <button mat-raised-button color="primary">primary</button>
+    <button mat-raised-button color="accent">accent</button>
+    <button mat-raised-button color="warn">warn</button>
   </section>
 
   <section>
-    <button md-fab color="primary">
-      <md-icon class="md-24">home</md-icon>
+    <button mat-fab color="primary">
+      <mat-icon class="md-24">home</mat-icon>
     </button>
-    <button md-fab color="accent">
-      <md-icon class="md-24">favorite</md-icon>
+    <button mat-fab color="accent">
+      <mat-icon class="md-24">favorite</mat-icon>
     </button>
-    <button md-fab color="warn">
-      <md-icon class="md-24">feedback</md-icon>
+    <button mat-fab color="warn">
+      <mat-icon class="md-24">feedback</mat-icon>
     </button>
   </section>
 
   <section>
-    <button md-icon-button color="primary">
-      <md-icon class="md-24">menu</md-icon>
+    <button mat-icon-button color="primary">
+      <mat-icon class="md-24">menu</mat-icon>
     </button>
 
-    <button md-icon-button color="accent">
-      <md-icon class="md-24">favorite</md-icon>
+    <button mat-icon-button color="accent">
+      <mat-icon class="md-24">favorite</mat-icon>
     </button>
 
-    <button md-icon-button>
-      <md-icon class="md-24">more_vert</md-icon>
+    <button mat-icon-button>
+      <mat-icon class="md-24">more_vert</mat-icon>
     </button>
   </section>
 
   <section>
     <div>
       <p>isDisabled: {{isDisabled}}, clickCounter: <span>{{clickCounter}}</span></p>
-      <button md-raised-button (click)="isDisabled=!isDisabled">
+      <button mat-raised-button (click)="isDisabled=!isDisabled">
         Disable buttons
       </button>
-      <button md-raised-button (click)="button1.focus()">Focus 1</button>
-      <button md-raised-button (click)="button2.focus()">Focus 2</button>
-      <button md-raised-button (click)="button3.focus()">Focus 3</button>
+      <button mat-raised-button (click)="button1.focus()">Focus 1</button>
+      <button mat-raised-button (click)="button2.focus()">Focus 2</button>
+      <button mat-raised-button (click)="button3.focus()">Focus 3</button>
     </div>
-    <button md-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1">off</button>
-    <button md-button color="primary" [disabled]="isDisabled">off</button>
-    <a href="http://www.google.com" #button2 md-button color="accent" [disabled]="isDisabled">off</a>
-    <button md-raised-button #button3 color="primary" [disabled]="isDisabled">off</button>
-    <button md-mini-fab [disabled]="isDisabled">
-      <md-icon class="md-24">check</md-icon>
+    <button mat-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1">off</button>
+    <button mat-button color="primary" [disabled]="isDisabled">off</button>
+    <a href="http://www.google.com" #button2 mat-button color="accent" [disabled]="isDisabled">off</a>
+    <button mat-raised-button #button3 color="primary" [disabled]="isDisabled">off</button>
+    <button mat-mini-fab [disabled]="isDisabled">
+      <mat-icon class="md-24">check</mat-icon>
     </button>
 
-    <button md-icon-button color="accent" [disabled]="isDisabled">
-      <md-icon class="md-24">favorite</md-icon>
+    <button mat-icon-button color="accent" [disabled]="isDisabled">
+      <mat-icon class="md-24">favorite</mat-icon>
     </button>
   </section>
   <section>
-    <a href="http://www.google.com" md-button color="primary">SEARCH</a>
-    <button md-button>DANCE</button>
+    <a href="http://www.google.com" mat-button color="primary">SEARCH</a>
+    <button mat-button>DANCE</button>
   </section>
   <section>
-    <a href="http://www.google.com" md-raised-button color="primary">SEARCH</a>
-    <button md-raised-button>DANCE</button>
+    <a href="http://www.google.com" mat-raised-button color="primary">SEARCH</a>
+    <button mat-raised-button>DANCE</button>
   </section>
   <section>
-    <button md-raised-button>More<md-icon>more_vert</md-icon></button>
-    <button md-raised-button>Check<md-icon>check</md-icon></button>
-    <button md-raised-button>Check<md-icon class="md-24">favorite</md-icon></button>
-    <button md-raised-button>Last<md-icon>navigate_before</md-icon></button>
+    <button mat-raised-button>More<mat-icon>more_vert</mat-icon></button>
+    <button mat-raised-button>Check<mat-icon>check</mat-icon></button>
+    <button mat-raised-button>Check<mat-icon class="md-24">favorite</mat-icon></button>
+    <button mat-raised-button>Last<mat-icon>navigate_before</mat-icon></button>
   </section>
   <section>
-    <button md-button>More<md-icon>more_vert</md-icon></button>
-    <button md-button>Check<md-icon>check</md-icon></button>
-    <button md-button>Check<md-icon class="md-24">favorite</md-icon></button>
-    <button md-button>Last<md-icon>navigate_before</md-icon></button>
+    <button mat-button>More<mat-icon>more_vert</mat-icon></button>
+    <button mat-button>Check<mat-icon>check</mat-icon></button>
+    <button mat-button>Check<mat-icon class="md-24">favorite</mat-icon></button>
+    <button mat-button>Last<mat-icon>navigate_before</mat-icon></button>
   </section>
   <section>
-    <button md-raised-button [disabled]="toggleDisable" (click)="toggleDisable = true">Disable</button>
-    <button md-button [disabled]="!toggleDisable" (click)="toggleDisable = false">Disable</button>
+    <button mat-raised-button [disabled]="toggleDisable" (click)="toggleDisable = true">Disable</button>
+    <button mat-button [disabled]="!toggleDisable" (click)="toggleDisable = false">Disable</button>
   </section>
 </div>
diff --git a/src/demo-app/card/card-demo.html b/src/demo-app/card/card-demo.html
index 98cc322d20e3..599e37891553 100644
--- a/src/demo-app/card/card-demo.html
+++ b/src/demo-app/card/card-demo.html
@@ -1,61 +1,61 @@
 <div class="demo-card-container">
-  <md-card>
+  <mat-card>
     Hello
-  </md-card>
+  </mat-card>
 
-  <md-card>
-    <md-card-title-group>
-        <md-card-title>Card with title</md-card-title>
-        <md-card-subtitle>Subtitle</md-card-subtitle>
-        <img md-card-md-image>
-    </md-card-title-group>
-  </md-card>
+  <mat-card>
+    <mat-card-title-group>
+        <mat-card-title>Card with title</mat-card-title>
+        <mat-card-subtitle>Subtitle</mat-card-subtitle>
+        <img mat-card-mat-image>
+    </mat-card-title-group>
+  </mat-card>
 
-  <md-card>
-    <md-card-subtitle>Subtitle</md-card-subtitle>
-    <md-card-title>Card with title and footer</md-card-title>
-    <md-card-content>
+  <mat-card>
+    <mat-card-subtitle>Subtitle</mat-card-subtitle>
+    <mat-card-title>Card with title and footer</mat-card-title>
+    <mat-card-content>
       <p>This is supporting text.</p>
       <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    </md-card-content>
-    <md-card-actions>
-      <button md-button>LIKE</button>
-      <button md-button>SHARE</button>
-    </md-card-actions>
-    <md-card-footer>
-      <md-progress-bar mode="indeterminate"></md-progress-bar>
-    </md-card-footer>
-  </md-card>
+    </mat-card-content>
+    <mat-card-actions>
+      <button mat-button>LIKE</button>
+      <button mat-button>SHARE</button>
+    </mat-card-actions>
+    <mat-card-footer>
+      <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+    </mat-card-footer>
+  </mat-card>
 
-  <md-card>
-    <img md-card-image src="https://material.angularjs.org/latest/img/washedout.png">
-    <md-card-title>Content Title</md-card-title>
-    <md-card-content>
+  <mat-card>
+    <img mat-card-image src="https://material.angularjs.org/latest/img/washedout.png">
+    <mat-card-title>Content Title</mat-card-title>
+    <mat-card-content>
       <p>Here is some content</p>
-    </md-card-content>
-    <md-card-actions align="end">
-      <button md-button>LIKE</button>
-      <button md-button>SHARE</button>
-    </md-card-actions>
-  </md-card>
+    </mat-card-content>
+    <mat-card-actions align="end">
+      <button mat-button>LIKE</button>
+      <button mat-button>SHARE</button>
+    </mat-card-actions>
+  </mat-card>
 
-  <md-card>
-    <md-card-header>
-      <img md-card-avatar>
-      <md-card-title>Header title</md-card-title>
-      <md-card-subtitle>Header subtitle</md-card-subtitle>
-    </md-card-header>
-    <img md-card-image src="https://material.angularjs.org/latest/img/washedout.png">
-    <md-card-content>
+  <mat-card>
+    <mat-card-header>
+      <img mat-card-avatar>
+      <mat-card-title>Header title</mat-card-title>
+      <mat-card-subtitle>Header subtitle</mat-card-subtitle>
+    </mat-card-header>
+    <img mat-card-image src="https://material.angularjs.org/latest/img/washedout.png">
+    <mat-card-content>
       <p>Here is some content</p>
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 
-  <md-card class="demo-card-blue mat-card-flat">
-    <md-card-title>Easily customizable</md-card-title>
-    <md-card-actions>
-      <button md-button>First</button>
-      <button md-button>Second</button>
-    </md-card-actions>
-  </md-card>
+  <mat-card class="demo-card-blue mat-card-flat">
+    <mat-card-title>Easily customizable</mat-card-title>
+    <mat-card-actions>
+      <button mat-button>First</button>
+      <button mat-button>Second</button>
+    </mat-card-actions>
+  </mat-card>
 </div>
diff --git a/src/demo-app/checkbox/checkbox-demo.html b/src/demo-app/checkbox/checkbox-demo.html
index 28760dac161c..0faf25ebd0fb 100644
--- a/src/demo-app/checkbox/checkbox-demo.html
+++ b/src/demo-app/checkbox/checkbox-demo.html
@@ -1,6 +1,6 @@
-<h1>md-checkbox: Basic Example</h1>
+<h1>mat-checkbox: Basic Example</h1>
 <form>
-<md-checkbox [(ngModel)]="isChecked"
+<mat-checkbox [(ngModel)]="isChecked"
              name="cb"
              value="basic_checkbox"
              [color]="checkboxColor()"
@@ -10,7 +10,7 @@ <h1>md-checkbox: Basic Example</h1>
              [align]="alignment">
   Do you want to <em>foobar</em> the <em>bazquux</em>?
 
-</md-checkbox> - <strong>{{printResult()}}</strong>
+</mat-checkbox> - <strong>{{printResult()}}</strong>
 </form>
 <div class="demo-checkboxes">
 <input id="indeterminate-toggle"
@@ -45,14 +45,14 @@ <h1>md-checkbox: Basic Example</h1>
 </div>
 
 <h1>Pseudo checkboxes</h1>
-<md-pseudo-checkbox></md-pseudo-checkbox>
-<md-pseudo-checkbox [disabled]="true"></md-pseudo-checkbox>
+<mat-pseudo-checkbox></mat-pseudo-checkbox>
+<mat-pseudo-checkbox [disabled]="true"></mat-pseudo-checkbox>
 
-<md-pseudo-checkbox state="checked"></md-pseudo-checkbox>
-<md-pseudo-checkbox state="checked" [disabled]="true"></md-pseudo-checkbox>
+<mat-pseudo-checkbox state="checked"></mat-pseudo-checkbox>
+<mat-pseudo-checkbox state="checked" [disabled]="true"></mat-pseudo-checkbox>
 
-<md-pseudo-checkbox state="indeterminate"></md-pseudo-checkbox>
-<md-pseudo-checkbox state="indeterminate" [disabled]="true"></md-pseudo-checkbox>
+<mat-pseudo-checkbox state="indeterminate"></mat-pseudo-checkbox>
+<mat-pseudo-checkbox state="indeterminate" [disabled]="true"></mat-pseudo-checkbox>
 
 <h1>Nested Checklist</h1>
-<md-checkbox-demo-nested-checklist></md-checkbox-demo-nested-checklist>
+<mat-checkbox-demo-nested-checklist></mat-checkbox-demo-nested-checklist>
diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts
index 9e507ea2506e..e7331d047770 100644
--- a/src/demo-app/checkbox/checkbox-demo.ts
+++ b/src/demo-app/checkbox/checkbox-demo.ts
@@ -9,7 +9,7 @@ export interface Task {
 
 @Component({
   moduleId: module.id,
-  selector: 'md-checkbox-demo-nested-checklist',
+  selector: 'mat-checkbox-demo-nested-checklist',
   styles: [`
     li {
       margin-bottom: 4px;
@@ -17,7 +17,7 @@ export interface Task {
   `],
   templateUrl: 'nested-checklist.html',
 })
-export class MdCheckboxDemoNestedChecklist {
+export class MatCheckboxDemoNestedChecklist {
   tasks: Task[] = [
     {
       name: 'Reminders',
@@ -63,7 +63,7 @@ export class MdCheckboxDemoNestedChecklist {
 
 @Component({
   moduleId: module.id,
-  selector: 'md-checkbox-demo',
+  selector: 'mat-checkbox-demo',
   templateUrl: 'checkbox-demo.html',
   styleUrls: ['checkbox-demo.css'],
 })
diff --git a/src/demo-app/checkbox/nested-checklist.html b/src/demo-app/checkbox/nested-checklist.html
index 71c77d83f2e5..6a4ab3e617ab 100644
--- a/src/demo-app/checkbox/nested-checklist.html
+++ b/src/demo-app/checkbox/nested-checklist.html
@@ -1,17 +1,17 @@
 <h2>Tasks</h2>
 <ul>
   <li *ngFor="let task of tasks">
-    <md-checkbox [(ngModel)]="task.completed"
+    <mat-checkbox [(ngModel)]="task.completed"
                  [checked]="allComplete(task)"
                  [indeterminate]="someComplete(task.subtasks)"
                  (change)="setAllCompleted(task.subtasks, $event.checked)">
       <h3>{{task.name}}</h3>
-    </md-checkbox>
+    </mat-checkbox>
     <ul>
       <li *ngFor="let subtask of task.subtasks">
-        <md-checkbox [(ngModel)]="subtask.completed">
+        <mat-checkbox [(ngModel)]="subtask.completed">
           {{subtask.name}}
-        </md-checkbox>
+        </mat-checkbox>
       </li>
     </ul>
   </li>
diff --git a/src/demo-app/chips/chips-demo.html b/src/demo-app/chips/chips-demo.html
index 4673b48b256a..6df231e28ee0 100644
--- a/src/demo-app/chips/chips-demo.html
+++ b/src/demo-app/chips/chips-demo.html
@@ -1,104 +1,104 @@
 <div class="chips-demo">
-  <md-card>
-    <md-toolbar color="primary">Static Chips</md-toolbar>
+  <mat-card>
+    <mat-toolbar color="primary">Static Chips</mat-toolbar>
 
-    <md-card-content>
+    <mat-card-content>
       <h4>Simple</h4>
 
-      <md-chip-list>
-        <md-chip>Chip 1</md-chip>
-        <md-chip>Chip 2</md-chip>
-        <md-chip>Chip 3</md-chip>
-      </md-chip-list>
+      <mat-chip-list>
+        <mat-chip>Chip 1</mat-chip>
+        <mat-chip>Chip 2</mat-chip>
+        <mat-chip>Chip 3</mat-chip>
+      </mat-chip-list>
 
       <h4>Unstyled</h4>
 
-      <md-chip-list>
-        <md-basic-chip>Basic Chip 1</md-basic-chip>
-        <md-basic-chip>Basic Chip 2</md-basic-chip>
-        <md-basic-chip>Basic Chip 3</md-basic-chip>
-      </md-chip-list>
+      <mat-chip-list>
+        <mat-basic-chip>Basic Chip 1</mat-basic-chip>
+        <mat-basic-chip>Basic Chip 2</mat-basic-chip>
+        <mat-basic-chip>Basic Chip 3</mat-basic-chip>
+      </mat-chip-list>
 
       <h4>Advanced</h4>
 
-      <md-chip-list selectable="false">
-        <md-chip color="accent" selected="true">Selected/Colored</md-chip>
+      <mat-chip-list selectable="false">
+        <mat-chip color="accent" selected="true">Selected/Colored</mat-chip>
 
-        <md-chip color="warn" selected="true" *ngIf="visible"
+        <mat-chip color="warn" selected="true" *ngIf="visible"
                  (destroy)="displayMessage('chip destroyed')" (remove)="toggleVisible()">
           With Events
-          <md-icon mdChipRemove>cancel</md-icon>
-        </md-chip>
-      </md-chip-list>
+          <mat-icon matChipRemove>cancel</mat-icon>
+        </mat-chip>
+      </mat-chip-list>
       <div>{{message}}</div>
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 
-  <md-card>
-    <md-toolbar color="primary">Dynamic Chips</md-toolbar>
+  <mat-card>
+    <mat-toolbar color="primary">Dynamic Chips</mat-toolbar>
 
-    <md-card-content>
+    <mat-card-content>
       <h4>Form Field</h4>
 
       <p>
-        You can easily put the the <code>&lt;md-chip-list&gt;</code> inside of an
-        <code>&lt;md-form-field&gt;</code>.
+        You can easily put the the <code>&lt;mat-chip-list&gt;</code> inside of an
+        <code>&lt;mat-form-field&gt;</code>.
       </p>
 
-      <button md-button (click)="tabIndex = (tabIndex === 0 ? -1 : 0)">
+      <button mat-button (click)="tabIndex = (tabIndex === 0 ? -1 : 0)">
         Set tabIndex to {{tabIndex === 0 ? -1 : 0}}
       </button>
-      <md-form-field class="has-chip-list">
-        <md-chip-list [tabIndex]="tabIndex" #chipList1 [(ngModel)]="selectedPeople" required>
-          <md-chip  *ngFor="let person of people" [color]="color" [selectable]="selectable"
+      <mat-form-field class="has-chip-list">
+        <mat-chip-list [tabIndex]="tabIndex" #chipList1 [(ngModel)]="selectedPeople" required>
+          <mat-chip  *ngFor="let person of people" [color]="color" [selectable]="selectable"
                    [removable]="removable" (remove)="remove(person)">
             {{person.name}}
-            <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
-          </md-chip>
+            <mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
+          </mat-chip>
           <input placeholder="New Contributor..."
-                 [mdChipInputFor]="chipList1"
-                 [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
-                 [mdChipInputAddOnBlur]="false"
-                 (mdChipInputTokenEnd)="add($event)" />
-        </md-chip-list>
-      </md-form-field>
+                 [matChipInputFor]="chipList1"
+                 [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                 [matChipInputAddOnBlur]="false"
+                 (matChipInputTokenEnd)="add($event)" />
+        </mat-chip-list>
+      </mat-form-field>
 
 
 
       <p>
-        You can also put <code>&lt;md-form-field&gt;</code> outside of an <code>md-chip-list</code>.
-        With <code>mdChipInput</code> the input work with chip-list
+        You can also put <code>&lt;mat-form-field&gt;</code> outside of an <code>mat-chip-list</code>.
+        With <code>matChipInput</code> the input work with chip-list
       </p>
 
-      <md-form-field>
-        <md-chip-list [tabIndex]="tabIndex"  #chipList2 [(ngModel)]="selectedPeople" required>
-          <md-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
+      <mat-form-field>
+        <mat-chip-list [tabIndex]="tabIndex"  #chipList2 [(ngModel)]="selectedPeople" required>
+          <mat-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
                    [removable]="removable" (remove)="remove(person)">
             {{person.name}}
-            <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
-          </md-chip>
-        </md-chip-list>
+            <mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
+          </mat-chip>
+        </mat-chip-list>
         <input placeholder="New Contributor..."
-               [mdChipInputFor]="chipList2"
-               [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
-               [mdChipInputAddOnBlur]="addOnBlur"
-               (mdChipInputTokenEnd)="add($event)" />
-      </md-form-field>
+               [matChipInputFor]="chipList2"
+               [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+               [matChipInputAddOnBlur]="addOnBlur"
+               (matChipInputTokenEnd)="add($event)" />
+      </mat-form-field>
 
       <p>
         Chips list without input
       </p>
 
 
-      <md-form-field class="has-chip-list">
-        <md-chip-list #chipList3>
-          <md-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
+      <mat-form-field class="has-chip-list">
+        <mat-chip-list #chipList3>
+          <mat-chip *ngFor="let person of people" [color]="color" [selectable]="selectable"
                    [removable]="removable" (remove)="remove(person)">
             {{person.name}}
-            <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
-          </md-chip>
-        </md-chip-list>
-      </md-form-field>
+            <mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
+          </mat-chip>
+        </mat-chip-list>
+      </mat-form-field>
 
 
       <p>
@@ -108,9 +108,9 @@ <h4>Form Field</h4>
 
       <h4>Options</h4>
       <p>
-        <md-checkbox name="selectable" [(ngModel)]="selectable">Selectable</md-checkbox>
-        <md-checkbox name="removable" [(ngModel)]="removable">Removable</md-checkbox>
-        <md-checkbox name="addOnBlur" [(ngModel)]="addOnBlur">Add on Blur</md-checkbox>
+        <mat-checkbox name="selectable" [(ngModel)]="selectable">Selectable</mat-checkbox>
+        <mat-checkbox name="removable" [(ngModel)]="removable">Removable</mat-checkbox>
+        <mat-checkbox name="addOnBlur" [(ngModel)]="addOnBlur">Add on Blur</mat-checkbox>
       </p>
 
       <h4>Stacked Chips</h4>
@@ -120,34 +120,34 @@ <h4>Stacked Chips</h4>
         <code>(focus)</code> event to run custom code.
       </p>
 
-      <md-chip-list class="mat-chip-list-stacked" aria-orientation="vertical" [tabIndex]="-1">
-        <md-chip *ngFor="let aColor of availableColors"
+      <mat-chip-list class="mat-chip-list-stacked" aria-orientation="vertical" [tabIndex]="-1">
+        <mat-chip *ngFor="let aColor of availableColors"
                  (focus)="color = aColor.color" color="{{aColor.color}}" selected="true">
           {{aColor.name}}
-        </md-chip>
-      </md-chip-list>
+        </mat-chip>
+      </mat-chip-list>
 
       <h4>NgModel with chip list</h4>
-      <md-chip-list [multiple]="true" [(ngModel)]="selectedColors">
-        <md-chip *ngFor="let aColor of availableColors" color="{{aColor.color}}"
+      <mat-chip-list [multiple]="true" [(ngModel)]="selectedColors">
+        <mat-chip *ngFor="let aColor of availableColors" color="{{aColor.color}}"
                  [value]="aColor.name" (remove)="removeColor(aColor)">
           {{aColor.name}}
-          <md-icon mdChipRemove>cancel</md-icon>
-        </md-chip>
-      </md-chip-list>
+          <mat-icon matChipRemove>cancel</mat-icon>
+        </mat-chip>
+      </mat-chip-list>
 
       The selected colors are <span *ngFor="let color of selectedColors"> {{color}}</span>.
 
       <h4>NgModel with single selection chip list</h4>
-      <md-chip-list [(ngModel)]="selectedColor">
-        <md-chip *ngFor="let aColor of availableColors" color="{{aColor.color}}"
+      <mat-chip-list [(ngModel)]="selectedColor">
+        <mat-chip *ngFor="let aColor of availableColors" color="{{aColor.color}}"
                  [value]="aColor.name" (remove)="removeColor(aColor)">
           {{aColor.name}}
-          <md-icon mdChipRemove>cancel</md-icon>
-        </md-chip>
-      </md-chip-list>
+          <mat-icon matChipRemove>cancel</mat-icon>
+        </mat-chip>
+      </mat-chip-list>
 
       The selected color is {{selectedColor}}.
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 </div>
diff --git a/src/demo-app/chips/chips-demo.scss b/src/demo-app/chips/chips-demo.scss
index 5928eef7375b..648001486a03 100644
--- a/src/demo-app/chips/chips-demo.scss
+++ b/src/demo-app/chips/chips-demo.scss
@@ -21,7 +21,7 @@
     margin: auto 10px;
   }
 
-  md-chip-list input {
+  mat-chip-list input {
     width: 150px;
   }
 }
diff --git a/src/demo-app/chips/chips-demo.ts b/src/demo-app/chips/chips-demo.ts
index 4d5995aed4a3..ad3620047c67 100644
--- a/src/demo-app/chips/chips-demo.ts
+++ b/src/demo-app/chips/chips-demo.ts
@@ -1,6 +1,6 @@
 import {ENTER} from '@angular/cdk/keycodes';
 import {Component} from '@angular/core';
-import {MdChipInputEvent} from '@angular/material';
+import {MatChipInputEvent} from '@angular/material';
 
 const COMMA = 188;
 
@@ -53,7 +53,7 @@ export class ChipsDemo {
     this.message = message;
   }
 
-  add(event: MdChipInputEvent): void {
+  add(event: MatChipInputEvent): void {
     let input = event.input;
     let value = event.value;
 
diff --git a/src/demo-app/datepicker/datepicker-demo.html b/src/demo-app/datepicker/datepicker-demo.html
index 9f55b0820c61..127c5ec2bc8d 100644
--- a/src/demo-app/datepicker/datepicker-demo.html
+++ b/src/demo-app/datepicker/datepicker-demo.html
@@ -1,107 +1,107 @@
 <h2>Options</h2>
 <p>
-  <md-checkbox [(ngModel)]="touch">Use touch UI</md-checkbox>
-  <md-checkbox [(ngModel)]="filterOdd">Filter odd months and dates</md-checkbox>
-  <md-checkbox [(ngModel)]="yearView">Start in year view</md-checkbox>
-  <md-checkbox [(ngModel)]="datepickerDisabled">Disable datepicker</md-checkbox>
-  <md-checkbox [(ngModel)]="inputDisabled">Disable input</md-checkbox>
+  <mat-checkbox [(ngModel)]="touch">Use touch UI</mat-checkbox>
+  <mat-checkbox [(ngModel)]="filterOdd">Filter odd months and dates</mat-checkbox>
+  <mat-checkbox [(ngModel)]="yearView">Start in year view</mat-checkbox>
+  <mat-checkbox [(ngModel)]="datepickerDisabled">Disable datepicker</mat-checkbox>
+  <mat-checkbox [(ngModel)]="inputDisabled">Disable input</mat-checkbox>
 </p>
 <p>
-  <md-form-field>
-    <input mdInput [mdDatepicker]="minDatePicker" [(ngModel)]="minDate" placeholder="Min date"
+  <mat-form-field>
+    <input matInput [matDatepicker]="minDatePicker" [(ngModel)]="minDate" placeholder="Min date"
         [disabled]="inputDisabled">
-    <md-datepicker-toggle mdSuffix [for]="minDatePicker"></md-datepicker-toggle>
-    <md-datepicker #minDatePicker [touchUi]="touch" [disabled]="datepickerDisabled"></md-datepicker>
-  </md-form-field>
-  <md-form-field>
-    <input mdInput [mdDatepicker]="maxDatePicker" [(ngModel)]="maxDate" placeholder="Max date"
+    <mat-datepicker-toggle matSuffix [for]="minDatePicker"></mat-datepicker-toggle>
+    <mat-datepicker #minDatePicker [touchUi]="touch" [disabled]="datepickerDisabled"></mat-datepicker>
+  </mat-form-field>
+  <mat-form-field>
+    <input matInput [matDatepicker]="maxDatePicker" [(ngModel)]="maxDate" placeholder="Max date"
         [disabled]="inputDisabled">
-    <md-datepicker-toggle mdSuffix [for]="maxDatePicker"></md-datepicker-toggle>
-    <md-datepicker #maxDatePicker [touchUi]="touch" [disabled]="datepickerDisabled"></md-datepicker>
-  </md-form-field>
+    <mat-datepicker-toggle matSuffix [for]="maxDatePicker"></mat-datepicker-toggle>
+    <mat-datepicker #maxDatePicker [touchUi]="touch" [disabled]="datepickerDisabled"></mat-datepicker>
+  </mat-form-field>
 </p>
 <p>
-  <md-form-field>
-    <input mdInput [mdDatepicker]="startAtPicker" [(ngModel)]="startAt" placeholder="Start at date"
+  <mat-form-field>
+    <input matInput [matDatepicker]="startAtPicker" [(ngModel)]="startAt" placeholder="Start at date"
         [disabled]="inputDisabled">
-    <md-datepicker-toggle mdSuffix [for]="startAtPicker"></md-datepicker-toggle>
-    <md-datepicker #startAtPicker [touchUi]="touch" [disabled]="datepickerDisabled"></md-datepicker>
-  </md-form-field>
+    <mat-datepicker-toggle matSuffix [for]="startAtPicker"></mat-datepicker-toggle>
+    <mat-datepicker #startAtPicker [touchUi]="touch" [disabled]="datepickerDisabled"></mat-datepicker>
+  </mat-form-field>
 </p>
 
 <h2>Result</h2>
 
 <p>
-  <md-datepicker-toggle [for]="resultPicker"></md-datepicker-toggle>
-  <md-form-field>
-    <input mdInput
+  <mat-datepicker-toggle [for]="resultPicker"></mat-datepicker-toggle>
+  <mat-form-field>
+    <input matInput
            #resultPickerModel="ngModel"
-           [mdDatepicker]="resultPicker"
+           [matDatepicker]="resultPicker"
            [(ngModel)]="date"
            [min]="minDate"
            [max]="maxDate"
-           [mdDatepickerFilter]="filterOdd ? dateFilter : null"
+           [matDatepickerFilter]="filterOdd ? dateFilter : null"
            [disabled]="inputDisabled"
            placeholder="Pick a date"
            (dateInput)="onDateInput($event)"
            (dateChange)="onDateChange($event)">
-    <md-datepicker
+    <mat-datepicker
         #resultPicker
         [touchUi]="touch"
         [disabled]="datepickerDisabled"
         [startAt]="startAt"
         [startView]="yearView ? 'year' : 'month'">
-    </md-datepicker>
-    <md-error *ngIf="resultPickerModel.hasError('mdDatepickerParse')">
-      "{{resultPickerModel.getError('mdDatepickerParse').text}}" is not a valid date!
-    </md-error>
-    <md-error *ngIf="resultPickerModel.hasError('mdDatepickerMin')">Too early!</md-error>
-    <md-error *ngIf="resultPickerModel.hasError('mdDatepickerMax')">Too late!</md-error>
-    <md-error *ngIf="resultPickerModel.hasError('mdDatepickerFilter')">Date unavailable!</md-error>
-  </md-form-field>
+    </mat-datepicker>
+    <mat-error *ngIf="resultPickerModel.hasError('matDatepickerParse')">
+      "{{resultPickerModel.getError('matDatepickerParse').text}}" is not a valid date!
+    </mat-error>
+    <mat-error *ngIf="resultPickerModel.hasError('matDatepickerMin')">Too early!</mat-error>
+    <mat-error *ngIf="resultPickerModel.hasError('matDatepickerMax')">Too late!</mat-error>
+    <mat-error *ngIf="resultPickerModel.hasError('matDatepickerFilter')">Date unavailable!</mat-error>
+  </mat-form-field>
 </p>
 <p>Last input: {{lastDateInput}}</p>
 <p>Last change: {{lastDateChange}}</p>
 <br>
 <p>
   <input #resultPickerModel2
-         [mdDatepicker]="resultPicker2"
+         [matDatepicker]="resultPicker2"
          [(ngModel)]="date"
          [min]="minDate"
          [max]="maxDate"
          [disabled]="inputDisabled"
-         [mdDatepickerFilter]="filterOdd ? dateFilter : null"
+         [matDatepickerFilter]="filterOdd ? dateFilter : null"
          placeholder="Pick a date">
-  <md-datepicker-toggle [for]="resultPicker2"></md-datepicker-toggle>
-  <md-datepicker
+  <mat-datepicker-toggle [for]="resultPicker2"></mat-datepicker-toggle>
+  <mat-datepicker
       #resultPicker2
       [touchUi]="touch"
       [disabled]="datepickerDisabled"
       [startAt]="startAt"
       [startView]="yearView ? 'year' : 'month'">
-  </md-datepicker>
+  </mat-datepicker>
 </p>
 
 <h2>Input disabled datepicker</h2>
 <p>
-  <md-datepicker-toggle [for]="datePicker1"></md-datepicker-toggle>
-  <md-form-field>
-    <input mdInput [mdDatepicker]="datePicker1" [(ngModel)]="date" [min]="minDate" [max]="maxDate"
-           [mdDatepickerFilter]="filterOdd ? dateFilter : null" disabled
+  <mat-datepicker-toggle [for]="datePicker1"></mat-datepicker-toggle>
+  <mat-form-field>
+    <input matInput [matDatepicker]="datePicker1" [(ngModel)]="date" [min]="minDate" [max]="maxDate"
+           [matDatepickerFilter]="filterOdd ? dateFilter : null" disabled
            placeholder="Input disabled">
-    <md-datepicker #datePicker1 [touchUi]="touch" [startAt]="startAt"
-                   [startView]="yearView ? 'year' : 'month'"></md-datepicker>
-  </md-form-field>
+    <mat-datepicker #datePicker1 [touchUi]="touch" [startAt]="startAt"
+                   [startView]="yearView ? 'year' : 'month'"></mat-datepicker>
+  </mat-form-field>
 </p>
 
 <h2>Input disabled, datepicker popup enabled</h2>
 <p>
-  <md-datepicker-toggle [for]="datePicker2"></md-datepicker-toggle>
-  <md-form-field>
-    <input mdInput disabled [mdDatepicker]="datePicker2" [(ngModel)]="date" [min]="minDate"
-           [max]="maxDate" [mdDatepickerFilter]="filterOdd ? dateFilter : null"
+  <mat-datepicker-toggle [for]="datePicker2"></mat-datepicker-toggle>
+  <mat-form-field>
+    <input matInput disabled [matDatepicker]="datePicker2" [(ngModel)]="date" [min]="minDate"
+           [max]="maxDate" [matDatepickerFilter]="filterOdd ? dateFilter : null"
            placeholder="Input disabled, datepicker enabled">
-    <md-datepicker #datePicker2 [touchUi]="touch" [disabled]="false" [startAt]="startAt"
-                   [startView]="yearView ? 'year' : 'month'"></md-datepicker>
-  </md-form-field>
+    <mat-datepicker #datePicker2 [touchUi]="touch" [disabled]="false" [startAt]="startAt"
+                   [startView]="yearView ? 'year' : 'month'"></mat-datepicker>
+  </mat-form-field>
 </p>
diff --git a/src/demo-app/datepicker/datepicker-demo.scss b/src/demo-app/datepicker/datepicker-demo.scss
index c98cba687f8c..9672ffb589e1 100644
--- a/src/demo-app/datepicker/datepicker-demo.scss
+++ b/src/demo-app/datepicker/datepicker-demo.scss
@@ -1,3 +1,3 @@
-md-calendar {
+mat-calendar {
   width: 300px;
 }
diff --git a/src/demo-app/datepicker/datepicker-demo.ts b/src/demo-app/datepicker/datepicker-demo.ts
index 3fc61b0b3144..fe363d322b5e 100644
--- a/src/demo-app/datepicker/datepicker-demo.ts
+++ b/src/demo-app/datepicker/datepicker-demo.ts
@@ -1,5 +1,5 @@
 import {ChangeDetectionStrategy, Component} from '@angular/core';
-import {MdDatepickerInputEvent} from '@angular/material';
+import {MatDatepickerInputEvent} from '@angular/material';
 
 
 @Component({
@@ -24,6 +24,6 @@ export class DatepickerDemo {
 
   dateFilter = (date: Date) => date.getMonth() % 2 == 1 && date.getDate() % 2 == 0;
 
-  onDateInput = (e: MdDatepickerInputEvent<Date>) => this.lastDateInput = e.value;
-  onDateChange = (e: MdDatepickerInputEvent<Date>) => this.lastDateChange = e.value;
+  onDateInput = (e: MatDatepickerInputEvent<Date>) => this.lastDateInput = e.value;
+  onDateChange = (e: MatDatepickerInputEvent<Date>) => this.lastDateChange = e.value;
 }
diff --git a/src/demo-app/demo-app/demo-app.html b/src/demo-app/demo-app/demo-app.html
index 7138842d1a48..496b93d96346 100644
--- a/src/demo-app/demo-app/demo-app.html
+++ b/src/demo-app/demo-app/demo-app.html
@@ -1,8 +1,8 @@
-<md-sidenav-container class="demo-root" fullscreen>
-  <md-sidenav #start>
-    <md-nav-list>
+<mat-sidenav-container class="demo-root" fullscreen>
+  <mat-sidenav #start>
+    <mat-nav-list>
       <a *ngFor="let navItem of navItems"
-         md-list-item
+         mat-list-item
          (click)="start.close()"
          routerLinkActive
          #routerLinkActiveInstance="routerLinkActive"
@@ -13,36 +13,36 @@
 
       <hr>
 
-      <a md-list-item
+      <a mat-list-item
          tabindex="-1"
          (click)="start.close()"
          [routerLink]="['/baseline']">
         Baseline
       </a>
-    </md-nav-list>
-    <button md-button tabindex="-1" (click)="start.close()">CLOSE</button>
-  </md-sidenav>
+    </mat-nav-list>
+    <button mat-button tabindex="-1" (click)="start.close()">CLOSE</button>
+  </mat-sidenav>
   <div>
-    <md-toolbar color="primary">
-      <button md-icon-button (click)="start.open()">
-        <md-icon class="md-24">menu</md-icon>
+    <mat-toolbar color="primary">
+      <button mat-icon-button (click)="start.open()">
+        <mat-icon class="md-24">menu</mat-icon>
       </button>
       <div class="demo-toolbar">
         <h1>Angular Material Demos</h1>
         <div>
-          <button md-icon-button (click)="toggleFullscreen()" title="Toggle fullscreen">
-            <md-icon class="md-24">fullscreen</md-icon>
+          <button mat-icon-button (click)="toggleFullscreen()" title="Toggle fullscreen">
+            <mat-icon class="md-24">fullscreen</mat-icon>
           </button>
-          <button md-button (click)="toggleTheme()">{{dark ? 'Light' : 'Dark'}} theme</button>
-          <button md-button (click)="root.dir = (root.dir == 'rtl' ? 'ltr' : 'rtl')" title="Toggle between RTL and LTR">
+          <button mat-button (click)="toggleTheme()">{{dark ? 'Light' : 'Dark'}} theme</button>
+          <button mat-button (click)="root.dir = (root.dir == 'rtl' ? 'ltr' : 'rtl')" title="Toggle between RTL and LTR">
             {{root.dir.toUpperCase()}}
           </button>
         </div>
       </div>
-    </md-toolbar>
+    </mat-toolbar>
 
     <div #root="dir" dir="ltr" class="demo-content">
       <router-outlet></router-outlet>
     </div>
   </div>
-</md-sidenav-container>
+</mat-sidenav-container>
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index 80e21dbe5c26..b73d8c9dd38b 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -8,7 +8,7 @@ import {BaselineDemo} from '../baseline/baseline-demo';
 import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
 import {ButtonDemo} from '../button/button-demo';
 import {CardDemo} from '../card/card-demo';
-import {CheckboxDemo, MdCheckboxDemoNestedChecklist} from '../checkbox/checkbox-demo';
+import {CheckboxDemo, MatCheckboxDemoNestedChecklist} from '../checkbox/checkbox-demo';
 import {ChipsDemo} from '../chips/chips-demo';
 import {DatepickerDemo} from '../datepicker/datepicker-demo';
 import {DemoMaterialModule} from '../demo-material-module';
@@ -79,7 +79,7 @@ import {DEMO_APP_ROUTES} from './routes';
     JazzDialog,
     ListDemo,
     LiveAnnouncerDemo,
-    MdCheckboxDemoNestedChecklist,
+    MatCheckboxDemoNestedChecklist,
     MenuDemo,
     OverlayDemo,
     PlatformDemo,
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index 1cf016b7a2dc..4da1bc2e0575 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -1,37 +1,37 @@
 import {NgModule} from '@angular/core';
 import {
-  MdAutocompleteModule,
-  MdButtonModule,
-  MdButtonToggleModule,
-  MdCardModule,
-  MdCheckboxModule,
-  MdChipsModule,
-  MdDatepickerModule,
-  MdDialogModule,
-  MdExpansionModule,
-  MdFormFieldModule,
-  MdGridListModule,
-  MdIconModule,
-  MdInputModule,
-  MdListModule,
-  MdMenuModule,
-  MdPaginatorModule,
-  MdProgressBarModule,
-  MdProgressSpinnerModule,
-  MdRadioModule,
-  MdSelectModule,
-  MdSidenavModule,
-  MdSliderModule,
-  MdSlideToggleModule,
-  MdSnackBarModule,
-  MdSortModule,
-  MdTableModule,
-  MdTabsModule,
-  MdToolbarModule,
-  MdTooltipModule,
-  MdStepperModule,
+  MatAutocompleteModule,
+  MatButtonModule,
+  MatButtonToggleModule,
+  MatCardModule,
+  MatCheckboxModule,
+  MatChipsModule,
+  MatDatepickerModule,
+  MatDialogModule,
+  MatExpansionModule,
+  MatFormFieldModule,
+  MatGridListModule,
+  MatIconModule,
+  MatInputModule,
+  MatListModule,
+  MatMenuModule,
+  MatPaginatorModule,
+  MatProgressBarModule,
+  MatProgressSpinnerModule,
+  MatRadioModule,
+  MatSelectModule,
+  MatSidenavModule,
+  MatSliderModule,
+  MatSlideToggleModule,
+  MatSnackBarModule,
+  MatSortModule,
+  MatTableModule,
+  MatTabsModule,
+  MatToolbarModule,
+  MatTooltipModule,
+  MatStepperModule,
 } from '@angular/material';
-import {MdNativeDateModule, MdRippleModule} from '@angular/material';
+import {MatNativeDateModule, MatRippleModule} from '@angular/material';
 import {CdkTableModule} from '@angular/cdk/table';
 import {A11yModule} from '@angular/cdk/a11y';
 import {BidiModule} from '@angular/cdk/bidi';
@@ -45,38 +45,38 @@ import {PortalModule} from '@angular/cdk/portal';
  */
 @NgModule({
   exports: [
-    MdAutocompleteModule,
-    MdButtonModule,
-    MdButtonToggleModule,
-    MdCardModule,
-    MdCheckboxModule,
-    MdChipsModule,
-    MdTableModule,
-    MdDatepickerModule,
-    MdDialogModule,
-    MdExpansionModule,
-    MdFormFieldModule,
-    MdGridListModule,
-    MdIconModule,
-    MdInputModule,
-    MdListModule,
-    MdMenuModule,
-    MdPaginatorModule,
-    MdProgressBarModule,
-    MdProgressSpinnerModule,
-    MdRadioModule,
-    MdRippleModule,
-    MdSelectModule,
-    MdSidenavModule,
-    MdSlideToggleModule,
-    MdSliderModule,
-    MdSnackBarModule,
-    MdSortModule,
-    MdStepperModule,
-    MdTabsModule,
-    MdToolbarModule,
-    MdTooltipModule,
-    MdNativeDateModule,
+    MatAutocompleteModule,
+    MatButtonModule,
+    MatButtonToggleModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatChipsModule,
+    MatTableModule,
+    MatDatepickerModule,
+    MatDialogModule,
+    MatExpansionModule,
+    MatFormFieldModule,
+    MatGridListModule,
+    MatIconModule,
+    MatInputModule,
+    MatListModule,
+    MatMenuModule,
+    MatPaginatorModule,
+    MatProgressBarModule,
+    MatProgressSpinnerModule,
+    MatRadioModule,
+    MatRippleModule,
+    MatSelectModule,
+    MatSidenavModule,
+    MatSlideToggleModule,
+    MatSliderModule,
+    MatSnackBarModule,
+    MatSortModule,
+    MatStepperModule,
+    MatTabsModule,
+    MatToolbarModule,
+    MatTooltipModule,
+    MatNativeDateModule,
     CdkTableModule,
     A11yModule,
     BidiModule,
diff --git a/src/demo-app/dialog/dialog-demo.html b/src/demo-app/dialog/dialog-demo.html
index e5d40ad94b34..ffceaaae13bf 100644
--- a/src/demo-app/dialog/dialog-demo.html
+++ b/src/demo-app/dialog/dialog-demo.html
@@ -1,81 +1,81 @@
 <h1>Dialog demo</h1>
 
-<button md-raised-button color="primary" (click)="openJazz()">
+<button mat-raised-button color="primary" (click)="openJazz()">
   Open dialog
 </button>
-<button md-raised-button color="accent" (click)="openContentElement()">
+<button mat-raised-button color="accent" (click)="openContentElement()">
   Open dialog with content elements
 </button>
-<button md-raised-button color="accent" (click)="openTemplate()">
+<button mat-raised-button color="accent" (click)="openTemplate()">
   Open dialog with template content
 </button>
 
-<md-card class="demo-dialog-card">
-  <md-card-content>
+<mat-card class="demo-dialog-card">
+  <mat-card-content>
     <h2>Dialog dimensions</h2>
 
     <p>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.width" placeholder="Width">
-      </md-form-field>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.height" placeholder="Height">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.width" placeholder="Width">
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.height" placeholder="Height">
+      </mat-form-field>
     </p>
 
     <h2>Dialog position</h2>
 
     <p>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.position.top" (change)="config.position.bottom = ''" placeholder="Top">
-      </md-form-field>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.position.bottom" (change)="config.position.top = ''" placeholder="Bottom">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.position.top" (change)="config.position.bottom = ''" placeholder="Top">
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.position.bottom" (change)="config.position.top = ''" placeholder="Bottom">
+      </mat-form-field>
     </p>
 
     <p>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.position.left" (change)="config.position.right = ''" placeholder="Left">
-      </md-form-field>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.position.right" (change)="config.position.left = ''" placeholder="Right">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.position.left" (change)="config.position.right = ''" placeholder="Left">
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.position.right" (change)="config.position.left = ''" placeholder="Right">
+      </mat-form-field>
     </p>
 
     <h2>Dialog backdrop</h2>
 
     <p>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.backdropClass" placeholder="Backdrop class">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.backdropClass" placeholder="Backdrop class">
+      </mat-form-field>
     </p>
 
-    <md-checkbox [(ngModel)]="config.hasBackdrop">Has backdrop</md-checkbox>
+    <mat-checkbox [(ngModel)]="config.hasBackdrop">Has backdrop</mat-checkbox>
 
     <h2>Other options</h2>
 
     <p>
-      <md-form-field>
-        <md-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
-          <md-option>Start</md-option>
-          <md-option value="end">End</md-option>
-          <md-option value="center">Center</md-option>
-        </md-select>
-      </md-form-field>
+      <mat-form-field>
+        <mat-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
+          <mat-option>Start</mat-option>
+          <mat-option value="end">End</mat-option>
+          <mat-option value="center">Center</mat-option>
+        </mat-select>
+      </mat-form-field>
     </p>
 
     <p>
-      <md-form-field>
-        <input mdInput [(ngModel)]="config.data.message" placeholder="Dialog message">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.data.message" placeholder="Dialog message">
+      </mat-form-field>
     </p>
 
     <p>
-      <md-checkbox [(ngModel)]="config.disableClose">Disable close</md-checkbox>
+      <mat-checkbox [(ngModel)]="config.disableClose">Disable close</mat-checkbox>
     </p>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
 <p>Last afterClosed result: {{lastAfterClosedResult}}</p>
 <p>Last beforeClose result: {{lastBeforeCloseResult}}</p>
@@ -85,9 +85,9 @@ <h2>Other options</h2>
 
   <p>It's Jazz!</p>
 
-  <md-input-container>
-    <input mdInput placeholder="How much?" #howMuch>
-  </md-input-container>
+  <mat-input-container>
+    <input matInput placeholder="How much?" #howMuch>
+  </mat-input-container>
 
   <p> {{ data.message }} </p>
   <button type="button" (click)="dialogRef.close(lastCloseResult = howMuch.value)">Close dialog</button>
diff --git a/src/demo-app/dialog/dialog-demo.ts b/src/demo-app/dialog/dialog-demo.ts
index 339fcbffa018..87c67b151e18 100644
--- a/src/demo-app/dialog/dialog-demo.ts
+++ b/src/demo-app/dialog/dialog-demo.ts
@@ -1,6 +1,6 @@
 import {Component, Inject, ViewChild, TemplateRef} from '@angular/core';
 import {DOCUMENT} from '@angular/platform-browser';
-import {MdDialog, MdDialogRef, MD_DIALOG_DATA} from '@angular/material';
+import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
 
 
 @Component({
@@ -10,7 +10,7 @@ import {MdDialog, MdDialogRef, MD_DIALOG_DATA} from '@angular/material';
   styleUrls: ['dialog-demo.css'],
 })
 export class DialogDemo {
-  dialogRef: MdDialogRef<JazzDialog> | null;
+  dialogRef: MatDialogRef<JazzDialog> | null;
   lastAfterClosedResult: string;
   lastBeforeCloseResult: string;
   actionsAlignment: string;
@@ -35,7 +35,7 @@ export class DialogDemo {
 
   @ViewChild(TemplateRef) template: TemplateRef<any>;
 
-  constructor(public dialog: MdDialog, @Inject(DOCUMENT) doc: any) {
+  constructor(public dialog: MatDialog, @Inject(DOCUMENT) doc: any) {
     // Possible useful example for the open and closeAll events.
     // Adding a class to the body if a dialog opens and
     // removing it after all open dialogs are closed
@@ -78,9 +78,9 @@ export class DialogDemo {
   template: `
   <p>It's Jazz!</p>
 
-  <md-form-field>
-    <input mdInput placeholder="How much?" #howMuch>
-  </md-form-field>
+  <mat-form-field>
+    <input matInput placeholder="How much?" #howMuch>
+  </mat-form-field>
 
   <p> {{ data.message }} </p>
   <button type="button" (click)="dialogRef.close(howMuch.value)">Close dialog</button>
@@ -90,8 +90,8 @@ export class JazzDialog {
   private _dimesionToggle = false;
 
   constructor(
-    public dialogRef: MdDialogRef<JazzDialog>,
-    @Inject(MD_DIALOG_DATA) public data: any) { }
+    public dialogRef: MatDialogRef<JazzDialog>,
+    @Inject(MAT_DIALOG_DATA) public data: any) { }
 
   togglePosition(): void {
     this._dimesionToggle = !this._dimesionToggle;
@@ -117,9 +117,9 @@ export class JazzDialog {
     }`
   ],
   template: `
-    <h2 md-dialog-title>Neptune</h2>
+    <h2 mat-dialog-title>Neptune</h2>
 
-    <md-dialog-content>
+    <mat-dialog-content>
       <img src="https://upload.wikimedia.org/wikipedia/commons/5/56/Neptune_Full.jpg"/>
 
       <p>
@@ -131,32 +131,32 @@ export class JazzDialog {
         astronomical units (4.50×109 km). It is named after the Roman god of the sea and has the
         astronomical symbol ♆, a stylised version of the god Neptune's trident.
       </p>
-    </md-dialog-content>
+    </mat-dialog-content>
 
-    <md-dialog-actions [attr.align]="actionsAlignment">
+    <mat-dialog-actions [attr.align]="actionsAlignment">
       <button
-        md-raised-button
+        mat-raised-button
         color="primary"
-        md-dialog-close>Close</button>
+        mat-dialog-close>Close</button>
 
       <a
-        md-button
+        mat-button
         color="primary"
         href="https://en.wikipedia.org/wiki/Neptune"
         target="_blank">Read more on Wikipedia</a>
 
       <button
-        md-button
+        mat-button
         color="secondary"
         (click)="showInStackedDialog()">
         Show in Dialog</button>
-    </md-dialog-actions>
+    </mat-dialog-actions>
   `
 })
 export class ContentElementDialog {
   actionsAlignment: string;
 
-  constructor(public dialog: MdDialog) { }
+  constructor(public dialog: MatDialog) { }
 
   showInStackedDialog() {
     this.dialog.open(IFrameDialog);
@@ -171,18 +171,18 @@ export class ContentElementDialog {
     }`
   ],
   template: `
-    <h2 md-dialog-title>Neptune</h2>
+    <h2 mat-dialog-title>Neptune</h2>
 
-    <md-dialog-content>
+    <mat-dialog-content>
       <iframe frameborder="0" src="https://en.wikipedia.org/wiki/Neptune"></iframe>
-    </md-dialog-content>
+    </mat-dialog-content>
 
-    <md-dialog-actions>
+    <mat-dialog-actions>
       <button
-        md-raised-button
+        mat-raised-button
         color="primary"
-        md-dialog-close>Close</button>
-    </md-dialog-actions>
+        mat-dialog-close>Close</button>
+    </mat-dialog-actions>
   `
 })
 export class IFrameDialog {
diff --git a/src/demo-app/drawer/drawer-demo.html b/src/demo-app/drawer/drawer-demo.html
index 3a2dddc4d1d2..a7f54541bc12 100644
--- a/src/demo-app/drawer/drawer-demo.html
+++ b/src/demo-app/drawer/drawer-demo.html
@@ -1,58 +1,58 @@
 <h2>Basic Use Case</h2>
 
-<md-drawer-container class="demo-drawer-container">
-  <md-drawer #start (open)="myinput.focus()" mode="side">
+<mat-drawer-container class="demo-drawer-container">
+  <mat-drawer #start (open)="myinput.focus()" mode="side">
     Start Side Drawer
     <br>
-    <button md-button (click)="start.close()">Close</button>
+    <button mat-button (click)="start.close()">Close</button>
     <br>
-    <button md-button (click)="end.open()">Open End Side</button>
+    <button mat-button (click)="end.open()">Open End Side</button>
     <br>
-    <button md-button
+    <button mat-button
             (click)="start.mode = (start.mode == 'push' ? 'over' : (start.mode == 'over' ? 'side' : 'push'))">Toggle Mode</button>
     <div>Mode: {{start.mode}}</div>
     <br>
     <input #myinput>
-  </md-drawer>
+  </mat-drawer>
 
-  <md-drawer #end position="end">
+  <mat-drawer #end position="end">
     End Side Drawer
     <br>
-    <button md-button (click)="end.close()">Close</button>
-  </md-drawer>
+    <button mat-button (click)="end.close()">Close</button>
+  </mat-drawer>
 
   <div class="demo-drawer-content">
     <h1>My Content</h1>
 
     <div>
       <header>Drawer</header>
-      <button md-button (click)="start.toggle()">Toggle Start Side Drawer</button>
-      <button md-button (click)="end.toggle()">Toggle End Side Drawer</button>
+      <button mat-button (click)="start.toggle()">Toggle Start Side Drawer</button>
+      <button mat-button (click)="end.toggle()">Toggle End Side Drawer</button>
     </div>
 
-    <button md-button>HELLO</button>
-    <button md-raised-button class="mat-primary">HELLO</button>
-    <button md-fab class="mat-accent">HI</button>
+    <button mat-button>HELLO</button>
+    <button mat-raised-button class="mat-primary">HELLO</button>
+    <button mat-fab class="mat-accent">HI</button>
   </div>
-</md-drawer-container>
+</mat-drawer-container>
 
 <h2>Drawer Already Opened</h2>
 
-<md-drawer-container class="demo-drawer-container">
-  <md-drawer #start2 opened mode="side">
+<mat-drawer-container class="demo-drawer-container">
+  <mat-drawer #start2 opened mode="side">
     Drawer
-  </md-drawer>
+  </mat-drawer>
 
   <div class="demo-drawer-content">
-    <button md-button (click)="start2.toggle()">Toggle Start Side Drawer</button>
+    <button mat-button (click)="start2.toggle()">Toggle Start Side Drawer</button>
   </div>
-</md-drawer-container>
+</mat-drawer-container>
 
 <h2>Dynamic Position Drawer</h2>
 
-<md-drawer-container class="demo-drawer-container">
-  <md-drawer #dynamicPosDrawer1 mode="side" [position]="invert ? 'end' : 'start'">Start</md-drawer>
-  <md-drawer #dynamicPosDrawer2 mode="side" [position]="invert ? 'start' : 'end'">End</md-drawer>
+<mat-drawer-container class="demo-drawer-container">
+  <mat-drawer #dynamicPosDrawer1 mode="side" [position]="invert ? 'end' : 'start'">Start</mat-drawer>
+  <mat-drawer #dynamicPosDrawer2 mode="side" [position]="invert ? 'start' : 'end'">End</mat-drawer>
 
   <div class="demo-drawer-content">
     <button (click)="dynamicPosDrawer1.toggle(); dynamicPosDrawer2.toggle()">
@@ -60,28 +60,28 @@ <h2>Dynamic Position Drawer</h2>
     </button>
     <button (click)="invert = !invert">Change sides</button>
   </div>
-</md-drawer-container>
+</mat-drawer-container>
 
 <h2>Drawer with focus attributes</h2>
 
-<md-drawer-container class="demo-drawer-container">
-  <md-drawer #focusDrawer>
-    <md-nav-list>
-      <a md-list-item routerLink>Link</a>
-      <a md-list-item routerLink cdk-focus-region-start>Focus region start</a>
-      <a md-list-item routerLink>Link</a>
-      <a md-list-item routerLink cdk-focus-initial>Initially focused</a>
-      <a md-list-item routerLink cdk-focus-region-end>Focus region end</a>
-      <a md-list-item routerLink>Link</a>
-    </md-nav-list>
-  </md-drawer>
+<mat-drawer-container class="demo-drawer-container">
+  <mat-drawer #focusDrawer>
+    <mat-nav-list>
+      <a mat-list-item routerLink>Link</a>
+      <a mat-list-item routerLink cdk-focus-region-start>Focus region start</a>
+      <a mat-list-item routerLink>Link</a>
+      <a mat-list-item routerLink cdk-focus-initial>Initially focused</a>
+      <a mat-list-item routerLink cdk-focus-region-end>Focus region end</a>
+      <a mat-list-item routerLink>Link</a>
+    </mat-nav-list>
+  </mat-drawer>
 
   <div class="demo-drawer-content">
     <h1>My Content</h1>
 
     <div>
       <header>Drawer</header>
-      <button md-button (click)="focusDrawer.toggle()">Toggle Drawer</button>
+      <button mat-button (click)="focusDrawer.toggle()">Toggle Drawer</button>
     </div>
   </div>
-</md-drawer-container>
+</mat-drawer-container>
diff --git a/src/demo-app/expansion/expansion-demo.html b/src/demo-app/expansion/expansion-demo.html
index e22b96339de9..b14c6434c650 100644
--- a/src/demo-app/expansion/expansion-demo.html
+++ b/src/demo-app/expansion/expansion-demo.html
@@ -1,64 +1,64 @@
 <h1>Single Expansion Panel</h1>
 
-<md-expansion-panel class="md-expansion-demo-width" #myPanel>
-  <md-expansion-panel-header [expandedHeight]="expandedHeight" [collapsedHeight]="collapsedHeight">
+<mat-expansion-panel class="mat-expansion-demo-width" #myPanel>
+  <mat-expansion-panel-header [expandedHeight]="expandedHeight" [collapsedHeight]="collapsedHeight">
     <mat-panel-description>This is a panel description.</mat-panel-description>
     <mat-panel-title>Panel Title</mat-panel-title>
-  </md-expansion-panel-header>
+  </mat-expansion-panel-header>
     This is the content text that makes sense here.
-  <md-action-row>
-    <button md-button (click)="myPanel.expanded = false">CANCEL</button>
-    <button md-button>SAVE</button>
-  </md-action-row>
-</md-expansion-panel>
+  <mat-action-row>
+    <button mat-button (click)="myPanel.expanded = false">CANCEL</button>
+    <button mat-button>SAVE</button>
+  </mat-action-row>
+</mat-expansion-panel>
 
 <br>
-<md-form-field>
-  <input mdInput [(ngModel)]="collapsedHeight" placeholder="Collapsed height">
-</md-form-field>
+<mat-form-field>
+  <input matInput [(ngModel)]="collapsedHeight" placeholder="Collapsed height">
+</mat-form-field>
 
-<md-form-field>
-  <input mdInput [(ngModel)]="expandedHeight" placeholder="Expanded height">
-</md-form-field>
+<mat-form-field>
+  <input matInput [(ngModel)]="expandedHeight" placeholder="Expanded height">
+</mat-form-field>
 <br>
 
 <h1>Accordion</h1>
 <div>
   <p>Accordion Options</p>
   <div>
-    <md-slide-toggle [(ngModel)]="multi">Allow Multi Expansion</md-slide-toggle>
-    <md-slide-toggle [(ngModel)]="hideToggle">Hide Indicators</md-slide-toggle>
-    <md-slide-toggle [(ngModel)]="disabled">Disable Panel 2</md-slide-toggle>
-    <md-slide-toggle [(ngModel)]="showPanel3">Show Panel 3</md-slide-toggle>
+    <mat-slide-toggle [(ngModel)]="multi">Allow Multi Expansion</mat-slide-toggle>
+    <mat-slide-toggle [(ngModel)]="hideToggle">Hide Indicators</mat-slide-toggle>
+    <mat-slide-toggle [(ngModel)]="disabled">Disable Panel 2</mat-slide-toggle>
+    <mat-slide-toggle [(ngModel)]="showPanel3">Show Panel 3</mat-slide-toggle>
   </div>
   <p>Accordion Style</p>
-  <md-radio-group [(ngModel)]="displayMode">
-    <md-radio-button value="default">Default</md-radio-button>
-    <md-radio-button value="flat">Flat</md-radio-button>
-  </md-radio-group>
+  <mat-radio-group [(ngModel)]="displayMode">
+    <mat-radio-button value="default">Default</mat-radio-button>
+    <mat-radio-button value="flat">Flat</mat-radio-button>
+  </mat-radio-group>
   <p>Accordion Panel(s)</p>
   <div>
-    <md-checkbox [(ngModel)]="panel1.expanded">Panel 1</md-checkbox>
-    <md-checkbox [(ngModel)]="panel2.expanded">Panel 2</md-checkbox>
+    <mat-checkbox [(ngModel)]="panel1.expanded">Panel 1</mat-checkbox>
+    <mat-checkbox [(ngModel)]="panel2.expanded">Panel 2</mat-checkbox>
   </div>
 </div>
 <br>
-<md-accordion [displayMode]="displayMode" [multi]="multi"
-              class="md-expansion-demo-width">
-  <md-expansion-panel #panel1  [hideToggle]="hideToggle">
-    <md-expansion-panel-header>Section 1</md-expansion-panel-header>
+<mat-accordion [displayMode]="displayMode" [multi]="multi"
+              class="mat-expansion-demo-width">
+  <mat-expansion-panel #panel1  [hideToggle]="hideToggle">
+    <mat-expansion-panel-header>Section 1</mat-expansion-panel-header>
     <p>This is the content text that makes sense here.</p>
-  </md-expansion-panel>
-  <md-expansion-panel #panel2 [hideToggle]="hideToggle" [disabled]="disabled">
-    <md-expansion-panel-header>Section 2</md-expansion-panel-header>
+  </mat-expansion-panel>
+  <mat-expansion-panel #panel2 [hideToggle]="hideToggle" [disabled]="disabled">
+    <mat-expansion-panel-header>Section 2</mat-expansion-panel-header>
     <p>This is the content text that makes sense here.</p>
-  </md-expansion-panel>
-  <md-expansion-panel #panel3 *ngIf="showPanel3" [hideToggle]="hideToggle">
-    <md-expansion-panel-header>Section 3</md-expansion-panel-header>
-    <md-checkbox #showButtons>Reveal Buttons Below</md-checkbox>
-    <md-action-row *ngIf="showButtons.checked">
-      <button md-button (click)="panel2.expanded = true">OPEN SECTION 2</button>
-      <button md-button (click)="panel3.expanded = false">CLOSE</button>
-    </md-action-row>
-  </md-expansion-panel>
-</md-accordion>
+  </mat-expansion-panel>
+  <mat-expansion-panel #panel3 *ngIf="showPanel3" [hideToggle]="hideToggle">
+    <mat-expansion-panel-header>Section 3</mat-expansion-panel-header>
+    <mat-checkbox #showButtons>Reveal Buttons Below</mat-checkbox>
+    <mat-action-row *ngIf="showButtons.checked">
+      <button mat-button (click)="panel2.expanded = true">OPEN SECTION 2</button>
+      <button mat-button (click)="panel3.expanded = false">CLOSE</button>
+    </mat-action-row>
+  </mat-expansion-panel>
+</mat-accordion>
diff --git a/src/demo-app/expansion/expansion-demo.scss b/src/demo-app/expansion/expansion-demo.scss
index df5591b49721..b8ef2d203d35 100644
--- a/src/demo-app/expansion/expansion-demo.scss
+++ b/src/demo-app/expansion/expansion-demo.scss
@@ -1,4 +1,4 @@
-.md-expansion-demo-width {
+.mat-expansion-demo-width {
   width: 600px;
   display: block;
 }
diff --git a/src/demo-app/grid-list/grid-list-demo.html b/src/demo-app/grid-list/grid-list-demo.html
index 6a915d77f7d1..a9e869cfcc69 100644
--- a/src/demo-app/grid-list/grid-list-demo.html
+++ b/src/demo-app/grid-list/grid-list-demo.html
@@ -1,91 +1,91 @@
 <div class="demo-grid-list">
-  <md-card>
-    <md-card-title>Basic grid list</md-card-title>
-    <md-card-content class="demo-basic-list">
-      <md-grid-list cols="4" [rowHeight]="basicRowHeight">
-        <md-grid-tile> One </md-grid-tile>
-        <md-grid-tile> Two </md-grid-tile>
-        <md-grid-tile> Three </md-grid-tile>
-        <md-grid-tile> Four </md-grid-tile>
-      </md-grid-list>
-    </md-card-content>
-  </md-card>
+  <mat-card>
+    <mat-card-title>Basic grid list</mat-card-title>
+    <mat-card-content class="demo-basic-list">
+      <mat-grid-list cols="4" [rowHeight]="basicRowHeight">
+        <mat-grid-tile> One </mat-grid-tile>
+        <mat-grid-tile> Two </mat-grid-tile>
+        <mat-grid-tile> Three </mat-grid-tile>
+        <mat-grid-tile> Four </mat-grid-tile>
+      </mat-grid-list>
+    </mat-card-content>
+  </mat-card>
 
-  <md-card>
-    <md-card-title>Fixed-height grid list</md-card-title>
-    <md-card-content>
-      <md-grid-list [cols]="fixedCols" [rowHeight]="fixedRowHeight">
-        <md-grid-tile *ngFor="let tile of tiles" [colspan]="tile.cols" [rowspan]="tile.rows"
+  <mat-card>
+    <mat-card-title>Fixed-height grid list</mat-card-title>
+    <mat-card-content>
+      <mat-grid-list [cols]="fixedCols" [rowHeight]="fixedRowHeight">
+        <mat-grid-tile *ngFor="let tile of tiles" [colspan]="tile.cols" [rowspan]="tile.rows"
                       [style.background]="tile.color">
           {{tile.text}}
-        </md-grid-tile>
-      </md-grid-list>
-    </md-card-content>
-    <md-card-actions>
+        </mat-grid-tile>
+      </mat-grid-list>
+    </mat-card-content>
+    <mat-card-actions>
       <p>Change list cols: <input type="number" [(ngModel)]="fixedCols"></p>
       <p>Change row height: <input type="number" [(ngModel)]="fixedRowHeight"></p>
-      <button md-button (click)="addTileCols()" color="primary">ADD COLSPAN (THREE)</button>
-    </md-card-actions>
-  </md-card>
+      <button mat-button (click)="addTileCols()" color="primary">ADD COLSPAN (THREE)</button>
+    </mat-card-actions>
+  </mat-card>
 
-  <md-card>
-    <md-card-title>Ratio-height grid list</md-card-title>
-    <md-card-content class="demo-ratio-list">
-      <md-grid-list cols="2" [rowHeight]="ratio" gutterSize="4px">
-        <md-grid-tile *ngFor="let tile of tiles" [style.background]="'lightblue'">
+  <mat-card>
+    <mat-card-title>Ratio-height grid list</mat-card-title>
+    <mat-card-content class="demo-ratio-list">
+      <mat-grid-list cols="2" [rowHeight]="ratio" gutterSize="4px">
+        <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'lightblue'">
           {{tile.text}}
-        </md-grid-tile>
-      </md-grid-list>
-    </md-card-content>
-    <md-card-actions>
+        </mat-grid-tile>
+      </mat-grid-list>
+    </mat-card-content>
+    <mat-card-actions>
       <p>Change ratio: <input [(ngModel)]="ratio"></p>
-    </md-card-actions>
-  </md-card>
+    </mat-card-actions>
+  </mat-card>
 
-  <md-card>
-    <md-card-title>Fit-height grid list</md-card-title>
-    <md-card-content class="demo-fit-list">
-      <md-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
+  <mat-card>
+    <mat-card-title>Fit-height grid list</mat-card-title>
+    <mat-card-content class="demo-fit-list">
+      <mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
                     [style.height]="fitListHeight">
-        <md-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
+        <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
           {{tile.text}}
-        </md-grid-tile>
-      </md-grid-list>
-    </md-card-content>
-    <md-card-actions>
+        </mat-grid-tile>
+      </mat-grid-list>
+    </mat-card-content>
+    <mat-card-actions>
       <p>Change list height: <input [(ngModel)]="fitListHeight"></p>
       <p>Change gutter: <input type="number" [(ngModel)]="ratioGutter"></p>
-    </md-card-actions>
-  </md-card>
+    </mat-card-actions>
+  </mat-card>
 
-  <md-card>
-    <md-card-title>Grid list with header</md-card-title>
-    <md-card-content>
-      <md-grid-list cols="3" rowHeight="200px">
-        <md-grid-tile *ngFor="let dog of dogs" style="background:gray">
-          <md-grid-tile-header>
-            <md-icon md-grid-avatar>info_outline</md-icon>
+  <mat-card>
+    <mat-card-title>Grid list with header</mat-card-title>
+    <mat-card-content>
+      <mat-grid-list cols="3" rowHeight="200px">
+        <mat-grid-tile *ngFor="let dog of dogs" style="background:gray">
+          <mat-grid-tile-header>
+            <mat-icon mat-grid-avatar>info_outline</mat-icon>
             {{dog.name}}
-          </md-grid-tile-header>
-        </md-grid-tile>
-      </md-grid-list>
-    </md-card-content>
-  </md-card>
+          </mat-grid-tile-header>
+        </mat-grid-tile>
+      </mat-grid-list>
+    </mat-card-content>
+  </mat-card>
 
-  <md-card>
-    <md-card-title>Grid list with footer</md-card-title>
-    <md-card-content>
-      <md-grid-list cols="3" rowHeight="200px">
-        <md-grid-tile *ngFor="let dog of dogs">
+  <mat-card>
+    <mat-card-title>Grid list with footer</mat-card-title>
+    <mat-card-content>
+      <mat-grid-list cols="3" rowHeight="200px">
+        <mat-grid-tile *ngFor="let dog of dogs">
           <img [alt]="dog.name" src="https://material.angularjs.org/material2_assets/ngconf/{{dog.name}}.png">
-          <md-grid-tile-footer>
-            <h3 md-line>{{dog.name}}</h3>
-            <span md-line>Human: {{dog.human}}</span>
-            <md-icon>star_border</md-icon>
-          </md-grid-tile-footer>
-        </md-grid-tile>
-      </md-grid-list>
-    </md-card-content>
-  </md-card>
+          <mat-grid-tile-footer>
+            <h3 mat-line>{{dog.name}}</h3>
+            <span mat-line>Human: {{dog.human}}</span>
+            <mat-icon>star_border</mat-icon>
+          </mat-grid-tile-footer>
+        </mat-grid-tile>
+      </mat-grid-list>
+    </mat-card-content>
+  </mat-card>
 </div>
 
diff --git a/src/demo-app/icon/icon-demo.html b/src/demo-app/icon/icon-demo.html
index 338c4717ff9f..6067745806b6 100644
--- a/src/demo-app/icon/icon-demo.html
+++ b/src/demo-app/icon/icon-demo.html
@@ -4,32 +4,32 @@
   </p>
 
   <p>
-    By name registered with MdIconProvider:
-    <md-icon svgIcon="thumb-up" class="green"></md-icon>
-    <md-icon svgIcon="thumb-up"></md-icon>
+    By name registered with MatIconProvider:
+    <mat-icon svgIcon="thumb-up" class="green"></mat-icon>
+    <mat-icon svgIcon="thumb-up"></mat-icon>
   </p>
 
   <p>
     From icon set:
-    <md-icon svgIcon="core:alarm"></md-icon>
-    <md-icon svgIcon="core:accessibility"></md-icon>
-    <md-icon svgIcon="core:alarm"></md-icon>
+    <mat-icon svgIcon="core:alarm"></mat-icon>
+    <mat-icon svgIcon="core:accessibility"></mat-icon>
+    <mat-icon svgIcon="core:alarm"></mat-icon>
   </p>
 
   <p>
     Ligature from Material Icons font:
-    <md-icon>home</md-icon>
+    <mat-icon>home</mat-icon>
   </p>
 
   <p>
     Using a theme:
-    <md-icon color="primary">home</md-icon>
-    <md-icon color="accent">home</md-icon>
-    <md-icon color="warn">home</md-icon>
+    <mat-icon color="primary">home</mat-icon>
+    <mat-icon color="accent">home</mat-icon>
+    <mat-icon color="warn">home</mat-icon>
   </p>
 
   <p>
     Custom icon font and CSS:
-    <md-icon fontSet="fontawesome" fontIcon="fa-birthday-cake"></md-icon>
+    <mat-icon fontSet="fontawesome" fontIcon="fa-birthday-cake"></mat-icon>
   </p>
 </div>
diff --git a/src/demo-app/icon/icon-demo.ts b/src/demo-app/icon/icon-demo.ts
index e5975d672a2d..1c66bb8b557e 100644
--- a/src/demo-app/icon/icon-demo.ts
+++ b/src/demo-app/icon/icon-demo.ts
@@ -1,18 +1,18 @@
 import {Component, ViewEncapsulation} from '@angular/core';
 import {DomSanitizer} from '@angular/platform-browser';
-import {MdIconRegistry} from '@angular/material';
+import {MatIconRegistry} from '@angular/material';
 
 @Component({
   moduleId: module.id,
-  selector: 'md-icon-demo',
+  selector: 'mat-icon-demo',
   templateUrl: 'icon-demo.html',
   styleUrls: ['icon-demo.css'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
 export class IconDemo {
-  constructor(mdIconRegistry: MdIconRegistry, sanitizer: DomSanitizer) {
-    mdIconRegistry
+  constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) {
+    iconRegistry
         .addSvgIcon('thumb-up',
             sanitizer.bypassSecurityTrustResourceUrl('/icon/assets/thumbup-icon.svg'))
         .addSvgIconSetInNamespace('core',
diff --git a/src/demo-app/index.html b/src/demo-app/index.html
index 706848123e5d..b8669924fdb5 100644
--- a/src/demo-app/index.html
+++ b/src/demo-app/index.html
@@ -11,7 +11,7 @@
   <link href="theme.css" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
 
-  <!-- FontAwesome for md-icon demo. -->
+  <!-- FontAwesome for mat-icon demo. -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 </head>
 <body>
diff --git a/src/demo-app/input/input-demo.html b/src/demo-app/input/input-demo.html
index 1a171440ca20..deeb7cdaf4cd 100644
--- a/src/demo-app/input/input-demo.html
+++ b/src/demo-app/input/input-demo.html
@@ -1,342 +1,342 @@
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Basic</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Basic</mat-toolbar>
+  <mat-card-content>
     <form>
-      <md-form-field class="demo-full-width">
-        <input mdInput placeholder="Company (disabled)" disabled value="Google">
-      </md-form-field>
+      <mat-form-field class="demo-full-width">
+        <input matInput placeholder="Company (disabled)" disabled value="Google">
+      </mat-form-field>
 
       <table style="width: 100%" cellspacing="0"><tr>
         <td>
-          <md-form-field style="width: 100%" floatPlaceholder="never">
-            <input mdInput placeholder="First name">
-          </md-form-field>
+          <mat-form-field style="width: 100%" floatPlaceholder="never">
+            <input matInput placeholder="First name">
+          </mat-form-field>
         </td>
         <td>
-          <md-form-field style="width: 100%">
-            <input mdInput placeholder="Long Last Name That Will Be Truncated">
-          </md-form-field>
+          <mat-form-field style="width: 100%">
+            <input matInput placeholder="Long Last Name That Will Be Truncated">
+          </mat-form-field>
         </td>
       </tr></table>
       <p>
-        <md-form-field class="demo-full-width">
-          <textarea mdInput placeholder="Address">1600 Amphitheatre Pkway</textarea>
-        </md-form-field>
-        <md-form-field class="demo-full-width">
-          <textarea mdInput placeholder="Address 2"></textarea>
-        </md-form-field>
+        <mat-form-field class="demo-full-width">
+          <textarea matInput placeholder="Address">1600 Amphitheatre Pkway</textarea>
+        </mat-form-field>
+        <mat-form-field class="demo-full-width">
+          <textarea matInput placeholder="Address 2"></textarea>
+        </mat-form-field>
       </p>
       <table style="width: 100%" cellspacing="0"><tr>
         <td>
-          <md-form-field class="demo-full-width">
-            <input mdInput placeholder="City" value="Mountain View">
-          </md-form-field>
+          <mat-form-field class="demo-full-width">
+            <input matInput placeholder="City" value="Mountain View">
+          </mat-form-field>
         </td>
         <td>
-          <md-form-field class="demo-full-width">
-            <input mdInput placeholder="State" maxLength="2" value="CA">
-          </md-form-field>
+          <mat-form-field class="demo-full-width">
+            <input matInput placeholder="State" maxLength="2" value="CA">
+          </mat-form-field>
         </td>
         <td>
-          <md-form-field class="demo-full-width">
-            <input mdInput #postalCode maxLength="5" placeholder="Postal Code" value="94043"
+          <mat-form-field class="demo-full-width">
+            <input matInput #postalCode maxLength="5" placeholder="Postal Code" value="94043"
                    pattern="[0-9]{5}">
-            <md-hint align="end">
-              <md-icon>mode_edit</md-icon>
+            <mat-hint align="end">
+              <mat-icon>mode_edit</mat-icon>
               <span aria-live="polite">{{postalCode.value.length}} / 5</span>
-            </md-hint>
-          </md-form-field>
+            </mat-hint>
+          </mat-form-field>
         </td>
       </tr></table>
     </form>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Error messages</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Error messages</mat-toolbar>
+  <mat-card-content>
     <h4>Regular</h4>
 
     <p>
-      <md-form-field>
-        <input mdInput placeholder="example" [(ngModel)]="errorMessageExample1" required>
-        <md-error>This field is required</md-error>
-      </md-form-field>
+      <mat-form-field>
+        <input matInput placeholder="example" [(ngModel)]="errorMessageExample1" required>
+        <mat-error>This field is required</mat-error>
+      </mat-form-field>
 
-      <md-form-field>
-        <input mdInput placeholder="email" [formControl]="emailFormControl">
-        <md-error *ngIf="emailFormControl.hasError('required')">
+      <mat-form-field>
+        <input matInput placeholder="email" [formControl]="emailFormControl">
+        <mat-error *ngIf="emailFormControl.hasError('required')">
           This field is required
-        </md-error>
-        <md-error *ngIf="emailFormControl.hasError('pattern')">
+        </mat-error>
+        <mat-error *ngIf="emailFormControl.hasError('pattern')">
           Please enter a valid email address
-        </md-error>
-      </md-form-field>
+        </mat-error>
+      </mat-form-field>
     </p>
 
     <h4>With hint</h4>
 
-    <md-form-field>
-      <input mdInput placeholder="example" [(ngModel)]="errorMessageExample2" required>
-      <md-error>This field is required</md-error>
-      <md-hint>Please type something here</md-hint>
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="example" [(ngModel)]="errorMessageExample2" required>
+      <mat-error>This field is required</mat-error>
+      <mat-hint>Please type something here</mat-hint>
+    </mat-form-field>
 
 
     <form novalidate>
       <h4>Inside a form</h4>
 
-      <md-form-field>
-        <input mdInput name="example" placeholder="example"
+      <mat-form-field>
+        <input matInput name="example" placeholder="example"
           [(ngModel)]="errorMessageExample3" required>
-        <md-error>This field is required</md-error>
-      </md-form-field>
+        <mat-error>This field is required</mat-error>
+      </mat-form-field>
 
-      <button color="primary" md-raised-button>Submit</button>
+      <button color="primary" mat-raised-button>Submit</button>
     </form>
 
     <h4>With a custom error function</h4>
-    <md-form-field>
-      <input mdInput
+    <mat-form-field>
+      <input matInput
         placeholder="example"
         [(ngModel)]="errorMessageExample4"
         [errorStateMatcher]="customErrorStateMatcher"
         required>
-      <md-error>This field is required</md-error>
-    </md-form-field>
+      <mat-error>This field is required</mat-error>
+    </mat-form-field>
 
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Prefix + Suffix</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Prefix + Suffix</mat-toolbar>
+  <mat-card-content>
     <h4>Text</h4>
-    <md-form-field class="demo-text-align-end">
-      <input mdInput placeholder="amount">
-      <span mdPrefix>$&nbsp;</span>
-      <span mdSuffix>.00</span>
-    </md-form-field>
+    <mat-form-field class="demo-text-align-end">
+      <input matInput placeholder="amount">
+      <span matPrefix>$&nbsp;</span>
+      <span matSuffix>.00</span>
+    </mat-form-field>
 
     <h4>Icons</h4>
-    <md-form-field>
-      <input mdInput placeholder="amount">
-      <md-icon mdPrefix>attach_money</md-icon>
-      <md-icon mdSuffix>mode_edit</md-icon>
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="amount">
+      <mat-icon matPrefix>attach_money</mat-icon>
+      <mat-icon matSuffix>mode_edit</mat-icon>
+    </mat-form-field>
 
     <h4>Icon buttons</h4>
-    <md-form-field>
-      <input mdInput placeholder="amount">
-      <button md-icon-button mdPrefix><md-icon>attach_money</md-icon></button>
-      <button md-icon-button mdSuffix><md-icon>mode_edit</md-icon></button>
-    </md-form-field>
-  </md-card-content>
-</md-card>
+    <mat-form-field>
+      <input matInput placeholder="amount">
+      <button mat-icon-button matPrefix><mat-icon>attach_money</mat-icon></button>
+      <button mat-icon-button matSuffix><mat-icon>mode_edit</mat-icon></button>
+    </mat-form-field>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Divider Colors</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Divider Colors</mat-toolbar>
+  <mat-card-content>
     <h4>Input</h4>
-    <md-form-field color="primary" >
-      <input mdInput placeholder="Default Color" value="example">
-    </md-form-field>
-    <md-form-field color="accent">
-      <input mdInput placeholder="Accent Color" value="example">
-    </md-form-field>
-    <md-form-field color="warn">
-      <input mdInput placeholder="Warn Color" value="example">
-    </md-form-field>
+    <mat-form-field color="primary" >
+      <input matInput placeholder="Default Color" value="example">
+    </mat-form-field>
+    <mat-form-field color="accent">
+      <input matInput placeholder="Accent Color" value="example">
+    </mat-form-field>
+    <mat-form-field color="warn">
+      <input matInput placeholder="Warn Color" value="example">
+    </mat-form-field>
 
     <h4>Textarea</h4>
-    <md-form-field color="primary">
-      <textarea mdInput placeholder="Default Color">example</textarea>
-    </md-form-field>
-    <md-form-field color="accent">
-      <textarea mdInput placeholder="Accent Color">example</textarea>
-    </md-form-field>
-    <md-form-field color="warn">
-      <textarea mdInput placeholder="Warn Color">example</textarea>
-    </md-form-field>
+    <mat-form-field color="primary">
+      <textarea matInput placeholder="Default Color">example</textarea>
+    </mat-form-field>
+    <mat-form-field color="accent">
+      <textarea matInput placeholder="Accent Color">example</textarea>
+    </mat-form-field>
+    <mat-form-field color="warn">
+      <textarea matInput placeholder="Warn Color">example</textarea>
+    </mat-form-field>
 
     <h4>With error</h4>
-    <md-form-field color="primary" >
-      <input mdInput placeholder="Default Color" [(ngModel)]="dividerColorExample1" required>
-      <md-error>This field is required</md-error>
-    </md-form-field>
-    <md-form-field color="accent">
-      <input mdInput placeholder="Accent Color" [(ngModel)]="dividerColorExample2" required>
-      <md-error>This field is required</md-error>
-    </md-form-field>
-    <md-form-field color="warn">
-      <input mdInput placeholder="Warn Color" [(ngModel)]="dividerColorExample3" required>
-      <md-error>This field is required</md-error>
-    </md-form-field>
-  </md-card-content>
-</md-card>
+    <mat-form-field color="primary" >
+      <input matInput placeholder="Default Color" [(ngModel)]="dividerColorExample1" required>
+      <mat-error>This field is required</mat-error>
+    </mat-form-field>
+    <mat-form-field color="accent">
+      <input matInput placeholder="Accent Color" [(ngModel)]="dividerColorExample2" required>
+      <mat-error>This field is required</mat-error>
+    </mat-form-field>
+    <mat-form-field color="warn">
+      <input matInput placeholder="Warn Color" [(ngModel)]="dividerColorExample3" required>
+      <mat-error>This field is required</mat-error>
+    </mat-form-field>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Hints</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Hints</mat-toolbar>
+  <mat-card-content>
     <h4>Input</h4>
     <p>
-      <md-form-field class="demo-full-width">
-        <input mdInput
+      <mat-form-field class="demo-full-width">
+        <input matInput
                #characterCountInputHintExample
                placeholder="Character count (100 max)"
                maxLength="100"
                value="Hello world. How are you?">
-        <md-hint align="end" aria-live="polite">
+        <mat-hint align="end" aria-live="polite">
           {{characterCountInputHintExample.value.length}} / 100
-        </md-hint>
-      </md-form-field>
+        </mat-hint>
+      </mat-form-field>
     </p>
 
     <h4>Textarea</h4>
     <p>
-      <md-form-field class="demo-full-width">
-        <textarea mdInput
+      <mat-form-field class="demo-full-width">
+        <textarea matInput
                   #characterCountTextareaHintExample
                   placeholder="Character count (100 max)"
                   maxLength="100">Hello world. How are you?</textarea>
-        <md-hint align="end" aria-live="polite">
+        <mat-hint align="end" aria-live="polite">
           {{characterCountTextareaHintExample.value.length}} / 100
-        </md-hint>
-      </md-form-field>
+        </mat-hint>
+      </mat-form-field>
     </p>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">
     <span>
       Hello&nbsp;
-      <md-form-field color="accent">
-        <input mdInput [(ngModel)]="name" type="text" placeholder="First name">
-      </md-form-field>,
+      <mat-form-field color="accent">
+        <input matInput [(ngModel)]="name" type="text" placeholder="First name">
+      </mat-form-field>,
       how are you?
     </span>
-  </md-toolbar>
-  <md-card-content>
+  </mat-toolbar>
+  <mat-card-content>
     <p>
-      <md-form-field>
-        <input mdInput disabled placeholder="Disabled field" value="Value">
-      </md-form-field>
-      <md-form-field>
-        <input mdInput required placeholder="Required field">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput disabled placeholder="Disabled field" value="Value">
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput required placeholder="Required field">
+      </mat-form-field>
     </p>
     <p>
-      <md-form-field style="width: 100%">
-        <input mdInput placeholder="100% width placeholder">
-      </md-form-field>
+      <mat-form-field style="width: 100%">
+        <input matInput placeholder="100% width placeholder">
+      </mat-form-field>
     </p>
     <p>
-      <md-form-field style="width: 100%">
-        <input mdInput #input placeholder="Character count (100 max)" maxLength="100">
-        <md-hint align="end" aria-live="polite">{{input.value.length}} / 100</md-hint>
-      </md-form-field>
+      <mat-form-field style="width: 100%">
+        <input matInput #input placeholder="Character count (100 max)" maxLength="100">
+        <mat-hint align="end" aria-live="polite">{{input.value.length}} / 100</mat-hint>
+      </mat-form-field>
     </p>
     <p>
-      <md-form-field hintLabel="Hint label" style="width: 100%">
-        <input mdInput placeholder="Show Hint Label">
-      </md-form-field>
+      <mat-form-field hintLabel="Hint label" style="width: 100%">
+        <input matInput placeholder="Show Hint Label">
+      </mat-form-field>
     </p>
 
     <p>
-      <md-form-field>
-        <input mdInput>
-        <md-placeholder>
-          I <md-icon>favorite</md-icon> <b>bold</b> placeholder
-        </md-placeholder>
-        <md-hint>
-          I also <md-icon>home</md-icon> <i>italic</i> hint labels
-        </md-hint>
-      </md-form-field>
+      <mat-form-field>
+        <input matInput>
+        <mat-placeholder>
+          I <mat-icon>favorite</mat-icon> <b>bold</b> placeholder
+        </mat-placeholder>
+        <mat-hint>
+          I also <mat-icon>home</mat-icon> <i>italic</i> hint labels
+        </mat-hint>
+      </mat-form-field>
     </p>
     <p>
-      <md-form-field hintLabel="Hint label" style="width: 100%">
-        <input mdInput #hintLabelWithCharCount placeholder="Show Hint Label With Character Count">
-        <md-hint align="end" aria-live="polite">{{hintLabelWithCharCount.value.length}}</md-hint>
-      </md-form-field>
+      <mat-form-field hintLabel="Hint label" style="width: 100%">
+        <input matInput #hintLabelWithCharCount placeholder="Show Hint Label With Character Count">
+        <mat-hint align="end" aria-live="polite">{{hintLabelWithCharCount.value.length}}</mat-hint>
+      </mat-form-field>
     </p>
     <p>
-      <md-form-field style="margin-bottom: 4em">
-        <textarea mdInput #longHint placeholder="Enter text to count"></textarea>
-        <md-hint>
+      <mat-form-field style="margin-bottom: 4em">
+        <textarea matInput #longHint placeholder="Enter text to count"></textarea>
+        <mat-hint>
           Enter some text to count how many characters are in it. The character count is shown on
           the right.
-        </md-hint>
-        <md-hint align="end" style="white-space: nowrap" aria-live="polite">
+        </mat-hint>
+        <mat-hint align="end" style="white-space: nowrap" aria-live="polite">
           Length: {{longHint.value.length}}
-        </md-hint>
-      </md-form-field>
+        </mat-hint>
+      </mat-form-field>
     </p>
     <p>
-      <md-checkbox [(ngModel)]="color">Check to change the color:</md-checkbox>
-      <md-form-field [color]="color ? 'primary' : 'accent'">
-        <input mdInput [placeholder]="color ? 'Primary color' : 'Accent color'">
-      </md-form-field>
+      <mat-checkbox [(ngModel)]="color">Check to change the color:</mat-checkbox>
+      <mat-form-field [color]="color ? 'primary' : 'accent'">
+        <input matInput [placeholder]="color ? 'Primary color' : 'Accent color'">
+      </mat-form-field>
     </p>
     <p>
-      <md-checkbox [(ngModel)]="requiredField"> Check to make required:</md-checkbox>
-      <md-form-field>
-        <input mdInput
+      <mat-checkbox [(ngModel)]="requiredField"> Check to make required:</mat-checkbox>
+      <mat-form-field>
+        <input matInput
                [required]="requiredField"
                [placeholder]="requiredField ? 'Required field' : 'Not required field'">
-      </md-form-field>
+      </mat-form-field>
     </p>
     <p>
-      <md-checkbox [(ngModel)]="hideRequiredMarker">Check to hide the required marker:</md-checkbox>
-      <md-form-field [hideRequiredMarker]="hideRequiredMarker" style="width: 300px">
-        <input mdInput
+      <mat-checkbox [(ngModel)]="hideRequiredMarker">Check to hide the required marker:</mat-checkbox>
+      <mat-form-field [hideRequiredMarker]="hideRequiredMarker" style="width: 300px">
+        <input matInput
                required
                [placeholder]="hideRequiredMarker ?
                    'Required Without Marker' : 'Required With Marker'">
-      </md-form-field>
+      </mat-form-field>
     </p>
     <p>
-      <md-button-toggle-group [(ngModel)]="floatingLabel">
-        <md-button-toggle value="auto">Auto Float</md-button-toggle>
-        <md-button-toggle value="always">Always Float</md-button-toggle>
-        <md-button-toggle value="never">Never Float</md-button-toggle>
-      </md-button-toggle-group>
+      <mat-button-toggle-group [(ngModel)]="floatingLabel">
+        <mat-button-toggle value="auto">Auto Float</mat-button-toggle>
+        <mat-button-toggle value="always">Always Float</mat-button-toggle>
+        <mat-button-toggle value="never">Never Float</mat-button-toggle>
+      </mat-button-toggle-group>
     </p>
 
     <p>
-      <md-form-field [floatPlaceholder]="floatingLabel">
-        <input mdInput placeholder="Placeholder">
-      </md-form-field>
+      <mat-form-field [floatPlaceholder]="floatingLabel">
+        <input matInput placeholder="Placeholder">
+      </mat-form-field>
     </p>
 
     <p>
-      <md-form-field>
-        <input mdInput placeholder="Prefixed" value="example">
-        <div mdPrefix>Example:&nbsp;</div>
-      </md-form-field>
-      <md-form-field class="demo-text-align-end">
-        <input mdInput placeholder="Suffixed" value="123">
-        <span mdSuffix>.00 €</span>
-      </md-form-field>
+      <mat-form-field>
+        <input matInput placeholder="Prefixed" value="example">
+        <div matPrefix>Example:&nbsp;</div>
+      </mat-form-field>
+      <mat-form-field class="demo-text-align-end">
+        <input matInput placeholder="Suffixed" value="123">
+        <span matSuffix>.00 €</span>
+      </mat-form-field>
       <br/>
       Both:
-      <md-form-field class="demo-text-align-end">
-        <input mdInput #email placeholder="Email Address" value="angular-core">
-        <span mdPrefix><md-icon [class.primary]="email.focused">email</md-icon>&nbsp;</span>
-        <span mdSuffix [class.primary]="email.focused">&nbsp;@gmail.com</span>
-      </md-form-field>
+      <mat-form-field class="demo-text-align-end">
+        <input matInput #email placeholder="Email Address" value="angular-core">
+        <span matPrefix><mat-icon [class.primary]="email.focused">email</mat-icon>&nbsp;</span>
+        <span matSuffix [class.primary]="email.focused">&nbsp;@gmail.com</span>
+      </mat-form-field>
     </p>
 
     <p>
-      Empty: <md-form-field><input mdInput></md-form-field>
-      <label>Label: <md-form-field><input mdInput></md-form-field></label>
+      Empty: <mat-form-field><input matInput></mat-form-field>
+      <label>Label: <mat-form-field><input matInput></mat-form-field></label>
     </p>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Number Inputs</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Number Inputs</mat-toolbar>
+  <mat-card-content>
     <table width="100%">
       <thead>
       <td>Table</td>
@@ -350,13 +350,13 @@ <h4>Textarea</h4>
       <tr *ngFor="let item of items; let i = index">
         <td>{{i+1}}</td>
         <td>
-          <md-form-field>
-            <input mdInput
+          <mat-form-field>
+            <input matInput
                    type="number"
                    placeholder="value"
                    aria-label="hello"
                    [(ngModel)]="items[i].value">
-          </md-form-field>
+          </mat-form-field>
         </td>
         <td>
           <input type="number" [(ngModel)]="items[i].value">
@@ -364,46 +364,46 @@ <h4>Textarea</h4>
         <td>{{item.value}}</td>
       </tr>
     </table>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Forms</md-toolbar>
-  <md-card-content>
-    <md-form-field><input mdInput placeholder="reactive" [formControl]="formControl">
-    </md-form-field>
-    <md-form-field>
-      <input mdInput placeholder="template" [(ngModel)]="model" required [disabled]="ctrlDisabled">
-    </md-form-field>
-    <button md-raised-button color="primary"
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Forms</mat-toolbar>
+  <mat-card-content>
+    <mat-form-field><input matInput placeholder="reactive" [formControl]="formControl">
+    </mat-form-field>
+    <mat-form-field>
+      <input matInput placeholder="template" [(ngModel)]="model" required [disabled]="ctrlDisabled">
+    </mat-form-field>
+    <button mat-raised-button color="primary"
             (click)="formControl.enabled ? formControl.disable() : formControl.enable()">
       DISABLE REACTIVE CTRL
     </button>
-    <button md-raised-button color="primary" (click)="ctrlDisabled = !ctrlDisabled">
+    <button mat-raised-button color="primary" (click)="ctrlDisabled = !ctrlDisabled">
       DISABLE TD CTRL
     </button>
     <div>
-      <md-form-field>
-          <input mdInput placeholder="delayed value" [formControl]="delayedFormControl">
-      </md-form-field>
+      <mat-form-field>
+          <input matInput placeholder="delayed value" [formControl]="delayedFormControl">
+      </mat-form-field>
     </div>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="demo-card demo-basic">
-  <md-toolbar color="primary">Textarea Autosize</md-toolbar>
-  <md-card-content>
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Textarea Autosize</mat-toolbar>
+  <mat-card-content>
     <h3>Regular &lt;textarea&gt;</h3>
-    <textarea class="demo-textarea" mdTextareaAutosize mdAutosizeMaxRows="10"></textarea>
+    <textarea class="demo-textarea" matTextareaAutosize matAutosizeMaxRows="10"></textarea>
 
-    <h3>&lt;textarea&gt; with md-form-field</h3>
+    <h3>&lt;textarea&gt; with mat-form-field</h3>
     <div>
-      <md-form-field>
-        <textarea mdInput
-                  mdTextareaAutosize
-                  mdAutosizeMaxRows="10"
+      <mat-form-field>
+        <textarea matInput
+                  matTextareaAutosize
+                  matAutosizeMaxRows="10"
                   placeholder="Autosized textarea"></textarea>
-      </md-form-field>
+      </mat-form-field>
     </div>
 
     <h3>&lt;textarea&gt; with ngModel</h3>
@@ -412,7 +412,7 @@ <h3>&lt;textarea&gt; with ngModel</h3>
     </div>
     <label>
       Plain textarea with auto size
-      <textarea mdTextareaAutosize [(ngModel)]="textareaNgModelValue"></textarea>
+      <textarea matTextareaAutosize [(ngModel)]="textareaNgModelValue"></textarea>
     </label>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
diff --git a/src/demo-app/list/list-demo.html b/src/demo-app/list/list-demo.html
index 5109f4cd2647..347d5c24732b 100644
--- a/src/demo-app/list/list-demo.html
+++ b/src/demo-app/list/list-demo.html
@@ -1,122 +1,122 @@
 
-<h1>md-list demo</h1>
+<h1>mat-list demo</h1>
 
-<button md-raised-button (click)="thirdLine=!thirdLine" class="demo-button">Show third line</button>
+<button mat-raised-button (click)="thirdLine=!thirdLine" class="demo-button">Show third line</button>
 
 <div class="demo">
   <div>
     <h2>Normal lists</h2>
 
-    <md-list>
-      <h3 md-subheader>Items</h3>
-      <md-list-item *ngFor="let item of items">
+    <mat-list>
+      <h3 mat-subheader>Items</h3>
+      <mat-list-item *ngFor="let item of items">
         {{item}}
-      </md-list-item>
-    </md-list>
+      </mat-list-item>
+    </mat-list>
 
-    <md-list>
-      <md-list-item *ngFor="let contact of contacts">
-        <h3 md-line>{{contact.name}}</h3>
-        <p md-line *ngIf="thirdLine">extra line</p>
-        <p md-line class="demo-secondary-text">{{contact.headline}}</p>
-      </md-list-item>
-    </md-list>
+    <mat-list>
+      <mat-list-item *ngFor="let contact of contacts">
+        <h3 mat-line>{{contact.name}}</h3>
+        <p mat-line *ngIf="thirdLine">extra line</p>
+        <p mat-line class="demo-secondary-text">{{contact.headline}}</p>
+      </mat-list-item>
+    </mat-list>
 
-    <md-list>
-      <h3 md-subheader>Today</h3>
-      <md-list-item *ngFor="let message of messages">
-        <img md-list-avatar [src]="message.image" alt="Image of {{message.from}}">
-        <h4 md-line>{{message.from}}</h4>
-        <p md-line>
+    <mat-list>
+      <h3 mat-subheader>Today</h3>
+      <mat-list-item *ngFor="let message of messages">
+        <img mat-list-avatar [src]="message.image" alt="Image of {{message.from}}">
+        <h4 mat-line>{{message.from}}</h4>
+        <p mat-line>
           <span>{{message.subject}} -- </span>
           <span class="demo-secondary-text">{{message.message}}</span>
         </p>
-      </md-list-item>
-      <md-divider></md-divider>
-      <md-list-item *ngFor="let message of messages">
-        <h4 md-line>{{message.from}}</h4>
-        <p md-line> {{message.subject}} </p>
-        <p md-line class="demo-secondary-text">{{message.message}} </p>
-      </md-list-item>
-    </md-list>
+      </mat-list-item>
+      <mat-divider></mat-divider>
+      <mat-list-item *ngFor="let message of messages">
+        <h4 mat-line>{{message.from}}</h4>
+        <p mat-line> {{message.subject}} </p>
+        <p mat-line class="demo-secondary-text">{{message.message}} </p>
+      </mat-list-item>
+    </mat-list>
   </div>
 
   <div>
     <h2>Dense lists</h2>
-    <md-list dense>
-      <h3 md-subheader>Items</h3>
-      <md-list-item *ngFor="let item of items">
+    <mat-list dense>
+      <h3 mat-subheader>Items</h3>
+      <mat-list-item *ngFor="let item of items">
         {{item}}
-      </md-list-item>
-    </md-list>
+      </mat-list-item>
+    </mat-list>
 
-    <md-list dense>
-      <md-list-item *ngFor="let contact of contacts">
-        <h3 md-line>{{contact.name}}</h3>
-        <p md-line class="demo-secondary-text">{{contact.headline}}</p>
-      </md-list-item>
-    </md-list>
+    <mat-list dense>
+      <mat-list-item *ngFor="let contact of contacts">
+        <h3 mat-line>{{contact.name}}</h3>
+        <p mat-line class="demo-secondary-text">{{contact.headline}}</p>
+      </mat-list-item>
+    </mat-list>
 
-    <md-list dense>
-      <h3 md-subheader>Today</h3>
-      <md-list-item *ngFor="let message of messages">
-        <img md-list-avatar [src]="message.image" alt="Image of {{message.from}}">
-        <h4 md-line>{{message.from}}</h4>
-        <p md-line> {{message.subject}} </p>
-        <p md-line class="demo-secondary-text">{{message.message}} </p>
-      </md-list-item>
-    </md-list>
+    <mat-list dense>
+      <h3 mat-subheader>Today</h3>
+      <mat-list-item *ngFor="let message of messages">
+        <img mat-list-avatar [src]="message.image" alt="Image of {{message.from}}">
+        <h4 mat-line>{{message.from}}</h4>
+        <p mat-line> {{message.subject}} </p>
+        <p mat-line class="demo-secondary-text">{{message.message}} </p>
+      </mat-list-item>
+    </mat-list>
   </div>
   <div>
     <h2>Nav lists</h2>
-    <md-nav-list>
-      <a md-list-item *ngFor="let link of links" href="http://www.google.com">
+    <mat-nav-list>
+      <a mat-list-item *ngFor="let link of links" href="http://www.google.com">
         {{ link.name }}
       </a>
-    </md-nav-list>
+    </mat-nav-list>
     <div *ngIf="infoClicked">
       More info!
     </div>
-    <md-nav-list>
-      <md-list-item *ngFor="let link of links">
-        <a md-line href="http://www.google.com">{{ link.name }}</a>
-        <button md-icon-button (click)="infoClicked=!infoClicked">
-          <md-icon>info</md-icon>
+    <mat-nav-list>
+      <mat-list-item *ngFor="let link of links">
+        <a mat-line href="http://www.google.com">{{ link.name }}</a>
+        <button mat-icon-button (click)="infoClicked=!infoClicked">
+          <mat-icon>info</mat-icon>
         </button>
-      </md-list-item>
-    </md-nav-list>
-    <md-nav-list>
-      <a md-list-item *ngFor="let link of links" href="http://www.google.com">
-        <md-icon md-list-icon>folder</md-icon>
-        <span md-line>{{ link.name }}</span>
-        <span md-line class="demo-secondary-text"> Description </span>
+      </mat-list-item>
+    </mat-nav-list>
+    <mat-nav-list>
+      <a mat-list-item *ngFor="let link of links" href="http://www.google.com">
+        <mat-icon mat-list-icon>folder</mat-icon>
+        <span mat-line>{{ link.name }}</span>
+        <span mat-line class="demo-secondary-text"> Description </span>
       </a>
-    </md-nav-list>
-    <md-nav-list dense>
-      <md-list-item *ngFor="let link of links">
-        <a md-line href="http://www.google.com">{{ link.name }}</a>
-        <button md-icon-button (click)="infoClicked=!infoClicked">
-          <md-icon class="material-icons">info</md-icon>
+    </mat-nav-list>
+    <mat-nav-list dense>
+      <mat-list-item *ngFor="let link of links">
+        <a mat-line href="http://www.google.com">{{ link.name }}</a>
+        <button mat-icon-button (click)="infoClicked=!infoClicked">
+          <mat-icon class="material-icons">info</mat-icon>
         </button>
-      </md-list-item>
-    </md-nav-list>
+      </mat-list-item>
+    </mat-nav-list>
   </div>
 
   <div>
     <h2>Selection list</h2>
 
-    <md-selection-list #groceries>
-      <h3 md-subheader>Groceries</h3>
+    <mat-selection-list #groceries>
+      <h3 mat-subheader>Groceries</h3>
 
-      <md-list-option *ngFor="let item of items" [value]="item">
+      <mat-list-option *ngFor="let item of items" [value]="item">
         {{item}}
-      </md-list-option>
-    </md-selection-list>
+      </mat-list-option>
+    </mat-selection-list>
 
     <p>Selected: {{groceries.selectedOptions.selected.length}}</p>
     <p>
-      <button md-raised-button (click)="groceries.selectAll()">Select all</button>
-      <button md-raised-button (click)="groceries.deselectAll()">Deselect all</button>
+      <button mat-raised-button (click)="groceries.selectAll()">Select all</button>
+      <button mat-raised-button (click)="groceries.deselectAll()">Deselect all</button>
     </p>
   </div>
 </div>
diff --git a/src/demo-app/live-announcer/live-announcer-demo.html b/src/demo-app/live-announcer/live-announcer-demo.html
index 4aa01f5ef659..ce59732387be 100644
--- a/src/demo-app/live-announcer/live-announcer-demo.html
+++ b/src/demo-app/live-announcer/live-announcer-demo.html
@@ -1,5 +1,5 @@
 <div class="demo-live-announcer">
 
-  <button md-button (click)="announceText('Hey Google')">Announce Text</button>
+  <button mat-button (click)="announceText('Hey Google')">Announce Text</button>
 
 </div>
\ No newline at end of file
diff --git a/src/demo-app/menu/menu-demo.html b/src/demo-app/menu/menu-demo.html
index 502050bf9ddf..86c9baf2849d 100644
--- a/src/demo-app/menu/menu-demo.html
+++ b/src/demo-app/menu/menu-demo.html
@@ -2,118 +2,118 @@
   <div class="menu-section">
     <p>You clicked on: {{ selected }}</p>
 
-    <md-toolbar>
-      <button md-icon-button [mdMenuTriggerFor]="menu" aria-label="Open basic menu">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar>
+      <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Open basic menu">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu #menu="mdMenu">
-      <button md-menu-item *ngFor="let item of items" (click)="select(item.text)" [disabled]="item.disabled">
+    <mat-menu #menu="matMenu">
+      <button mat-menu-item *ngFor="let item of items" (click)="select(item.text)" [disabled]="item.disabled">
         {{ item.text }}
       </button>
-    </md-menu>
+    </mat-menu>
   </div>
   <div class="menu-section">
     <p>Nested menu</p>
 
-    <md-toolbar>
-      <button md-icon-button [mdMenuTriggerFor]="animals">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar>
+      <button mat-icon-button [matMenuTriggerFor]="animals">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
-
-    <md-menu #animals="mdMenu">
-      <button md-menu-item [mdMenuTriggerFor]="vertebrates">Vertebrates</button>
-      <button md-menu-item [mdMenuTriggerFor]="invertebrates">Invertebrates</button>
-    </md-menu>
-
-    <md-menu #vertebrates="mdMenu">
-      <button md-menu-item [mdMenuTriggerFor]="fish">Fishes</button>
-      <button md-menu-item [mdMenuTriggerFor]="amphibians">Amphibians</button>
-      <button md-menu-item [mdMenuTriggerFor]="reptiles">Reptiles</button>
-      <button md-menu-item>Birds</button>
-      <button md-menu-item>Mammals</button>
-    </md-menu>
-
-    <md-menu #invertebrates="mdMenu">
-      <button md-menu-item>Insects</button>
-      <button md-menu-item>Molluscs</button>
-      <button md-menu-item>Crustaceans</button>
-      <button md-menu-item>Corals</button>
-      <button md-menu-item>Arachnids</button>
-      <button md-menu-item>Velvet worms</button>
-      <button md-menu-item>Horseshoe crabs</button>
-    </md-menu>
-
-    <md-menu #fish="mdMenu">
-      <button md-menu-item>Baikal oilfish</button>
-      <button md-menu-item>Bala shark</button>
-      <button md-menu-item>Ballan wrasse</button>
-      <button md-menu-item>Bamboo shark</button>
-      <button md-menu-item>Banded killifish</button>
-    </md-menu>
-
-    <md-menu #amphibians="mdMenu">
-      <button md-menu-item>Sonoran desert toad</button>
-      <button md-menu-item>Western toad</button>
-      <button md-menu-item>Arroyo toad</button>
-      <button md-menu-item>Yosemite toad</button>
-    </md-menu>
-
-    <md-menu #reptiles="mdMenu">
-      <button md-menu-item>Banded Day Gecko</button>
-      <button md-menu-item>Banded Gila Monster</button>
-      <button md-menu-item>Black Tree Monitor</button>
-      <button md-menu-item>Blue Spiny Lizard</button>
-    </md-menu>
+    </mat-toolbar>
+
+    <mat-menu #animals="matMenu">
+      <button mat-menu-item [matMenuTriggerFor]="vertebrates">Vertebrates</button>
+      <button mat-menu-item [matMenuTriggerFor]="invertebrates">Invertebrates</button>
+    </mat-menu>
+
+    <mat-menu #vertebrates="matMenu">
+      <button mat-menu-item [matMenuTriggerFor]="fish">Fishes</button>
+      <button mat-menu-item [matMenuTriggerFor]="amphibians">Amphibians</button>
+      <button mat-menu-item [matMenuTriggerFor]="reptiles">Reptiles</button>
+      <button mat-menu-item>Birds</button>
+      <button mat-menu-item>Mammals</button>
+    </mat-menu>
+
+    <mat-menu #invertebrates="matMenu">
+      <button mat-menu-item>Insects</button>
+      <button mat-menu-item>Molluscs</button>
+      <button mat-menu-item>Crustaceans</button>
+      <button mat-menu-item>Corals</button>
+      <button mat-menu-item>Arachnids</button>
+      <button mat-menu-item>Velvet worms</button>
+      <button mat-menu-item>Horseshoe crabs</button>
+    </mat-menu>
+
+    <mat-menu #fish="matMenu">
+      <button mat-menu-item>Baikal oilfish</button>
+      <button mat-menu-item>Bala shark</button>
+      <button mat-menu-item>Ballan wrasse</button>
+      <button mat-menu-item>Bamboo shark</button>
+      <button mat-menu-item>Banded killifish</button>
+    </mat-menu>
+
+    <mat-menu #amphibians="matMenu">
+      <button mat-menu-item>Sonoran desert toad</button>
+      <button mat-menu-item>Western toad</button>
+      <button mat-menu-item>Arroyo toad</button>
+      <button mat-menu-item>Yosemite toad</button>
+    </mat-menu>
+
+    <mat-menu #reptiles="matMenu">
+      <button mat-menu-item>Banded Day Gecko</button>
+      <button mat-menu-item>Banded Gila Monster</button>
+      <button mat-menu-item>Black Tree Monitor</button>
+      <button mat-menu-item>Blue Spiny Lizard</button>
+    </mat-menu>
   </div>
   <div class="menu-section">
     <p>Clicking these will navigate:</p>
-    <md-toolbar>
-      <button md-icon-button [mdMenuTriggerFor]="anchorMenu" aria-label="Open anchor menu">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar>
+      <button mat-icon-button [matMenuTriggerFor]="anchorMenu" aria-label="Open anchor menu">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu #anchorMenu="mdMenu">
-      <a md-menu-item *ngFor="let item of items" href="http://www.google.com" [disabled]="item.disabled">
+    <mat-menu #anchorMenu="matMenu">
+      <a mat-menu-item *ngFor="let item of items" href="http://www.google.com" [disabled]="item.disabled">
         {{ item.text }}
       </a>
-    </md-menu>
+    </mat-menu>
   </div>
   <div class="menu-section">
     <p>
       Position x: before
     </p>
-    <md-toolbar class="end-icon">
-      <button md-icon-button [mdMenuTriggerFor]="posXMenu" aria-label="Open x-positioned menu">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar class="end-icon">
+      <button mat-icon-button [matMenuTriggerFor]="posXMenu" aria-label="Open x-positioned menu">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu xPosition="before" #posXMenu="mdMenu" class="before">
-      <button md-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
-        <md-icon>{{ item.icon }}</md-icon>
+    <mat-menu xPosition="before" #posXMenu="matMenu" class="before">
+      <button mat-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
+        <mat-icon>{{ item.icon }}</mat-icon>
         {{ item.text }}
       </button>
-    </md-menu>
+    </mat-menu>
   </div>
   <div class="menu-section">
     <p>
       Position y: above
     </p>
-    <md-toolbar>
-      <button md-icon-button [mdMenuTriggerFor]="posYMenu" aria-label="Open y-positioned menu">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar>
+      <button mat-icon-button [matMenuTriggerFor]="posYMenu" aria-label="Open y-positioned menu">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu yPosition="above" #posYMenu="mdMenu">
-      <button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
+    <mat-menu yPosition="above" #posYMenu="matMenu">
+      <button mat-menu-item *ngFor="let item of items" [disabled]="item.disabled">
         {{ item.text }}
       </button>
-    </md-menu>
+    </mat-menu>
   </div>
 </div>
 
@@ -121,49 +121,49 @@
   <div class="menu-section">
     <p>overlapTrigger: false</p>
 
-    <md-toolbar>
-      <button md-icon-button [md-menu-trigger-for]="menuOverlay">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar>
+      <button mat-icon-button [mat-menu-trigger-for]="menuOverlay">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu [overlapTrigger]="false" #menuOverlay="mdMenu">
-      <button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
+    <mat-menu [overlapTrigger]="false" #menuOverlay="matMenu">
+      <button mat-menu-item *ngFor="let item of items" [disabled]="item.disabled">
         {{ item.text }}
       </button>
-    </md-menu>
+    </mat-menu>
   </div>
   <div class="menu-section">
     <p>
       Position x: before, overlapTrigger: false
     </p>
-    <md-toolbar class="end-icon">
-      <button md-icon-button [md-menu-trigger-for]="posXMenuOverlay">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar class="end-icon">
+      <button mat-icon-button [mat-menu-trigger-for]="posXMenuOverlay">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu xPosition="before" [overlapTrigger]="false" #posXMenuOverlay="mdMenu" class="before">
-      <button md-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
-        <md-icon>{{ item.icon }}</md-icon>
+    <mat-menu xPosition="before" [overlapTrigger]="false" #posXMenuOverlay="matMenu" class="before">
+      <button mat-menu-item *ngFor="let item of iconItems" [disabled]="item.disabled">
+        <mat-icon>{{ item.icon }}</mat-icon>
         {{ item.text }}
       </button>
-    </md-menu>
+    </mat-menu>
   </div>
   <div class="menu-section">
     <p>
       Position y: above, overlapTrigger: false
     </p>
-    <md-toolbar>
-      <button md-icon-button [md-menu-trigger-for]="posYMenuOverlay">
-        <md-icon>more_vert</md-icon>
+    <mat-toolbar>
+      <button mat-icon-button [mat-menu-trigger-for]="posYMenuOverlay">
+        <mat-icon>more_vert</mat-icon>
       </button>
-    </md-toolbar>
+    </mat-toolbar>
 
-    <md-menu yPosition="above" [overlapTrigger]="false" #posYMenuOverlay="mdMenu">
-      <button md-menu-item *ngFor="let item of items" [disabled]="item.disabled">
+    <mat-menu yPosition="above" [overlapTrigger]="false" #posYMenuOverlay="matMenu">
+      <button mat-menu-item *ngFor="let item of items" [disabled]="item.disabled">
         {{ item.text }}
       </button>
-    </md-menu>
+    </mat-menu>
   </div>
 </div>
diff --git a/src/demo-app/progress-bar/progress-bar-demo.html b/src/demo-app/progress-bar/progress-bar-demo.html
index 7c1e558e8c37..62acae8389ec 100644
--- a/src/demo-app/progress-bar/progress-bar-demo.html
+++ b/src/demo-app/progress-bar/progress-bar-demo.html
@@ -1,45 +1,45 @@
-<md-button-toggle-group class="demo-progress-bar-controls" [(ngModel)]="color">
-  <md-button-toggle value="primary">Primary Color</md-button-toggle>
-  <md-button-toggle value="accent">Accent Color</md-button-toggle>
-  <md-button-toggle value="warn">Warn Color</md-button-toggle>
-</md-button-toggle-group>
+<mat-button-toggle-group class="demo-progress-bar-controls" [(ngModel)]="color">
+  <mat-button-toggle value="primary">Primary Color</mat-button-toggle>
+  <mat-button-toggle value="accent">Accent Color</mat-button-toggle>
+  <mat-button-toggle value="warn">Warn Color</mat-button-toggle>
+</mat-button-toggle-group>
 
 <h1>Determinate</h1>
 
 <div class="demo-progress-bar-controls">
   <span>Value: {{determinateProgressValue}}</span>
-  <button md-raised-button (click)="stepDeterminateProgressVal(10)">Increase</button>
-  <button md-raised-button (click)="stepDeterminateProgressVal(-10)">Decrease</button>
+  <button mat-raised-button (click)="stepDeterminateProgressVal(10)">Increase</button>
+  <button mat-raised-button (click)="stepDeterminateProgressVal(-10)">Decrease</button>
 </div>
 
 <div class="demo-progress-bar-container">
-  <md-progress-bar mode="determinate" [value]="determinateProgressValue" [color]="color">
-  </md-progress-bar>
+  <mat-progress-bar mode="determinate" [value]="determinateProgressValue" [color]="color">
+  </mat-progress-bar>
 </div>
 
 <h1>Buffer</h1>
 
 <div class="demo-progress-bar-controls">
   <span>Value: {{bufferProgressValue}}</span>
-  <button md-raised-button (click)="stepBufferProgressVal(10)">Increase</button>
-  <button md-raised-button (click)="stepBufferProgressVal(-10)">Decrease</button>
+  <button mat-raised-button (click)="stepBufferProgressVal(10)">Increase</button>
+  <button mat-raised-button (click)="stepBufferProgressVal(-10)">Decrease</button>
   <span class="demo-progress-bar-spacer"></span>
   <span>Buffer Value: {{bufferBufferValue}}</span>
-  <button md-raised-button (click)="stepBufferBufferVal(10)">Increase</button>
-  <button md-raised-button (click)="stepBufferBufferVal(-10)">Decrease</button>
+  <button mat-raised-button (click)="stepBufferBufferVal(10)">Increase</button>
+  <button mat-raised-button (click)="stepBufferBufferVal(-10)">Decrease</button>
 </div>
 
 <div class="demo-progress-bar-container">
-  <md-progress-bar [value]="bufferProgressValue" [bufferValue]="bufferBufferValue" mode="buffer"
-                   [color]="color"></md-progress-bar>
+  <mat-progress-bar [value]="bufferProgressValue" [bufferValue]="bufferBufferValue" mode="buffer"
+                   [color]="color"></mat-progress-bar>
 </div>
 
 <h1>Indeterminate</h1>
 <div class="demo-progress-bar-container">
-  <md-progress-bar mode="indeterminate" [color]="color"></md-progress-bar>
+  <mat-progress-bar mode="indeterminate" [color]="color"></mat-progress-bar>
 </div>
 
 <h1>Query</h1>
 <div class="demo-progress-bar-container">
-  <md-progress-bar mode="query" [color]="color"></md-progress-bar>
+  <mat-progress-bar mode="query" [color]="color"></mat-progress-bar>
 </div>
diff --git a/src/demo-app/progress-bar/progress-bar-demo.scss b/src/demo-app/progress-bar/progress-bar-demo.scss
index f78bb2d8a226..b83828a6417e 100644
--- a/src/demo-app/progress-bar/progress-bar-demo.scss
+++ b/src/demo-app/progress-bar/progress-bar-demo.scss
@@ -1,7 +1,7 @@
 .demo-progress-bar-container {
   width: 100%;
 
-  md-progress-bar {
+  mat-progress-bar {
     margin: 20px 0;
   }
 }
diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.html b/src/demo-app/progress-spinner/progress-spinner-demo.html
index 07a04390dc8c..27a9dfcec7c3 100644
--- a/src/demo-app/progress-spinner/progress-spinner-demo.html
+++ b/src/demo-app/progress-spinner/progress-spinner-demo.html
@@ -2,29 +2,29 @@ <h1>Determinate</h1>
 
 <div class="demo-progress-spinner-controls">
   <p>Value: {{progressValue}}</p>
-  <button md-raised-button (click)="step(10)">Increase</button>
-  <button md-raised-button (click)="step(-10)">Decrease</button>
-  <md-checkbox [(ngModel)]="isDeterminate">Is determinate</md-checkbox>
+  <button mat-raised-button (click)="step(10)">Increase</button>
+  <button mat-raised-button (click)="step(-10)">Decrease</button>
+  <mat-checkbox [(ngModel)]="isDeterminate">Is determinate</mat-checkbox>
 </div>
 
 <div class="demo-progress-spinner">
-  <md-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
-      [value]="progressValue" color="primary" [strokeWidth]="1"></md-progress-spinner>
-  <md-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
-      [value]="progressValue" color="accent"></md-progress-spinner>
+  <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
+      [value]="progressValue" color="primary" [strokeWidth]="1"></mat-progress-spinner>
+  <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
+      [value]="progressValue" color="accent"></mat-progress-spinner>
 </div>
 
 <h1>Indeterminate</h1>
 
-<md-button-toggle-group class="demo-progress-spinner-controls" [(ngModel)]="color">
-  <md-button-toggle value="primary">Primary Color</md-button-toggle>
-  <md-button-toggle value="accent">Accent Color</md-button-toggle>
-  <md-button-toggle value="warn">Warn Color</md-button-toggle>
-</md-button-toggle-group>
+<mat-button-toggle-group class="demo-progress-spinner-controls" [(ngModel)]="color">
+  <mat-button-toggle value="primary">Primary Color</mat-button-toggle>
+  <mat-button-toggle value="accent">Accent Color</mat-button-toggle>
+  <mat-button-toggle value="warn">Warn Color</mat-button-toggle>
+</mat-button-toggle-group>
 
 <div class="demo-progress-spinner">
-  <md-progress-spinner mode="indeterminate" [color]="color"></md-progress-spinner>
-  <md-progress-spinner mode="indeterminate" [color]="color"></md-progress-spinner>
-  <md-spinner [color]="color"></md-spinner>
+  <mat-progress-spinner mode="indeterminate" [color]="color"></mat-progress-spinner>
+  <mat-progress-spinner mode="indeterminate" [color]="color"></mat-progress-spinner>
+  <mat-spinner [color]="color"></mat-spinner>
 </div>
 
diff --git a/src/demo-app/radio/radio-demo.html b/src/demo-app/radio/radio-demo.html
index 043690f4b7e5..09ecd1a2782a 100644
--- a/src/demo-app/radio/radio-demo.html
+++ b/src/demo-app/radio/radio-demo.html
@@ -1,52 +1,52 @@
 <h1>Basic Example</h1>
 <section class="demo-section">
-  <md-radio-button name="group1">Option 1</md-radio-button>
-  <md-radio-button name="group1">Option 2</md-radio-button>
-  <md-radio-button name="group1" disabled="true">Option 3 (disabled)</md-radio-button>
+  <mat-radio-button name="group1">Option 1</mat-radio-button>
+  <mat-radio-button name="group1">Option 2</mat-radio-button>
+  <mat-radio-button name="group1" disabled="true">Option 3 (disabled)</mat-radio-button>
 </section>
 
 <h1>Color Example</h1>
 <section class="demo-section">
-  <md-radio-button name="group2">Default (accent)</md-radio-button>
-  <md-radio-button name="group2" color="primary">Primary</md-radio-button>
-  <md-radio-button name="group2" color="accent">Accent</md-radio-button>
-  <md-radio-button name="group2" color="warn">Warn</md-radio-button>
+  <mat-radio-button name="group2">Default (accent)</mat-radio-button>
+  <mat-radio-button name="group2" color="primary">Primary</mat-radio-button>
+  <mat-radio-button name="group2" color="accent">Accent</mat-radio-button>
+  <mat-radio-button name="group2" color="warn">Warn</mat-radio-button>
 </section>
 
 <h1>Dynamic Example</h1>
 <section class="demo-section">
   <div>
     <span>isDisabled: {{isDisabled}}</span>
-    <button md-raised-button (click)="isDisabled=!isDisabled" class="demo-button">
+    <button mat-raised-button (click)="isDisabled=!isDisabled" class="demo-button">
       Disable buttons
     </button>
   </div>
   <div>
     <span>isRequired: {{isRequired}}</span>
-    <button md-raised-button (click)="isRequired=!isRequired" class="demo-button">
+    <button mat-raised-button (click)="isRequired=!isRequired" class="demo-button">
       Require buttons
     </button>
   </div>
   <div>
-    <span><md-checkbox [(ngModel)]="isAlignEnd">Align end</md-checkbox></span>
+    <span><mat-checkbox [(ngModel)]="isAlignEnd">Align end</mat-checkbox></span>
   </div>
-  <md-radio-group
+  <mat-radio-group
     name="my_options"
     [disabled]="isDisabled"
     [required]="isRequired"
     [align]="isAlignEnd ? 'end' : 'start'">
-    <md-radio-button value="option_1">Option 1</md-radio-button>
-    <md-radio-button value="option_2">Option 2</md-radio-button>
-    <md-radio-button value="option_3">Option 3</md-radio-button>
-  </md-radio-group>
+    <mat-radio-button value="option_1">Option 1</mat-radio-button>
+    <mat-radio-button value="option_2">Option 2</mat-radio-button>
+    <mat-radio-button value="option_3">Option 3</mat-radio-button>
+  </mat-radio-group>
 </section>
 <h1>Favorite Season Example</h1>
 <h2>Dynamic Example with two-way data-binding</h2>
 <section class="demo-section">
-  <md-radio-group name="more_options" [(ngModel)]="favoriteSeason">
-    <md-radio-button *ngFor="let season of seasonOptions" name="more_options" [value]="season">
+  <mat-radio-group name="more_options" [(ngModel)]="favoriteSeason">
+    <mat-radio-button *ngFor="let season of seasonOptions" name="more_options" [value]="season">
       {{season}}
-    </md-radio-button>
-  </md-radio-group>
+    </mat-radio-button>
+  </mat-radio-group>
   <p>Your favorite season is: {{favoriteSeason}}</p>
 </section>
diff --git a/src/demo-app/ripple/ripple-demo.html b/src/demo-app/ripple/ripple-demo.html
index 8517723177b3..98feef4e9d23 100644
--- a/src/demo-app/ripple/ripple-demo.html
+++ b/src/demo-app/ripple/ripple-demo.html
@@ -1,55 +1,55 @@
-<!-- Use <md-card>? -->
+<!-- Use <mat-card>? -->
 <div class="demo-ripple">
   <section>
-    <md-checkbox [(ngModel)]="disableButtonRipples">Disable button ripples</md-checkbox>
-    <button md-button [disableRipple]="disableButtonRipples">flat</button>
-    <button md-raised-button [disableRipple]="disableButtonRipples">raised</button>
-    <button md-fab [disableRipple]="disableButtonRipples">
-      <md-icon>check</md-icon>
+    <mat-checkbox [(ngModel)]="disableButtonRipples">Disable button ripples</mat-checkbox>
+    <button mat-button [disableRipple]="disableButtonRipples">flat</button>
+    <button mat-raised-button [disableRipple]="disableButtonRipples">raised</button>
+    <button mat-fab [disableRipple]="disableButtonRipples">
+      <mat-icon>check</mat-icon>
     </button>
-    <button md-mini-fab [disableRipple]="disableButtonRipples">
-      <md-icon>check</md-icon>
+    <button mat-mini-fab [disableRipple]="disableButtonRipples">
+      <mat-icon>check</mat-icon>
     </button>
   </section>
 
   <section>
-    <div class="demo-ripple-checkbox-option"><md-checkbox [(ngModel)]="centered">Centered</md-checkbox></div>
-    <div class="demo-ripple-checkbox-option"><md-checkbox [(ngModel)]="unbounded">Unbounded</md-checkbox></div>
-    <div class="demo-ripple-checkbox-option"><md-checkbox [(ngModel)]="disabled">Disabled</md-checkbox></div>
-    <div class="demo-ripple-checkbox-option"><md-checkbox [(ngModel)]="rounded">Rounded container (flaky in Firefox)</md-checkbox></div>
+    <div class="demo-ripple-checkbox-option"><mat-checkbox [(ngModel)]="centered">Centered</mat-checkbox></div>
+    <div class="demo-ripple-checkbox-option"><mat-checkbox [(ngModel)]="unbounded">Unbounded</mat-checkbox></div>
+    <div class="demo-ripple-checkbox-option"><mat-checkbox [(ngModel)]="disabled">Disabled</mat-checkbox></div>
+    <div class="demo-ripple-checkbox-option"><mat-checkbox [(ngModel)]="rounded">Rounded container (flaky in Firefox)</mat-checkbox></div>
   </section>
   <section>
     Speed
-    <md-radio-group [(ngModel)]="rippleSpeed">
-      <md-radio-button name="demo-ripple-options" value="0.4">Slow</md-radio-button>
-      <md-radio-button name="demo-ripple-options" value="1">Normal</md-radio-button>
-      <md-radio-button name="demo-ripple-options" value="2">Fast</md-radio-button>
-    </md-radio-group>
+    <mat-radio-group [(ngModel)]="rippleSpeed">
+      <mat-radio-button name="demo-ripple-options" value="0.4">Slow</mat-radio-button>
+      <mat-radio-button name="demo-ripple-options" value="1">Normal</mat-radio-button>
+      <mat-radio-button name="demo-ripple-options" value="2">Fast</mat-radio-button>
+    </mat-radio-group>
   </section>
   <section>
-    <md-form-field>
-      <input mdInput placeholder="Ripple radius" aria-label="radius" [(ngModel)]="radius">
-    </md-form-field>
-    <md-form-field>
-      <input mdInput placeholder="Ripple color" aria-label="color" [(ngModel)]="rippleColor">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Ripple radius" aria-label="radius" [(ngModel)]="radius">
+    </mat-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Ripple color" aria-label="color" [(ngModel)]="rippleColor">
+    </mat-form-field>
   </section>
   <section>
-    <button md-raised-button (click)="launchRipple()">Launch Ripple</button>
-    <button md-raised-button (click)="launchRipple(true)">Launch Ripple (Persistent)</button>
-    <button md-raised-button (click)="fadeOutAll()">Fade Out All</button>
+    <button mat-raised-button (click)="launchRipple()">Launch Ripple</button>
+    <button mat-raised-button (click)="launchRipple(true)">Launch Ripple (Persistent)</button>
+    <button mat-raised-button (click)="fadeOutAll()">Fade Out All</button>
   </section>
   <section>
     <div class="demo-ripple-container"
         [class.demo-ripple-disabled]="disabled"
         [class.demo-ripple-rounded]="rounded"
-        md-ripple
-        [mdRippleCentered]="centered"
-        [mdRippleDisabled]="disabled"
-        [mdRippleUnbounded]="unbounded"
-        [mdRippleRadius]="radius"
-        [mdRippleColor]="rippleColor"
-        [mdRippleSpeedFactor]="rippleSpeed">
+        mat-ripple
+        [matRippleCentered]="centered"
+        [matRippleDisabled]="disabled"
+        [matRippleUnbounded]="unbounded"
+        [matRippleRadius]="radius"
+        [matRippleColor]="rippleColor"
+        [matRippleSpeedFactor]="rippleSpeed">
       Click me
     </div>
   </section>
diff --git a/src/demo-app/ripple/ripple-demo.ts b/src/demo-app/ripple/ripple-demo.ts
index f75ce343f591..ec9a69b828e1 100644
--- a/src/demo-app/ripple/ripple-demo.ts
+++ b/src/demo-app/ripple/ripple-demo.ts
@@ -1,5 +1,5 @@
 import {Component, ViewChild} from '@angular/core';
-import {MdRipple} from '@angular/material';
+import {MatRipple} from '@angular/material';
 
 
 @Component({
@@ -9,7 +9,7 @@ import {MdRipple} from '@angular/material';
   styleUrls: ['ripple-demo.css'],
 })
 export class RippleDemo {
-  @ViewChild(MdRipple) ripple: MdRipple;
+  @ViewChild(MatRipple) ripple: MatRipple;
 
   centered = false;
   disabled = false;
diff --git a/src/demo-app/select/select-demo.html b/src/demo-app/select/select-demo.html
index c673924d5933..1ce8ef756f15 100644
--- a/src/demo-app/select/select-demo.html
+++ b/src/demo-app/select/select-demo.html
@@ -1,23 +1,23 @@
 Space above cards: <input type="number" [formControl]="topHeightCtrl">
-<button md-button (click)="showSelect=!showSelect">SHOW SELECT</button>
+<button mat-button (click)="showSelect=!showSelect">SHOW SELECT</button>
 <div [style.height.px]="topHeightCtrl.value"></div>
 
 <div class="demo-select">
-  <md-card>
-    <md-card-subtitle>ngModel</md-card-subtitle>
+  <mat-card>
+    <mat-card-subtitle>ngModel</mat-card-subtitle>
 
-    <md-form-field [floatPlaceholder]="floatPlaceholder" [color]="drinksTheme">
-      <md-select placeholder="Drink" [(ngModel)]="currentDrink" [required]="drinksRequired"
+    <mat-form-field [floatPlaceholder]="floatPlaceholder" [color]="drinksTheme">
+      <mat-select placeholder="Drink" [(ngModel)]="currentDrink" [required]="drinksRequired"
         [disabled]="drinksDisabled" #drinkControl="ngModel">
-        <md-option>None</md-option>
-        <md-option *ngFor="let drink of drinks" [value]="drink.value" [disabled]="drink.disabled">
+        <mat-option>None</mat-option>
+        <mat-option *ngFor="let drink of drinks" [value]="drink.value" [disabled]="drink.disabled">
           {{ drink.viewValue }}
-        </md-option>
-      </md-select>
-      <md-icon mdPrefix class="demo-drink-icon">local_drink</md-icon>
-      <md-hint>Pick a drink!</md-hint>
-      <md-error>You must make a selection</md-error>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+      <mat-icon matPrefix class="demo-drink-icon">local_drink</mat-icon>
+      <mat-hint>Pick a drink!</mat-hint>
+      <mat-error>You must make a selection</mat-error>
+    </mat-form-field>
     <p> Value: {{ currentDrink }} </p>
     <p> Touched: {{ drinkControl.touched }} </p>
     <p> Dirty: {{ drinkControl.dirty }} </p>
@@ -39,24 +39,24 @@
       </select>
     </p>
 
-    <button md-button (click)="currentDrink='water-2'">SET VALUE</button>
-    <button md-button (click)="drinksRequired=!drinksRequired">TOGGLE REQUIRED</button>
-    <button md-button (click)="drinksDisabled=!drinksDisabled">TOGGLE DISABLED</button>
-    <button md-button (click)="drinkControl.reset()">RESET</button>
-  </md-card>
+    <button mat-button (click)="currentDrink='water-2'">SET VALUE</button>
+    <button mat-button (click)="drinksRequired=!drinksRequired">TOGGLE REQUIRED</button>
+    <button mat-button (click)="drinksDisabled=!drinksDisabled">TOGGLE DISABLED</button>
+    <button mat-button (click)="drinkControl.reset()">RESET</button>
+  </mat-card>
 
-  <md-card>
-    <md-card-subtitle>Multiple selection</md-card-subtitle>
+  <mat-card>
+    <mat-card-subtitle>Multiple selection</mat-card-subtitle>
 
-    <md-card-content>
-      <md-form-field [color]="pokemonTheme">
-        <md-select multiple placeholder="Pokemon" [(ngModel)]="currentPokemon"
+    <mat-card-content>
+      <mat-form-field [color]="pokemonTheme">
+        <mat-select multiple placeholder="Pokemon" [(ngModel)]="currentPokemon"
           [required]="pokemonRequired" [disabled]="pokemonDisabled" #pokemonControl="ngModel">
-          <md-option *ngFor="let creature of pokemon" [value]="creature.value">
+          <mat-option *ngFor="let creature of pokemon" [value]="creature.value">
             {{ creature.viewValue }}
-          </md-option>
-        </md-select>
-      </md-form-field>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
       <p> Value: {{ currentPokemon }} </p>
       <p> Touched: {{ pokemonControl.touched }} </p>
       <p> Dirty: {{ pokemonControl.dirty }} </p>
@@ -67,114 +67,114 @@
           <option *ngFor="let theme of availableThemes" [value]="theme.value">{{ theme.name }}</option>
         </select>
       </p>
-      <button md-button (click)="setPokemonValue()">SET VALUE</button>
-      <button md-button (click)="pokemonRequired=!pokemonRequired">TOGGLE REQUIRED</button>
-      <button md-button (click)="pokemonDisabled=!pokemonDisabled">TOGGLE DISABLED</button>
-      <button md-button (click)="pokemonControl.reset()">RESET</button>
-    </md-card-content>
-  </md-card>
-
-  <md-card>
-    <md-card-subtitle>Without Angular forms</md-card-subtitle>
-
-    <md-form-field>
-      <md-select placeholder="Digimon" [(value)]="currentDigimon">
-        <md-option>None</md-option>
-        <md-option *ngFor="let creature of digimon" [value]="creature.value">
+      <button mat-button (click)="setPokemonValue()">SET VALUE</button>
+      <button mat-button (click)="pokemonRequired=!pokemonRequired">TOGGLE REQUIRED</button>
+      <button mat-button (click)="pokemonDisabled=!pokemonDisabled">TOGGLE DISABLED</button>
+      <button mat-button (click)="pokemonControl.reset()">RESET</button>
+    </mat-card-content>
+  </mat-card>
+
+  <mat-card>
+    <mat-card-subtitle>Without Angular forms</mat-card-subtitle>
+
+    <mat-form-field>
+      <mat-select placeholder="Digimon" [(value)]="currentDigimon">
+        <mat-option>None</mat-option>
+        <mat-option *ngFor="let creature of digimon" [value]="creature.value">
           {{ creature.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
 
     <p>Value: {{ currentDigimon }}</p>
 
-    <button md-button (click)="currentDigimon='pajiramon-3'">SET VALUE</button>
-    <button md-button (click)="currentDigimon=null">RESET</button>
-  </md-card>
+    <button mat-button (click)="currentDigimon='pajiramon-3'">SET VALUE</button>
+    <button mat-button (click)="currentDigimon=null">RESET</button>
+  </mat-card>
 
-  <md-card>
-    <md-card-subtitle>Option groups</md-card-subtitle>
+  <mat-card>
+    <mat-card-subtitle>Option groups</mat-card-subtitle>
 
-    <md-card-content>
-      <md-form-field>
-        <md-select placeholder="Pokemon" [(ngModel)]="currentPokemonFromGroup">
-          <md-optgroup *ngFor="let group of pokemonGroups" [label]="group.name"
+    <mat-card-content>
+      <mat-form-field>
+        <mat-select placeholder="Pokemon" [(ngModel)]="currentPokemonFromGroup">
+          <mat-optgroup *ngFor="let group of pokemonGroups" [label]="group.name"
             [disabled]="group.disabled">
-            <md-option *ngFor="let creature of group.pokemon" [value]="creature.value">
+            <mat-option *ngFor="let creature of group.pokemon" [value]="creature.value">
               {{ creature.viewValue }}
-            </md-option>
-          </md-optgroup>
-        </md-select>
-      </md-form-field>
-    </md-card-content>
-  </md-card>
-
-
-  <md-card>
-    <md-card-subtitle>compareWith</md-card-subtitle>
-    <md-card-content>
-      <md-form-field [color]="drinksTheme">
-        <md-select placeholder="Drink"
+            </mat-option>
+          </mat-optgroup>
+        </mat-select>
+      </mat-form-field>
+    </mat-card-content>
+  </mat-card>
+
+
+  <mat-card>
+    <mat-card-subtitle>compareWith</mat-card-subtitle>
+    <mat-card-content>
+      <mat-form-field [color]="drinksTheme">
+        <mat-select placeholder="Drink"
                    [(ngModel)]="currentDrinkObject"
                    [required]="drinkObjectRequired"
                    [compareWith]="compareByValue ? compareDrinkObjectsByValue : compareByReference"
                    #drinkObjectControl="ngModel">
-          <md-option *ngFor="let drink of drinks" [value]="drink" [disabled]="drink.disabled">
+          <mat-option *ngFor="let drink of drinks" [value]="drink" [disabled]="drink.disabled">
             {{ drink.viewValue }}
-          </md-option>
-        </md-select>
-      </md-form-field>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
       <p> Value: {{ currentDrinkObject | json }} </p>
       <p> Touched: {{ drinkObjectControl.touched }} </p>
       <p> Dirty: {{ drinkObjectControl.dirty }} </p>
       <p> Status: {{ drinkObjectControl.control?.status }} </p>
       <p> Comparison Mode: {{ compareByValue ? 'VALUE' : 'REFERENCE' }} </p>
 
-      <button md-button (click)="reassignDrinkByCopy()"
-              mdTooltip="This action should clear the display value when comparing by reference.">
+      <button mat-button (click)="reassignDrinkByCopy()"
+              matTooltip="This action should clear the display value when comparing by reference.">
         REASSIGN DRINK BY COPY
       </button>
-      <button md-button (click)="drinkObjectRequired=!drinkObjectRequired">TOGGLE REQUIRED</button>
-      <button md-button (click)="compareByValue=!compareByValue">TOGGLE COMPARE BY VALUE</button>
-      <button md-button (click)="drinkObjectControl.reset()">RESET</button>
-    </md-card-content>
-  </md-card>
+      <button mat-button (click)="drinkObjectRequired=!drinkObjectRequired">TOGGLE REQUIRED</button>
+      <button mat-button (click)="compareByValue=!compareByValue">TOGGLE COMPARE BY VALUE</button>
+      <button mat-button (click)="drinkObjectControl.reset()">RESET</button>
+    </mat-card-content>
+  </mat-card>
 
   <div *ngIf="showSelect">
-    <md-card>
-      <md-card-subtitle>formControl</md-card-subtitle>
-
-      <md-card-content>
-        <md-form-field>
-          <md-select placeholder="Food i would like to eat" [formControl]="foodControl">
-            <md-option *ngFor="let food of foods" [value]="food.value"> {{ food.viewValue }}</md-option>
-          </md-select>
-        </md-form-field>
+    <mat-card>
+      <mat-card-subtitle>formControl</mat-card-subtitle>
+
+      <mat-card-content>
+        <mat-form-field>
+          <mat-select placeholder="Food i would like to eat" [formControl]="foodControl">
+            <mat-option *ngFor="let food of foods" [value]="food.value"> {{ food.viewValue }}</mat-option>
+          </mat-select>
+        </mat-form-field>
         <p> Value: {{ foodControl.value }} </p>
         <p> Touched: {{ foodControl.touched }} </p>
         <p> Dirty: {{ foodControl.dirty }} </p>
         <p> Status: {{ foodControl.status }} </p>
-        <button md-button (click)="foodControl.setValue('pizza-1')">SET VALUE</button>
-        <button md-button (click)="toggleDisabled()">TOGGLE DISABLED</button>
-        <button md-button (click)="foodControl.reset()">RESET</button>
-      </md-card-content>
-    </md-card>
+        <button mat-button (click)="foodControl.setValue('pizza-1')">SET VALUE</button>
+        <button mat-button (click)="toggleDisabled()">TOGGLE DISABLED</button>
+        <button mat-button (click)="foodControl.reset()">RESET</button>
+      </mat-card-content>
+    </mat-card>
   </div>
 
   <div *ngIf="showSelect">
-    <md-card>
-      <md-card-subtitle>Change event</md-card-subtitle>
+    <mat-card>
+      <mat-card-subtitle>Change event</mat-card-subtitle>
 
-      <md-card-content>
-        <md-form-field>
-          <md-select placeholder="Starter Pokemon" (change)="latestChangeEvent = $event">
-            <md-option *ngFor="let creature of pokemon" [value]="creature.value">{{ creature.viewValue }}</md-option>
-          </md-select>
-        </md-form-field>
+      <mat-card-content>
+        <mat-form-field>
+          <mat-select placeholder="Starter Pokemon" (change)="latestChangeEvent = $event">
+            <mat-option *ngFor="let creature of pokemon" [value]="creature.value">{{ creature.viewValue }}</mat-option>
+          </mat-select>
+        </mat-form-field>
 
         <p> Change event value: {{ latestChangeEvent?.value }} </p>
-      </md-card-content>
-    </md-card>
+      </mat-card-content>
+    </mat-card>
   </div>
 
 </div>
diff --git a/src/demo-app/select/select-demo.ts b/src/demo-app/select/select-demo.ts
index 48490643dbdf..1967e60f7c43 100644
--- a/src/demo-app/select/select-demo.ts
+++ b/src/demo-app/select/select-demo.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {FormControl} from '@angular/forms';
-import {MdSelectChange} from '@angular/material';
+import {MatSelectChange} from '@angular/material';
 
 @Component({
     moduleId: module.id,
@@ -20,7 +20,7 @@ export class SelectDemo {
   currentPokemon: string[];
   currentPokemonFromGroup: string;
   currentDigimon: string;
-  latestChangeEvent: MdSelectChange;
+  latestChangeEvent: MatSelectChange;
   floatPlaceholder: string = 'auto';
   foodControl = new FormControl('pizza-1');
   topHeightCtrl = new FormControl(0);
diff --git a/src/demo-app/sidenav/sidenav-demo.html b/src/demo-app/sidenav/sidenav-demo.html
index fdc13d483172..3603f87421aa 100644
--- a/src/demo-app/sidenav/sidenav-demo.html
+++ b/src/demo-app/sidenav/sidenav-demo.html
@@ -1,60 +1,60 @@
-<button md-raised-button (click)="isLaunched = true" *ngIf="!isLaunched" color="primary">
+<button mat-raised-button (click)="isLaunched = true" *ngIf="!isLaunched" color="primary">
   Launch Fullscreen Sidenav Demo
 </button>
 
 <div class="demo-sidenav-area" *ngIf="isLaunched">
-  <md-toolbar *ngIf="showHeader && !coverHeader">Header</md-toolbar>
-  <md-sidenav-container>
-    <md-sidenav #start (open)="myinput.focus()" [mode]="mode"
+  <mat-toolbar *ngIf="showHeader && !coverHeader">Header</mat-toolbar>
+  <mat-sidenav-container>
+    <mat-sidenav #start (open)="myinput.focus()" [mode]="mode"
                 [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       Start Side Sidenav
       <br>
-      <button md-button (click)="start.close()">Close</button>
+      <button mat-button (click)="start.close()">Close</button>
       <br>
-      <button md-button (click)="end.open()">Open End Side</button>
+      <button mat-button (click)="end.open()">Open End Side</button>
       <br>
-      <button md-button (click)="modeIndex = (modeIndex + 1) % 3">Toggle Mode</button>
+      <button mat-button (click)="modeIndex = (modeIndex + 1) % 3">Toggle Mode</button>
       <div>Mode: {{start.mode}}</div>
       <br>
       <input #myinput>
       <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
-    </md-sidenav>
+    </mat-sidenav>
 
-    <md-sidenav #end position="end"
+    <mat-sidenav #end position="end"
                 [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       End Side Sidenav
       <br>
-      <button md-button (click)="end.close()">Close</button>
+      <button mat-button (click)="end.close()">Close</button>
       <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
-    </md-sidenav>
+    </mat-sidenav>
 
-    <md-sidenav-content>
-      <md-toolbar *ngIf="showHeader && coverHeader">Header</md-toolbar>
+    <mat-sidenav-content>
+      <mat-toolbar *ngIf="showHeader && coverHeader">Header</mat-toolbar>
       <div class="demo-sidenav-content">
         <div>
-          <button md-raised-button (click)="isLaunched = false">
+          <button mat-raised-button (click)="isLaunched = false">
             Exit Fullscreen Sidenav Demo
           </button>
         </div>
 
         <div>
           <h3>Sidenav</h3>
-          <button md-button (click)="start.toggle()">Toggle Start Side Sidenav</button>
-          <button md-button (click)="end.toggle()">Toggle End Side Sidenav</button>
-          <md-checkbox [(ngModel)]="fixed">Fixed mode</md-checkbox>
-          <md-checkbox [(ngModel)]="coverHeader">Sidenav covers header/footer</md-checkbox>
+          <button mat-button (click)="start.toggle()">Toggle Start Side Sidenav</button>
+          <button mat-button (click)="end.toggle()">Toggle End Side Sidenav</button>
+          <mat-checkbox [(ngModel)]="fixed">Fixed mode</mat-checkbox>
+          <mat-checkbox [(ngModel)]="coverHeader">Sidenav covers header/footer</mat-checkbox>
         </div>
 
         <div>
           <h3>Header / Footer</h3>
-          <md-checkbox [(ngModel)]="showHeader">Show header</md-checkbox>
-          <md-checkbox [(ngModel)]="showFooter">Show footer</md-checkbox>
+          <mat-checkbox [(ngModel)]="showHeader">Show header</mat-checkbox>
+          <mat-checkbox [(ngModel)]="showFooter">Show footer</mat-checkbox>
         </div>
 
         <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
       </div>
-      <md-toolbar *ngIf="showFooter && coverHeader">Footer</md-toolbar>
-    </md-sidenav-content>
-  </md-sidenav-container>
-  <md-toolbar *ngIf="showFooter && !coverHeader">Footer</md-toolbar>
+      <mat-toolbar *ngIf="showFooter && coverHeader">Footer</mat-toolbar>
+    </mat-sidenav-content>
+  </mat-sidenav-container>
+  <mat-toolbar *ngIf="showFooter && !coverHeader">Footer</mat-toolbar>
 </div>
diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.html b/src/demo-app/slide-toggle/slide-toggle-demo.html
index 7338520a84b8..9239217593a9 100644
--- a/src/demo-app/slide-toggle/slide-toggle-demo.html
+++ b/src/demo-app/slide-toggle/slide-toggle-demo.html
@@ -1,27 +1,27 @@
 <div class="slide-toggle-example">
 
-  <md-slide-toggle color="primary" [(ngModel)]="firstToggle">
+  <mat-slide-toggle color="primary" [(ngModel)]="firstToggle">
     Default Slide Toggle
-  </md-slide-toggle>
+  </mat-slide-toggle>
 
-  <md-slide-toggle [(ngModel)]="firstToggle" disabled>
+  <mat-slide-toggle [(ngModel)]="firstToggle" disabled>
     Disabled Slide Toggle
-  </md-slide-toggle>
+  </mat-slide-toggle>
 
-  <md-slide-toggle [disabled]="firstToggle">
+  <mat-slide-toggle [disabled]="firstToggle">
     Disable Bound
-  </md-slide-toggle>
+  </mat-slide-toggle>
 
   <p>Example where the slide toggle is required inside of a form.</p>
 
   <form #form="ngForm" (ngSubmit)="onFormSubmit()" ngNativeValidate>
 
-    <md-slide-toggle name="slideToggle" required ngModel>
+    <mat-slide-toggle name="slideToggle" required ngModel>
       Slide Toggle
-    </md-slide-toggle>
+    </mat-slide-toggle>
 
     <p>
-      <button md-raised-button type="submit">Submit Form</button>
+      <button mat-raised-button type="submit">Submit Form</button>
     </p>
 
   </form>
diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.scss b/src/demo-app/slide-toggle/slide-toggle-demo.scss
index a7429af3ff56..a178e139b106 100644
--- a/src/demo-app/slide-toggle/slide-toggle-demo.scss
+++ b/src/demo-app/slide-toggle/slide-toggle-demo.scss
@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: flex-start;
 
-  md-slide-toggle {
+  mat-slide-toggle {
     margin: 6px 0;
   }
 }
diff --git a/src/demo-app/slider/slider-demo.html b/src/demo-app/slider/slider-demo.html
index 2641eae973a1..624cbd78b3f2 100644
--- a/src/demo-app/slider/slider-demo.html
+++ b/src/demo-app/slider/slider-demo.html
@@ -1,60 +1,60 @@
 <h1>Default Slider</h1>
-Label <md-slider #slidey aria-label="Basic slider"></md-slider>
+Label <mat-slider #slidey aria-label="Basic slider"></mat-slider>
 {{slidey.value}}
 
 <h1>Colors</h1>
-<md-slider color="primary" value="50" thumbLabel aria-label="Primary color slider"></md-slider>
-<md-slider color="accent" value="50" thumbLabel aria-label="Accent color slider"></md-slider>
-<md-slider color="warn" value="50" thumbLabel aria-label="Warn color slider"></md-slider>
+<mat-slider color="primary" value="50" thumbLabel aria-label="Primary color slider"></mat-slider>
+<mat-slider color="accent" value="50" thumbLabel aria-label="Accent color slider"></mat-slider>
+<mat-slider color="warn" value="50" thumbLabel aria-label="Warn color slider"></mat-slider>
 
 <h1>Slider with Min and Max</h1>
 <input [(ngModel)]="min" type="number">
-<md-slider [min]="min" [max]="max" tickInterval="5" #slider2 aria-label="Min & max slider">
-</md-slider>
+<mat-slider [min]="min" [max]="max" tickInterval="5" #slider2 aria-label="Min & max slider">
+</mat-slider>
 {{slider2.value}}
 <input [(ngModel)]="max" type="number">
 
 <h1>Disabled Slider</h1>
-<md-slider disabled [(ngModel)]="disabledValue" [tickInterval]="1" aria-label="Disabled slider">
-</md-slider>
+<mat-slider disabled [(ngModel)]="disabledValue" [tickInterval]="1" aria-label="Disabled slider">
+</mat-slider>
 <input [(ngModel)]="disabledValue" type="number">
 
 <h1>Slider with set value</h1>
-<md-slider value="43" aria-label="Initial value slider"></md-slider>
+<mat-slider value="43" aria-label="Initial value slider"></mat-slider>
 
 <h1>Slider with step defined</h1>
-<md-slider min="1" max="100" step="20" #slider5 aria-label="Slider with step"></md-slider>
+<mat-slider min="1" max="100" step="20" #slider5 aria-label="Slider with step"></mat-slider>
 {{slider5.value}}
 
 <h1>Slider with set tick interval</h1>
-<md-slider tickInterval="auto" aria-label="Slider with auto ticks"></md-slider>
-<md-slider tickInterval="9" aria-label="Slider with ticks"></md-slider>
+<mat-slider tickInterval="auto" aria-label="Slider with auto ticks"></mat-slider>
+<mat-slider tickInterval="9" aria-label="Slider with ticks"></mat-slider>
 
 <h1>Slider with Thumb Label</h1>
-<md-slider thumbLabel aria-label="Slider with thumb label"></md-slider>
+<mat-slider thumbLabel aria-label="Slider with thumb label"></mat-slider>
 
 <h1>Slider with one-way binding</h1>
-<md-slider [value]="val" step="40" aria-label="Slider with value binding"></md-slider>
+<mat-slider [value]="val" step="40" aria-label="Slider with value binding"></mat-slider>
 <input [(ngModel)]="val" type="number">
 
 <h1>Slider with two-way binding</h1>
-<md-slider [(ngModel)]="demo" step="40" aria-label="Slider with ngModel"></md-slider>
+<mat-slider [(ngModel)]="demo" step="40" aria-label="Slider with ngModel"></mat-slider>
 <input [(ngModel)]="demo" type="number">
 
 <h1>Inverted slider</h1>
-<md-slider invert value="50" tickInterval="5" aria-label="Inverted slider"></md-slider>
+<mat-slider invert value="50" tickInterval="5" aria-label="Inverted slider"></mat-slider>
 
 <h1>Vertical slider</h1>
-<md-slider vertical thumbLabel tickInterval="auto" value="50" aria-label="Vertical slider">
-</md-slider>
+<mat-slider vertical thumbLabel tickInterval="auto" value="50" aria-label="Vertical slider">
+</mat-slider>
 
 <h1>Inverted vertical slider</h1>
-<md-slider vertical invert thumbLabel tickInterval="auto" value="50"
+<mat-slider vertical invert thumbLabel tickInterval="auto" value="50"
            aria-label="Inverted vertical slider">
-</md-slider>
+</mat-slider>
 
-<md-tab-group>
-  <md-tab label="One">
-    <md-slider min="1" max="5" value="3" aria-label="Slider in a tab"></md-slider>
-  </md-tab>
-</md-tab-group>
+<mat-tab-group>
+  <mat-tab label="One">
+    <mat-slider min="1" max="5" value="3" aria-label="Slider in a tab"></mat-slider>
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/demo-app/snack-bar/snack-bar-demo.html b/src/demo-app/snack-bar/snack-bar-demo.html
index c2f8171c1cc4..1bdb4819e7aa 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.html
+++ b/src/demo-app/snack-bar/snack-bar-demo.html
@@ -1,53 +1,53 @@
 <h1>SnackBar demo</h1>
 <div>
   <div>
-    Message: <md-form-field><input mdInput type="text" [(ngModel)]="message"></md-form-field>
+    Message: <mat-form-field><input matInput type="text" [(ngModel)]="message"></mat-form-field>
   </div>
   <div>
     <div>Position in page: </div>
-    <md-form-field>
-      <md-select [(ngModel)]="horizontalPosition">
-        <md-option value="start">Start</md-option>
-        <md-option value="end">End</md-option>
-        <md-option value="left">Left</md-option>
-        <md-option value="right">Right</md-option>
-        <md-option value="center">Center</md-option>
-      </md-select>
-    </md-form-field>
-    <md-form-field>
-      <md-select [(ngModel)]="verticalPosition">
-        <md-option value="top">Top</md-option>
-        <md-option value="bottom">Bottom</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select [(ngModel)]="horizontalPosition">
+        <mat-option value="start">Start</mat-option>
+        <mat-option value="end">End</mat-option>
+        <mat-option value="left">Left</mat-option>
+        <mat-option value="right">Right</mat-option>
+        <mat-option value="center">Center</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-select [(ngModel)]="verticalPosition">
+        <mat-option value="top">Top</mat-option>
+        <mat-option value="bottom">Bottom</mat-option>
+      </mat-select>
+    </mat-form-field>
   </div>
   <div>
-    <md-checkbox [(ngModel)]="action">
+    <mat-checkbox [(ngModel)]="action">
       <p *ngIf="!action">Show button on snack bar</p>
-      <md-form-field *ngIf="action">
-        <input mdInput
+      <mat-form-field *ngIf="action">
+        <input matInput
                type="text"
                class="demo-button-label-input"
                placeholder="Snack bar action label"
                [(ngModel)]="actionButtonLabel">
-      </md-form-field>
-    </md-checkbox>
+      </mat-form-field>
+    </mat-checkbox>
   </div>
   <div>
-    <md-checkbox [(ngModel)]="setAutoHide">
+    <mat-checkbox [(ngModel)]="setAutoHide">
       <p *ngIf="!setAutoHide">Auto hide after duration</p>
-      <md-form-field *ngIf="setAutoHide">
-        <input mdInput
+      <mat-form-field *ngIf="setAutoHide">
+        <input matInput
                type="number"
                class="demo-button-label-input"
                placeholder="Auto Hide Duration in ms"
                [(ngModel)]="autoHide">
-      </md-form-field>
-    </md-checkbox>
+      </mat-form-field>
+    </mat-checkbox>
   </div>
   <p>
-    <md-checkbox [(ngModel)]="addExtraClass">Add extra class to container</md-checkbox>
+    <mat-checkbox [(ngModel)]="addExtraClass">Add extra class to container</mat-checkbox>
   </p>
 </div>
 
-<button md-raised-button (click)="open()">OPEN</button>
+<button mat-raised-button (click)="open()">OPEN</button>
diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 334959021f81..94bffbcc0acf 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -1,10 +1,10 @@
 import {Dir} from '@angular/cdk/bidi';
 import {Component, ViewEncapsulation} from '@angular/core';
 import {
-  MdSnackBar,
-  MdSnackBarConfig,
-  MdSnackBarHorizontalPosition,
-  MdSnackBarVerticalPosition,
+  MatSnackBar,
+  MatSnackBarConfig,
+  MatSnackBarHorizontalPosition,
+  MatSnackBarVerticalPosition,
 } from '@angular/material';
 
 
@@ -23,14 +23,14 @@ export class SnackBarDemo {
   setAutoHide: boolean = true;
   autoHide: number = 10000;
   addExtraClass: boolean = false;
-  horizontalPosition: MdSnackBarHorizontalPosition = 'center';
-  verticalPosition: MdSnackBarVerticalPosition = 'bottom';
+  horizontalPosition: MatSnackBarHorizontalPosition = 'center';
+  verticalPosition: MatSnackBarVerticalPosition = 'bottom';
 
-  constructor(public snackBar: MdSnackBar, private dir: Dir) {
+  constructor(public snackBar: MatSnackBar, private dir: Dir) {
   }
 
   open() {
-    let config = new MdSnackBarConfig();
+    let config = new MatSnackBarConfig();
     config.verticalPosition = this.verticalPosition;
     config.horizontalPosition = this.horizontalPosition;
     config.duration = this.autoHide;
diff --git a/src/demo-app/stepper/stepper-demo.html b/src/demo-app/stepper/stepper-demo.html
index 11cda6eaea19..61d8cd9cde99 100644
--- a/src/demo-app/stepper/stepper-demo.html
+++ b/src/demo-app/stepper/stepper-demo.html
@@ -1,197 +1,197 @@
-<md-checkbox [(ngModel)]="isNonLinear">Disable linear mode</md-checkbox>
+<mat-checkbox [(ngModel)]="isNonLinear">Disable linear mode</mat-checkbox>
 
 <h3>Linear Vertical Stepper Demo using a single form</h3>
 <form [formGroup]="formGroup">
-  <md-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
-    <md-step formGroupName="0" [stepControl]="formArray?.get([0])">
-      <ng-template mdStepLabel>Fill out your name</ng-template>
-      <md-input-container>
-        <input mdInput placeholder="First Name" formControlName="firstNameFormCtrl" required>
-        <md-error>This field is required</md-error>
-      </md-input-container>
-
-      <md-input-container>
-        <input mdInput placeholder="Last Name" formControlName="lastNameFormCtrl" required>
-        <md-error>This field is required</md-error>
-      </md-input-container>
+  <mat-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
+    <mat-step formGroupName="0" [stepControl]="formArray?.get([0])">
+      <ng-template matStepLabel>Fill out your name</ng-template>
+      <mat-input-container>
+        <input matInput placeholder="First Name" formControlName="firstNameFormCtrl" required>
+        <mat-error>This field is required</mat-error>
+      </mat-input-container>
+
+      <mat-input-container>
+        <input matInput placeholder="Last Name" formControlName="lastNameFormCtrl" required>
+        <mat-error>This field is required</mat-error>
+      </mat-input-container>
       <div>
-        <button md-button mdStepperNext type="button">Next</button>
+        <button mat-button matStepperNext type="button">Next</button>
       </div>
-    </md-step>
+    </mat-step>
 
-    <md-step formGroupName="1" [stepControl]="formArray?.get([1])" optional>
-      <ng-template mdStepLabel>
+    <mat-step formGroupName="1" [stepControl]="formArray?.get([1])" optional>
+      <ng-template matStepLabel>
         <div>Fill out your email address</div>
       </ng-template>
-      <md-input-container>
-        <input mdInput placeholder="Email address" formControlName="emailFormCtrl">
-        <md-error>The input is invalid.</md-error>
-      </md-input-container>
+      <mat-input-container>
+        <input matInput placeholder="Email address" formControlName="emailFormCtrl">
+        <mat-error>The input is invalid.</mat-error>
+      </mat-input-container>
       <div>
-        <button md-button mdStepperPrevious type="button">Back</button>
-        <button md-button mdStepperNext type="button">Next</button>
+        <button mat-button matStepperPrevious type="button">Back</button>
+        <button mat-button matStepperNext type="button">Next</button>
       </div>
-    </md-step>
+    </mat-step>
 
-    <md-step>
-      <ng-template mdStepLabel>Confirm your information</ng-template>
+    <mat-step>
+      <ng-template matStepLabel>Confirm your information</ng-template>
       Everything seems correct.
       <div>
-        <button md-button>Done</button>
+        <button mat-button>Done</button>
       </div>
-    </md-step>
-  </md-vertical-stepper>
+    </mat-step>
+  </mat-vertical-stepper>
 </form>
 
 <h3>Linear Horizontal Stepper Demo using a different form for each step</h3>
-<md-horizontal-stepper [linear]="!isNonLinear">
-  <md-step [stepControl]="nameFormGroup">
+<mat-horizontal-stepper [linear]="!isNonLinear">
+  <mat-step [stepControl]="nameFormGroup">
     <form [formGroup]="nameFormGroup">
-      <ng-template mdStepLabel>Fill out your name</ng-template>
-      <md-form-field>
-        <input mdInput placeholder="First Name" formControlName="firstNameCtrl" required>
-        <md-error>This field is required</md-error>
-      </md-form-field>
-      <md-form-field>
-        <input mdInput placeholder="Last Name" formControlName="lastNameCtrl" required>
-        <md-error>This field is required</md-error>
-      </md-form-field>
+      <ng-template matStepLabel>Fill out your name</ng-template>
+      <mat-form-field>
+        <input matInput placeholder="First Name" formControlName="firstNameCtrl" required>
+        <mat-error>This field is required</mat-error>
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput placeholder="Last Name" formControlName="lastNameCtrl" required>
+        <mat-error>This field is required</mat-error>
+      </mat-form-field>
       <div>
-        <button md-button mdStepperNext>Next</button>
+        <button mat-button matStepperNext>Next</button>
       </div>
     </form>
-  </md-step>
+  </mat-step>
 
-  <md-step [stepControl]="emailFormGroup" optional>
+  <mat-step [stepControl]="emailFormGroup" optional>
     <form [formGroup]="emailFormGroup">
-      <ng-template mdStepLabel>Fill out your email address</ng-template>
-      <md-form-field>
-        <input mdInput placeholder="Email address" formControlName="emailCtrl">
-        <md-error>The input is invalid</md-error>
-      </md-form-field>
+      <ng-template matStepLabel>Fill out your email address</ng-template>
+      <mat-form-field>
+        <input matInput placeholder="Email address" formControlName="emailCtrl">
+        <mat-error>The input is invalid</mat-error>
+      </mat-form-field>
       <div>
-        <button md-button mdStepperPrevious>Back</button>
-        <button md-button mdStepperNext>Next</button>
+        <button mat-button matStepperPrevious>Back</button>
+        <button mat-button matStepperNext>Next</button>
       </div>
     </form>
-  </md-step>
+  </mat-step>
 
-  <md-step>
+  <mat-step>
     <form>
-      <ng-template mdStepLabel>Confirm your information</ng-template>
+      <ng-template matStepLabel>Confirm your information</ng-template>
       Everything seems correct.
       <div>
-        <button md-button>Done</button>
+        <button mat-button>Done</button>
       </div>
     </form>
-  </md-step>
-</md-horizontal-stepper>
+  </mat-step>
+</mat-horizontal-stepper>
 
 <h3>Vertical Stepper Demo</h3>
-<md-checkbox [(ngModel)]="isNonEditable">Make steps non-editable</md-checkbox>
-<md-vertical-stepper>
-  <md-step [editable]="!isNonEditable">
-    <ng-template mdStepLabel>Fill out your name</ng-template>
-    <md-form-field>
-      <input mdInput placeholder="First Name">
-    </md-form-field>
-
-    <md-form-field>
-      <input mdInput placeholder="Last Name">
-    </md-form-field>
+<mat-checkbox [(ngModel)]="isNonEditable">Make steps non-editable</mat-checkbox>
+<mat-vertical-stepper>
+  <mat-step [editable]="!isNonEditable">
+    <ng-template matStepLabel>Fill out your name</ng-template>
+    <mat-form-field>
+      <input matInput placeholder="First Name">
+    </mat-form-field>
+
+    <mat-form-field>
+      <input matInput placeholder="Last Name">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperNext type="button">Next</button>
+      <button mat-button matStepperNext type="button">Next</button>
     </div>
-  </md-step>
+  </mat-step>
 
-  <md-step [editable]="!isNonEditable">
-    <ng-template mdStepLabel>
+  <mat-step [editable]="!isNonEditable">
+    <ng-template matStepLabel>
       <div>Fill out your phone number</div>
     </ng-template>
-    <md-form-field>
-      <input mdInput placeholder="Phone number">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Phone number">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperPrevious type="button">Back</button>
-      <button md-button mdStepperNext type="button">Next</button>
+      <button mat-button matStepperPrevious type="button">Back</button>
+      <button mat-button matStepperNext type="button">Next</button>
     </div>
-  </md-step>
+  </mat-step>
 
-  <md-step [editable]="!isNonEditable">
-    <ng-template mdStepLabel>
+  <mat-step [editable]="!isNonEditable">
+    <ng-template matStepLabel>
       <div>Fill out your address</div>
     </ng-template>
-    <md-form-field>
-      <input mdInput placeholder="Address">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Address">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperPrevious type="button">Back</button>
-      <button md-button mdStepperNext type="button">Next</button>
+      <button mat-button matStepperPrevious type="button">Back</button>
+      <button mat-button matStepperNext type="button">Next</button>
     </div>
-  </md-step>
+  </mat-step>
 
-  <md-step>
-    <ng-template mdStepLabel>Confirm your information</ng-template>
+  <mat-step>
+    <ng-template matStepLabel>Confirm your information</ng-template>
     Everything seems correct.
     <div>
-      <button md-button>Done</button>
+      <button mat-button>Done</button>
     </div>
-  </md-step>
-</md-vertical-stepper>
+  </mat-step>
+</mat-vertical-stepper>
 
 <h3>Horizontal Stepper Demo with Text Label</h3>
-<md-horizontal-stepper>
-  <md-step label="Fill out your name">
-    <md-form-field>
-      <input mdInput placeholder="First Name">
-    </md-form-field>
-
-    <md-form-field>
-      <input mdInput placeholder="Last Name">
-    </md-form-field>
+<mat-horizontal-stepper>
+  <mat-step label="Fill out your name">
+    <mat-form-field>
+      <input matInput placeholder="First Name">
+    </mat-form-field>
+
+    <mat-form-field>
+      <input matInput placeholder="Last Name">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperNext type="button">Next</button>
+      <button mat-button matStepperNext type="button">Next</button>
     </div>
-  </md-step>
+  </mat-step>
 
-  <md-step label="Fill out your phone number">
-    <md-form-field>
-      <input mdInput placeholder="Phone number">
-    </md-form-field>
+  <mat-step label="Fill out your phone number">
+    <mat-form-field>
+      <input matInput placeholder="Phone number">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperPrevious type="button">Back</button>
-      <button md-button mdStepperNext type="button">Next</button>
+      <button mat-button matStepperPrevious type="button">Back</button>
+      <button mat-button matStepperNext type="button">Next</button>
     </div>
-  </md-step>
+  </mat-step>
 
-  <md-step label="Fill out your address">
-    <md-form-field>
-      <input mdInput placeholder="Address">
-    </md-form-field>
+  <mat-step label="Fill out your address">
+    <mat-form-field>
+      <input matInput placeholder="Address">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperPrevious type="button">Back</button>
-      <button md-button mdStepperNext type="button">Next</button>
+      <button mat-button matStepperPrevious type="button">Back</button>
+      <button mat-button matStepperNext type="button">Next</button>
     </div>
-  </md-step>
+  </mat-step>
 
-  <md-step label="Confirm your information">
+  <mat-step label="Confirm your information">
     Everything seems correct.
     <div>
-      <button md-button>Done</button>
+      <button mat-button>Done</button>
     </div>
-  </md-step>
-</md-horizontal-stepper>
+  </mat-step>
+</mat-horizontal-stepper>
 
 <h3>Horizontal Stepper Demo with Templated Label</h3>
-<md-horizontal-stepper>
-  <md-step *ngFor="let step of steps">
-    <ng-template mdStepLabel>{{step.label}}</ng-template>
-    <md-form-field>
-      <input mdInput placeholder="Answer" [(ngModel)]="step.content">
-    </md-form-field>
+<mat-horizontal-stepper>
+  <mat-step *ngFor="let step of steps">
+    <ng-template matStepLabel>{{step.label}}</ng-template>
+    <mat-form-field>
+      <input matInput placeholder="Answer" [(ngModel)]="step.content">
+    </mat-form-field>
     <div>
-      <button md-button mdStepperPrevious>Back</button>
-      <button md-button mdStepperNext>Next</button>
+      <button mat-button matStepperPrevious>Back</button>
+      <button mat-button matStepperNext>Next</button>
     </div>
-  </md-step>
-</md-horizontal-stepper>
+  </mat-step>
+</mat-horizontal-stepper>
diff --git a/src/demo-app/table/person-data-source.ts b/src/demo-app/table/person-data-source.ts
index 6bf96511be1d..cc74bb243afe 100644
--- a/src/demo-app/table/person-data-source.ts
+++ b/src/demo-app/table/person-data-source.ts
@@ -1,4 +1,4 @@
-import {MdPaginator, MdSort} from '@angular/material';
+import {MatPaginator, MatSort} from '@angular/material';
 import {DataSource} from '@angular/cdk/collections';
 import {Observable} from 'rxjs/Observable';
 import {PeopleDatabase, UserData} from './people-database';
@@ -7,8 +7,8 @@ import 'rxjs/add/operator/map';
 
 export class PersonDataSource extends DataSource<any> {
   constructor(private _peopleDatabase: PeopleDatabase,
-              private _paginator: MdPaginator,
-              private _sort: MdSort) {
+              private _paginator: MatPaginator,
+              private _sort: MatSort) {
     super();
   }
 
diff --git a/src/demo-app/table/table-demo.html b/src/demo-app/table/table-demo.html
index 563a70f3ea0b..1741dc26d2be 100644
--- a/src/demo-app/table/table-demo.html
+++ b/src/demo-app/table/table-demo.html
@@ -1,34 +1,34 @@
 <div class="demo-data-source-actions">
   <div>
-    <button md-raised-button (click)="connect()">Connect New Data Source</button>
-    <button md-raised-button (click)="disconnect()" [disabled]="!dataSource">Disconnect Data Source</button>
+    <button mat-raised-button (click)="connect()">Connect New Data Source</button>
+    <button mat-raised-button (click)="disconnect()" [disabled]="!dataSource">Disconnect Data Source</button>
   </div>
 
   <div>
-    <button md-raised-button (click)="_peopleDatabase.shuffle(changeReferences)">Randomize Data</button>
-    <md-checkbox [(ngModel)]="changeReferences">Change references</md-checkbox>
+    <button mat-raised-button (click)="_peopleDatabase.shuffle(changeReferences)">Randomize Data</button>
+    <mat-checkbox [(ngModel)]="changeReferences">Change references</mat-checkbox>
   </div>
 
   <div class="demo-track-by-select">
     <div class="demo-track-by-label">Track By</div>
-    <md-radio-group [(ngModel)]="trackByStrategy">
-      <md-radio-button [value]="'reference'">Reference</md-radio-button>
-      <md-radio-button [value]="'id'">ID</md-radio-button>
-      <md-radio-button [value]="'index'">Index</md-radio-button>
-    </md-radio-group>
+    <mat-radio-group [(ngModel)]="trackByStrategy">
+      <mat-radio-button [value]="'reference'">Reference</mat-radio-button>
+      <mat-radio-button [value]="'id'">ID</mat-radio-button>
+      <mat-radio-button [value]="'index'">Index</mat-radio-button>
+    </mat-radio-group>
   </div>
 </div>
 
-<md-card class="demo-table-card">
+<mat-card class="demo-table-card">
   <h3>
     CdkTable With Dynamic Column Def
     <div>
-      <button md-raised-button
+      <button mat-raised-button
               (click)="addDynamicColumnDef()"
               [disabled]="dynamicColumnIds.length >= 4">
         Add Column Def
       </button>
-      <button md-raised-button
+      <button mat-raised-button
               (click)="removeDynamicColumnDef()"
               [disabled]="dynamicColumnIds.length == 0">
         Remove Column Def
@@ -45,27 +45,27 @@ <h3>
     <cdk-header-row *cdkHeaderRowDef="dynamicColumnIds"></cdk-header-row>
     <cdk-row *cdkRowDef="let row; columns: dynamicColumnIds;"></cdk-row>
   </cdk-table>
-</md-card>
+</mat-card>
 
-<md-card class="demo-table-card">
+<mat-card class="demo-table-card">
   <h3>CdkTable Example</h3>
 
   <div class="demo-highlighter">
     Highlight:
-    <md-checkbox (change)="toggleHighlight('first', $event.checked)">First Row</md-checkbox>
-    <md-checkbox (change)="toggleHighlight('last', $event.checked)">Last Row</md-checkbox>
-    <md-checkbox (change)="toggleHighlight('even', $event.checked)">Even Rows</md-checkbox>
-    <md-checkbox (change)="toggleHighlight('odd', $event.checked)">Odd Rows</md-checkbox>
+    <mat-checkbox (change)="toggleHighlight('first', $event.checked)">First Row</mat-checkbox>
+    <mat-checkbox (change)="toggleHighlight('last', $event.checked)">Last Row</mat-checkbox>
+    <mat-checkbox (change)="toggleHighlight('even', $event.checked)">Even Rows</mat-checkbox>
+    <mat-checkbox (change)="toggleHighlight('odd', $event.checked)">Odd Rows</mat-checkbox>
   </div>
 
-  <cdk-table #table mdSort
+  <cdk-table #table matSort
                [dataSource]="dataSource"
                [trackBy]="userTrackBy">
 
     <!-- Column Definition: ID -->
     <ng-container cdkColumnDef="userId">
       <cdk-header-cell *cdkHeaderCellDef
-                       md-sort-header arrowPosition="before">
+                       mat-sort-header arrowPosition="before">
           ID
         </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row"> {{row.id}} </cdk-cell>
@@ -74,7 +74,7 @@ <h3>CdkTable Example</h3>
     <!-- Column Definition: Progress -->
     <ng-container cdkColumnDef="progress">
       <cdk-header-cell *cdkHeaderCellDef
-                         md-sort-header start="desc">
+                         mat-sort-header start="desc">
           Progress
         </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row">
@@ -90,7 +90,7 @@ <h3>CdkTable Example</h3>
 
     <!-- Column Definition: Name -->
     <ng-container cdkColumnDef="userName">
-      <cdk-header-cell *cdkHeaderCellDef md-sort-header>
+      <cdk-header-cell *cdkHeaderCellDef mat-sort-header>
           Name
         </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row"> {{row.name}} </cdk-cell>
@@ -99,7 +99,7 @@ <h3>CdkTable Example</h3>
     <!-- Column Definition: Color -->
     <ng-container cdkColumnDef="color">
       <cdk-header-cell *cdkHeaderCellDef
-                         md-sort-header disableClear>
+                         mat-sort-header disableClear>
           Color
         </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row" [style.color]="row.color"> {{row.color}} </cdk-cell>
@@ -116,9 +116,9 @@ <h3>CdkTable Example</h3>
                }">
       </cdk-row>
   </cdk-table>
-</md-card>
+</mat-card>
 
-<h3>MdTable Example</h3>
+<h3>MatTable Example</h3>
 
 <div class="demo-table-container demo-mat-table-example mat-elevation-z4">
 
@@ -126,18 +126,18 @@ <h3>MdTable Example</h3>
                      (toggleColorColumn)="toggleColorColumn()">
   </table-header-demo>
 
-  <md-table [dataSource]="dataSource" [trackBy]="userTrackBy">
+  <mat-table [dataSource]="dataSource" [trackBy]="userTrackBy">
 
     <!-- Column Definition: ID -->
     <ng-container cdkColumnDef="userId">
-      <md-header-cell *mdHeaderCellDef> ID </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.id}} </md-cell>
+      <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
     </ng-container>
 
     <!-- Column Definition: Progress -->
-    <ng-container mdColumnDef="progress">
-      <md-header-cell *mdHeaderCellDef> Progress </md-header-cell>
-      <md-cell *mdCellDef="let row">
+    <ng-container matColumnDef="progress">
+      <mat-header-cell *matHeaderCellDef> Progress </mat-header-cell>
+      <mat-cell *matCellDef="let row">
         <div class="demo-progress-stat">{{row.progress}}%</div>
         <div class="demo-progress-indicator-container">
           <div class="demo-progress-indicator"
@@ -145,28 +145,28 @@ <h3>MdTable Example</h3>
                [style.opacity]="getOpacity(row.progress)"
                [style.width.%]="row.progress"></div>
         </div>
-      </md-cell>
+      </mat-cell>
     </ng-container>
 
     <!-- Column Definition: Name -->
-    <ng-container mdColumnDef="userName">
-      <md-header-cell *mdHeaderCellDef> Name </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.name}} </md-cell>
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
     </ng-container>
 
     <!-- Column Definition: Color -->
-    <ng-container mdColumnDef="color">
-      <md-header-cell *mdHeaderCellDef>Color</md-header-cell>
-      <md-cell *mdCellDef="let row" [style.color]="row.color"> {{row.color}} </md-cell>
+    <ng-container matColumnDef="color">
+      <mat-header-cell *matHeaderCellDef>Color</mat-header-cell>
+      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns"></md-row>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
 
-  </md-table>
+  </mat-table>
 
-  <md-paginator #paginator
+  <mat-paginator #paginator
                 [length]="_peopleDatabase.data.length"
                 [pageSizeOptions]="[5, 10, 25, 100]">
-  </md-paginator>
+  </mat-paginator>
 </div>
diff --git a/src/demo-app/table/table-demo.scss b/src/demo-app/table/table-demo.scss
index 2f6ce9cb5478..e968dc3b8e98 100644
--- a/src/demo-app/table/table-demo.scss
+++ b/src/demo-app/table/table-demo.scss
@@ -67,7 +67,7 @@
   display: flex;
   flex-direction: column;
 
-  md-table {
+  mat-table {
     overflow: auto;
   }
 }
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index 887f33960aa7..79067958ae25 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -1,7 +1,7 @@
 import {Component, ViewChild} from '@angular/core';
 import {PeopleDatabase, UserData} from './people-database';
 import {PersonDataSource} from './person-data-source';
-import {MdPaginator, MdSort} from '@angular/material';
+import {MatPaginator, MatSort} from '@angular/material';
 
 export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
 
@@ -25,9 +25,9 @@ export class TableDemo {
   dynamicColumnDefs: any[] = [];
   dynamicColumnIds: string[] = [];
 
-  @ViewChild(MdPaginator) _paginator: MdPaginator;
+  @ViewChild(MatPaginator) _paginator: MatPaginator;
 
-  @ViewChild(MdSort) sort: MdSort;
+  @ViewChild(MatSort) sort: MatSort;
 
   constructor(public _peopleDatabase: PeopleDatabase) { }
 
diff --git a/src/demo-app/table/table-header-demo.html b/src/demo-app/table/table-header-demo.html
index e03ccb1e682f..9ab9197006e6 100644
--- a/src/demo-app/table/table-header-demo.html
+++ b/src/demo-app/table/table-header-demo.html
@@ -3,17 +3,17 @@
 </div>
 
 <div class="actions">
-  <button md-icon-button [mdMenuTriggerFor]="menu">
-    <md-icon>more_vert</md-icon>
+  <button mat-icon-button [matMenuTriggerFor]="menu">
+    <mat-icon>more_vert</mat-icon>
   </button>
-  <md-menu #menu="mdMenu">
-    <button md-menu-item (click)="shiftColumns.next()">
-      <md-icon>subdirectory_arrow_left</md-icon>
+  <mat-menu #menu="matMenu">
+    <button mat-menu-item (click)="shiftColumns.next()">
+      <mat-icon>subdirectory_arrow_left</mat-icon>
       Shift Columns Left
     </button>
-    <button md-menu-item (click)="toggleColorColumn.next()">
-      <md-icon>color_lens</md-icon>
+    <button mat-menu-item (click)="toggleColorColumn.next()">
+      <mat-icon>color_lens</mat-icon>
       Toggle Color Column
     </button>
-  </md-menu>
+  </mat-menu>
 </div>
diff --git a/src/demo-app/tabs/tabs-demo.html b/src/demo-app/tabs/tabs-demo.html
index e600753a33e8..759a92e70a9c 100644
--- a/src/demo-app/tabs/tabs-demo.html
+++ b/src/demo-app/tabs/tabs-demo.html
@@ -1,20 +1,20 @@
 <h1>Tab Nav Bar</h1>
 
-<button md-button (click)="tabLinks.shift()">Remove tab</button>
-<button md-button (click)="swapTabLinks()">Swap first two</button>
-<button md-button (click)="addToLabel()">Add to labels</button>
-<button md-button (click)="toggleBackground()">Toggle background</button>
+<button mat-button (click)="tabLinks.shift()">Remove tab</button>
+<button mat-button (click)="swapTabLinks()">Swap first two</button>
+<button mat-button (click)="addToLabel()">Add to labels</button>
+<button mat-button (click)="toggleBackground()">Toggle background</button>
 
 <div class="demo-nav-bar">
-  <nav md-tab-nav-bar aria-label="weather navigation links" [backgroundColor]="tabNavBackground">
-    <a md-tab-link
+  <nav mat-tab-nav-bar aria-label="weather navigation links" [backgroundColor]="tabNavBackground">
+    <a mat-tab-link
        *ngFor="let tabLink of tabLinks; let i = index"
        [routerLink]="tabLink.link"
        routerLinkActive #rla="routerLinkActive"
        [active]="rla.isActive">
       {{tabLink.label}}
     </a>
-    <a md-tab-link disabled>Disabled Link</a>
+    <a mat-tab-link disabled>Disabled Link</a>
   </nav>
   <router-outlet></router-outlet>
 </div>
@@ -24,37 +24,37 @@ <h1>Tab Group Demo - Dynamic Tabs</h1>
 
 <div>
   Selected tab index:
-  <md-form-field>
-    <input mdInput type="number" [(ngModel)]="activeTabIndex">
-  </md-form-field>
+  <mat-form-field>
+    <input matInput type="number" [(ngModel)]="activeTabIndex">
+  </mat-form-field>
 </div>
 
 <div class="demo-dynamic-tabs">
-  <md-card>
-    <md-card-title>Add New Tab</md-card-title>
-    <md-card-content>
-      <md-checkbox [(ngModel)]="createWithLongContent">
+  <mat-card>
+    <mat-card-title>Add New Tab</mat-card-title>
+    <mat-card-content>
+      <mat-checkbox [(ngModel)]="createWithLongContent">
         Include extra content
-      </md-checkbox>
-      <md-checkbox [(ngModel)]="gotoNewTabAfterAdding">
+      </mat-checkbox>
+      <mat-checkbox [(ngModel)]="gotoNewTabAfterAdding">
         Select after adding
-      </md-checkbox>
+      </mat-checkbox>
       <div>
         Position:
-        <md-form-field>
-          <input mdInput type="number" [(ngModel)]="addTabPosition">
-        </md-form-field>
+        <mat-form-field>
+          <input matInput type="number" [(ngModel)]="addTabPosition">
+        </mat-form-field>
       </div>
-      <button md-raised-button color="primary"
+      <button mat-raised-button color="primary"
               (click)="addTab(createWithLongContent)">
         Add
       </button>
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 
-  <md-tab-group class="demo-tab-group" dynamicHeight [(selectedIndex)]="activeTabIndex">
-    <md-tab *ngFor="let tab of dynamicTabs" [disabled]="tab.disabled">
-      <ng-template md-tab-label>{{tab.label}}</ng-template>
+  <mat-tab-group class="demo-tab-group" dynamicHeight [(selectedIndex)]="activeTabIndex">
+    <mat-tab *ngFor="let tab of dynamicTabs" [disabled]="tab.disabled">
+      <ng-template mat-tab-label>{{tab.label}}</ng-template>
       <div class="tab-content">
         {{tab.content}}
         <br>
@@ -88,25 +88,25 @@ <h1>Tab Group Demo - Dynamic Tabs</h1>
         </div>
         <br>
         <br>
-        <md-form-field>
-          <input mdInput placeholder="Tab Label" [(ngModel)]="tab.label">
-        </md-form-field>
+        <mat-form-field>
+          <input matInput placeholder="Tab Label" [(ngModel)]="tab.label">
+        </mat-form-field>
         <br><br>
-        <button md-raised-button
+        <button mat-raised-button
                 [disabled]="dynamicTabs.length == 1"
                 (click)="deleteTab(tab)">
           Delete Tab
         </button>
       </div>
-    </md-tab>
-  </md-tab-group>
+    </mat-tab>
+  </mat-tab-group>
 </div>
 
 <h1>Tab Group Demo - Dynamic Height</h1>
 
-<md-tab-group class="demo-tab-group" dynamicHeight>
-  <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
-    <ng-template md-tab-label>{{tab.label}}</ng-template>
+<mat-tab-group class="demo-tab-group" dynamicHeight>
+  <mat-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
+    <ng-template mat-tab-label>{{tab.label}}</ng-template>
     <div class="tab-content">
       {{tab.content}}
       <br>
@@ -140,19 +140,19 @@ <h1>Tab Group Demo - Dynamic Height</h1>
       </div>
       <br>
       <br>
-      <md-form-field>
-        <input mdInput placeholder="Tab Label" [(ngModel)]="tab.label">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput placeholder="Tab Label" [(ngModel)]="tab.label">
+      </mat-form-field>
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 
 <h1>Tab Group Demo - Fixed Height</h1>
 
-<md-tab-group class="demo-tab-group" style="height: 220px">
-  <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
-    <ng-template md-tab-label>{{tab.label}}</ng-template>
+<mat-tab-group class="demo-tab-group" style="height: 220px">
+  <mat-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
+    <ng-template mat-tab-label>{{tab.label}}</ng-template>
     <div class="tab-content">
       {{tab.content}}
       <br>
@@ -186,94 +186,94 @@ <h1>Tab Group Demo - Fixed Height</h1>
       </div>
       <br>
       <br>
-      <md-form-field>
-        <input mdInput placeholder="Tab Label" [(ngModel)]="tab.label">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput placeholder="Tab Label" [(ngModel)]="tab.label">
+      </mat-form-field>
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 <h1>Stretched Tabs</h1>
 
-<md-tab-group class="demo-tab-group" style="height: 200px" md-stretch-tabs>
-  <md-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
-    <ng-template md-tab-label>{{tab.label}}</ng-template>
+<mat-tab-group class="demo-tab-group" style="height: 200px" mat-stretch-tabs>
+  <mat-tab *ngFor="let tab of tabs" [disabled]="tab.disabled">
+    <ng-template mat-tab-label>{{tab.label}}</ng-template>
     <div class="tab-content">
       {{tab.content}}
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 
 <h1>Async Tabs</h1>
 
-<md-tab-group class="demo-tab-group">
-  <md-tab *ngFor="let tab of asyncTabs | async; let i = index" [disabled]="i == 1">
-    <ng-template md-tab-label>{{tab.label}}</ng-template>
+<mat-tab-group class="demo-tab-group">
+  <mat-tab *ngFor="let tab of asyncTabs | async; let i = index" [disabled]="i == 1">
+    <ng-template mat-tab-label>{{tab.label}}</ng-template>
 
     <div class="tab-content">
       {{tab.content}}
       <br>
       <br>
       <br>
-      <md-form-field>
-        <input mdInput placeholder="Tab Label" [(ngModel)]="tab.label">
-      </md-form-field>
+      <mat-form-field>
+        <input matInput placeholder="Tab Label" [(ngModel)]="tab.label">
+      </mat-form-field>
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 <!-- Simple tabs api -->
 <h1>Tabs with simplified api</h1>
-<md-tab-group class="demo-tab-group">
-  <md-tab label="Earth">
+<mat-tab-group class="demo-tab-group">
+  <mat-tab label="Earth">
     <div class="tab-content">
       This tab is about the Earth!
     </div>
-  </md-tab>
-  <md-tab label="Fire">
+  </mat-tab>
+  <mat-tab label="Fire">
     This tab is about combustion!
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 <h1>Inverted tabs</h1>
-<md-tab-group class="demo-tab-group" headerPosition="below">
-  <md-tab label="Earth">
+<mat-tab-group class="demo-tab-group" headerPosition="below">
+  <mat-tab label="Earth">
     <div class="tab-content">
       This tab is about the Earth!
     </div>
-  </md-tab>
-  <md-tab label="Fire">
+  </mat-tab>
+  <mat-tab label="Fire">
     <div class="tab-content">
       This tab is about combustion!
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 <h1>Accent tabs</h1>
-<md-tab-group class="demo-tab-group" color="accent">
-  <md-tab label="Earth">
+<mat-tab-group class="demo-tab-group" color="accent">
+  <mat-tab label="Earth">
     <div class="tab-content">
       This tab is about the Earth!
     </div>
-  </md-tab>
-  <md-tab label="Fire">
+  </mat-tab>
+  <mat-tab label="Fire">
     <div class="tab-content">
       This tab is about combustion!
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
 <h1>Tabs with background color</h1>
-<md-tab-group class="demo-tab-group" backgroundColor="primary" color="accent">
-  <md-tab label="Earth">
+<mat-tab-group class="demo-tab-group" backgroundColor="primary" color="accent">
+  <mat-tab label="Earth">
     <div class="tab-content">
       This tab is about the Earth!
     </div>
-  </md-tab>
-  <md-tab label="Fire">
+  </mat-tab>
+  <mat-tab label="Fire">
     <div class="tab-content">
       This tab is about combustion!
     </div>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/demo-app/toolbar/toolbar-demo.html b/src/demo-app/toolbar/toolbar-demo.html
index e6d3f30c5172..a7a434c97ded 100644
--- a/src/demo-app/toolbar/toolbar-demo.html
+++ b/src/demo-app/toolbar/toolbar-demo.html
@@ -1,68 +1,68 @@
 <div class="demo-toolbar">
 
   <p>
-    <md-toolbar>
-      <md-icon class="demo-toolbar-icon">menu</md-icon>
+    <mat-toolbar>
+      <mat-icon class="demo-toolbar-icon">menu</mat-icon>
       <span>Default Toolbar</span>
 
       <span class="demo-fill-remaining"></span>
 
-      <md-icon>code</md-icon>
-    </md-toolbar>
+      <mat-icon>code</mat-icon>
+    </mat-toolbar>
   </p>
 
   <p>
-    <md-toolbar color="primary">
-      <md-icon class="demo-toolbar-icon">menu</md-icon>
+    <mat-toolbar color="primary">
+      <mat-icon class="demo-toolbar-icon">menu</mat-icon>
       <span>Primary Toolbar</span>
 
       <span class="demo-fill-remaining"></span>
 
-      <md-icon>code</md-icon>
-    </md-toolbar>
+      <mat-icon>code</mat-icon>
+    </mat-toolbar>
   </p>
 
   <p>
-    <md-toolbar color="accent">
-      <md-icon class="demo-toolbar-icon">menu</md-icon>
+    <mat-toolbar color="accent">
+      <mat-icon class="demo-toolbar-icon">menu</mat-icon>
       <span>Accent Toolbar</span>
 
       <span class="demo-fill-remaining"></span>
 
-      <md-icon>code</md-icon>
-    </md-toolbar>
+      <mat-icon>code</mat-icon>
+    </mat-toolbar>
   </p>
 
   <p>
-    <md-toolbar color="accent">
+    <mat-toolbar color="accent">
       <span>Custom Toolbar</span>
-      <md-toolbar-row>
+      <mat-toolbar-row>
         <span>Second Line</span>
-      </md-toolbar-row>
-    </md-toolbar>
+      </mat-toolbar-row>
+    </mat-toolbar>
   </p>
 
   <p>
-    <md-toolbar color="primary">
+    <mat-toolbar color="primary">
       <span>Custom Toolbar</span>
 
-      <md-toolbar-row>
+      <mat-toolbar-row>
         <span>Second Line</span>
 
         <span class="demo-fill-remaining"></span>
 
-        <md-icon class="demo-toolbar-icon">verified_user</md-icon>
-      </md-toolbar-row>
+        <mat-icon class="demo-toolbar-icon">verified_user</mat-icon>
+      </mat-toolbar-row>
 
-      <md-toolbar-row>
+      <mat-toolbar-row>
         <span>Third Line</span>
 
         <span class="demo-fill-remaining"></span>
 
-        <md-icon class="demo-toolbar-icon">favorite</md-icon>
-        <md-icon class="demo-toolbar-icon">delete</md-icon>
-      </md-toolbar-row>
-    </md-toolbar>
+        <mat-icon class="demo-toolbar-icon">favorite</mat-icon>
+        <mat-icon class="demo-toolbar-icon">delete</mat-icon>
+      </mat-toolbar-row>
+    </mat-toolbar>
   </p>
 
 </div>
\ No newline at end of file
diff --git a/src/demo-app/tooltip/tooltip-demo.html b/src/demo-app/tooltip/tooltip-demo.html
index 32845a31bf0f..2d8094231b48 100644
--- a/src/demo-app/tooltip/tooltip-demo.html
+++ b/src/demo-app/tooltip/tooltip-demo.html
@@ -1,4 +1,4 @@
-<button *ngFor="let tooltip of tooltips" mdTooltip="Tooltip message">Tooltip Button</button>
+<button *ngFor="let tooltip of tooltips" matTooltip="Tooltip message">Tooltip Button</button>
 <button (click)="tooltips.push(null)">Add tooltip</button>
 <button (click)="tooltips.shift()" [disabled]="tooltips.length == 0">Remove tooltip</button>
 
@@ -6,15 +6,15 @@
   <h1>Tooltip Demo</h1>
 
   <div class="centered" cdk-scrollable>
-    <button #tooltip="mdTooltip"
-            md-raised-button
+    <button #tooltip="matTooltip"
+            mat-raised-button
             color="primary"
-            [mdTooltip]="message"
-            [mdTooltipPosition]="position"
-            [mdTooltipDisabled]="disabled"
-            [mdTooltipShowDelay]="showDelay"
-            [mdTooltipHideDelay]="hideDelay"
-            [mdTooltipClass]="{'red-tooltip': showExtraClass}">
+            [matTooltip]="message"
+            [matTooltipPosition]="position"
+            [matTooltipDisabled]="disabled"
+            [matTooltipShowDelay]="showDelay"
+            [matTooltipHideDelay]="hideDelay"
+            [matTooltipClass]="{'red-tooltip': showExtraClass}">
       Mouse over to see the tooltip
     </button>
     <div>Scroll down while tooltip is open to see it hide automatically</div>
@@ -22,50 +22,50 @@ <h1>Tooltip Demo</h1>
   </div>
 
   <p>
-    <md-radio-group [(ngModel)]="position">
-      <md-radio-button value="below">Below</md-radio-button>
-      <md-radio-button value="above">Above</md-radio-button>
-      <md-radio-button value="left">Left</md-radio-button>
-      <md-radio-button value="right">Right</md-radio-button>
-      <md-radio-button value="before">Before</md-radio-button>
-      <md-radio-button value="after">After</md-radio-button>
-    </md-radio-group>
+    <mat-radio-group [(ngModel)]="position">
+      <mat-radio-button value="below">Below</mat-radio-button>
+      <mat-radio-button value="above">Above</mat-radio-button>
+      <mat-radio-button value="left">Left</mat-radio-button>
+      <mat-radio-button value="right">Right</mat-radio-button>
+      <mat-radio-button value="before">Before</mat-radio-button>
+      <mat-radio-button value="after">After</mat-radio-button>
+    </mat-radio-group>
   </p>
   <p>
     <strong>Message: </strong>
-    <md-form-field><input mdInput [(ngModel)]="message"></md-form-field>
+    <mat-form-field><input matInput [(ngModel)]="message"></mat-form-field>
   </p>
 
   <p>
     <strong>Disabled: </strong>
-    <md-checkbox [(ngModel)]="disabled"></md-checkbox>
+    <mat-checkbox [(ngModel)]="disabled"></mat-checkbox>
   </p>
 
   <p>
     <strong>Show Delay (ms): </strong>
-    <md-form-field>
-      <input mdInput type="number" [(ngModel)]="showDelay">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput type="number" [(ngModel)]="showDelay">
+    </mat-form-field>
   </p>
 
   <p>
     <strong>Hide Delay (ms): </strong>
-    <md-form-field>
-      <input mdInput type="number" [(ngModel)]="hideDelay">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput type="number" [(ngModel)]="hideDelay">
+    </mat-form-field>
   </p>
 
   <strong>Mouse over to</strong>
-  <button md-raised-button color="primary" (mouseenter)="tooltip.show()">
+  <button mat-raised-button color="primary" (mouseenter)="tooltip.show()">
     Show tooltip
   </button>
-  <button md-raised-button color="primary" (mouseenter)="tooltip.hide()">
+  <button mat-raised-button color="primary" (mouseenter)="tooltip.hide()">
     Hide tooltip
   </button>
-  <button md-raised-button color="primary" (mouseenter)="tooltip.toggle()">
+  <button mat-raised-button color="primary" (mouseenter)="tooltip.toggle()">
     Toggle tooltip
   </button>
-  <button md-raised-button color="primary" (mouseenter)="showExtraClass = !showExtraClass">
+  <button mat-raised-button color="primary" (mouseenter)="showExtraClass = !showExtraClass">
     Toggle tooltipClass
   </button>
 </div>
diff --git a/src/e2e-app/button/button-e2e.html b/src/e2e-app/button/button-e2e.html
index 96170713001b..74510d8c9015 100644
--- a/src/e2e-app/button/button-e2e.html
+++ b/src/e2e-app/button/button-e2e.html
@@ -5,32 +5,32 @@
       isDisabled: {{isDisabled}}, clickCounter:
       <span id="click-counter">{{clickCounter}}</span>
     </p>
-    <button md-raised-button (click)="isDisabled=!isDisabled" id="disable-toggle">
+    <button mat-raised-button (click)="isDisabled=!isDisabled" id="disable-toggle">
       Disable buttons
     </button>
   </div>
 
-  <button md-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="test-button">
+  <button mat-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="test-button">
     off
   </button>
 
-  <button md-button color="primary" [disabled]="isDisabled">
+  <button mat-button color="primary" [disabled]="isDisabled">
     off
   </button>
 
-  <a href="http://www.google.com" md-button color="accent" [disabled]="isDisabled">
+  <a href="http://www.google.com" mat-button color="accent" [disabled]="isDisabled">
     off
   </a>
 
-  <button md-raised-button color="primary" [disabled]="isDisabled">
+  <button mat-raised-button color="primary" [disabled]="isDisabled">
     off
   </button>
 
-  <button md-mini-fab [disabled]="isDisabled" aria-label="Check">
-    <md-icon class="md-24">check</md-icon>
+  <button mat-mini-fab [disabled]="isDisabled" aria-label="Check">
+    <mat-icon class="md-24">check</mat-icon>
   </button>
 
-  <button md-icon-button color="accent" [disabled]="isDisabled" aria-label="Check">
-    <md-icon class="md-24">favorite</md-icon>
+  <button mat-icon-button color="accent" [disabled]="isDisabled" aria-label="Check">
+    <mat-icon class="md-24">favorite</mat-icon>
   </button>
 </section>
diff --git a/src/e2e-app/checkbox/checkbox-e2e.html b/src/e2e-app/checkbox/checkbox-e2e.html
index 5d78249c6d97..5ad9f8a36d70 100644
--- a/src/e2e-app/checkbox/checkbox-e2e.html
+++ b/src/e2e-app/checkbox/checkbox-e2e.html
@@ -1 +1 @@
-<md-checkbox id="test-checkbox">Check this button</md-checkbox>
+<mat-checkbox id="test-checkbox">Check this button</mat-checkbox>
diff --git a/src/e2e-app/dialog/dialog-e2e.ts b/src/e2e-app/dialog/dialog-e2e.ts
index 717297e2aef3..b7bac051ef5f 100644
--- a/src/e2e-app/dialog/dialog-e2e.ts
+++ b/src/e2e-app/dialog/dialog-e2e.ts
@@ -1,5 +1,5 @@
 import {Component, ViewChild, TemplateRef} from '@angular/core';
-import {MdDialog, MdDialogRef, MdDialogConfig} from '@angular/material';
+import {MatDialog, MatDialogRef, MatDialogConfig} from '@angular/material';
 
 @Component({
   selector: 'dialog-e2e',
@@ -7,13 +7,13 @@ import {MdDialog, MdDialogRef, MdDialogConfig} from '@angular/material';
   templateUrl: 'dialog-e2e.html'
 })
 export class DialogE2E {
-  dialogRef: MdDialogRef<TestDialog> | null;
+  dialogRef: MatDialogRef<TestDialog> | null;
 
   @ViewChild(TemplateRef) templateRef: TemplateRef<any>;
 
-  constructor (private _dialog: MdDialog) { }
+  constructor (private _dialog: MatDialog) { }
 
-  private _openDialog(config?: MdDialogConfig) {
+  private _openDialog(config?: MatDialogConfig) {
     this.dialogRef = this._dialog.open(TestDialog, config);
     this.dialogRef.afterClosed().subscribe(() => this.dialogRef = null);
   }
@@ -41,5 +41,5 @@ export class DialogE2E {
   <button type="button" (click)="dialogRef.close()" id="close">CLOSE</button>`
 })
 export class TestDialog {
-  constructor(public dialogRef: MdDialogRef<TestDialog>) { }
+  constructor(public dialogRef: MatDialogRef<TestDialog>) { }
 }
diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts
index e80b8c0a7817..a9fd3f395e7c 100644
--- a/src/e2e-app/e2e-app-module.ts
+++ b/src/e2e-app/e2e-app-module.ts
@@ -20,23 +20,23 @@ import {InputE2E} from './input/input-e2e';
 import {SidenavE2E} from './sidenav/sidenav-e2e';
 import {BlockScrollStrategyE2E} from './block-scroll-strategy/block-scroll-strategy-e2e';
 import {
-  MdButtonModule,
-  MdCheckboxModule,
-  MdDialogModule,
-  MdFormFieldModule,
-  MdGridListModule,
-  MdIconModule,
-  MdInputModule,
-  MdListModule,
-  MdMenuModule,
-  MdNativeDateModule,
-  MdProgressBarModule,
-  MdProgressSpinnerModule,
-  MdRadioModule,
-  MdSidenavModule,
-  MdSlideToggleModule,
-  MdStepperModule,
-  MdTabsModule,
+  MatButtonModule,
+  MatCheckboxModule,
+  MatDialogModule,
+  MatFormFieldModule,
+  MatGridListModule,
+  MatIconModule,
+  MatInputModule,
+  MatListModule,
+  MatMenuModule,
+  MatNativeDateModule,
+  MatProgressBarModule,
+  MatProgressSpinnerModule,
+  MatRadioModule,
+  MatSidenavModule,
+  MatSlideToggleModule,
+  MatStepperModule,
+  MatTabsModule,
 } from '@angular/material';
 import {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
 import {ExampleModule} from '@angular/material-examples';
@@ -47,23 +47,23 @@ import {ReactiveFormsModule} from '@angular/forms';
  */
 @NgModule({
   exports: [
-    MdButtonModule,
-    MdCheckboxModule,
-    MdDialogModule,
-    MdFormFieldModule,
-    MdGridListModule,
-    MdIconModule,
-    MdInputModule,
-    MdListModule,
-    MdMenuModule,
-    MdProgressBarModule,
-    MdProgressSpinnerModule,
-    MdRadioModule,
-    MdSidenavModule,
-    MdSlideToggleModule,
-    MdStepperModule,
-    MdTabsModule,
-    MdNativeDateModule,
+    MatButtonModule,
+    MatCheckboxModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatGridListModule,
+    MatIconModule,
+    MatInputModule,
+    MatListModule,
+    MatMenuModule,
+    MatProgressBarModule,
+    MatProgressSpinnerModule,
+    MatRadioModule,
+    MatSidenavModule,
+    MatSlideToggleModule,
+    MatStepperModule,
+    MatTabsModule,
+    MatNativeDateModule,
   ]
 })
 export class E2eMaterialModule {}
diff --git a/src/e2e-app/e2e-app/e2e-app.html b/src/e2e-app/e2e-app/e2e-app.html
index e3631595618d..1a142abe75ab 100644
--- a/src/e2e-app/e2e-app/e2e-app.html
+++ b/src/e2e-app/e2e-app/e2e-app.html
@@ -1,28 +1,28 @@
 <button (click)="showLinks = !showLinks">Toggle Navigation Links</button>
 
-<md-nav-list *ngIf="showLinks">
-  <a md-list-item [routerLink]="['block-scroll-strategy']">Block scroll strategy</a>
-  <a md-list-item [routerLink]="['button']">Button</a>
-  <a md-list-item [routerLink]="['button-toggle']">Button Toggle</a>
-  <a md-list-item [routerLink]="['checkbox']">Checkbox</a>
-  <a md-list-item [routerLink]="['dialog']">Dialog</a>
-  <a md-list-item [routerLink]="['expansion']">Expansion</a>
-  <a md-list-item [routerLink]="['fullscreen']">Fullscreen</a>
-  <a md-list-item [routerLink]="['grid-list']">Grid list</a>
-  <a md-list-item [routerLink]="['icon']">Icon</a>
-  <a md-list-item [routerLink]="['input']">Input</a>
-  <a md-list-item [routerLink]="['list']">List</a>
-  <a md-list-item [routerLink]="['menu']">Menu</a>
-  <a md-list-item [routerLink]="['progress-bar']">Progress bar</a>
-  <a md-list-item [routerLink]="['progress-spinner']">Progress Spinner</a>
-  <a md-list-item [routerLink]="['radio']">Radios</a>
-  <a md-list-item [routerLink]="['sidenav']">Sidenav</a>
-  <a md-list-item [routerLink]="['slide-toggle']">Slide Toggle</a>
-  <a md-list-item [routerLink]="['stepper']">Stepper</a>
-  <a md-list-item [routerLink]="['tabs']">Tabs</a>
-  <a md-list-item [routerLink]="['cards']">Cards</a>
-  <a md-list-item [routerLink]="['toolbar']">Toolbar</a>
-</md-nav-list>
+<mat-nav-list *ngIf="showLinks">
+  <a mat-list-item [routerLink]="['block-scroll-strategy']">Block scroll strategy</a>
+  <a mat-list-item [routerLink]="['button']">Button</a>
+  <a mat-list-item [routerLink]="['button-toggle']">Button Toggle</a>
+  <a mat-list-item [routerLink]="['checkbox']">Checkbox</a>
+  <a mat-list-item [routerLink]="['dialog']">Dialog</a>
+  <a mat-list-item [routerLink]="['expansion']">Expansion</a>
+  <a mat-list-item [routerLink]="['fullscreen']">Fullscreen</a>
+  <a mat-list-item [routerLink]="['grid-list']">Grid list</a>
+  <a mat-list-item [routerLink]="['icon']">Icon</a>
+  <a mat-list-item [routerLink]="['input']">Input</a>
+  <a mat-list-item [routerLink]="['list']">List</a>
+  <a mat-list-item [routerLink]="['menu']">Menu</a>
+  <a mat-list-item [routerLink]="['progress-bar']">Progress bar</a>
+  <a mat-list-item [routerLink]="['progress-spinner']">Progress Spinner</a>
+  <a mat-list-item [routerLink]="['radio']">Radios</a>
+  <a mat-list-item [routerLink]="['sidenav']">Sidenav</a>
+  <a mat-list-item [routerLink]="['slide-toggle']">Slide Toggle</a>
+  <a mat-list-item [routerLink]="['stepper']">Stepper</a>
+  <a mat-list-item [routerLink]="['tabs']">Tabs</a>
+  <a mat-list-item [routerLink]="['cards']">Cards</a>
+  <a mat-list-item [routerLink]="['toolbar']">Toolbar</a>
+</mat-nav-list>
 
 <main>
   <router-outlet role="main"></router-outlet>
diff --git a/src/e2e-app/fullscreen/fullscreen-e2e.ts b/src/e2e-app/fullscreen/fullscreen-e2e.ts
index 0db67b5d6974..3bf543d9c965 100644
--- a/src/e2e-app/fullscreen/fullscreen-e2e.ts
+++ b/src/e2e-app/fullscreen/fullscreen-e2e.ts
@@ -1,5 +1,5 @@
 import {Component, ElementRef, Output, EventEmitter} from '@angular/core';
-import {MdDialog, MdDialogRef} from '@angular/material';
+import {MatDialog, MatDialogRef} from '@angular/material';
 
 @Component({
   moduleId: module.id,
@@ -8,9 +8,9 @@ import {MdDialog, MdDialogRef} from '@angular/material';
 })
 export class FullscreenE2E {
 
-  dialogRef: MdDialogRef<TestDialog> | null;
+  dialogRef: MatDialogRef<TestDialog> | null;
 
-  constructor (private _element: ElementRef, private _dialog: MdDialog) { }
+  constructor (private _element: ElementRef, private _dialog: MatDialog) { }
 
   openDialog() {
     this.dialogRef = this._dialog.open(TestDialog);
@@ -58,5 +58,5 @@ export class TestDialog {
   @Output() openFullscreen = new EventEmitter<void>();
   @Output() exitFullscreen = new EventEmitter<void>();
 
-  constructor(public dialogRef: MdDialogRef<TestDialog>) {}
+  constructor(public dialogRef: MatDialogRef<TestDialog>) {}
 }
diff --git a/src/e2e-app/grid-list/grid-list-e2e.html b/src/e2e-app/grid-list/grid-list-e2e.html
index d0e7037eb867..7ba581a491c8 100644
--- a/src/e2e-app/grid-list/grid-list-e2e.html
+++ b/src/e2e-app/grid-list/grid-list-e2e.html
@@ -1,6 +1,6 @@
-<md-grid-list cols="4" [rowHeight]="100">
-  <md-grid-tile>One</md-grid-tile>
-  <md-grid-tile>Two</md-grid-tile>
-  <md-grid-tile>Three</md-grid-tile>
-  <md-grid-tile>Four</md-grid-tile>
-</md-grid-list>
+<mat-grid-list cols="4" [rowHeight]="100">
+  <mat-grid-tile>One</mat-grid-tile>
+  <mat-grid-tile>Two</mat-grid-tile>
+  <mat-grid-tile>Three</mat-grid-tile>
+  <mat-grid-tile>Four</mat-grid-tile>
+</mat-grid-list>
diff --git a/src/e2e-app/icon/icon-e2e.html b/src/e2e-app/icon/icon-e2e.html
index cf538e71481d..65a0e62c71e9 100644
--- a/src/e2e-app/icon/icon-e2e.html
+++ b/src/e2e-app/icon/icon-e2e.html
@@ -1,3 +1,3 @@
 <section>
-  <md-icon class="md-24" id="test-icon">favorite</md-icon>
+  <mat-icon class="md-24" id="test-icon">favorite</mat-icon>
 </section>
\ No newline at end of file
diff --git a/src/e2e-app/index.html b/src/e2e-app/index.html
index 0fa9e0cf5568..855ef3b086a7 100644
--- a/src/e2e-app/index.html
+++ b/src/e2e-app/index.html
@@ -11,7 +11,7 @@
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
   <link href="dist/packages/material/core/theming/prebuilt/indigo-pink.css" rel="stylesheet">
 
-  <!-- FontAwesome for md-icon demo. -->
+  <!-- FontAwesome for mat-icon demo. -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 </head>
 <body>
diff --git a/src/e2e-app/input/input-e2e.html b/src/e2e-app/input/input-e2e.html
index b47fa322a9ba..ee908d25449e 100644
--- a/src/e2e-app/input/input-e2e.html
+++ b/src/e2e-app/input/input-e2e.html
@@ -1,23 +1,23 @@
 <section>
   <p>
-    <md-form-field>
-      <input mdInput type="text" id="text-input" placeholder="Enter some text">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput type="text" id="text-input" placeholder="Enter some text">
+    </mat-form-field>
   </p>
   <p>
-    <md-form-field>
-      <input mdInput type="number" id="number-input" placeholder="Enter a number">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput type="number" id="number-input" placeholder="Enter a number">
+    </mat-form-field>
   </p>
   <p>
-    <md-form-field>
-      <textarea mdInput id="text-area" placeholder="Enter some text"></textarea>
-    </md-form-field>
+    <mat-form-field>
+      <textarea matInput id="text-area" placeholder="Enter some text"></textarea>
+    </mat-form-field>
   </p>
   <p>
-    <md-form-field>
-      <textarea mdInput mdTextareaAutosize mdAutosizeMaxRows="10" id="autosize-text-area"
+    <mat-form-field>
+      <textarea matInput matTextareaAutosize matAutosizeMaxRows="10" id="autosize-text-area"
                 placeholder="Enter some text"></textarea>
-    </md-form-field>
+    </mat-form-field>
   </p>
 </section>
diff --git a/src/e2e-app/menu/menu-e2e.html b/src/e2e-app/menu/menu-e2e.html
index bd80754a8dc6..6c07798831a5 100644
--- a/src/e2e-app/menu/menu-e2e.html
+++ b/src/e2e-app/menu/menu-e2e.html
@@ -2,35 +2,35 @@
   <div style="float:left">
     <div id="text">{{ selected }}</div>
     <button id="start">START</button>
-    <button [mdMenuTriggerFor]="menu" id="trigger">TRIGGER</button>
-    <button [mdMenuTriggerFor]="menu" id="trigger-two">TRIGGER 2</button>
+    <button [matMenuTriggerFor]="menu" id="trigger">TRIGGER</button>
+    <button [matMenuTriggerFor]="menu" id="trigger-two">TRIGGER 2</button>
 
-    <md-menu #menu="mdMenu" yPosition="below" class="custom">
-      <button md-menu-item (click)="selected='one'">One</button>
-      <button md-menu-item (click)="selected='two'">Two</button>
-      <button md-menu-item (click)="selected='three'" disabled>Three</button>
-      <button md-menu-item>Four</button>
-    </md-menu>
+    <mat-menu #menu="matMenu" yPosition="below" class="custom">
+      <button mat-menu-item (click)="selected='one'">One</button>
+      <button mat-menu-item (click)="selected='two'">Two</button>
+      <button mat-menu-item (click)="selected='three'" disabled>Three</button>
+      <button mat-menu-item>Four</button>
+    </mat-menu>
 
-    <button [mdMenuTriggerFor]="beforeMenu" id="before-t">
+    <button [matMenuTriggerFor]="beforeMenu" id="before-t">
       BEFORE
     </button>
-    <md-menu xPosition="before" yPosition="below" class="before" #beforeMenu="mdMenu">
-      <button md-menu-item>Item</button>
-    </md-menu>
+    <mat-menu xPosition="before" yPosition="below" class="before" #beforeMenu="matMenu">
+      <button mat-menu-item>Item</button>
+    </mat-menu>
 
     <div class="bottom-row">
-      <button [mdMenuTriggerFor]="aboveMenu" id="above-t">ABOVE</button>
-      <md-menu yPosition="above" class="above" #aboveMenu="mdMenu">
-        <button md-menu-item>Item</button>
-      </md-menu>
+      <button [matMenuTriggerFor]="aboveMenu" id="above-t">ABOVE</button>
+      <mat-menu yPosition="above" class="above" #aboveMenu="matMenu">
+        <button mat-menu-item>Item</button>
+      </mat-menu>
 
-      <button [mdMenuTriggerFor]="combined" id="combined-t">
+      <button [matMenuTriggerFor]="combined" id="combined-t">
         BOTH
       </button>
-      <md-menu xPosition="before" yPosition="above" class="combined" #combined="mdMenu">
-        <button md-menu-item>Item</button>
-      </md-menu>
+      <mat-menu xPosition="before" yPosition="above" class="combined" #combined="matMenu">
+        <button mat-menu-item>Item</button>
+      </mat-menu>
 
     </div>
   </div>
diff --git a/src/e2e-app/progress-bar/progress-bar-e2e.html b/src/e2e-app/progress-bar/progress-bar-e2e.html
index 79d6660603b0..b1218f154b26 100644
--- a/src/e2e-app/progress-bar/progress-bar-e2e.html
+++ b/src/e2e-app/progress-bar/progress-bar-e2e.html
@@ -1,4 +1,4 @@
-<md-progress-bar mode="determinate" [value]="determinateValue"></md-progress-bar>
-<md-progress-bar mode="buffer" [value]="bufferValue"></md-progress-bar>
-<md-progress-bar mode="query"></md-progress-bar>
-<md-progress-bar mode="indeterminate"></md-progress-bar>
+<mat-progress-bar mode="determinate" [value]="determinateValue"></mat-progress-bar>
+<mat-progress-bar mode="buffer" [value]="bufferValue"></mat-progress-bar>
+<mat-progress-bar mode="query"></mat-progress-bar>
+<mat-progress-bar mode="indeterminate"></mat-progress-bar>
diff --git a/src/e2e-app/progress-bar/progress-bar-e2e.ts b/src/e2e-app/progress-bar/progress-bar-e2e.ts
index 7371b2afadb7..a8bdeb2bc100 100644
--- a/src/e2e-app/progress-bar/progress-bar-e2e.ts
+++ b/src/e2e-app/progress-bar/progress-bar-e2e.ts
@@ -6,7 +6,7 @@ import {Component} from '@angular/core';
   selector: 'progress-bar-e2e',
   templateUrl: 'progress-bar-e2e.html',
   styles: [`
-    md-progress-bar {
+    mat-progress-bar {
       margin-bottom: 10px;
     }
   `]
diff --git a/src/e2e-app/progress-spinner/progress-spinner-e2e.html b/src/e2e-app/progress-spinner/progress-spinner-e2e.html
index 9a7709ebf8b3..7971277ec758 100644
--- a/src/e2e-app/progress-spinner/progress-spinner-e2e.html
+++ b/src/e2e-app/progress-spinner/progress-spinner-e2e.html
@@ -1,3 +1,3 @@
-<md-progress-spinner [value]="57"></md-progress-spinner>
-<md-progress-spinner mode="indeterminate"></md-progress-spinner>
-<md-spinner></md-spinner>
+<mat-progress-spinner [value]="57"></mat-progress-spinner>
+<mat-progress-spinner mode="indeterminate"></mat-progress-spinner>
+<mat-spinner></mat-spinner>
diff --git a/src/e2e-app/radio/radio-e2e.html b/src/e2e-app/radio/radio-e2e.html
index d14f9cead519..28ba53e3541b 100644
--- a/src/e2e-app/radio/radio-e2e.html
+++ b/src/e2e-app/radio/radio-e2e.html
@@ -1,12 +1,12 @@
 <section>
-  <md-radio-group [disabled]="isGroupDisabled"
+  <mat-radio-group [disabled]="isGroupDisabled"
                   [(value)]="groupValue"
                   id="test-group" aria-label="Select a Pokemon">
 
-    <md-radio-button value="fire" id="fire">Charmander</md-radio-button>
-    <md-radio-button value="water" id="water">Squirtle</md-radio-button>
-    <md-radio-button value="leaf" id="leaf">Bulbasaur</md-radio-button>
+    <mat-radio-button value="fire" id="fire">Charmander</mat-radio-button>
+    <mat-radio-button value="water" id="water">Squirtle</mat-radio-button>
+    <mat-radio-button value="leaf" id="leaf">Bulbasaur</mat-radio-button>
 
-  </md-radio-group>
+  </mat-radio-group>
   <button (click)="isGroupDisabled=!isGroupDisabled" id="toggle-disable">Disable/enable group</button>
 </section>
diff --git a/src/e2e-app/sidenav/sidenav-e2e.html b/src/e2e-app/sidenav/sidenav-e2e.html
index 254ae42cfc0c..67deac6a0e7c 100644
--- a/src/e2e-app/sidenav/sidenav-e2e.html
+++ b/src/e2e-app/sidenav/sidenav-e2e.html
@@ -1,8 +1,8 @@
 <section>
-  <md-sidenav-container>
-    <md-sidenav #sidenav mode="side">Drawer content</md-sidenav>
+  <mat-sidenav-container>
+    <mat-sidenav #sidenav mode="side">Drawer content</mat-sidenav>
     <button type="button" (click)="sidenav.toggle()">
       Open sidenav
     </button>
-  </md-sidenav-container>
+  </mat-sidenav-container>
 </section>
diff --git a/src/e2e-app/slide-toggle/slide-toggle-e2e.html b/src/e2e-app/slide-toggle/slide-toggle-e2e.html
index 13ce7328669d..c8bc16b7c38d 100644
--- a/src/e2e-app/slide-toggle/slide-toggle-e2e.html
+++ b/src/e2e-app/slide-toggle/slide-toggle-e2e.html
@@ -1,2 +1,2 @@
-<md-slide-toggle id="normal-slide-toggle">Slide Toggle</md-slide-toggle>
-<md-slide-toggle id="disabled-slide-toggle" disabled>Disabled Slide Toggle</md-slide-toggle>
\ No newline at end of file
+<mat-slide-toggle id="normal-slide-toggle">Slide Toggle</mat-slide-toggle>
+<mat-slide-toggle id="disabled-slide-toggle" disabled>Disabled Slide Toggle</mat-slide-toggle>
\ No newline at end of file
diff --git a/src/e2e-app/tabs/tabs-e2e.html b/src/e2e-app/tabs/tabs-e2e.html
index 9e9431af0cc0..1b21b9f58ca7 100644
--- a/src/e2e-app/tabs/tabs-e2e.html
+++ b/src/e2e-app/tabs/tabs-e2e.html
@@ -1,16 +1,16 @@
 <section>
-  <md-tab-group>
-    <md-tab>
-      <ng-template md-tab-label>One</ng-template>
+  <mat-tab-group>
+    <mat-tab>
+      <ng-template mat-tab-label>One</ng-template>
       First tab's content
-    </md-tab>
-    <md-tab>
-      <ng-template md-tab-label>Two</ng-template>
+    </mat-tab>
+    <mat-tab>
+      <ng-template mat-tab-label>Two</ng-template>
       Second tab's content
-    </md-tab>
-    <md-tab>
-      <ng-template md-tab-label>Three</ng-template>
+    </mat-tab>
+    <mat-tab>
+      <ng-template mat-tab-label>Three</ng-template>
       Third tab's content
-    </md-tab>
-  </md-tab-group>
+    </mat-tab>
+  </mat-tab-group>
 </section>
diff --git a/src/lib/autocomplete/autocomplete-module.ts b/src/lib/autocomplete/autocomplete-module.ts
index 4fbc35f2f31b..96029b6c2bd5 100644
--- a/src/lib/autocomplete/autocomplete-module.ts
+++ b/src/lib/autocomplete/autocomplete-module.ts
@@ -9,17 +9,17 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {OverlayModule} from '@angular/cdk/overlay';
-import {MdOptionModule, MdCommonModule} from '@angular/material/core';
-import {MdAutocomplete} from './autocomplete';
+import {MatOptionModule, MatCommonModule} from '@angular/material/core';
+import {MatAutocomplete} from './autocomplete';
 import {
-  MdAutocompleteTrigger,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
+  MatAutocompleteTrigger,
+  MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
 } from './autocomplete-trigger';
 
 @NgModule({
-  imports: [MdOptionModule, OverlayModule, MdCommonModule, CommonModule],
-  exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
-  declarations: [MdAutocomplete, MdAutocompleteTrigger],
-  providers: [MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
+  imports: [MatOptionModule, OverlayModule, MatCommonModule, CommonModule],
+  exports: [MatAutocomplete, MatOptionModule, MatAutocompleteTrigger, MatCommonModule],
+  declarations: [MatAutocomplete, MatAutocompleteTrigger],
+  providers: [MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER],
 })
-export class MdAutocompleteModule {}
+export class MatAutocompleteModule {}
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 89e8d3487b90..33d5510dcc61 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -34,15 +34,15 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {MdOption, MdOptionSelectionChange} from '@angular/material/core';
-import {MdFormField} from '@angular/material/form-field';
+import {MatOption, MatOptionSelectionChange} from '@angular/material/core';
+import {MatFormField} from '@angular/material/form-field';
 import {DOCUMENT} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subscription} from 'rxjs/Subscription';
-import {MdAutocomplete} from './autocomplete';
+import {MatAutocomplete} from './autocomplete';
 
 
 /**
@@ -58,44 +58,43 @@ export const AUTOCOMPLETE_OPTION_HEIGHT = 48;
 export const AUTOCOMPLETE_PANEL_HEIGHT = 256;
 
 /** Injection token that determines the scroll handling while the autocomplete panel is open. */
-export const MD_AUTOCOMPLETE_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-autocomplete-scroll-strategy');
+export const MAT_AUTOCOMPLETE_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-autocomplete-scroll-strategy');
 
 /** @docs-private */
-export function MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition();
 }
 
 /** @docs-private */
-export const MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_AUTOCOMPLETE_SCROLL_STRATEGY,
+export const MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_AUTOCOMPLETE_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 /**
  * Provider that allows the autocomplete to register as a ControlValueAccessor.
  * @docs-private
  */
-export const MD_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
+export const MAT_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdAutocompleteTrigger),
+  useExisting: forwardRef(() => MatAutocompleteTrigger),
   multi: true
 };
 
 /**
  * Creates an error to be thrown when attempting to use an autocomplete trigger without a panel.
  */
-export function getMdAutocompleteMissingPanelError(): Error {
-  return Error('Attempting to open an undefined instance of `md-autocomplete`. ' +
-               'Make sure that the id passed to the `mdAutocomplete` is correct and that ' +
+export function getMatAutocompleteMissingPanelError(): Error {
+  return Error('Attempting to open an undefined instance of `mat-autocomplete`. ' +
+               'Make sure that the id passed to the `matAutocomplete` is correct and that ' +
                'you\'re attempting to open it after the ngAfterContentInit hook.');
 }
 
 @Directive({
-  selector: `input[mdAutocomplete], input[matAutocomplete],
-             textarea[mdAutocomplete], textarea[matAutocomplete]`,
+  selector: `input[matAutocomplete], textarea[matAutocomplete]`,
   host: {
     'role': 'combobox',
     'autocomplete': 'off',
@@ -111,9 +110,9 @@ export function getMdAutocompleteMissingPanelError(): Error {
     '(input)': '_handleInput($event)',
     '(keydown)': '_handleKeydown($event)',
   },
-  providers: [MD_AUTOCOMPLETE_VALUE_ACCESSOR]
+  providers: [MAT_AUTOCOMPLETE_VALUE_ACCESSOR]
 })
-export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
+export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   private _overlayRef: OverlayRef | null;
   private _portal: TemplatePortal<any>;
   private _panelOpen: boolean = false;
@@ -134,25 +133,15 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   _onTouched = () => {};
 
   /* The autocomplete panel to be attached to this trigger. */
-  @Input('mdAutocomplete') autocomplete: MdAutocomplete;
-
-  /** Property with mat- prefix for no-conflict mode. */
-  @Input('matAutocomplete')
-  get _matAutocomplete(): MdAutocomplete {
-    return this.autocomplete;
-  }
-
-  set _matAutocomplete(autocomplete: MdAutocomplete) {
-    this.autocomplete = autocomplete;
-  }
+  @Input('matAutocomplete') autocomplete: MatAutocomplete;
 
   constructor(private _element: ElementRef, private _overlay: Overlay,
               private _viewContainerRef: ViewContainerRef,
               private _zone: NgZone,
               private _changeDetectorRef: ChangeDetectorRef,
-              @Inject(MD_AUTOCOMPLETE_SCROLL_STRATEGY) private _scrollStrategy,
+              @Inject(MAT_AUTOCOMPLETE_SCROLL_STRATEGY) private _scrollStrategy,
               @Optional() private _dir: Directionality,
-              @Optional() @Host() private _formField: MdFormField,
+              @Optional() @Host() private _formField: MatFormField,
               @Optional() @Inject(DOCUMENT) private _document: any) {}
 
   ngOnDestroy() {
@@ -194,7 +183,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    * A stream of actions that should close the autocomplete panel, including
    * when an option is selected, on blur, and when TAB is pressed.
    */
-  get panelClosingActions(): Observable<MdOptionSelectionChange> {
+  get panelClosingActions(): Observable<MatOptionSelectionChange> {
     return merge(
       this.optionSelections,
       this.autocomplete._keyManager.tabOut,
@@ -203,12 +192,12 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   }
 
   /** Stream of autocomplete option selections. */
-  get optionSelections(): Observable<MdOptionSelectionChange> {
+  get optionSelections(): Observable<MatOptionSelectionChange> {
     return merge(...this.autocomplete.options.map(option => option.onSelectionChange));
   }
 
-  /** The currently active option, coerced to MdOption type. */
-  get activeOption(): MdOption | null {
+  /** The currently active option, coerced to MatOption type. */
+  get activeOption(): MatOption | null {
     if (this.autocomplete && this.autocomplete._keyManager) {
       return this.autocomplete._keyManager.activeItem;
     }
@@ -348,7 +337,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    */
   private _scrollToOption(): void {
     const activeOptionIndex = this.autocomplete._keyManager.activeItemIndex || 0;
-    const labelCount = MdOption.countGroupLabelsBeforeOption(activeOptionIndex,
+    const labelCount = MatOption.countGroupLabelsBeforeOption(activeOptionIndex,
         this.autocomplete.options, this.autocomplete.optionGroups);
     const optionOffset = (activeOptionIndex + labelCount) * AUTOCOMPLETE_OPTION_HEIGHT;
     const panelTop = this.autocomplete._getScrollTop();
@@ -404,7 +393,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     // The display value can also be the number zero and shouldn't fall back to an empty string.
     const inputValue = toDisplay != null ? toDisplay : '';
 
-    // If it's used within a `MdFormField`, we should set it through the property so it can go
+    // If it's used within a `MatFormField`, we should set it through the property so it can go
     // through change detection.
     if (this._formField) {
       this._formField._control.value = inputValue;
@@ -418,7 +407,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    * control to that value. It will also mark the control as dirty if this interaction
    * stemmed from the user.
    */
-  private _setValueAndClose(event: MdOptionSelectionChange | null): void {
+  private _setValueAndClose(event: MatOptionSelectionChange | null): void {
     if (event && event.source) {
       this._clearPreviousSelectedOption(event.source);
       this._setTriggerValue(event.source.value);
@@ -433,7 +422,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   /**
    * Clear any previous selected option and emit a selection change event for this option
    */
-  private _clearPreviousSelectedOption(skip: MdOption) {
+  private _clearPreviousSelectedOption(skip: MatOption) {
     this.autocomplete.options.forEach(option => {
       if (option != skip && option.selected) {
         option.deselect();
@@ -443,7 +432,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
 
   private _attachOverlay(): void {
     if (!this.autocomplete) {
-      throw getMdAutocompleteMissingPanelError();
+      throw getMatAutocompleteMissingPanelError();
     }
 
     if (!this._overlayRef) {
diff --git a/src/lib/autocomplete/autocomplete.md b/src/lib/autocomplete/autocomplete.md
index cee71e488c8d..4989442172c7 100644
--- a/src/lib/autocomplete/autocomplete.md
+++ b/src/lib/autocomplete/autocomplete.md
@@ -3,44 +3,44 @@ You can read more about autocompletes in the [Material Design spec](https://mate
 
 ### Simple autocomplete
 
-Start by adding a regular `mdInput` to the page. Let's assume you're using the `formControl`
+Start by adding a regular `matInput` to the page. Let's assume you're using the `formControl`
 directive from the `@angular/forms` module to track the value of the input.
 
 *my-comp.html*
 ```html
-<md-form-field>
-   <input type="text" mdInput [formControl]="myControl">
-</md-form-field>
+<mat-form-field>
+   <input type="text" matInput [formControl]="myControl">
+</mat-form-field>
 ```
 
 Next, create the autocomplete panel and the options displayed inside it. Each option should be
-defined by an `md-option` tag. Set each option's value property to whatever you'd like the value
+defined by an `mat-option` tag. Set each option's value property to whatever you'd like the value
 of the text input to be upon that option's selection.
 
 *my-comp.html*
 ```html
-<md-autocomplete>
-   <md-option *ngFor="let option of options" [value]="option">
+<mat-autocomplete>
+   <mat-option *ngFor="let option of options" [value]="option">
       {{ option }}
-   </md-option>
-</md-autocomplete>
+   </mat-option>
+</mat-autocomplete>
 ```
 
 Now we'll need to link the text input to its panel. We can do this by exporting the autocomplete
 panel instance into a local template variable (here we called it "auto"), and binding that variable
-to the input's `mdAutocomplete` property.
+to the input's `matAutocomplete` property.
 
 *my-comp.html*
 ```html
-<md-form-field>
-   <input type="text" mdInput [formControl]="myControl" [mdAutocomplete]="auto">
-</md-form-field>
+<mat-form-field>
+   <input type="text" matInput [formControl]="myControl" [matAutocomplete]="auto">
+</mat-form-field>
 
-<md-autocomplete #auto="mdAutocomplete">
-   <md-option *ngFor="let option of options" [value]="option">
+<mat-autocomplete #auto="matAutocomplete">
+   <mat-option *ngFor="let option of options" [value]="option">
       {{ option }}
-   </md-option>
-</md-autocomplete>
+   </mat-option>
+</mat-autocomplete>
 ```
 
 <!-- example(autocomplete-simple) -->
@@ -84,16 +84,16 @@ desired display value. Then bind it to the autocomplete's `displayWith` property
 - <kbd>ENTER</kbd>: Select currently active item.
 
 #### Option groups
-`md-option` can be collected into groups using the `md-optgroup` element:
+`mat-option` can be collected into groups using the `mat-optgroup` element:
 
 ```html
-<md-autocomplete #auto="mdAutocomplete">
-  <md-optgroup *ngFor="let group of filteredGroups | async" [label]="group.name">
-    <md-option *ngFor="let option of group.options" [value]="option">
+<mat-autocomplete #auto="matAutocomplete">
+  <mat-optgroup *ngFor="let group of filteredGroups | async" [label]="group.name">
+    <mat-option *ngFor="let option of group.options" [value]="option">
       {{ option.name }}
-    </md-option>
-  </md-optgroup>
-</md-autocomplete>
+    </mat-option>
+  </mat-optgroup>
+</mat-autocomplete>
 ```
 
 ### Accessibility
diff --git a/src/lib/autocomplete/autocomplete.scss b/src/lib/autocomplete/autocomplete.scss
index 03d7e62f7b53..afcfabb00ded 100644
--- a/src/lib/autocomplete/autocomplete.scss
+++ b/src/lib/autocomplete/autocomplete.scss
@@ -1,7 +1,7 @@
 @import '../core/style/menu-common';
 
 /**
- * The max-height of the panel, currently matching md-select value.
+ * The max-height of the panel, currently matching mat-select value.
  * TODO: Check value with MD team.
  */
 $mat-autocomplete-panel-max-height: 256px !default;
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index e4886f42dd1d..eb3e117a2d15 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -15,24 +15,24 @@ import {
 } from '@angular/core';
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MdOption} from '@angular/material/core';
-import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
+import {MatOption} from '@angular/material/core';
+import {MatFormField, MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {MdInputModule} from '../input/index';
+import {MatInputModule} from '../input/index';
 import {
-  getMdAutocompleteMissingPanelError,
-  MdAutocomplete,
-  MdAutocompleteModule,
-  MdAutocompleteSelectedEvent,
-  MdAutocompleteTrigger,
+  getMatAutocompleteMissingPanelError,
+  MatAutocomplete,
+  MatAutocompleteModule,
+  MatAutocompleteSelectedEvent,
+  MatAutocompleteTrigger,
 } from './index';
 
 
-describe('MdAutocomplete', () => {
+describe('MatAutocomplete', () => {
   let overlayContainerElement: HTMLElement;
   let dir: Direction;
   let scrolledSubject = new Subject();
@@ -41,9 +41,9 @@ describe('MdAutocomplete', () => {
     dir = 'ltr';
     TestBed.configureTestingModule({
       imports: [
-        MdAutocompleteModule,
-        MdFormFieldModule,
-        MdInputModule,
+        MatAutocompleteModule,
+        MatFormFieldModule,
+        MatInputModule,
         FormsModule,
         ReactiveFormsModule,
         NoopAnimationsModule
@@ -183,7 +183,7 @@ describe('MdAutocomplete', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
         option.click();
         fixture.detectChanges();
 
@@ -204,7 +204,7 @@ describe('MdAutocomplete', () => {
         fixture.detectChanges();
 
         let options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[0].click();
 
         // Changing value from 'Alabama' to 'al' to re-populate the option list,
@@ -214,7 +214,7 @@ describe('MdAutocomplete', () => {
 
         fixture.whenStable().then(() => {
           options =
-              overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
           options[1].click();
           fixture.detectChanges();
 
@@ -286,7 +286,7 @@ describe('MdAutocomplete', () => {
         fixture.detectChanges();
 
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -319,7 +319,7 @@ describe('MdAutocomplete', () => {
         fixture.detectChanges();
 
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -340,7 +340,7 @@ describe('MdAutocomplete', () => {
         fixture.detectChanges();
 
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -440,7 +440,7 @@ describe('MdAutocomplete', () => {
 
       fixture.whenStable().then(() => {
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -456,7 +456,7 @@ describe('MdAutocomplete', () => {
 
       fixture.whenStable().then(() => {
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -474,7 +474,7 @@ describe('MdAutocomplete', () => {
 
       fixture.whenStable().then(() => {
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -493,7 +493,7 @@ describe('MdAutocomplete', () => {
         fixture.detectChanges();
 
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
 
         fixture.detectChanges();
@@ -568,7 +568,7 @@ describe('MdAutocomplete', () => {
 
       fixture.whenStable().then(() => {
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -648,7 +648,7 @@ describe('MdAutocomplete', () => {
     it('should set the active item to the first option when DOWN key is pressed', fakeAsync(() => {
       tick();
       const optionEls =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
@@ -680,7 +680,7 @@ describe('MdAutocomplete', () => {
     it('should set the active item to the last option when UP key is pressed', fakeAsync(() => {
       tick();
       const optionEls =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
       tick();
@@ -721,7 +721,7 @@ describe('MdAutocomplete', () => {
       fixture.detectChanges();
 
       const optionEls =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       expect(fixture.componentInstance.trigger.activeOption)
           .toBe(fixture.componentInstance.options.first,
@@ -1196,7 +1196,7 @@ describe('MdAutocomplete', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
         // Focus the option manually since the synthetic click may not do it.
         option.focus();
@@ -1309,7 +1309,7 @@ describe('MdAutocomplete', () => {
 
     it('should deselect any other selected option', async(() => {
       let options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[0].click();
       fixture.detectChanges();
 
@@ -1321,7 +1321,7 @@ describe('MdAutocomplete', () => {
             .toBe(true, `Clicked option should be selected.`);
 
         options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -1335,7 +1335,7 @@ describe('MdAutocomplete', () => {
 
     it('should call deselect only on the previous selected option', async(() => {
       let options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[0].click();
       fixture.detectChanges();
 
@@ -1349,7 +1349,7 @@ describe('MdAutocomplete', () => {
             .toBe(true, `Clicked option should be selected.`);
 
         options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         options[1].click();
         fixture.detectChanges();
 
@@ -1359,7 +1359,7 @@ describe('MdAutocomplete', () => {
     }));
   });
 
-  describe('without mdInput', () => {
+  describe('without matInput', () => {
     let fixture: ComponentFixture<AutocompleteWithNativeInput>;
 
     beforeEach(() => {
@@ -1389,7 +1389,7 @@ describe('MdAutocomplete', () => {
         fixture.detectChanges();
 
         const options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
         expect(options.length).toBe(1);
       }).not.toThrowError();
     });
@@ -1455,7 +1455,7 @@ describe('MdAutocomplete', () => {
       typeInElement('o', input);
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdOptions.length).toBe(2);
+      expect(fixture.componentInstance.matOptions.length).toBe(2);
     }));
 
     it('should throw if the user attempts to open the panel too early', async(() => {
@@ -1464,7 +1464,7 @@ describe('MdAutocomplete', () => {
 
       expect(() => {
         fixture.componentInstance.trigger.openPanel();
-      }).toThrow(getMdAutocompleteMissingPanelError());
+      }).toThrow(getMatAutocompleteMissingPanelError());
     }));
 
     it('should hide the placeholder with a preselected form control value ' +
@@ -1559,7 +1559,7 @@ describe('MdAutocomplete', () => {
     tick();
     fixture.detectChanges();
 
-    let options = overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+    let options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
     let spy = fixture.componentInstance.optionSelected;
 
     options[1].click();
@@ -1568,7 +1568,7 @@ describe('MdAutocomplete', () => {
 
     expect(spy).toHaveBeenCalledTimes(1);
 
-    let event = spy.calls.mostRecent().args[0] as MdAutocompleteSelectedEvent;
+    let event = spy.calls.mostRecent().args[0] as MatAutocompleteSelectedEvent;
 
     expect(event.source).toBe(fixture.componentInstance.autocomplete);
     expect(event.option.value).toBe('Washington');
@@ -1585,7 +1585,7 @@ describe('MdAutocomplete', () => {
     fixture.componentInstance.states.push('Puerto Rico');
     fixture.detectChanges();
 
-    let options = overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+    let options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
     let spy = fixture.componentInstance.optionSelected;
 
     options[3].click();
@@ -1594,7 +1594,7 @@ describe('MdAutocomplete', () => {
 
     expect(spy).toHaveBeenCalledTimes(1);
 
-    let event = spy.calls.mostRecent().args[0] as MdAutocompleteSelectedEvent;
+    let event = spy.calls.mostRecent().args[0] as MatAutocompleteSelectedEvent;
 
     expect(event.source).toBe(fixture.componentInstance.autocomplete);
     expect(event.option.value).toBe('Puerto Rico');
@@ -1603,15 +1603,15 @@ describe('MdAutocomplete', () => {
 
 @Component({
   template: `
-    <md-form-field [floatPlaceholder]="placeholder" [style.width.px]="width">
-      <input mdInput placeholder="State" [mdAutocomplete]="auto" [formControl]="stateCtrl">
-    </md-form-field>
+    <mat-form-field [floatPlaceholder]="placeholder" [style.width.px]="width">
+      <input matInput placeholder="State" [matAutocomplete]="auto" [formControl]="stateCtrl">
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete" [displayWith]="displayFn">
-      <md-option *ngFor="let state of filteredStates" [value]="state">
+    <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
+      <mat-option *ngFor="let state of filteredStates" [value]="state">
         <span> {{ state.code }}: {{ state.name }}  </span>
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class SimpleAutocomplete implements OnDestroy {
@@ -1621,10 +1621,10 @@ class SimpleAutocomplete implements OnDestroy {
   placeholder = 'auto';
   width: number;
 
-  @ViewChild(MdAutocompleteTrigger) trigger: MdAutocompleteTrigger;
-  @ViewChild(MdAutocomplete) panel: MdAutocomplete;
-  @ViewChild(MdFormField) formField: MdFormField;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
+  @ViewChild(MatAutocomplete) panel: MatAutocomplete;
+  @ViewChild(MatFormField) formField: MatFormField;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 
   states = [
     {code: 'AL', name: 'Alabama'},
@@ -1661,15 +1661,15 @@ class SimpleAutocomplete implements OnDestroy {
 
 @Component({
   template: `
-    <md-form-field *ngIf="isVisible">
-      <input mdInput placeholder="Choose" [mdAutocomplete]="auto" [formControl]="optionCtrl">
-    </md-form-field>
+    <mat-form-field *ngIf="isVisible">
+      <input matInput placeholder="Choose" [matAutocomplete]="auto" [formControl]="optionCtrl">
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let option of filteredOptions | async" [value]="option">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let option of filteredOptions | async" [value]="option">
          {{option}}
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class NgIfAutocomplete {
@@ -1678,8 +1678,8 @@ class NgIfAutocomplete {
   isVisible = true;
   options = ['One', 'Two', 'Three'];
 
-  @ViewChild(MdAutocompleteTrigger) trigger: MdAutocompleteTrigger;
-  @ViewChildren(MdOption) mdOptions: QueryList<MdOption>;
+  @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
+  @ViewChildren(MatOption) matOptions: QueryList<MatOption>;
 
   constructor() {
     this.filteredOptions = RxChain.from(this.optionCtrl.valueChanges)
@@ -1695,16 +1695,16 @@ class NgIfAutocomplete {
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput placeholder="State" [mdAutocomplete]="auto"
+    <mat-form-field>
+      <input matInput placeholder="State" [matAutocomplete]="auto"
       (input)="onInput($event.target?.value)">
-    </md-form-field>
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let state of filteredStates" [value]="state">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let state of filteredStates" [value]="state">
         <span> {{ state }}  </span>
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithoutForms {
@@ -1723,16 +1723,16 @@ class AutocompleteWithoutForms {
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput placeholder="State" [mdAutocomplete]="auto" [(ngModel)]="selectedState"
+    <mat-form-field>
+      <input matInput placeholder="State" [matAutocomplete]="auto" [(ngModel)]="selectedState"
       (ngModelChange)="onInput($event)">
-    </md-form-field>
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let state of filteredStates" [value]="state">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let state of filteredStates" [value]="state">
         <span>{{ state }}</span>
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithNgModel {
@@ -1751,15 +1751,15 @@ class AutocompleteWithNgModel {
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput placeholder="Number" [mdAutocomplete]="auto" [(ngModel)]="selectedNumber">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Number" [matAutocomplete]="auto" [(ngModel)]="selectedNumber">
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let number of numbers" [value]="number">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let number of numbers" [value]="number">
         <span>{{ number }}</span>
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithNumbers {
@@ -1770,13 +1770,13 @@ class AutocompleteWithNumbers {
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <md-form-field>
-      <input type="text" mdInput [mdAutocomplete]="auto">
-    </md-form-field>
+    <mat-form-field>
+      <input type="text" matInput [matAutocomplete]="auto">
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let option of options" [value]="option">{{ option }}</md-option>
-    </md-autocomplete>
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let option of options" [value]="option">{{ option }}</mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithOnPushDelay implements OnInit {
@@ -1791,13 +1791,13 @@ class AutocompleteWithOnPushDelay implements OnInit {
 
 @Component({
   template: `
-    <input placeholder="Choose" [mdAutocomplete]="auto" [formControl]="optionCtrl">
+    <input placeholder="Choose" [matAutocomplete]="auto" [formControl]="optionCtrl">
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let option of filteredOptions | async" [value]="option">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let option of filteredOptions | async" [value]="option">
          {{option}}
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithNativeInput {
@@ -1805,8 +1805,8 @@ class AutocompleteWithNativeInput {
   filteredOptions: Observable<any>;
   options = ['En', 'To', 'Tre', 'Fire', 'Fem'];
 
-  @ViewChild(MdAutocompleteTrigger) trigger: MdAutocompleteTrigger;
-  @ViewChildren(MdOption) mdOptions: QueryList<MdOption>;
+  @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
+  @ViewChildren(MatOption) matOptions: QueryList<MatOption>;
 
   constructor() {
     this.filteredOptions = RxChain.from(this.optionCtrl.valueChanges)
@@ -1821,22 +1821,22 @@ class AutocompleteWithNativeInput {
 
 
 @Component({
-  template: `<input placeholder="Choose" [mdAutocomplete]="auto">`
+  template: `<input placeholder="Choose" [matAutocomplete]="auto">`
 })
 class AutocompleteWithoutPanel {
-  @ViewChild(MdAutocompleteTrigger) trigger: MdAutocompleteTrigger;
+  @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
 }
 
 
 @Component({
   template: `
-    <md-form-field floatPlaceholder="never">
-      <input placeholder="State" mdInput [mdAutocomplete]="auto" [formControl]="formControl">
-    </md-form-field>
+    <mat-form-field floatPlaceholder="never">
+      <input placeholder="State" matInput [matAutocomplete]="auto" [formControl]="formControl">
+    </mat-form-field>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option value="California">California</md-option>
-    </md-autocomplete>
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option value="California">California</mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithFormsAndNonfloatingPlaceholder {
@@ -1846,21 +1846,21 @@ class AutocompleteWithFormsAndNonfloatingPlaceholder {
 
 @Component({
   template: `
-    <md-input-container>
-      <input mdInput placeholder="State" [mdAutocomplete]="auto" [(ngModel)]="selectedState">
-    </md-input-container>
+    <mat-input-container>
+      <input matInput placeholder="State" [matAutocomplete]="auto" [(ngModel)]="selectedState">
+    </mat-input-container>
 
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-optgroup *ngFor="let group of stateGroups" [label]="group.label">
-        <md-option *ngFor="let state of group.states" [value]="state">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-optgroup *ngFor="let group of stateGroups" [label]="group.label">
+        <mat-option *ngFor="let state of group.states" [value]="state">
           <span>{{ state }}</span>
-        </md-option>
-      </md-optgroup>
-    </md-autocomplete>
+        </mat-option>
+      </mat-optgroup>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithGroups {
-  @ViewChild(MdAutocompleteTrigger) trigger: MdAutocompleteTrigger;
+  @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
   selectedState: string;
   stateGroups = [
     {
@@ -1880,15 +1880,15 @@ class AutocompleteWithGroups {
 
 @Component({
   template: `
-    <md-input-container>
-      <input mdInput placeholder="State" [mdAutocomplete]="auto" [(ngModel)]="selectedState">
-    </md-input-container>
+    <mat-input-container>
+      <input matInput placeholder="State" [matAutocomplete]="auto" [(ngModel)]="selectedState">
+    </mat-input-container>
 
-    <md-autocomplete #auto="mdAutocomplete" (optionSelected)="optionSelected($event)">
-      <md-option *ngFor="let state of states" [value]="state">
+    <mat-autocomplete #auto="matAutocomplete" (optionSelected)="optionSelected($event)">
+      <mat-option *ngFor="let state of states" [value]="state">
         <span>{{ state }}</span>
-      </md-option>
-    </md-autocomplete>
+      </mat-option>
+    </mat-autocomplete>
   `
 })
 class AutocompleteWithSelectEvent {
@@ -1896,6 +1896,6 @@ class AutocompleteWithSelectEvent {
   states = ['New York', 'Washington', 'Oregon'];
   optionSelected = jasmine.createSpy('optionSelected callback');
 
-  @ViewChild(MdAutocompleteTrigger) trigger: MdAutocompleteTrigger;
-  @ViewChild(MdAutocomplete) autocomplete: MdAutocomplete;
+  @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
+  @ViewChild(MatAutocomplete) autocomplete: MatAutocomplete;
 }
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index 24c29d411fd7..86b415352932 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -21,7 +21,7 @@ import {
   EventEmitter,
   Output,
 } from '@angular/core';
-import {MdOption, MdOptgroup} from '@angular/material/core';
+import {MatOption, MatOptgroup} from '@angular/material/core';
 import {ActiveDescendantKeyManager} from '@angular/cdk/a11y';
 
 
@@ -32,28 +32,28 @@ import {ActiveDescendantKeyManager} from '@angular/cdk/a11y';
 let _uniqueAutocompleteIdCounter = 0;
 
 /** Event object that is emitted when an autocomplete option is selected */
-export class MdAutocompleteSelectedEvent {
-  constructor(public source: MdAutocomplete, public option: MdOption) { }
+export class MatAutocompleteSelectedEvent {
+  constructor(public source: MatAutocomplete, public option: MatOption) { }
 }
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-autocomplete, mat-autocomplete',
+  selector: 'mat-autocomplete',
   templateUrl: 'autocomplete.html',
   styleUrls: ['autocomplete.css'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  exportAs: 'mdAutocomplete, matAutocomplete',
+  exportAs: 'matAutocomplete',
   host: {
     'class': 'mat-autocomplete'
   }
 })
-export class MdAutocomplete implements AfterContentInit {
+export class MatAutocomplete implements AfterContentInit {
 
   /** Manages active item in option list based on key events. */
-  _keyManager: ActiveDescendantKeyManager<MdOption>;
+  _keyManager: ActiveDescendantKeyManager<MatOption>;
 
   /** Whether the autocomplete panel should be visible, depending on option length. */
   showPanel = false;
@@ -65,25 +65,25 @@ export class MdAutocomplete implements AfterContentInit {
   @ViewChild('panel') panel: ElementRef;
 
   /** @docs-private */
-  @ContentChildren(MdOption, { descendants: true }) options: QueryList<MdOption>;
+  @ContentChildren(MatOption, { descendants: true }) options: QueryList<MatOption>;
 
   /** @docs-private */
-  @ContentChildren(MdOptgroup) optionGroups: QueryList<MdOptgroup>;
+  @ContentChildren(MatOptgroup) optionGroups: QueryList<MatOptgroup>;
 
   /** Function that maps an option's control value to its display value in the trigger. */
   @Input() displayWith: ((value: any) => string) | null = null;
 
   /** Event that is emitted whenever an option from the list is selected. */
-  @Output() optionSelected: EventEmitter<MdAutocompleteSelectedEvent> =
-      new EventEmitter<MdAutocompleteSelectedEvent>();
+  @Output() optionSelected: EventEmitter<MatAutocompleteSelectedEvent> =
+      new EventEmitter<MatAutocompleteSelectedEvent>();
 
   /** Unique ID to be used by autocomplete trigger's "aria-owns" property. */
-  id: string = `md-autocomplete-${_uniqueAutocompleteIdCounter++}`;
+  id: string = `mat-autocomplete-${_uniqueAutocompleteIdCounter++}`;
 
   constructor(private _changeDetectorRef: ChangeDetectorRef) { }
 
   ngAfterContentInit() {
-    this._keyManager = new ActiveDescendantKeyManager<MdOption>(this.options).withWrap();
+    this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withWrap();
   }
 
   /**
@@ -110,8 +110,8 @@ export class MdAutocomplete implements AfterContentInit {
   }
 
   /** Emits the `select` event. */
-  _emitSelectEvent(option: MdOption): void {
-    const event = new MdAutocompleteSelectedEvent(this, option);
+  _emitSelectEvent(option: MatOption): void {
+    const event = new MatAutocompleteSelectedEvent(this, option);
     this.optionSelected.emit(event);
   }
 
diff --git a/src/lib/autocomplete/mat-exports.ts b/src/lib/autocomplete/mat-exports.ts
deleted file mode 100644
index adf1f587a717..000000000000
--- a/src/lib/autocomplete/mat-exports.ts
+++ /dev/null
@@ -1,27 +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 {MdAutocomplete} from './autocomplete';
-import {MdAutocompleteModule} from './autocomplete-module';
-import {
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER,
-  MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MD_AUTOCOMPLETE_VALUE_ACCESSOR,
-  MdAutocompleteTrigger,
-} from './autocomplete-trigger';
-
-
-/* tslint:disable:max-line-length */
-export {MD_AUTOCOMPLETE_SCROLL_STRATEGY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY};
-export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER};
-export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MD_AUTOCOMPLETE_VALUE_ACCESSOR as MAT_AUTOCOMPLETE_VALUE_ACCESSOR};
-export {MdAutocomplete as MatAutocomplete};
-export {MdAutocompleteModule as MatAutocompleteModule};
-export {MdAutocompleteTrigger as MatAutocompleteTrigger};
diff --git a/src/lib/autocomplete/public_api.ts b/src/lib/autocomplete/public_api.ts
index ce1e1dfacde8..dab3c54fc9d8 100644
--- a/src/lib/autocomplete/public_api.ts
+++ b/src/lib/autocomplete/public_api.ts
@@ -9,4 +9,4 @@
 export * from './autocomplete';
 export * from './autocomplete-module';
 export * from './autocomplete-trigger';
-export * from './mat-exports';
+
diff --git a/src/lib/button-toggle/_button-toggle-theme.scss b/src/lib/button-toggle/_button-toggle-theme.scss
index 83715baa6f7c..f381958472f9 100644
--- a/src/lib/button-toggle/_button-toggle-theme.scss
+++ b/src/lib/button-toggle/_button-toggle-theme.scss
@@ -2,7 +2,7 @@
 @import '../core/theming/theming';
 @import '../core/typography/typography-utils';
 
-// Applies a focus style to an md-button-toggle element for each of the supported palettes.
+// Applies a focus style to an mat-button-toggle element for each of the supported palettes.
 @mixin _mat-button-toggle-focus-color($theme) {
   $background: map-get($theme, background);
 
diff --git a/src/lib/button-toggle/button-toggle-module.ts b/src/lib/button-toggle/button-toggle-module.ts
index e14857e5b6a2..f3e6271430ce 100644
--- a/src/lib/button-toggle/button-toggle-module.ts
+++ b/src/lib/button-toggle/button-toggle-module.ts
@@ -7,20 +7,20 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
-import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MdCommonModule} from '@angular/material/core';
+import {MatButtonToggleGroup, MatButtonToggleGroupMultiple, MatButtonToggle} from './button-toggle';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MatCommonModule} from '@angular/material/core';
 import {A11yModule} from '@angular/cdk/a11y';
 
 
 @NgModule({
-  imports: [MdCommonModule, A11yModule],
+  imports: [MatCommonModule, A11yModule],
   exports: [
-    MdButtonToggleGroup,
-    MdButtonToggleGroupMultiple,
-    MdButtonToggle,
-    MdCommonModule,
+    MatButtonToggleGroup,
+    MatButtonToggleGroupMultiple,
+    MatButtonToggle,
+    MatCommonModule,
   ],
-  declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
+  declarations: [MatButtonToggleGroup, MatButtonToggleGroupMultiple, MatButtonToggle],
   providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
 })
-export class MdButtonToggleModule {}
+export class MatButtonToggleModule {}
diff --git a/src/lib/button-toggle/button-toggle.md b/src/lib/button-toggle/button-toggle.md
index 2d63576f1f83..da133c4d223c 100644
--- a/src/lib/button-toggle/button-toggle.md
+++ b/src/lib/button-toggle/button-toggle.md
@@ -1,17 +1,17 @@
-`<md-button-toggle>` are on/off toggles with the appearance of a button. These toggles can be 
+`<mat-button-toggle>` are on/off toggles with the appearance of a button. These toggles can be 
 configured to behave as either radio-buttons or checkboxes. While they can be standalone, they are 
-typically part of a `md-button-toggle-group`.
+typically part of a `mat-button-toggle-group`.
 
 
 <!-- example(button-toggle-overview) -->
 
 ### Exclusive selection vs. multiple selection
-By default, `md-button-toggle-group` acts like a radio-button group- only one item can be selected.
-In this mode, the `value` of the `md-button-toggle-group` will reflect the value of the selected 
+By default, `mat-button-toggle-group` acts like a radio-button group- only one item can be selected.
+In this mode, the `value` of the `mat-button-toggle-group` will reflect the value of the selected 
 button and `ngModel` is supported. 
 
 Adding the `multiple` attribute allows multiple items to be selected (checkbox behavior). In this
-mode the values of the the toggles are not used, the `md-button-toggle-group` does not have a value, 
+mode the values of the the toggles are not used, the `mat-button-toggle-group` does not have a value, 
 and `ngModel` is not supported.
 
 ### Accessibility
diff --git a/src/lib/button-toggle/button-toggle.spec.ts b/src/lib/button-toggle/button-toggle.spec.ts
index 48fd73fe1b28..fa793edd8a39 100644
--- a/src/lib/button-toggle/button-toggle.spec.ts
+++ b/src/lib/button-toggle/button-toggle.spec.ts
@@ -9,19 +9,19 @@ import {NgModel, FormsModule, ReactiveFormsModule, FormControl} from '@angular/f
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {
-  MdButtonToggleGroup,
-  MdButtonToggle,
-  MdButtonToggleGroupMultiple,
-  MdButtonToggleChange,
-  MdButtonToggleModule,
+  MatButtonToggleGroup,
+  MatButtonToggle,
+  MatButtonToggleGroupMultiple,
+  MatButtonToggleChange,
+  MatButtonToggleModule,
 } from './index';
 
 
-describe('MdButtonToggle with forms', () => {
+describe('MatButtonToggle with forms', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonToggleModule, FormsModule, ReactiveFormsModule],
+      imports: [MatButtonToggleModule, FormsModule, ReactiveFormsModule],
       declarations: [
         ButtonToggleGroupWithNgModel,
         ButtonToggleGroupWithFormControl,
@@ -34,7 +34,7 @@ describe('MdButtonToggle with forms', () => {
   describe('using FormControl', () => {
     let fixture: ComponentFixture<ButtonToggleGroupWithFormControl>;
     let groupDebugElement: DebugElement;
-    let groupInstance: MdButtonToggleGroup;
+    let groupInstance: MatButtonToggleGroup;
     let testComponent: ButtonToggleGroupWithFormControl;
 
     beforeEach(async(() => {
@@ -43,8 +43,8 @@ describe('MdButtonToggle with forms', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
-      groupInstance = groupDebugElement.injector.get<MdButtonToggleGroup>(MdButtonToggleGroup);
+      groupDebugElement = fixture.debugElement.query(By.directive(MatButtonToggleGroup));
+      groupInstance = groupDebugElement.injector.get<MatButtonToggleGroup>(MatButtonToggleGroup);
     }));
 
     it('should toggle the disabled state', () => {
@@ -83,8 +83,8 @@ describe('MdButtonToggle with forms', () => {
     let groupNativeElement: HTMLElement;
     let buttonToggleDebugElements: DebugElement[];
     let buttonToggleNativeElements: HTMLElement[];
-    let groupInstance: MdButtonToggleGroup;
-    let buttonToggleInstances: MdButtonToggle[];
+    let groupInstance: MatButtonToggleGroup;
+    let buttonToggleInstances: MatButtonToggle[];
     let testComponent: ButtonToggleGroupWithNgModel;
     let groupNgModel: NgModel;
     let buttonToggleLabels: HTMLElement[];
@@ -94,12 +94,12 @@ describe('MdButtonToggle with forms', () => {
       fixture.detectChanges();
       testComponent = fixture.debugElement.componentInstance;
 
-      groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
+      groupDebugElement = fixture.debugElement.query(By.directive(MatButtonToggleGroup));
       groupNativeElement = groupDebugElement.nativeElement;
-      groupInstance = groupDebugElement.injector.get<MdButtonToggleGroup>(MdButtonToggleGroup);
+      groupInstance = groupDebugElement.injector.get<MatButtonToggleGroup>(MatButtonToggleGroup);
       groupNgModel = groupDebugElement.injector.get<NgModel>(NgModel);
 
-      buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
+      buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MatButtonToggle));
       buttonToggleNativeElements =
         buttonToggleDebugElements.map(debugEl => debugEl.nativeElement);
       buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
@@ -181,11 +181,11 @@ describe('MdButtonToggle with forms', () => {
 
 });
 
-describe('MdButtonToggle without forms', () => {
+describe('MatButtonToggle without forms', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonToggleModule],
+      imports: [MatButtonToggleModule],
       declarations: [
         ButtonTogglesInsideButtonToggleGroup,
         ButtonTogglesInsideButtonToggleGroupMultiple,
@@ -207,8 +207,8 @@ describe('MdButtonToggle without forms', () => {
     let buttonToggleDebugElements: DebugElement[];
     let buttonToggleNativeElements: HTMLElement[];
     let buttonToggleLabelElements: HTMLLabelElement[];
-    let groupInstance: MdButtonToggleGroup;
-    let buttonToggleInstances: MdButtonToggle[];
+    let groupInstance: MatButtonToggleGroup;
+    let buttonToggleInstances: MatButtonToggle[];
     let testComponent: ButtonTogglesInsideButtonToggleGroup;
 
     beforeEach(() => {
@@ -217,11 +217,11 @@ describe('MdButtonToggle without forms', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
+      groupDebugElement = fixture.debugElement.query(By.directive(MatButtonToggleGroup));
       groupNativeElement = groupDebugElement.nativeElement;
-      groupInstance = groupDebugElement.injector.get<MdButtonToggleGroup>(MdButtonToggleGroup);
+      groupInstance = groupDebugElement.injector.get<MatButtonToggleGroup>(MatButtonToggleGroup);
 
-      buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
+      buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MatButtonToggle));
 
       buttonToggleNativeElements = buttonToggleDebugElements
         .map(debugEl => debugEl.nativeElement);
@@ -366,9 +366,9 @@ describe('MdButtonToggle without forms', () => {
     it('should not fire an initial change event', () => {
       let fixture = TestBed.createComponent(ButtonToggleGroupWithInitialValue);
       let testComponent = fixture.debugElement.componentInstance;
-      let groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
-      let groupInstance: MdButtonToggleGroup = groupDebugElement.injector
-          .get<MdButtonToggleGroup>(MdButtonToggleGroup);
+      let groupDebugElement = fixture.debugElement.query(By.directive(MatButtonToggleGroup));
+      let groupInstance: MatButtonToggleGroup = groupDebugElement.injector
+          .get<MatButtonToggleGroup>(MatButtonToggleGroup);
 
       fixture.detectChanges();
 
@@ -391,8 +391,8 @@ describe('MdButtonToggle without forms', () => {
     let buttonToggleDebugElements: DebugElement[];
     let buttonToggleNativeElements: HTMLElement[];
     let buttonToggleLabelElements: HTMLLabelElement[];
-    let groupInstance: MdButtonToggleGroupMultiple;
-    let buttonToggleInstances: MdButtonToggle[];
+    let groupInstance: MatButtonToggleGroupMultiple;
+    let buttonToggleInstances: MatButtonToggle[];
     let testComponent: ButtonTogglesInsideButtonToggleGroupMultiple;
 
     beforeEach(async(() => {
@@ -401,12 +401,12 @@ describe('MdButtonToggle without forms', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroupMultiple));
+      groupDebugElement = fixture.debugElement.query(By.directive(MatButtonToggleGroupMultiple));
       groupNativeElement = groupDebugElement.nativeElement;
-      groupInstance = groupDebugElement.injector.get<MdButtonToggleGroupMultiple>(
-          MdButtonToggleGroupMultiple);
+      groupInstance = groupDebugElement.injector.get<MatButtonToggleGroupMultiple>(
+          MatButtonToggleGroupMultiple);
 
-      buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
+      buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MatButtonToggle));
       buttonToggleNativeElements = buttonToggleDebugElements
         .map(debugEl => debugEl.nativeElement);
       buttonToggleLabelElements = fixture.debugElement.queryAll(By.css('label'))
@@ -499,7 +499,7 @@ describe('MdButtonToggle without forms', () => {
     let buttonToggleDebugElement: DebugElement;
     let buttonToggleNativeElement: HTMLElement;
     let buttonToggleLabelElement: HTMLLabelElement;
-    let buttonToggleInstance: MdButtonToggle;
+    let buttonToggleInstance: MatButtonToggle;
     let testComponent: StandaloneButtonToggle;
 
     beforeEach(async(() => {
@@ -508,7 +508,7 @@ describe('MdButtonToggle without forms', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      buttonToggleDebugElement = fixture.debugElement.query(By.directive(MdButtonToggle));
+      buttonToggleDebugElement = fixture.debugElement.query(By.directive(MatButtonToggle));
       buttonToggleNativeElement = buttonToggleDebugElement.nativeElement;
       buttonToggleLabelElement = fixture.debugElement.query(By.css('label')).nativeElement;
       buttonToggleInstance = buttonToggleDebugElement.componentInstance;
@@ -567,7 +567,7 @@ describe('MdButtonToggle without forms', () => {
 
     it('should use the provided aria-label', () => {
       let fixture = TestBed.createComponent(ButtonToggleWithAriaLabel);
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdButtonToggle));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatButtonToggle));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = checkboxNativeElement.querySelector('input') as HTMLInputElement;
 
@@ -583,7 +583,7 @@ describe('MdButtonToggle without forms', () => {
 
     it('should use the provided aria-labelledby', () => {
       let fixture = TestBed.createComponent(ButtonToggleWithAriaLabelledby);
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdButtonToggle));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatButtonToggle));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = checkboxNativeElement.querySelector('input') as HTMLInputElement;
 
@@ -593,7 +593,7 @@ describe('MdButtonToggle without forms', () => {
 
     it('should not assign aria-labelledby if none is provided', () => {
       let fixture = TestBed.createComponent(StandaloneButtonToggle);
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdButtonToggle));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatButtonToggle));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = checkboxNativeElement.querySelector('input') as HTMLInputElement;
 
@@ -605,11 +605,13 @@ describe('MdButtonToggle without forms', () => {
 
 @Component({
   template: `
-  <md-button-toggle-group [disabled]="isGroupDisabled" [vertical]="isVertical" [value]="groupValue">
-    <md-button-toggle value="test1">Test1</md-button-toggle>
-    <md-button-toggle value="test2">Test2</md-button-toggle>
-    <md-button-toggle value="test3">Test3</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group [disabled]="isGroupDisabled"
+                           [vertical]="isVertical"
+                           [value]="groupValue">
+    <mat-button-toggle value="test1">Test1</mat-button-toggle>
+    <mat-button-toggle value="test2">Test2</mat-button-toggle>
+    <mat-button-toggle value="test3">Test3</mat-button-toggle>
+  </mat-button-toggle-group>
   `
 })
 class ButtonTogglesInsideButtonToggleGroup {
@@ -620,11 +622,11 @@ class ButtonTogglesInsideButtonToggleGroup {
 
 @Component({
   template: `
-  <md-button-toggle-group [(ngModel)]="modelValue" (change)="lastEvent = $event">
-    <md-button-toggle *ngFor="let option of options" [value]="option.value">
+  <mat-button-toggle-group [(ngModel)]="modelValue" (change)="lastEvent = $event">
+    <mat-button-toggle *ngFor="let option of options" [value]="option.value">
       {{option.label}}
-    </md-button-toggle>
-  </md-button-toggle-group>
+    </mat-button-toggle>
+  </mat-button-toggle-group>
   `
 })
 class ButtonToggleGroupWithNgModel {
@@ -634,16 +636,16 @@ class ButtonToggleGroupWithNgModel {
     {label: 'Green', value: 'green'},
     {label: 'Blue', value: 'blue'},
   ];
-  lastEvent: MdButtonToggleChange;
+  lastEvent: MatButtonToggleChange;
 }
 
 @Component({
   template: `
-  <md-button-toggle-group [disabled]="isGroupDisabled" [vertical]="isVertical" multiple>
-    <md-button-toggle value="eggs">Eggs</md-button-toggle>
-    <md-button-toggle value="flour">Flour</md-button-toggle>
-    <md-button-toggle value="sugar">Sugar</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group [disabled]="isGroupDisabled" [vertical]="isVertical" multiple>
+    <mat-button-toggle value="eggs">Eggs</mat-button-toggle>
+    <mat-button-toggle value="flour">Flour</mat-button-toggle>
+    <mat-button-toggle value="sugar">Sugar</mat-button-toggle>
+  </mat-button-toggle-group>
   `
 })
 class ButtonTogglesInsideButtonToggleGroupMultiple {
@@ -653,30 +655,30 @@ class ButtonTogglesInsideButtonToggleGroupMultiple {
 
 @Component({
   template: `
-  <md-button-toggle>Yes</md-button-toggle>
+  <mat-button-toggle>Yes</mat-button-toggle>
   `
 })
 class StandaloneButtonToggle { }
 
 @Component({
   template: `
-  <md-button-toggle-group (change)="lastEvent = $event" value="red">
-    <md-button-toggle value="red">Value Red</md-button-toggle>
-    <md-button-toggle value="green">Value Green</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group (change)="lastEvent = $event" value="red">
+    <mat-button-toggle value="red">Value Red</mat-button-toggle>
+    <mat-button-toggle value="green">Value Green</mat-button-toggle>
+  </mat-button-toggle-group>
   `
 })
 class ButtonToggleGroupWithInitialValue {
-  lastEvent: MdButtonToggleChange;
+  lastEvent: MatButtonToggleChange;
 }
 
 @Component({
   template: `
-  <md-button-toggle-group [formControl]="control">
-    <md-button-toggle value="red">Value Red</md-button-toggle>
-    <md-button-toggle value="green">Value Green</md-button-toggle>
-    <md-button-toggle value="blue">Value Blue</md-button-toggle>
-  </md-button-toggle-group>
+  <mat-button-toggle-group [formControl]="control">
+    <mat-button-toggle value="red">Value Red</mat-button-toggle>
+    <mat-button-toggle value="green">Value Green</mat-button-toggle>
+    <mat-button-toggle value="blue">Value Blue</mat-button-toggle>
+  </mat-button-toggle-group>
   `
 })
 class ButtonToggleGroupWithFormControl {
@@ -685,12 +687,12 @@ class ButtonToggleGroupWithFormControl {
 
 /** Simple test component with an aria-label set. */
 @Component({
-  template: `<md-button-toggle aria-label="Super effective"></md-button-toggle>`
+  template: `<mat-button-toggle aria-label="Super effective"></mat-button-toggle>`
 })
 class ButtonToggleWithAriaLabel { }
 
 /** Simple test component with an aria-label set. */
 @Component({
-  template: `<md-button-toggle aria-labelledby="some-id"></md-button-toggle>`
+  template: `<mat-button-toggle aria-labelledby="some-id"></mat-button-toggle>`
 })
 class ButtonToggleWithAriaLabelledby {}
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index cb45c07dec00..7bc8fa72da90 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -34,58 +34,58 @@ import {FocusMonitor} from '@angular/cdk/a11y';
 /** Acceptable types for a button toggle. */
 export type ToggleType = 'checkbox' | 'radio';
 
-// Boilerplate for applying mixins to MdButtonToggleGroup and MdButtonToggleGroupMultiple
+// Boilerplate for applying mixins to MatButtonToggleGroup and MatButtonToggleGroupMultiple
 /** @docs-private */
-export class MdButtonToggleGroupBase {}
-export const _MdButtonToggleGroupMixinBase = mixinDisabled(MdButtonToggleGroupBase);
+export class MatButtonToggleGroupBase {}
+export const _MatButtonToggleGroupMixinBase = mixinDisabled(MatButtonToggleGroupBase);
 
 /**
- * Provider Expression that allows md-button-toggle-group to register as a ControlValueAccessor.
+ * Provider Expression that allows mat-button-toggle-group to register as a ControlValueAccessor.
  * This allows it to support [(ngModel)].
  * @docs-private
  */
-export const MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR: any = {
+export const MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdButtonToggleGroup),
+  useExisting: forwardRef(() => MatButtonToggleGroup),
   multi: true
 };
 
 let _uniqueIdCounter = 0;
 
-/** Change event object emitted by MdButtonToggle. */
-export class MdButtonToggleChange {
-  /** The MdButtonToggle that emits the event. */
-  source: MdButtonToggle | null;
-  /** The value assigned to the MdButtonToggle. */
+/** Change event object emitted by MatButtonToggle. */
+export class MatButtonToggleChange {
+  /** The MatButtonToggle that emits the event. */
+  source: MatButtonToggle | null;
+  /** The value assigned to the MatButtonToggle. */
   value: any;
 }
 
 /** Exclusive selection button toggle group that behaves like a radio-button group. */
 @Directive({
-  selector: 'md-button-toggle-group:not([multiple]), mat-button-toggle-group:not([multiple])',
-  providers: [MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR],
+  selector: 'mat-button-toggle-group:not([multiple])',
+  providers: [MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR],
   inputs: ['disabled'],
   host: {
     'role': 'radiogroup',
     'class': 'mat-button-toggle-group',
     '[class.mat-button-toggle-vertical]': 'vertical'
   },
-  exportAs: 'mdButtonToggleGroup, matButtonToggleGroup',
+  exportAs: 'matButtonToggleGroup',
 })
-export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
+export class MatButtonToggleGroup extends _MatButtonToggleGroupMixinBase
     implements ControlValueAccessor, CanDisable {
 
   /** The value for the button toggle group. Should match currently selected button toggle. */
   private _value: any = null;
 
   /** The HTML name attribute applied to toggles in this group. */
-  private _name: string = `md-button-toggle-group-${_uniqueIdCounter++}`;
+  private _name: string = `mat-button-toggle-group-${_uniqueIdCounter++}`;
 
   /** Whether the button toggle group should be vertical. */
   private _vertical: boolean = false;
 
   /** The currently selected button toggle, should match the value. */
-  private _selected: MdButtonToggle | null = null;
+  private _selected: MatButtonToggle | null = null;
 
   /**
    * The method to be called in order to update ngModel.
@@ -97,7 +97,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
   onTouched: () => any = () => {};
 
   /** Child button toggle buttons. */
-  @ContentChildren(forwardRef(() => MdButtonToggle)) _buttonToggles: QueryList<MdButtonToggle>;
+  @ContentChildren(forwardRef(() => MatButtonToggle)) _buttonToggles: QueryList<MatButtonToggle>;
 
   /** `name` attribute for the underlying `input` element. */
   @Input()
@@ -139,7 +139,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
     return this._selected;
   }
 
-  set selected(selected: MdButtonToggle | null) {
+  set selected(selected: MatButtonToggle | null) {
     this._selected = selected;
     this.value = selected ? selected.value : null;
 
@@ -149,7 +149,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
   }
 
   /** Event emitted when the group's value changes. */
-  @Output() change: EventEmitter<MdButtonToggleChange> = new EventEmitter<MdButtonToggleChange>();
+  @Output() change: EventEmitter<MatButtonToggleChange> = new EventEmitter<MatButtonToggleChange>();
 
   constructor(private _changeDetector: ChangeDetectorRef) {
     super();
@@ -184,7 +184,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
 
   /** Dispatch change event with current selection and group value. */
   _emitChangeEvent(): void {
-    let event = new MdButtonToggleChange();
+    let event = new MatButtonToggleChange();
     event.source = this._selected;
     event.value = this._value;
     this._controlValueAccessorChangeFn(event.value);
@@ -229,8 +229,8 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
 
 /** Multiple selection button-toggle group. `ngModel` is not supported in this mode. */
 @Directive({
-  selector: 'md-button-toggle-group[multiple], mat-button-toggle-group[multiple]',
-  exportAs: 'mdButtonToggleGroup, matButtonToggleGroup',
+  selector: 'mat-button-toggle-group[multiple]',
+  exportAs: 'matButtonToggleGroup',
   inputs: ['disabled'],
   host: {
     'class': 'mat-button-toggle-group',
@@ -238,7 +238,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
     'role': 'group'
   }
 })
-export class MdButtonToggleGroupMultiple extends _MdButtonToggleGroupMixinBase
+export class MatButtonToggleGroupMultiple extends _MatButtonToggleGroupMixinBase
     implements CanDisable {
 
   /** Whether the button toggle group should be vertical. */
@@ -258,7 +258,7 @@ export class MdButtonToggleGroupMultiple extends _MdButtonToggleGroupMixinBase
 /** Single button inside of a toggle group. */
 @Component({
   moduleId: module.id,
-  selector: 'md-button-toggle, mat-button-toggle',
+  selector: 'mat-button-toggle',
   templateUrl: 'button-toggle.html',
   styleUrls: ['button-toggle.css'],
   encapsulation: ViewEncapsulation.None,
@@ -272,7 +272,7 @@ export class MdButtonToggleGroupMultiple extends _MdButtonToggleGroupMixinBase
     '[attr.id]': 'id',
   }
 })
-export class MdButtonToggle implements OnInit, OnDestroy {
+export class MatButtonToggle implements OnInit, OnDestroy {
   /**
    * Attached to the aria-label attribute of the host element. In most cases, arial-labelledby will
    * take precedence so this may be omitted.
@@ -305,10 +305,10 @@ export class MdButtonToggle implements OnInit, OnDestroy {
   @ViewChild('input') _inputElement: ElementRef;
 
   /** The parent button toggle group (exclusive selection). Optional. */
-  buttonToggleGroup: MdButtonToggleGroup;
+  buttonToggleGroup: MatButtonToggleGroup;
 
   /** The parent button toggle group (multiple selection). Optional. */
-  buttonToggleGroupMultiple: MdButtonToggleGroupMultiple;
+  buttonToggleGroupMultiple: MatButtonToggleGroupMultiple;
 
   /** Unique ID for the underlying `input` element. */
   get inputId(): string {
@@ -338,7 +338,7 @@ export class MdButtonToggle implements OnInit, OnDestroy {
     }
   }
 
-  /** MdButtonToggleGroup reads this to assign its own value. */
+  /** MatButtonToggleGroup reads this to assign its own value. */
   @Input()
   get value(): any {
     return this._value;
@@ -365,10 +365,10 @@ export class MdButtonToggle implements OnInit, OnDestroy {
   }
 
   /** Event emitted when the group value changes. */
-  @Output() change: EventEmitter<MdButtonToggleChange> = new EventEmitter<MdButtonToggleChange>();
+  @Output() change: EventEmitter<MatButtonToggleChange> = new EventEmitter<MatButtonToggleChange>();
 
-  constructor(@Optional() toggleGroup: MdButtonToggleGroup,
-              @Optional() toggleGroupMultiple: MdButtonToggleGroupMultiple,
+  constructor(@Optional() toggleGroup: MatButtonToggleGroup,
+              @Optional() toggleGroupMultiple: MatButtonToggleGroupMultiple,
               private _changeDetectorRef: ChangeDetectorRef,
               private _buttonToggleDispatcher: UniqueSelectionDispatcher,
               private _renderer: Renderer2,
@@ -400,7 +400,7 @@ export class MdButtonToggle implements OnInit, OnDestroy {
 
   ngOnInit() {
     if (this.id == null) {
-      this.id = `md-button-toggle-${_uniqueIdCounter++}`;
+      this.id = `mat-button-toggle-${_uniqueIdCounter++}`;
     }
 
     if (this.buttonToggleGroup && this._value == this.buttonToggleGroup.value) {
@@ -454,7 +454,7 @@ export class MdButtonToggle implements OnInit, OnDestroy {
 
   /** Dispatch change event with current value. */
   private _emitChangeEvent(): void {
-    let event = new MdButtonToggleChange();
+    let event = new MatButtonToggleChange();
     event.source = this;
     event.value = this._value;
     this.change.emit(event);
diff --git a/src/lib/button-toggle/mat-exports.ts b/src/lib/button-toggle/mat-exports.ts
deleted file mode 100644
index cc90bd8db34c..000000000000
--- a/src/lib/button-toggle/mat-exports.ts
+++ /dev/null
@@ -1,26 +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 {
-  MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR,
-  MdButtonToggle,
-  MdButtonToggleChange,
-  MdButtonToggleGroup,
-  MdButtonToggleGroupBase,
-  MdButtonToggleGroupMultiple,
-} from './button-toggle';
-import {MdButtonToggleModule} from './button-toggle-module';
-
-
-export {MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR};
-export {MdButtonToggle as MatButtonToggle};
-export {MdButtonToggleChange as MatButtonToggleChange};
-export {MdButtonToggleGroup as MatButtonToggleGroup};
-export {MdButtonToggleGroupBase as MatButtonToggleGroupBase};
-export {MdButtonToggleGroupMultiple as MatButtonToggleGroupMultiple};
-export {MdButtonToggleModule as MatButtonToggleModule};
diff --git a/src/lib/button-toggle/public_api.ts b/src/lib/button-toggle/public_api.ts
index 22b48b8b9e18..1912abb6d7e3 100644
--- a/src/lib/button-toggle/public_api.ts
+++ b/src/lib/button-toggle/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './button-toggle';
 export * from './button-toggle-module';
-export * from './mat-exports';
+
diff --git a/src/lib/button/_button-theme.scss b/src/lib/button/_button-theme.scss
index 53e182b2b245..661cb8015bec 100644
--- a/src/lib/button/_button-theme.scss
+++ b/src/lib/button/_button-theme.scss
@@ -1,7 +1,7 @@
 @import '../core/theming/theming';
 @import '../core/typography/typography-utils';
 
-// Applies a focus style to an md-button element for each of the supported palettes.
+// Applies a focus style to an mat-button element for each of the supported palettes.
 @mixin _mat-button-focus-color($theme) {
   $primary: map-get($theme, primary);
   $accent: map-get($theme, accent);
@@ -42,7 +42,7 @@
   }
 }
 
-// Applies a property to an md-button element for each of the supported palettes.
+// Applies a property to an mat-button element for each of the supported palettes.
 @mixin _mat-button-theme-color($theme, $property, $color: 'default') {
   $primary: map-get($theme, primary);
   $accent: map-get($theme, accent);
diff --git a/src/lib/button/button-module.ts b/src/lib/button/button-module.ts
index c32e3fa71ace..b72265dc739d 100644
--- a/src/lib/button/button-module.ts
+++ b/src/lib/button/button-module.ts
@@ -8,44 +8,44 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule, MdRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '@angular/material/core';
 import {A11yModule} from '@angular/cdk/a11y';
 import {
-  MdAnchor,
-  MdButton,
-  MdMiniFab,
-  MdButtonCssMatStyler,
-  MdFab,
-  MdIconButtonCssMatStyler,
-  MdRaisedButtonCssMatStyler
+  MatAnchor,
+  MatButton,
+  MatMiniFab,
+  MatButtonCssMatStyler,
+  MatFab,
+  MatIconButtonCssMatStyler,
+  MatRaisedButtonCssMatStyler
 } from './button';
 
 
 @NgModule({
   imports: [
     CommonModule,
-    MdRippleModule,
-    MdCommonModule,
+    MatRippleModule,
+    MatCommonModule,
     A11yModule,
   ],
   exports: [
-    MdButton,
-    MdAnchor,
-    MdMiniFab,
-    MdFab,
-    MdCommonModule,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
+    MatButton,
+    MatAnchor,
+    MatMiniFab,
+    MatFab,
+    MatCommonModule,
+    MatButtonCssMatStyler,
+    MatRaisedButtonCssMatStyler,
+    MatIconButtonCssMatStyler,
   ],
   declarations: [
-    MdButton,
-    MdAnchor,
-    MdMiniFab,
-    MdFab,
-    MdButtonCssMatStyler,
-    MdRaisedButtonCssMatStyler,
-    MdIconButtonCssMatStyler,
+    MatButton,
+    MatAnchor,
+    MatMiniFab,
+    MatFab,
+    MatButtonCssMatStyler,
+    MatRaisedButtonCssMatStyler,
+    MatIconButtonCssMatStyler,
   ],
 })
-export class MdButtonModule {}
+export class MatButtonModule {}
diff --git a/src/lib/button/button.html b/src/lib/button/button.html
index e7caa601203c..a9af6ab8b4c7 100644
--- a/src/lib/button/button.html
+++ b/src/lib/button/button.html
@@ -1,5 +1,5 @@
 <span class="mat-button-wrapper"><ng-content></ng-content></span>
-<div mat-ripple class="mat-button-ripple"
+<div matRipple class="mat-button-ripple"
      [class.mat-button-ripple-round]="_isRoundButton || _isIconButton"
      [matRippleDisabled]="_isRippleDisabled()"
      [matRippleCentered]="_isIconButton"
diff --git a/src/lib/button/button.md b/src/lib/button/button.md
index 7271f1ed8c7b..c2a5eaf1ddd1 100644
--- a/src/lib/button/button.md
+++ b/src/lib/button/button.md
@@ -12,17 +12,17 @@ There are five button variants, each applied as an attribute:
 
 | Attribute          | Description                                                                 |
 |--------------------|-----------------------------------------------------------------------------|
-| `md-button`        | Rectangular button w/ no elevation.                                         |
-| `md-raised-button` | Rectangular button w/ elevation                                             |
-| `md-icon-button`   | Circular button with a transparent background, meant to contain an icon     |
-| `md-fab`           | Circular button w/ elevation, defaults to theme's accent color              |
-| `md-mini-fab`      | Same as `md-fab` but smaller                                                |
+| `mat-button`        | Rectangular button w/ no elevation.                                         |
+| `mat-raised-button` | Rectangular button w/ elevation                                             |
+| `mat-icon-button`   | Circular button with a transparent background, meant to contain an icon     |
+| `mat-fab`           | Circular button w/ elevation, defaults to theme's accent color              |
+| `mat-mini-fab`      | Same as `mat-fab` but smaller                                                |
 
 
 ### Theming
 Buttons can be colored in terms of the current theme using the `color` property to set the
 background color to `primary`, `accent`, or `warn`. By default, only FABs (Floating Action Button) 
-are colored; the default background color for `md-button` and `md-raised-button` matches the theme's 
+are colored; the default background color for `mat-button` and `mat-raised-button` matches the theme's 
 background color.
 
 ### Capitalization
@@ -38,5 +38,5 @@ default. The `<button>` element should be used for any interaction that _perform
 current page_. The `<a>` element should be used for any interaction that _navigates to another
 view_.
 
-Buttons or links containing only icons (such as `md-fab`, `md-mini-fab`, and `md-icon-button`) should
+Buttons or links containing only icons (such as `mat-fab`, `mat-mini-fab`, and `mat-icon-button`) should
 be given a meaningful label via `aria-label` or `aria-labelledby`.
diff --git a/src/lib/button/button.spec.ts b/src/lib/button/button.spec.ts
index a7707a08d207..3aed8f7fafac 100644
--- a/src/lib/button/button.spec.ts
+++ b/src/lib/button/button.spec.ts
@@ -3,15 +3,15 @@ import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {FakeViewportRuler} from '@angular/cdk/testing';
-import {MdButtonModule} from './index';
-import {MdRipple} from '@angular/material/core';
+import {MatButtonModule} from './index';
+import {MatRipple} from '@angular/material/core';
 
 
-describe('MdButton', () => {
+describe('MatButton', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonModule],
+      imports: [MatButtonModule],
       declarations: [TestApp],
       providers: [
         {provide: ViewportRuler, useClass: FakeViewportRuler},
@@ -67,10 +67,10 @@ describe('MdButton', () => {
     expect(buttonDebugElement.nativeElement.classList.contains('custom-class')).toBe(true);
   });
 
-  describe('button[md-fab]', () => {
+  describe('button[mat-fab]', () => {
     it('should have accent palette by default', () => {
       const fixture = TestBed.createComponent(TestApp);
-      const fabButtonDebugEl = fixture.debugElement.query(By.css('button[md-fab]'));
+      const fabButtonDebugEl = fixture.debugElement.query(By.css('button[mat-fab]'));
 
       fixture.detectChanges();
 
@@ -79,10 +79,10 @@ describe('MdButton', () => {
     });
   });
 
-  describe('button[md-mini-fab]', () => {
+  describe('button[mat-mini-fab]', () => {
     it('should have accent palette by default', () => {
       const fixture = TestBed.createComponent(TestApp);
-      const miniFabButtonDebugEl = fixture.debugElement.query(By.css('button[md-mini-fab]'));
+      const miniFabButtonDebugEl = fixture.debugElement.query(By.css('button[mat-mini-fab]'));
 
       fixture.detectChanges();
 
@@ -92,7 +92,7 @@ describe('MdButton', () => {
   });
 
   // Regular button tests
-  describe('button[md-button]', () => {
+  describe('button[mat-button]', () => {
     it('should handle a click on the button', () => {
       let fixture = TestBed.createComponent(TestApp);
       let testComponent = fixture.debugElement.componentInstance;
@@ -128,7 +128,7 @@ describe('MdButton', () => {
   });
 
   // Anchor button tests
-  describe('a[md-button]', () => {
+  describe('a[mat-button]', () => {
     it('should not redirect if disabled', () => {
       let fixture = TestBed.createComponent(TestApp);
       let testComponent = fixture.debugElement.componentInstance;
@@ -188,10 +188,10 @@ describe('MdButton', () => {
     let testComponent: TestApp;
     let buttonDebugElement: DebugElement;
     let buttonRippleDebugElement: DebugElement;
-    let buttonRippleInstance: MdRipple;
+    let buttonRippleInstance: MatRipple;
     let anchorDebugElement: DebugElement;
     let anchorRippleDebugElement: DebugElement;
-    let anchorRippleInstance: MdRipple;
+    let anchorRippleInstance: MatRipple;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(TestApp);
@@ -199,16 +199,16 @@ describe('MdButton', () => {
 
       testComponent = fixture.componentInstance;
 
-      buttonDebugElement = fixture.debugElement.query(By.css('button[md-button]'));
-      buttonRippleDebugElement = buttonDebugElement.query(By.directive(MdRipple));
-      buttonRippleInstance = buttonRippleDebugElement.injector.get<MdRipple>(MdRipple);
+      buttonDebugElement = fixture.debugElement.query(By.css('button[mat-button]'));
+      buttonRippleDebugElement = buttonDebugElement.query(By.directive(MatRipple));
+      buttonRippleInstance = buttonRippleDebugElement.injector.get<MatRipple>(MatRipple);
 
-      anchorDebugElement = fixture.debugElement.query(By.css('a[md-button]'));
-      anchorRippleDebugElement = anchorDebugElement.query(By.directive(MdRipple));
-      anchorRippleInstance = anchorRippleDebugElement.injector.get<MdRipple>(MdRipple);
+      anchorDebugElement = fixture.debugElement.query(By.css('a[mat-button]'));
+      anchorRippleDebugElement = anchorDebugElement.query(By.directive(MatRipple));
+      anchorRippleInstance = anchorRippleDebugElement.injector.get<MatRipple>(MatRipple);
     });
 
-    it('should disable the ripple if mdRippleDisabled input is set', () => {
+    it('should disable the ripple if matRippleDisabled input is set', () => {
       expect(buttonRippleInstance.disabled).toBeFalsy();
 
       testComponent.rippleDisabled = true;
@@ -219,36 +219,38 @@ describe('MdButton', () => {
 
     it('should disable the ripple when the button is disabled', () => {
       expect(buttonRippleInstance.disabled).toBeFalsy(
-        'Expected an enabled button[md-button] to have an enabled ripple'
+        'Expected an enabled button[mat-button] to have an enabled ripple'
       );
       expect(anchorRippleInstance.disabled).toBeFalsy(
-        'Expected an enabled a[md-button] to have an enabled ripple'
+        'Expected an enabled a[mat-button] to have an enabled ripple'
       );
 
       testComponent.isDisabled = true;
       fixture.detectChanges();
 
       expect(buttonRippleInstance.disabled).toBeTruthy(
-        'Expected a disabled button[md-button] not to have an enabled ripple'
+        'Expected a disabled button[mat-button] not to have an enabled ripple'
       );
       expect(anchorRippleInstance.disabled).toBeTruthy(
-        'Expected a disabled a[md-button] not to have an enabled ripple'
+        'Expected a disabled a[mat-button] not to have an enabled ripple'
       );
     });
   });
 });
 
-/** Test component that contains an MdButton. */
+/** Test component that contains an MatButton. */
 @Component({
   selector: 'test-app',
   template: `
-    <button md-button type="button" (click)="increment()"
+    <button mat-button type="button" (click)="increment()"
       [disabled]="isDisabled" [color]="buttonColor" [disableRipple]="rippleDisabled">
       Go
     </button>
-    <a href="http://www.google.com" md-button [disabled]="isDisabled" [color]="buttonColor">Link</a>
-    <button md-fab>Fab Button</button>
-    <button md-mini-fab>Mini Fab Button</button>
+    <a href="http://www.google.com" mat-button [disabled]="isDisabled" [color]="buttonColor">
+      Link
+    </a>
+    <button mat-fab>Fab Button</button>
+    <button mat-mini-fab>Mini Fab Button</button>
   `
 })
 class TestApp {
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index d11c1776b299..3d498f4189c1 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -24,7 +24,6 @@ import {
   CanColor,
   CanDisable,
   CanDisableRipple,
-  MATERIAL_COMPATIBILITY_MODE,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple
@@ -34,7 +33,7 @@ import {FocusMonitor} from '@angular/cdk/a11y';
 
 // TODO(kara): Convert attribute selectors to classes when attr maps become available
 
-/** Default color palette for round buttons (md-fab and md-mini-fab) */
+/** Default color palette for round buttons (mat-fab and mat-mini-fab) */
 const DEFAULT_ROUND_BUTTON_COLOR = 'accent';
 
 
@@ -43,46 +42,43 @@ const DEFAULT_ROUND_BUTTON_COLOR = 'accent';
  * @docs-private
  */
 @Directive({
-  selector: 'button[md-button], button[mat-button], a[md-button], a[mat-button]',
+  selector: 'button[mat-button], a[mat-button]',
   host: {'class': 'mat-button'}
 })
-export class MdButtonCssMatStyler {}
+export class MatButtonCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector:
-      'button[md-raised-button], button[mat-raised-button], ' +
-      'a[md-raised-button], a[mat-raised-button]',
+  selector: 'button[mat-raised-button], a[mat-raised-button]',
   host: {'class': 'mat-raised-button'}
 })
-export class MdRaisedButtonCssMatStyler {}
+export class MatRaisedButtonCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector:
-      'button[md-icon-button], button[mat-icon-button], a[md-icon-button], a[mat-icon-button]',
+  selector: 'button[mat-icon-button], a[mat-icon-button]',
   host: {'class': 'mat-icon-button'}
 })
-export class MdIconButtonCssMatStyler {}
+export class MatIconButtonCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: 'button[md-fab], button[mat-fab], a[md-fab], a[mat-fab]',
+  selector: 'button[mat-fab], a[mat-fab]',
   host: {'class': 'mat-fab'}
 })
-export class MdFab {
-  constructor(@Self() @Optional() @Inject(forwardRef(() => MdButton)) button: MdButton,
-              @Self() @Optional() @Inject(forwardRef(() => MdAnchor)) anchor: MdAnchor) {
-    // Set the default color palette for the md-fab components.
+export class MatFab {
+  constructor(@Self() @Optional() @Inject(forwardRef(() => MatButton)) button: MatButton,
+              @Self() @Optional() @Inject(forwardRef(() => MatAnchor)) anchor: MatAnchor) {
+    // Set the default color palette for the mat-fab components.
     (button || anchor).color = DEFAULT_ROUND_BUTTON_COLOR;
   }
 }
@@ -93,24 +89,24 @@ export class MdFab {
  * @docs-private
  */
 @Directive({
-  selector: 'button[md-mini-fab], button[mat-mini-fab], a[md-mini-fab], a[mat-mini-fab]',
+  selector: 'button[mat-mini-fab], a[mat-mini-fab]',
   host: {'class': 'mat-mini-fab'}
 })
-export class MdMiniFab {
-  constructor(@Self() @Optional() @Inject(forwardRef(() => MdButton)) button: MdButton,
-              @Self() @Optional() @Inject(forwardRef(() => MdAnchor)) anchor: MdAnchor) {
-    // Set the default color palette for the md-mini-fab components.
+export class MatMiniFab {
+  constructor(@Self() @Optional() @Inject(forwardRef(() => MatButton)) button: MatButton,
+              @Self() @Optional() @Inject(forwardRef(() => MatAnchor)) anchor: MatAnchor) {
+    // Set the default color palette for the mat-mini-fab components.
     (button || anchor).color = DEFAULT_ROUND_BUTTON_COLOR;
   }
 }
 
 
-// Boilerplate for applying mixins to MdButton.
+// Boilerplate for applying mixins to MatButton.
 /** @docs-private */
-export class MdButtonBase {
+export class MatButtonBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(MdButtonBase)));
+export const _MatButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(MatButtonBase)));
 
 
 /**
@@ -118,9 +114,7 @@ export const _MdButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(Md
  */
 @Component({
   moduleId: module.id,
-  selector: `button[md-button], button[md-raised-button], button[md-icon-button],
-             button[md-fab], button[md-mini-fab],
-             button[mat-button], button[mat-raised-button], button[mat-icon-button],
+  selector: `button[mat-button], button[mat-raised-button], button[mat-icon-button],
              button[mat-fab], button[mat-mini-fab]`,
   host: {
     '[disabled]': 'disabled || null',
@@ -131,9 +125,8 @@ export const _MdButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(Md
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdButton extends _MdButtonMixinBase
+export class MatButton extends _MatButtonMixinBase
     implements OnDestroy, CanDisable, CanColor, CanDisableRipple {
 
   /** Whether the button is round. */
@@ -167,10 +160,7 @@ export class MdButton extends _MdButtonMixinBase
     return this.disableRipple || this.disabled;
   }
 
-  /**
-   * Gets whether the button has one of the given attributes
-   * with either an 'md-' or 'mat-' prefix.
-   */
+  /** Gets whether the button has one of the given attributes with a 'mat-' prefix. */
   _hasAttributeWithPrefix(...unprefixedAttributeNames: string[]) {
     // If not on the browser, say that there are none of the attributes present.
     // Since these only affect how the ripple displays (and ripples only happen on the client),
@@ -180,9 +170,7 @@ export class MdButton extends _MdButtonMixinBase
     }
 
     return unprefixedAttributeNames.some(suffix => {
-      const el = this._getHostElement();
-
-      return el.hasAttribute('md-' + suffix) || el.hasAttribute('mat-' + suffix);
+      return this._getHostElement().hasAttribute('mat-' + suffix);
     });
   }
 }
@@ -192,8 +180,7 @@ export class MdButton extends _MdButtonMixinBase
  */
 @Component({
   moduleId: module.id,
-  selector: `a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab],
-             a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab], a[mat-mini-fab]`,
+  selector: `a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab], a[mat-mini-fab]`,
   host: {
     '[attr.tabindex]': 'disabled ? -1 : 0',
     '[attr.disabled]': 'disabled || null',
@@ -207,7 +194,7 @@ export class MdButton extends _MdButtonMixinBase
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdAnchor extends MdButton {
+export class MatAnchor extends MatButton {
   constructor(
       platform: Platform,
       focusMonitor: FocusMonitor,
diff --git a/src/lib/button/mat-exports.ts b/src/lib/button/mat-exports.ts
deleted file mode 100644
index 61e08fd808dd..000000000000
--- a/src/lib/button/mat-exports.ts
+++ /dev/null
@@ -1,29 +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 {
-  MdAnchor,
-  MdButton,
-  MdButtonBase,
-  MdButtonCssMatStyler,
-  MdFab,
-  MdIconButtonCssMatStyler,
-  MdMiniFab,
-  MdRaisedButtonCssMatStyler,
-} from './button';
-import {MdButtonModule} from './button-module';
-
-export {MdButton as MatButton};
-export {MdButtonBase as MatButtonBase};
-export {MdButtonCssMatStyler as MatButtonCssMatStyler};
-export {MdButtonModule as MatButtonModule};
-export {MdAnchor as MatAnchor};
-export {MdIconButtonCssMatStyler as MatIconButtonCssMatStyler};
-export {MdFab as MatFab};
-export {MdMiniFab as MatMiniFab};
-export {MdRaisedButtonCssMatStyler as MatRaisedButtonCssMatStyler};
diff --git a/src/lib/button/public_api.ts b/src/lib/button/public_api.ts
index 7867a26b0db3..b8b9355bf302 100644
--- a/src/lib/button/public_api.ts
+++ b/src/lib/button/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './button-module';
 export * from './button';
-export * from './mat-exports';
+
diff --git a/src/lib/card/card-header.html b/src/lib/card/card-header.html
index 42cbd1b14252..74371726e671 100644
--- a/src/lib/card/card-header.html
+++ b/src/lib/card/card-header.html
@@ -1,7 +1,6 @@
-<ng-content select="[md-card-avatar], [mat-card-avatar], [mdCardAvatar], [matCardAvatar]"></ng-content>
+<ng-content select="[mat-card-avatar], [matCardAvatar]"></ng-content>
 <div class="mat-card-header-text">
-  <ng-content
-      select="md-card-title, mat-card-title, md-card-subtitle, mat-card-subtitle,
-      [md-card-title], [mat-card-title], [md-card-subtitle], [mat-card-subtitle]"></ng-content>
+  <ng-content select="mat-card-title, mat-card-subtitle, [mat-card-title], [mat-card-subtitle]">
+  </ng-content>
 </div>
 <ng-content></ng-content>
diff --git a/src/lib/card/card-module.ts b/src/lib/card/card-module.ts
index 3843333c7fd5..e30a338ff45e 100644
--- a/src/lib/card/card-module.ts
+++ b/src/lib/card/card-module.ts
@@ -7,48 +7,48 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '@angular/material/core';
 import {
-  MdCard,
-  MdCardHeader,
-  MdCardTitleGroup,
-  MdCardContent,
-  MdCardTitle,
-  MdCardSubtitle,
-  MdCardActions,
-  MdCardFooter,
-  MdCardSmImage,
-  MdCardMdImage,
-  MdCardLgImage,
-  MdCardImage,
-  MdCardXlImage,
-  MdCardAvatar,
+  MatCard,
+  MatCardHeader,
+  MatCardTitleGroup,
+  MatCardContent,
+  MatCardTitle,
+  MatCardSubtitle,
+  MatCardActions,
+  MatCardFooter,
+  MatCardSmImage,
+  MatCardMdImage,
+  MatCardLgImage,
+  MatCardImage,
+  MatCardXlImage,
+  MatCardAvatar,
 } from './card';
 
 
 @NgModule({
-  imports: [MdCommonModule],
+  imports: [MatCommonModule],
   exports: [
-    MdCard,
-    MdCardHeader,
-    MdCardTitleGroup,
-    MdCardContent,
-    MdCardTitle,
-    MdCardSubtitle,
-    MdCardActions,
-    MdCardFooter,
-    MdCardSmImage,
-    MdCardMdImage,
-    MdCardLgImage,
-    MdCardImage,
-    MdCardXlImage,
-    MdCardAvatar,
-    MdCommonModule,
+    MatCard,
+    MatCardHeader,
+    MatCardTitleGroup,
+    MatCardContent,
+    MatCardTitle,
+    MatCardSubtitle,
+    MatCardActions,
+    MatCardFooter,
+    MatCardSmImage,
+    MatCardMdImage,
+    MatCardLgImage,
+    MatCardImage,
+    MatCardXlImage,
+    MatCardAvatar,
+    MatCommonModule,
   ],
   declarations: [
-    MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
-    MdCardActions, MdCardFooter, MdCardSmImage, MdCardMdImage, MdCardLgImage, MdCardImage,
-    MdCardXlImage, MdCardAvatar,
+    MatCard, MatCardHeader, MatCardTitleGroup, MatCardContent, MatCardTitle, MatCardSubtitle,
+    MatCardActions, MatCardFooter, MatCardSmImage, MatCardMdImage, MatCardLgImage, MatCardImage,
+    MatCardXlImage, MatCardAvatar,
   ],
 })
-export class MdCardModule {}
+export class MatCardModule {}
diff --git a/src/lib/card/card-title-group.html b/src/lib/card/card-title-group.html
index 4e1d758f7f69..af6035693bdc 100644
--- a/src/lib/card/card-title-group.html
+++ b/src/lib/card/card-title-group.html
@@ -1,7 +1,6 @@
 <div>
-  <ng-content
-      select="md-card-title, mat-card-title, md-card-subtitle, mat-card-subtitle,
-      [md-card-title], [mat-card-title], [md-card-subtitle], [mat-card-subtitle]"></ng-content>
+  <ng-content select="mat-card-title, mat-card-subtitle, [mat-card-title], [mat-card-subtitle]">
+  </ng-content>
 </div>
 <ng-content select="img"></ng-content>
 <ng-content></ng-content>
diff --git a/src/lib/card/card.html b/src/lib/card/card.html
index d26c09f7bd43..3a56f6c2fe37 100644
--- a/src/lib/card/card.html
+++ b/src/lib/card/card.html
@@ -1,2 +1,2 @@
 <ng-content></ng-content>
-<ng-content select="md-card-footer, mat-card-footer"></ng-content>
+<ng-content select="mat-card-footer"></ng-content>
diff --git a/src/lib/card/card.md b/src/lib/card/card.md
index 37ae6fe3e9b2..fe3a6b33b328 100644
--- a/src/lib/card/card.md
+++ b/src/lib/card/card.md
@@ -1,58 +1,58 @@
-`<md-card>` is a content container for text, photos, and actions in the context of a single subject.
+`<mat-card>` is a content container for text, photos, and actions in the context of a single subject.
 
 <!-- example(card-overview) -->
 
 
 ### Basic card sections
-The most basic card needs only an `<md-card>` element with some content. However, Angular Material
-provides a number of preset sections that you can use inside of an `<md-card>`:
+The most basic card needs only an `<mat-card>` element with some content. However, Angular Material
+provides a number of preset sections that you can use inside of an `<mat-card>`:
 
 
 | Element               | Description                                                              |
 |-----------------------|--------------------------------------------------------------------------|
-| `<md-card-title>`     | Card title                                                               |
-| `<md-card-subtitle>`  | Card subtitle                                                            |
-| `<md-card-content>`   | Primary card content. Intended for blocks of text                        |
-| `<img md-card-image>` | Card image. Stretches the image to the container width                   |
-| `<md-card-actions>`   | Container for buttons at the bottom of the card                          |
-| `<md-card-footer>`    | Section anchored to the bottom of the card                               |
+| `<mat-card-title>`     | Card title                                                               |
+| `<mat-card-subtitle>`  | Card subtitle                                                            |
+| `<mat-card-content>`   | Primary card content. Intended for blocks of text                        |
+| `<img mat-card-image>` | Card image. Stretches the image to the container width                   |
+| `<mat-card-actions>`   | Container for buttons at the bottom of the card                          |
+| `<mat-card-footer>`    | Section anchored to the bottom of the card                               |
 
 These elements primary serve as pre-styled content containers without any additional APIs. 
-However, the `align` property on `<md-card-actions>` can be used to position the actions at the 
+However, the `align` property on `<mat-card-actions>` can be used to position the actions at the 
 `'start'` or `'end` of the container.  
 
 
 ### Card headers
-In addition to the aforementioned sections, `<md-card-header>` gives the ability to add a rich
+In addition to the aforementioned sections, `<mat-card-header>` gives the ability to add a rich
 header to a card. This header can contain:
 
 | Element                | Description                                                             |
 |------------------------|-------------------------------------------------------------------------|
-| `<md-card-title>`      | A title within the header                                               |
-| `<md-card-subtitle>`   | A subtitle within the header                                            |
-| `<img md-card-avatar>` | An image used as an avatar within the header                            |
+| `<mat-card-title>`      | A title within the header                                               |
+| `<mat-card-subtitle>`   | A subtitle within the header                                            |
+| `<img mat-card-avatar>` | An image used as an avatar within the header                            |
 
 
 ### Title groups
-`<md-card-title-group>` can be used to combine a title, subtitle, and image into a single section.
+`<mat-card-title-group>` can be used to combine a title, subtitle, and image into a single section.
 This element can contain:
-* `<md-card-title>`
-* `<md-card-subtitle>`
+* `<mat-card-title>`
+* `<mat-card-subtitle>`
 * One of:
-    * `<img md-card-sm-image>`
-    * `<img md-card-md-image>`
-    * `<img md-card-lg-image>`
+    * `<img mat-card-sm-image>`
+    * `<img mat-card-mat-image>`
+    * `<img mat-card-lg-image>`
 
 ### Accessibility
 Cards can be used in a wide variety of scenarios and can contain many different types of content.
-Due to this dynamic nature, the appropriate accessibility treatment depends on how `<md-card>` is
+Due to this dynamic nature, the appropriate accessibility treatment depends on how `<mat-card>` is
 used.
 
 #### Group, region, and landmarks
 There are several ARIA roles that communicate that a portion of the UI represents some semantically
 meaningful whole. Depending on what the content of the card means to your application,
 [`role="group"`][0], [`role="region"`][1], or [one of the landmark roles][3] should typically be
-applied to the `<md-card>` element.
+applied to the `<mat-card>` element.
 
 A role is not necessary when the card is used as a purely decorative container that does not
 convey a meaningful grouping of related content for a single subject. In these cases, the content
@@ -60,7 +60,7 @@ of the card should follow standard practices for document content.
 
 
 #### Focus
-Depending on how cards are used, it may be appropriate to apply a `tabindex` to the `<md-card>`
+Depending on how cards are used, it may be appropriate to apply a `tabindex` to the `<mat-card>`
 element. If cards are a primary mechanism through which user interact with the application,
 `tabindex="0"` is appropriate. If attention can be sent to the card, but it's not part of the
 document flow, `tabindex="-1"` is appropriate.
diff --git a/src/lib/card/card.ts b/src/lib/card/card.ts
index 2ec494d2b118..fc1e7a34ace3 100644
--- a/src/lib/card/card.ts
+++ b/src/lib/card/card.ts
@@ -20,49 +20,47 @@ import {
  * @docs-private
  */
 @Directive({
-  selector: 'md-card-content, mat-card-content',
+  selector: 'mat-card-content',
   host: {'class': 'mat-card-content'}
 })
-export class MdCardContent {}
+export class MatCardContent {}
 
 /**
  * Title of a card, needed as it's used as a selector in the API.
  * @docs-private
  */
 @Directive({
-  selector: `md-card-title, mat-card-title, [md-card-title], [mat-card-title],
-             [mdCardTitle], [matCardTitle]`,
+  selector: `mat-card-title, [mat-card-title], [matCardTitle]`,
   host: {
     'class': 'mat-card-title'
   }
 })
-export class MdCardTitle {}
+export class MatCardTitle {}
 
 /**
  * Sub-title of a card, needed as it's used as a selector in the API.
  * @docs-private
  */
 @Directive({
-  selector: `md-card-subtitle, mat-card-subtitle, [md-card-subtitle], [mat-card-subtitle],
-             [mdCardSubtitle], [matCardSubtitle]`,
+  selector: `mat-card-subtitle, [mat-card-subtitle], [matCardSubtitle]`,
   host: {
     'class': 'mat-card-subtitle'
   }
 })
-export class MdCardSubtitle {}
+export class MatCardSubtitle {}
 
 /**
  * Action section of a card, needed as it's used as a selector in the API.
  * @docs-private
  */
 @Directive({
-  selector: 'md-card-actions, mat-card-actions',
+  selector: 'mat-card-actions',
   host: {
     'class': 'mat-card-actions',
     '[class.mat-card-actions-align-end]': 'align === "end"',
   }
 })
-export class MdCardActions {
+export class MatCardActions {
   /** Position of the actions inside the card. */
   @Input() align: 'start' | 'end' = 'start';
 }
@@ -72,70 +70,70 @@ export class MdCardActions {
  * @docs-private
  */
 @Directive({
-  selector: 'md-card-footer, mat-card-footer',
+  selector: 'mat-card-footer',
   host: {'class': 'mat-card-footer'}
 })
-export class MdCardFooter {}
+export class MatCardFooter {}
 
 /**
  * Image used in a card, needed to add the mat- CSS styling.
  * @docs-private
  */
 @Directive({
-  selector: '[md-card-image], [mat-card-image], [mdCardImage], [matCardImage]',
+  selector: '[mat-card-image], [matCardImage]',
   host: {'class': 'mat-card-image'}
 })
-export class MdCardImage {}
+export class MatCardImage {}
 
 /**
  * Image used in a card, needed to add the mat- CSS styling.
  * @docs-private
  */
 @Directive({
-  selector: '[md-card-sm-image], [mat-card-sm-image], [mdCardImageSmall], [matCardImageSmall]',
+  selector: '[mat-card-sm-image], [matCardImageSmall]',
   host: {'class': 'mat-card-sm-image'}
 })
-export class MdCardSmImage {}
+export class MatCardSmImage {}
 
 /**
  * Image used in a card, needed to add the mat- CSS styling.
  * @docs-private
  */
 @Directive({
-  selector: '[md-card-md-image], [mat-card-md-image], [mdCardImageMedium], [matCardImageMedium]',
+  selector: '[mat-card-md-image], [matCardImageMedium]',
   host: {'class': 'mat-card-md-image'}
 })
-export class MdCardMdImage {}
+export class MatCardMdImage {}
 
 /**
  * Image used in a card, needed to add the mat- CSS styling.
  * @docs-private
  */
 @Directive({
-  selector: '[md-card-lg-image], [mat-card-lg-image], [mdCardImageLarge], [matCardImageLarge]',
+  selector: '[mat-card-lg-image], [matCardImageLarge]',
   host: {'class': 'mat-card-lg-image'}
 })
-export class MdCardLgImage {}
+export class MatCardLgImage {}
 
 /**
  * Large image used in a card, needed to add the mat- CSS styling.
  * @docs-private
  */
 @Directive({
-  selector: '[md-card-xl-image], [mat-card-xl-image], [mdCardImageXLarge], [matCardImageXLarge]',
+  selector: '[mat-card-xl-image], [matCardImageXLarge]',
   host: {'class': 'mat-card-xl-image'}
 })
-export class MdCardXlImage {}
+export class MatCardXlImage {}
 
 /**
  * Avatar image used in a card, needed to add the mat- CSS styling.
  * @docs-private
  */
 @Directive({
-  selector: '[md-card-avatar], [mat-card-avatar], [mdCardAvatar], [matCardAvatar]',
+  selector: '[mat-card-avatar], [matCardAvatar]',
   host: {'class': 'mat-card-avatar'}
 })
-export class MdCardAvatar {}
+export class MatCardAvatar {}
 
 
 /**
@@ -143,15 +141,15 @@ export class MdCardAvatar {}
  *
  * While this component can be used alone, it also provides a number
  * of preset styles for common card sections, including:
- * - md-card-title
- * - md-card-subtitle
- * - md-card-content
- * - md-card-actions
- * - md-card-footer
+ * - mat-card-title
+ * - mat-card-subtitle
+ * - mat-card-content
+ * - mat-card-actions
+ * - mat-card-footer
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-card, mat-card',
+  selector: 'mat-card',
   templateUrl: 'card.html',
   styleUrls: ['card.css'],
   encapsulation: ViewEncapsulation.None,
@@ -159,38 +157,38 @@ export class MdCardAvatar {}
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card'}
 })
-export class MdCard {}
+export class MatCard {}
 
 
 /**
- * Component intended to be used within the `<md-card>` component. It adds styles for a
+ * Component intended to be used within the `<mat-card>` component. It adds styles for a
  * preset header section (i.e. a title, subtitle, and avatar layout).
  * @docs-private
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-card-header, mat-card-header',
+  selector: 'mat-card-header',
   templateUrl: 'card-header.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card-header'}
 })
-export class MdCardHeader {}
+export class MatCardHeader {}
 
 
 /**
- * Component intended to be used within the <md-card> component. It adds styles for a preset
+ * Component intended to be used within the <mat-card> component. It adds styles for a preset
  * layout that groups an image with a title section.
  * @docs-private
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-card-title-group, mat-card-title-group',
+  selector: 'mat-card-title-group',
   templateUrl: 'card-title-group.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card-title-group'}
 })
-export class MdCardTitleGroup {}
+export class MatCardTitleGroup {}
diff --git a/src/lib/card/mat-exports.ts b/src/lib/card/mat-exports.ts
deleted file mode 100644
index d4b22e577da0..000000000000
--- a/src/lib/card/mat-exports.ts
+++ /dev/null
@@ -1,42 +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 {
-  MdCard,
-  MdCardActions,
-  MdCardAvatar,
-  MdCardContent,
-  MdCardFooter,
-  MdCardHeader,
-  MdCardImage,
-  MdCardLgImage,
-  MdCardMdImage,
-  MdCardSmImage,
-  MdCardSubtitle,
-  MdCardTitle,
-  MdCardTitleGroup,
-  MdCardXlImage,
-} from './card';
-import {MdCardModule} from './card-module';
-
-
-export {MdCard as MatCard};
-export {MdCardActions as MatCardActions};
-export {MdCardAvatar as MatCardAvatar};
-export {MdCardContent as MatCardContent};
-export {MdCardFooter as MatCardFooter};
-export {MdCardHeader as MatCardHeader};
-export {MdCardImage as MatCardImage};
-export {MdCardLgImage as MatCardLgImage};
-export {MdCardMdImage as MatCardMatImage};
-export {MdCardModule as MatCardModule};
-export {MdCardSmImage as MatCardSmImage};
-export {MdCardSubtitle as MatCardSubtitle};
-export {MdCardTitle as MatCardTitle};
-export {MdCardTitleGroup as MatCardTitleGroup};
-export {MdCardXlImage as MatCardXlImage};
diff --git a/src/lib/card/public_api.ts b/src/lib/card/public_api.ts
index 863f34d9a5c7..8917e375f934 100644
--- a/src/lib/card/public_api.ts
+++ b/src/lib/card/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './card';
 export * from './card-module';
-export * from './mat-exports';
+
diff --git a/src/lib/checkbox/checkbox-module.ts b/src/lib/checkbox/checkbox-module.ts
index 49ff7562c8e0..90bf880804c8 100644
--- a/src/lib/checkbox/checkbox-module.ts
+++ b/src/lib/checkbox/checkbox-module.ts
@@ -9,14 +9,14 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {ObserversModule} from '@angular/cdk/observers';
-import {MdRippleModule, MdCommonModule} from '@angular/material/core';
-import {MdCheckbox} from './checkbox';
-import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
+import {MatRippleModule, MatCommonModule} from '@angular/material/core';
+import {MatCheckbox} from './checkbox';
+import {MatCheckboxRequiredValidator} from './checkbox-required-validator';
 import {A11yModule} from '@angular/cdk/a11y';
 
 @NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule, A11yModule],
-  exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
-  declarations: [MdCheckbox, MdCheckboxRequiredValidator],
+  imports: [CommonModule, MatRippleModule, MatCommonModule, ObserversModule, A11yModule],
+  exports: [MatCheckbox, MatCheckboxRequiredValidator, MatCommonModule],
+  declarations: [MatCheckbox, MatCheckboxRequiredValidator],
 })
-export class MdCheckboxModule {}
+export class MatCheckboxModule {}
diff --git a/src/lib/checkbox/checkbox-required-validator.ts b/src/lib/checkbox/checkbox-required-validator.ts
index bd9172d0d781..41ab27739504 100644
--- a/src/lib/checkbox/checkbox-required-validator.ts
+++ b/src/lib/checkbox/checkbox-required-validator.ts
@@ -16,25 +16,23 @@ import {
   NG_VALIDATORS,
 } from '@angular/forms';
 
-export const _MdCheckboxRequiredValidator = CheckboxRequiredValidator;
+export const _MatCheckboxRequiredValidator = CheckboxRequiredValidator;
 
-export const MD_CHECKBOX_REQUIRED_VALIDATOR: Provider = {
+export const MAT_CHECKBOX_REQUIRED_VALIDATOR: Provider = {
   provide: NG_VALIDATORS,
-  useExisting: forwardRef(() => MdCheckboxRequiredValidator),
+  useExisting: forwardRef(() => MatCheckboxRequiredValidator),
   multi: true
 };
 
 /**
  * Validator for Material checkbox's required attribute in template-driven checkbox.
  * Current CheckboxRequiredValidator only work with `input type=checkbox` and does not
- * work with `md-checkbox`.
+ * work with `mat-checkbox`.
  */
 @Directive({
-  selector: `md-checkbox[required][formControlName],
-             mat-checkbox[required][formControlName],
-             md-checkbox[required][formControl], md-checkbox[required][ngModel],
+  selector: `mat-checkbox[required][formControlName],
              mat-checkbox[required][formControl], mat-checkbox[required][ngModel]`,
-  providers: [MD_CHECKBOX_REQUIRED_VALIDATOR],
+  providers: [MAT_CHECKBOX_REQUIRED_VALIDATOR],
   host: {'[attr.required]': 'required ? "" : null'}
 })
-export class MdCheckboxRequiredValidator extends _MdCheckboxRequiredValidator {}
+export class MatCheckboxRequiredValidator extends _MatCheckboxRequiredValidator {}
diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index f1185ea34a3f..1361d9362485 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -15,7 +15,7 @@
            [attr.aria-labelledby]="ariaLabelledby"
            (change)="_onInteractionEvent($event)"
            (click)="_onInputClick($event)">
-    <div mat-ripple class="mat-checkbox-ripple"
+    <div matRipple class="mat-checkbox-ripple"
          [matRippleTrigger]="label"
          [matRippleDisabled]="_isRippleDisabled()"
          [matRippleCentered]="true"></div>
diff --git a/src/lib/checkbox/checkbox.md b/src/lib/checkbox/checkbox.md
index 7fae30d246e5..0ae96cf7939e 100644
--- a/src/lib/checkbox/checkbox.md
+++ b/src/lib/checkbox/checkbox.md
@@ -1,10 +1,10 @@
-`<md-checkbox>` provides the same functionality as a native `<input type="checkbox">`
+`<mat-checkbox>` provides the same functionality as a native `<input type="checkbox">`
 enhanced with Material Design styling and animations.
 
 <!-- example(checkbox-overview) -->
 
 ### Checkbox label
-The checkbox label is provided as the content to the `<md-checkbox>` element. The label can be 
+The checkbox label is provided as the content to the `<mat-checkbox>` element. The label can be 
 positioned before or after the checkbox by setting the `labelPosition` property to `'before'` or
 `'after'`.
 
@@ -14,23 +14,23 @@ If you don't want the label to appear next to the checkbox, you can use
 specify an appropriate label.
 
 ### Use with `@angular/forms`
-`<md-checkbox>` is compatible with `@angular/forms` and supports both `FormsModule` 
+`<mat-checkbox>` is compatible with `@angular/forms` and supports both `FormsModule` 
 and `ReactiveFormsModule`.
 
 ### Indeterminate state
-`<md-checkbox>` supports an `indeterminate` state, similar to the native `<input type="checkbox">`.
+`<mat-checkbox>` supports an `indeterminate` state, similar to the native `<input type="checkbox">`.
 While the `indeterminate` property of the checkbox is true, it will render as indeterminate 
 regardless of the `checked` value. Any interaction with the checkbox by a user (i.e., clicking) will
 remove the indeterminate state.
 
 ### Theming
-The color of a `<md-checkbox>` can be changed by using the `color` property. By default, checkboxes
+The color of a `<mat-checkbox>` can be changed by using the `color` property. By default, checkboxes
 use the theme's accent color. This can be changed to `'primary'` or `'warn'`.  
 
 ### Accessibility
-The `<md-checkbox>` uses an internal `<input type="checkbox">` to provide an accessible experience.
+The `<mat-checkbox>` uses an internal `<input type="checkbox">` to provide an accessible experience.
 This internal checkbox receives focus and is automatically labelled by the text content of the
-`<md-checkbox>` element.
+`<mat-checkbox>` element.
 
 Checkboxes without text or labels should be given a meaningful label via `aria-label` or
 `aria-labelledby`.
diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
index d6d829f37c0f..73b6f50177f6 100644
--- a/src/lib/checkbox/checkbox.spec.ts
+++ b/src/lib/checkbox/checkbox.spec.ts
@@ -11,16 +11,16 @@ import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
-import {MdCheckbox, MdCheckboxChange, MdCheckboxModule} from './index';
+import {MatCheckbox, MatCheckboxChange, MatCheckboxModule} from './index';
 import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
 
 
-describe('MdCheckbox', () => {
+describe('MatCheckbox', () => {
   let fixture: ComponentFixture<any>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdCheckboxModule, FormsModule, ReactiveFormsModule],
+      imports: [MatCheckboxModule, FormsModule, ReactiveFormsModule],
       declarations: [
         SingleCheckbox,
         CheckboxWithFormDirectives,
@@ -45,7 +45,7 @@ describe('MdCheckbox', () => {
   describe('basic behaviors', () => {
     let checkboxDebugElement: DebugElement;
     let checkboxNativeElement: HTMLElement;
-    let checkboxInstance: MdCheckbox;
+    let checkboxInstance: MatCheckbox;
     let testComponent: SingleCheckbox;
     let inputElement: HTMLInputElement;
     let labelElement: HTMLLabelElement;
@@ -54,7 +54,7 @@ describe('MdCheckbox', () => {
       fixture = TestBed.createComponent(SingleCheckbox);
       fixture.detectChanges();
 
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       checkboxInstance = checkboxDebugElement.componentInstance;
       testComponent = fixture.debugElement.componentInstance;
@@ -273,7 +273,7 @@ describe('MdCheckbox', () => {
       testComponent.checkboxId = null;
       fixture.detectChanges();
 
-      expect(checkboxInstance.inputId).toMatch(/md-checkbox-\d+/);
+      expect(checkboxInstance.inputId).toMatch(/mat-checkbox-\d+/);
       expect(inputElement.id).toBe(checkboxInstance.inputId);
     });
 
@@ -436,7 +436,7 @@ describe('MdCheckbox', () => {
         expect(checkboxNativeElement.querySelectorAll('.mat-ripple-element').length).toBe(1);
       });
 
-      it('should remove ripple if mdRippleDisabled input is set', () => {
+      it('should remove ripple if matRippleDisabled input is set', () => {
         testComponent.disableRipple = true;
         fixture.detectChanges();
 
@@ -531,14 +531,14 @@ describe('MdCheckbox', () => {
       it('should not apply transition classes when there is no state change', () => {
         testComponent.isChecked = checkboxInstance.checked;
         fixture.detectChanges();
-        expect(checkboxNativeElement).not.toMatch(/^md\-checkbox\-anim/g);
+        expect(checkboxNativeElement).not.toMatch(/^mat\-checkbox\-anim/g);
 
         testComponent.isIndeterminate = checkboxInstance.indeterminate;
-        expect(checkboxNativeElement).not.toMatch(/^md\-checkbox\-anim/g);
+        expect(checkboxNativeElement).not.toMatch(/^mat\-checkbox\-anim/g);
       });
 
       it('should not initially have any transition classes', () => {
-        expect(checkboxNativeElement).not.toMatch(/^md\-checkbox\-anim/g);
+        expect(checkboxNativeElement).not.toMatch(/^mat\-checkbox\-anim/g);
       });
     });
   });
@@ -546,7 +546,7 @@ describe('MdCheckbox', () => {
   describe('with change event and no initial value', () => {
     let checkboxDebugElement: DebugElement;
     let checkboxNativeElement: HTMLElement;
-    let checkboxInstance: MdCheckbox;
+    let checkboxInstance: MatCheckbox;
     let testComponent: CheckboxWithChangeEvent;
     let inputElement: HTMLInputElement;
     let labelElement: HTMLLabelElement;
@@ -555,7 +555,7 @@ describe('MdCheckbox', () => {
       fixture = TestBed.createComponent(CheckboxWithChangeEvent);
       fixture.detectChanges();
 
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       checkboxInstance = checkboxDebugElement.componentInstance;
       testComponent = fixture.debugElement.componentInstance;
@@ -605,7 +605,7 @@ describe('MdCheckbox', () => {
 
     it('should use the provided aria-label', () => {
       fixture = TestBed.createComponent(CheckboxWithAriaLabel);
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = <HTMLInputElement>checkboxNativeElement.querySelector('input');
 
@@ -621,7 +621,7 @@ describe('MdCheckbox', () => {
 
     it('should use the provided aria-labelledby', () => {
       fixture = TestBed.createComponent(CheckboxWithAriaLabelledby);
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = <HTMLInputElement>checkboxNativeElement.querySelector('input');
 
@@ -631,7 +631,7 @@ describe('MdCheckbox', () => {
 
     it('should not assign aria-labelledby if none is provided', () => {
       fixture = TestBed.createComponent(SingleCheckbox);
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = <HTMLInputElement>checkboxNativeElement.querySelector('input');
 
@@ -652,7 +652,7 @@ describe('MdCheckbox', () => {
       fixture.detectChanges();
 
       testComponent = fixture.debugElement.componentInstance;
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       inputElement = <HTMLInputElement>checkboxNativeElement.querySelector('input');
       labelElement = <HTMLLabelElement>checkboxNativeElement.querySelector('label');
@@ -685,11 +685,11 @@ describe('MdCheckbox', () => {
 
     it('should assign a unique id to each checkbox', () => {
       let [firstId, secondId] =
-          fixture.debugElement.queryAll(By.directive(MdCheckbox))
+          fixture.debugElement.queryAll(By.directive(MatCheckbox))
           .map(debugElement => debugElement.nativeElement.querySelector('input').id);
 
-      expect(firstId).toMatch(/md-checkbox-\d+-input/);
-      expect(secondId).toMatch(/md-checkbox-\d+-input/);
+      expect(firstId).toMatch(/mat-checkbox-\d+-input/);
+      expect(secondId).toMatch(/mat-checkbox-\d+-input/);
       expect(firstId).not.toEqual(secondId);
     });
   });
@@ -697,14 +697,14 @@ describe('MdCheckbox', () => {
   describe('with ngModel', () => {
     let checkboxDebugElement: DebugElement;
     let checkboxNativeElement: HTMLElement;
-    let checkboxInstance: MdCheckbox;
+    let checkboxInstance: MatCheckbox;
     let inputElement: HTMLInputElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(CheckboxWithFormDirectives);
       fixture.detectChanges();
 
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxNativeElement = checkboxDebugElement.nativeElement;
       checkboxInstance = checkboxDebugElement.componentInstance;
       inputElement = <HTMLInputElement>checkboxNativeElement.querySelector('input');
@@ -713,7 +713,7 @@ describe('MdCheckbox', () => {
     it('should be in pristine, untouched, and valid states initially', fakeAsync(() => {
       flushMicrotasks();
 
-      let checkboxElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      let checkboxElement = fixture.debugElement.query(By.directive(MatCheckbox));
       let ngModel = checkboxElement.injector.get<NgModel>(NgModel);
 
       expect(ngModel.valid).toBe(true);
@@ -740,7 +740,7 @@ describe('MdCheckbox', () => {
   });
 
   describe('with required ngModel', () => {
-    let checkboxInstance: MdCheckbox;
+    let checkboxInstance: MatCheckbox;
     let inputElement: HTMLInputElement;
     let testComponent: CheckboxWithNgModel;
 
@@ -748,7 +748,7 @@ describe('MdCheckbox', () => {
       fixture = TestBed.createComponent(CheckboxWithNgModel);
       fixture.detectChanges();
 
-      let checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      let checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       let checkboxNativeElement = checkboxDebugElement.nativeElement;
       testComponent = fixture.debugElement.componentInstance;
       checkboxInstance = checkboxDebugElement.componentInstance;
@@ -756,7 +756,7 @@ describe('MdCheckbox', () => {
     });
 
     it('should validate with RequiredTrue validator', () => {
-      let checkboxElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      let checkboxElement = fixture.debugElement.query(By.directive(MatCheckbox));
       let ngModel = checkboxElement.injector.get<NgModel>(NgModel);
 
       testComponent.isRequired = true;
@@ -781,7 +781,7 @@ describe('MdCheckbox', () => {
     });
 
     it('should forward name value to input element', () => {
-      let checkboxElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      let checkboxElement = fixture.debugElement.query(By.directive(MatCheckbox));
       let inputElement = <HTMLInputElement> checkboxElement.nativeElement.querySelector('input');
 
       expect(inputElement.getAttribute('name')).toBe('test-name');
@@ -790,7 +790,7 @@ describe('MdCheckbox', () => {
 
   describe('with form control', () => {
     let checkboxDebugElement: DebugElement;
-    let checkboxInstance: MdCheckbox;
+    let checkboxInstance: MatCheckbox;
     let testComponent: CheckboxWithFormControl;
     let inputElement: HTMLInputElement;
 
@@ -798,7 +798,7 @@ describe('MdCheckbox', () => {
       fixture = TestBed.createComponent(CheckboxWithFormControl);
       fixture.detectChanges();
 
-      checkboxDebugElement = fixture.debugElement.query(By.directive(MdCheckbox));
+      checkboxDebugElement = fixture.debugElement.query(By.directive(MatCheckbox));
       checkboxInstance = checkboxDebugElement.componentInstance;
       testComponent = fixture.debugElement.componentInstance;
       inputElement = <HTMLInputElement>checkboxDebugElement.nativeElement.querySelector('input');
@@ -829,7 +829,7 @@ describe('MdCheckbox', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(CheckboxWithoutLabel);
 
-      const checkboxDebugEl = fixture.debugElement.query(By.directive(MdCheckbox));
+      const checkboxDebugEl = fixture.debugElement.query(By.directive(MatCheckbox));
 
       testComponent = fixture.componentInstance;
       checkboxElement = checkboxDebugEl.nativeElement;
@@ -880,7 +880,7 @@ describe('MdCheckbox', () => {
 @Component({
   template: `
   <div (click)="parentElementClicked = true" (keyup)="parentElementKeyedUp = true">
-    <md-checkbox
+    <mat-checkbox
         [id]="checkboxId"
         [required]="isRequired"
         [labelPosition]="labelPos"
@@ -893,7 +893,7 @@ describe('MdCheckbox', () => {
         (click)="onCheckboxClick($event)"
         (change)="onCheckboxChange($event)">
       Simple checkbox
-    </md-checkbox>
+    </mat-checkbox>
   </div>`
 })
 class SingleCheckbox {
@@ -910,14 +910,14 @@ class SingleCheckbox {
   checkboxValue: string = 'single_checkbox';
 
   onCheckboxClick: (event?: Event) => void = () => {};
-  onCheckboxChange: (event?: MdCheckboxChange) => void = () => {};
+  onCheckboxChange: (event?: MatCheckboxChange) => void = () => {};
 }
 
-/** Simple component for testing an MdCheckbox with ngModel in a form. */
+/** Simple component for testing an MatCheckbox with ngModel in a form. */
 @Component({
   template: `
     <form>
-      <md-checkbox name="cb" [(ngModel)]="isGood">Be good</md-checkbox>
+      <mat-checkbox name="cb" [(ngModel)]="isGood">Be good</mat-checkbox>
     </form>
   `,
 })
@@ -925,9 +925,9 @@ class CheckboxWithFormDirectives {
   isGood: boolean = false;
 }
 
-/** Simple component for testing an MdCheckbox with required ngModel. */
+/** Simple component for testing an MatCheckbox with required ngModel. */
 @Component({
-  template: `<md-checkbox [required]="isRequired" [(ngModel)]="isGood">Be good</md-checkbox>`,
+  template: `<mat-checkbox [required]="isRequired" [(ngModel)]="isGood">Be good</mat-checkbox>`,
 })
 class CheckboxWithNgModel {
   isGood: boolean = false;
@@ -937,8 +937,8 @@ class CheckboxWithNgModel {
 /** Simple test component with multiple checkboxes. */
 @Component(({
   template: `
-    <md-checkbox>Option 1</md-checkbox>
-    <md-checkbox>Option 2</md-checkbox>
+    <mat-checkbox>Option 1</mat-checkbox>
+    <mat-checkbox>Option 2</mat-checkbox>
   `
 }))
 class MultipleCheckboxes { }
@@ -947,10 +947,10 @@ class MultipleCheckboxes { }
 /** Simple test component with tabIndex */
 @Component({
   template: `
-    <md-checkbox
+    <mat-checkbox
         [tabIndex]="customTabIndex"
         [disabled]="isDisabled">
-    </md-checkbox>`,
+    </mat-checkbox>`,
 })
 class CheckboxWithTabIndex {
   customTabIndex: number = 7;
@@ -959,33 +959,33 @@ class CheckboxWithTabIndex {
 
 /** Simple test component with an aria-label set. */
 @Component({
-  template: `<md-checkbox aria-label="Super effective"></md-checkbox>`
+  template: `<mat-checkbox aria-label="Super effective"></mat-checkbox>`
 })
 class CheckboxWithAriaLabel { }
 
 /** Simple test component with an aria-label set. */
 @Component({
-  template: `<md-checkbox aria-labelledby="some-id"></md-checkbox>`
+  template: `<mat-checkbox aria-labelledby="some-id"></mat-checkbox>`
 })
 class CheckboxWithAriaLabelledby {}
 
 /** Simple test component with name attribute */
 @Component({
-  template: `<md-checkbox name="test-name"></md-checkbox>`
+  template: `<mat-checkbox name="test-name"></mat-checkbox>`
 })
 class CheckboxWithNameAttribute {}
 
 /** Simple test component with change event */
 @Component({
-  template: `<md-checkbox (change)="lastEvent = $event"></md-checkbox>`
+  template: `<mat-checkbox (change)="lastEvent = $event"></mat-checkbox>`
 })
 class CheckboxWithChangeEvent {
-  lastEvent: MdCheckboxChange;
+  lastEvent: MatCheckboxChange;
 }
 
 /** Test component with reactive forms */
 @Component({
-  template: `<md-checkbox [formControl]="formControl"></md-checkbox>`
+  template: `<mat-checkbox [formControl]="formControl"></mat-checkbox>`
 })
 class CheckboxWithFormControl {
   formControl = new FormControl();
@@ -993,7 +993,7 @@ class CheckboxWithFormControl {
 
 /** Test component without label */
 @Component({
-  template: `<md-checkbox>{{ label }}</md-checkbox>`
+  template: `<mat-checkbox>{{ label }}</mat-checkbox>`
 })
 class CheckboxWithoutLabel {
   label: string;
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 86096cd2861d..97ffec3de20d 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -26,8 +26,8 @@ import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {
   CanColor,
   CanDisable,
-  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
-  MdRipple,
+  CanDisableRipple,
+  MatRipple,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
@@ -40,13 +40,13 @@ import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 let nextUniqueId = 0;
 
 /**
- * Provider Expression that allows md-checkbox to register as a ControlValueAccessor.
+ * Provider Expression that allows mat-checkbox to register as a ControlValueAccessor.
  * This allows it to support [(ngModel)].
  * @docs-private
  */
-export const MD_CHECKBOX_CONTROL_VALUE_ACCESSOR: any = {
+export const MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdCheckbox),
+  useExisting: forwardRef(() => MatCheckbox),
   multi: true
 };
 
@@ -65,26 +65,26 @@ export enum TransitionCheckState {
   Indeterminate
 }
 
-/** Change event object emitted by MdCheckbox. */
-export class MdCheckboxChange {
-  /** The source MdCheckbox of the event. */
-  source: MdCheckbox;
+/** Change event object emitted by MatCheckbox. */
+export class MatCheckboxChange {
+  /** The source MatCheckbox of the event. */
+  source: MatCheckbox;
   /** The new `checked` value of the checkbox. */
   checked: boolean;
 }
 
-// Boilerplate for applying mixins to MdCheckbox.
+// Boilerplate for applying mixins to MatCheckbox.
 /** @docs-private */
-export class MdCheckboxBase {
+export class MatCheckboxBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdCheckboxMixinBase =
-  mixinColor(mixinDisableRipple(mixinDisabled(MdCheckboxBase)), 'accent');
+export const _MatCheckboxMixinBase =
+  mixinColor(mixinDisableRipple(mixinDisabled(MatCheckboxBase)), 'accent');
 
 
 /**
  * A material design checkbox component. Supports all of the functionality of an HTML5 checkbox,
- * and exposes a similar API. A MdCheckbox can be either checked, unchecked, indeterminate, or
+ * and exposes a similar API. A MatCheckbox can be either checked, unchecked, indeterminate, or
  * disabled. Note that all additional accessibility attributes are taken care of by the component,
  * so there is no need to provide them yourself. However, if you want to omit a label and still
  * have the checkbox be accessible, you may supply an [aria-label] input.
@@ -92,7 +92,7 @@ export const _MdCheckboxMixinBase =
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-checkbox, mat-checkbox',
+  selector: 'mat-checkbox',
   templateUrl: 'checkbox.html',
   styleUrls: ['checkbox.css'],
   host: {
@@ -103,15 +103,14 @@ export const _MdCheckboxMixinBase =
     '[class.mat-checkbox-disabled]': 'disabled',
     '[class.mat-checkbox-label-before]': 'labelPosition == "before"',
   },
-  providers: [MD_CHECKBOX_CONTROL_VALUE_ACCESSOR],
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
+  providers: [MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR],
   inputs: ['disabled', 'disableRipple', 'color'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAccessor, AfterViewInit,
-    OnDestroy, CanColor, CanDisable, CanDisableRipple {
+export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAccessor,
+    AfterViewInit, OnDestroy, CanColor, CanDisable, CanDisableRipple {
 
   /**
    * Attached to the aria-label attribute of the host element. In most cases, arial-labelledby will
@@ -124,7 +123,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAcce
    */
   @Input('aria-labelledby') ariaLabelledby: string | null = null;
 
-  private _uniqueId: string = `md-checkbox-${++nextUniqueId}`;
+  private _uniqueId: string = `mat-checkbox-${++nextUniqueId}`;
 
   /** A unique id for the checkbox input. If none is supplied, it will be auto-generated. */
   @Input() id: string = this._uniqueId;
@@ -164,7 +163,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAcce
   @Input() name: string | null = null;
 
   /** Event emitted when the checkbox's `checked` value changes. */
-  @Output() change: EventEmitter<MdCheckboxChange> = new EventEmitter<MdCheckboxChange>();
+  @Output() change: EventEmitter<MatCheckboxChange> = new EventEmitter<MatCheckboxChange>();
 
   /** Event emitted when the checkbox's `indeterminate` value changes. */
   @Output() indeterminateChange: EventEmitter<boolean> = new EventEmitter<boolean>();
@@ -176,7 +175,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAcce
   @ViewChild('input') _inputElement: ElementRef;
 
   /** Called when the checkbox is blurred. Needed to properly implement ControlValueAccessor. */
-  @ViewChild(MdRipple) _ripple: MdRipple;
+  @ViewChild(MatRipple) _ripple: MatRipple;
 
   /**
    * Called when the checkbox is blurred. Needed to properly implement ControlValueAccessor.
@@ -322,7 +321,7 @@ export class MdCheckbox extends _MdCheckboxMixinBase implements ControlValueAcce
   }
 
   private _emitChangeEvent() {
-    let event = new MdCheckboxChange();
+    let event = new MatCheckboxChange();
     event.source = this;
     event.checked = this.checked;
 
diff --git a/src/lib/checkbox/mat-exports.ts b/src/lib/checkbox/mat-exports.ts
deleted file mode 100644
index 6b3089901f56..000000000000
--- a/src/lib/checkbox/mat-exports.ts
+++ /dev/null
@@ -1,28 +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 {
-  MD_CHECKBOX_CONTROL_VALUE_ACCESSOR,
-  MdCheckbox,
-  MdCheckboxBase,
-  MdCheckboxChange,
-} from './checkbox';
-import {MdCheckboxModule} from './checkbox-module';
-import {
-  MD_CHECKBOX_REQUIRED_VALIDATOR,
-  MdCheckboxRequiredValidator,
-} from './checkbox-required-validator';
-
-
-export {MD_CHECKBOX_CONTROL_VALUE_ACCESSOR as MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR};
-export {MD_CHECKBOX_REQUIRED_VALIDATOR as MAT_CHECKBOX_REQUIRED_VALIDATOR};
-export {MdCheckbox as MatCheckbox};
-export {MdCheckboxBase as MatCheckboxBase};
-export {MdCheckboxChange as MatCheckboxChange};
-export {MdCheckboxModule as MatCheckboxModule};
-export {MdCheckboxRequiredValidator as MatCheckboxRequiredValidator};
diff --git a/src/lib/checkbox/public_api.ts b/src/lib/checkbox/public_api.ts
index 7a6132ac2ed2..89bc5a134764 100644
--- a/src/lib/checkbox/public_api.ts
+++ b/src/lib/checkbox/public_api.ts
@@ -9,4 +9,4 @@
 export * from './checkbox';
 export * from './checkbox-module';
 export * from './checkbox-required-validator';
-export * from './mat-exports';
+
diff --git a/src/lib/chips/chip-input.spec.ts b/src/lib/chips/chip-input.spec.ts
index 62e9fd498a2b..da845439823f 100644
--- a/src/lib/chips/chip-input.spec.ts
+++ b/src/lib/chips/chip-input.spec.ts
@@ -5,24 +5,24 @@ import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdChipInput, MdChipInputEvent} from './chip-input';
-import {MdChipsModule} from './index';
+import {MatChipInput, MatChipInputEvent} from './chip-input';
+import {MatChipsModule} from './index';
 
 
 const COMMA = 188;
 
-describe('MdChipInput', () => {
+describe('MatChipInput', () => {
   let fixture: ComponentFixture<any>;
   let testChipInput: TestChipInput;
   let inputDebugElement: DebugElement;
   let inputNativeElement: HTMLElement;
-  let chipInputDirective: MdChipInput;
+  let chipInputDirective: MatChipInput;
 
   let dir = 'ltr';
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule, PlatformModule],
+      imports: [MatChipsModule, PlatformModule],
       declarations: [TestChipInput],
       providers: [{
         provide: Directionality, useFactory: () => {
@@ -39,8 +39,8 @@ describe('MdChipInput', () => {
     testChipInput = fixture.debugElement.componentInstance;
     fixture.detectChanges();
 
-    inputDebugElement = fixture.debugElement.query(By.directive(MdChipInput));
-    chipInputDirective = inputDebugElement.injector.get(MdChipInput) as MdChipInput;
+    inputDebugElement = fixture.debugElement.query(By.directive(MatChipInput));
+    chipInputDirective = inputDebugElement.injector.get(MatChipInput) as MatChipInput;
     inputNativeElement = inputDebugElement.nativeElement;
   }));
 
@@ -104,18 +104,18 @@ describe('MdChipInput', () => {
 
 @Component({
   template: `
-    <md-chip-list #chipList>
-    </md-chip-list>
-    <input mdInput [mdChipInputFor]="chipList"
-              [mdChipInputAddOnBlur]="addOnBlur"
-              [mdChipInputSeparatorKeyCodes]="separatorKeys"
-              (mdChipInputTokenEnd)="add($event)" />
+    <mat-chip-list #chipList>
+    </mat-chip-list>
+    <input matInput [matChipInputFor]="chipList"
+              [matChipInputAddOnBlur]="addOnBlur"
+              [matChipInputSeparatorKeyCodes]="separatorKeys"
+              (matChipInputTokenEnd)="add($event)" />
   `
 })
 class TestChipInput {
   addOnBlur: boolean = false;
   separatorKeys: number[] = [ENTER];
 
-  add(_: MdChipInputEvent) {
+  add(_: MatChipInputEvent) {
   }
 }
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index c4c61ae2856f..b014dd52b756 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -9,20 +9,20 @@
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ENTER} from '@angular/cdk/keycodes';
 import {Directive, ElementRef, EventEmitter, Input, Output} from '@angular/core';
-import {MdChipList} from './chip-list';
+import {MatChipList} from './chip-list';
 
 
-export interface MdChipInputEvent {
+export interface MatChipInputEvent {
   input: HTMLInputElement;
   value: string;
 }
 
 /**
- * Directive that adds chip-specific behaviors to an input element inside <md-form-field>.
- * May be placed inside or outside of an <md-chip-list>.
+ * Directive that adds chip-specific behaviors to an input element inside <mat-form-field>.
+ * May be placed inside or outside of an <mat-chip-list>.
  */
 @Directive({
-  selector: 'input[mdChipInputFor], input[matChipInputFor]',
+  selector: 'input[matChipInputFor]',
   host: {
     'class': 'mat-chip-input mat-input-element',
     '(keydown)': '_keydown($event)',
@@ -30,13 +30,13 @@ export interface MdChipInputEvent {
     '(focus)': '_focus()',
   }
 })
-export class MdChipInput {
+export class MatChipInput {
   focused: boolean = false;
-  _chipList: MdChipList;
+  _chipList: MatChipList;
 
   /** Register input for chip list */
-  @Input('mdChipInputFor')
-  set chipList(value: MdChipList) {
+  @Input('matChipInputFor')
+  set chipList(value: MatChipList) {
     if (value) {
       this._chipList = value;
       this._chipList.registerInput(this);
@@ -46,7 +46,7 @@ export class MdChipInput {
   /**
    * Whether or not the chipEnd event will be emitted when the input is blurred.
    */
-  @Input('mdChipInputAddOnBlur')
+  @Input('matChipInputAddOnBlur')
   get addOnBlur() { return this._addOnBlur; }
   set addOnBlur(value) { this._addOnBlur = coerceBooleanProperty(value); }
   _addOnBlur: boolean = false;
@@ -57,16 +57,14 @@ export class MdChipInput {
    * Defaults to `[ENTER]`.
    */
   // TODO(tinayuangao): Support Set here
-  @Input('mdChipInputSeparatorKeyCodes') separatorKeyCodes: number[] = [ENTER];
+  @Input('matChipInputSeparatorKeyCodes') separatorKeyCodes: number[] = [ENTER];
 
   /** Emitted when a chip is to be added. */
-  @Output('mdChipInputTokenEnd')
-  chipEnd = new EventEmitter<MdChipInputEvent>();
-
-  @Output('matChipInputTokenEnd') _matChipInputTokenEnd = this.chipEnd;
+  @Output('matChipInputTokenEnd')
+  chipEnd = new EventEmitter<MatChipInputEvent>();
 
   @Input('matChipInputFor')
-  set matChipList(value: MdChipList) { this.chipList = value; }
+  set matChipList(value: MatChipList) { this.chipList = value; }
 
   @Input('matChipInputAddOnBlur')
   get matAddOnBlur() { return this._addOnBlur; }
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index e4ef2f7d2de0..bb9a5b33eb71 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -5,23 +5,23 @@ import {createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent} from '@an
 import {Component, DebugElement, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MdFormFieldModule} from '@angular/material/form-field';
+import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdInputModule} from '../input/index';
-import {MdChip} from './chip';
-import {MdChipInputEvent} from './chip-input';
-import {MdChipList, MdChipsModule} from './index';
+import {MatInputModule} from '../input/index';
+import {MatChip} from './chip';
+import {MatChipInputEvent} from './chip-input';
+import {MatChipList, MatChipsModule} from './index';
 
 
-describe('MdChipList', () => {
+describe('MatChipList', () => {
   let fixture: ComponentFixture<any>;
   let chipListDebugElement: DebugElement;
   let chipListNativeElement: HTMLElement;
-  let chipListInstance: MdChipList;
+  let chipListInstance: MatChipList;
   let testComponent: StandardChipList;
   let chips: QueryList<any>;
-  let manager: FocusKeyManager<MdChip>;
+  let manager: FocusKeyManager<MatChip>;
   let dir = 'ltr';
 
   beforeEach(async(() => {
@@ -29,9 +29,9 @@ describe('MdChipList', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        MdChipsModule,
-        MdFormFieldModule,
-        MdInputModule,
+        MatChipsModule,
+        MatFormFieldModule,
+        MatInputModule,
         NoopAnimationsModule
       ],
       declarations: [
@@ -141,7 +141,7 @@ describe('MdChipList', () => {
         }));
 
         it('should focus previous item when press LEFT ARROW', () => {
-          let nativeChips = chipListNativeElement.querySelectorAll('md-chip');
+          let nativeChips = chipListNativeElement.querySelectorAll('mat-chip');
           let lastNativeChip = nativeChips[nativeChips.length - 1] as HTMLElement;
 
           let LEFT_EVENT = createKeyboardEvent('keydown', LEFT_ARROW, lastNativeChip);
@@ -162,7 +162,7 @@ describe('MdChipList', () => {
         });
 
         it('should focus next item when press RIGHT ARROW', () => {
-          let nativeChips = chipListNativeElement.querySelectorAll('md-chip');
+          let nativeChips = chipListNativeElement.querySelectorAll('mat-chip');
           let firstNativeChip = nativeChips[0] as HTMLElement;
 
           let RIGHT_EVENT: KeyboardEvent =
@@ -192,7 +192,7 @@ describe('MdChipList', () => {
         }));
 
         it('should focus previous item when press RIGHT ARROW', () => {
-          let nativeChips = chipListNativeElement.querySelectorAll('md-chip');
+          let nativeChips = chipListNativeElement.querySelectorAll('mat-chip');
           let lastNativeChip = nativeChips[nativeChips.length - 1] as HTMLElement;
 
           let RIGHT_EVENT: KeyboardEvent =
@@ -214,7 +214,7 @@ describe('MdChipList', () => {
         });
 
         it('should focus next item when press LEFT ARROW', () => {
-          let nativeChips = chipListNativeElement.querySelectorAll('md-chip');
+          let nativeChips = chipListNativeElement.querySelectorAll('mat-chip');
           let firstNativeChip = nativeChips[0] as HTMLElement;
 
           let LEFT_EVENT: KeyboardEvent =
@@ -327,11 +327,11 @@ describe('MdChipList', () => {
       fixture.detectChanges();
 
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-      nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+      nativeChips = fixture.debugElement.queryAll(By.css('mat-chip'))
           .map((chip) => chip.nativeElement);
 
 
-      chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
+      chipListDebugElement = fixture.debugElement.query(By.directive(MatChipList));
       chipListInstance = chipListDebugElement.componentInstance;
       chips = chipListInstance.chips;
 
@@ -366,7 +366,7 @@ describe('MdChipList', () => {
       fixture.componentInstance.foods.push({viewValue: 'Potatoes', value: 'potatoes-8'});
       fixture.detectChanges();
 
-      nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+      nativeChips = fixture.debugElement.queryAll(By.css('mat-chip'))
         .map((chip) => chip.nativeElement);
       const lastChip = nativeChips[8];
       dispatchKeyboardEvent(lastChip, 'keydown', SPACE);
@@ -403,7 +403,7 @@ describe('MdChipList', () => {
         fixture.detectChanges();
 
         formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-        nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+        nativeChips = fixture.debugElement.queryAll(By.css('mat-chip'))
           .map((chip) => chip.nativeElement);
         chips = fixture.componentInstance.chips;
       });
@@ -556,7 +556,7 @@ describe('MdChipList', () => {
         fixture.detectChanges();
 
         formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-        nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+        nativeChips = fixture.debugElement.queryAll(By.css('mat-chip'))
           .map((chip) => chip.nativeElement);
         chips = fixture.componentInstance.chips;
       });
@@ -641,7 +641,7 @@ describe('MdChipList', () => {
       fixture.detectChanges();
 
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-      nativeChips = fixture.debugElement.queryAll(By.css('md-chip'))
+      nativeChips = fixture.debugElement.queryAll(By.css('mat-chip'))
         .map((chip) => chip.nativeElement);
     });
 
@@ -778,7 +778,7 @@ describe('MdChipList', () => {
       beforeEach(() => {
         fixture = TestBed.createComponent(InputChipList);
         fixture.detectChanges();
-        chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
+        chipListDebugElement = fixture.debugElement.query(By.directive(MatChipList));
         chipListInstance = chipListDebugElement.componentInstance;
         chips = chipListInstance.chips;
         manager = fixture.componentInstance.chipList._keyManager;
@@ -828,7 +828,7 @@ describe('MdChipList', () => {
     fixture = TestBed.createComponent(StandardChipList);
     fixture.detectChanges();
 
-    chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
+    chipListDebugElement = fixture.debugElement.query(By.directive(MatChipList));
     chipListNativeElement = chipListDebugElement.nativeElement;
     chipListInstance = chipListDebugElement.componentInstance;
     testComponent = fixture.debugElement.componentInstance;
@@ -839,7 +839,7 @@ describe('MdChipList', () => {
     fixture = TestBed.createComponent(FormFieldChipList);
     fixture.detectChanges();
 
-    chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
+    chipListDebugElement = fixture.debugElement.query(By.directive(MatChipList));
     chipListNativeElement = chipListDebugElement.nativeElement;
     chipListInstance = chipListDebugElement.componentInstance;
     testComponent = fixture.debugElement.componentInstance;
@@ -850,15 +850,15 @@ describe('MdChipList', () => {
 
 @Component({
   template: `
-    <md-chip-list [tabIndex]="tabIndex">
+    <mat-chip-list [tabIndex]="tabIndex">
       <div *ngFor="let i of [0,1,2,3,4]">
        <div *ngIf="remove != i">
-          <md-chip (select)="chipSelect(i)" (deselect)="chipDeselect(i)">
+          <mat-chip (select)="chipSelect(i)" (deselect)="chipDeselect(i)">
             {{name}} {{i + 1}}
-          </md-chip>
+          </mat-chip>
         </div>
       </div>
-    </md-chip-list>`
+    </mat-chip-list>`
 })
 class StandardChipList {
   name: string = 'Test';
@@ -871,14 +871,14 @@ class StandardChipList {
 
 @Component({
   template: `
-    <md-form-field>
-      <md-chip-list #chipList>
-        <md-chip>Chip 1</md-chip>
-        <md-chip>Chip 1</md-chip>
-        <md-chip>Chip 1</md-chip>
-      </md-chip-list>
-      <input mdInput name="test" [mdChipInputFor]="chipList"/>
-    </md-form-field>
+    <mat-form-field>
+      <mat-chip-list #chipList>
+        <mat-chip>Chip 1</mat-chip>
+        <mat-chip>Chip 1</mat-chip>
+        <mat-chip>Chip 1</mat-chip>
+      </mat-chip-list>
+      <input matInput name="test" [matChipInputFor]="chipList"/>
+    </mat-form-field>
   `
 })
 class FormFieldChipList {
@@ -888,14 +888,14 @@ class FormFieldChipList {
 @Component({
   selector: 'basic-chip-list',
   template: `
-    <md-form-field>
-      <md-chip-list placeholder="Food" [formControl]="control" [required]="isRequired"
+    <mat-form-field>
+      <mat-chip-list placeholder="Food" [formControl]="control" [required]="isRequired"
         [tabIndex]="tabIndexOverride" [selectable]="selectable">
-        <md-chip *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
+        <mat-chip *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
           {{ food.viewValue }}
-        </md-chip>
-      </md-chip-list>
-    </md-form-field>
+        </mat-chip>
+      </mat-chip-list>
+    </mat-form-field>
   `
 })
 class BasicChipList {
@@ -914,23 +914,23 @@ class BasicChipList {
   tabIndexOverride: number;
   selectable: boolean;
 
-  @ViewChild(MdChipList) chipList: MdChipList;
-  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+  @ViewChild(MatChipList) chipList: MatChipList;
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
 
 
 @Component({
   selector: 'multi-selection-chip-list',
   template: `
-    <md-form-field>
-      <md-chip-list [multiple]="true" placeholder="Food" [formControl]="control"
+    <mat-form-field>
+      <mat-chip-list [multiple]="true" placeholder="Food" [formControl]="control"
         [required]="isRequired"
         [tabIndex]="tabIndexOverride" [selectable]="selectable">
-        <md-chip *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
+        <mat-chip *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
           {{ food.viewValue }}
-        </md-chip>
-      </md-chip-list>
-    </md-form-field>
+        </mat-chip>
+      </mat-chip-list>
+    </mat-form-field>
   `
 })
 class MultiSelectionChipList {
@@ -949,26 +949,26 @@ class MultiSelectionChipList {
   tabIndexOverride: number;
   selectable: boolean;
 
-  @ViewChild(MdChipList) chipList: MdChipList;
-  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+  @ViewChild(MatChipList) chipList: MatChipList;
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
 
 @Component({
   selector: 'input-chip-list',
   template: `
-    <md-form-field>
-      <md-chip-list [multiple]="true"
+    <mat-form-field>
+      <mat-chip-list [multiple]="true"
                     placeholder="Food" [formControl]="control" [required]="isRequired" #chipList1>
-        <md-chip *ngFor="let food of foods" [value]="food.value">
+        <mat-chip *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-chip>
-      </md-chip-list>
+        </mat-chip>
+      </mat-chip-list>
       <input placeholder="New food..."
-          [mdChipInputFor]="chipList1"
-          [mdChipInputSeparatorKeyCodes]="separatorKeyCodes"
-          [mdChipInputAddOnBlur]="addOnBlur"
-          (mdChipInputTokenEnd)="add($event)" />/>
-    </md-form-field>
+          [matChipInputFor]="chipList1"
+          [matChipInputSeparatorKeyCodes]="separatorKeyCodes"
+          [matChipInputAddOnBlur]="addOnBlur"
+          (matChipInputTokenEnd)="add($event)" />/>
+    </mat-form-field>
   `
 })
 class InputChipList {
@@ -988,7 +988,7 @@ class InputChipList {
   addOnBlur: boolean = true;
   isRequired: boolean;
 
-  add(event: MdChipInputEvent): void {
+  add(event: MatChipInputEvent): void {
     let input = event.input;
     let value = event.value;
 
@@ -1006,17 +1006,17 @@ class InputChipList {
     }
   }
 
-  @ViewChild(MdChipList) chipList: MdChipList;
-  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+  @ViewChild(MatChipList) chipList: MatChipList;
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <md-chip-list [formControl]="control">
-        <md-chip *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-chip>
-      </md-chip-list>
-    </md-form-field>
+    <mat-form-field>
+      <mat-chip-list [formControl]="control">
+        <mat-chip *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</mat-chip>
+      </mat-chip-list>
+    </mat-form-field>
   `
 })
 class FalsyValueChipList {
@@ -1025,5 +1025,5 @@ class FalsyValueChipList {
     { value: 1, viewValue: 'Pizza' },
   ];
   control = new FormControl();
-  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 5555824873d6..ae7bdfe0b177 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -31,20 +31,20 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
-import {MdFormFieldControl} from '@angular/material/form-field';
+import {MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {MdChip, MdChipEvent, MdChipSelectionChange} from './chip';
-import {MdChipInput} from './chip-input';
+import {MatChip, MatChipEvent, MatChipSelectionChange} from './chip';
+import {MatChipInput} from './chip-input';
 
 // Increasing integer for generating unique ids for chip-list components.
 let nextUniqueId = 0;
 
 /** Change event object that is emitted when the chip list value has changed. */
-export class MdChipListChange {
-  constructor(public source: MdChipList, public value: any) { }
+export class MatChipListChange {
+  constructor(public source: MatChipList, public value: any) { }
 }
 
 
@@ -53,9 +53,9 @@ export class MdChipListChange {
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-chip-list, mat-chip-list',
+  selector: 'mat-chip-list',
   template: `<div class="mat-chip-list-wrapper"><ng-content></ng-content></div>`,
-  exportAs: 'mdChipList, matChipList',
+  exportAs: 'matChipList',
   host: {
     '[attr.tabindex]': '_tabIndex',
     '[attr.aria-describedby]': '_ariaDescribedby || null',
@@ -73,18 +73,18 @@ export class MdChipListChange {
     '(blur)': '_blur()',
     '(keydown)': '_keydown($event)'
   },
-  providers: [{provide: MdFormFieldControl, useExisting: MdChipList}],
+  providers: [{provide: MatFormFieldControl, useExisting: MatChipList}],
   styleUrls: ['chips.css'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor,
+export class MatChipList implements MatFormFieldControl<any>, ControlValueAccessor,
     AfterContentInit, OnInit, OnDestroy {
   readonly controlType = 'mat-chip-list';
 
   /**
-   * Stream that emits whenever the state of the input changes such that the wrapping `MdFormField`
+   * Stream that emits whenever the state of the input changes such that the wrapping `MatFormField`
    * needs to run change detection.
    */
   stateChanges = new Subject<void>();
@@ -93,7 +93,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   protected _lastDestroyedIndex: number|null = null;
 
   /** Track which chips we're listening to for focus/destruction. */
-  protected _chipSet: WeakMap<MdChip, boolean> = new WeakMap();
+  protected _chipSet: WeakMap<MatChip, boolean> = new WeakMap();
 
   /** Subscription to tabbing out from the chip list. */
   private _tabOutSubscription = Subscription.EMPTY;
@@ -120,7 +120,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   private _multiple: boolean = false;
 
   /** The chip input to add more chips */
-  protected _chipInput: MdChipInput;
+  protected _chipInput: MatChipInput;
 
   /** The aria-describedby attribute on the chip list for improved a11y. */
   protected _ariaDescribedby: string;
@@ -129,7 +129,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   protected _id: string;
 
   /** Uid of the chip list */
-  protected _uid: string = `md-chip-list-${nextUniqueId++}`;
+  protected _uid: string = `mat-chip-list-${nextUniqueId++}`;
 
   /** Whether this is required */
   protected _required: boolean = false;
@@ -139,7 +139,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
 
   protected _value: any;
 
-  /** Placeholder for the chip list. Alternatively, placeholder can be set on MdChipInput */
+  /** Placeholder for the chip list. Alternatively, placeholder can be set on MatChipInput */
   protected _placeholder: string;
 
   /** Tab index for the chip list. */
@@ -152,7 +152,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   _userTabIndex: number | null = null;
 
   /** The FocusKeyManager which handles focus. */
-  _keyManager: FocusKeyManager<MdChip>;
+  _keyManager: FocusKeyManager<MatChip>;
 
   /** Function when touched */
   _onTouched = () => {};
@@ -160,13 +160,13 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   /** Function when changed */
   _onChange: (value: any) => void = () => {};
 
-  _selectionModel: SelectionModel<MdChip>;
+  _selectionModel: SelectionModel<MatChip>;
 
   /** Comparison function to specify which option is displayed. Defaults to object equality. */
   private _compareWith = (o1: any, o2: any) => o1 === o2;
 
   /** The array of selected chips inside chip list. */
-  get selected(): MdChip[] | MdChip {
+  get selected(): MatChip[] | MatChip {
     return this.multiple ? this._selectionModel.selected : this._selectionModel.selected[0];
   }
 
@@ -228,13 +228,13 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
     return this._chipInput ? this._chipInput.placeholder : this._placeholder;
   }
 
-  /** Whether any chips or the mdChipInput inside of this chip-list has focus. */
+  /** Whether any chips or the matChipInput inside of this chip-list has focus. */
   get focused() {
     return this.chips.some(chip => chip._hasFocus) ||
       (this._chipInput && this._chipInput.focused);
   }
 
-  /** Whether this chip-list contains no chips and no mdChipInput. */
+  /** Whether this chip-list contains no chips and no matChipInput. */
   get empty(): boolean {
     return (!this._chipInput || this._chipInput.empty) && this.chips.length === 0;
   }
@@ -275,27 +275,27 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   }
 
   /** Combined stream of all of the child chips' selection change events. */
-  get chipSelectionChanges(): Observable<MdChipSelectionChange> {
+  get chipSelectionChanges(): Observable<MatChipSelectionChange> {
     return merge(...this.chips.map(chip => chip.selectionChange));
   }
 
   /** Combined stream of all of the child chips' focus change events. */
-  get chipFocusChanges(): Observable<MdChipEvent> {
+  get chipFocusChanges(): Observable<MatChipEvent> {
     return merge(...this.chips.map(chip => chip._onFocus));
   }
 
   /** Combined stream of all of the child chips' blur change events. */
-  get chipBlurChanges(): Observable<MdChipEvent> {
+  get chipBlurChanges(): Observable<MatChipEvent> {
     return merge(...this.chips.map(chip => chip._onBlur));
   }
 
   /** Combined stream of all of the child chips' remove change events. */
-  get chipRemoveChanges(): Observable<MdChipEvent> {
+  get chipRemoveChanges(): Observable<MatChipEvent> {
     return merge(...this.chips.map(chip => chip.destroy));
   }
 
   /** Event emitted when the selected chip list value has been changed by the user. */
-  @Output() change: EventEmitter<MdChipListChange> = new EventEmitter<MdChipListChange>();
+  @Output() change: EventEmitter<MatChipListChange> = new EventEmitter<MatChipListChange>();
 
   /**
    * Event that emits whenever the raw value of the chip-list changes. This is here primarily
@@ -305,7 +305,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   @Output() valueChange = new EventEmitter<any>();
 
   /** The chip components contained within this chip list. */
-  @ContentChildren(MdChip) chips: QueryList<MdChip>;
+  @ContentChildren(MatChip) chips: QueryList<MatChip>;
 
   constructor(protected _renderer: Renderer2,
               protected _elementRef: ElementRef,
@@ -321,7 +321,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
 
   ngAfterContentInit(): void {
 
-    this._keyManager = new FocusKeyManager<MdChip>(this.chips).withWrap();
+    this._keyManager = new FocusKeyManager<MatChip>(this.chips).withWrap();
 
     // Prevents the chip list from capturing focus and redirecting
     // it back to the first chip when the user tabs out.
@@ -346,7 +346,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
   }
 
   ngOnInit() {
-    this._selectionModel = new SelectionModel<MdChip>(this.multiple, undefined, false);
+    this._selectionModel = new SelectionModel<MatChip>(this.multiple, undefined, false);
     this.stateChanges.next();
   }
 
@@ -361,11 +361,11 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
 
 
   /** Associates an HTML input element with this chip list. */
-  registerInput(inputElement: MdChipInput) {
+  registerInput(inputElement: MatChipInput) {
     this._chipInput = inputElement;
   }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
 
   // Implemented as part of ControlValueAccessor
@@ -471,7 +471,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
    * Otherwise focus the next chip in the list.
    * Save `_lastDestroyedIndex` so we can set the correct focus.
    */
-  protected _updateKeyManager(chip: MdChip) {
+  protected _updateKeyManager(chip: MatChip) {
     let chipIndex: number = this.chips.toArray().indexOf(chip);
     if (this._isValidIndex(chipIndex)) {
       if (chip._hasFocus) {
@@ -554,7 +554,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
    * Finds and selects the chip based on its value.
    * @returns Chip that has the corresponding value.
    */
-  private _selectValue(value: any, isUserInput: boolean = true): MdChip | undefined {
+  private _selectValue(value: any, isUserInput: boolean = true): MatChip | undefined {
 
     const correspondingChip = this.chips.find(chip => {
       return chip.value != null && this._compareWith(chip.value,  value);
@@ -581,7 +581,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
    * Deselects every chip in the list.
    * @param skip Chip that should not be deselected.
    */
-  private _clearSelection(skip?: MdChip): void {
+  private _clearSelection(skip?: MatChip): void {
     this._selectionModel.clear();
     this.chips.forEach(chip => {
       if (chip !== skip) {
@@ -618,7 +618,7 @@ export class MdChipList implements MdFormFieldControl<any>, ControlValueAccessor
       valueToEmit = this.selected ? this.selected.value : fallbackValue;
     }
     this._value = valueToEmit;
-    this.change.emit(new MdChipListChange(this, valueToEmit));
+    this.change.emit(new MatChipListChange(this, valueToEmit));
     this.valueChange.emit(valueToEmit);
     this._onChange(valueToEmit);
     this._changeDetectorRef.markForCheck();
diff --git a/src/lib/chips/chip-remove.spec.ts b/src/lib/chips/chip-remove.spec.ts
index 39450a639438..b8fabef214dc 100644
--- a/src/lib/chips/chip-remove.spec.ts
+++ b/src/lib/chips/chip-remove.spec.ts
@@ -1,7 +1,7 @@
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {MdChip, MdChipsModule} from './index';
+import {MatChip, MatChipsModule} from './index';
 
 describe('Chip Remove', () => {
   let fixture: ComponentFixture<any>;
@@ -11,7 +11,7 @@ describe('Chip Remove', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule],
+      imports: [MatChipsModule],
       declarations: [
         TestChip
       ]
@@ -25,7 +25,7 @@ describe('Chip Remove', () => {
     testChip = fixture.debugElement.componentInstance;
     fixture.detectChanges();
 
-    chipDebugElement = fixture.debugElement.query(By.directive(MdChip));
+    chipDebugElement = fixture.debugElement.query(By.directive(MatChip));
     chipNativeElement = chipDebugElement.nativeElement;
   }));
 
@@ -53,7 +53,7 @@ describe('Chip Remove', () => {
 
 @Component({
   template: `
-    <md-chip [removable]="removable" (remove)="didRemove()"><a mdChipRemove></a></md-chip>
+    <mat-chip [removable]="removable" (remove)="didRemove()"><a matChipRemove></a></mat-chip>
   `
 })
 class TestChip {
diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
index 51ade187196a..e5bdd5023bab 100644
--- a/src/lib/chips/chip.spec.ts
+++ b/src/lib/chips/chip.spec.ts
@@ -4,7 +4,7 @@ import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdChip, MdChipEvent, MdChipList, MdChipSelectionChange, MdChipsModule} from './index';
+import {MatChip, MatChipEvent, MatChipList, MatChipSelectionChange, MatChipsModule} from './index';
 
 
 describe('Chips', () => {
@@ -12,13 +12,13 @@ describe('Chips', () => {
   let chipDebugElement: DebugElement;
   let chipListNativeElement: HTMLElement;
   let chipNativeElement: HTMLElement;
-  let chipInstance: MdChip;
+  let chipInstance: MatChip;
 
   let dir = 'ltr';
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule],
+      imports: [MatChipsModule],
       declarations: [
         BasicChip, SingleChip
       ],
@@ -32,15 +32,15 @@ describe('Chips', () => {
     TestBed.compileComponents();
   }));
 
-  describe('MdBasicChip', () => {
+  describe('MatBasicChip', () => {
 
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicChip);
       fixture.detectChanges();
 
-      chipDebugElement = fixture.debugElement.query(By.directive(MdChip));
+      chipDebugElement = fixture.debugElement.query(By.directive(MatChip));
       chipNativeElement = chipDebugElement.nativeElement;
-      chipInstance = chipDebugElement.injector.get(MdChip);
+      chipInstance = chipDebugElement.injector.get(MatChip);
 
       document.body.appendChild(chipNativeElement);
     });
@@ -55,17 +55,17 @@ describe('Chips', () => {
     });
   });
 
-  describe('MdChip', () => {
+  describe('MatChip', () => {
     let testComponent: SingleChip;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(SingleChip);
       fixture.detectChanges();
 
-      chipDebugElement = fixture.debugElement.query(By.directive(MdChip));
-      chipListNativeElement = fixture.debugElement.query(By.directive(MdChipList)).nativeElement;
+      chipDebugElement = fixture.debugElement.query(By.directive(MatChip));
+      chipListNativeElement = fixture.debugElement.query(By.directive(MatChipList)).nativeElement;
       chipNativeElement = chipDebugElement.nativeElement;
-      chipInstance = chipDebugElement.injector.get(MdChip);
+      chipInstance = chipDebugElement.injector.get(MatChip);
       testComponent = fixture.debugElement.componentInstance;
 
       document.body.appendChild(chipNativeElement);
@@ -77,7 +77,7 @@ describe('Chips', () => {
 
     describe('basic behaviors', () => {
 
-      it('adds the `md-chip` class', () => {
+      it('adds the `mat-chip` class', () => {
         expect(chipNativeElement.classList).toContain('mat-chip');
       });
 
@@ -122,7 +122,7 @@ describe('Chips', () => {
 
         expect(chipNativeElement.classList).toContain('mat-chip-selected');
         expect(testComponent.chipSelectionChange)
-          .toHaveBeenCalledWith({source: chipInstance, isUserInput: false, selected: true});
+            .toHaveBeenCalledWith({source: chipInstance, isUserInput: false, selected: true});
       });
 
       it('allows removal', () => {
@@ -145,13 +145,13 @@ describe('Chips', () => {
 
         it('should selects/deselects the currently focused chip on SPACE', () => {
           const SPACE_EVENT: KeyboardEvent = createKeyboardEvent('keydown', SPACE) as KeyboardEvent;
-          const CHIP_SELECTED_EVENT: MdChipSelectionChange = {
+          const CHIP_SELECTED_EVENT: MatChipSelectionChange = {
             source: chipInstance,
             isUserInput: true,
             selected: true
           };
 
-          const CHIP_DESELECTED_EVENT: MdChipSelectionChange = {
+          const CHIP_DESELECTED_EVENT: MatChipSelectionChange = {
             source: chipInstance,
             isUserInput: true,
             selected: false
@@ -287,17 +287,17 @@ describe('Chips', () => {
 
 @Component({
   template: `
-    <md-chip-list>
+    <mat-chip-list>
       <div *ngIf="shouldShow">
-        <md-chip [selectable]="selectable" [removable]="removable"
+        <mat-chip [selectable]="selectable" [removable]="removable"
                  [color]="color" [selected]="selected" [disabled]="disabled"
                  (focus)="chipFocus($event)" (destroyed)="chipDestroy($event)"
                  (selectionChange)="chipSelectionChange($event)"
                  (removed)="chipRemove($event)">
           {{name}}
-        </md-chip>
+        </mat-chip>
       </div>
-    </md-chip-list>`
+    </mat-chip-list>`
 })
 class SingleChip {
   disabled: boolean = false;
@@ -308,14 +308,14 @@ class SingleChip {
   removable: boolean = true;
   shouldShow: boolean = true;
 
-  chipFocus: (event?: MdChipEvent) => void = () => {};
-  chipDestroy: (event?: MdChipEvent) => void = () => {};
-  chipSelectionChange: (event?: MdChipSelectionChange) => void = () => {};
-  chipRemove: (event?: MdChipEvent) => void = () => {};
+  chipFocus: (event?: MatChipEvent) => void = () => {};
+  chipDestroy: (event?: MatChipEvent) => void = () => {};
+  chipSelectionChange: (event?: MatChipSelectionChange) => void = () => {};
+  chipRemove: (event?: MatChipEvent) => void = () => {};
 }
 
 @Component({
-  template: `<md-basic-chip>{{name}}</md-basic-chip>`
+  template: `<mat-basic-chip>{{name}}</mat-basic-chip>`
 })
 class BasicChip {
 }
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 5b2690816e30..8d8c3c6c7ace 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -22,24 +22,24 @@ import {CanColor, CanDisable, mixinColor, mixinDisabled} from '@angular/material
 import {Subject} from 'rxjs/Subject';
 
 
-export interface MdChipEvent {
-  chip: MdChip;
+export interface MatChipEvent {
+  chip: MatChip;
 }
 
-/** Event object emitted by MdChip when selected or deselected. */
-export class MdChipSelectionChange {
-  constructor(public source: MdChip, public selected: boolean, public isUserInput = false) { }
+/** Event object emitted by MatChip when selected or deselected. */
+export class MatChipSelectionChange {
+  constructor(public source: MatChip, public selected: boolean, public isUserInput = false) { }
 }
 
 
-// Boilerplate for applying mixins to MdChip.
+// Boilerplate for applying mixins to MatChip.
 /** @docs-private */
-export class MdChipBase {
+export class MatChipBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {
   }
 }
 
-export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary');
+export const _MatChipMixinBase = mixinColor(mixinDisabled(MatChipBase), 'primary');
 
 
 /**
@@ -47,20 +47,19 @@ export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary')
  * @docs-private
  */
 @Directive({
-  selector: `md-basic-chip, [md-basic-chip], mat-basic-chip, [mat-basic-chip]`,
+  selector: `mat-basic-chip, [mat-basic-chip]`,
   host: {'class': 'mat-basic-chip'},
 })
-export class MdBasicChip {
+export class MatBasicChip {
 }
 
 /**
- * Material design styled Chip component. Used inside the MdChipList component.
+ * Material design styled Chip component. Used inside the MatChipList component.
  */
 @Directive({
-  selector: `md-basic-chip, [md-basic-chip], md-chip, [md-chip],
-             mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]`,
+  selector: `mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]`,
   inputs: ['color', 'disabled'],
-  exportAs: 'mdChip, matChip',
+  exportAs: 'matChip',
   host: {
     'class': 'mat-chip',
     'tabindex': '-1',
@@ -76,7 +75,7 @@ export class MdBasicChip {
   },
 
 })
-export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestroy, CanColor,
+export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDestroy, CanColor,
     CanDisable {
 
   protected _value: any;
@@ -103,7 +102,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       selected: value
     });
   }
-  /** The value of the chip. Defaults to the content inside <md-chip> tags. */
+  /** The value of the chip. Defaults to the content inside <mat-chip> tags. */
   @Input()
   get value(): any {
     return this._value != undefined
@@ -140,16 +139,16 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   }
 
   /** Emits when the chip is focused. */
-  _onFocus = new Subject<MdChipEvent>();
+  _onFocus = new Subject<MatChipEvent>();
 
   /** Emits when the chip is blured. */
-  _onBlur = new Subject<MdChipEvent>();
+  _onBlur = new Subject<MatChipEvent>();
 
   /** Emitted when the chip is selected or deselected. */
-  @Output() selectionChange = new EventEmitter<MdChipSelectionChange>();
+  @Output() selectionChange = new EventEmitter<MatChipSelectionChange>();
 
   /** Emitted when the chip is destroyed. */
-  @Output() destroyed = new EventEmitter<MdChipEvent>();
+  @Output() destroyed = new EventEmitter<MatChipEvent>();
 
   /**
    * Emitted when the chip is destroyed.
@@ -158,7 +157,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   @Output() destroy = this.destroyed;
 
   /** Emitted when a chip is to be removed. */
-  @Output() removed = new EventEmitter<MdChipEvent>();
+  @Output() removed = new EventEmitter<MatChipEvent>();
 
   /**
    * Emitted when a chip is to be removed.
@@ -229,7 +228,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   }
 
   /**
-   * Allows for programmatic removal of the chip. Called by the MdChipList when the DELETE or
+   * Allows for programmatic removal of the chip. Called by the MatChipList when the DELETE or
    * BACKSPACE keys are pressed.
    *
    * Informs any listeners of the removal request. Does not remove the chip from the DOM.
@@ -292,22 +291,22 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
  *
  * Example:
  *
- *     <md-chip>
- *       <md-icon mdChipRemove>cancel</md-icon>
- *     </md-chip>
+ *     <mat-chip>
+ *       <mat-icon matChipRemove>cancel</mat-icon>
+ *     </mat-chip>
  *
- * You *may* use a custom icon, but you may need to override the `md-chip-remove` positioning styles
- * to properly center the icon within the chip.
+ * You *may* use a custom icon, but you may need to override the `mat-chip-remove` positioning
+ * styles to properly center the icon within the chip.
  */
 @Directive({
-  selector: '[mdChipRemove], [matChipRemove]',
+  selector: '[matChipRemove]',
   host: {
     'class': 'mat-chip-remove',
     '(click)': '_handleClick($event)',
   },
 })
-export class MdChipRemove {
-  constructor(protected _parentChip: MdChip) {
+export class MatChipRemove {
+  constructor(protected _parentChip: MatChip) {
   }
 
   /** Calls the parent chip's public `remove()` method if applicable. */
diff --git a/src/lib/chips/chips-module.ts b/src/lib/chips/chips-module.ts
index b87aac229dc8..e74b17793131 100644
--- a/src/lib/chips/chips-module.ts
+++ b/src/lib/chips/chips-module.ts
@@ -7,14 +7,14 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdChipList} from './chip-list';
-import {MdBasicChip, MdChip, MdChipRemove} from './chip';
-import {MdChipInput} from './chip-input';
+import {MatChipList} from './chip-list';
+import {MatBasicChip, MatChip, MatChipRemove} from './chip';
+import {MatChipInput} from './chip-input';
 
 
 @NgModule({
   imports: [],
-  exports: [MdChipList, MdChip, MdChipInput, MdChipRemove, MdChipRemove, MdBasicChip],
-  declarations: [MdChipList, MdChip, MdChipInput, MdChipRemove,  MdChipRemove, MdBasicChip]
+  exports: [MatChipList, MatChip, MatChipInput, MatChipRemove, MatChipRemove, MatBasicChip],
+  declarations: [MatChipList, MatChip, MatChipInput, MatChipRemove,  MatChipRemove, MatBasicChip]
 })
-export class MdChipsModule {}
+export class MatChipsModule {}
diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index db4dfdeef6be..180e4a326bcd 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -1,26 +1,26 @@
-`<md-chip-list>` displays a list of values as individual, keyboard accessible, chips.
+`<mat-chip-list>` displays a list of values as individual, keyboard accessible, chips.
 
 <!-- example(chips-overview) -->
 
 _Note: chips are still early in their development and more features are being actively worked on._
 
 ```html
-<md-chip-list>
-  <md-chip>Papadum</md-chip>
-  <md-chip>Naan</md-chip>
-  <md-chip>Dal</md-chip>
-</md-chip-list>
+<mat-chip-list>
+  <mat-chip>Papadum</mat-chip>
+  <mat-chip>Naan</mat-chip>
+  <mat-chip>Dal</mat-chip>
+</mat-chip-list>
 ```
 
 ### Unstyled chips
-By default, `<md-chip>` has Material Design styles applied. For a chip with no styles applied,
-use `<md-basic-chip>`. You can then customize the chip appearance by adding your own CSS.
+By default, `<mat-chip>` has Material Design styles applied. For a chip with no styles applied,
+use `<mat-basic-chip>`. You can then customize the chip appearance by adding your own CSS.
 
-_Hint: `<md-basic-chip>` receives the `mat-basic-chip` CSS class in addition to the `mat-chip` class._
+_Hint: `<mat-basic-chip>` receives the `mat-basic-chip` CSS class in addition to the `mat-chip` class._
 
 ### Selection
 Chips can be selected via the `selected` property. Selection can be disabled by setting
-`selectable` to `false` on the `<md-chip-list>`.
+`selectable` to `false` on the `<mat-chip-list>`.
 
 Whenever the selection state changes, a `ChipSelectionChange` event will be emitted via 
 `(selectionChange)`.
@@ -30,9 +30,9 @@ Individual chips may be disabled by applying the `disabled` attribute to the chi
 chips are neither selectable nor focusable. Currently, disabled chips receive no special styling.
 
 ### Chip input
-The `MdChipInput` directive can be used together with a chip-list to streamline the interaction
+The `MatChipInput` directive can be used together with a chip-list to streamline the interaction
 between the two components. This directive adds chip-specific behaviors to the input element
-within `<md-form-field>` for adding and removing chips. The `<input>` with `MdChipInput` can
+within `<mat-form-field>` for adding and removing chips. The `<input>` with `MatChipInput` can
 be placed inside or outside the chip-list element.
 
 An exmaple of chip input placed inside the chip-list element.
@@ -41,13 +41,13 @@ An exmaple of chip input placed inside the chip-list element.
 An example of chip input placed outside the chip-list element.
 
 ```html
-<md-form-field>
-  <md-chip-list #chipList>
-    <md-chip>Chip 1<md-chip>
-    <md-chip>Chip 2<md-chip>
-  </md-chip-list>
-  <input mdChipInputFor="chipList">
-</md-form-field>
+<mat-form-field>
+  <mat-chip-list #chipList>
+    <mat-chip>Chip 1<mat-chip>
+    <mat-chip>Chip 2<mat-chip>
+  </mat-chip-list>
+  <input matChipInputFor="chipList">
+</mat-form-field>
 ```
 
 ### Keyboard interaction
@@ -59,15 +59,15 @@ If you want the chips in the list to be stacked vertically, instead of horizonta
 the `mat-chip-list-stacked` class, as well as the `aria-orientation="vertical"` attribute:
 
 ```html
-<md-chip-list class="mat-chip-list-stacked" aria-orientation="vertical">
-  <md-chip>Papadum</md-chip>
-  <md-chip>Naan</md-chip>
-  <md-chip>Dal</md-chip>
-</md-chip-list>
+<mat-chip-list class="mat-chip-list-stacked" aria-orientation="vertical">
+  <mat-chip>Papadum</mat-chip>
+  <mat-chip>Naan</mat-chip>
+  <mat-chip>Dal</mat-chip>
+</mat-chip-list>
 ```
 
 ### Theming
-The selected color of an `<md-chip>` can be changed by using the `color` property. By default, chips
+The selected color of an `<mat-chip>` can be changed by using the `color` property. By default, chips
 use a neutral background color based on the current theme (light or dark). This can be changed to
 `'primary'`, `'accent'`, or `'warn'`.
 
diff --git a/src/lib/chips/mat-exports.ts b/src/lib/chips/mat-exports.ts
deleted file mode 100644
index 73ccd86cd58f..000000000000
--- a/src/lib/chips/mat-exports.ts
+++ /dev/null
@@ -1,24 +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 {MdBasicChip, MdChip, MdChipBase, MdChipEvent, MdChipRemove} from './chip';
-import {MdChipInput, MdChipInputEvent} from './chip-input';
-import {MdChipList, MdChipListChange} from './chip-list';
-import {MdChipsModule} from './chips-module';
-
-
-export {MdBasicChip as MatBasicChip};
-export {MdChip as MatChip};
-export {MdChipBase as MatChipBase};
-export {MdChipEvent as MatChipEvent};
-export {MdChipInput as MatChipInput};
-export {MdChipInputEvent as MatChipInputEvent};
-export {MdChipListChange as MatChipListChange};
-export {MdChipList as MatChipList};
-export {MdChipRemove as MatChipRemove};
-export {MdChipsModule as MatChipsModule};
diff --git a/src/lib/chips/public_api.ts b/src/lib/chips/public_api.ts
index d7a19a1e5240..dfff919ca34f 100644
--- a/src/lib/chips/public_api.ts
+++ b/src/lib/chips/public_api.ts
@@ -10,4 +10,4 @@ export * from './chips-module';
 export * from './chip-list';
 export * from './chip';
 export * from './chip-input';
-export * from './mat-exports';
+
diff --git a/src/lib/core/_core.scss b/src/lib/core/_core.scss
index 7ae874518a80..7a4372719261 100644
--- a/src/lib/core/_core.scss
+++ b/src/lib/core/_core.scss
@@ -40,7 +40,7 @@
   @include mat-pseudo-checkbox-theme($theme);
 
   // Wrapper element that provides the theme background when the
-  // user's content isn't inside of a `md-sidenav-container`.
+  // user's content isn't inside of a `mat-sidenav-container`.
   .mat-app-background {
     $background: map-get($theme, background);
     background-color: mat-color($background, background);
diff --git a/src/lib/core/common-behaviors/common-module.ts b/src/lib/core/common-behaviors/common-module.ts
index dcc15f4b33c6..5262c8e6b6a9 100644
--- a/src/lib/core/common-behaviors/common-module.ts
+++ b/src/lib/core/common-behaviors/common-module.ts
@@ -13,14 +13,14 @@ import {CompatibilityModule} from '../compatibility/compatibility';
 
 
 /** Injection token that configures whether the Material sanity checks are enabled. */
-export const MATERIAL_SANITY_CHECKS = new InjectionToken<boolean>('md-sanity-checks');
+export const MATERIAL_SANITY_CHECKS = new InjectionToken<boolean>('mat-sanity-checks');
 
 
 /**
  * Module that captures anything that should be loaded and/or run for *all* Angular Material
  * components. This includes Bidi, compatibility mode, etc.
  *
- * This module should be imported to each top-level component module (e.g., MdTabsModule).
+ * This module should be imported to each top-level component module (e.g., MatTabsModule).
  */
 @NgModule({
   imports: [CompatibilityModule, BidiModule],
@@ -29,7 +29,7 @@ export const MATERIAL_SANITY_CHECKS = new InjectionToken<boolean>('md-sanity-che
     provide: MATERIAL_SANITY_CHECKS, useValue: true,
   }],
 })
-export class MdCommonModule {
+export class MatCommonModule {
   /** Whether we've done the global sanity checks (e.g. a theme is loaded, there is a doctype). */
   private _hasDoneGlobalChecks = false;
 
diff --git a/src/lib/core/common-behaviors/index.ts b/src/lib/core/common-behaviors/index.ts
index 80e6e0c694d1..8ec520969ad7 100644
--- a/src/lib/core/common-behaviors/index.ts
+++ b/src/lib/core/common-behaviors/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {MdCommonModule, MATERIAL_SANITY_CHECKS} from './common-module';
+export {MatCommonModule, MATERIAL_SANITY_CHECKS} from './common-module';
 export {CanDisable, mixinDisabled} from './disabled';
 export {CanColor, mixinColor, ThemePalette} from './color';
 export {CanDisableRipple, mixinDisableRipple} from './disable-ripple';
diff --git a/src/lib/core/compatibility/compatibility.spec.ts b/src/lib/core/compatibility/compatibility.spec.ts
index b22fe0a9055a..e69de29bb2d1 100644
--- a/src/lib/core/compatibility/compatibility.spec.ts
+++ b/src/lib/core/compatibility/compatibility.spec.ts
@@ -1,104 +0,0 @@
-import {Component, NgModule} from '@angular/core';
-import {async, TestBed} from '@angular/core/testing';
-import {MdCheckboxModule} from '../../checkbox/index';
-import {
-  NoConflictStyleCompatibilityMode,
-  MAT_ELEMENTS_SELECTOR,
-  MD_ELEMENTS_SELECTOR,
-  getMdCompatibilityInvalidPrefixError,
-} from './compatibility';
-import {wrappedErrorMessage} from '@angular/cdk/testing';
-
-
-describe('Style compatibility', () => {
-
-  describe('selectors', () => {
-    it('should have the same selectors in the same order for compatibility mode', () => {
-      expect(MAT_ELEMENTS_SELECTOR.replace(/(\s|\[)mat/g, '$1md').trim())
-          .toBe(MD_ELEMENTS_SELECTOR.trim());
-      expect(MD_ELEMENTS_SELECTOR.replace(/(\s|\[)md/g, '$1mat').trim())
-          .toBe(MAT_ELEMENTS_SELECTOR.trim());
-    });
-  });
-
-  describe('in default mode', () => {
-    beforeEach(async(() => {
-      TestBed.configureTestingModule({
-        // Specifically do *not* directly import the DefaultStyleCompatibilityModeModule
-        // to ensure that it is the default behavior.
-        imports: [MdCheckboxModule],
-        declarations: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
-      });
-
-      TestBed.compileComponents();
-    }));
-
-    it('should throw an error when trying to use the "mat-" prefix', () => {
-      const expectedError = getMdCompatibilityInvalidPrefixError('mat', 'mat-checkbox');
-
-      expect(() => {
-        TestBed.createComponent(ComponentWithMatCheckbox);
-      }).toThrowError(wrappedErrorMessage(expectedError));
-    });
-  });
-
-  describe('in no-conflict mode', () => {
-    beforeEach(async(() => {
-      TestBed.configureTestingModule({
-        imports: [MdCheckboxModule, NoConflictStyleCompatibilityMode],
-        declarations: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
-      });
-
-      TestBed.compileComponents();
-    }));
-
-    it('should not throw an error when trying to use the "mat-" prefix', () => {
-      TestBed.createComponent(ComponentWithMatCheckbox);
-    });
-
-    it('should throw an error when trying to use the "md-" prefix', () => {
-      const expectedError = getMdCompatibilityInvalidPrefixError('md', 'md-checkbox');
-
-      expect(() => {
-        TestBed.createComponent(ComponentWithMdCheckbox);
-      }).toThrowError(wrappedErrorMessage(expectedError));
-    });
-  });
-
-  describe('with no-conflict mode at root and component module imported in app sub-module', () => {
-    beforeEach(async(() => {
-      TestBed.configureTestingModule({
-        imports: [TestAppSubModule, NoConflictStyleCompatibilityMode],
-      });
-
-      TestBed.compileComponents();
-    }));
-
-    it('should throw an error when using the "md-" prefix', () => {
-      const expectedError = getMdCompatibilityInvalidPrefixError('md', 'md-checkbox');
-
-      expect(() => {
-        TestBed.createComponent(ComponentWithMdCheckbox);
-      }).toThrowError(wrappedErrorMessage(expectedError));
-    });
-
-    it('should not throw an error when using the "mat-" prefix', () => {
-      TestBed.createComponent(ComponentWithMatCheckbox);
-    });
-  });
-});
-
-
-@Component({ template: `<md-checkbox>Hungry</md-checkbox>` })
-export class ComponentWithMdCheckbox { }
-
-@Component({ template: `<mat-checkbox>Hungry</mat-checkbox>` })
-export class ComponentWithMatCheckbox { }
-
-
-@NgModule({
-  imports: [MdCheckboxModule],
-  exports: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
-  declarations: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
-})
-export class TestAppSubModule {}
diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts
index 769e23fcb549..eaaaacf16241 100644
--- a/src/lib/core/compatibility/compatibility.ts
+++ b/src/lib/core/compatibility/compatibility.ts
@@ -6,20 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule, Directive, Inject, Optional, ElementRef, InjectionToken} from '@angular/core';
+import {Directive, InjectionToken, NgModule} from '@angular/core';
 
 export const MATERIAL_COMPATIBILITY_MODE = new InjectionToken<boolean>('md-compatibility-mode');
 
-/**
- * Returns an exception to be thrown if the consumer has used
- * an invalid Material prefix on a component.
- * @docs-private
- */
-export function getMdCompatibilityInvalidPrefixError(prefix: string, nodeName: string) {
-  return Error(`The "${prefix}-" prefix cannot be used in ng-material v1 compatibility mode. ` +
-                   `It was used on an "${nodeName.toLowerCase()}" element.`);
-}
-
 /** Selector that matches all elements that may have style collisions with AngularJS Material. */
 export const MAT_ELEMENTS_SELECTOR = `
   [mat-button],
@@ -188,29 +178,11 @@ export const MD_ELEMENTS_SELECTOR = `
 
 /** Directive that enforces that the `mat-` prefix cannot be used. */
 @Directive({selector: MAT_ELEMENTS_SELECTOR})
-export class MatPrefixRejector {
-  constructor(
-    @Optional() @Inject(MATERIAL_COMPATIBILITY_MODE) isCompatibilityMode: boolean,
-    elementRef: ElementRef) {
-
-    if (!isCompatibilityMode) {
-      throw getMdCompatibilityInvalidPrefixError('mat', elementRef.nativeElement.nodeName);
-    }
-  }
-}
+export class MatPrefixRejector {}
 
 /** Directive that enforces that the `md-` prefix cannot be used. */
 @Directive({selector: MD_ELEMENTS_SELECTOR})
-export class MdPrefixRejector {
-  constructor(
-    @Optional() @Inject(MATERIAL_COMPATIBILITY_MODE) isCompatibilityMode: boolean,
-    elementRef: ElementRef) {
-
-    if (isCompatibilityMode) {
-      throw getMdCompatibilityInvalidPrefixError('md', elementRef.nativeElement.nodeName);
-    }
-  }
-}
+export class MdPrefixRejector {}
 
 
 /**
@@ -229,9 +201,5 @@ export class CompatibilityModule {}
  * Module that enforces "no-conflict" compatibility mode settings. When this module is loaded,
  * it will throw an error if there are any uses of the `md-` prefix.
  */
-@NgModule({
-  providers: [{
-    provide: MATERIAL_COMPATIBILITY_MODE, useValue: true,
-  }],
-})
+@NgModule()
 export class NoConflictStyleCompatibilityMode {}
diff --git a/src/lib/core/datetime/date-formats.ts b/src/lib/core/datetime/date-formats.ts
index 9ea86e42bbae..2a0a15361916 100644
--- a/src/lib/core/datetime/date-formats.ts
+++ b/src/lib/core/datetime/date-formats.ts
@@ -9,7 +9,7 @@
 import {InjectionToken} from '@angular/core';
 
 
-export type MdDateFormats = {
+export type MatDateFormats = {
   parse: {
     dateInput: any
   },
@@ -22,4 +22,4 @@ export type MdDateFormats = {
 };
 
 
-export const MD_DATE_FORMATS = new InjectionToken<MdDateFormats>('md-date-formats');
+export const MAT_DATE_FORMATS = new InjectionToken<MatDateFormats>('mat-date-formats');
diff --git a/src/lib/core/datetime/index.ts b/src/lib/core/datetime/index.ts
index e16c8b39b197..a7035f4b62b6 100644
--- a/src/lib/core/datetime/index.ts
+++ b/src/lib/core/datetime/index.ts
@@ -9,8 +9,8 @@
 import {NgModule} from '@angular/core';
 import {DateAdapter, MAT_DATE_LOCALE_PROVIDER} from './date-adapter';
 import {NativeDateAdapter} from './native-date-adapter';
-import {MD_DATE_FORMATS} from './date-formats';
-import {MD_NATIVE_DATE_FORMATS} from './native-date-formats';
+import {MAT_DATE_FORMATS} from './date-formats';
+import {MAT_NATIVE_DATE_FORMATS} from './native-date-formats';
 
 export * from './date-adapter';
 export * from './date-formats';
@@ -29,6 +29,6 @@ export class NativeDateModule {}
 
 @NgModule({
   imports: [NativeDateModule],
-  providers: [{provide: MD_DATE_FORMATS, useValue: MD_NATIVE_DATE_FORMATS}],
+  providers: [{provide: MAT_DATE_FORMATS, useValue: MAT_NATIVE_DATE_FORMATS}],
 })
-export class MdNativeDateModule {}
+export class MatNativeDateModule {}
diff --git a/src/lib/core/datetime/native-date-formats.ts b/src/lib/core/datetime/native-date-formats.ts
index 631cfcb010b5..2c8bd3e494ba 100644
--- a/src/lib/core/datetime/native-date-formats.ts
+++ b/src/lib/core/datetime/native-date-formats.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MdDateFormats} from './date-formats';
+import {MatDateFormats} from './date-formats';
 
 
-export const MD_NATIVE_DATE_FORMATS: MdDateFormats = {
+export const MAT_NATIVE_DATE_FORMATS: MatDateFormats = {
   parse: {
     dateInput: null,
   },
diff --git a/src/lib/core/error/error-options.ts b/src/lib/core/error/error-options.ts
index e4d1bb4d16f2..fc0945955f0d 100644
--- a/src/lib/core/error/error-options.ts
+++ b/src/lib/core/error/error-options.ts
@@ -10,7 +10,8 @@ import {InjectionToken} from '@angular/core';
 import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
 
 /** Injection token that can be used to specify the global error options. */
-export const MD_ERROR_GLOBAL_OPTIONS = new InjectionToken<ErrorOptions>('md-error-global-options');
+export const MAT_ERROR_GLOBAL_OPTIONS =
+    new InjectionToken<ErrorOptions>('mat-error-global-options');
 
 export type ErrorStateMatcher =
     (control: FormControl, form: FormGroupDirective | NgForm) => boolean;
diff --git a/src/lib/core/line/line.ts b/src/lib/core/line/line.ts
index 747adc0ccdeb..fa76897daa17 100644
--- a/src/lib/core/line/line.ts
+++ b/src/lib/core/line/line.ts
@@ -13,26 +13,26 @@ import {
   ElementRef,
   QueryList,
 } from '@angular/core';
-import {MdCommonModule} from '../common-behaviors/common-module';
+import {MatCommonModule} from '../common-behaviors/common-module';
 
 
 /**
  * Shared directive to count lines inside a text area, such as a list item.
- * Line elements can be extracted with a @ContentChildren(MdLine) query, then
+ * Line elements can be extracted with a @ContentChildren(MatLine) query, then
  * counted by checking the query list's length.
  */
 @Directive({
-  selector: '[md-line], [mat-line], [mdLine], [matLine]',
+  selector: '[mat-line], [matLine]',
   host: {'class': 'mat-line'}
 })
-export class MdLine {}
+export class MatLine {}
 
 /**
  * Helper that takes a query list of lines and sets the correct class on the host.
  * @docs-private
  */
-export class MdLineSetter {
-  constructor(private _lines: QueryList<MdLine>, private _renderer: Renderer2,
+export class MatLineSetter {
+  constructor(private _lines: QueryList<MatLine>, private _renderer: Renderer2,
               private _element: ElementRef) {
     this._setLineClass(this._lines.length);
 
@@ -67,8 +67,8 @@ export class MdLineSetter {
 }
 
 @NgModule({
-  imports: [MdCommonModule],
-  exports: [MdLine, MdCommonModule],
-  declarations: [MdLine],
+  imports: [MatCommonModule],
+  exports: [MatLine, MatCommonModule],
+  declarations: [MatLine],
 })
-export class MdLineModule { }
+export class MatLineModule { }
diff --git a/src/lib/core/mat-exports.ts b/src/lib/core/mat-exports.ts
deleted file mode 100644
index b38a9c583c59..000000000000
--- a/src/lib/core/mat-exports.ts
+++ /dev/null
@@ -1,49 +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 {MdCommonModule} from './common-behaviors/common-module';
-import {
-  MD_DATE_FORMATS,
-  MD_NATIVE_DATE_FORMATS,
-  MdDateFormats,
-  MdNativeDateModule,
-} from './datetime/index';
-import {MD_ERROR_GLOBAL_OPTIONS} from './error/error-options';
-import {MdLine, MdLineModule, MdLineSetter} from './line/line';
-import {
-  MdOptgroup,
-  MdOptgroupBase,
-  MdOption,
-  MdOptionModule,
-  MdOptionSelectionChange,
-} from './option/index';
-import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from './placeholder/placeholder-options';
-import {MD_RIPPLE_GLOBAL_OPTIONS, MdRipple, MdRippleModule} from './ripple/index';
-import {MdPseudoCheckbox, MdPseudoCheckboxModule, MdPseudoCheckboxState} from './selection/index';
-
-export {MD_DATE_FORMATS as MAT_DATE_FORMATS};
-export {MD_RIPPLE_GLOBAL_OPTIONS as MAT_RIPPLE_GLOBAL_OPTIONS};
-export {MD_NATIVE_DATE_FORMATS as MAT_NATIVE_DATE_FORMATS};
-export {MD_PLACEHOLDER_GLOBAL_OPTIONS as MAT_PLACEHOLDER_GLOBAL_OPTIONS};
-export {MD_ERROR_GLOBAL_OPTIONS as MAT_ERROR_GLOBAL_OPTIONS};
-export {MdCommonModule as MatCommonModule};
-export {MdDateFormats as MatDateFormats};
-export {MdLine as MatLine};
-export {MdLineModule as MatLineModule};
-export {MdLineSetter as MatLineSetter};
-export {MdOptgroup as MatOptgroup};
-export {MdOptgroupBase as MatOptgroupBase};
-export {MdOption as MatOption};
-export {MdOptionModule as MatOptionModule};
-export {MdOptionSelectionChange as MatOptionSelectionChange};
-export {MdNativeDateModule as MatNativeDateModule};
-export {MdPseudoCheckbox as MatPseudoCheckbox};
-export {MdPseudoCheckboxModule as MatPseudoCheckboxModule};
-export {MdPseudoCheckboxState as MatPseudoCheckboxState};
-export {MdRipple as MatRipple};
-export {MdRippleModule as MatRippleModule};
diff --git a/src/lib/core/option/_option.scss b/src/lib/core/option/_option.scss
index 109f1ecc3d99..6cbae7e330ed 100644
--- a/src/lib/core/option/_option.scss
+++ b/src/lib/core/option/_option.scss
@@ -30,9 +30,9 @@
   }
 
   // Collapses unwanted whitespace created by newlines in code like the following:
-  // <md-option>
+  // <mat-option>
   //   {{value}}
-  // </md-option>
+  // </mat-option>
   .mat-option-text {
     display: inline-block;
   }
diff --git a/src/lib/core/option/index.ts b/src/lib/core/option/index.ts
index 2150e97f094b..cb72fc3876ff 100644
--- a/src/lib/core/option/index.ts
+++ b/src/lib/core/option/index.ts
@@ -8,18 +8,18 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdRippleModule} from '../ripple/index';
-import {MdPseudoCheckboxModule} from '../selection/index';
-import {MdOption} from './option';
-import {MdOptgroup} from './optgroup';
+import {MatRippleModule} from '../ripple/index';
+import {MatPseudoCheckboxModule} from '../selection/index';
+import {MatOption} from './option';
+import {MatOptgroup} from './optgroup';
 
 
 @NgModule({
-  imports: [MdRippleModule, CommonModule, MdPseudoCheckboxModule],
-  exports: [MdOption, MdOptgroup],
-  declarations: [MdOption, MdOptgroup]
+  imports: [MatRippleModule, CommonModule, MatPseudoCheckboxModule],
+  exports: [MatOption, MatOptgroup],
+  declarations: [MatOption, MatOptgroup]
 })
-export class MdOptionModule {}
+export class MatOptionModule {}
 
 
 export * from './option';
diff --git a/src/lib/core/option/optgroup.html b/src/lib/core/option/optgroup.html
index 62e7c987b446..5e1054f77639 100644
--- a/src/lib/core/option/optgroup.html
+++ b/src/lib/core/option/optgroup.html
@@ -1,2 +1,2 @@
 <label class="mat-optgroup-label" [id]="_labelId">{{ label }}</label>
-<ng-content select="md-option, mat-option"></ng-content>
+<ng-content select="mat-option"></ng-content>
diff --git a/src/lib/core/option/optgroup.ts b/src/lib/core/option/optgroup.ts
index f904895ac8d2..7315448e8421 100644
--- a/src/lib/core/option/optgroup.ts
+++ b/src/lib/core/option/optgroup.ts
@@ -9,20 +9,20 @@
 import {Component, ViewEncapsulation, Input, ChangeDetectionStrategy} from '@angular/core';
 import {mixinDisabled, CanDisable} from '../common-behaviors/disabled';
 
-// Boilerplate for applying mixins to MdOptgroup.
+// Boilerplate for applying mixins to MatOptgroup.
 /** @docs-private */
-export class MdOptgroupBase { }
-export const _MdOptgroupMixinBase = mixinDisabled(MdOptgroupBase);
+export class MatOptgroupBase { }
+export const _MatOptgroupMixinBase = mixinDisabled(MatOptgroupBase);
 
 // Counter for unique group ids.
 let _uniqueOptgroupIdCounter = 0;
 
 /**
- * Component that is used to group instances of `md-option`.
+ * Component that is used to group instances of `mat-option`.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-optgroup, mat-optgroup',
+  selector: 'mat-optgroup',
   templateUrl: 'optgroup.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
@@ -36,7 +36,7 @@ let _uniqueOptgroupIdCounter = 0;
     '[attr.aria-labelledby]': '_labelId',
   }
 })
-export class MdOptgroup extends _MdOptgroupMixinBase implements CanDisable {
+export class MatOptgroup extends _MatOptgroupMixinBase implements CanDisable {
   /** Label for the option group. */
   @Input() label: string;
 
diff --git a/src/lib/core/option/option.spec.ts b/src/lib/core/option/option.spec.ts
index d0a9c79470d3..f03c47f8e30c 100644
--- a/src/lib/core/option/option.spec.ts
+++ b/src/lib/core/option/option.spec.ts
@@ -2,13 +2,13 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {dispatchFakeEvent} from '@angular/cdk/testing';
-import {MdOption, MdOptionModule} from './index';
+import {MatOption, MatOptionModule} from './index';
 
-describe('MdOption component', () => {
+describe('MatOption component', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdOptionModule],
+      imports: [MatOptionModule],
       declarations: [OptionWithDisable]
     }).compileComponents();
   }));
@@ -17,13 +17,13 @@ describe('MdOption component', () => {
     let fixture: ComponentFixture<OptionWithDisable>;
     let optionDebugElement: DebugElement;
     let optionNativeElement: HTMLElement;
-    let optionInstance: MdOption;
+    let optionInstance: MatOption;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(OptionWithDisable);
       fixture.detectChanges();
 
-      optionDebugElement = fixture.debugElement.query(By.directive(MdOption));
+      optionDebugElement = fixture.debugElement.query(By.directive(MatOption));
       optionNativeElement = optionDebugElement.nativeElement;
       optionInstance = optionDebugElement.componentInstance;
     });
@@ -73,7 +73,7 @@ describe('MdOption component', () => {
 });
 
 @Component({
-  template: `<md-option [disabled]="disabled"></md-option>`
+  template: `<mat-option [disabled]="disabled"></mat-option>`
 })
 export class OptionWithDisable {
   disabled: boolean;
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index 8174c0b5f9fc..b7061303225c 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -20,8 +20,7 @@ import {
   QueryList,
   ViewEncapsulation,
 } from '@angular/core';
-import {MATERIAL_COMPATIBILITY_MODE} from '../compatibility/compatibility';
-import {MdOptgroup} from './optgroup';
+import {MatOptgroup} from './optgroup';
 
 /**
  * Option IDs need to be unique across components, so this counter exists outside of
@@ -29,17 +28,17 @@ import {MdOptgroup} from './optgroup';
  */
 let _uniqueIdCounter = 0;
 
-/** Event object emitted by MdOption when selected or deselected. */
-export class MdOptionSelectionChange {
-  constructor(public source: MdOption, public isUserInput = false) { }
+/** Event object emitted by MatOption when selected or deselected. */
+export class MatOptionSelectionChange {
+  constructor(public source: MatOption, public isUserInput = false) { }
 }
 
 /**
- * Single option inside of a `<md-select>` element.
+ * Single option inside of a `<mat-select>` element.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-option, mat-option',
+  selector: 'mat-option',
   host: {
     'role': 'option',
     '[attr.tabindex]': '_getTabIndex()',
@@ -58,9 +57,8 @@ export class MdOptionSelectionChange {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdOption {
+export class MatOption {
   private _selected: boolean = false;
   private _active: boolean = false;
   private _multiple: boolean = false;
@@ -69,7 +67,7 @@ export class MdOption {
   /** Whether the option is disabled.  */
   private _disabled: boolean = false;
 
-  private _id: string = `md-option-${_uniqueIdCounter++}`;
+  private _id: string = `mat-option-${_uniqueIdCounter++}`;
 
   /** Whether the wrapping component is in multiple selection mode. */
   get multiple() { return this._multiple; }
@@ -102,12 +100,12 @@ export class MdOption {
   }
 
   /** Event emitted when the option is selected or deselected. */
-  @Output() onSelectionChange = new EventEmitter<MdOptionSelectionChange>();
+  @Output() onSelectionChange = new EventEmitter<MatOptionSelectionChange>();
 
   constructor(
     private _element: ElementRef,
     private _changeDetectorRef: ChangeDetectorRef,
-    @Optional() public readonly group: MdOptgroup) {}
+    @Optional() public readonly group: MatOptgroup) {}
 
   /**
    * Whether or not the option is currently active and ready to be selected.
@@ -214,7 +212,7 @@ export class MdOption {
 
   /** Emits the selection change event. */
   private _emitSelectionChangeEvent(isUserInput = false): void {
-    this.onSelectionChange.emit(new MdOptionSelectionChange(this, isUserInput));
+    this.onSelectionChange.emit(new MatOptionSelectionChange(this, isUserInput));
   }
 
   /**
@@ -223,8 +221,8 @@ export class MdOption {
    * @param options Flat list of all of the options.
    * @param optionGroups Flat list of all of the option groups.
    */
-  static countGroupLabelsBeforeOption(optionIndex: number, options: QueryList<MdOption>,
-    optionGroups: QueryList<MdOptgroup>): number {
+  static countGroupLabelsBeforeOption(optionIndex: number, options: QueryList<MatOption>,
+    optionGroups: QueryList<MatOptgroup>): number {
 
     if (optionGroups.length) {
       let optionsArray = options.toArray();
diff --git a/src/lib/core/placeholder/placeholder-options.ts b/src/lib/core/placeholder/placeholder-options.ts
index ee79b824fa86..ba024ad3cfd2 100644
--- a/src/lib/core/placeholder/placeholder-options.ts
+++ b/src/lib/core/placeholder/placeholder-options.ts
@@ -9,8 +9,8 @@
 import { InjectionToken } from '@angular/core';
 
 /** InjectionToken that can be used to specify the global placeholder options. */
-export const MD_PLACEHOLDER_GLOBAL_OPTIONS =
-  new InjectionToken<PlaceholderOptions>('md-placeholder-global-options');
+export const MAT_PLACEHOLDER_GLOBAL_OPTIONS =
+  new InjectionToken<PlaceholderOptions>('mat-placeholder-global-options');
 
 /** Type for the available floatPlaceholder values. */
 export type FloatPlaceholderType = 'always' | 'never' | 'auto';
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public_api.ts
index 4a540f7e1cf6..c059cace3f96 100644
--- a/src/lib/core/public_api.ts
+++ b/src/lib/core/public_api.ts
@@ -21,7 +21,7 @@ export * from './ripple/index';
 export * from './selection/index';
 export * from './style/index';
 export * from './util/object-extend';
-export * from './mat-exports';
+
 
 // TODO: don't have this
 export * from './testing/month-constants';
diff --git a/src/lib/core/ripple/README.md b/src/lib/core/ripple/README.md
index 3ec6f266617f..2cbcbe44a147 100644
--- a/src/lib/core/ripple/README.md
+++ b/src/lib/core/ripple/README.md
@@ -1,10 +1,10 @@
-# md-ripple
+# mat-ripple
 
-`md-ripple` defines an area in which a ripple animates, usually in response to user action. It is used as an attribute directive, for example `<div md-ripple [mdRippleColor]="rippleColor">...</div>`.
+`mat-ripple` defines an area in which a ripple animates, usually in response to user action. It is used as an attribute directive, for example `<div mat-ripple [matRippleColor]="rippleColor">...</div>`.
 
-By default, a ripple is activated when the host element of the `md-ripple` directive receives mouse or touch events. On a mousedown or touch start, the ripple background fades in. When the click event completes, a circular foreground ripple fades in and expands from the event location to cover the host element bounds.
+By default, a ripple is activated when the host element of the `mat-ripple` directive receives mouse or touch events. On a mousedown or touch start, the ripple background fades in. When the click event completes, a circular foreground ripple fades in and expands from the event location to cover the host element bounds.
 
-Ripples can also be triggered programmatically by getting a reference to the MdRipple directive and calling its `start` and `end` methods.
+Ripples can also be triggered programmatically by getting a reference to the MatRipple directive and calling its `start` and `end` methods.
 
 ### Global options
 
@@ -12,7 +12,7 @@ Developers are able to specify options for all ripples inside of their applicati
 
 The speed of the ripples can be adjusted and the ripples can be disabled globally as well.
 
-Global ripple options can be specified by setting the `MD_RIPPLE_GLOBAL_OPTIONS` provider.
+Global ripple options can be specified by setting the `MAT_RIPPLE_GLOBAL_OPTIONS` provider.
 
 ```ts
 const globalRippleConfig: RippleGlobalOptions = {
@@ -22,7 +22,7 @@ const globalRippleConfig: RippleGlobalOptions = {
 
 @NgModule({
   providers: [
-    {provide: MD_RIPPLE_GLOBAL_OPTIONS, useValue: globalRippleConfig} 
+    {provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: globalRippleConfig} 
   ]
 })
 ```
@@ -40,9 +40,9 @@ Properties:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| `mdRippleTrigger` | Element | The DOM element that triggers the ripple when clicked. Defaults to the parent of the `md-ripple`.
-| `mdRippleColor` | string | Custom color for foreground ripples
-| `mdRippleCentered` | boolean | If true, the ripple animation originates from the center of the `md-ripple` bounds rather than from the location of the click event.
-| `mdRippleRadius` | number | Optional fixed radius of foreground ripples when fully expanded. Mainly used in conjunction with `unbounded` attribute. If not set, ripples will expand from their origin to the most distant corner of the component's bounding rectangle.
-| `mdRippleUnbounded` | boolean | If true, foreground ripples will be visible outside the component's bounds.
-| `mdRippleDisabled` | boolean | If true, click events on the trigger element will not activate ripples. The `start` and `end` methods can still be called to programmatically create ripples.
+| `matRippleTrigger` | Element | The DOM element that triggers the ripple when clicked. Defaults to the parent of the `mat-ripple`.
+| `matRippleColor` | string | Custom color for foreground ripples
+| `matRippleCentered` | boolean | If true, the ripple animation originates from the center of the `mat-ripple` bounds rather than from the location of the click event.
+| `matRippleRadius` | number | Optional fixed radius of foreground ripples when fully expanded. Mainly used in conjunction with `unbounded` attribute. If not set, ripples will expand from their origin to the most distant corner of the component's bounding rectangle.
+| `matRippleUnbounded` | boolean | If true, foreground ripples will be visible outside the component's bounds.
+| `matRippleDisabled` | boolean | If true, click events on the trigger element will not activate ripples. The `start` and `end` methods can still be called to programmatically create ripples.
diff --git a/src/lib/core/ripple/_ripple.scss b/src/lib/core/ripple/_ripple.scss
index 257df0e8ba69..6c03b9ae0980 100644
--- a/src/lib/core/ripple/_ripple.scss
+++ b/src/lib/core/ripple/_ripple.scss
@@ -4,7 +4,7 @@
 $mat-ripple-color-opacity: 0.1;
 
 @mixin mat-ripple() {
-  // The host element of an md-ripple directive should always have a position of "absolute" or
+  // The host element of an mat-ripple directive should always have a position of "absolute" or
   // "relative" so that the ripple divs it creates inside itself are correctly positioned.
   .mat-ripple {
     overflow: hidden;
diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts
index 4a16b4b3b288..046815308345 100644
--- a/src/lib/core/ripple/index.ts
+++ b/src/lib/core/ripple/index.ts
@@ -9,17 +9,17 @@
 import {NgModule} from '@angular/core';
 import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {PlatformModule} from '@angular/cdk/platform';
-import {MdCommonModule} from '../common-behaviors/common-module';
-import {MdRipple} from './ripple';
+import {MatCommonModule} from '../common-behaviors/common-module';
+import {MatRipple} from './ripple';
 
-export {MdRipple, RippleGlobalOptions, MD_RIPPLE_GLOBAL_OPTIONS} from './ripple';
+export {MatRipple, RippleGlobalOptions, MAT_RIPPLE_GLOBAL_OPTIONS} from './ripple';
 export {RippleRef, RippleState} from './ripple-ref';
 export {RippleConfig, RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from './ripple-renderer';
 
 @NgModule({
-  imports: [MdCommonModule, PlatformModule, ScrollDispatchModule],
-  exports: [MdRipple, MdCommonModule],
-  declarations: [MdRipple],
+  imports: [MatCommonModule, PlatformModule, ScrollDispatchModule],
+  exports: [MatRipple, MatCommonModule],
+  declarations: [MatRipple],
   providers: [VIEWPORT_RULER_PROVIDER],
 })
-export class MdRippleModule {}
+export class MatRippleModule {}
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index 5fb8608a8fe9..765637567fe8 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -5,11 +5,11 @@ import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchMouseEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
-  MdRipple, MdRippleModule, MD_RIPPLE_GLOBAL_OPTIONS, RippleState, RippleGlobalOptions
+  MatRipple, MatRippleModule, MAT_RIPPLE_GLOBAL_OPTIONS, RippleState, RippleGlobalOptions
 } from './index';
 
 
-describe('MdRipple', () => {
+describe('MatRipple', () => {
   let fixture: ComponentFixture<any>;
   let rippleTarget: HTMLElement;
   let originalBodyMargin: string | null;
@@ -23,7 +23,7 @@ describe('MdRipple', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [MdRippleModule],
+      imports: [MatRippleModule],
       declarations: [
         BasicRippleContainer,
         RippleContainerWithInputBindings,
@@ -47,7 +47,7 @@ describe('MdRipple', () => {
   });
 
   describe('basic ripple', () => {
-    let rippleDirective: MdRipple;
+    let rippleDirective: MatRipple;
 
     const TARGET_HEIGHT = 200;
     const TARGET_WIDTH = 300;
@@ -285,7 +285,7 @@ describe('MdRipple', () => {
   });
 
   describe('manual ripples', () => {
-    let rippleDirective: MdRipple;
+    let rippleDirective: MatRipple;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicRippleContainer);
@@ -359,7 +359,7 @@ describe('MdRipple', () => {
   });
 
   describe('global ripple options', () => {
-    let rippleDirective: MdRipple;
+    let rippleDirective: MatRipple;
 
     function createTestComponent(rippleConfig: RippleGlobalOptions,
                                  testComponent: any = BasicRippleContainer) {
@@ -367,9 +367,9 @@ describe('MdRipple', () => {
       // The testing module has been initialized in the root describe group for the ripples.
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
-        imports: [MdRippleModule],
+        imports: [MatRippleModule],
         declarations: [testComponent],
-        providers: [{ provide: MD_RIPPLE_GLOBAL_OPTIONS, useValue: rippleConfig }]
+        providers: [{ provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: rippleConfig }]
       });
 
       fixture = TestBed.createComponent(testComponent);
@@ -456,7 +456,7 @@ describe('MdRipple', () => {
 
   describe('configuring behavior', () => {
     let controller: RippleContainerWithInputBindings;
-    let rippleComponent: MdRipple;
+    let rippleComponent: MatRipple;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(RippleContainerWithInputBindings);
@@ -570,25 +570,25 @@ describe('MdRipple', () => {
 
 @Component({
   template: `
-    <div id="container" #ripple="mdRipple" mat-ripple [mdRippleSpeedFactor]="0"
+    <div id="container" #ripple="matRipple" mat-ripple [matRippleSpeedFactor]="0"
          style="position: relative; width:300px; height:200px;">
     </div>
   `,
 })
 class BasicRippleContainer {
-  @ViewChild('ripple') ripple: MdRipple;
+  @ViewChild('ripple') ripple: MatRipple;
 }
 
 @Component({
   template: `
     <div id="container" style="position: relative; width:300px; height:200px;"
       mat-ripple
-      [mdRippleSpeedFactor]="0"
-      [mdRippleTrigger]="trigger"
-      [mdRippleCentered]="centered"
-      [mdRippleRadius]="radius"
-      [mdRippleDisabled]="disabled"
-      [mdRippleColor]="color">
+      [matRippleSpeedFactor]="0"
+      [matRippleTrigger]="trigger"
+      [matRippleCentered]="centered"
+      [matRippleRadius]="radius"
+      [matRippleDisabled]="disabled"
+      [matRippleColor]="color">
     </div>
     <div class="alternateTrigger"></div>
   `,
@@ -599,17 +599,17 @@ class RippleContainerWithInputBindings {
   disabled = false;
   radius = 0;
   color = '';
-  @ViewChild(MdRipple) ripple: MdRipple;
+  @ViewChild(MatRipple) ripple: MatRipple;
 }
 
 @Component({
-  template: `<div id="container" #ripple="mdRipple" mat-ripple></div>`,
+  template: `<div id="container" #ripple="matRipple" mat-ripple></div>`,
 })
 class RippleContainerWithoutBindings {}
 
-@Component({ template: `<div id="container" mat-ripple [mdRippleSpeedFactor]="0"
+@Component({ template: `<div id="container" mat-ripple [matRippleSpeedFactor]="0"
                              *ngIf="!isDestroyed"></div>` })
 class RippleContainerWithNgIf {
-  @ViewChild(MdRipple) ripple: MdRipple;
+  @ViewChild(MatRipple) ripple: MatRipple;
   isDestroyed = false;
 }
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index 5b25c0a829f1..76e3bcec6b2e 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -29,18 +29,18 @@ export interface RippleGlobalOptions {
 }
 
 /** Injection token that can be used to specify the global ripple options. */
-export const MD_RIPPLE_GLOBAL_OPTIONS =
-    new InjectionToken<RippleGlobalOptions>('md-ripple-global-options');
+export const MAT_RIPPLE_GLOBAL_OPTIONS =
+    new InjectionToken<RippleGlobalOptions>('mat-ripple-global-options');
 
 @Directive({
-  selector: '[md-ripple], [mat-ripple], [mdRipple], [matRipple]',
-  exportAs: 'mdRipple, matRipple',
+  selector: '[mat-ripple], [matRipple]',
+  exportAs: 'matRipple',
   host: {
     'class': 'mat-ripple',
     '[class.mat-ripple-unbounded]': 'unbounded'
   }
 })
-export class MdRipple implements OnChanges, OnDestroy {
+export class MatRipple implements OnChanges, OnDestroy {
 
   /**
    * The element that triggers the ripple when click events are received. Defaults to the
@@ -48,74 +48,39 @@ export class MdRipple implements OnChanges, OnDestroy {
    */
   // Prevent TS metadata emit from referencing HTMLElement in ripple.js
   // Otherwise running this code in a Node environment (e.g Universal) will not work.
-  @Input('mdRippleTrigger') trigger: HTMLElement|HTMLElement;
+  @Input('matRippleTrigger') trigger: HTMLElement|HTMLElement;
 
   /**
    * Whether the ripple always originates from the center of the host element's bounds, rather
    * than originating from the location of the click event.
    */
-  @Input('mdRippleCentered') centered: boolean;
+  @Input('matRippleCentered') centered: boolean;
 
   /**
    * Whether click events will not trigger the ripple. Ripples can be still launched manually
    * by using the `launch()` method.
    */
-  @Input('mdRippleDisabled') disabled: boolean;
+  @Input('matRippleDisabled') disabled: boolean;
 
   /**
    * If set, the radius in pixels of foreground ripples when fully expanded. If unset, the radius
    * will be the distance from the center of the ripple to the furthest corner of the host element's
    * bounding rectangle.
    */
-  @Input('mdRippleRadius') radius: number = 0;
+  @Input('matRippleRadius') radius: number = 0;
 
   /**
    * If set, the normal duration of ripple animations is divided by this value. For example,
    * setting it to 0.5 will cause the animations to take twice as long.
    * A changed speedFactor will not modify the fade-out duration of the ripples.
    */
-  @Input('mdRippleSpeedFactor') speedFactor: number = 1;
+  @Input('matRippleSpeedFactor') speedFactor: number = 1;
 
   /** Custom color for ripples. */
-  @Input('mdRippleColor') color: string;
+  @Input('matRippleColor') color: string;
 
   /** Whether foreground ripples should be visible outside the component's bounds. */
-  @Input('mdRippleUnbounded') unbounded: boolean;
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleTrigger')
-  get _matRippleTrigger() { return this.trigger; }
-  set _matRippleTrigger(v) { this.trigger = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleCentered')
-  get _matRippleCentered() { return this.centered; }
-  set _matRippleCentered(v) { this.centered = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleDisabled')
-  get _matRippleDisabled() { return this.disabled; }
-  set _matRippleDisabled(v) { this.disabled = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleRadius')
-  get _matRippleRadius() { return this.radius; }
-  set _matRippleRadius(v) { this.radius = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleSpeedFactor')
-  get _matRippleSpeedFactor() { return this.speedFactor; }
-  set _matRippleSpeedFactor(v) { this.speedFactor = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleColor')
-  get _matRippleColor() { return this.color; }
-  set _matRippleColor(v) { this.color = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matRippleUnbounded')
-  get _matRippleUnbounded() { return this.unbounded; }
-  set _matRippleUnbounded(v) { this.unbounded = v; }
+  @Input('matRippleUnbounded') unbounded: boolean;
 
   /** Renderer for the ripple DOM manipulations. */
   private _rippleRenderer: RippleRenderer;
@@ -128,7 +93,7 @@ export class MdRipple implements OnChanges, OnDestroy {
     ngZone: NgZone,
     ruler: ViewportRuler,
     platform: Platform,
-    @Optional() @Inject(MD_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions
+    @Optional() @Inject(MAT_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions
   ) {
     this._rippleRenderer = new RippleRenderer(elementRef, ngZone, ruler, platform);
     this._globalOptions = globalOptions ? globalOptions : {};
diff --git a/src/lib/core/selection/index.ts b/src/lib/core/selection/index.ts
index cb3ef436abcb..48df48afef60 100644
--- a/src/lib/core/selection/index.ts
+++ b/src/lib/core/selection/index.ts
@@ -7,14 +7,14 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdPseudoCheckbox} from './pseudo-checkbox/pseudo-checkbox';
+import {MatPseudoCheckbox} from './pseudo-checkbox/pseudo-checkbox';
 
 
 @NgModule({
-  exports: [MdPseudoCheckbox],
-  declarations: [MdPseudoCheckbox]
+  exports: [MatPseudoCheckbox],
+  declarations: [MatPseudoCheckbox]
 })
-export class MdPseudoCheckboxModule { }
+export class MatPseudoCheckboxModule { }
 
 
 export * from './pseudo-checkbox/pseudo-checkbox';
diff --git a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
index db3e5331b153..b7188b2c3927 100644
--- a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
+++ b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
@@ -8,7 +8,7 @@
 
 import {Component, ViewEncapsulation, Input, ChangeDetectionStrategy} from '@angular/core';
 
-export type MdPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
+export type MatPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
 
 /**
  * Component that shows a simplified checkbox without including any kind of "real" checkbox.
@@ -18,7 +18,7 @@ export type MdPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
  * `mat-primary .mat-pseudo-checkbox`.
  *
  * Note that this component will be completely invisible to screen-reader users. This is *not*
- * interchangeable with <md-checkbox> and should *not* be used if the user would directly interact
+ * interchangeable with <mat-checkbox> and should *not* be used if the user would directly interact
  * with the checkbox. The pseudo-checkbox should only be used as an implementation detail of
  * more complex components that appropriately handle selected / checked state.
  * @docs-private
@@ -28,7 +28,7 @@ export type MdPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  selector: 'md-pseudo-checkbox, mat-pseudo-checkbox',
+  selector: 'mat-pseudo-checkbox',
   styleUrls: ['pseudo-checkbox.css'],
   template: '',
   host: {
@@ -38,9 +38,9 @@ export type MdPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
     '[class.mat-pseudo-checkbox-disabled]': 'disabled',
   },
 })
-export class MdPseudoCheckbox {
+export class MatPseudoCheckbox {
   /** Display state of the checkbox. */
-  @Input() state: MdPseudoCheckboxState = 'unchecked';
+  @Input() state: MatPseudoCheckboxState = 'unchecked';
 
   /** Whether the checkbox is disabled. */
   @Input() disabled: boolean = false;
diff --git a/src/lib/core/style/_menu-common.scss b/src/lib/core/style/_menu-common.scss
index 9dc35940cfb9..ba363b1bcaa9 100644
--- a/src/lib/core/style/_menu-common.scss
+++ b/src/lib/core/style/_menu-common.scss
@@ -2,7 +2,7 @@
 @import './elevation';
 @import './list-common';
 
-/** The mixins below are shared between md-menu and md-select */
+/** The mixins below are shared between mat-menu and mat-select */
 
 // menu width must be a multiple of 56px
 $mat-menu-overlay-min-width: 112px !default;   // 56 * 2
diff --git a/src/lib/datepicker/calendar-body.spec.ts b/src/lib/datepicker/calendar-body.spec.ts
index 08c34dec4c84..ea5052d7b66c 100644
--- a/src/lib/datepicker/calendar-body.spec.ts
+++ b/src/lib/datepicker/calendar-body.spec.ts
@@ -1,14 +1,14 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component} from '@angular/core';
-import {MdCalendarBody, MdCalendarCell} from './calendar-body';
+import {MatCalendarBody, MatCalendarCell} from './calendar-body';
 import {By} from '@angular/platform-browser';
 
 
-describe('MdCalendarBody', () => {
+describe('MatCalendarBody', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
-        MdCalendarBody,
+        MatCalendarBody,
 
         // Test components.
         StandardCalendarBody,
@@ -37,7 +37,7 @@ describe('MdCalendarBody', () => {
       fixture = TestBed.createComponent(StandardCalendarBody);
       fixture.detectChanges();
 
-      let calendarBodyDebugElement = fixture.debugElement.query(By.directive(MdCalendarBody));
+      let calendarBodyDebugElement = fixture.debugElement.query(By.directive(MatCalendarBody));
       calendarBodyNativeElement = calendarBodyDebugElement.nativeElement;
       testComponent = fixture.componentInstance;
 
@@ -102,7 +102,7 @@ describe('MdCalendarBody', () => {
       fixture = TestBed.createComponent(CalendarBodyWithDisabledCells);
       fixture.detectChanges();
 
-      let calendarBodyDebugElement = fixture.debugElement.query(By.directive(MdCalendarBody));
+      let calendarBodyDebugElement = fixture.debugElement.query(By.directive(MatCalendarBody));
       calendarBodyNativeElement = calendarBodyDebugElement.nativeElement;
       testComponent = fixture.componentInstance;
       cellEls = calendarBodyNativeElement.querySelectorAll('.mat-calendar-body-cell');
@@ -127,7 +127,7 @@ describe('MdCalendarBody', () => {
 
 
 @Component({
-  template: `<table md-calendar-body
+  template: `<table mat-calendar-body
                     [label]="label"
                     [rows]="rows"
                     [todayValue]="todayValue"
@@ -153,7 +153,7 @@ class StandardCalendarBody {
 
 
 @Component({
-  template: `<table md-calendar-body
+  template: `<table mat-calendar-body
                     [rows]="rows"
                     [allowDisabledSelection]="allowDisabledSelection"
                     (selectedValueChange)="selected = $event">
@@ -171,5 +171,5 @@ class CalendarBodyWithDisabledCells {
 
 
 function createCell(value: number) {
-  return new MdCalendarCell(value, `${value}`, `${value}-label`, true);
+  return new MatCalendarCell(value, `${value}`, `${value}-label`, true);
 }
diff --git a/src/lib/datepicker/calendar-body.ts b/src/lib/datepicker/calendar-body.ts
index c6a2d70d2bd0..6272f5d8799c 100644
--- a/src/lib/datepicker/calendar-body.ts
+++ b/src/lib/datepicker/calendar-body.ts
@@ -20,7 +20,7 @@ import {
  * An internal class that represents the data corresponding to a single calendar cell.
  * @docs-private
  */
-export class MdCalendarCell {
+export class MatCalendarCell {
   constructor(public value: number,
               public displayValue: string,
               public ariaLabel: string,
@@ -34,7 +34,7 @@ export class MdCalendarCell {
  */
 @Component({
   moduleId: module.id,
-  selector: '[md-calendar-body], [mat-calendar-body]',
+  selector: '[mat-calendar-body]',
   templateUrl: 'calendar-body.html',
   styleUrls: ['calendar-body.css'],
   host: {
@@ -44,12 +44,12 @@ export class MdCalendarCell {
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdCalendarBody {
+export class MatCalendarBody {
   /** The label for the table. (e.g. "Jan 2017"). */
   @Input() label: string;
 
   /** The cells to display in the table. */
-  @Input() rows: MdCalendarCell[][];
+  @Input() rows: MatCalendarCell[][];
 
   /** The value in the table that corresponds to today. */
   @Input() todayValue: number;
@@ -78,7 +78,7 @@ export class MdCalendarBody {
   /** Emits when a new value is selected. */
   @Output() selectedValueChange = new EventEmitter<number>();
 
-  _cellClicked(cell: MdCalendarCell): void {
+  _cellClicked(cell: MatCalendarCell): void {
     if (!this.allowDisabledSelection && !cell.enabled) {
       return;
     }
diff --git a/src/lib/datepicker/calendar.html b/src/lib/datepicker/calendar.html
index 71d227291bd1..0af5479a9709 100644
--- a/src/lib/datepicker/calendar.html
+++ b/src/lib/datepicker/calendar.html
@@ -22,14 +22,14 @@
 
 <div class="mat-calendar-content" (keydown)="_handleCalendarBodyKeydown($event)"
     [ngSwitch]="_monthView" cdkMonitorSubtreeFocus>
-  <md-month-view
+  <mat-month-view
       *ngSwitchCase="true"
       [activeDate]="_activeDate"
       [selected]="selected"
       [dateFilter]="_dateFilterForViews"
       (selectedChange)="_dateSelected($event)"
       (userSelection)="_userSelected()">
-  </md-month-view>
+  </mat-month-view>
 
   <mat-year-view
       *ngSwitchDefault
diff --git a/src/lib/datepicker/calendar.spec.ts b/src/lib/datepicker/calendar.spec.ts
index 686fa406de13..35d1c4bcfeae 100644
--- a/src/lib/datepicker/calendar.spec.ts
+++ b/src/lib/datepicker/calendar.spec.ts
@@ -21,32 +21,31 @@ import {
   JUN,
   MAR,
   MAY,
-  MdNativeDateModule,
-  NoConflictStyleCompatibilityMode,
+  MatNativeDateModule,
   NOV,
   SEP,
 } from '@angular/material/core';
 import {By} from '@angular/platform-browser';
-import {MdButtonModule} from '../button/index';
-import {MdCalendar} from './calendar';
-import {MdCalendarBody} from './calendar-body';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdMonthView} from './month-view';
-import {MdYearView} from './year-view';
+import {MatButtonModule} from '../button/index';
+import {MatCalendar} from './calendar';
+import {MatCalendarBody} from './calendar-body';
+import {MatDatepickerIntl} from './datepicker-intl';
+import {MatMonthView} from './month-view';
+import {MatYearView} from './year-view';
 
 
-describe('MdCalendar', () => {
+describe('MatCalendar', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        MdButtonModule,
-        MdNativeDateModule,
+        MatButtonModule,
+        MatNativeDateModule,
       ],
       declarations: [
-        MdCalendar,
-        MdCalendarBody,
-        MdMonthView,
-        MdYearView,
+        MatCalendar,
+        MatCalendarBody,
+        MatMonthView,
+        MatYearView,
 
         // Test components.
         StandardCalendar,
@@ -54,7 +53,7 @@ describe('MdCalendar', () => {
         CalendarWithDateFilter,
       ],
       providers: [
-        MdDatepickerIntl,
+        MatDatepickerIntl,
       ],
     });
 
@@ -68,13 +67,13 @@ describe('MdCalendar', () => {
     let periodButton: HTMLElement;
     let prevButton: HTMLElement;
     let nextButton: HTMLElement;
-    let calendarInstance: MdCalendar<Date>;
+    let calendarInstance: MatCalendar<Date>;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(StandardCalendar);
       fixture.detectChanges();
 
-      let calendarDebugElement = fixture.debugElement.query(By.directive(MdCalendar));
+      let calendarDebugElement = fixture.debugElement.query(By.directive(MatCalendar));
       calendarElement = calendarDebugElement.nativeElement;
       periodButton = calendarElement.querySelector('.mat-calendar-period-button') as HTMLElement;
       prevButton = calendarElement.querySelector('.mat-calendar-previous-button') as HTMLElement;
@@ -161,7 +160,7 @@ describe('MdCalendar', () => {
     });
 
     it('should re-render when the i18n labels have changed',
-      inject([MdDatepickerIntl], (intl: MdDatepickerIntl) => {
+      inject([MatDatepickerIntl], (intl: MatDatepickerIntl) => {
         const button = fixture.debugElement.nativeElement
             .querySelector('.mat-calendar-period-button');
 
@@ -461,12 +460,12 @@ describe('MdCalendar', () => {
     let fixture: ComponentFixture<CalendarWithMinMax>;
     let testComponent: CalendarWithMinMax;
     let calendarElement: HTMLElement;
-    let calendarInstance: MdCalendar<Date>;
+    let calendarInstance: MatCalendar<Date>;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(CalendarWithMinMax);
 
-      let calendarDebugElement = fixture.debugElement.query(By.directive(MdCalendar));
+      let calendarDebugElement = fixture.debugElement.query(By.directive(MatCalendar));
       calendarElement = calendarDebugElement.nativeElement;
       calendarInstance = calendarDebugElement.componentInstance;
       testComponent = fixture.componentInstance;
@@ -535,13 +534,13 @@ describe('MdCalendar', () => {
     let fixture: ComponentFixture<CalendarWithDateFilter>;
     let testComponent: CalendarWithDateFilter;
     let calendarElement: HTMLElement;
-    let calendarInstance: MdCalendar<Date>;
+    let calendarInstance: MatCalendar<Date>;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(CalendarWithDateFilter);
       fixture.detectChanges();
 
-      let calendarDebugElement = fixture.debugElement.query(By.directive(MdCalendar));
+      let calendarDebugElement = fixture.debugElement.query(By.directive(MatCalendar));
       calendarElement = calendarDebugElement.nativeElement;
       calendarInstance = calendarDebugElement.componentInstance;
       testComponent = fixture.componentInstance;
@@ -602,40 +601,9 @@ describe('MdCalendar', () => {
   });
 });
 
-describe('MdCalendar in compatibility mode', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        MdButtonModule,
-        MdNativeDateModule,
-        NoConflictStyleCompatibilityMode,
-      ],
-      declarations: [
-        MdCalendar,
-        MdCalendarBody,
-        MdMonthView,
-        MdYearView,
-
-        // Test components.
-        StandardCalendar,
-      ],
-      providers: [
-        MdDatepickerIntl,
-      ],
-    });
-
-    TestBed.compileComponents();
-  }));
-
-  it('should not throw on creation', () => {
-    let fixture = TestBed.createComponent(StandardCalendar);
-    expect(() => fixture.detectChanges()).not.toThrow();
-  });
-});
-
 
 @Component({
-  template: `<md-calendar [startAt]="startDate" [(selected)]="selected"></md-calendar>`
+  template: `<mat-calendar [startAt]="startDate" [(selected)]="selected"></mat-calendar>`
 })
 class StandardCalendar {
   selected: Date;
@@ -645,7 +613,7 @@ class StandardCalendar {
 
 @Component({
   template: `
-    <md-calendar [startAt]="startAt" [minDate]="minDate" [maxDate]="maxDate"></md-calendar>
+    <mat-calendar [startAt]="startAt" [minDate]="minDate" [maxDate]="maxDate"></mat-calendar>
   `
 })
 class CalendarWithMinMax {
@@ -657,8 +625,8 @@ class CalendarWithMinMax {
 
 @Component({
   template: `
-    <md-calendar [startAt]="startDate" [(selected)]="selected" [dateFilter]="dateFilter">
-    </md-calendar>
+    <mat-calendar [startAt]="startDate" [(selected)]="selected" [dateFilter]="dateFilter">
+    </mat-calendar>
   `
 })
 class CalendarWithDateFilter {
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index b66adc2ff4f3..a046757fdbce 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -32,17 +32,12 @@ import {
   Output,
   ViewEncapsulation,
 } from '@angular/core';
-import {
-  DateAdapter,
-  MATERIAL_COMPATIBILITY_MODE,
-  MD_DATE_FORMATS,
-  MdDateFormats,
-} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {first} from 'rxjs/operator/first';
 import {Subscription} from 'rxjs/Subscription';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
-import {MdDatepickerIntl} from './datepicker-intl';
+import {MatDatepickerIntl} from './datepicker-intl';
 
 
 /**
@@ -51,7 +46,7 @@ import {MdDatepickerIntl} from './datepicker-intl';
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-calendar, mat-calendar',
+  selector: 'mat-calendar',
   templateUrl: 'calendar.html',
   styleUrls: ['calendar.css'],
   host: {
@@ -60,9 +55,8 @@ import {MdDatepickerIntl} from './datepicker-intl';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdCalendar<D> implements AfterContentInit, OnDestroy {
+export class MatCalendar<D> implements AfterContentInit, OnDestroy {
   private _intlChanges: Subscription;
 
   /** A date representing the period (month or year) to start the calendar in. */
@@ -145,10 +139,10 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
   }
 
   constructor(private _elementRef: ElementRef,
-              private _intl: MdDatepickerIntl,
+              private _intl: MatDatepickerIntl,
               private _ngZone: NgZone,
               @Optional() private _dateAdapter: DateAdapter<D>,
-              @Optional() @Inject(MD_DATE_FORMATS) private _dateFormats: MdDateFormats,
+              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats,
               changeDetectorRef: ChangeDetectorRef) {
 
     if (!this._dateAdapter) {
@@ -156,7 +150,7 @@ export class MdCalendar<D> implements AfterContentInit, OnDestroy {
     }
 
     if (!this._dateFormats) {
-      throw createMissingDateImplError('MD_DATE_FORMATS');
+      throw createMissingDateImplError('MAT_DATE_FORMATS');
     }
 
     this._intlChanges = _intl.changes.subscribe(() => changeDetectorRef.markForCheck());
diff --git a/src/lib/datepicker/coerce-date-property.spec.ts b/src/lib/datepicker/coerce-date-property.spec.ts
index 52c15b36655e..cad4486f843c 100644
--- a/src/lib/datepicker/coerce-date-property.spec.ts
+++ b/src/lib/datepicker/coerce-date-property.spec.ts
@@ -1,5 +1,5 @@
 import {async, inject, TestBed} from '@angular/core/testing';
-import {DateAdapter, JAN, MdNativeDateModule} from '@angular/material/core';
+import {DateAdapter, JAN, MatNativeDateModule} from '@angular/material/core';
 import {coerceDateProperty} from './index';
 
 
@@ -8,7 +8,7 @@ describe('coerceDateProperty', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdNativeDateModule],
+      imports: [MatNativeDateModule],
     });
 
     TestBed.compileComponents();
diff --git a/src/lib/datepicker/datepicker-content.scss b/src/lib/datepicker/datepicker-content.scss
index 44fcbd387196..386ec6dac95e 100644
--- a/src/lib/datepicker/datepicker-content.scss
+++ b/src/lib/datepicker/datepicker-content.scss
@@ -1,27 +1,27 @@
 @import '../core/style/elevation';
 
 
-$md-datepicker-calendar-padding: 8px;
-$md-datepicker-non-touch-calendar-cell-size: 40px;
-$md-datepicker-non-touch-calendar-width:
-    $md-datepicker-non-touch-calendar-cell-size * 7 + $md-datepicker-calendar-padding * 2;
+$mat-datepicker-calendar-padding: 8px;
+$mat-datepicker-non-touch-calendar-cell-size: 40px;
+$mat-datepicker-non-touch-calendar-width:
+    $mat-datepicker-non-touch-calendar-cell-size * 7 + $mat-datepicker-calendar-padding * 2;
 // Based on the natural height of the calendar in a month with 6 rows of dates
 // (largest the calendar will get).
-$md-datepicker-non-touch-calendar-height: 354px;
+$mat-datepicker-non-touch-calendar-height: 354px;
 
 // Ideally the calendar would have a constant aspect ratio, no matter its size, and we would base
 // these measurements off the aspect ratio. Unfortunately, the aspect ratio does change a little as
 // the calendar grows, since some of the elements have pixel-based sizes. These numbers have been
 // chosen to minimize extra whitespace at larger sizes, while still ensuring we won't need
 // scrollbars at smaller sizes.
-$md-datepicker-touch-landscape-width: 64vh;
-$md-datepicker-touch-landscape-height: 80vh;
-$md-datepicker-touch-portrait-width: 80vw;
-$md-datepicker-touch-portrait-height: 100vw;
-$md-datepicker-touch-min-width: 250px;
-$md-datepicker-touch-min-height: 312px;
-$md-datepicker-touch-max-width: 750px;
-$md-datepicker-touch-max-height: 788px;
+$mat-datepicker-touch-landscape-width: 64vh;
+$mat-datepicker-touch-landscape-height: 80vh;
+$mat-datepicker-touch-portrait-width: 80vw;
+$mat-datepicker-touch-portrait-height: 100vw;
+$mat-datepicker-touch-min-width: 250px;
+$mat-datepicker-touch-min-height: 312px;
+$mat-datepicker-touch-max-width: 750px;
+$mat-datepicker-touch-max-height: 788px;
 
 
 .mat-datepicker-content {
@@ -31,8 +31,8 @@ $md-datepicker-touch-max-height: 788px;
 }
 
 .mat-calendar {
-  width: $md-datepicker-non-touch-calendar-width;
-  height: $md-datepicker-non-touch-calendar-height;
+  width: $mat-datepicker-non-touch-calendar-width;
+  height: $mat-datepicker-non-touch-calendar-height;
 }
 
 .mat-datepicker-content-touch {
@@ -48,23 +48,23 @@ $md-datepicker-touch-max-height: 788px;
   margin: -24px;
 
   .mat-calendar {
-    min-width: $md-datepicker-touch-min-width;
-    min-height: $md-datepicker-touch-min-height;
-    max-width: $md-datepicker-touch-max-width;
-    max-height: $md-datepicker-touch-max-height;
+    min-width: $mat-datepicker-touch-min-width;
+    min-height: $mat-datepicker-touch-min-height;
+    max-width: $mat-datepicker-touch-max-width;
+    max-height: $mat-datepicker-touch-max-height;
   }
 }
 
 @media all and (orientation: landscape) {
   .mat-datepicker-content-touch .mat-calendar {
-    width: $md-datepicker-touch-landscape-width;
-    height: $md-datepicker-touch-landscape-height;
+    width: $mat-datepicker-touch-landscape-width;
+    height: $mat-datepicker-touch-landscape-height;
   }
 }
 
 @media all and (orientation: portrait) {
   .mat-datepicker-content-touch .mat-calendar {
-    width: $md-datepicker-touch-portrait-width;
-    height: $md-datepicker-touch-portrait-height;
+    width: $mat-datepicker-touch-portrait-width;
+    height: $mat-datepicker-touch-portrait-height;
   }
 }
diff --git a/src/lib/datepicker/datepicker-errors.ts b/src/lib/datepicker/datepicker-errors.ts
index c9ac18a8263e..18eb6f2f912f 100644
--- a/src/lib/datepicker/datepicker-errors.ts
+++ b/src/lib/datepicker/datepicker-errors.ts
@@ -9,6 +9,6 @@
 /** @docs-private */
 export function createMissingDateImplError(provider: string) {
   return Error(
-      `MdDatepicker: No provider found for ${provider}. You must import one of the following ` +
-      `modules at your application root: MdNativeDateModule, or provide a custom implementation.`);
+      `MatDatepicker: No provider found for ${provider}. You must import one of the following ` +
+      `modules at your application root: MatNativeDateModule, or provide a custom implementation.`);
 }
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 6116ad87c219..fc3fee065f54 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -31,24 +31,24 @@ import {
   ValidatorFn,
   Validators,
 } from '@angular/forms';
-import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
-import {MdFormField} from '@angular/material/form-field';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
+import {MatFormField} from '@angular/material/form-field';
 import {Subscription} from 'rxjs/Subscription';
 import {coerceDateProperty} from './coerce-date-property';
-import {MdDatepicker} from './datepicker';
+import {MatDatepicker} from './datepicker';
 import {createMissingDateImplError} from './datepicker-errors';
 
 
-export const MD_DATEPICKER_VALUE_ACCESSOR: any = {
+export const MAT_DATEPICKER_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdDatepickerInput),
+  useExisting: forwardRef(() => MatDatepickerInput),
   multi: true
 };
 
 
-export const MD_DATEPICKER_VALIDATORS: any = {
+export const MAT_DATEPICKER_VALIDATORS: any = {
   provide: NG_VALIDATORS,
-  useExisting: forwardRef(() => MdDatepickerInput),
+  useExisting: forwardRef(() => MatDatepickerInput),
   multi: true
 };
 
@@ -56,22 +56,22 @@ export const MD_DATEPICKER_VALIDATORS: any = {
 /**
  * An event used for datepicker input and change events. We don't always have access to a native
  * input or change event because the event may have been triggered by the user clicking on the
- * calendar popup. For consistency, we always use MdDatepickerInputEvent instead.
+ * calendar popup. For consistency, we always use MatDatepickerInputEvent instead.
  */
-export class MdDatepickerInputEvent<D> {
+export class MatDatepickerInputEvent<D> {
   /** The new value for the target datepicker input. */
   value: D | null;
 
-  constructor(public target: MdDatepickerInput<D>, public targetElement: HTMLElement) {
+  constructor(public target: MatDatepickerInput<D>, public targetElement: HTMLElement) {
     this.value = this.target.value;
   }
 }
 
 
-/** Directive used to connect an input to a MdDatepicker. */
+/** Directive used to connect an input to a MatDatepicker. */
 @Directive({
-  selector: 'input[mdDatepicker], input[matDatepicker]',
-  providers: [MD_DATEPICKER_VALUE_ACCESSOR, MD_DATEPICKER_VALIDATORS],
+  selector: 'input[matDatepicker]',
+  providers: [MAT_DATEPICKER_VALUE_ACCESSOR, MAT_DATEPICKER_VALIDATORS],
   host: {
     '[attr.aria-haspopup]': 'true',
     '[attr.aria-owns]': '(_datepicker?.opened && _datepicker.id) || null',
@@ -83,40 +83,30 @@ export class MdDatepickerInputEvent<D> {
     '(blur)': '_onTouched()',
     '(keydown)': '_onKeydown($event)',
   },
-  exportAs: 'mdDatepickerInput, matDatepickerInput',
+  exportAs: 'matDatepickerInput',
 })
-export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAccessor, OnDestroy,
+export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAccessor, OnDestroy,
     Validator {
   /** The datepicker that this input is associated with. */
   @Input()
-  set mdDatepicker(value: MdDatepicker<D>) {
+  set matDatepicker(value: MatDatepicker<D>) {
     this.registerDatepicker(value);
   }
-  _datepicker: MdDatepicker<D>;
+  _datepicker: MatDatepicker<D>;
 
-  private registerDatepicker(value: MdDatepicker<D>) {
+  private registerDatepicker(value: MatDatepicker<D>) {
     if (value) {
       this._datepicker = value;
       this._datepicker._registerInput(this);
     }
   }
 
-  @Input() set matDatepicker(value: MdDatepicker<D>) {
-    // Note that we don't set `this.mdDatepicker = value` here,
-    // because that line gets stripped by the JS compiler.
-    this.registerDatepicker(value);
-  }
-
-  @Input() set mdDatepickerFilter(filter: (date: D | null) => boolean) {
+  @Input() set matDatepickerFilter(filter: (date: D | null) => boolean) {
     this._dateFilter = filter;
     this._validatorOnChange();
   }
   _dateFilter: (date: D | null) => boolean;
 
-  @Input() set matDatepickerFilter(filter: (date: D | null) => boolean) {
-    this.mdDatepickerFilter = filter;
-  }
-
   /** The value of the input. */
   @Input()
   get value(): D | null {
@@ -169,10 +159,10 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   private _disabled: boolean;
 
   /** Emits when a `change` event is fired on this `<input>`. */
-  @Output() dateChange = new EventEmitter<MdDatepickerInputEvent<D>>();
+  @Output() dateChange = new EventEmitter<MatDatepickerInputEvent<D>>();
 
   /** Emits when an `input` event is fired on this `<input>`. */
-  @Output() dateInput = new EventEmitter<MdDatepickerInputEvent<D>>();
+  @Output() dateInput = new EventEmitter<MatDatepickerInputEvent<D>>();
 
   /** Emits when the value changes (either due to user input or programmatic change). */
   _valueChange = new EventEmitter<D|null>();
@@ -193,7 +183,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
   /** The form control validator for whether the input parses. */
   private _parseValidator: ValidatorFn = (): ValidationErrors | null => {
     return this._lastValueValid ?
-        null : {'mdDatepickerParse': {'text': this._elementRef.nativeElement.value}};
+        null : {'matDatepickerParse': {'text': this._elementRef.nativeElement.value}};
   }
 
   /** The form control validator for the min date. */
@@ -201,7 +191,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     const controlValue = coerceDateProperty(this._dateAdapter, control.value);
     return (!this.min || !controlValue ||
         this._dateAdapter.compareDate(this.min, controlValue) <= 0) ?
-        null : {'mdDatepickerMin': {'min': this.min, 'actual': controlValue}};
+        null : {'matDatepickerMin': {'min': this.min, 'actual': controlValue}};
   }
 
   /** The form control validator for the max date. */
@@ -209,14 +199,14 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     const controlValue = coerceDateProperty(this._dateAdapter, control.value);
     return (!this.max || !controlValue ||
         this._dateAdapter.compareDate(this.max, controlValue) >= 0) ?
-        null : {'mdDatepickerMax': {'max': this.max, 'actual': controlValue}};
+        null : {'matDatepickerMax': {'max': this.max, 'actual': controlValue}};
   }
 
   /** The form control validator for the date filter. */
   private _filterValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
     const controlValue = coerceDateProperty(this._dateAdapter, control.value);
     return !this._dateFilter || !controlValue || this._dateFilter(controlValue) ?
-        null : {'mdDatepickerFilter': true};
+        null : {'matDatepickerFilter': true};
   }
 
   /** The combined form control validator for this input. */
@@ -231,13 +221,13 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
       private _elementRef: ElementRef,
       private _renderer: Renderer2,
       @Optional() private _dateAdapter: DateAdapter<D>,
-      @Optional() @Inject(MD_DATE_FORMATS) private _dateFormats: MdDateFormats,
-      @Optional() private _mdFormField: MdFormField) {
+      @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats,
+      @Optional() private _formField: MatFormField) {
     if (!this._dateAdapter) {
       throw createMissingDateImplError('DateAdapter');
     }
     if (!this._dateFormats) {
-      throw createMissingDateImplError('MD_DATE_FORMATS');
+      throw createMissingDateImplError('MAT_DATE_FORMATS');
     }
 
     // Update the displayed date when the locale changes.
@@ -253,8 +243,8 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
             this.value = selected;
             this._cvaOnChange(selected);
             this._onTouched();
-            this.dateInput.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
-            this.dateChange.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
+            this.dateInput.emit(new MatDatepickerInputEvent(this, this._elementRef.nativeElement));
+            this.dateChange.emit(new MatDatepickerInputEvent(this, this._elementRef.nativeElement));
           });
     }
   }
@@ -279,7 +269,7 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
    * @return The element to connect the popup to.
    */
   getPopupConnectionElementRef(): ElementRef {
-    return this._mdFormField ? this._mdFormField.underlineRef : this._elementRef;
+    return this._formField ? this._formField.underlineRef : this._elementRef;
   }
 
   // Implemented as part of ControlValueAccessor
@@ -316,11 +306,11 @@ export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAcces
     this._value = date;
     this._cvaOnChange(date);
     this._valueChange.emit(date);
-    this.dateInput.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
+    this.dateInput.emit(new MatDatepickerInputEvent(this, this._elementRef.nativeElement));
   }
 
   _onChange() {
-    this.dateChange.emit(new MdDatepickerInputEvent(this, this._elementRef.nativeElement));
+    this.dateChange.emit(new MatDatepickerInputEvent(this, this._elementRef.nativeElement));
   }
 
   /**
diff --git a/src/lib/datepicker/datepicker-intl.ts b/src/lib/datepicker/datepicker-intl.ts
index c52f0fb0ce8e..377db19cbf95 100644
--- a/src/lib/datepicker/datepicker-intl.ts
+++ b/src/lib/datepicker/datepicker-intl.ts
@@ -12,7 +12,7 @@ import {Subject} from 'rxjs/Subject';
 
 /** Datepicker data that requires internationalization. */
 @Injectable()
-export class MdDatepickerIntl {
+export class MatDatepickerIntl {
   /**
    * Stream that emits whenever the labels here are changed. Use this to notify
    * components if the labels have changed after initialization.
diff --git a/src/lib/datepicker/datepicker-module.ts b/src/lib/datepicker/datepicker-module.ts
index 36272d381b14..4b34d46bcdd5 100644
--- a/src/lib/datepicker/datepicker-module.ts
+++ b/src/lib/datepicker/datepicker-module.ts
@@ -10,58 +10,58 @@ import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdButtonModule} from '@angular/material/button';
-import {MdDialogModule} from '@angular/material/dialog';
-import {MdIconModule} from '@angular/material/icon';
-import {MdCalendar} from './calendar';
-import {MdCalendarBody} from './calendar-body';
+import {MatButtonModule} from '@angular/material/button';
+import {MatDialogModule} from '@angular/material/dialog';
+import {MatIconModule} from '@angular/material/icon';
+import {MatCalendar} from './calendar';
+import {MatCalendarBody} from './calendar-body';
 import {
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-  MdDatepicker,
-  MdDatepickerContent,
+  MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+  MatDatepicker,
+  MatDatepickerContent,
 } from './datepicker';
-import {MdDatepickerInput} from './datepicker-input';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdDatepickerToggle} from './datepicker-toggle';
-import {MdMonthView} from './month-view';
-import {MdYearView} from './year-view';
+import {MatDatepickerInput} from './datepicker-input';
+import {MatDatepickerIntl} from './datepicker-intl';
+import {MatDatepickerToggle} from './datepicker-toggle';
+import {MatMonthView} from './month-view';
+import {MatYearView} from './year-view';
 
 
 @NgModule({
   imports: [
     CommonModule,
-    MdButtonModule,
-    MdDialogModule,
-    MdIconModule,
+    MatButtonModule,
+    MatDialogModule,
+    MatIconModule,
     OverlayModule,
     A11yModule,
   ],
   exports: [
-    MdCalendar,
-    MdCalendarBody,
-    MdDatepicker,
-    MdDatepickerContent,
-    MdDatepickerInput,
-    MdDatepickerToggle,
-    MdMonthView,
-    MdYearView,
+    MatCalendar,
+    MatCalendarBody,
+    MatDatepicker,
+    MatDatepickerContent,
+    MatDatepickerInput,
+    MatDatepickerToggle,
+    MatMonthView,
+    MatYearView,
   ],
   declarations: [
-    MdCalendar,
-    MdCalendarBody,
-    MdDatepicker,
-    MdDatepickerContent,
-    MdDatepickerInput,
-    MdDatepickerToggle,
-    MdMonthView,
-    MdYearView,
+    MatCalendar,
+    MatCalendarBody,
+    MatDatepicker,
+    MatDatepickerContent,
+    MatDatepickerInput,
+    MatDatepickerToggle,
+    MatMonthView,
+    MatYearView,
   ],
   providers: [
-    MdDatepickerIntl,
-    MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
+    MatDatepickerIntl,
+    MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
   ],
   entryComponents: [
-    MdDatepickerContent,
+    MatDatepickerContent,
   ]
 })
-export class MdDatepickerModule {}
+export class MatDatepickerModule {}
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index 5968934ff4fc..c9988235b132 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -8,26 +8,25 @@
 
 import {
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   Input,
-  ViewEncapsulation,
-  OnDestroy,
   OnChanges,
+  OnDestroy,
   SimpleChanges,
-  ChangeDetectorRef,
+  ViewEncapsulation,
 } from '@angular/core';
-import {MdDatepicker} from './datepicker';
-import {MdDatepickerIntl} from './datepicker-intl';
+import {MatDatepicker} from './datepicker';
+import {MatDatepickerIntl} from './datepicker-intl';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
-import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-datepicker-toggle, mat-datepicker-toggle',
+  selector: 'mat-datepicker-toggle',
   templateUrl: 'datepicker-toggle.html',
   host: {
     'class': 'mat-datepicker-toggle',
@@ -35,13 +34,12 @@ import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdDatepickerToggle<D> implements OnChanges, OnDestroy {
+export class MatDatepickerToggle<D> implements OnChanges, OnDestroy {
   private _stateChanges = Subscription.EMPTY;
 
   /** Datepicker instance that the button will toggle. */
-  @Input('for') datepicker: MdDatepicker<D>;
+  @Input('for') datepicker: MatDatepicker<D>;
 
   /** Whether the toggle button is disabled. */
   @Input()
@@ -54,12 +52,12 @@ export class MdDatepickerToggle<D> implements OnChanges, OnDestroy {
   private _disabled: boolean;
 
   constructor(
-    public _intl: MdDatepickerIntl,
+    public _intl: MatDatepickerIntl,
     private _changeDetectorRef: ChangeDetectorRef) {}
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.datepicker) {
-      const datepicker: MdDatepicker<D> = changes.datepicker.currentValue;
+      const datepicker: MatDatepicker<D> = changes.datepicker.currentValue;
       const datepickerDisabled = datepicker ? datepicker._disabledChange : observableOf();
       const inputDisabled = datepicker && datepicker._datepickerInput ?
         datepicker._datepickerInput._disabledChange :
diff --git a/src/lib/datepicker/datepicker.md b/src/lib/datepicker/datepicker.md
index 47f5a0f22b3b..6a3ee7a32861 100644
--- a/src/lib/datepicker/datepicker.md
+++ b/src/lib/datepicker/datepicker.md
@@ -13,42 +13,42 @@ There are many more features that will be added in future iterations, including:
  * Built in support for [Moment.js](https://momentjs.com/) dates
 
 ### Connecting a datepicker to an input
-A datepicker is composed of a text input and a calendar pop-up, connected via the `mdDatepicker`
+A datepicker is composed of a text input and a calendar pop-up, connected via the `matDatepicker`
 property on the text input.
 
 ```html
-<input [mdDatepicker]="myDatepicker">
-<md-datepicker #myDatepicker></md-datepicker>
+<input [matDatepicker]="myDatepicker">
+<mat-datepicker #myDatepicker></mat-datepicker>
 ```
 
 An optional datepicker toggle button is available. A toggle can be added to the example above:
 
 ```html
-<input [mdDatepicker]="myDatepicker">
-<md-datepicker-toggle [for]="myDatepicker"></md-datepicker-toggle>
-<md-datepicker #myDatepicker></md-datepicker>
+<input [matDatepicker]="myDatepicker">
+<mat-datepicker-toggle [for]="myDatepicker"></mat-datepicker-toggle>
+<mat-datepicker #myDatepicker></mat-datepicker>
 ```
 
-This works exactly the same with an input that is part of an `<md-form-field>` and the toggle
+This works exactly the same with an input that is part of an `<mat-form-field>` and the toggle
 can easily be used as a prefix or suffix on the material input:
 
 ```html
-<md-form-field>
-  <input mdInput [mdDatepicker]="myDatepicker">
-  <md-datepicker-toggle mdSuffix [for]="myDatepicker"></md-datepicker-toggle>
-  <md-datepicker #myDatepicker></md-datepicker>
-</md-form-field>
+<mat-form-field>
+  <input matInput [matDatepicker]="myDatepicker">
+  <mat-datepicker-toggle matSuffix [for]="myDatepicker"></mat-datepicker-toggle>
+  <mat-datepicker #myDatepicker></mat-datepicker>
+</mat-form-field>
 ```
 
 ### Setting the calendar starting view
 By default the calendar will open in month view, this can be changed by setting the `startView`
-property of `md-datepicker` to `"year"`. In year view the user will see all months of the year and
+property of `mat-datepicker` to `"year"`. In year view the user will see all months of the year and
 then proceed to month view after choosing a month.
 
 The month or year that the calendar opens to is determined by first checking if any date is
 currently selected, if so it will open to the month or year containing that date. Otherwise it will
 open to the month or year containing today's date. This behavior can be overridden by using the
-`startAt` property of `md-datepicker`. In this case the calendar will open to the month or year
+`startAt` property of `mat-datepicker`. In this case the calendar will open to the month or year
 containing the `startAt` date.
 
 <!-- example(datepicker-start-view) -->
@@ -62,13 +62,13 @@ from advancing the calendar past the `month` or `year` (depending on current vie
 
 <!-- example(datepicker-min-max) -->
 
-The second way to add date validation is using the `mdDatepickerFilter` property of the datepicker
+The second way to add date validation is using the `matDatepickerFilter` property of the datepicker
 input. This property accepts a function of `<D> => boolean` (where `<D>` is the date type used by
 the datepicker, see section on
 [choosing a date implementation](#choosing-a-date-implementation-and-date-format-settings)).
 A result of `true` indicates that the date is valid and a result of `false` indicates that it is
 not. Again this will also disable the dates on the calendar that are invalid. However, one important
-difference between using `mdDatepickerFilter` vs using `min` or `max` is that filtering out all
+difference between using `matDatepickerFilter` vs using `min` or `max` is that filtering out all
 dates before or after a certain point, will not prevent the user from advancing the calendar past
 that point.
 
@@ -79,9 +79,9 @@ They will not be able to go further back in the calendar than 2000. If they manu
 that is before the min, after the max, or filtered out, the input will have validation errors.
 
 Each validation property has a different error that can be checked:
- * A value that violates the `min` property will have a `mdDatepickerMin` error.
- * A value that violates the `max` property will have a `mdDatepickerMax` error.
- * A value that violates the `mdDatepickerFilter` property will have a `mdDatepickerFilter` error.
+ * A value that violates the `min` property will have a `matDatepickerMin` error.
+ * A value that violates the `max` property will have a `matDatepickerMax` error.
+ * A value that violates the `matDatepickerFilter` property will have a `matDatepickerFilter` error.
  
 ### Input and change events
 The input's native `input` and `change` events will only trigger due to user interaction with the
@@ -90,21 +90,21 @@ this limitation, the datepicker input also has support for `dateInput` and `date
 These trigger when the user interacts with either the input or the popup.
   
 ```html
-<input [mdDatepicker]="d" (dateInput)="onInput($event)" (dateChange)="onChange($event)">
-<md-datepicker #d></md-datepicker>
+<input [matDatepicker]="d" (dateInput)="onInput($event)" (dateChange)="onChange($event)">
+<mat-datepicker #d></mat-datepicker>
 ```
 
 ### Touch UI mode
 The datepicker normally opens as a popup under the input. However this is not ideal for touch
 devices that don't have as much screen real estate and need bigger click targets. For this reason
-`md-datepicker` has a `touchUi` property that can be set to `true` in order to enable a more touch
+`mat-datepicker` has a `touchUi` property that can be set to `true` in order to enable a more touch
 friendly UI where the calendar opens in a large dialog.
 
 <!-- example(datepicker-touch) -->
 
 ### Manually opening and closing the calendar
 The calendar popup can be programmatically controlled using the `open` and `close` methods on the
-`md-datepicker`. It also has an `opened` property that reflects the status of the popup.
+`mat-datepicker`. It also has an `opened` property that reflects the status of the popup.
 
 <!-- example(datepicker-api) -->
 
@@ -150,20 +150,20 @@ The datepicker was built to be date implementation agnostic. This means that it
 with a variety of different date implementations. However it also means that developers need to make
 sure to provide the appropriate pieces for the datepicker to work with their chosen implementation.
 The easiest way to ensure this is just to import one of the pre-made modules (currently
-`MdNativeDateModule` is the only implementation that ships with material, but there are plans to add
+`MatNativeDateModule` is the only implementation that ships with material, but there are plans to add
 a module for Moment.js support):
- * `MdNativeDateModule` - support for native JavaScript Date object
+ * `MatNativeDateModule` - support for native JavaScript Date object
 
-These modules include providers for `DateAdapter` and `MD_DATE_FORMATS`
+These modules include providers for `DateAdapter` and `MAT_DATE_FORMATS`
 
 ```ts
 @NgModule({
-  imports: [MdDatepickerModule, MdNativeDateModule],
+  imports: [MatDatepickerModule, MatNativeDateModule],
 })
 export class MyApp {}
 ```
 
-Because `DateAdapter` is a generic class, `MdDatepicker` and `MdDatepickerInput` also need to be
+Because `DateAdapter` is a generic class, `MatDatepicker` and `MatDatepickerInput` also need to be
 made generic. When working with these classes (for example as a `ViewChild`) you should include the
 appropriate generic type that corresponds to the `DateAdapter` implementation you are using. For
 example:
@@ -171,11 +171,11 @@ example:
 ```ts
 @Component({...})
 export class MyComponent {
-  @ViewChild(MdDatepicker) datepicker: MdDatepicker<Date>;
+  @ViewChild(MatDatepicker) datepicker: MatDatepicker<Date>;
 }
 ```
 
-*Please note: `MdNativeDateModule` is based off of the functionality available in JavaScript's
+*Please note: `MatNativeDateModule` is based off of the functionality available in JavaScript's
 native `Date` object, and is thus not suitable for many locales. One of the biggest shortcomings of
 the native `Date` object is the inability to set the parse format. We highly recommend using a
 custom `DateAdapter` that works with the formatting/parsing library of your choice.*
@@ -183,22 +183,22 @@ custom `DateAdapter` that works with the formatting/parsing library of your choi
 #### Customizing the date implementation
 The datepicker does all of its interaction with date objects via the `DateAdapter`. Making the
 datepicker work with a different date implementation is as easy as extending `DateAdapter`, and
-using your subclass as the provider. You will also want to make sure that the `MD_DATE_FORMATS`
+using your subclass as the provider. You will also want to make sure that the `MAT_DATE_FORMATS`
 provided in your app are formats that can be understood by your date implementation.
 
 ```ts
 @NgModule({
-  imports: [MdDatepickerModule],
+  imports: [MatDatepickerModule],
   providers: [
     {provide: DateAdapter, useClass: MyDateAdapter},
-    {provide: MD_DATE_FORMATS, useValue: MY_DATE_FORMATS},
+    {provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS},
   ],
 })
 export class MyApp {}
 ```
 
 #### Customizing the parse and display formats
-The `MD_DATE_FORMATS` object is just a collection of formats that the datepicker uses when parsing
+The `MAT_DATE_FORMATS` object is just a collection of formats that the datepicker uses when parsing
 and displaying dates. These formats are passed through to the `DateAdapter` so you will want to make
 sure that the format objects you're using are compatible with the `DateAdapter` used in your app.
 This example shows how to use the native `Date` implementation from material, but with custom
@@ -206,36 +206,36 @@ formats.
 
 ```ts
 @NgModule({
-  imports: [MdDatepickerModule],
+  imports: [MatDatepickerModule],
   providers: [
     {provide: DateAdapter, useClass: NativeDateAdapter},
-    {provide: MD_DATE_FORMATS, useValue: MY_NATIVE_DATE_FORMATS},
+    {provide: MAT_DATE_FORMATS, useValue: MY_NATIVE_DATE_FORMATS},
   ],
 })
 export class MyApp {}
 ```
 
 #### Localizing labels and messages
-The various text strings used by the datepicker are provided through `MdDatepickerIntl`.
+The various text strings used by the datepicker are provided through `MatDatepickerIntl`.
 Localization of these messages can be done by providing a subclass with translated values in your
 application root module.
 
 ```ts
 @NgModule({
-  imports: [MdDatepickerModule, MdNativeDateModule],
+  imports: [MatDatepickerModule, MatNativeDateModule],
   providers: [
-    {provide: MdDatepickerIntl, useClass: MyIntl},
+    {provide: MatDatepickerIntl, useClass: MyIntl},
   ],
 })
 export class MyApp {}
 ```
 ### Accessibility
-The `MdDatepickerInput` directive adds `aria-haspopup` attribute to the native input element, and it
+The `MatDatepickerInput` directive adds `aria-haspopup` attribute to the native input element, and it
 triggers a calendar dialog with `role="dialog"`.
 
-`MdDatepickerIntl` includes strings that are used for `aria-label`s. The datepicker input
+`MatDatepickerIntl` includes strings that are used for `aria-label`s. The datepicker input
 should have a placeholder or be given a meaningful label via `aria-label`, `aria-labelledby` or
-`MdDatepickerIntl`.
+`MatDatepickerIntl`.
 
 #### Keyboard shortcuts
 The keyboard shortcuts to handle datepicker are:
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index cd0834f951d5..3f87fc50749d 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -15,33 +15,33 @@ import {
   JUL,
   JUN,
   MAT_DATE_LOCALE,
-  MdNativeDateModule,
+  MatNativeDateModule,
   NativeDateModule,
   SEP,
 } from '@angular/material/core';
-import {MdFormFieldModule} from '@angular/material/form-field';
+import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdInputModule} from '../input/index';
-import {MdDatepicker} from './datepicker';
-import {MdDatepickerInput} from './datepicker-input';
-import {MdDatepickerIntl, MdDatepickerModule} from './index';
+import {MatInputModule} from '../input/index';
+import {MatDatepicker} from './datepicker';
+import {MatDatepickerInput} from './datepicker-input';
+import {MatDatepickerIntl, MatDatepickerModule} from './index';
 
 
-describe('MdDatepicker', () => {
+describe('MatDatepicker', () => {
   afterEach(inject([OverlayContainer], (container: OverlayContainer) => {
     container.getContainerElement().parentNode!.removeChild(container.getContainerElement());
   }));
 
-  describe('with MdNativeDateModule', () => {
+  describe('with MatNativeDateModule', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [
           FormsModule,
-          MdDatepickerModule,
-          MdFormFieldModule,
-          MdInputModule,
-          MdNativeDateModule,
+          MatDatepickerModule,
+          MatFormFieldModule,
+          MatInputModule,
+          MatNativeDateModule,
           NoopAnimationsModule,
           ReactiveFormsModule,
         ],
@@ -94,12 +94,12 @@ describe('MdDatepicker', () => {
         testComponent.touch = true;
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
 
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).not.toBeNull();
+        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
       });
 
       it('open in disabled mode should not open the calendar', () => {
@@ -107,13 +107,13 @@ describe('MdDatepicker', () => {
         fixture.detectChanges();
 
         expect(document.querySelector('.cdk-overlay-pane')).toBeNull();
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
 
         testComponent.datepicker.open();
         fixture.detectChanges();
 
         expect(document.querySelector('.cdk-overlay-pane')).toBeNull();
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
       });
 
       it('disabled datepicker input should open the calendar if datepicker is enabled', () => {
@@ -149,7 +149,7 @@ describe('MdDatepicker', () => {
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        let content = document.querySelector('.cdk-overlay-pane md-datepicker-content')!;
+        let content = document.querySelector('.cdk-overlay-pane mat-datepicker-content')!;
         expect(content).toBeTruthy('Expected datepicker to be open.');
 
         const keyboardEvent = createKeyboardEvent('keydown', ESCAPE);
@@ -158,7 +158,7 @@ describe('MdDatepicker', () => {
         dispatchEvent(content, keyboardEvent);
         fixture.detectChanges();
 
-        content = document.querySelector('.cdk-overlay-pane md-datepicker-content')!;
+        content = document.querySelector('.cdk-overlay-pane mat-datepicker-content')!;
 
         expect(content).toBeFalsy('Expected datepicker to be closed.');
         expect(stopPropagationSpy).toHaveBeenCalled();
@@ -173,13 +173,13 @@ describe('MdDatepicker', () => {
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).not.toBeNull();
+        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
 
         testComponent.datepicker.close();
         fixture.detectChanges();
 
         fixture.whenStable().then(() => {
-          expect(document.querySelector('md-dialog-container')).toBeNull();
+          expect(document.querySelector('mat-dialog-container')).toBeNull();
         });
       });
 
@@ -190,7 +190,7 @@ describe('MdDatepicker', () => {
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).not.toBeNull();
+        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
         expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 1));
 
         let cells = document.querySelectorAll('.mat-calendar-body-cell');
@@ -198,7 +198,7 @@ describe('MdDatepicker', () => {
         fixture.detectChanges();
 
         fixture.whenStable().then(() => {
-          expect(document.querySelector('md-dialog-container')).toBeNull();
+          expect(document.querySelector('mat-dialog-container')).toBeNull();
           expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 2));
         });
       });
@@ -212,7 +212,7 @@ describe('MdDatepicker', () => {
           testComponent.datepicker.open();
           fixture.detectChanges();
 
-          expect(document.querySelector('md-datepicker-content')).not.toBeNull();
+          expect(document.querySelector('mat-datepicker-content')).not.toBeNull();
           expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, currentDay));
 
           let cells = document.querySelectorAll('.mat-calendar-body-cell');
@@ -222,7 +222,7 @@ describe('MdDatepicker', () => {
 
         fixture.whenStable().then(() => {
           expect(selectedChangedSpy.calls.count()).toEqual(1);
-          expect(document.querySelector('md-dialog-container')).toBeNull();
+          expect(document.querySelector('mat-dialog-container')).toBeNull();
           expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 2));
         });
       });
@@ -536,7 +536,7 @@ describe('MdDatepicker', () => {
       });
     });
 
-    describe('datepicker with md-datepicker-toggle', () => {
+    describe('datepicker with mat-datepicker-toggle', () => {
       let fixture: ComponentFixture<DatepickerWithToggle>;
       let testComponent: DatepickerWithToggle;
 
@@ -553,13 +553,13 @@ describe('MdDatepicker', () => {
       }));
 
       it('should open calendar when toggle clicked', () => {
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
 
         let toggle = fixture.debugElement.query(By.css('button'));
         dispatchMouseEvent(toggle.nativeElement, 'click');
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).not.toBeNull();
+        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
       });
 
       it('should not open calendar when toggle clicked if datepicker is disabled', () => {
@@ -568,12 +568,12 @@ describe('MdDatepicker', () => {
         const toggle = fixture.debugElement.query(By.css('button')).nativeElement;
 
         expect(toggle.hasAttribute('disabled')).toBe(true);
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
 
         dispatchMouseEvent(toggle, 'click');
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
       });
 
       it('should not open calendar when toggle clicked if input is disabled', () => {
@@ -584,12 +584,12 @@ describe('MdDatepicker', () => {
         const toggle = fixture.debugElement.query(By.css('button')).nativeElement;
 
         expect(toggle.hasAttribute('disabled')).toBe(true);
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
 
         dispatchMouseEvent(toggle, 'click');
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).toBeNull();
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
       });
 
       it('should set the `button` type on the trigger to prevent form submissions', () => {
@@ -627,7 +627,7 @@ describe('MdDatepicker', () => {
       });
 
       it('should re-render when the i18n labels change',
-        inject([MdDatepickerIntl], (intl: MdDatepickerIntl) => {
+        inject([MatDatepickerIntl], (intl: MatDatepickerIntl) => {
           const toggle = fixture.debugElement.query(By.css('button')).nativeElement;
 
           intl.openCalendarLabel = 'Open the calendar, perhaps?';
@@ -638,7 +638,7 @@ describe('MdDatepicker', () => {
         }));
     });
 
-    describe('datepicker inside md-form-field', () => {
+    describe('datepicker inside mat-form-field', () => {
       let fixture: ComponentFixture<FormFieldDatepicker>;
       let testComponent: FormFieldDatepicker;
 
@@ -654,10 +654,10 @@ describe('MdDatepicker', () => {
         fixture.detectChanges();
       }));
 
-      it('should attach popup to md-form-field underline', () => {
+      it('should attach popup to mat-form-field underline', () => {
         let attachToRef = testComponent.datepickerInput.getPopupConnectionElementRef();
         expect(attachToRef.nativeElement.classList.contains('mat-form-field-underline'))
-            .toBe(true, 'popup should be attached to md-form-field underline');
+            .toBe(true, 'popup should be attached to mat-form-field underline');
       });
     });
 
@@ -787,7 +787,7 @@ describe('MdDatepicker', () => {
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).not.toBeNull();
+        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
 
         let cells = document.querySelectorAll('.mat-calendar-body-cell');
         expect(cells[0].classList).toContain('mat-calendar-body-disabled');
@@ -857,7 +857,7 @@ describe('MdDatepicker', () => {
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('md-dialog-container')).not.toBeNull();
+        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
 
         let cells = document.querySelectorAll('.mat-calendar-body-cell');
         dispatchMouseEvent(cells[0], 'click');
@@ -897,14 +897,14 @@ describe('MdDatepicker', () => {
     });
   });
 
-  describe('with missing DateAdapter and MD_DATE_FORMATS', () => {
+  describe('with missing DateAdapter and MAT_DATE_FORMATS', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [
           FormsModule,
-          MdDatepickerModule,
-          MdFormFieldModule,
-          MdInputModule,
+          MatDatepickerModule,
+          MatFormFieldModule,
+          MatInputModule,
           NoopAnimationsModule,
           ReactiveFormsModule,
         ],
@@ -916,7 +916,7 @@ describe('MdDatepicker', () => {
 
     it('should throw when created', () => {
       expect(() => TestBed.createComponent(StandardDatepicker))
-          .toThrowError(/MdDatepicker: No provider found for .*/);
+          .toThrowError(/MatDatepicker: No provider found for .*/);
     });
   });
 
@@ -928,10 +928,10 @@ describe('MdDatepicker', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [
-          MdDatepickerModule,
-          MdFormFieldModule,
-          MdInputModule,
-          MdNativeDateModule,
+          MatDatepickerModule,
+          MatFormFieldModule,
+          MatInputModule,
+          MatNativeDateModule,
           NoopAnimationsModule
         ],
         declarations: [StandardDatepicker],
@@ -1010,10 +1010,10 @@ describe('MdDatepicker', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [
-          MdDatepickerModule,
-          MdFormFieldModule,
-          MdInputModule,
-          MdNativeDateModule,
+          MatDatepickerModule,
+          MatFormFieldModule,
+          MatInputModule,
+          MatNativeDateModule,
           NoopAnimationsModule,
           NativeDateModule,
           FormsModule
@@ -1045,120 +1045,123 @@ describe('MdDatepicker', () => {
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [value]="date">
-    <md-datepicker #d [touchUi]="touch" [disabled]="disabled"></md-datepicker>
+    <input [matDatepicker]="d" [value]="date">
+    <mat-datepicker #d [touchUi]="touch" [disabled]="disabled"></mat-datepicker>
   `,
 })
 class StandardDatepicker {
   touch = false;
   disabled = false;
   date: Date | null = new Date(2020, JAN, 1);
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
 
 
 @Component({
   template: `
-    <input [mdDatepicker]="d"><input [mdDatepicker]="d"><md-datepicker #d></md-datepicker>
+    <input [matDatepicker]="d"><input [matDatepicker]="d"><mat-datepicker #d></mat-datepicker>
   `,
 })
 class MultiInputDatepicker {}
 
 
 @Component({
-  template: `<md-datepicker #d></md-datepicker>`,
+  template: `<mat-datepicker #d></mat-datepicker>`,
 })
 class NoInputDatepicker {
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
 }
 
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [value]="date">
-    <md-datepicker #d [startAt]="startDate"></md-datepicker>
+    <input [matDatepicker]="d" [value]="date">
+    <mat-datepicker #d [startAt]="startDate"></mat-datepicker>
   `,
 })
 class DatepickerWithStartAt {
   date = new Date(2020, JAN, 1);
   startDate = new Date(2010, JAN, 1);
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
 }
 
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [value]="date">
-    <md-datepicker #d startView="year"></md-datepicker>
+    <input [matDatepicker]="d" [value]="date">
+    <mat-datepicker #d startView="year"></mat-datepicker>
   `,
 })
 class DatepickerWithStartView {
   date = new Date(2020, JAN, 1);
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
 }
 
 
 @Component({
-  template: `<input [(ngModel)]="selected" [mdDatepicker]="d"><md-datepicker #d></md-datepicker>`,
+  template: `
+    <input [(ngModel)]="selected" [matDatepicker]="d">
+    <mat-datepicker #d></mat-datepicker>
+  `,
 })
 class DatepickerWithNgModel {
   selected: Date | null = null;
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
 
 
 @Component({
   template: `
-    <input [formControl]="formControl" [mdDatepicker]="d">
-    <md-datepicker #d></md-datepicker>
+    <input [formControl]="formControl" [matDatepicker]="d">
+    <mat-datepicker #d></mat-datepicker>
   `,
 })
 class DatepickerWithFormControl {
   formControl = new FormControl();
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
 
 
 @Component({
   template: `
-    <input [mdDatepicker]="d">
-    <md-datepicker-toggle [for]="d"></md-datepicker-toggle>
-    <md-datepicker #d [touchUi]="touchUI"></md-datepicker>
+    <input [matDatepicker]="d">
+    <mat-datepicker-toggle [for]="d"></mat-datepicker-toggle>
+    <mat-datepicker #d [touchUi]="touchUI"></mat-datepicker>
   `,
 })
 class DatepickerWithToggle {
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) input: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) input: MatDatepickerInput<Date>;
   touchUI = true;
 }
 
 
 @Component({
   template: `
-      <md-form-field>
-        <input mdInput [mdDatepicker]="d">
-        <md-datepicker #d></md-datepicker>
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [matDatepicker]="d">
+        <mat-datepicker #d></mat-datepicker>
+      </mat-form-field>
   `,
 })
 class FormFieldDatepicker {
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
 
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [(ngModel)]="date" [min]="minDate" [max]="maxDate">
-    <md-datepicker-toggle [for]="d"></md-datepicker-toggle>
-    <md-datepicker #d></md-datepicker>
+    <input [matDatepicker]="d" [(ngModel)]="date" [min]="minDate" [max]="maxDate">
+    <mat-datepicker-toggle [for]="d"></mat-datepicker-toggle>
+    <mat-datepicker #d></mat-datepicker>
   `,
 })
 class DatepickerWithMinAndMaxValidation {
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
   date: Date | null;
   minDate = new Date(2010, JAN, 1);
   maxDate = new Date(2020, JAN, 1);
@@ -1167,13 +1170,13 @@ class DatepickerWithMinAndMaxValidation {
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [(ngModel)]="date" [mdDatepickerFilter]="filter">
-    <md-datepicker-toggle [for]="d"></md-datepicker-toggle>
-    <md-datepicker #d [touchUi]="true"></md-datepicker>
+    <input [matDatepicker]="d" [(ngModel)]="date" [matDatepickerFilter]="filter">
+    <mat-datepicker-toggle [for]="d"></mat-datepicker-toggle>
+    <mat-datepicker #d [touchUi]="true"></mat-datepicker>
   `,
 })
 class DatepickerWithFilterAndValidation {
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
   date: Date;
   filter = (date: Date) => date.getDate() != 1;
 }
@@ -1181,13 +1184,13 @@ class DatepickerWithFilterAndValidation {
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" (change)="onChange()" (input)="onInput()"
+    <input [matDatepicker]="d" (change)="onChange()" (input)="onInput()"
            (dateChange)="onDateChange()" (dateInput)="onDateInput()">
-    <md-datepicker #d [touchUi]="true"></md-datepicker>
+    <mat-datepicker #d [touchUi]="true"></mat-datepicker>
   `
 })
 class DatepickerWithChangeAndInputEvents {
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
 
   onChange() {}
 
@@ -1200,20 +1203,20 @@ class DatepickerWithChangeAndInputEvents {
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [(ngModel)]="date">
-    <md-datepicker #d></md-datepicker>
+    <input [matDatepicker]="d" [(ngModel)]="date">
+    <mat-datepicker #d></mat-datepicker>
   `
 })
 class DatepickerWithi18n {
   date: Date | null = new Date(2010, JAN, 1);
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
 
 @Component({
   template: `
-    <input [mdDatepicker]="d" [(ngModel)]="value" [min]="min" [max]="max">
-    <md-datepicker #d [startAt]="startAt"></md-datepicker>
+    <input [matDatepicker]="d" [(ngModel)]="value" [min]="min" [max]="max">
+    <mat-datepicker #d [startAt]="startAt"></mat-datepicker>
   `
 })
 class DatepickerWithISOStrings {
@@ -1221,6 +1224,6 @@ class DatepickerWithISOStrings {
   min = new Date(2017, JAN, 1).toISOString();
   max = new Date (2017, DEC, 31).toISOString();
   startAt = new Date(2017, JUL, 1).toISOString();
-  @ViewChild('d') datepicker: MdDatepicker<Date>;
-  @ViewChild(MdDatepickerInput) datepickerInput: MdDatepickerInput<Date>;
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+  @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index d0873f7f1980..8c9d10adafb3 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -11,8 +11,8 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {
   Overlay,
-  OverlayRef,
   OverlayConfig,
+  OverlayRef,
   PositionStrategy,
   RepositionScrollStrategy,
   ScrollStrategy,
@@ -36,48 +36,48 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import {DateAdapter, MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
-import {MdDialog, MdDialogRef} from '@angular/material/dialog';
+import {DateAdapter} from '@angular/material/core';
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {DOCUMENT} from '@angular/platform-browser';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {MdCalendar} from './calendar';
+import {MatCalendar} from './calendar';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
-import {MdDatepickerInput} from './datepicker-input';
+import {MatDatepickerInput} from './datepicker-input';
 
 
 /** Used to generate a unique ID for each datepicker instance. */
 let datepickerUid = 0;
 
 /** Injection token that determines the scroll handling while the calendar is open. */
-export const MD_DATEPICKER_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-datepicker-scroll-strategy');
+export const MAT_DATEPICKER_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-datepicker-scroll-strategy');
 
 /** @docs-private */
-export function MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition();
 }
 
 /** @docs-private */
-export const MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_DATEPICKER_SCROLL_STRATEGY,
+export const MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_DATEPICKER_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 
 /**
  * Component used as the content for the datepicker dialog and popup. We use this instead of using
- * MdCalendar directly as the content so we can control the initial focus. This also gives us a
+ * MatCalendar directly as the content so we can control the initial focus. This also gives us a
  * place to put additional features of the popup that are not part of the calendar itself in the
  * future. (e.g. confirmation buttons).
  * @docs-private
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-datepicker-content, mat-datepicker-content',
+  selector: 'mat-datepicker-content',
   templateUrl: 'datepicker-content.html',
   styleUrls: ['datepicker-content.css'],
   host: {
@@ -88,12 +88,11 @@ export const MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdDatepickerContent<D> implements AfterContentInit {
-  datepicker: MdDatepicker<D>;
+export class MatDatepickerContent<D> implements AfterContentInit {
+  datepicker: MatDatepicker<D>;
 
-  @ViewChild(MdCalendar) _calendar: MdCalendar<D>;
+  @ViewChild(MatCalendar) _calendar: MatCalendar<D>;
 
   ngAfterContentInit() {
     this._calendar._focusActiveCell();
@@ -114,18 +113,18 @@ export class MdDatepickerContent<D> implements AfterContentInit {
 
 
 // TODO(mmalerba): We use a component instead of a directive here so the user can use implicit
-// template reference variables (e.g. #d vs #d="mdDatepicker"). We can change this to a directive if
-// angular adds support for `exportAs: '$implicit'` on directives.
+// template reference variables (e.g. #d vs #d="matDatepicker"). We can change this to a directive
+// if angular adds support for `exportAs: '$implicit'` on directives.
 /** Component responsible for managing the datepicker popup/dialog. */
 @Component({
   moduleId: module.id,
-  selector: 'md-datepicker, mat-datepicker',
+  selector: 'mat-datepicker',
   template: '',
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdDatepicker<D> implements OnDestroy {
+export class MatDatepicker<D> implements OnDestroy {
   /** The date to open the calendar to initially. */
   @Input()
   get startAt(): D | null {
@@ -170,7 +169,7 @@ export class MdDatepicker<D> implements OnDestroy {
   opened = false;
 
   /** The id for the datepicker calendar. */
-  id = `md-datepicker-${datepickerUid++}`;
+  id = `mat-datepicker-${datepickerUid++}`;
 
   /** The currently selected date. */
   get _selected(): D | null { return this._validSelected; }
@@ -195,10 +194,10 @@ export class MdDatepicker<D> implements OnDestroy {
   private _popupRef: OverlayRef;
 
   /** A reference to the dialog when the calendar is opened as a dialog. */
-  private _dialogRef: MdDialogRef<any> | null;
+  private _dialogRef: MatDialogRef<any> | null;
 
   /** A portal containing the calendar for this datepicker. */
-  private _calendarPortal: ComponentPortal<MdDatepickerContent<D>>;
+  private _calendarPortal: ComponentPortal<MatDatepickerContent<D>>;
 
   /** The element that was focused before the datepicker was opened. */
   private _focusedElementBeforeOpen: HTMLElement | null = null;
@@ -206,16 +205,16 @@ export class MdDatepicker<D> implements OnDestroy {
   private _inputSubscription = Subscription.EMPTY;
 
   /** The input element this datepicker is associated with. */
-  _datepickerInput: MdDatepickerInput<D>;
+  _datepickerInput: MatDatepickerInput<D>;
 
   /** Emits when the datepicker is disabled. */
   _disabledChange = new Subject<boolean>();
 
-  constructor(private _dialog: MdDialog,
+  constructor(private _dialog: MatDialog,
               private _overlay: Overlay,
               private _ngZone: NgZone,
               private _viewContainerRef: ViewContainerRef,
-              @Inject(MD_DATEPICKER_SCROLL_STRATEGY) private _scrollStrategy,
+              @Inject(MAT_DATEPICKER_SCROLL_STRATEGY) private _scrollStrategy,
               @Optional() private _dateAdapter: DateAdapter<D>,
               @Optional() private _dir: Directionality,
               @Optional() @Inject(DOCUMENT) private _document: any) {
@@ -247,9 +246,9 @@ export class MdDatepicker<D> implements OnDestroy {
    * Register an input with this datepicker.
    * @param input The datepicker input to register with this datepicker.
    */
-  _registerInput(input: MdDatepickerInput<D>): void {
+  _registerInput(input: MatDatepickerInput<D>): void {
     if (this._datepickerInput) {
-      throw Error('An MdDatepicker can only be associated with a single input.');
+      throw Error('An MatDatepicker can only be associated with a single input.');
     }
     this._datepickerInput = input;
     this._inputSubscription =
@@ -262,7 +261,7 @@ export class MdDatepicker<D> implements OnDestroy {
       return;
     }
     if (!this._datepickerInput) {
-      throw Error('Attempted to open an MdDatepicker with no associated input.');
+      throw Error('Attempted to open an MatDatepicker with no associated input.');
     }
     if (this._document) {
       this._focusedElementBeforeOpen = this._document.activeElement;
@@ -299,7 +298,7 @@ export class MdDatepicker<D> implements OnDestroy {
 
   /** Open the calendar as a dialog. */
   private _openAsDialog(): void {
-    this._dialogRef = this._dialog.open(MdDatepickerContent, {
+    this._dialogRef = this._dialog.open(MatDatepickerContent, {
       direction: this._dir ? this._dir.value : 'ltr',
       viewContainerRef: this._viewContainerRef,
     });
@@ -310,7 +309,7 @@ export class MdDatepicker<D> implements OnDestroy {
   /** Open the calendar as a popup. */
   private _openAsPopup(): void {
     if (!this._calendarPortal) {
-      this._calendarPortal = new ComponentPortal(MdDatepickerContent, this._viewContainerRef);
+      this._calendarPortal = new ComponentPortal(MatDatepickerContent, this._viewContainerRef);
     }
 
     if (!this._popupRef) {
@@ -318,7 +317,7 @@ export class MdDatepicker<D> implements OnDestroy {
     }
 
     if (!this._popupRef.hasAttached()) {
-      let componentRef: ComponentRef<MdDatepickerContent<D>> =
+      let componentRef: ComponentRef<MatDatepickerContent<D>> =
           this._popupRef.attach(this._calendarPortal);
       componentRef.instance.datepicker = this;
 
diff --git a/src/lib/datepicker/mat-exports.ts b/src/lib/datepicker/mat-exports.ts
deleted file mode 100644
index 71e214bcd1f0..000000000000
--- a/src/lib/datepicker/mat-exports.ts
+++ /dev/null
@@ -1,48 +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 {MdCalendar} from './calendar';
-import {MdCalendarBody, MdCalendarCell} from './calendar-body';
-import {
-  MD_DATEPICKER_SCROLL_STRATEGY,
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER,
-  MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdDatepicker,
-  MdDatepickerContent,
-} from './datepicker';
-import {
-  MD_DATEPICKER_VALIDATORS,
-  MD_DATEPICKER_VALUE_ACCESSOR,
-  MdDatepickerInput,
-  MdDatepickerInputEvent,
-} from './datepicker-input';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdDatepickerModule} from './datepicker-module';
-import {MdDatepickerToggle} from './datepicker-toggle';
-import {MdMonthView} from './month-view';
-import {MdYearView} from './year-view';
-
-
-/* tslint:disable:max-line-length */
-export {MD_DATEPICKER_SCROLL_STRATEGY as MAT_DATEPICKER_SCROLL_STRATEGY};
-export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER};
-export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MD_DATEPICKER_VALIDATORS as MAT_DATEPICKER_VALIDATORS};
-export {MD_DATEPICKER_VALUE_ACCESSOR as MAT_DATEPICKER_VALUE_ACCESSOR};
-export {MdCalendar as MatCalendar};
-export {MdCalendarBody as MatCalendarBody};
-export {MdCalendarCell as MatCalendarCell};
-export {MdDatepicker as MatDatepicker};
-export {MdDatepickerContent as MatDatepickerContent};
-export {MdDatepickerInput as MatDatepickerInput};
-export {MdDatepickerInputEvent as MatDatepickerInputEvent};
-export {MdDatepickerIntl as MatDatepickerIntl};
-export {MdDatepickerModule as MatDatepickerModule};
-export {MdDatepickerToggle as MatDatepickerToggle};
-export {MdMonthView as MatMonthView};
-export {MdYearView as MatYearView};
diff --git a/src/lib/datepicker/month-view.spec.ts b/src/lib/datepicker/month-view.spec.ts
index 8b97849a85e8..b54cb400d5a5 100644
--- a/src/lib/datepicker/month-view.spec.ts
+++ b/src/lib/datepicker/month-view.spec.ts
@@ -1,20 +1,20 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdMonthView} from './month-view';
-import {MdCalendarBody} from './calendar-body';
-import {MdNativeDateModule} from '@angular/material/core';
+import {MatMonthView} from './month-view';
+import {MatCalendarBody} from './calendar-body';
+import {MatNativeDateModule} from '@angular/material/core';
 import {JAN, MAR} from '@angular/material/core';
 
-describe('MdMonthView', () => {
+describe('MatMonthView', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        MdNativeDateModule,
+        MatNativeDateModule,
       ],
       declarations: [
-        MdCalendarBody,
-        MdMonthView,
+        MatCalendarBody,
+        MatMonthView,
 
         // Test components.
         StandardMonthView,
@@ -34,7 +34,7 @@ describe('MdMonthView', () => {
       fixture = TestBed.createComponent(StandardMonthView);
       fixture.detectChanges();
 
-      let monthViewDebugElement = fixture.debugElement.query(By.directive(MdMonthView));
+      let monthViewDebugElement = fixture.debugElement.query(By.directive(MatMonthView));
       monthViewNativeElement = monthViewDebugElement.nativeElement;
       testComponent = fixture.componentInstance;
     });
@@ -87,7 +87,7 @@ describe('MdMonthView', () => {
       fixture = TestBed.createComponent(MonthViewWithDateFilter);
       fixture.detectChanges();
 
-      let monthViewDebugElement = fixture.debugElement.query(By.directive(MdMonthView));
+      let monthViewDebugElement = fixture.debugElement.query(By.directive(MatMonthView));
       monthViewNativeElement = monthViewDebugElement.nativeElement;
       testComponent = fixture.componentInstance;
     });
@@ -102,7 +102,7 @@ describe('MdMonthView', () => {
 
 
 @Component({
-  template: `<md-month-view [activeDate]="date" [(selected)]="selected"></md-month-view>`,
+  template: `<mat-month-view [activeDate]="date" [(selected)]="selected"></mat-month-view>`,
 })
 class StandardMonthView {
   date = new Date(2017, JAN, 5);
@@ -111,7 +111,7 @@ class StandardMonthView {
 
 
 @Component({
-  template: `<md-month-view [activeDate]="activeDate" [dateFilter]="dateFilter"></md-month-view>`
+  template: `<mat-month-view [activeDate]="activeDate" [dateFilter]="dateFilter"></mat-month-view>`
 })
 class MonthViewWithDateFilter {
   activeDate = new Date(2017, JAN, 1);
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index 6030f1a45de4..4ac52fe8b251 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -17,11 +17,8 @@ import {
   Output,
   ViewEncapsulation,
 } from '@angular/core';
-import {
-  DateAdapter, MATERIAL_COMPATIBILITY_MODE, MD_DATE_FORMATS,
-  MdDateFormats
-} from '@angular/material/core';
-import {MdCalendarCell} from './calendar-body';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
+import {MatCalendarCell} from './calendar-body';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 
@@ -35,14 +32,13 @@ const DAYS_PER_WEEK = 7;
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-month-view',
+  selector: 'mat-month-view',
   templateUrl: 'month-view.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdMonthView<D> implements AfterContentInit {
+export class MatMonthView<D> implements AfterContentInit {
   /**
    * The date to display in this month view (everything other than the month and year is ignored).
    */
@@ -79,7 +75,7 @@ export class MdMonthView<D> implements AfterContentInit {
   _monthLabel: string;
 
   /** Grid of calendar cells representing the dates of the month. */
-  _weeks: MdCalendarCell[][];
+  _weeks: MatCalendarCell[][];
 
   /** The number of blank cells in the first row before the 1st of the month. */
   _firstWeekOffset: number;
@@ -97,12 +93,12 @@ export class MdMonthView<D> implements AfterContentInit {
   _weekdays: {long: string, narrow: string}[];
 
   constructor(@Optional() public _dateAdapter: DateAdapter<D>,
-              @Optional() @Inject(MD_DATE_FORMATS) private _dateFormats: MdDateFormats) {
+              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats) {
     if (!this._dateAdapter) {
       throw createMissingDateImplError('DateAdapter');
     }
     if (!this._dateFormats) {
-      throw createMissingDateImplError('MD_DATE_FORMATS');
+      throw createMissingDateImplError('MAT_DATE_FORMATS');
     }
 
     const firstDayOfWeek = this._dateAdapter.getFirstDayOfWeek();
@@ -152,7 +148,7 @@ export class MdMonthView<D> implements AfterContentInit {
     this._createWeekCells();
   }
 
-  /** Creates MdCalendarCells for the dates in this month. */
+  /** Creates MatCalendarCells for the dates in this month. */
   private _createWeekCells() {
     let daysInMonth = this._dateAdapter.getNumDaysInMonth(this.activeDate);
     let dateNames = this._dateAdapter.getDateNames();
@@ -169,7 +165,7 @@ export class MdMonthView<D> implements AfterContentInit {
           this.dateFilter(date);
       let ariaLabel = this._dateAdapter.format(date, this._dateFormats.display.dateA11yLabel);
       this._weeks[this._weeks.length - 1]
-          .push(new MdCalendarCell(i + 1, dateNames[i], ariaLabel, enabled));
+          .push(new MatCalendarCell(i + 1, dateNames[i], ariaLabel, enabled));
     }
   }
 
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public_api.ts
index 89d5bac6d09b..661e07c2aac0 100644
--- a/src/lib/datepicker/public_api.ts
+++ b/src/lib/datepicker/public_api.ts
@@ -16,4 +16,4 @@ export * from './datepicker-intl';
 export * from './datepicker-toggle';
 export * from './month-view';
 export * from './year-view';
-export * from './mat-exports';
+
diff --git a/src/lib/datepicker/year-view.spec.ts b/src/lib/datepicker/year-view.spec.ts
index ee68a91e7134..4b44066a7a63 100644
--- a/src/lib/datepicker/year-view.spec.ts
+++ b/src/lib/datepicker/year-view.spec.ts
@@ -1,20 +1,20 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdYearView} from './year-view';
-import {MdCalendarBody} from './calendar-body';
-import {MdNativeDateModule} from '@angular/material/core';
+import {MatYearView} from './year-view';
+import {MatCalendarBody} from './calendar-body';
+import {MatNativeDateModule} from '@angular/material/core';
 import {FEB, JAN, JUL, JUN, MAR} from '@angular/material/core';
 
-describe('MdYearView', () => {
+describe('MatYearView', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        MdNativeDateModule,
+        MatNativeDateModule,
       ],
       declarations: [
-        MdCalendarBody,
-        MdYearView,
+        MatCalendarBody,
+        MatYearView,
 
         // Test components.
         StandardYearView,
@@ -34,7 +34,7 @@ describe('MdYearView', () => {
       fixture = TestBed.createComponent(StandardYearView);
       fixture.detectChanges();
 
-      let yearViewDebugElement = fixture.debugElement.query(By.directive(MdYearView));
+      let yearViewDebugElement = fixture.debugElement.query(By.directive(MatYearView));
       yearViewNativeElement = yearViewDebugElement.nativeElement;
       testComponent = fixture.componentInstance;
     });
@@ -97,7 +97,7 @@ describe('MdYearView', () => {
       fixture = TestBed.createComponent(YearViewWithDateFilter);
       fixture.detectChanges();
 
-      let yearViewDebugElement = fixture.debugElement.query(By.directive(MdYearView));
+      let yearViewDebugElement = fixture.debugElement.query(By.directive(MatYearView));
       yearViewNativeElement = yearViewDebugElement.nativeElement;
       testComponent = fixture.componentInstance;
     });
@@ -113,18 +113,18 @@ describe('MdYearView', () => {
 
 @Component({
   template: `
-    <md-year-view [activeDate]="date" [(selected)]="selected"></md-year-view>`,
+    <mat-year-view [activeDate]="date" [(selected)]="selected"></mat-year-view>`,
 })
 class StandardYearView {
   date = new Date(2017, JAN, 5);
   selected = new Date(2017, MAR, 10);
 
-  @ViewChild(MdYearView) yearView: MdYearView<Date>;
+  @ViewChild(MatYearView) yearView: MatYearView<Date>;
 }
 
 
 @Component({
-  template: `<md-year-view [activeDate]="activeDate" [dateFilter]="dateFilter"></md-year-view>`
+  template: `<mat-year-view [activeDate]="activeDate" [dateFilter]="dateFilter"></mat-year-view>`
 })
 class YearViewWithDateFilter {
   activeDate = new Date(2017, JAN, 1);
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index db7699df0491..11f95149e317 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -17,8 +17,8 @@ import {
   Output,
   ViewEncapsulation,
 } from '@angular/core';
-import {DateAdapter, MD_DATE_FORMATS, MdDateFormats} from '@angular/material/core';
-import {MdCalendarCell} from './calendar-body';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
+import {MatCalendarCell} from './calendar-body';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 
@@ -29,13 +29,13 @@ import {createMissingDateImplError} from './datepicker-errors';
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-year-view, mat-year-view',
+  selector: 'mat-year-view',
   templateUrl: 'year-view.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdYearView<D> implements AfterContentInit {
+export class MatYearView<D> implements AfterContentInit {
   /** The date to display in this year view (everything other than the year is ignored). */
   @Input()
   get activeDate(): D { return this._activeDate; }
@@ -64,7 +64,7 @@ export class MdYearView<D> implements AfterContentInit {
   @Output() selectedChange = new EventEmitter<D>();
 
   /** Grid of calendar cells representing the months of the year. */
-  _months: MdCalendarCell[][];
+  _months: MatCalendarCell[][];
 
   /** The label for this year (e.g. "2017"). */
   _yearLabel: string;
@@ -79,12 +79,12 @@ export class MdYearView<D> implements AfterContentInit {
   _selectedMonth: number | null;
 
   constructor(@Optional() public _dateAdapter: DateAdapter<D>,
-              @Optional() @Inject(MD_DATE_FORMATS) private _dateFormats: MdDateFormats) {
+              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats) {
     if (!this._dateAdapter) {
       throw createMissingDateImplError('DateAdapter');
     }
     if (!this._dateFormats) {
-      throw createMissingDateImplError('MD_DATE_FORMATS');
+      throw createMissingDateImplError('MAT_DATE_FORMATS');
     }
 
     this._activeDate = this._dateAdapter.today();
@@ -124,12 +124,12 @@ export class MdYearView<D> implements AfterContentInit {
         this._dateAdapter.getMonth(date) : null;
   }
 
-  /** Creates an MdCalendarCell for the given month. */
+  /** Creates an MatCalendarCell for the given month. */
   private _createCellForMonth(month: number, monthName: string) {
     let ariaLabel = this._dateAdapter.format(
         this._dateAdapter.createDate(this._dateAdapter.getYear(this.activeDate), month, 1),
         this._dateFormats.display.monthYearA11yLabel);
-    return new MdCalendarCell(
+    return new MatCalendarCell(
         month, monthName.toLocaleUpperCase(), ariaLabel, this._isMonthEnabled(month));
   }
 
diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
index a9a53e8826f3..f2dc3e0bd500 100644
--- a/src/lib/dialog/dialog-config.ts
+++ b/src/lib/dialog/dialog-config.ts
@@ -21,9 +21,9 @@ export interface DialogPosition {
 }
 
 /**
- * Configuration for opening a modal dialog with the MdDialog service.
+ * Configuration for opening a modal dialog with the MatDialog service.
  */
-export class MdDialogConfig {
+export class MatDialogConfig {
 
   /**
    * Where the attached component should live in Angular's *logical* component tree.
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 0fc71833df46..372e21ee072a 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -27,7 +27,7 @@ import {
   TemplatePortal
 } from '@angular/cdk/portal';
 import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
-import {MdDialogConfig} from './dialog-config';
+import {MatDialogConfig} from './dialog-config';
 
 
 /**
@@ -35,7 +35,7 @@ import {MdDialogConfig} from './dialog-config';
  * attached to a DomPortalHost without an origin.
  * @docs-private
  */
-export function throwMdDialogContentAlreadyAttachedError() {
+export function throwMatDialogContentAlreadyAttachedError() {
   throw Error('Attempting to attach dialog content after content is already attached');
 }
 
@@ -46,7 +46,7 @@ export function throwMdDialogContentAlreadyAttachedError() {
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-dialog-container, mat-dialog-container',
+  selector: 'mat-dialog-container',
   templateUrl: 'dialog-container.html',
   styleUrls: ['dialog.css'],
   encapsulation: ViewEncapsulation.None,
@@ -74,7 +74,7 @@ export function throwMdDialogContentAlreadyAttachedError() {
     '(@slideDialog.done)': '_onAnimationDone($event)',
   },
 })
-export class MdDialogContainer extends BasePortalHost {
+export class MatDialogContainer extends BasePortalHost {
   /** The portal host inside of this container into which the dialog content will be loaded. */
   @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
 
@@ -85,7 +85,7 @@ export class MdDialogContainer extends BasePortalHost {
   private _elementFocusedBeforeDialogWasOpened: HTMLElement | null = null;
 
   /** The dialog configuration. */
-  _config: MdDialogConfig;
+  _config: MatDialogConfig;
 
   /** State of the dialog animation. */
   _state: 'void' | 'enter' | 'exit' = 'enter';
@@ -114,7 +114,7 @@ export class MdDialogContainer extends BasePortalHost {
    */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
     if (this._portalHost.hasAttached()) {
-      throwMdDialogContentAlreadyAttachedError();
+      throwMatDialogContentAlreadyAttachedError();
     }
 
     this._savePreviouslyFocusedElement();
@@ -127,7 +127,7 @@ export class MdDialogContainer extends BasePortalHost {
    */
   attachTemplatePortal<C>(portal: TemplatePortal<C>): EmbeddedViewRef<C> {
     if (this._portalHost.hasAttached()) {
-      throwMdDialogContentAlreadyAttachedError();
+      throwMatDialogContentAlreadyAttachedError();
     }
 
     this._savePreviouslyFocusedElement();
diff --git a/src/lib/dialog/dialog-content-directives.ts b/src/lib/dialog/dialog-content-directives.ts
index c87e24a86f4b..99dd5c900c02 100644
--- a/src/lib/dialog/dialog-content-directives.ts
+++ b/src/lib/dialog/dialog-content-directives.ts
@@ -7,8 +7,8 @@
  */
 
 import {Directive, Input, OnChanges, OnInit, Optional, SimpleChanges} from '@angular/core';
-import {MdDialogRef} from './dialog-ref';
-import {MdDialogContainer} from './dialog-container';
+import {MatDialogRef} from './dialog-ref';
+import {MatDialogContainer} from './dialog-container';
 
 /** Counter used to generate unique IDs for dialog elements. */
 let dialogElementUid = 0;
@@ -17,30 +17,26 @@ let dialogElementUid = 0;
  * Button that will close the current dialog.
  */
 @Directive({
-  selector: `button[md-dialog-close], button[mat-dialog-close],
-             button[mdDialogClose], button[matDialogClose]`,
+  selector: `button[mat-dialog-close], button[matDialogClose]`,
   host: {
     '(click)': 'dialogRef.close(dialogResult)',
     '[attr.aria-label]': 'ariaLabel',
     'type': 'button', // Prevents accidental form submits.
   }
 })
-export class MdDialogClose implements OnChanges {
+export class MatDialogClose implements OnChanges {
   /** Screenreader label for the button. */
   @Input('aria-label') ariaLabel: string = 'Close dialog';
 
   /** Dialog close input. */
-  @Input('md-dialog-close') dialogResult: any;
+  @Input('mat-dialog-close') dialogResult: any;
 
   @Input('matDialogClose') _matDialogClose: any;
-  @Input('mdDialogClose') _mdDialogClose: any;
-  @Input('mat-dialog-close') _matDialogCloseResult: any;
 
-  constructor(public dialogRef: MdDialogRef<any>) { }
+  constructor(public dialogRef: MatDialogRef<any>) { }
 
   ngOnChanges(changes: SimpleChanges) {
-    const proxiedChange = changes._matDialogClose || changes._mdDialogClose ||
-        changes._matDialogCloseResult;
+    const proxiedChange = changes._matDialogClose || changes._matDialogCloseResult;
 
     if (proxiedChange) {
       this.dialogResult = proxiedChange.currentValue;
@@ -52,16 +48,16 @@ export class MdDialogClose implements OnChanges {
  * Title of a dialog element. Stays fixed to the top of the dialog when scrolling.
  */
 @Directive({
-  selector: '[md-dialog-title], [mat-dialog-title], [mdDialogTitle], [matDialogTitle]',
+  selector: '[mat-dialog-title], [matDialogTitle]',
   host: {
     'class': 'mat-dialog-title',
     '[id]': 'id',
   },
 })
-export class MdDialogTitle implements OnInit {
-  @Input() id = `md-dialog-title-${dialogElementUid++}`;
+export class MatDialogTitle implements OnInit {
+  @Input() id = `mat-dialog-title-${dialogElementUid++}`;
 
-  constructor(@Optional() private _container: MdDialogContainer) { }
+  constructor(@Optional() private _container: MatDialogContainer) { }
 
   ngOnInit() {
     if (this._container && !this._container._ariaLabelledBy) {
@@ -75,11 +71,10 @@ export class MdDialogTitle implements OnInit {
  * Scrollable content container of a dialog.
  */
 @Directive({
-  selector: `[md-dialog-content], md-dialog-content, [mat-dialog-content], mat-dialog-content,
-             [mdDialogContent], [matDialogContent]`,
+  selector: `[mat-dialog-content], mat-dialog-content, [matDialogContent]`,
   host: {'class': 'mat-dialog-content'}
 })
-export class MdDialogContent { }
+export class MatDialogContent { }
 
 
 /**
@@ -87,8 +82,7 @@ export class MdDialogContent { }
  * Stays fixed to the bottom when scrolling.
  */
 @Directive({
-  selector: `[md-dialog-actions], md-dialog-actions, [mat-dialog-actions], mat-dialog-actions,
-             [mdDialogActions], [matDialogActions]`,
+  selector: `[mat-dialog-actions], mat-dialog-actions, [matDialogActions]`,
   host: {'class': 'mat-dialog-actions'}
 })
-export class MdDialogActions { }
+export class MatDialogActions { }
diff --git a/src/lib/dialog/dialog-module.ts b/src/lib/dialog/dialog-module.ts
index c587faf42df2..ef6e7a236080 100644
--- a/src/lib/dialog/dialog-module.ts
+++ b/src/lib/dialog/dialog-module.ts
@@ -11,14 +11,14 @@ import {CommonModule} from '@angular/common';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
 import {A11yModule} from '@angular/cdk/a11y';
-import {MdCommonModule} from '@angular/material/core';
-import {MdDialog, MD_DIALOG_SCROLL_STRATEGY_PROVIDER} from './dialog';
-import {MdDialogContainer} from './dialog-container';
+import {MatCommonModule} from '@angular/material/core';
+import {MatDialog, MAT_DIALOG_SCROLL_STRATEGY_PROVIDER} from './dialog';
+import {MatDialogContainer} from './dialog-container';
 import {
-  MdDialogClose,
-  MdDialogContent,
-  MdDialogTitle,
-  MdDialogActions
+  MatDialogClose,
+  MatDialogContent,
+  MatDialogTitle,
+  MatDialogActions
 } from './dialog-content-directives';
 
 
@@ -28,27 +28,27 @@ import {
     OverlayModule,
     PortalModule,
     A11yModule,
-    MdCommonModule,
+    MatCommonModule,
   ],
   exports: [
-    MdDialogContainer,
-    MdDialogClose,
-    MdDialogTitle,
-    MdDialogContent,
-    MdDialogActions,
-    MdCommonModule,
+    MatDialogContainer,
+    MatDialogClose,
+    MatDialogTitle,
+    MatDialogContent,
+    MatDialogActions,
+    MatCommonModule,
   ],
   declarations: [
-    MdDialogContainer,
-    MdDialogClose,
-    MdDialogTitle,
-    MdDialogActions,
-    MdDialogContent,
+    MatDialogContainer,
+    MatDialogClose,
+    MatDialogTitle,
+    MatDialogActions,
+    MatDialogContent,
   ],
   providers: [
-    MdDialog,
-    MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
+    MatDialog,
+    MAT_DIALOG_SCROLL_STRATEGY_PROVIDER,
   ],
-  entryComponents: [MdDialogContainer],
+  entryComponents: [MatDialogContainer],
 })
-export class MdDialogModule {}
+export class MatDialogModule {}
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index d4839bb486d0..98f1c5914ca6 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -11,7 +11,7 @@ import {filter, first, RxChain} from '@angular/cdk/rxjs';
 import {DialogPosition} from './dialog-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {MdDialogContainer} from './dialog-container';
+import {MatDialogContainer} from './dialog-container';
 
 
 // TODO(jelbourn): resizing
@@ -20,9 +20,9 @@ import {MdDialogContainer} from './dialog-container';
 let uniqueId = 0;
 
 /**
- * Reference to a dialog opened via the MdDialog service.
+ * Reference to a dialog opened via the MatDialog service.
  */
-export class MdDialogRef<T> {
+export class MatDialogRef<T> {
   /** The instance of component opened into the dialog. */
   componentInstance: T;
 
@@ -43,8 +43,8 @@ export class MdDialogRef<T> {
 
   constructor(
     private _overlayRef: OverlayRef,
-    private _containerInstance: MdDialogContainer,
-    public readonly id: string = `md-dialog-${uniqueId++}`) {
+    private _containerInstance: MatDialogContainer,
+    public readonly id: string = `mat-dialog-${uniqueId++}`) {
 
     // Emit when opening animation completes
     RxChain.from(_containerInstance._animationStateChanged)
diff --git a/src/lib/dialog/dialog.md b/src/lib/dialog/dialog.md
index f2d42df5f1cd..c20447c35b56 100644
--- a/src/lib/dialog/dialog.md
+++ b/src/lib/dialog/dialog.md
@@ -1,10 +1,10 @@
-The `MdDialog` service can be used to open modal dialogs with Material Design styling and 
+The `MatDialog` service can be used to open modal dialogs with Material Design styling and 
 animations.
 
 <!-- example(dialog-overview) -->
 
 A dialog is opened by calling the `open` method with a component to be loaded and an optional 
-config object. The `open` method will return an instance of `MdDialogRef`:
+config object. The `open` method will return an instance of `MatDialogRef`:
 
 ```ts
 let dialogRef = dialog.open(UserProfileComponent, {
@@ -13,7 +13,7 @@ let dialogRef = dialog.open(UserProfileComponent, {
 });
 ```
 
-The `MdDialogRef` provides a handle on the opened dialog. It can be used to close the dialog and to
+The `MatDialogRef` provides a handle on the opened dialog. It can be used to close the dialog and to
 receive notification when the dialog has been closed.
 
 ```ts
@@ -24,14 +24,14 @@ dialogRef.afterClosed().subscribe(result => {
 dialogRef.close('Pizza!');
 ```
 
-Components created via `MdDialog` can _inject_ `MdDialogRef` and use it to close the dialog
+Components created via `MatDialog` can _inject_ `MatDialogRef` and use it to close the dialog
 in which they are contained. When closing, an optional result value can be provided. This result
 value is forwarded as the result of the `afterClosed` promise. 
 
 ```ts
 @Component({/* ... */})
 export class YourDialog {
-  constructor(public dialogRef: MdDialogRef<YourDialog>) { }
+  constructor(public dialogRef: MatDialogRef<YourDialog>) { }
   
   closeDialog() {
     this.dialogRef.close('Pizza!');
@@ -48,18 +48,18 @@ let dialogRef = dialog.open(YourDialog, {
 });
 ```
 
-To access the data in your dialog component, you have to use the MD_DIALOG_DATA injection token:
+To access the data in your dialog component, you have to use the MAT_DIALOG_DATA injection token:
 
 ```ts
 import {Component, Inject} from '@angular/core';
-import {MD_DIALOG_DATA} from '@angular/material';
+import {MAT_DIALOG_DATA} from '@angular/material';
 
 @Component({
   selector: 'your-dialog',
   template: 'passed in {{ data.name }}',
 })
 export class YourDialog {
-  constructor(@Inject(MD_DIALOG_DATA) public data: any) { }
+  constructor(@Inject(MAT_DIALOG_DATA) public data: any) { }
 }
 ```
 
@@ -70,20 +70,20 @@ Several directives are available to make it easier to structure your dialog cont
 
 | Name                  | Description                                                                                                   |
 |-----------------------|---------------------------------------------------------------------------------------------------------------|
-| `md-dialog-title`     | \[Attr] Dialog title, applied to a heading element (e.g., `<h1>`, `<h2>`)                                     |
-| `<md-dialog-content>` | Primary scrollable content of the dialog                                                                      |
-| `<md-dialog-actions>` | Container for action buttons at the bottom of the dialog                                                      |
-| `md-dialog-close`     | \[Attr] Added to a `<button>`, makes the button close the dialog with an optional result from the bound value.|
+| `mat-dialog-title`     | \[Attr] Dialog title, applied to a heading element (e.g., `<h1>`, `<h2>`)                                     |
+| `<mat-dialog-content>` | Primary scrollable content of the dialog                                                                      |
+| `<mat-dialog-actions>` | Container for action buttons at the bottom of the dialog                                                      |
+| `mat-dialog-close`     | \[Attr] Added to a `<button>`, makes the button close the dialog with an optional result from the bound value.|
 
 For example:
 ```html
-<h2 md-dialog-title>Delete all</h2>
-<md-dialog-content>Are you sure?</md-dialog-content>
-<md-dialog-actions>
-  <button md-button md-dialog-close>No</button>
+<h2 mat-dialog-title>Delete all</h2>
+<mat-dialog-content>Are you sure?</mat-dialog-content>
+<mat-dialog-actions>
+  <button mat-button mat-dialog-close>No</button>
   <!-- Can optionally provide a result for the closing dialog. -->
-  <button md-button [md-dialog-close]="true">Yes</button>
-</md-dialog-actions>
+  <button mat-button [mat-dialog-close]="true">Yes</button>
+</mat-dialog-actions>
 ```
 
 Once a dialog opens, the dialog will automatically focus the first tabbable element.
@@ -91,14 +91,14 @@ Once a dialog opens, the dialog will automatically focus the first tabbable elem
 You can control which elements are tab stops with the `tabindex` attribute
 
 ```html
-<button md-button tabindex="-1">Not Tabbable</button>
+<button mat-button tabindex="-1">Not Tabbable</button>
 ```
 
 <!-- example(dialog-content) -->
 
 ### AOT Compilation
 
-Due to the dynamic nature of the `MdDialog`, and its usage of `ViewContainerRef#createComponent()`
+Due to the dynamic nature of the `MatDialog`, and its usage of `ViewContainerRef#createComponent()`
 to create the component on the fly, the AOT compiler will not know to create the proper
 `ComponentFactory` for your dialog component by default.
 
@@ -109,7 +109,7 @@ that the AOT compiler knows to create the `ComponentFactory` for it.
 @NgModule({
   imports: [
     // ...
-    MdDialogModule
+    MatDialogModule
   ],
 
   declarations: [
@@ -129,10 +129,10 @@ export class AppModule() {}
 
 ### Accessibility
 By default, each dialog has `role="dialog"` on the root element. The role can be changed to
-`alertdialog` via the `MdDialogConfig` when opening.
+`alertdialog` via the `MatDialogConfig` when opening.
 
 The `aria-label`, `aria-labelledby`, and `aria-describedby` attributes can all be set to the
-dialog element via the `MdDialogConfig` as well. Each dialog should typically have a label
+dialog element via the `MatDialogConfig` as well. Each dialog should typically have a label
 set via `aria-label` or `aria-labelledby`.
 
 #### Focus management
diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 70c09652081d..dcd1489553d2 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -1,36 +1,36 @@
 import {
-  inject,
   async,
+  ComponentFixture,
   fakeAsync,
   flushMicrotasks,
-  ComponentFixture,
+  inject,
   TestBed,
   tick,
 } from '@angular/core/testing';
 import {
-  NgModule,
+  ChangeDetectionStrategy,
   Component,
   Directive,
-  ViewChild,
-  ViewContainerRef,
-  Injector,
   Inject,
-  ChangeDetectionStrategy,
-  TemplateRef
+  Injector,
+  NgModule,
+  TemplateRef,
+  ViewChild,
+  ViewContainerRef
 } from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Location} from '@angular/common';
 import {SpyLocation} from '@angular/common/testing';
-import {MdDialogContainer} from './dialog-container';
+import {MatDialogContainer} from './dialog-container';
 import {OverlayContainer} from '@angular/cdk/overlay';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
-import {MdDialogModule, MdDialogRef, MdDialog, MD_DIALOG_DATA} from './index';
+import {MAT_DIALOG_DATA, MatDialog, MatDialogModule, MatDialogRef} from './index';
 
 
-describe('MdDialog', () => {
-  let dialog: MdDialog;
+describe('MatDialog', () => {
+  let dialog: MatDialog;
   let overlayContainerElement: HTMLElement;
 
   let testViewContainerRef: ViewContainerRef;
@@ -39,7 +39,7 @@ describe('MdDialog', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdDialogModule, DialogTestModule],
+      imports: [MatDialogModule, DialogTestModule],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerElement = document.createElement('div');
@@ -52,7 +52,7 @@ describe('MdDialog', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MdDialog, Location], (d: MdDialog, l: Location) => {
+  beforeEach(inject([MatDialog, Location], (d: MatDialog, l: Location) => {
     dialog = d;
     mockLocation = l as SpyLocation;
   }));
@@ -76,7 +76,7 @@ describe('MdDialog', () => {
     expect(dialogRef.componentInstance.dialogRef).toBe(dialogRef);
 
     viewContainerFixture.detectChanges();
-    let dialogContainerElement = overlayContainerElement.querySelector('md-dialog-container')!;
+    let dialogContainerElement = overlayContainerElement.querySelector('mat-dialog-container')!;
     expect(dialogContainerElement.getAttribute('role')).toBe('dialog');
   });
 
@@ -96,7 +96,7 @@ describe('MdDialog', () => {
 
     viewContainerFixture.detectChanges();
 
-    let dialogContainerElement = overlayContainerElement.querySelector('md-dialog-container')!;
+    let dialogContainerElement = overlayContainerElement.querySelector('mat-dialog-container')!;
     expect(dialogContainerElement.getAttribute('role')).toBe('dialog');
 
     dialogRef.close();
@@ -142,7 +142,7 @@ describe('MdDialog', () => {
     expect(dialogRef.componentInstance.dialogRef).toBe(dialogRef);
 
     viewContainerFixture.detectChanges();
-    let dialogContainerElement = overlayContainerElement.querySelector('md-dialog-container')!;
+    let dialogContainerElement = overlayContainerElement.querySelector('mat-dialog-container')!;
     expect(dialogContainerElement.getAttribute('role')).toBe('dialog');
   });
 
@@ -151,7 +151,7 @@ describe('MdDialog', () => {
 
     viewContainerFixture.detectChanges();
 
-    let dialogContainerElement = overlayContainerElement.querySelector('md-dialog-container')!;
+    let dialogContainerElement = overlayContainerElement.querySelector('mat-dialog-container')!;
     expect(dialogContainerElement.getAttribute('role')).toBe('alertdialog');
   });
 
@@ -160,7 +160,7 @@ describe('MdDialog', () => {
 
     viewContainerFixture.detectChanges();
 
-    let dialogContainerElement = overlayContainerElement.querySelector('md-dialog-container')!;
+    let dialogContainerElement = overlayContainerElement.querySelector('mat-dialog-container')!;
     expect(dialogContainerElement.getAttribute('aria-describedby')).toBe('description-element');
   });
 
@@ -174,7 +174,7 @@ describe('MdDialog', () => {
 
     viewContainerFixture.whenStable().then(() => {
       expect(afterCloseCallback).toHaveBeenCalledWith('Charmander');
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeNull();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
     });
   }));
 
@@ -183,7 +183,7 @@ describe('MdDialog', () => {
 
     // beforeClose should emit before dialog container is destroyed
     const beforeCloseHandler = jasmine.createSpy('beforeClose callback').and.callFake(() => {
-      expect(overlayContainerElement.querySelector('md-dialog-container'))
+      expect(overlayContainerElement.querySelector('mat-dialog-container'))
           .not.toBeNull('dialog container exists when beforeClose is called');
     });
 
@@ -193,7 +193,7 @@ describe('MdDialog', () => {
 
     viewContainerFixture.whenStable().then(() => {
       expect(beforeCloseHandler).toHaveBeenCalledWith('Bulbasaurus');
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeNull();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
     });
   }));
 
@@ -206,7 +206,7 @@ describe('MdDialog', () => {
     viewContainerFixture.detectChanges();
 
     viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeNull();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
     });
   }));
 
@@ -223,7 +223,7 @@ describe('MdDialog', () => {
     onPushFixture.detectChanges();
     flushMicrotasks();
 
-    expect(overlayContainerElement.querySelectorAll('md-dialog-container').length)
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length)
         .toBe(1, 'Expected one open dialog.');
 
     dialogRef.close();
@@ -231,7 +231,7 @@ describe('MdDialog', () => {
     onPushFixture.detectChanges();
     tick(500);
 
-    expect(overlayContainerElement.querySelectorAll('md-dialog-container').length)
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length)
         .toBe(0, 'Expected no open dialogs.');
   }));
 
@@ -248,7 +248,7 @@ describe('MdDialog', () => {
     viewContainerFixture.detectChanges();
 
     viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeFalsy();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeFalsy();
     });
   }));
 
@@ -438,20 +438,20 @@ describe('MdDialog', () => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
 
-    expect(overlayContainerElement.querySelectorAll('md-dialog-container').length).toBe(3);
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(3);
 
     dialog.closeAll();
     viewContainerFixture.detectChanges();
 
     viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelectorAll('md-dialog-container').length).toBe(0);
+      expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
     });
   }));
 
   it('should set the proper animation states', () => {
     let dialogRef = dialog.open(PizzaMsg, { viewContainerRef: testViewContainerRef });
-    let dialogContainer: MdDialogContainer =
-        viewContainerFixture.debugElement.query(By.directive(MdDialogContainer)).componentInstance;
+    let dialogContainer: MatDialogContainer =
+        viewContainerFixture.debugElement.query(By.directive(MatDialogContainer)).componentInstance;
 
     expect(dialogContainer._state).toBe('enter');
 
@@ -464,13 +464,13 @@ describe('MdDialog', () => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
 
-    expect(overlayContainerElement.querySelectorAll('md-dialog-container').length).toBe(2);
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(2);
 
     mockLocation.simulateUrlPop('');
     viewContainerFixture.detectChanges();
 
     viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelectorAll('md-dialog-container').length).toBe(0);
+      expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
     });
   }));
 
@@ -478,13 +478,13 @@ describe('MdDialog', () => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
 
-    expect(overlayContainerElement.querySelectorAll('md-dialog-container').length).toBe(2);
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(2);
 
     mockLocation.simulateHashChange('');
     viewContainerFixture.detectChanges();
 
     viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelectorAll('md-dialog-container').length).toBe(0);
+      expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
     });
   }));
 
@@ -583,7 +583,7 @@ describe('MdDialog', () => {
       let backdrop = overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
       backdrop.click();
 
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeTruthy();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeTruthy();
     });
 
     it('should prevent closing via the escape key', () => {
@@ -595,7 +595,7 @@ describe('MdDialog', () => {
       viewContainerFixture.detectChanges();
       dispatchKeyboardEvent(document, 'keydown', ESCAPE);
 
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeTruthy();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeTruthy();
     });
 
     it('should allow for the disableClose option to be updated while open', async(() => {
@@ -609,14 +609,14 @@ describe('MdDialog', () => {
       let backdrop = overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
       backdrop.click();
 
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeTruthy();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeTruthy();
 
       dialogRef.disableClose = false;
       backdrop.click();
 
       viewContainerFixture.detectChanges();
       viewContainerFixture.whenStable().then(() => {
-        expect(overlayContainerElement.querySelector('md-dialog-container')).toBeFalsy();
+        expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeFalsy();
       });
     }));
   });
@@ -768,13 +768,13 @@ describe('MdDialog', () => {
         flushMicrotasks();
 
         expect(document.activeElement.tagName)
-            .toBe('MD-DIALOG-CONTAINER', 'Expected dialog container to be focused.');
+            .toBe('MAT-DIALOG-CONTAINER', 'Expected dialog container to be focused.');
       }));
 
   });
 
   describe('dialog content elements', () => {
-    let dialogRef: MdDialogRef<ContentElementDialog>;
+    let dialogRef: MatDialogRef<ContentElementDialog>;
 
     beforeEach(() => {
       dialogRef = dialog.open(ContentElementDialog);
@@ -784,7 +784,7 @@ describe('MdDialog', () => {
     it('should close the dialog when clicking on the close button', async(() => {
       expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(1);
 
-      (overlayContainerElement.querySelector('button[md-dialog-close]') as HTMLElement).click();
+      (overlayContainerElement.querySelector('button[mat-dialog-close]') as HTMLElement).click();
       viewContainerFixture.detectChanges();
 
       viewContainerFixture.whenStable().then(() => {
@@ -792,16 +792,16 @@ describe('MdDialog', () => {
       });
     }));
 
-    it('should not close the dialog if [md-dialog-close] is applied on a non-button node', () => {
+    it('should not close the dialog if [mat-dialog-close] is applied on a non-button node', () => {
       expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(1);
 
-      (overlayContainerElement.querySelector('div[md-dialog-close]') as HTMLElement).click();
+      (overlayContainerElement.querySelector('div[mat-dialog-close]') as HTMLElement).click();
 
       expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(1);
     });
 
     it('should allow for a user-specified aria-label on the close button', async(() => {
-      let button = overlayContainerElement.querySelector('button[md-dialog-close]')!;
+      let button = overlayContainerElement.querySelector('button[mat-dialog-close]')!;
 
       dialogRef.componentInstance.closeButtonAriaLabel = 'Best close button ever';
       viewContainerFixture.detectChanges();
@@ -812,12 +812,12 @@ describe('MdDialog', () => {
     }));
 
     it('should override the "type" attribute of the close button', () => {
-      let button = overlayContainerElement.querySelector('button[md-dialog-close]')!;
+      let button = overlayContainerElement.querySelector('button[mat-dialog-close]')!;
 
       expect(button.getAttribute('type')).toBe('button');
     });
 
-    it('should return the [md-dialog-close] result when clicking on the close button', async(() => {
+    it('should return the [mat-dialog-close] result when clicking the close button', async(() => {
       let afterCloseCallback = jasmine.createSpy('afterClose callback');
       dialogRef.afterClosed().subscribe(afterCloseCallback);
 
@@ -830,8 +830,8 @@ describe('MdDialog', () => {
     }));
 
     it('should set the aria-labelledby attribute to the id of the title', async(() => {
-      let title = overlayContainerElement.querySelector('[md-dialog-title]')!;
-      let container = overlayContainerElement.querySelector('md-dialog-container')!;
+      let title = overlayContainerElement.querySelector('[mat-dialog-title]')!;
+      let container = overlayContainerElement.querySelector('mat-dialog-container')!;
 
       viewContainerFixture.whenStable().then(() => {
         expect(title.id).toBeTruthy('Expected title element to have an id.');
@@ -843,16 +843,16 @@ describe('MdDialog', () => {
   });
 });
 
-describe('MdDialog with a parent MdDialog', () => {
-  let parentDialog: MdDialog;
-  let childDialog: MdDialog;
+describe('MatDialog with a parent MatDialog', () => {
+  let parentDialog: MatDialog;
+  let childDialog: MatDialog;
   let overlayContainerElement: HTMLElement;
-  let fixture: ComponentFixture<ComponentThatProvidesMdDialog>;
+  let fixture: ComponentFixture<ComponentThatProvidesMatDialog>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdDialogModule, DialogTestModule],
-      declarations: [ComponentThatProvidesMdDialog],
+      imports: [MatDialogModule, DialogTestModule],
+      declarations: [ComponentThatProvidesMatDialog],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerElement = document.createElement('div');
@@ -865,10 +865,10 @@ describe('MdDialog with a parent MdDialog', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MdDialog], (d: MdDialog) => {
+  beforeEach(inject([MatDialog], (d: MatDialog) => {
     parentDialog = d;
 
-    fixture = TestBed.createComponent(ComponentThatProvidesMdDialog);
+    fixture = TestBed.createComponent(ComponentThatProvidesMatDialog);
     childDialog = fixture.componentInstance.dialog;
     fixture.detectChanges();
   }));
@@ -877,7 +877,7 @@ describe('MdDialog with a parent MdDialog', () => {
     overlayContainerElement.innerHTML = '';
   });
 
-  it('should close dialogs opened by a parent when calling closeAll on a child MdDialog',
+  it('should close dialogs opened by a parent when calling closeAll on a child MatDialog',
     async(() => {
       parentDialog.open(PizzaMsg);
       fixture.detectChanges();
@@ -890,11 +890,11 @@ describe('MdDialog with a parent MdDialog', () => {
 
       fixture.whenStable().then(() => {
         expect(overlayContainerElement.textContent!.trim())
-            .toBe('', 'Expected closeAll on child MdDialog to close dialog opened by parent');
+            .toBe('', 'Expected closeAll on child MatDialog to close dialog opened by parent');
       });
     }));
 
-  it('should close dialogs opened by a child when calling closeAll on a parent MdDialog',
+  it('should close dialogs opened by a child when calling closeAll on a parent MatDialog',
     async(() => {
       childDialog.open(PizzaMsg);
       fixture.detectChanges();
@@ -907,7 +907,7 @@ describe('MdDialog with a parent MdDialog', () => {
 
       fixture.whenStable().then(() => {
         expect(overlayContainerElement.textContent!.trim())
-            .toBe('', 'Expected closeAll on parent MdDialog to close dialog opened by child');
+            .toBe('', 'Expected closeAll on parent MatDialog to close dialog opened by child');
       });
     }));
 
@@ -918,7 +918,7 @@ describe('MdDialog with a parent MdDialog', () => {
     fixture.detectChanges();
 
     fixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelector('md-dialog-container')).toBeNull();
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
     });
   }));
 });
@@ -956,11 +956,11 @@ class ComponentWithChildViewContainer {
 })
 class ComponentWithTemplateRef {
   localValue: string;
-  dialogRef: MdDialogRef<any>;
+  dialogRef: MatDialogRef<any>;
 
   @ViewChild(TemplateRef) templateRef: TemplateRef<any>;
 
-  setDialogRef(dialogRef: MdDialogRef<any>): string {
+  setDialogRef(dialogRef: MatDialogRef<any>): string {
     this.dialogRef = dialogRef;
     return '';
   }
@@ -969,19 +969,19 @@ class ComponentWithTemplateRef {
 /** Simple component for testing ComponentPortal. */
 @Component({template: '<p>Pizza</p> <input> <button>Close</button>'})
 class PizzaMsg {
-  constructor(public dialogRef: MdDialogRef<PizzaMsg>,
+  constructor(public dialogRef: MatDialogRef<PizzaMsg>,
               public dialogInjector: Injector) {}
 }
 
 @Component({
   template: `
-    <h1 md-dialog-title>This is the title</h1>
-    <md-dialog-content>Lorem ipsum dolor sit amet.</md-dialog-content>
-    <md-dialog-actions>
-      <button md-dialog-close [aria-label]="closeButtonAriaLabel">Close</button>
-      <button class="close-with-true" [md-dialog-close]="true">Close and return true</button>
-      <div md-dialog-close>Should not close</div>
-    </md-dialog-actions>
+    <h1 mat-dialog-title>This is the title</h1>
+    <mat-dialog-content>Lorem ipsum dolor sit amet.</mat-dialog-content>
+    <mat-dialog-actions>
+      <button mat-dialog-close [aria-label]="closeButtonAriaLabel">Close</button>
+      <button class="close-with-true" [mat-dialog-close]="true">Close and return true</button>
+      <div mat-dialog-close>Should not close</div>
+    </mat-dialog-actions>
   `
 })
 class ContentElementDialog {
@@ -990,16 +990,16 @@ class ContentElementDialog {
 
 @Component({
   template: '',
-  providers: [MdDialog]
+  providers: [MatDialog]
 })
-class ComponentThatProvidesMdDialog {
-  constructor(public dialog: MdDialog) {}
+class ComponentThatProvidesMatDialog {
+  constructor(public dialog: MatDialog) {}
 }
 
 /** Simple component for testing ComponentPortal. */
 @Component({template: ''})
 class DialogWithInjectedData {
-  constructor(@Inject(MD_DIALOG_DATA) public data: any) { }
+  constructor(@Inject(MAT_DIALOG_DATA) public data: any) { }
 }
 
 @Component({template: '<p>Pasta</p>'})
@@ -1019,7 +1019,7 @@ const TEST_DIRECTIVES = [
 ];
 
 @NgModule({
-  imports: [MdDialogModule, NoopAnimationsModule],
+  imports: [MatDialogModule, NoopAnimationsModule],
   exports: TEST_DIRECTIVES,
   declarations: TEST_DIRECTIVES,
   entryComponents: [
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 0fa02226f787..7bbb1793cbb2 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -31,29 +31,29 @@ import {extendObject} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {defer} from 'rxjs/observable/defer';
 import {Subject} from 'rxjs/Subject';
-import {MdDialogConfig} from './dialog-config';
-import {MdDialogContainer} from './dialog-container';
-import {MdDialogRef} from './dialog-ref';
+import {MatDialogConfig} from './dialog-config';
+import {MatDialogContainer} from './dialog-container';
+import {MatDialogRef} from './dialog-ref';
 
 
-export const MD_DIALOG_DATA = new InjectionToken<any>('MdDialogData');
+export const MAT_DIALOG_DATA = new InjectionToken<any>('MatDialogData');
 
 
 /** Injection token that determines the scroll handling while the dialog is open. */
-export const MD_DIALOG_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-dialog-scroll-strategy');
+export const MAT_DIALOG_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-dialog-scroll-strategy');
 
 /** @docs-private */
-export function MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => BlockScrollStrategy {
   return () => overlay.scrollStrategies.block();
 }
 
 /** @docs-private */
-export const MD_DIALOG_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_DIALOG_SCROLL_STRATEGY,
+export const MAT_DIALOG_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_DIALOG_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 
@@ -61,19 +61,19 @@ export const MD_DIALOG_SCROLL_STRATEGY_PROVIDER = {
  * Service to open Material Design modal dialogs.
  */
 @Injectable()
-export class MdDialog {
-  private _openDialogsAtThisLevel: MdDialogRef<any>[] = [];
+export class MatDialog {
+  private _openDialogsAtThisLevel: MatDialogRef<any>[] = [];
   private _afterAllClosedAtThisLevel = new Subject<void>();
-  private _afterOpenAtThisLevel = new Subject<MdDialogRef<any>>();
+  private _afterOpenAtThisLevel = new Subject<MatDialogRef<any>>();
   private _boundKeydown = this._handleKeydown.bind(this);
 
   /** Keeps track of the currently-open dialogs. */
-  get openDialogs(): MdDialogRef<any>[] {
+  get openDialogs(): MatDialogRef<any>[] {
     return this._parentDialog ? this._parentDialog.openDialogs : this._openDialogsAtThisLevel;
   }
 
   /** Stream that emits when a dialog has been opened. */
-  get afterOpen(): Subject<MdDialogRef<any>> {
+  get afterOpen(): Subject<MatDialogRef<any>> {
     return this._parentDialog ? this._parentDialog.afterOpen : this._afterOpenAtThisLevel;
   }
 
@@ -94,8 +94,8 @@ export class MdDialog {
       private _overlay: Overlay,
       private _injector: Injector,
       @Optional() location: Location,
-      @Inject(MD_DIALOG_SCROLL_STRATEGY) private _scrollStrategy,
-      @Optional() @SkipSelf() private _parentDialog: MdDialog) {
+      @Inject(MAT_DIALOG_SCROLL_STRATEGY) private _scrollStrategy,
+      @Optional() @SkipSelf() private _parentDialog: MatDialog) {
 
     // Close all of the dialogs when the user goes forwards/backwards in history or when the
     // location hash changes. Note that this usually doesn't include clicking on links (unless
@@ -113,7 +113,7 @@ export class MdDialog {
    * @returns Reference to the newly-opened dialog.
    */
   open<T>(componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
-          config?: MdDialogConfig): MdDialogRef<T> {
+          config?: MatDialogConfig): MatDialogRef<T> {
 
     const inProgressDialog = this.openDialogs.find(dialog => dialog._isAnimating());
 
@@ -163,7 +163,7 @@ export class MdDialog {
    * Finds an open dialog by its id.
    * @param id ID to use when looking up the dialog.
    */
-  getDialogById(id: string): MdDialogRef<any> | undefined {
+  getDialogById(id: string): MatDialogRef<any> | undefined {
     return this.openDialogs.find(dialog => dialog.id === id);
   }
 
@@ -172,7 +172,7 @@ export class MdDialog {
    * @param config The dialog configuration.
    * @returns A promise resolving to the OverlayRef for the created overlay.
    */
-  private _createOverlay(config: MdDialogConfig): OverlayRef {
+  private _createOverlay(config: MatDialogConfig): OverlayRef {
     const overlayState = this._getOverlayState(config);
     return this._overlay.create(overlayState);
   }
@@ -182,7 +182,7 @@ export class MdDialog {
    * @param dialogConfig The dialog configuration.
    * @returns The overlay configuration.
    */
-  private _getOverlayState(dialogConfig: MdDialogConfig): OverlayConfig {
+  private _getOverlayState(dialogConfig: MatDialogConfig): OverlayConfig {
     const state = new OverlayConfig({
       positionStrategy: this._overlay.position().global(),
       scrollStrategy: this._scrollStrategy(),
@@ -199,37 +199,37 @@ export class MdDialog {
   }
 
   /**
-   * Attaches an MdDialogContainer to a dialog's already-created overlay.
+   * Attaches an MatDialogContainer to a dialog's already-created overlay.
    * @param overlay Reference to the dialog's underlying overlay.
    * @param config The dialog configuration.
    * @returns A promise resolving to a ComponentRef for the attached container.
    */
-  private _attachDialogContainer(overlay: OverlayRef, config: MdDialogConfig): MdDialogContainer {
-    let containerPortal = new ComponentPortal(MdDialogContainer, config.viewContainerRef);
-    let containerRef: ComponentRef<MdDialogContainer> = overlay.attach(containerPortal);
+  private _attachDialogContainer(overlay: OverlayRef, config: MatDialogConfig): MatDialogContainer {
+    let containerPortal = new ComponentPortal(MatDialogContainer, config.viewContainerRef);
+    let containerRef: ComponentRef<MatDialogContainer> = overlay.attach(containerPortal);
     containerRef.instance._config = config;
 
     return containerRef.instance;
   }
 
   /**
-   * Attaches the user-provided component to the already-created MdDialogContainer.
+   * Attaches the user-provided component to the already-created MatDialogContainer.
    * @param componentOrTemplateRef The type of component being loaded into the dialog,
    *     or a TemplateRef to instantiate as the content.
-   * @param dialogContainer Reference to the wrapping MdDialogContainer.
+   * @param dialogContainer Reference to the wrapping MatDialogContainer.
    * @param overlayRef Reference to the overlay in which the dialog resides.
    * @param config The dialog configuration.
-   * @returns A promise resolving to the MdDialogRef that should be returned to the user.
+   * @returns A promise resolving to the MatDialogRef that should be returned to the user.
    */
   private _attachDialogContent<T>(
       componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
-      dialogContainer: MdDialogContainer,
+      dialogContainer: MatDialogContainer,
       overlayRef: OverlayRef,
-      config: MdDialogConfig): MdDialogRef<T> {
+      config: MatDialogConfig): MatDialogRef<T> {
 
     // Create a reference to the dialog we're creating in order to give the user a handle
     // to modify and close it.
-    const dialogRef = new MdDialogRef<T>(overlayRef, dialogContainer, config.id);
+    const dialogRef = new MatDialogRef<T>(overlayRef, dialogContainer, config.id);
 
     // When the dialog backdrop is clicked, we want to close it.
     if (config.hasBackdrop) {
@@ -267,16 +267,16 @@ export class MdDialog {
    * @returns The custom injector that can be used inside the dialog.
    */
   private _createInjector<T>(
-      config: MdDialogConfig,
-      dialogRef: MdDialogRef<T>,
-      dialogContainer: MdDialogContainer): PortalInjector {
+      config: MatDialogConfig,
+      dialogRef: MatDialogRef<T>,
+      dialogContainer: MatDialogContainer): PortalInjector {
 
     const userInjector = config && config.viewContainerRef && config.viewContainerRef.injector;
     const injectionTokens = new WeakMap();
 
-    injectionTokens.set(MdDialogRef, dialogRef);
-    injectionTokens.set(MdDialogContainer, dialogContainer);
-    injectionTokens.set(MD_DIALOG_DATA, config.data);
+    injectionTokens.set(MatDialogRef, dialogRef);
+    injectionTokens.set(MatDialogContainer, dialogContainer);
+    injectionTokens.set(MAT_DIALOG_DATA, config.data);
 
     return new PortalInjector(userInjector || this._injector, injectionTokens);
   }
@@ -285,7 +285,7 @@ export class MdDialog {
    * Removes a dialog from the array of open dialogs.
    * @param dialogRef Dialog to be removed.
    */
-  private _removeOpenDialog(dialogRef: MdDialogRef<any>) {
+  private _removeOpenDialog(dialogRef: MatDialogRef<any>) {
     const index = this.openDialogs.indexOf(dialogRef);
 
     if (index > -1) {
@@ -318,6 +318,6 @@ export class MdDialog {
  * @param config Config to be modified.
  * @returns The new configuration object.
  */
-function _applyConfigDefaults(config?: MdDialogConfig): MdDialogConfig {
-  return extendObject(new MdDialogConfig(), config);
+function _applyConfigDefaults(config?: MatDialogConfig): MatDialogConfig {
+  return extendObject(new MatDialogConfig(), config);
 }
diff --git a/src/lib/dialog/mat-exports.ts b/src/lib/dialog/mat-exports.ts
deleted file mode 100644
index ce9f2daf51c3..000000000000
--- a/src/lib/dialog/mat-exports.ts
+++ /dev/null
@@ -1,40 +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 {
-  MD_DIALOG_DATA,
-  MD_DIALOG_SCROLL_STRATEGY,
-  MD_DIALOG_SCROLL_STRATEGY_PROVIDER,
-  MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdDialog,
-} from './dialog';
-import {MdDialogConfig} from './dialog-config';
-import {MdDialogContainer} from './dialog-container';
-import {
-  MdDialogActions,
-  MdDialogClose,
-  MdDialogContent,
-  MdDialogTitle,
-} from './dialog-content-directives';
-import {MdDialogModule} from './dialog-module';
-import {MdDialogRef} from './dialog-ref';
-
-
-export {MD_DIALOG_DATA as MAT_DIALOG_DATA};
-export {MD_DIALOG_SCROLL_STRATEGY as MAT_DIALOG_SCROLL_STRATEGY};
-export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER};
-export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MdDialog as MatDialog};
-export {MdDialogActions as MatDialogActions};
-export {MdDialogClose as MatDialogClose};
-export {MdDialogConfig as MatDialogConfig};
-export {MdDialogContainer as MatDialogContainer};
-export {MdDialogContent as MatDialogContent};
-export {MdDialogModule as MatDialogModule};
-export {MdDialogRef as MatDialogRef};
-export {MdDialogTitle as MatDialogTitle};
diff --git a/src/lib/dialog/public_api.ts b/src/lib/dialog/public_api.ts
index 040eb5aff84f..39d91ce6af2e 100644
--- a/src/lib/dialog/public_api.ts
+++ b/src/lib/dialog/public_api.ts
@@ -12,4 +12,4 @@ export * from './dialog-container';
 export * from './dialog-content-directives';
 export * from './dialog-config';
 export * from './dialog-ref';
-export * from './mat-exports';
+
diff --git a/src/lib/expansion/accordion.spec.ts b/src/lib/expansion/accordion.spec.ts
index f29dd5e5ab5e..f1f1e6047788 100644
--- a/src/lib/expansion/accordion.spec.ts
+++ b/src/lib/expansion/accordion.spec.ts
@@ -2,7 +2,7 @@ import {async, TestBed} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {MdExpansionModule} from './index';
+import {MatExpansionModule} from './index';
 
 
 describe('CdkAccordion', () => {
@@ -10,7 +10,7 @@ describe('CdkAccordion', () => {
     TestBed.configureTestingModule({
       imports: [
         BrowserAnimationsModule,
-        MdExpansionModule
+        MatExpansionModule
       ],
       declarations: [
         SetOfItems
@@ -49,16 +49,16 @@ describe('CdkAccordion', () => {
 
 
 @Component({template: `
-  <md-accordion [multi]="multi">
-    <md-expansion-panel [expanded]="firstPanelExpanded">
-      <md-expansion-panel-header>Summary</md-expansion-panel-header>
+  <mat-accordion [multi]="multi">
+    <mat-expansion-panel [expanded]="firstPanelExpanded">
+      <mat-expansion-panel-header>Summary</mat-expansion-panel-header>
       <p>Content</p>
-    </md-expansion-panel>
-    <md-expansion-panel [expanded]="secondPanelExpanded">
-      <md-expansion-panel-header>Summary</md-expansion-panel-header>
+    </mat-expansion-panel>
+    <mat-expansion-panel [expanded]="secondPanelExpanded">
+      <mat-expansion-panel-header>Summary</mat-expansion-panel-header>
       <p>Content</p>
-    </md-expansion-panel>
-  </md-accordion>`})
+    </mat-expansion-panel>
+  </mat-accordion>`})
 class SetOfItems {
   multi: boolean = false;
   firstPanelExpanded: boolean = false;
diff --git a/src/lib/expansion/accordion.ts b/src/lib/expansion/accordion.ts
index 8439c30d83af..17c72e0a2831 100644
--- a/src/lib/expansion/accordion.ts
+++ b/src/lib/expansion/accordion.ts
@@ -9,8 +9,8 @@
 import {Directive, Input} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
-/** MdAccordion's display modes. */
-export type MdAccordionDisplayMode = 'default' | 'flat';
+/** MatAccordion's display modes. */
+export type MatAccordionDisplayMode = 'default' | 'flat';
 
 /** Unique ID counter */
 let nextId = 0;
@@ -43,16 +43,16 @@ export class CdkAccordion {
    *  flat - no spacing is placed around expanded panels, showing all panels at the same
    *     elevation.
    */
-  @Input() displayMode: MdAccordionDisplayMode = 'default';
+  @Input() displayMode: MatAccordionDisplayMode = 'default';
 }
 
 /**
  * Directive for a Material Design Accordion.
  */
 @Directive({
-  selector: 'mat-accordion, md-accordion',
+  selector: 'mat-accordion',
   host: {
     class: 'mat-accordion'
   }
 })
-export class MdAccordion extends CdkAccordion {}
+export class MatAccordion extends CdkAccordion {}
diff --git a/src/lib/expansion/expansion-module.ts b/src/lib/expansion/expansion-module.ts
index 80119c2c93cf..156b774476ac 100644
--- a/src/lib/expansion/expansion-module.ts
+++ b/src/lib/expansion/expansion-module.ts
@@ -8,37 +8,37 @@
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {CompatibilityModule, UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
 import {A11yModule} from '@angular/cdk/a11y';
-import {CdkAccordion, MdAccordion} from './accordion';
-import {MdExpansionPanel, MdExpansionPanelActionRow} from './expansion-panel';
+import {CdkAccordion, MatAccordion} from './accordion';
+import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel';
 import {
-  MdExpansionPanelDescription,
-  MdExpansionPanelHeader,
-  MdExpansionPanelTitle,
+  MatExpansionPanelDescription,
+  MatExpansionPanelHeader,
+  MatExpansionPanelTitle,
 } from './expansion-panel-header';
 
 
 @NgModule({
-  imports: [CompatibilityModule, CommonModule, A11yModule],
+  imports: [CommonModule, A11yModule],
   exports: [
     CdkAccordion,
-    MdAccordion,
-    MdExpansionPanel,
-    MdExpansionPanelActionRow,
-    MdExpansionPanelHeader,
-    MdExpansionPanelTitle,
-    MdExpansionPanelDescription
+    MatAccordion,
+    MatExpansionPanel,
+    MatExpansionPanelActionRow,
+    MatExpansionPanelHeader,
+    MatExpansionPanelTitle,
+    MatExpansionPanelDescription
   ],
   declarations: [
     CdkAccordion,
-    MdAccordion,
-    MdExpansionPanel,
-    MdExpansionPanelActionRow,
-    MdExpansionPanelHeader,
-    MdExpansionPanelTitle,
-    MdExpansionPanelDescription
+    MatAccordion,
+    MatExpansionPanel,
+    MatExpansionPanelActionRow,
+    MatExpansionPanelHeader,
+    MatExpansionPanelTitle,
+    MatExpansionPanelDescription
   ],
   providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER]
 })
-export class MdExpansionModule {}
+export class MatExpansionModule {}
diff --git a/src/lib/expansion/expansion-panel-header.html b/src/lib/expansion/expansion-panel-header.html
index 20373a9cb3ef..41c329965859 100644
--- a/src/lib/expansion/expansion-panel-header.html
+++ b/src/lib/expansion/expansion-panel-header.html
@@ -1,6 +1,6 @@
 <span class="mat-content">
-  <ng-content select="md-panel-title, mat-panel-title"></ng-content>
-  <ng-content select="md-panel-description, mat-panel-description"></ng-content>
+  <ng-content select="mat-panel-title"></ng-content>
+  <ng-content select="mat-panel-description"></ng-content>
   <ng-content></ng-content>
 </span>
 <span [@indicatorRotate]="_getExpandedState()" *ngIf="_showToggle()"
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 3b0799fef527..2da0a225a61e 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -24,19 +24,19 @@ import {
 } from '@angular/core';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
-import {EXPANSION_PANEL_ANIMATION_TIMING, MdExpansionPanel} from './expansion-panel';
+import {EXPANSION_PANEL_ANIMATION_TIMING, MatExpansionPanel} from './expansion-panel';
 
 
 /**
- * <md-expansion-panel-header> component.
+ * <mat-expansion-panel-header> component.
  *
- * This component corresponds to the header element of an <md-expansion-panel>.
+ * This component corresponds to the header element of an <mat-expansion-panel>.
  *
  * Please refer to README.md for examples on how to use it.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-expansion-panel-header, mat-expansion-panel-header',
+  selector: 'mat-expansion-panel-header',
   styleUrls: ['./expansion-panel-header.css'],
   templateUrl: './expansion-panel-header.html',
   encapsulation: ViewEncapsulation.None,
@@ -81,12 +81,12 @@ import {EXPANSION_PANEL_ANIMATION_TIMING, MdExpansionPanel} from './expansion-pa
     ]),
   ],
 })
-export class MdExpansionPanelHeader implements OnDestroy {
+export class MatExpansionPanelHeader implements OnDestroy {
   private _parentChangeSubscription = Subscription.EMPTY;
 
   constructor(
     renderer: Renderer2,
-    @Host() public panel: MdExpansionPanel,
+    @Host() public panel: MatExpansionPanel,
     private _element: ElementRef,
     private _focusMonitor: FocusMonitor,
     private _changeDetectorRef: ChangeDetectorRef) {
@@ -157,27 +157,27 @@ export class MdExpansionPanelHeader implements OnDestroy {
 }
 
 /**
- * <md-panel-description> directive.
+ * <mat-panel-description> directive.
  *
- * This direction is to be used inside of the MdExpansionPanelHeader component.
+ * This direction is to be used inside of the MatExpansionPanelHeader component.
  */
 @Directive({
-  selector: 'md-panel-description, mat-panel-description',
+  selector: 'mat-panel-description',
   host : {
     class: 'mat-expansion-panel-header-description'
   }
 })
-export class MdExpansionPanelDescription {}
+export class MatExpansionPanelDescription {}
 
 /**
- * <md-panel-title> directive.
+ * <mat-panel-title> directive.
  *
- * This direction is to be used inside of the MdExpansionPanelHeader component.
+ * This direction is to be used inside of the MatExpansionPanelHeader component.
  */
 @Directive({
-  selector: 'md-panel-title, mat-panel-title',
+  selector: 'mat-panel-title',
   host : {
     class: 'mat-expansion-panel-header-title'
   }
 })
-export class MdExpansionPanelTitle {}
+export class MatExpansionPanelTitle {}
diff --git a/src/lib/expansion/expansion-panel.html b/src/lib/expansion/expansion-panel.html
index 751e5176a0ab..93e8f6f8e47e 100644
--- a/src/lib/expansion/expansion-panel.html
+++ b/src/lib/expansion/expansion-panel.html
@@ -1,8 +1,8 @@
-<ng-content select="mat-expansion-panel-header, md-expansion-panel-header"></ng-content>
+<ng-content select="mat-expansion-panel-header"></ng-content>
 <div [class.mat-expanded]="expanded" class="mat-expansion-panel-content"
      [@bodyExpansion]="_getExpandedState()" [id]="id">
   <div class="mat-expansion-panel-body">
     <ng-content></ng-content>
   </div>
-  <ng-content select="mat-action-row, md-action-row"></ng-content>
+  <ng-content select="mat-action-row"></ng-content>
 </div>
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 5ed09e2fcf79..cf4a209f4c9d 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -23,29 +23,29 @@ import {
 } from '@angular/core';
 import {CanDisable, mixinDisabled, UniqueSelectionDispatcher} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
-import {MdAccordion} from './accordion';
+import {MatAccordion} from './accordion';
 import {AccordionItem} from './accordion-item';
 
 
-// Boilerplate for applying mixins to MdExpansionPanel.
+// Boilerplate for applying mixins to MatExpansionPanel.
 /** @docs-private */
-export class MdExpansionPanelBase extends AccordionItem {
-  constructor(accordion: MdAccordion,
+export class MatExpansionPanelBase extends AccordionItem {
+  constructor(accordion: MatAccordion,
               _changeDetectorRef: ChangeDetectorRef,
               _uniqueSelectionDispatcher: UniqueSelectionDispatcher) {
     super(accordion, _changeDetectorRef, _uniqueSelectionDispatcher);
   }
 }
-export const _MdExpansionPanelMixinBase = mixinDisabled(MdExpansionPanelBase);
+export const _MatExpansionPanelMixinBase = mixinDisabled(MatExpansionPanelBase);
 
-/** MdExpansionPanel's states. */
-export type MdExpansionPanelState = 'expanded' | 'collapsed';
+/** MatExpansionPanel's states. */
+export type MatExpansionPanelState = 'expanded' | 'collapsed';
 
 /** Time and timing curve for expansion panel animations. */
 export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,1)';
 
 /**
- * <md-expansion-panel> component.
+ * <mat-expansion-panel> component.
  *
  * This component can be used as a single element to show expandable content, or as one of
  * multiple children of an element with the CdkAccordion directive attached.
@@ -55,7 +55,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
 @Component({
   moduleId: module.id,
   styleUrls: ['./expansion-panel.css'],
-  selector: 'md-expansion-panel, mat-expansion-panel',
+  selector: 'mat-expansion-panel',
   templateUrl: './expansion-panel.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
@@ -67,7 +67,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
     '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
   },
   providers: [
-    {provide: AccordionItem, useExisting: forwardRef(() => MdExpansionPanel)}
+    {provide: AccordionItem, useExisting: forwardRef(() => MatExpansionPanel)}
   ],
   animations: [
     trigger('bodyExpansion', [
@@ -77,7 +77,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
     ]),
   ],
 })
-export class MdExpansionPanel extends _MdExpansionPanelMixinBase
+export class MatExpansionPanel extends _MatExpansionPanelMixinBase
     implements CanDisable, OnChanges, OnDestroy {
   /** Whether the toggle indicator should be hidden. */
   @Input() hideToggle: boolean = false;
@@ -85,7 +85,7 @@ export class MdExpansionPanel extends _MdExpansionPanelMixinBase
   /** Stream that emits for changes in `@Input` properties. */
   _inputChanges = new Subject<SimpleChanges>();
 
-  constructor(@Optional() @Host() accordion: MdAccordion,
+  constructor(@Optional() @Host() accordion: MatAccordion,
               _changeDetectorRef: ChangeDetectorRef,
               _uniqueSelectionDispatcher: UniqueSelectionDispatcher) {
     super(accordion, _changeDetectorRef, _uniqueSelectionDispatcher);
@@ -109,7 +109,7 @@ export class MdExpansionPanel extends _MdExpansionPanelMixinBase
   }
 
   /** Gets the expanded state string. */
-  _getExpandedState(): MdExpansionPanelState {
+  _getExpandedState(): MatExpansionPanelState {
     return this.expanded ? 'expanded' : 'collapsed';
   }
 
@@ -123,9 +123,9 @@ export class MdExpansionPanel extends _MdExpansionPanelMixinBase
 }
 
 @Directive({
-  selector: 'mat-action-row, md-action-row',
+  selector: 'mat-action-row',
   host: {
     class: 'mat-action-row'
   }
 })
-export class MdExpansionPanelActionRow {}
+export class MatExpansionPanelActionRow {}
diff --git a/src/lib/expansion/expansion.md b/src/lib/expansion/expansion.md
index 14ad08aaacee..e52b1f069d2d 100644
--- a/src/lib/expansion/expansion.md
+++ b/src/lib/expansion/expansion.md
@@ -1,4 +1,4 @@
-`<md-expansion-panel>` provides an expandable details-summary view.
+`<mat-expansion-panel>` provides an expandable details-summary view.
 
 <!-- example(expansion-overview) -->
 
@@ -8,9 +8,9 @@ Each expansion-panel must include a header and may optionally include an action
 
 #### Header
 
-The `<md-expansion-panel-header>` shows a summary of the panel content and acts
+The `<mat-expansion-panel-header>` shows a summary of the panel content and acts
 as the control for expanding and collapsing. This header may optionally contain an
-`<md-panel-title>` and an `<md-panel-description>`, which format the content of the
+`<mat-panel-title>` and an `<mat-panel-description>`, which format the content of the
 header to align with Material Design specifications.
 
 By default, the expansion-panel header includes a toggle icon at the end of the
@@ -18,19 +18,19 @@ header to indicate the expansion state. This icon can be hidden via the
 `hideToggle` property.
 
 ```html
-<md-expansion-panel>
-  <md-expansion-panel-header>
-    <md-panel-title>
+<mat-expansion-panel>
+  <mat-expansion-panel-header>
+    <mat-panel-title>
       This is the expansion title
-    </md-panel-title>
-    <md-panel-description>
+    </mat-panel-title>
+    <mat-panel-description>
       This is a summary of the content
-    </md-panel-description>
-  </md-expansion-panel-header>
+    </mat-panel-description>
+  </mat-expansion-panel-header>
 
   <p>This is the primary content of the panel.</p>
 
-</md-expansion-panel>
+</mat-expansion-panel>
 ```
 
 #### Action bar
@@ -39,17 +39,17 @@ Actions may optionally be included at the bottom of the panel, visible only when
 is in its expanded state.
 
 ```html
-<md-expansion-panel>
-  <md-expansion-panel-header>
+<mat-expansion-panel>
+  <mat-expansion-panel-header>
     This is the expansion title
-  </md-expansion-panel-header>
+  </mat-expansion-panel-header>
 
   <p>This is the primary content of the panel.</p>
 
-  <md-action-row>
-    <button md-button>Click me</button>
-  </md-action-row>
-</md-expansion-panel>
+  <mat-action-row>
+    <button mat-button>Click me</button>
+  </mat-action-row>
+</mat-expansion-panel>
 ```
 
 #### Disabling a panel
@@ -58,14 +58,14 @@ Expansion panels can be disabled using the `disabled` attribute. A disabled expa
 be toggled by the user, but can still be manipulated using programmatically.
 
 ```html
-<md-expansion-panel [disabled]="isDisabled">
-  <md-expansion-panel-header>
+<mat-expansion-panel [disabled]="isDisabled">
+  <mat-expansion-panel-header>
     This is the expansion title
-  </md-expansion-panel-header>
-  <md-panel-description>
+  </mat-expansion-panel-header>
+  <mat-panel-description>
     This is a summary of the content
-  </md-panel-description>
-</md-expansion-panel>
+  </mat-panel-description>
+</mat-expansion-panel>
 ```
 
 
@@ -76,27 +76,27 @@ expansions state to be set independently of each other. When `multi="false"` (de
 panel can be expanded at a given time:
 
 ```html
-<md-accordion>
+<mat-accordion>
 
-  <md-expansion-panel>
-    <md-expansion-panel-header>
+  <mat-expansion-panel>
+    <mat-expansion-panel-header>
       This is the expansion 1 title
-    </md-expansion-panel-header>
+    </mat-expansion-panel-header>
 
     This the expansion 1 content
 
-  </md-expansion-panel>
+  </mat-expansion-panel>
 
-  <md-expansion-panel>
-    <md-expansion-panel-header>
+  <mat-expansion-panel>
+    <mat-expansion-panel-header>
       This is the expansion 2 title
-    </md-expansion-panel-header>
+    </mat-expansion-panel-header>
 
     This the expansion 2 content
 
-  </md-expansion-panel>
+  </mat-expansion-panel>
 
-</md-accordion>
+</mat-accordion>
 ```
 
 ### Accessibility
diff --git a/src/lib/expansion/expansion.spec.ts b/src/lib/expansion/expansion.spec.ts
index 5c0033a326e4..53a0cae367c4 100644
--- a/src/lib/expansion/expansion.spec.ts
+++ b/src/lib/expansion/expansion.spec.ts
@@ -2,15 +2,15 @@ import {async, TestBed, fakeAsync, tick, ComponentFixture} from '@angular/core/t
 import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdExpansionModule, MdExpansionPanel} from './index';
+import {MatExpansionModule, MatExpansionPanel} from './index';
 
 
-describe('MdExpansionPanel', () => {
+describe('MatExpansionPanel', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
         NoopAnimationsModule,
-        MdExpansionModule
+        MatExpansionModule
       ],
       declarations: [
         PanelWithContent,
@@ -82,7 +82,7 @@ describe('MdExpansionPanel', () => {
     let fixture = TestBed.createComponent(PanelWithCustomMargin);
     fixture.detectChanges();
 
-    let panel = fixture.debugElement.query(By.css('md-expansion-panel'));
+    let panel = fixture.debugElement.query(By.css('mat-expansion-panel'));
     let styles = getComputedStyle(panel.nativeElement);
 
     expect(panel.componentInstance._hasSpacing()).toBe(false);
@@ -146,8 +146,8 @@ describe('MdExpansionPanel', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(PanelWithContent);
       fixture.detectChanges();
-      panel = fixture.debugElement.query(By.css('md-expansion-panel')).nativeElement;
-      header = fixture.debugElement.query(By.css('md-expansion-panel-header')).nativeElement;
+      panel = fixture.debugElement.query(By.css('mat-expansion-panel')).nativeElement;
+      header = fixture.debugElement.query(By.css('mat-expansion-panel-header')).nativeElement;
     });
 
     it('should toggle the aria-disabled attribute on the header', () => {
@@ -202,15 +202,15 @@ describe('MdExpansionPanel', () => {
 
 @Component({
   template: `
-  <md-expansion-panel [expanded]="expanded"
+  <mat-expansion-panel [expanded]="expanded"
                       [hideToggle]="hideToggle"
                       [disabled]="disabled"
                       (opened)="openCallback()"
                       (closed)="closeCallback()">
-    <md-expansion-panel-header>Panel Title</md-expansion-panel-header>
+    <mat-expansion-panel-header>Panel Title</mat-expansion-panel-header>
     <p>Some content</p>
     <button>I am a button</button>
-  </md-expansion-panel>`
+  </mat-expansion-panel>`
 })
 class PanelWithContent {
   expanded = false;
@@ -218,21 +218,21 @@ class PanelWithContent {
   disabled = false;
   openCallback = jasmine.createSpy('openCallback');
   closeCallback = jasmine.createSpy('closeCallback');
-  @ViewChild(MdExpansionPanel) panel: MdExpansionPanel;
+  @ViewChild(MatExpansionPanel) panel: MatExpansionPanel;
 }
 
 
 @Component({
   styles: [
-    `md-expansion-panel {
+    `mat-expansion-panel {
       margin: 13px 37px;
     }`
   ],
   template: `
-  <md-expansion-panel [expanded]="expanded">
+  <mat-expansion-panel [expanded]="expanded">
     Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolores officia, aliquam dicta
     corrupti maxime voluptate accusamus impedit atque incidunt pariatur.
-  </md-expansion-panel>`
+  </mat-expansion-panel>`
 })
 class PanelWithCustomMargin {
   expanded: boolean = false;
diff --git a/src/lib/expansion/mat-exports.ts b/src/lib/expansion/mat-exports.ts
deleted file mode 100644
index be1bed20796f..000000000000
--- a/src/lib/expansion/mat-exports.ts
+++ /dev/null
@@ -1,31 +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 {MdAccordion, MdAccordionDisplayMode} from './accordion';
-import {MdExpansionModule} from './expansion-module';
-import {
-  MdExpansionPanel,
-  MdExpansionPanelActionRow,
-  MdExpansionPanelState,
-} from './expansion-panel';
-import {
-  MdExpansionPanelDescription,
-  MdExpansionPanelHeader,
-  MdExpansionPanelTitle,
-} from './expansion-panel-header';
-
-
-export {MdAccordion as MatAccordion};
-export {MdAccordionDisplayMode as MatAccordionDisplayMode};
-export {MdExpansionModule as MatExpansionModule};
-export {MdExpansionPanel as MatExpansionPanel};
-export {MdExpansionPanelActionRow as MatExpansionPanelActionRow};
-export {MdExpansionPanelDescription as MatExpansionPanelDescription};
-export {MdExpansionPanelHeader as MatExpansionPanelHeader};
-export {MdExpansionPanelState as MatExpansionPanelState};
-export {MdExpansionPanelTitle as MatExpansionPanelTitle};
diff --git a/src/lib/expansion/public_api.ts b/src/lib/expansion/public_api.ts
index d2e7b1224299..919561d57005 100644
--- a/src/lib/expansion/public_api.ts
+++ b/src/lib/expansion/public_api.ts
@@ -9,19 +9,19 @@
 export * from './expansion-module';
 export {
   CdkAccordion,
-  MdAccordion,
-  MdAccordionDisplayMode
+  MatAccordion,
+  MatAccordionDisplayMode
 } from './accordion';
 export {AccordionItem} from './accordion-item';
 export {
-  MdExpansionPanel,
-  MdExpansionPanelState,
-  MdExpansionPanelActionRow
+  MatExpansionPanel,
+  MatExpansionPanelState,
+  MatExpansionPanelActionRow
 } from './expansion-panel';
 export {
-  MdExpansionPanelHeader,
-  MdExpansionPanelDescription,
-  MdExpansionPanelTitle
+  MatExpansionPanelHeader,
+  MatExpansionPanelDescription,
+  MatExpansionPanelTitle
 } from './expansion-panel-header';
 
-export * from './mat-exports';
+
diff --git a/src/lib/form-field/error.ts b/src/lib/form-field/error.ts
index 40d5bb1762ec..21c659d5dd55 100644
--- a/src/lib/form-field/error.ts
+++ b/src/lib/form-field/error.ts
@@ -14,13 +14,13 @@ let nextUniqueId = 0;
 
 /** Single error message to be shown underneath the form field. */
 @Directive({
-  selector: 'md-error, mat-error',
+  selector: 'mat-error',
   host: {
     'class': 'mat-error',
     'role': 'alert',
     '[attr.id]': 'id',
   }
 })
-export class MdError {
+export class MatError {
   @Input() id: string = `mat-error-${nextUniqueId++}`;
 }
diff --git a/src/lib/form-field/form-field-control.ts b/src/lib/form-field/form-field-control.ts
index 8bbf3b6cf12c..f2f006421a44 100644
--- a/src/lib/form-field/form-field-control.ts
+++ b/src/lib/form-field/form-field-control.ts
@@ -10,13 +10,13 @@ import {Observable} from 'rxjs/Observable';
 import {NgControl} from '@angular/forms';
 
 
-/** An interface which allows a control to work inside of a `MdFormField`. */
-export abstract class MdFormFieldControl<T> {
+/** An interface which allows a control to work inside of a `MatFormField`. */
+export abstract class MatFormFieldControl<T> {
   /** The value of the control. */
   value: T;
 
   /**
-   * Stream that emits whenever the state of the control changes such that the parent `MdFormField`
+   * Stream that emits whenever the state of the control changes such that the parent `MatFormField`
    * needs to run change detection.
    */
   readonly stateChanges: Observable<void>;
@@ -36,7 +36,7 @@ export abstract class MdFormFieldControl<T> {
   /** Whether the control is empty. */
   readonly empty: boolean;
 
-  /** Whether the `MdFormField` label should try to float. */
+  /** Whether the `MatFormField` label should try to float. */
   readonly shouldPlaceholderFloat: boolean;
 
   /** Whether the control is required. */
@@ -49,7 +49,7 @@ export abstract class MdFormFieldControl<T> {
   readonly errorState: boolean;
 
   /**
-   * An optional name for the control type that can be used to distinguish `md-form-field` elements
+   * An optional name for the control type that can be used to distinguish `mat-form-field` elements
    * based on their control type. The form field will add a class,
    * `mat-form-field-type-{{controlType}}` to its root element.
    */
diff --git a/src/lib/form-field/form-field-errors.ts b/src/lib/form-field/form-field-errors.ts
index 008393915e4c..21869d7fc271 100644
--- a/src/lib/form-field/form-field-errors.ts
+++ b/src/lib/form-field/form-field-errors.ts
@@ -7,17 +7,17 @@
  */
 
 /** @docs-private */
-export function getMdFormFieldPlaceholderConflictError(): Error {
+export function getMatFormFieldPlaceholderConflictError(): Error {
   return Error('Placeholder attribute and child element were both specified.');
 }
 
 /** @docs-private */
-export function getMdFormFieldDuplicatedHintError(align: string): Error {
+export function getMatFormFieldDuplicatedHintError(align: string): Error {
   return Error(`A hint was already declared for 'align="${align}"'.`);
 }
 
 /** @docs-private */
-export function getMdFormFieldMissingControlError(): Error {
-  return Error('md-form-field must contain a MdFormFieldControl. ' +
-      'Did you forget to add mdInput to the native input or textarea element?');
+export function getMatFormFieldMissingControlError(): Error {
+  return Error('mat-form-field must contain a MatFormFieldControl. ' +
+      'Did you forget to add matInput to the native input or textarea element?');
 }
diff --git a/src/lib/form-field/form-field-module.ts b/src/lib/form-field/form-field-module.ts
index 46f51cd12a8e..eecad6ddb328 100644
--- a/src/lib/form-field/form-field-module.ts
+++ b/src/lib/form-field/form-field-module.ts
@@ -9,34 +9,34 @@
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {PlatformModule} from '@angular/cdk/platform';
-import {MdError} from './error';
-import {MdFormField} from './form-field';
-import {MdHint} from './hint';
-import {MdPlaceholder} from './placeholder';
-import {MdPrefix} from './prefix';
-import {MdSuffix} from './suffix';
+import {MatError} from './error';
+import {MatFormField} from './form-field';
+import {MatHint} from './hint';
+import {MatPlaceholder} from './placeholder';
+import {MatPrefix} from './prefix';
+import {MatSuffix} from './suffix';
 
 
 @NgModule({
   declarations: [
-    MdError,
-    MdHint,
-    MdFormField,
-    MdPlaceholder,
-    MdPrefix,
-    MdSuffix,
+    MatError,
+    MatHint,
+    MatFormField,
+    MatPlaceholder,
+    MatPrefix,
+    MatSuffix,
   ],
   imports: [
     CommonModule,
     PlatformModule,
   ],
   exports: [
-    MdError,
-    MdHint,
-    MdFormField,
-    MdPlaceholder,
-    MdPrefix,
-    MdSuffix,
+    MatError,
+    MatHint,
+    MatFormField,
+    MatPlaceholder,
+    MatPrefix,
+    MatSuffix,
   ],
 })
-export class MdFormFieldModule {}
+export class MatFormFieldModule {}
diff --git a/src/lib/form-field/form-field.html b/src/lib/form-field/form-field.html
index 4bf46aec7a8a..3ab526ce0e7e 100644
--- a/src/lib/form-field/form-field.html
+++ b/src/lib/form-field/form-field.html
@@ -2,7 +2,7 @@
   <div class="mat-input-flex mat-form-field-flex" #connectionContainer
        (click)="_control.onContainerClick && _control.onContainerClick($event)">
     <div class="mat-input-prefix mat-form-field-prefix" *ngIf="_prefixChildren.length">
-      <ng-content select="[mdPrefix], [matPrefix]"></ng-content>
+      <ng-content select="[matPrefix]"></ng-content>
     </div>
 
     <div class="mat-input-infix mat-form-field-infix">
@@ -20,7 +20,7 @@
                [class.mat-warn]="color == 'warn'"
                #placeholder
                *ngIf="_hasPlaceholder()">
-          <ng-content select="md-placeholder, mat-placeholder"></ng-content>
+          <ng-content select="mat-placeholder"></ng-content>
           {{_control.placeholder}}
           <span
             class="mat-placeholder-required mat-form-field-required-marker"
@@ -31,7 +31,7 @@
     </div>
 
     <div class="mat-input-suffix mat-form-field-suffix" *ngIf="_suffixChildren.length">
-      <ng-content select="[mdSuffix], [matSuffix]"></ng-content>
+      <ng-content select="[matSuffix]"></ng-content>
     </div>
   </div>
 
@@ -45,16 +45,16 @@
   <div class="mat-input-subscript-wrapper mat-form-field-subscript-wrapper"
        [ngSwitch]="_getDisplayedMessages()">
     <div *ngSwitchCase="'error'" [@transitionMessages]="_subscriptAnimationState">
-      <ng-content select="md-error, mat-error"></ng-content>
+      <ng-content select="mat-error"></ng-content>
     </div>
 
     <div class="mat-input-hint-wrapper mat-form-field-hint-wrapper" *ngSwitchCase="'hint'"
       [@transitionMessages]="_subscriptAnimationState">
       <!-- TODO(mmalerba): use an actual <mat-hint> once all selectors are switched to mat-* -->
       <div *ngIf="hintLabel" [id]="_hintLabelId" class="mat-hint">{{hintLabel}}</div>
-      <ng-content select="md-hint:not([align='end']), mat-hint:not([align='end'])"></ng-content>
+      <ng-content select="mat-hint:not([align='end'])"></ng-content>
       <div class="mat-input-hint-spacer mat-form-field-hint-spacer"></div>
-      <ng-content select="md-hint[align='end'], mat-hint[align='end']"></ng-content>
+      <ng-content select="mat-hint[align='end']"></ng-content>
     </div>
   </div>
 </div>
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 33de45151f6e..a3e5bbf295d2 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -118,7 +118,7 @@ $mat-form-field-underline-height: 1px !default;
 
 // Pseudo-class for Chrome and Safari auto-fill to move the placeholder to the floating position.
 // This is necessary because these browsers do not actually fire any events when a form auto-fill is
-// occurring. Once the autofill is committed, a change event happen and the regular md-form-field
+// occurring. Once the autofill is committed, a change event happen and the regular mat-form-field
 // classes take over to fulfill this behaviour.
 .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
     .mat-form-field-placeholder {
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 8d320f2f7fbc..75c2991d6b5f 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -28,21 +28,21 @@ import {
 } from '@angular/core';
 import {
   FloatPlaceholderType,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  MAT_PLACEHOLDER_GLOBAL_OPTIONS,
   PlaceholderOptions,
 } from '@angular/material/core';
 import {fromEvent} from 'rxjs/observable/fromEvent';
-import {MdError} from './error';
-import {MdFormFieldControl} from './form-field-control';
+import {MatError} from './error';
+import {MatFormFieldControl} from './form-field-control';
 import {
-  getMdFormFieldDuplicatedHintError,
-  getMdFormFieldMissingControlError,
-  getMdFormFieldPlaceholderConflictError,
+  getMatFormFieldDuplicatedHintError,
+  getMatFormFieldMissingControlError,
+  getMatFormFieldPlaceholderConflictError,
 } from './form-field-errors';
-import {MdHint} from './hint';
-import {MdPlaceholder} from './placeholder';
-import {MdPrefix} from './prefix';
-import {MdSuffix} from './suffix';
+import {MatHint} from './hint';
+import {MatPlaceholder} from './placeholder';
+import {MatPrefix} from './prefix';
+import {MatSuffix} from './suffix';
 
 
 let nextUniqueId = 0;
@@ -52,11 +52,11 @@ let nextUniqueId = 0;
 @Component({
   moduleId: module.id,
   // TODO(mmalerba): the input-container selectors and classes are deprecated and will be removed.
-  selector: 'md-input-container, mat-input-container, md-form-field, mat-form-field',
+  selector: 'mat-input-container, mat-form-field',
   templateUrl: 'form-field.html',
-  // MdInput is a directive and can't have styles, so we need to include its styles here.
-  // The MdInput styles are fairly minimal so it shouldn't be a big deal for people who aren't using
-  // MdInput.
+  // MatInput is a directive and can't have styles, so we need to include its styles here.
+  // The MatInput styles are fairly minimal so it shouldn't be a big deal for people who
+  // aren't using MatInput.
   styleUrls: ['form-field.css', '../input/input.css'],
   animations: [
     // TODO(mmalerba): Use angular animations for placeholder animation as well.
@@ -91,7 +91,7 @@ let nextUniqueId = 0;
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 
-export class MdFormField implements AfterViewInit, AfterContentInit, AfterContentChecked {
+export class MatFormField implements AfterViewInit, AfterContentInit, AfterContentChecked {
   private _placeholderOptions: PlaceholderOptions;
 
   /** Color of the form field underline, based on the theme. */
@@ -121,7 +121,7 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
   /** Whether the placeholder can float or not. */
   get _canPlaceholderFloat() { return this._floatPlaceholder !== 'never'; }
 
-  /** State of the md-hint and md-error animations. */
+  /** State of the mat-hint and mat-error animations. */
   _subscriptAnimationState: string = '';
 
   /** Text for the form field hint. */
@@ -134,7 +134,7 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
   private _hintLabel = '';
 
   // Unique id for the hint label.
-  _hintLabelId: string = `md-hint-${nextUniqueId++}`;
+  _hintLabelId: string = `mat-hint-${nextUniqueId++}`;
 
   /** Whether the placeholder should always float, never float or float as the user types. */
   @Input()
@@ -151,18 +151,18 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
   @ViewChild('underline') underlineRef: ElementRef;
   @ViewChild('connectionContainer') _connectionContainerRef: ElementRef;
   @ViewChild('placeholder') private _placeholder: ElementRef;
-  @ContentChild(MdFormFieldControl) _control: MdFormFieldControl<any>;
-  @ContentChild(MdPlaceholder) _placeholderChild: MdPlaceholder;
-  @ContentChildren(MdError) _errorChildren: QueryList<MdError>;
-  @ContentChildren(MdHint) _hintChildren: QueryList<MdHint>;
-  @ContentChildren(MdPrefix) _prefixChildren: QueryList<MdPrefix>;
-  @ContentChildren(MdSuffix) _suffixChildren: QueryList<MdSuffix>;
+  @ContentChild(MatFormFieldControl) _control: MatFormFieldControl<any>;
+  @ContentChild(MatPlaceholder) _placeholderChild: MatPlaceholder;
+  @ContentChildren(MatError) _errorChildren: QueryList<MatError>;
+  @ContentChildren(MatHint) _hintChildren: QueryList<MatHint>;
+  @ContentChildren(MatPrefix) _prefixChildren: QueryList<MatPrefix>;
+  @ContentChildren(MatSuffix) _suffixChildren: QueryList<MatSuffix>;
 
   constructor(
       public _elementRef: ElementRef,
       private _renderer: Renderer2,
       private _changeDetectorRef: ChangeDetectorRef,
-      @Optional() @Inject(MD_PLACEHOLDER_GLOBAL_OPTIONS) placeholderOptions: PlaceholderOptions) {
+      @Optional() @Inject(MAT_PLACEHOLDER_GLOBAL_OPTIONS) placeholderOptions: PlaceholderOptions) {
     this._placeholderOptions = placeholderOptions ? placeholderOptions : {};
     this.floatPlaceholder = this._placeholderOptions.float || 'auto';
   }
@@ -244,11 +244,11 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
 
   /**
    * Ensure that there is only one placeholder (either `placeholder` attribute on the child control
-   * or child element with the `md-placeholder` directive).
+   * or child element with the `mat-placeholder` directive).
    */
   private _validatePlaceholders() {
     if (this._control.placeholder && this._placeholderChild) {
-      throw getMdFormFieldPlaceholderConflictError();
+      throw getMatFormFieldPlaceholderConflictError();
     }
   }
 
@@ -259,22 +259,22 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
   }
 
   /**
-   * Ensure that there is a maximum of one of each `<md-hint>` alignment specified, with the
+   * Ensure that there is a maximum of one of each `<mat-hint>` alignment specified, with the
    * attribute being considered as `align="start"`.
    */
   private _validateHints() {
     if (this._hintChildren) {
-      let startHint: MdHint;
-      let endHint: MdHint;
-      this._hintChildren.forEach((hint: MdHint) => {
+      let startHint: MatHint;
+      let endHint: MatHint;
+      this._hintChildren.forEach((hint: MatHint) => {
         if (hint.align == 'start') {
           if (startHint || this.hintLabel) {
-            throw getMdFormFieldDuplicatedHintError('start');
+            throw getMatFormFieldDuplicatedHintError('start');
           }
           startHint = hint;
         } else if (hint.align == 'end') {
           if (endHint) {
-            throw getMdFormFieldDuplicatedHintError('end');
+            throw getMatFormFieldDuplicatedHintError('end');
           }
           endHint = hint;
         }
@@ -306,7 +306,7 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
           ids.push(endHint.id);
         }
       } else if (this._errorChildren) {
-        ids = this._errorChildren.map(mdError => mdError.id);
+        ids = this._errorChildren.map(error => error.id);
       }
 
       this._control.setDescribedByIds(ids);
@@ -316,7 +316,7 @@ export class MdFormField implements AfterViewInit, AfterContentInit, AfterConten
   /** Throws an error if the form field's control is missing. */
   protected _validateControlChild() {
     if (!this._control) {
-      throw getMdFormFieldMissingControlError();
+      throw getMatFormFieldMissingControlError();
     }
   }
 }
diff --git a/src/lib/form-field/hint.ts b/src/lib/form-field/hint.ts
index 3a5e21857aeb..8b0079d84f0e 100644
--- a/src/lib/form-field/hint.ts
+++ b/src/lib/form-field/hint.ts
@@ -14,7 +14,7 @@ let nextUniqueId = 0;
 
 /** Hint text to be shown underneath the form field control. */
 @Directive({
-  selector: 'md-hint, mat-hint',
+  selector: 'mat-hint',
   host: {
     'class': 'mat-hint',
     '[class.mat-right]': 'align == "end"',
@@ -23,7 +23,7 @@ let nextUniqueId = 0;
     '[attr.align]': 'null',
   }
 })
-export class MdHint {
+export class MatHint {
   /** Whether to align the hint label at the start or end of the line. */
   @Input() align: 'start' | 'end' = 'start';
 
diff --git a/src/lib/form-field/mat-exports.ts b/src/lib/form-field/mat-exports.ts
deleted file mode 100644
index 788c9b4452d2..000000000000
--- a/src/lib/form-field/mat-exports.ts
+++ /dev/null
@@ -1,28 +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 {
-  MdFormField,
-} from './form-field';
-import {MdError} from './error';
-import {MdHint} from './hint';
-import {MdFormFieldModule} from './form-field-module';
-import {MdPrefix} from './prefix';
-import {MdSuffix} from './suffix';
-import {MdPlaceholder} from './placeholder';
-import {MdFormFieldControl} from './form-field-control';
-
-
-export {MdFormFieldModule as MatFormFieldModule};
-export {MdError as MatError};
-export {MdFormField as MatFormField};
-export {MdFormFieldControl as MatFormFieldControl};
-export {MdHint as MatHint};
-export {MdPlaceholder as MatPlaceholder};
-export {MdPrefix as MatPrefix};
-export {MdSuffix as MatSuffix};
diff --git a/src/lib/form-field/placeholder.ts b/src/lib/form-field/placeholder.ts
index 260a4b8fef91..12473820043d 100644
--- a/src/lib/form-field/placeholder.ts
+++ b/src/lib/form-field/placeholder.ts
@@ -9,8 +9,8 @@
 import {Directive} from '@angular/core';
 
 
-/** The floating placeholder for an `MdFormField`. */
+/** The floating placeholder for an `MatFormField`. */
 @Directive({
-  selector: 'md-placeholder, mat-placeholder'
+  selector: 'mat-placeholder'
 })
-export class MdPlaceholder {}
+export class MatPlaceholder {}
diff --git a/src/lib/form-field/prefix.ts b/src/lib/form-field/prefix.ts
index 3ac184b14331..8bb192de1864 100644
--- a/src/lib/form-field/prefix.ts
+++ b/src/lib/form-field/prefix.ts
@@ -11,6 +11,6 @@ import {Directive} from '@angular/core';
 
 /** Prefix to be placed the the front of the form field. */
 @Directive({
-  selector: '[mdPrefix], [matPrefix]',
+  selector: '[matPrefix]',
 })
-export class MdPrefix {}
+export class MatPrefix {}
diff --git a/src/lib/form-field/public_api.ts b/src/lib/form-field/public_api.ts
index 4edf1173bbe0..0ef3a74f0654 100644
--- a/src/lib/form-field/public_api.ts
+++ b/src/lib/form-field/public_api.ts
@@ -15,4 +15,4 @@ export * from './hint';
 export * from './placeholder';
 export * from './prefix';
 export * from './suffix';
-export * from './mat-exports';
+
diff --git a/src/lib/form-field/suffix.ts b/src/lib/form-field/suffix.ts
index be70eec03959..8f707f93a996 100644
--- a/src/lib/form-field/suffix.ts
+++ b/src/lib/form-field/suffix.ts
@@ -11,6 +11,6 @@ import {Directive} from '@angular/core';
 
 /** Suffix to be placed at the end of the form field. */
 @Directive({
-  selector: '[mdSuffix], [matSuffix]',
+  selector: '[matSuffix]',
 })
-export class MdSuffix {}
+export class MatSuffix {}
diff --git a/src/lib/grid-list/grid-list-module.ts b/src/lib/grid-list/grid-list-module.ts
index d57f8b80b5b0..f8206cd014cb 100644
--- a/src/lib/grid-list/grid-list-module.ts
+++ b/src/lib/grid-list/grid-list-module.ts
@@ -7,33 +7,33 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdLineModule, MdCommonModule} from '@angular/material/core';
+import {MatLineModule, MatCommonModule} from '@angular/material/core';
 import {
-  MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
-  MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
+  MatGridTile, MatGridTileText, MatGridTileFooterCssMatStyler,
+  MatGridTileHeaderCssMatStyler, MatGridAvatarCssMatStyler
 } from './grid-tile';
-import {MdGridList} from './grid-list';
+import {MatGridList} from './grid-list';
 
 
 @NgModule({
-  imports: [MdLineModule, MdCommonModule],
+  imports: [MatLineModule, MatCommonModule],
   exports: [
-    MdGridList,
-    MdGridTile,
-    MdGridTileText,
-    MdLineModule,
-    MdCommonModule,
-    MdGridTileHeaderCssMatStyler,
-    MdGridTileFooterCssMatStyler,
-    MdGridAvatarCssMatStyler
+    MatGridList,
+    MatGridTile,
+    MatGridTileText,
+    MatLineModule,
+    MatCommonModule,
+    MatGridTileHeaderCssMatStyler,
+    MatGridTileFooterCssMatStyler,
+    MatGridAvatarCssMatStyler
   ],
   declarations: [
-    MdGridList,
-    MdGridTile,
-    MdGridTileText,
-    MdGridTileHeaderCssMatStyler,
-    MdGridTileFooterCssMatStyler,
-    MdGridAvatarCssMatStyler
+    MatGridList,
+    MatGridTile,
+    MatGridTileText,
+    MatGridTileHeaderCssMatStyler,
+    MatGridTileFooterCssMatStyler,
+    MatGridAvatarCssMatStyler
   ],
 })
-export class MdGridListModule {}
+export class MatGridListModule {}
diff --git a/src/lib/grid-list/grid-list.md b/src/lib/grid-list/grid-list.md
index 6cc3bde1ed73..0142c9d0a77e 100644
--- a/src/lib/grid-list/grid-list.md
+++ b/src/lib/grid-list/grid-list.md
@@ -1,11 +1,11 @@
-`md-grid-list` is a two-dimensional list view that arranges cells into grid-based layout. 
+`mat-grid-list` is a two-dimensional list view that arranges cells into grid-based layout. 
 See Material Design spec [here](https://www.google.com/design/spec/components/grid-lists.html).
 
 <!-- example(grid-list-overview) -->
 
 ### Setting the number of columns
 
-An `md-grid-list` must specify a `cols` attribute which sets the number of columns in the grid. The
+An `mat-grid-list` must specify a `cols` attribute which sets the number of columns in the grid. The
 number of rows will be automatically determined based on the number of columns and the number of
 items.
 
@@ -32,15 +32,15 @@ units are specified, `px` units are assumed. By default the gutter size is `1px`
 
 ### Adding tiles that span multiple rows or columns
 
-It is possible to set the rowspan and colspan of each `md-grid-tile` individually, using the
+It is possible to set the rowspan and colspan of each `mat-grid-tile` individually, using the
 `rowspan` and `colspan` properties. If not set, they both default to `1`. The `colspan` must not
-exceed the number of `cols` in the `md-grid-list`. There is no such restriction on the `rowspan`
+exceed the number of `cols` in the `mat-grid-list`. There is no such restriction on the `rowspan`
 however, more rows will simply be added for it the tile to fill.
 
 ### Tile headers and footers
 
-A header and footer can be added to an `md-grid-tile` using the `md-grid-tile-header` and
-`md-grid-tile-footer` elements respectively.
+A header and footer can be added to an `mat-grid-tile` using the `mat-grid-tile-header` and
+`mat-grid-tile-footer` elements respectively.
 
 ### Accessibility
 By default, the grid-list assumes that it will be used in a purely decorative fashion and thus sets
diff --git a/src/lib/grid-list/grid-list.spec.ts b/src/lib/grid-list/grid-list.spec.ts
index 048d430d8545..4ccf274839a8 100644
--- a/src/lib/grid-list/grid-list.spec.ts
+++ b/src/lib/grid-list/grid-list.spec.ts
@@ -1,14 +1,14 @@
 import {async, TestBed} from '@angular/core/testing';
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdGridList, MdGridListModule} from './index';
-import {MdGridTile, MdGridTileText} from './grid-tile';
+import {MatGridList, MatGridListModule} from './index';
+import {MatGridTile, MatGridTileText} from './grid-tile';
 
 
-describe('MdGridList', () => {
+describe('MatGridList', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdGridListModule],
+      imports: [MatGridListModule],
       declarations: [
         GridListWithoutCols,
         GridListWithInvalidRowHeightRatio,
@@ -55,7 +55,7 @@ describe('MdGridList', () => {
   it('should default to 1:1 row height if undefined ', () => {
     let fixture = TestBed.createComponent(GridListWithUnspecifiedRowHeight);
     fixture.detectChanges();
-    let tile = fixture.debugElement.query(By.directive(MdGridTile));
+    let tile = fixture.debugElement.query(By.directive(MatGridTile));
 
     // In ratio mode, heights are set using the padding-top property.
     expect(getStyle(tile, 'padding-top')).toBe('200px');
@@ -67,7 +67,7 @@ describe('MdGridList', () => {
     fixture.componentInstance.rowHeight = '4:1';
     fixture.detectChanges();
 
-    let tile = fixture.debugElement.query(By.directive(MdGridTile));
+    let tile = fixture.debugElement.query(By.directive(MatGridTile));
     expect(getStyle(tile, 'padding-top')).toBe('100px');
 
     fixture.componentInstance.rowHeight = '2:1';
@@ -81,7 +81,7 @@ describe('MdGridList', () => {
 
     fixture.componentInstance.totalHeight = '300px';
     fixture.detectChanges();
-    let tile = fixture.debugElement.query(By.directive(MdGridTile));
+    let tile = fixture.debugElement.query(By.directive(MatGridTile));
 
     // 149.5 * 2 = 299px + 1px gutter = 300px
     expect(getStyle(tile, 'height')).toBe('149.5px');
@@ -99,7 +99,7 @@ describe('MdGridList', () => {
     fixture.componentInstance.rowHeight = '100px';
     fixture.detectChanges();
 
-    let tile = fixture.debugElement.query(By.directive(MdGridTile));
+    let tile = fixture.debugElement.query(By.directive(MatGridTile));
     expect(getStyle(tile, 'height')).toBe('100px');
 
     fixture.componentInstance.rowHeight = '200px';
@@ -112,7 +112,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithUnitlessFixedRowHeight);
     fixture.detectChanges();
 
-    let tile = fixture.debugElement.query(By.directive(MdGridTile));
+    let tile = fixture.debugElement.query(By.directive(MatGridTile));
     expect(getStyle(tile, 'height')).toBe('100px');
   });
 
@@ -120,7 +120,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithUnspecifiedGutterSize);
     fixture.detectChanges();
 
-    let tiles = fixture.debugElement.queryAll(By.css('md-grid-tile'));
+    let tiles = fixture.debugElement.queryAll(By.css('mat-grid-tile'));
 
     // check horizontal gutter
     expect(getStyle(tiles[0], 'width')).toBe('99.5px');
@@ -135,7 +135,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithGutterSize);
     fixture.detectChanges();
 
-    let tiles = fixture.debugElement.queryAll(By.css('md-grid-tile'));
+    let tiles = fixture.debugElement.queryAll(By.css('mat-grid-tile'));
 
     // check horizontal gutter
     expect(getStyle(tiles[0], 'width')).toBe('99px');
@@ -150,7 +150,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithUnitlessGutterSize);
     fixture.detectChanges();
 
-    let tiles = fixture.debugElement.queryAll(By.css('md-grid-tile'));
+    let tiles = fixture.debugElement.queryAll(By.css('mat-grid-tile'));
 
     // check horizontal gutter
     expect(getStyle(tiles[0], 'width')).toBe('99px');
@@ -165,7 +165,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithRatioHeightAndMulipleRows);
     fixture.detectChanges();
 
-    let list = fixture.debugElement.query(By.directive(MdGridList));
+    let list = fixture.debugElement.query(By.directive(MatGridList));
     expect(getStyle(list, 'padding-bottom')).toBe('201px');
   });
 
@@ -173,7 +173,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithFixRowHeightAndMultipleRows);
     fixture.detectChanges();
 
-    let list = fixture.debugElement.query(By.directive(MdGridList));
+    let list = fixture.debugElement.query(By.directive(MatGridList));
     expect(getStyle(list, 'height')).toBe('201px');
   });
 
@@ -182,7 +182,7 @@ describe('MdGridList', () => {
       fixture.componentInstance.colspan = 2;
       fixture.detectChanges();
 
-      let tile = fixture.debugElement.query(By.directive(MdGridTile));
+      let tile = fixture.debugElement.query(By.directive(MatGridTile));
       expect(getStyle(tile, 'width')).toBe('199.5px');
 
       fixture.componentInstance.colspan = 3;
@@ -196,7 +196,7 @@ describe('MdGridList', () => {
     fixture.componentInstance.rowspan = 2;
     fixture.detectChanges();
 
-    let tile = fixture.debugElement.query(By.directive(MdGridTile));
+    let tile = fixture.debugElement.query(By.directive(MatGridTile));
     expect(getStyle(tile, 'height')).toBe('201px');
 
     fixture.componentInstance.rowspan = 3;
@@ -215,7 +215,7 @@ describe('MdGridList', () => {
       ];
 
       fixture.detectChanges();
-      let tiles = fixture.debugElement.queryAll(By.css('md-grid-tile'));
+      let tiles = fixture.debugElement.queryAll(By.css('mat-grid-tile'));
 
       expect(getStyle(tiles[0], 'width')).toBe('299.75px');
       expect(getStyle(tiles[0], 'height')).toBe('100px');
@@ -242,7 +242,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithFootersWithoutLines);
     fixture.detectChanges();
 
-    let footer = fixture.debugElement.query(By.directive(MdGridTileText));
+    let footer = fixture.debugElement.query(By.directive(MatGridTileText));
     expect(footer.nativeElement.classList.contains('mat-2-line')).toBe(false);
   });
 
@@ -250,7 +250,7 @@ describe('MdGridList', () => {
     let fixture = TestBed.createComponent(GridListWithFooterContainingTwoLines);
     fixture.detectChanges();
 
-    let footer = fixture.debugElement.query(By.directive(MdGridTileText));
+    let footer = fixture.debugElement.query(By.directive(MatGridTileText));
     expect(footer.nativeElement.classList.contains('mat-2-line')).toBe(true);
   });
 
@@ -260,7 +260,7 @@ describe('MdGridList', () => {
     fixture.componentInstance.rowHeight = '4:1';
     fixture.detectChanges();
 
-    const firstTile = fixture.debugElement.query(By.directive(MdGridTile)).nativeElement;
+    const firstTile = fixture.debugElement.query(By.directive(MatGridTile)).nativeElement;
 
     expect(firstTile.style.marginTop).toBe('0px');
     expect(firstTile.style.left).toBe('0px');
@@ -272,8 +272,8 @@ describe('MdGridList', () => {
     fixture.componentInstance.rowHeight = '4:1';
     fixture.detectChanges();
 
-    const list = fixture.debugElement.query(By.directive(MdGridList));
-    const tile = fixture.debugElement.query(By.directive(MdGridTile));
+    const list = fixture.debugElement.query(By.directive(MatGridList));
+    const tile = fixture.debugElement.query(By.directive(MatGridTile));
 
     expect(getStyle(tile, 'padding-top')).toBe('100px');
     expect(getStyle(list, 'padding-bottom')).toBe('100px');
@@ -308,153 +308,153 @@ function getComputedLeft(element: DebugElement): number {
 
 
 
-@Component({template: '<md-grid-list></md-grid-list>'})
+@Component({template: '<mat-grid-list></mat-grid-list>'})
 class GridListWithoutCols { }
 
-@Component({template: '<md-grid-list cols="4" rowHeight="4:3:2"></md-grid-list>'})
+@Component({template: '<mat-grid-list cols="4" rowHeight="4:3:2"></mat-grid-list>'})
 class GridListWithInvalidRowHeightRatio { }
 
 @Component({template:
-    '<md-grid-list cols="4"><md-grid-tile colspan="5"></md-grid-tile></md-grid-list>'})
+    '<mat-grid-list cols="4"><mat-grid-tile colspan="5"></mat-grid-tile></mat-grid-list>'})
 class GridListWithTooWideColspan { }
 
 @Component({template: `
     <div style="width:200px">
-      <md-grid-list cols="1">
-        <md-grid-tile></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="1">
+        <mat-grid-tile></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithUnspecifiedRowHeight { }
 
 @Component({template: `
     <div style="width:400px">
-      <md-grid-list cols="1" [rowHeight]="rowHeight">
-        <md-grid-tile></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="1" [rowHeight]="rowHeight">
+        <mat-grid-tile></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GirdListWithRowHeightRatio {
   rowHeight: string;
 }
 
 @Component({template: `
-    <md-grid-list cols="1" rowHeight="fit" [style.height]="totalHeight">
-      <md-grid-tile></md-grid-tile>
-      <md-grid-tile></md-grid-tile>
-    </md-grid-list>`})
+    <mat-grid-list cols="1" rowHeight="fit" [style.height]="totalHeight">
+      <mat-grid-tile></mat-grid-tile>
+      <mat-grid-tile></mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithFitRowHeightMode {
   totalHeight: string;
 }
 
 @Component({template: `
-    <md-grid-list cols="4" [rowHeight]="rowHeight">
-      <md-grid-tile></md-grid-tile>
-    </md-grid-list>`})
+    <mat-grid-list cols="4" [rowHeight]="rowHeight">
+      <mat-grid-tile></mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithFixedRowHeightMode {
   rowHeight: string;
 }
 
 @Component({template: `
-    <md-grid-list cols="4" rowHeight="100">
-      <md-grid-tile></md-grid-tile>
-    </md-grid-list>`})
+    <mat-grid-list cols="4" rowHeight="100">
+      <mat-grid-tile></mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithUnitlessFixedRowHeight {
   rowHeight: string;
 }
 
 @Component({template: `
     <div style="width:200px">
-      <md-grid-list cols="2" rowHeight="100px">
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="2" rowHeight="100px">
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithUnspecifiedGutterSize { }
 
 @Component({template: `
     <div style="width:200px">
-      <md-grid-list cols="2" gutterSize="2px" rowHeight="100px">
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="2" gutterSize="2px" rowHeight="100px">
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithGutterSize { }
 
 @Component({template: `
     <div style="width:200px">
-      <md-grid-list cols="2" gutterSize="2" rowHeight="100px">
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="2" gutterSize="2" rowHeight="100px">
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithUnitlessGutterSize { }
 
 @Component({template: `
     <div style="width:400px">
-      <md-grid-list cols="1" rowHeight="4:1">
-        <md-grid-tile></md-grid-tile>
-        <md-grid-tile></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="1" rowHeight="4:1">
+        <mat-grid-tile></mat-grid-tile>
+        <mat-grid-tile></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithRatioHeightAndMulipleRows { }
 
 @Component({template: `
-    <md-grid-list cols="1" rowHeight="100px">
-      <md-grid-tile></md-grid-tile>
-      <md-grid-tile></md-grid-tile>
-    </md-grid-list>`})
+    <mat-grid-list cols="1" rowHeight="100px">
+      <mat-grid-tile></mat-grid-tile>
+      <mat-grid-tile></mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithFixRowHeightAndMultipleRows { }
 
 @Component({template: `
     <div style="width:400px">
-      <md-grid-list cols="4">
-        <md-grid-tile [colspan]="colspan"></md-grid-tile>
-      </md-grid-list>
+      <mat-grid-list cols="4">
+        <mat-grid-tile [colspan]="colspan"></mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithColspanBinding {
   colspan: number;
 }
 
 @Component({template: `
-    <md-grid-list cols="1" rowHeight="100px">
-      <md-grid-tile [rowspan]="rowspan"></md-grid-tile>
-    </md-grid-list>`})
+    <mat-grid-list cols="1" rowHeight="100px">
+      <mat-grid-tile [rowspan]="rowspan"></mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithRowspanBinding {
   rowspan: number;
 }
 
 @Component({template: `
     <div style="width:400px">
-      <md-grid-list cols="4" rowHeight="100px">
-        <md-grid-tile *ngFor="let tile of tiles" [colspan]="tile.cols" [rowspan]="tile.rows"
+      <mat-grid-list cols="4" rowHeight="100px">
+        <mat-grid-tile *ngFor="let tile of tiles" [colspan]="tile.cols" [rowspan]="tile.rows"
                       [style.background]="tile.color">
           {{tile.text}}
-        </md-grid-tile>
-      </md-grid-list>
+        </mat-grid-tile>
+      </mat-grid-list>
     </div>`})
 class GridListWithComplexLayout {
   tiles: any[];
 }
 
 @Component({template: `
-    <md-grid-list cols="1">
-      <md-grid-tile>
-        <md-grid-tile-footer>
+    <mat-grid-list cols="1">
+      <mat-grid-tile>
+        <mat-grid-tile-footer>
           I'm a footer!
-        </md-grid-tile-footer>
-      </md-grid-tile>
-    </md-grid-list>`})
+        </mat-grid-tile-footer>
+      </mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithFootersWithoutLines { }
 
 @Component({template: `
-    <md-grid-list cols="1">
-      <md-grid-tile>
-        <md-grid-tile-footer>
-          <h3 md-line>First line</h3>
-          <span md-line>Second line</span>
-        </md-grid-tile-footer>
-      </md-grid-tile>
-    </md-grid-list>`})
+    <mat-grid-list cols="1">
+      <mat-grid-tile>
+        <mat-grid-tile-footer>
+          <h3 mat-line>First line</h3>
+          <span mat-line>Second line</span>
+        </mat-grid-tile-footer>
+      </mat-grid-tile>
+    </mat-grid-list>`})
 class GridListWithFooterContainingTwoLines { }
diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
index bfa2c9a802b3..dbd3b2a74bd2 100644
--- a/src/lib/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -19,7 +19,7 @@ import {
   Optional,
   ChangeDetectionStrategy,
 } from '@angular/core';
-import {MdGridTile} from './grid-tile';
+import {MatGridTile} from './grid-tile';
 import {TileCoordinator} from './tile-coordinator';
 import {TileStyler, FitTileStyler, RatioTileStyler, FixedTileStyler} from './tile-styler';
 import {Directionality} from '@angular/cdk/bidi';
@@ -33,11 +33,11 @@ import {
 // TODO(kara): Re-layout on window resize / media change (debounced).
 // TODO(kara): gridTileHeader and gridTileFooter.
 
-const MD_FIT_MODE = 'fit';
+const MAT_FIT_MODE = 'fit';
 
 @Component({
   moduleId: module.id,
-  selector: 'md-grid-list, mat-grid-list',
+  selector: 'mat-grid-list',
   templateUrl: 'grid-list.html',
   styleUrls: ['grid-list.css'],
   host: {
@@ -47,7 +47,7 @@ const MD_FIT_MODE = 'fit';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdGridList implements OnInit, AfterContentChecked {
+export class MatGridList implements OnInit, AfterContentChecked {
   /** Number of columns being rendered. */
   private _cols: number;
 
@@ -66,7 +66,7 @@ export class MdGridList implements OnInit, AfterContentChecked {
   private _tileStyler: TileStyler;
 
   /** Query list of tiles that are being rendered. */
-  @ContentChildren(MdGridTile) _tiles: QueryList<MdGridTile>;
+  @ContentChildren(MatGridTile) _tiles: QueryList<MatGridTile>;
 
   constructor(
       private _renderer: Renderer2,
@@ -110,8 +110,8 @@ export class MdGridList implements OnInit, AfterContentChecked {
   /** Throw a friendly error if cols property is missing */
   private _checkCols() {
     if (!this.cols) {
-      throw Error(`md-grid-list: must pass in number of columns. ` +
-                  `Example: <md-grid-list cols="3">`);
+      throw Error(`mat-grid-list: must pass in number of columns. ` +
+                  `Example: <mat-grid-list cols="3">`);
     }
   }
 
@@ -128,7 +128,7 @@ export class MdGridList implements OnInit, AfterContentChecked {
       this._tileStyler.reset(this);
     }
 
-    if (rowHeight === MD_FIT_MODE) {
+    if (rowHeight === MAT_FIT_MODE) {
       this._tileStyler = new FitTileStyler();
     } else if (rowHeight && rowHeight.indexOf(':') > -1) {
       this._tileStyler = new RatioTileStyler(rowHeight);
diff --git a/src/lib/grid-list/grid-tile-text.html b/src/lib/grid-list/grid-tile-text.html
index 03c27a703a66..ec16bf917e16 100644
--- a/src/lib/grid-list/grid-tile-text.html
+++ b/src/lib/grid-list/grid-tile-text.html
@@ -1,3 +1,3 @@
-<ng-content select="[md-grid-avatar], [mat-grid-avatar], [mdGridAvatar], [matGridAvatar]"></ng-content>
-<div class="mat-grid-list-text"><ng-content select="[md-line], [mat-line], [mdLine], [matLine]"></ng-content></div>
+<ng-content select="[mat-grid-avatar], [matGridAvatar]"></ng-content>
+<div class="mat-grid-list-text"><ng-content select="[mat-line], [matLine]"></ng-content></div>
 <ng-content></ng-content>
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index 62443ef026e6..7f0e14f3780a 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -18,12 +18,12 @@ import {
   Directive,
   ChangeDetectionStrategy,
 } from '@angular/core';
-import {MdLine, MdLineSetter} from '@angular/material/core';
+import {MatLine, MatLineSetter} from '@angular/material/core';
 import {coerceToNumber} from './grid-list-measure';
 
 @Component({
   moduleId: module.id,
-  selector: 'md-grid-tile, mat-grid-tile',
+  selector: 'mat-grid-tile',
   host: {
     'class': 'mat-grid-tile',
   },
@@ -33,7 +33,7 @@ import {coerceToNumber} from './grid-list-measure';
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdGridTile {
+export class MatGridTile {
   _rowspan: number = 1;
   _colspan: number = 1;
 
@@ -60,24 +60,24 @@ export class MdGridTile {
 
 @Component({
   moduleId: module.id,
-  selector: 'md-grid-tile-header, mat-grid-tile-header, md-grid-tile-footer, mat-grid-tile-footer',
+  selector: 'mat-grid-tile-header, mat-grid-tile-footer',
   templateUrl: 'grid-tile-text.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdGridTileText implements AfterContentInit {
+export class MatGridTileText implements AfterContentInit {
   /**
    *  Helper that watches the number of lines in a text area and sets
    * a class on the host element that matches the line count.
    */
-  _lineSetter: MdLineSetter;
-  @ContentChildren(MdLine) _lines: QueryList<MdLine>;
+  _lineSetter: MatLineSetter;
+  @ContentChildren(MatLine) _lines: QueryList<MatLine>;
 
   constructor(private _renderer: Renderer2, private _element: ElementRef) {}
 
   ngAfterContentInit() {
-    this._lineSetter = new MdLineSetter(this._lines, this._renderer, this._element);
+    this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
   }
 }
 
@@ -86,27 +86,27 @@ export class MdGridTileText implements AfterContentInit {
  * @docs-private
  */
 @Directive({
-  selector: '[md-grid-avatar], [mat-grid-avatar], [mdGridAvatar], [matGridAvatar]',
+  selector: '[mat-grid-avatar], [matGridAvatar]',
   host: {'class': 'mat-grid-avatar'}
 })
-export class MdGridAvatarCssMatStyler {}
+export class MatGridAvatarCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: 'md-grid-tile-header, mat-grid-tile-header',
+  selector: 'mat-grid-tile-header',
   host: {'class': 'mat-grid-tile-header'}
 })
-export class MdGridTileHeaderCssMatStyler {}
+export class MatGridTileHeaderCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: 'md-grid-tile-footer, mat-grid-tile-footer',
+  selector: 'mat-grid-tile-footer',
   host: {'class': 'mat-grid-tile-footer'}
 })
-export class MdGridTileFooterCssMatStyler {}
+export class MatGridTileFooterCssMatStyler {}
diff --git a/src/lib/grid-list/mat-exports.ts b/src/lib/grid-list/mat-exports.ts
deleted file mode 100644
index 0590465d4b71..000000000000
--- a/src/lib/grid-list/mat-exports.ts
+++ /dev/null
@@ -1,16 +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 {MdGridList} from './grid-list';
-import {MdGridListModule} from './grid-list-module';
-import {MdGridTile} from './grid-tile';
-
-
-export {MdGridList as MatGridList};
-export {MdGridListModule as MatGridListModule};
-export {MdGridTile as MatGridTile};
diff --git a/src/lib/grid-list/public_api.ts b/src/lib/grid-list/public_api.ts
index 5329b294b274..dadf36d92a04 100644
--- a/src/lib/grid-list/public_api.ts
+++ b/src/lib/grid-list/public_api.ts
@@ -8,5 +8,5 @@
 
 export * from './grid-list-module';
 export * from './grid-list';
-export {MdGridTile} from './grid-tile';
-export * from './mat-exports';
+export {MatGridTile} from './grid-tile';
+
diff --git a/src/lib/grid-list/tile-coordinator.ts b/src/lib/grid-list/tile-coordinator.ts
index 7610ef154bba..281db2482fc9 100644
--- a/src/lib/grid-list/tile-coordinator.ts
+++ b/src/lib/grid-list/tile-coordinator.ts
@@ -7,7 +7,7 @@
  */
 
 import {QueryList} from '@angular/core';
-import {MdGridTile} from './grid-tile';
+import {MatGridTile} from './grid-tile';
 
 /**
  * Class for determining, from a list of tiles, the (row, col) position of each of those tiles
@@ -51,7 +51,7 @@ export class TileCoordinator {
   /** The computed (row, col) position of each tile (the output). */
   positions: TilePosition[];
 
-  constructor(numColumns: number, tiles: QueryList<MdGridTile>) {
+  constructor(numColumns: number, tiles: QueryList<MatGridTile>) {
     this.tracker = new Array(numColumns);
     this.tracker.fill(0, 0, this.tracker.length);
 
@@ -59,7 +59,7 @@ export class TileCoordinator {
   }
 
   /** Calculates the row and col position of a tile. */
-  private _trackTile(tile: MdGridTile): TilePosition {
+  private _trackTile(tile: MatGridTile): TilePosition {
     // Find a gap large enough for this tile.
     let gapStartIndex = this._findMatchingGap(tile.colspan);
 
@@ -76,7 +76,7 @@ export class TileCoordinator {
   /** Finds the next available space large enough to fit the tile. */
   private _findMatchingGap(tileCols: number): number {
     if (tileCols > this.tracker.length) {
-      throw Error(`md-grid-list: tile with colspan ${tileCols} is wider than ` +
+      throw Error(`mat-grid-list: tile with colspan ${tileCols} is wider than ` +
                       `grid with cols="${this.tracker.length}".`);
     }
 
@@ -138,7 +138,7 @@ export class TileCoordinator {
   }
 
   /** Update the tile tracker to account for the given tile in the given space. */
-  private _markTilePosition(start: number, tile: MdGridTile): void {
+  private _markTilePosition(start: number, tile: MatGridTile): void {
     for (let i = 0; i < tile.colspan; i++) {
       this.tracker[start + i] = tile.rowspan;
     }
diff --git a/src/lib/grid-list/tile-styler.ts b/src/lib/grid-list/tile-styler.ts
index 36a897e1d583..1be3f05e54f8 100644
--- a/src/lib/grid-list/tile-styler.ts
+++ b/src/lib/grid-list/tile-styler.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MdGridList} from './grid-list';
-import {MdGridTile} from './grid-tile';
+import {MatGridList} from './grid-list';
+import {MatGridTile} from './grid-tile';
 import {TileCoordinator} from './tile-coordinator';
 
 /**
@@ -86,7 +86,7 @@ export abstract class TileStyler {
    * @param rowIndex Index of the tile's row.
    * @param colIndex Index of the tile's column.
    */
-  setStyle(tile: MdGridTile, rowIndex: number, colIndex: number): void {
+  setStyle(tile: MatGridTile, rowIndex: number, colIndex: number): void {
     // Percent of the available horizontal space that one column takes up.
     let percentWidthPerTile = 100 / this._cols;
 
@@ -99,7 +99,7 @@ export abstract class TileStyler {
   }
 
   /** Sets the horizontal placement of the tile in the list. */
-  setColStyles(tile: MdGridTile, colIndex: number, percentWidth: number,
+  setColStyles(tile: MatGridTile, colIndex: number, percentWidth: number,
                gutterWidth: number) {
     // Base horizontal size of a column.
     let baseTileWidth = this.getBaseTileSize(percentWidth, gutterWidth);
@@ -131,7 +131,7 @@ export abstract class TileStyler {
    * This method will be implemented by each type of TileStyler.
    * @docs-private
    */
-  abstract setRowStyles(tile: MdGridTile, rowIndex: number, percentWidth: number,
+  abstract setRowStyles(tile: MatGridTile, rowIndex: number, percentWidth: number,
                         gutterWidth: number);
 
   /**
@@ -146,13 +146,13 @@ export abstract class TileStyler {
    * @param list Grid list that the styler was attached to.
    * @docs-private
    */
-  abstract reset(list: MdGridList);
+  abstract reset(list: MatGridList);
 }
 
 
 /**
  * This type of styler is instantiated when the user passes in a fixed row height.
- * Example <md-grid-list cols="3" rowHeight="100px">
+ * Example <mat-grid-list cols="3" rowHeight="100px">
  * @docs-private
  */
 export class FixedTileStyler extends TileStyler {
@@ -164,7 +164,7 @@ export class FixedTileStyler extends TileStyler {
     this.fixedRowHeight = normalizeUnits(this.fixedRowHeight);
   }
 
-  setRowStyles(tile: MdGridTile, rowIndex: number): void {
+  setRowStyles(tile: MatGridTile, rowIndex: number): void {
     tile._setStyle('top', this.getTilePosition(this.fixedRowHeight, rowIndex));
     tile._setStyle('height', calc(this.getTileSize(this.fixedRowHeight, tile.rowspan)));
   }
@@ -175,7 +175,7 @@ export class FixedTileStyler extends TileStyler {
     ];
   }
 
-  reset(list: MdGridList) {
+  reset(list: MatGridList) {
     list._setListStyle(['height', null]);
 
     list._tiles.forEach(tile => {
@@ -188,7 +188,7 @@ export class FixedTileStyler extends TileStyler {
 
 /**
  * This type of styler is instantiated when the user passes in a width:height ratio
- * for the row height.  Example <md-grid-list cols="3" rowHeight="3:1">
+ * for the row height.  Example <mat-grid-list cols="3" rowHeight="3:1">
  * @docs-private
  */
 export class RatioTileStyler extends TileStyler {
@@ -202,7 +202,7 @@ export class RatioTileStyler extends TileStyler {
     this._parseRatio(value);
   }
 
-  setRowStyles(tile: MdGridTile, rowIndex: number, percentWidth: number,
+  setRowStyles(tile: MatGridTile, rowIndex: number, percentWidth: number,
                gutterWidth: number): void {
     let percentHeightPerTile = percentWidth / this.rowHeightRatio;
     this.baseTileHeight = this.getBaseTileSize(percentHeightPerTile, gutterWidth);
@@ -220,7 +220,7 @@ export class RatioTileStyler extends TileStyler {
     ];
   }
 
-  reset(list: MdGridList) {
+  reset(list: MatGridList) {
     list._setListStyle(['padding-bottom', null]);
 
     list._tiles.forEach(tile => {
@@ -233,7 +233,7 @@ export class RatioTileStyler extends TileStyler {
     const ratioParts = value.split(':');
 
     if (ratioParts.length !== 2) {
-      throw Error(`md-grid-list: invalid ratio given for row-height: "${value}"`);
+      throw Error(`mat-grid-list: invalid ratio given for row-height: "${value}"`);
     }
 
     this.rowHeightRatio = parseFloat(ratioParts[0]) / parseFloat(ratioParts[1]);
@@ -243,13 +243,13 @@ export class RatioTileStyler extends TileStyler {
 /**
  * This type of styler is instantiated when the user selects a "fit" row height mode.
  * In other words, the row height will reflect the total height of the container divided
- * by the number of rows.  Example <md-grid-list cols="3" rowHeight="fit">
+ * by the number of rows.  Example <mat-grid-list cols="3" rowHeight="fit">
  *
  * @docs-private
  */
 export class FitTileStyler extends TileStyler {
 
-  setRowStyles(tile: MdGridTile, rowIndex: number): void {
+  setRowStyles(tile: MatGridTile, rowIndex: number): void {
     // Percent of the available vertical space that one row takes up.
     let percentHeightPerTile = 100 / this._rowspan;
 
@@ -263,7 +263,7 @@ export class FitTileStyler extends TileStyler {
     tile._setStyle('height', calc(this.getTileSize(baseTileHeight, tile.rowspan)));
   }
 
-  reset(list: MdGridList) {
+  reset(list: MatGridList) {
     list._tiles.forEach(tile => {
       tile._setStyle('top', null);
       tile._setStyle('height', null);
diff --git a/src/lib/icon/icon-module.ts b/src/lib/icon/icon-module.ts
index 1104d7a29429..75a0d144810b 100644
--- a/src/lib/icon/icon-module.ts
+++ b/src/lib/icon/icon-module.ts
@@ -7,15 +7,15 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MdIcon} from './icon';
+import {MatCommonModule} from '@angular/material/core';
+import {MatIcon} from './icon';
 import {ICON_REGISTRY_PROVIDER} from './icon-registry';
 
 
 @NgModule({
-  imports: [MdCommonModule],
-  exports: [MdIcon, MdCommonModule],
-  declarations: [MdIcon],
+  imports: [MatCommonModule],
+  exports: [MatIcon, MatCommonModule],
+  declarations: [MatIcon],
   providers: [ICON_REGISTRY_PROVIDER],
 })
-export class MdIconModule {}
+export class MatIconModule {}
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 7ff669fc292d..f0f2a06e70c1 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -21,17 +21,17 @@ import {_throw as observableThrow} from 'rxjs/observable/throw';
  * load an icon with a name that cannot be found.
  * @docs-private
  */
-export function getMdIconNameNotFoundError(iconName: string): Error {
+export function getMatIconNameNotFoundError(iconName: string): Error {
   return Error(`Unable to find icon with the name "${iconName}"`);
 }
 
 
 /**
  * Returns an exception to be thrown when the consumer attempts to use
- * `<md-icon>` without including @angular/http.
+ * `<mat-icon>` without including @angular/http.
  * @docs-private
  */
-export function getMdIconNoHttpProviderError(): Error {
+export function getMatIconNoHttpProviderError(): Error {
   return Error('Could not find Http provider for use with Angular Material icons. ' +
                'Please include the HttpModule from @angular/http in your app imports.');
 }
@@ -42,8 +42,8 @@ export function getMdIconNoHttpProviderError(): Error {
  * @param url URL that was attempted to be sanitized.
  * @docs-private
  */
-export function getMdIconFailedToSanitizeError(url: SafeResourceUrl): Error {
-  return Error(`The URL provided to MdIconRegistry was not trusted as a resource URL ` +
+export function getMatIconFailedToSanitizeError(url: SafeResourceUrl): Error {
+  return Error(`The URL provided to MatIconRegistry was not trusted as a resource URL ` +
                `via Angular's DomSanitizer. Attempted URL was "${url}".`);
 }
 
@@ -57,14 +57,14 @@ class SvgIconConfig {
 }
 
 /**
- * Service to register and display icons used by the <md-icon> component.
+ * Service to register and display icons used by the <mat-icon> component.
  * - Registers icon URLs by namespace and name.
  * - Registers icon set URLs by namespace.
  * - Registers aliases for CSS classes, for use with icon fonts.
  * - Loads icons from URLs and extracts individual icons from icon sets.
  */
 @Injectable()
-export class MdIconRegistry {
+export class MatIconRegistry {
   /**
    * URLs and cached SVG elements for individual icons. Keys are of the format "[namespace]:[icon]".
    */
@@ -86,7 +86,7 @@ export class MdIconRegistry {
   private _fontCssClassesByAlias = new Map<string, string>();
 
   /**
-   * The CSS class to apply when an <md-icon> component has no icon name, url, or font specified.
+   * The CSS class to apply when an <mat-icon> component has no icon name, url, or font specified.
    * The default 'material-icons' value assumes that the material icon font has been loaded as
    * described at http://google.github.io/material-design-icons/#icon-font-for-the-web
    */
@@ -141,9 +141,9 @@ export class MdIconRegistry {
   }
 
   /**
-   * Defines an alias for a CSS class name to be used for icon fonts. Creating an mdIcon
+   * Defines an alias for a CSS class name to be used for icon fonts. Creating an matIcon
    * component with the alias as the fontSet input will cause the class name to be applied
-   * to the <md-icon> element.
+   * to the <mat-icon> element.
    *
    * @param alias Alias for the font.
    * @param className Class name override to be used instead of the alias.
@@ -162,7 +162,7 @@ export class MdIconRegistry {
   }
 
   /**
-   * Sets the CSS class name to be used for icon fonts when an <md-icon> component does not
+   * Sets the CSS class name to be used for icon fonts when an <mat-icon> component does not
    * have a fontSet input value, and is not loading an icon by name or URL.
    *
    * @param className
@@ -173,7 +173,7 @@ export class MdIconRegistry {
   }
 
   /**
-   * Returns the CSS class name to be used for icon fonts when an <md-icon> component does not
+   * Returns the CSS class name to be used for icon fonts when an <mat-icon> component does not
    * have a fontSet input value, and is not loading an icon by name or URL.
    */
   getDefaultFontSetClass(): string {
@@ -192,7 +192,7 @@ export class MdIconRegistry {
     let url = this._sanitizer.sanitize(SecurityContext.RESOURCE_URL, safeUrl);
 
     if (!url) {
-      throw getMdIconFailedToSanitizeError(safeUrl);
+      throw getMatIconFailedToSanitizeError(safeUrl);
     }
 
     let cachedIcon = this._cachedIconsByUrl.get(url);
@@ -231,7 +231,7 @@ export class MdIconRegistry {
       return this._getSvgFromIconSetConfigs(name, iconSetConfigs);
     }
 
-    return observableThrow(getMdIconNameNotFoundError(key));
+    return observableThrow(getMatIconNameNotFoundError(key));
   }
 
   /**
@@ -300,7 +300,7 @@ export class MdIconRegistry {
       const foundIcon = this._extractIconWithNameFromAnySet(name, iconSetConfigs);
 
       if (!foundIcon) {
-        throw getMdIconNameNotFoundError(name);
+        throw getMatIconNameNotFoundError(name);
       }
 
       return foundIcon;
@@ -443,13 +443,13 @@ export class MdIconRegistry {
    */
   private _fetchUrl(safeUrl: SafeResourceUrl): Observable<string> {
     if (!this._http) {
-      throw getMdIconNoHttpProviderError();
+      throw getMatIconNoHttpProviderError();
     }
 
     const url = this._sanitizer.sanitize(SecurityContext.RESOURCE_URL, safeUrl);
 
     if (!url) {
-      throw getMdIconFailedToSanitizeError(safeUrl);
+      throw getMatIconFailedToSanitizeError(safeUrl);
     }
 
     // Store in-progress fetches to avoid sending a duplicate request for a URL when there is
@@ -476,15 +476,15 @@ export class MdIconRegistry {
 
 /** @docs-private */
 export function ICON_REGISTRY_PROVIDER_FACTORY(
-    parentRegistry: MdIconRegistry, http: Http, sanitizer: DomSanitizer) {
-  return parentRegistry || new MdIconRegistry(http, sanitizer);
+    parentRegistry: MatIconRegistry, http: Http, sanitizer: DomSanitizer) {
+  return parentRegistry || new MatIconRegistry(http, sanitizer);
 }
 
 /** @docs-private */
 export const ICON_REGISTRY_PROVIDER = {
-  // If there is already an MdIconRegistry available, use that. Otherwise, provide a new one.
-  provide: MdIconRegistry,
-  deps: [[new Optional(), new SkipSelf(), MdIconRegistry], [new Optional(), Http], DomSanitizer],
+  // If there is already an MatIconRegistry available, use that. Otherwise, provide a new one.
+  provide: MatIconRegistry,
+  deps: [[new Optional(), new SkipSelf(), MatIconRegistry], [new Optional(), Http], DomSanitizer],
   useFactory: ICON_REGISTRY_PROVIDER_FACTORY
 };
 
diff --git a/src/lib/icon/icon.md b/src/lib/icon/icon.md
index 15dfa0dfa27f..6a08ac010789 100644
--- a/src/lib/icon/icon.md
+++ b/src/lib/icon/icon.md
@@ -1,26 +1,26 @@
-`md-icon` makes it easier to use _vector-based_ icons in your app.  This directive supports both
+`mat-icon` makes it easier to use _vector-based_ icons in your app.  This directive supports both
 icon fonts and SVG icons, but not bitmap-based formats (png, jpg, etc.).
 
 <!-- example(icon-overview) -->
 
 ### Registering icons
 
-`MdIconRegistry` is an injectable service that allows you to associate icon names with SVG URLs and
+`MatIconRegistry` is an injectable service that allows you to associate icon names with SVG URLs and
 define aliases for CSS font classes. Its methods are discussed below and listed in the API summary.
 
 ### Font icons with ligatures
 
 Some fonts are designed to show icons by using
 [ligatures](https://en.wikipedia.org/wiki/Typographic_ligature), for example by rendering the text
-"home" as a home image. To use a ligature icon, put its text in the content of the `md-icon`
+"home" as a home image. To use a ligature icon, put its text in the content of the `mat-icon`
 component.
 
-By default, `<md-icon>` expects the
+By default, `<mat-icon>` expects the
 [Material icons font](http://google.github.io/material-design-icons/#icon-font-for-the-web).
 (You will still need to include the HTML to load the font and its CSS, as described in the link).
 You can specify a different font by setting the `fontSet` input to either the CSS class to apply to
 use the desired font, or to an alias previously registered with
-`MdIconRegistry.registerFontClassAlias`.
+`MatIconRegistry.registerFontClassAlias`.
 
 ### Font icons with CSS
 
@@ -28,23 +28,23 @@ Fonts can also display icons by defining a CSS class for each icon glyph, which
 `:before` selector to cause the icon to appear.
 [FontAwesome](https://fortawesome.github.io/Font-Awesome/examples/) uses this approach to display
 its icons. To use such a font, set the `fontSet` input to the font's CSS class (either the class
-itself or an alias registered with `MdIconRegistry.registerFontClassAlias`), and set the `fontIcon`
+itself or an alias registered with `MatIconRegistry.registerFontClassAlias`), and set the `fontIcon`
 input to the class for the specific icon to show.
 
 For both types of font icons, you can specify the default font class to use when `fontSet` is not
-explicitly set by calling `MdIconRegistry.setDefaultFontSetClass`.
+explicitly set by calling `MatIconRegistry.setDefaultFontSetClass`.
 
 ### SVG icons
 
-When an `md-icon` component displays an SVG icon, it does so by directly inlining the SVG content
+When an `mat-icon` component displays an SVG icon, it does so by directly inlining the SVG content
 into the page as a child of the component. (Rather than using an <img> tag or a div background
 image). This makes it easier to apply CSS styles to SVG icons. For example, the default color of the
 SVG content is the CSS 
 [currentColor](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#currentColor_keyword) 
 value. This makes SVG icons by default have the same color as surrounding text, and allows you to 
-change the color by setting the "color" style on the `md-icon` element.
+change the color by setting the "color" style on the `mat-icon` element.
 
-In order to prevent XSS vulnerabilities, any SVG URLs passed to the `MdIconRegistry` must be 
+In order to prevent XSS vulnerabilities, any SVG URLs passed to the `MatIconRegistry` must be 
 marked as trusted resource URLs by using Angular's `DomSanitizer` service.
 
 Also note that all SVG icons are fetched via XmlHttpRequest, and due to the same-origin policy, 
@@ -54,7 +54,7 @@ to allow cross-domain access.
 #### Named icons
 
 To associate a name with an icon URL, use the `addSvgIcon` or `addSvgIconInNamespace` methods of
-`MdIconRegistry`. After registering an icon, it can be displayed by setting the `svgIcon` input.
+`MatIconRegistry`. After registering an icon, it can be displayed by setting the `svgIcon` input.
 For an icon in the default namespace, use the name directly. For a non-default namespace, use the
 format `[namespace]:[name]`.
 
@@ -65,7 +65,7 @@ root `<svg>` tag that contains multiple nested `<svg>` tags in its `<defs>` sect
 nested tags is identified with an `id` attribute. This `id` is used as the name of the icon.
 
 Icon sets are registered using the `addSvgIconSet` or `addSvgIconSetInNamespace` methods of
-`MdIconRegistry`. After an icon set is registered, each of its embedded icons can be accessed by
+`MatIconRegistry`. After an icon set is registered, each of its embedded icons can be accessed by
 their `id` attributes. To display an icon from an icon set, use the `svgIcon` input in the same way
 as for individually registered icons.
 
@@ -81,8 +81,8 @@ match the current theme's colors using the `color` attribute. This can be change
 ### Accessibility
 
 Similar to an `<img>` element, an icon alone does not convey any useful information for a
-screen-reader user. The user of `<md-icon>` must provide additional information pertaining to how
-the icon is used. Based on the use-cases described below, `md-icon` is marked as
+screen-reader user. The user of `<mat-icon>` must provide additional information pertaining to how
+the icon is used. Based on the use-cases described below, `mat-icon` is marked as
 `aria-hidden="true"` by default, but this can be overriden by adding `aria-hidden="false"` to the
 element.
 
@@ -92,22 +92,22 @@ In thinking about accessibility, it is useful to place icon use into one of thre
 3. **Indicator**: the icon is not interactive, but it conveys some information, such as a status.
 
 #### Decorative icons
-When the icon is puely cosmetic and conveys no real semantic meaning, the `<md-icon>` element
+When the icon is puely cosmetic and conveys no real semantic meaning, the `<mat-icon>` element
 should be marked with `aria-hidden="true"`.
 
 #### Interactive icons
 Icons alone are not interactive elements for screen-reader users; when the user would interact with
 some icon on the page, a more appropriate  element should "own" the interaction:
-* The `<md-icon>` element should be a child of a `<button>` or `<a>` element.
-* The `<md-icon>` element should be marked with `aria-hidden="true"`.
+* The `<mat-icon>` element should be a child of a `<button>` or `<a>` element.
+* The `<mat-icon>` element should be marked with `aria-hidden="true"`.
 * The parent `<button>` or `<a>` should either have a meaningful label provided either through
 direct text content, `aria-label`, or `aria-labelledby`.
 
 #### Indicator icons
 When the presence of an icon communicates some information to the user, that information must also
 be made available to screen-readers. The most straightforward way to do this is to
-1. Mark the `<md-icon>` as `aria-hidden="true"`
-2. Add a `<span>` as an adjacent sibling to the `<md-icon>` element with text that conveys the same
+1. Mark the `<mat-icon>` as `aria-hidden="true"`
+2. Add a `<span>` as an adjacent sibling to the `<mat-icon>` element with text that conveys the same
 information as the icon.
 3. Add the `cdk-visually-hidden` class to the `<span>`. This will make the message invisible
 on-screen but still available to screen-reader users.
diff --git a/src/lib/icon/icon.spec.ts b/src/lib/icon/icon.spec.ts
index 952e2b70185e..13ff507a24fc 100644
--- a/src/lib/icon/icon.spec.ts
+++ b/src/lib/icon/icon.spec.ts
@@ -3,8 +3,8 @@ import {SafeResourceUrl, DomSanitizer} from '@angular/platform-browser';
 import {HttpModule, XHRBackend} from '@angular/http';
 import {MockBackend} from '@angular/http/testing';
 import {Component} from '@angular/core';
-import {MdIconModule} from './index';
-import {MdIconRegistry, getMdIconNoHttpProviderError} from './icon-registry';
+import {MatIconModule} from './index';
+import {MatIconRegistry, getMatIconNoHttpProviderError} from './icon-registry';
 import {getFakeSvgHttpResponse} from './fake-svgs';
 import {wrappedErrorMessage} from '@angular/cdk/testing';
 
@@ -36,11 +36,11 @@ function verifyPathChildElement(element: Element, attributeValue: string): void
 }
 
 
-describe('MdIcon', () => {
+describe('MatIcon', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [HttpModule, MdIconModule],
+      imports: [HttpModule, MatIconModule],
       declarations: [
         IconWithColor,
         IconWithLigature,
@@ -58,13 +58,13 @@ describe('MdIcon', () => {
     TestBed.compileComponents();
   }));
 
-  let mdIconRegistry: MdIconRegistry;
+  let iconRegistry: MatIconRegistry;
   let sanitizer: DomSanitizer;
   let httpRequestUrls: string[];
 
-  let deps = [MdIconRegistry, MockBackend, DomSanitizer];
-  beforeEach(inject(deps, (mir: MdIconRegistry, mockBackend: MockBackend, ds: DomSanitizer) => {
-    mdIconRegistry = mir;
+  let deps = [MatIconRegistry, MockBackend, DomSanitizer];
+  beforeEach(inject(deps, (mir: MatIconRegistry, mockBackend: MockBackend, ds: DomSanitizer) => {
+    iconRegistry = mir;
     sanitizer = ds;
     // Keep track of requests so we can verify caching behavior.
     // Return responses for the SVGs defined in fake-svgs.ts.
@@ -80,25 +80,25 @@ describe('MdIcon', () => {
     let fixture = TestBed.createComponent(IconWithColor);
 
     const testComponent = fixture.componentInstance;
-    const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+    const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
     testComponent.iconName = 'home';
     testComponent.iconColor = 'primary';
     fixture.detectChanges();
-    expect(sortedClassNames(mdIconElement)).toEqual(['mat-icon', 'mat-primary', 'material-icons']);
+    expect(sortedClassNames(matIconElement)).toEqual(['mat-icon', 'mat-primary', 'material-icons']);
   });
 
-  it('should mark md-icon as aria-hidden by default', () => {
+  it('should mark mat-icon as aria-hidden by default', () => {
     const fixture = TestBed.createComponent(IconWithLigature);
-    const iconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+    const iconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
     expect(iconElement.getAttribute('aria-hidden'))
-        .toBe('true', 'Expected the md-icon element has aria-hidden="true" by default');
+        .toBe('true', 'Expected the mat-icon element has aria-hidden="true" by default');
   });
 
   it('should not override a user-provided aria-hidden attribute', () => {
     const fixture = TestBed.createComponent(IconWithAriaHiddenFalse);
-    const iconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+    const iconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
     expect(iconElement.getAttribute('aria-hidden'))
-        .toBe('false', 'Expected the md-icon element has the user-provided aria-hidden value');
+        .toBe('false', 'Expected the mat-icon element has the user-provided aria-hidden value');
   });
 
   describe('Ligature icons', () => {
@@ -106,57 +106,57 @@ describe('MdIcon', () => {
       let fixture = TestBed.createComponent(IconWithLigature);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       testComponent.iconName = 'home';
       fixture.detectChanges();
-      expect(sortedClassNames(mdIconElement)).toEqual(['mat-icon', 'material-icons']);
+      expect(sortedClassNames(matIconElement)).toEqual(['mat-icon', 'material-icons']);
     });
 
     it('should use alternate icon font if set', () => {
-      mdIconRegistry.setDefaultFontSetClass('myfont');
+      iconRegistry.setDefaultFontSetClass('myfont');
 
       let fixture = TestBed.createComponent(IconWithLigature);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       testComponent.iconName = 'home';
       fixture.detectChanges();
-      expect(sortedClassNames(mdIconElement)).toEqual(['mat-icon', 'myfont']);
+      expect(sortedClassNames(matIconElement)).toEqual(['mat-icon', 'myfont']);
     });
   });
 
   describe('Icons from URLs', () => {
     it('should register icon URLs by name', () => {
-      mdIconRegistry.addSvgIcon('fluffy', trust('cat.svg'));
-      mdIconRegistry.addSvgIcon('fido', trust('dog.svg'));
+      iconRegistry.addSvgIcon('fluffy', trust('cat.svg'));
+      iconRegistry.addSvgIcon('fido', trust('dog.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: SVGElement;
 
       testComponent.iconName = 'fido';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'woof');
 
       // Change the icon, and the SVG element should be replaced.
       testComponent.iconName = 'fluffy';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'meow');
 
       expect(httpRequestUrls).toEqual(['dog.svg', 'cat.svg']);
       // Using an icon from a previously loaded URL should not cause another HTTP request.
       testComponent.iconName = 'fido';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'woof');
       expect(httpRequestUrls).toEqual(['dog.svg', 'cat.svg']);
     });
 
     it('should throw an error when using an untrusted icon url', () => {
-      mdIconRegistry.addSvgIcon('fluffy', 'farm-set-1.svg');
+      iconRegistry.addSvgIcon('fluffy', 'farm-set-1.svg');
 
       expect(() => {
         let fixture = TestBed.createComponent(IconFromSvgName);
@@ -166,7 +166,7 @@ describe('MdIcon', () => {
     });
 
     it('should throw an error when using an untrusted icon set url', () => {
-      mdIconRegistry.addSvgIconSetInNamespace('farm', 'farm-set-1.svg');
+      iconRegistry.addSvgIconSetInNamespace('farm', 'farm-set-1.svg');
 
       expect(() => {
         let fixture = TestBed.createComponent(IconFromSvgName);
@@ -176,20 +176,20 @@ describe('MdIcon', () => {
     });
 
     it('should extract icon from SVG icon set', () => {
-      mdIconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-1.svg'));
+      iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-1.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
       let svgChild: any;
 
       testComponent.iconName = 'farm:pig';
       fixture.detectChanges();
 
-      expect(mdIconElement.childNodes.length).toBe(1);
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      expect(matIconElement.childNodes.length).toBe(1);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       expect(svgElement.childNodes.length).toBe(1);
       svgChild = svgElement.childNodes[0];
       // The first <svg> child should be the <g id="pig"> element.
@@ -200,7 +200,7 @@ describe('MdIcon', () => {
       // Change the icon, and the SVG element should be replaced.
       testComponent.iconName = 'farm:cow';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       svgChild = svgElement.childNodes[0];
       // The first <svg> child should be the <g id="cow"> element.
       expect(svgChild.tagName.toLowerCase()).toBe('g');
@@ -209,20 +209,20 @@ describe('MdIcon', () => {
     });
 
     it('should allow multiple icon sets in a namespace', () => {
-      mdIconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-1.svg'));
-      mdIconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-2.svg'));
-      mdIconRegistry.addSvgIconSetInNamespace('arrows', trust('arrow-set.svg'));
+      iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-1.svg'));
+      iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-2.svg'));
+      iconRegistry.addSvgIconSetInNamespace('arrows', trust('arrow-set.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
       let svgChild: any;
 
       testComponent.iconName = 'farm:pig';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       expect(svgElement.childNodes.length).toBe(1);
       svgChild = svgElement.childNodes[0];
       // The <svg> child should be the <g id="pig"> element.
@@ -239,7 +239,7 @@ describe('MdIcon', () => {
       // and no additional HTTP request should be made.
       testComponent.iconName = 'farm:cow';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       svgChild = svgElement.childNodes[0];
       // The first <svg> child should be the <g id="cow"> element.
       expect(svgChild.tagName.toLowerCase()).toBe('g');
@@ -250,16 +250,16 @@ describe('MdIcon', () => {
     });
 
     it('should unwrap <symbol> nodes', () => {
-      mdIconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-3.svg'));
+      iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-3.svg'));
 
       const fixture = TestBed.createComponent(IconFromSvgName);
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
 
       testComponent.iconName = 'farm:duck';
       fixture.detectChanges();
 
-      const svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      const svgElement = verifyAndGetSingleSvgChild(matIconElement);
       const firstChild = svgElement.childNodes[0];
 
       expect(svgElement.querySelector('symbol')).toBeFalsy();
@@ -269,34 +269,34 @@ describe('MdIcon', () => {
     });
 
     it('should not wrap <svg> elements in icon sets in another svg tag', () => {
-      mdIconRegistry.addSvgIconSet(trust('arrow-set.svg'));
+      iconRegistry.addSvgIconSet(trust('arrow-set.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
 
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
       // arrow-set.svg stores its icons as nested <svg> elements, so they should be used
       // directly and not wrapped in an outer <svg> tag like the <g> elements in other sets.
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'left');
     });
 
     it('should return unmodified copies of icons from icon sets', () => {
-      mdIconRegistry.addSvgIconSet(trust('arrow-set.svg'));
+      iconRegistry.addSvgIconSet(trust('arrow-set.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
 
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'left');
       // Modify the SVG element by setting a viewBox attribute.
       svgElement.setAttribute('viewBox', '0 0 100 100');
@@ -304,19 +304,19 @@ describe('MdIcon', () => {
       // Switch to a different icon.
       testComponent.iconName = 'right-arrow';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'right');
 
       // Switch back to the first icon. The viewBox attribute should not be present.
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
+      svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'left');
       expect(svgElement.getAttribute('viewBox')).toBeFalsy();
     });
 
     it('should not throw when toggling an icon that has a binding in IE11', () => {
-      mdIconRegistry.addSvgIcon('fluffy', trust('cat.svg'));
+      iconRegistry.addSvgIcon('fluffy', trust('cat.svg'));
 
       const fixture = TestBed.createComponent(IconWithBindingAndNgIf);
 
@@ -332,12 +332,12 @@ describe('MdIcon', () => {
     });
 
     it('should remove the SVG element from the DOM when the binding is cleared', () => {
-      mdIconRegistry.addSvgIconSet(trust('arrow-set.svg'));
+      iconRegistry.addSvgIconSet(trust('arrow-set.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
 
       const testComponent = fixture.componentInstance;
-      const icon = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const icon = fixture.debugElement.nativeElement.querySelector('mat-icon');
 
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
@@ -354,27 +354,27 @@ describe('MdIcon', () => {
 
   describe('custom fonts', () => {
     it('should apply CSS classes for custom font and icon', () => {
-      mdIconRegistry.registerFontClassAlias('f1', 'font1');
-      mdIconRegistry.registerFontClassAlias('f2');
+      iconRegistry.registerFontClassAlias('f1', 'font1');
+      iconRegistry.registerFontClassAlias('f2');
 
       let fixture = TestBed.createComponent(IconWithCustomFontCss);
 
       const testComponent = fixture.componentInstance;
-      const mdIconElement = fixture.debugElement.nativeElement.querySelector('md-icon');
+      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       testComponent.fontSet = 'f1';
       testComponent.fontIcon = 'house';
       fixture.detectChanges();
-      expect(sortedClassNames(mdIconElement)).toEqual(['font1', 'house', 'mat-icon']);
+      expect(sortedClassNames(matIconElement)).toEqual(['font1', 'house', 'mat-icon']);
 
       testComponent.fontSet = 'f2';
       testComponent.fontIcon = 'igloo';
       fixture.detectChanges();
-      expect(sortedClassNames(mdIconElement)).toEqual(['f2', 'igloo', 'mat-icon']);
+      expect(sortedClassNames(matIconElement)).toEqual(['f2', 'igloo', 'mat-icon']);
 
       testComponent.fontSet = 'f3';
       testComponent.fontIcon = 'tent';
       fixture.detectChanges();
-      expect(sortedClassNames(mdIconElement)).toEqual(['f3', 'mat-icon', 'tent']);
+      expect(sortedClassNames(matIconElement)).toEqual(['f3', 'mat-icon', 'tent']);
     });
   });
 
@@ -385,29 +385,29 @@ describe('MdIcon', () => {
 });
 
 
-describe('MdIcon without HttpModule', () => {
-  let mdIconRegistry: MdIconRegistry;
+describe('MatIcon without HttpModule', () => {
+  let iconRegistry: MatIconRegistry;
   let sanitizer: DomSanitizer;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdIconModule],
+      imports: [MatIconModule],
       declarations: [IconFromSvgName],
     });
 
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MdIconRegistry, DomSanitizer], (mir: MdIconRegistry, ds: DomSanitizer) => {
-    mdIconRegistry = mir;
+  beforeEach(inject([MatIconRegistry, DomSanitizer], (mir: MatIconRegistry, ds: DomSanitizer) => {
+    iconRegistry = mir;
     sanitizer = ds;
   }));
 
   it('should throw an error when trying to load a remote icon', async() => {
-    const expectedError = wrappedErrorMessage(getMdIconNoHttpProviderError());
+    const expectedError = wrappedErrorMessage(getMatIconNoHttpProviderError());
 
     expect(() => {
-      mdIconRegistry.addSvgIcon('fido', sanitizer.bypassSecurityTrustResourceUrl('dog.svg'));
+      iconRegistry.addSvgIcon('fido', sanitizer.bypassSecurityTrustResourceUrl('dog.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
 
@@ -418,32 +418,32 @@ describe('MdIcon without HttpModule', () => {
 });
 
 
-@Component({template: `<md-icon>{{iconName}}</md-icon>`})
+@Component({template: `<mat-icon>{{iconName}}</mat-icon>`})
 class IconWithLigature {
   iconName = '';
 }
 
-@Component({template: `<md-icon [color]="iconColor">{{iconName}}</md-icon>`})
+@Component({template: `<mat-icon [color]="iconColor">{{iconName}}</mat-icon>`})
 class IconWithColor {
   iconName = '';
   iconColor = 'primary';
 }
 
-@Component({template: `<md-icon [fontSet]="fontSet" [fontIcon]="fontIcon"></md-icon>`})
+@Component({template: `<mat-icon [fontSet]="fontSet" [fontIcon]="fontIcon"></mat-icon>`})
 class IconWithCustomFontCss {
   fontSet = '';
   fontIcon = '';
 }
 
-@Component({template: `<md-icon [svgIcon]="iconName"></md-icon>`})
+@Component({template: `<mat-icon [svgIcon]="iconName"></mat-icon>`})
 class IconFromSvgName {
   iconName: string | undefined = '';
 }
 
-@Component({template: '<md-icon aria-hidden="false">face</md-icon>'})
+@Component({template: '<mat-icon aria-hidden="false">face</mat-icon>'})
 class IconWithAriaHiddenFalse { }
 
-@Component({template: `<md-icon [svgIcon]="iconName" *ngIf="showIcon">{{iconName}}</md-icon>`})
+@Component({template: `<mat-icon [svgIcon]="iconName" *ngIf="showIcon">{{iconName}}</mat-icon>`})
 class IconWithBindingAndNgIf {
   iconName = 'fluffy';
   showIcon = true;
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index f5a001d0ee01..8f52ee3ba010 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -20,15 +20,15 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {CanColor, mixinColor} from '@angular/material/core';
-import {MdIconRegistry} from './icon-registry';
+import {MatIconRegistry} from './icon-registry';
 
 
-// Boilerplate for applying mixins to MdIcon.
+// Boilerplate for applying mixins to MatIcon.
 /** @docs-private */
-export class MdIconBase {
+export class MatIconBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdIconMixinBase = mixinColor(MdIconBase);
+export const _MatIconMixinBase = mixinColor(MatIconBase);
 
 
 /**
@@ -36,32 +36,32 @@ export const _MdIconMixinBase = mixinColor(MdIconBase);
  *
  * - Specify the svgIcon input to load an SVG icon from a URL previously registered with the
  *   addSvgIcon, addSvgIconInNamespace, addSvgIconSet, or addSvgIconSetInNamespace methods of
- *   MdIconRegistry. If the svgIcon value contains a colon it is assumed to be in the format
+ *   MatIconRegistry. If the svgIcon value contains a colon it is assumed to be in the format
  *   "[namespace]:[name]", if not the value will be the name of an icon in the default namespace.
  *   Examples:
- *     <md-icon svgIcon="left-arrow"></md-icon>
- *     <md-icon svgIcon="animals:cat"></md-icon>
+ *     <mat-icon svgIcon="left-arrow"></mat-icon>
+ *     <mat-icon svgIcon="animals:cat"></mat-icon>
  *
- * - Use a font ligature as an icon by putting the ligature text in the content of the <md-icon>
+ * - Use a font ligature as an icon by putting the ligature text in the content of the <mat-icon>
  *   component. By default the Material icons font is used as described at
  *   http://google.github.io/material-design-icons/#icon-font-for-the-web. You can specify an
  *   alternate font by setting the fontSet input to either the CSS class to apply to use the
- *   desired font, or to an alias previously registered with MdIconRegistry.registerFontClassAlias.
+ *   desired font, or to an alias previously registered with MatIconRegistry.registerFontClassAlias.
  *   Examples:
- *     <md-icon>home</md-icon>
- *     <md-icon fontSet="myfont">sun</md-icon>
+ *     <mat-icon>home</mat-icon>
+ *     <mat-icon fontSet="myfont">sun</mat-icon>
  *
  * - Specify a font glyph to be included via CSS rules by setting the fontSet input to specify the
  *   font, and the fontIcon input to specify the icon. Typically the fontIcon will specify a
  *   CSS class which causes the glyph to be displayed via a :before selector, as in
  *   https://fortawesome.github.io/Font-Awesome/examples/
  *   Example:
- *     <md-icon fontSet="fa" fontIcon="alarm"></md-icon>
+ *     <mat-icon fontSet="fa" fontIcon="alarm"></mat-icon>
  */
 @Component({
   moduleId: module.id,
   template: '<ng-content></ng-content>',
-  selector: 'md-icon, mat-icon',
+  selector: 'mat-icon',
   styleUrls: ['icon.css'],
   inputs: ['color'],
   host: {
@@ -72,7 +72,7 @@ export const _MdIconMixinBase = mixinColor(MdIconBase);
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdIcon extends _MdIconMixinBase implements OnChanges, OnInit, CanColor {
+export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, CanColor {
 
   /** Name of the icon in the SVG icon set. */
   @Input() svgIcon: string;
@@ -89,7 +89,7 @@ export class MdIcon extends _MdIconMixinBase implements OnChanges, OnInit, CanCo
   constructor(
       renderer: Renderer2,
       elementRef: ElementRef,
-      private _mdIconRegistry: MdIconRegistry,
+      private _iconRegistry: MatIconRegistry,
       @Attribute('aria-hidden') ariaHidden: string) {
     super(renderer, elementRef);
 
@@ -131,7 +131,7 @@ export class MdIcon extends _MdIconMixinBase implements OnChanges, OnInit, CanCo
       if (this.svgIcon) {
         const [namespace, iconName] = this._splitIconName(this.svgIcon);
 
-        first.call(this._mdIconRegistry.getNamedSvgIcon(iconName, namespace)).subscribe(
+        first.call(this._iconRegistry.getNamedSvgIcon(iconName, namespace)).subscribe(
             svg => this._setSvgElement(svg),
             (err: Error) => console.log(`Error retrieving icon: ${err.message}`));
       } else {
@@ -146,7 +146,7 @@ export class MdIcon extends _MdIconMixinBase implements OnChanges, OnInit, CanCo
 
   ngOnInit() {
     // Update font classes because ngOnChanges won't be called if none of the inputs are present,
-    // e.g. <md-icon>arrow</md-icon>. In this case we need to add a CSS class for the default font.
+    // e.g. <mat-icon>arrow</mat-icon> In this case we need to add a CSS class for the default font.
     if (this._usingFontIcon()) {
       this._updateFontIconClasses();
     }
@@ -179,8 +179,8 @@ export class MdIcon extends _MdIconMixinBase implements OnChanges, OnInit, CanCo
 
     const elem = this._elementRef.nativeElement;
     const fontSetClass = this.fontSet ?
-        this._mdIconRegistry.classNameForFontAlias(this.fontSet) :
-        this._mdIconRegistry.getDefaultFontSetClass();
+        this._iconRegistry.classNameForFontAlias(this.fontSet) :
+        this._iconRegistry.getDefaultFontSetClass();
 
     if (fontSetClass != this._previousFontSetClass) {
       if (this._previousFontSetClass) {
diff --git a/src/lib/icon/mat-exports.ts b/src/lib/icon/mat-exports.ts
deleted file mode 100644
index 73a7dc18e85a..000000000000
--- a/src/lib/icon/mat-exports.ts
+++ /dev/null
@@ -1,17 +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 {MdIcon, MdIconBase} from './icon';
-import {MdIconRegistry} from './icon-registry';
-import {MdIconModule} from './icon-module';
-
-
-export {MdIcon as MatIcon};
-export {MdIconBase as MatIconBase};
-export {MdIconModule as MatIconModule};
-export {MdIconRegistry as MatIconRegistry};
diff --git a/src/lib/icon/public_api.ts b/src/lib/icon/public_api.ts
index ac95ddd5615a..acfae35041ea 100644
--- a/src/lib/icon/public_api.ts
+++ b/src/lib/icon/public_api.ts
@@ -9,4 +9,4 @@
 export * from './icon-module';
 export * from './icon';
 export * from './icon-registry';
-export * from './mat-exports';
+
diff --git a/src/lib/input/autosize.spec.ts b/src/lib/input/autosize.spec.ts
index f8fd600f97ae..9a4c9eda740e 100644
--- a/src/lib/input/autosize.spec.ts
+++ b/src/lib/input/autosize.spec.ts
@@ -2,18 +2,18 @@ import {Component, ViewChild} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {ComponentFixture, TestBed, async, fakeAsync, flushMicrotasks} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdInputModule} from './index';
-import {MdTextareaAutosize} from './autosize';
+import {MatInputModule} from './index';
+import {MatTextareaAutosize} from './autosize';
 
 
-describe('MdTextareaAutosize', () => {
+describe('MatTextareaAutosize', () => {
   let fixture: ComponentFixture<AutosizeTextAreaWithContent>;
   let textarea: HTMLTextAreaElement;
-  let autosize: MdTextareaAutosize;
+  let autosize: MatTextareaAutosize;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdInputModule, FormsModule],
+      imports: [MatInputModule, FormsModule],
       declarations: [
         AutosizeTextAreaWithContent,
         AutosizeTextAreaWithValue,
@@ -30,7 +30,7 @@ describe('MdTextareaAutosize', () => {
 
     textarea = fixture.nativeElement.querySelector('textarea');
     autosize = fixture.debugElement.query(
-        By.directive(MdTextareaAutosize)).injector.get<MdTextareaAutosize>(MdTextareaAutosize);
+        By.directive(MatTextareaAutosize)).injector.get<MatTextareaAutosize>(MatTextareaAutosize);
   });
 
   it('should resize the textarea based on its content', () => {
@@ -103,7 +103,7 @@ describe('MdTextareaAutosize', () => {
         .toBeGreaterThan(previousMaxHeight, 'Expected increased max-height with maxRows increase.');
   });
 
-  it('should export the mdAutosize reference', () => {
+  it('should export the matAutosize reference', () => {
     expect(fixture.componentInstance.autosize).toBeTruthy();
     expect(fixture.componentInstance.autosize.resizeToFitContent).toBeTruthy();
   });
@@ -150,7 +150,7 @@ describe('MdTextareaAutosize', () => {
     // detection should be triggered after a multiline content is set.
     fixture = TestBed.createComponent(AutosizeTextAreaWithContent);
     textarea = fixture.nativeElement.querySelector('textarea');
-    autosize = fixture.debugElement.query(By.css('textarea')).injector.get(MdTextareaAutosize);
+    autosize = fixture.debugElement.query(By.css('textarea')).injector.get(MatTextareaAutosize);
 
     fixture.componentInstance.content = `
       Line
@@ -215,21 +215,21 @@ const textareaStyleReset = `
 
 @Component({
   template: `
-    <textarea mdTextareaAutosize [mdAutosizeMinRows]="minRows" [mdAutosizeMaxRows]="maxRows"
-        #autosize="mdTextareaAutosize">
+    <textarea matTextareaAutosize [matAutosizeMinRows]="minRows" [matAutosizeMaxRows]="maxRows"
+        #autosize="matTextareaAutosize">
       {{content}}
     </textarea>`,
   styles: [textareaStyleReset],
 })
 class AutosizeTextAreaWithContent {
-  @ViewChild('autosize') autosize: MdTextareaAutosize;
+  @ViewChild('autosize') autosize: MatTextareaAutosize;
   minRows: number | null = null;
   maxRows: number | null = null;
   content: string = '';
 }
 
 @Component({
-  template: `<textarea mdTextareaAutosize [value]="value"></textarea>`,
+  template: `<textarea matTextareaAutosize [value]="value"></textarea>`,
   styles: [textareaStyleReset],
 })
 class AutosizeTextAreaWithValue {
@@ -237,7 +237,7 @@ class AutosizeTextAreaWithValue {
 }
 
 @Component({
-  template: `<textarea mdTextareaAutosize [(ngModel)]="model"></textarea>`,
+  template: `<textarea matTextareaAutosize [(ngModel)]="model"></textarea>`,
   styles: [textareaStyleReset],
 })
 class AutosizeTextareaWithNgModel {
diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts
index 1bc338021849..3b6df9739838 100644
--- a/src/lib/input/autosize.ts
+++ b/src/lib/input/autosize.ts
@@ -14,23 +14,22 @@ import {Platform} from '@angular/cdk/platform';
  * Directive to automatically resize a textarea to fit its content.
  */
 @Directive({
-  selector: `textarea[md-autosize], textarea[mdTextareaAutosize],
-             textarea[mat-autosize], textarea[matTextareaAutosize]`,
-  exportAs: 'mdTextareaAutosize, matTextareaAutosize',
+  selector: `textarea[mat-autosize], textarea[matTextareaAutosize]`,
+  exportAs: 'matTextareaAutosize',
   host: {
     // Textarea elements that have the directive applied should have a single row by default.
     // Browsers normally show two rows by default and therefore this limits the minRows binding.
     'rows': '1',
   },
 })
-export class MdTextareaAutosize implements AfterViewInit, DoCheck {
+export class MatTextareaAutosize implements AfterViewInit, DoCheck {
   /** Keep track of the previous textarea value to avoid resizing when the value hasn't changed. */
   private _previousValue: string;
 
   private _minRows: number;
   private _maxRows: number;
 
-  @Input('mdAutosizeMinRows')
+  @Input('matAutosizeMinRows')
   get minRows() { return this._minRows; }
 
   set minRows(value: number) {
@@ -38,21 +37,13 @@ export class MdTextareaAutosize implements AfterViewInit, DoCheck {
     this._setMinHeight();
   }
 
-  @Input('mdAutosizeMaxRows')
+  @Input('matAutosizeMaxRows')
   get maxRows() { return this._maxRows; }
   set maxRows(value: number) {
     this._maxRows = value;
     this._setMaxHeight();
   }
 
-  @Input('matAutosizeMinRows')
-  get _matAutosizeMinRows() { return this.minRows; }
-  set _matAutosizeMinRows(v) { this.minRows = v; }
-
-  @Input('matAutosizeMaxRows')
-  get _matAutosizeMaxRows() { return this.maxRows; }
-  set _matAutosizeMaxRows(v) { this.maxRows = v; }
-
   /** Cached height of a textarea with a single row. */
   private _cachedLineHeight: number;
 
diff --git a/src/lib/input/input-errors.ts b/src/lib/input/input-errors.ts
index 0ed0090f4e74..139696d2097f 100644
--- a/src/lib/input/input-errors.ts
+++ b/src/lib/input/input-errors.ts
@@ -7,6 +7,6 @@
  */
 
 /** @docs-private */
-export function getMdInputUnsupportedTypeError(type: string): Error {
-  return Error(`Input type "${type}" isn't supported by mdInput.`);
+export function getMatInputUnsupportedTypeError(type: string): Error {
+  return Error(`Input type "${type}" isn't supported by matInput.`);
 }
diff --git a/src/lib/input/input-module.ts b/src/lib/input/input-module.ts
index c114e4d0c2fe..57efdfb87d9e 100644
--- a/src/lib/input/input-module.ts
+++ b/src/lib/input/input-module.ts
@@ -9,27 +9,27 @@
 import {PlatformModule} from '@angular/cdk/platform';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdFormFieldModule} from '@angular/material/form-field';
-import {MdTextareaAutosize} from './autosize';
-import {MdInput} from './input';
+import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatTextareaAutosize} from './autosize';
+import {MatInput} from './input';
 
 
 @NgModule({
   declarations: [
-    MdInput,
-    MdTextareaAutosize,
+    MatInput,
+    MatTextareaAutosize,
   ],
   imports: [
     CommonModule,
-    MdFormFieldModule,
+    MatFormFieldModule,
     PlatformModule,
   ],
   exports: [
-    // We re-export the `MdFormFieldModule` since `MdInput` will almost always be used together with
-    // `MdFormField`.
-    MdFormFieldModule,
-    MdInput,
-    MdTextareaAutosize,
+    // We re-export the `MatFormFieldModule` since `MatInput` will almost always
+    // be used together with `MatFormField`.
+    MatFormFieldModule,
+    MatInput,
+    MatTextareaAutosize,
   ],
 })
-export class MdInputModule {}
+export class MatInputModule {}
diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index e3626c1fa6d4..c2cd28a0bc6c 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -1,25 +1,25 @@
-`<md-form-field>` is a wrapper for native `input` and `textarea` elements. This container
+`<mat-form-field>` is a wrapper for native `input` and `textarea` elements. This container
 applies Material Design styles and behavior while still allowing direct access to the underlying
 native element.
 
-The native element wrapped by the `md-form-field` must be marked with the `mdInput` directive.
+The native element wrapped by the `mat-form-field` must be marked with the `matInput` directive.
 
 <!-- example(input-overview) -->
 
 ### `input` and `textarea` attributes
 
 All of the attributes that can be used with normal `input` and `textarea` elements can be used on
-elements inside `md-form-field` as well. This includes Angular directives such as
+elements inside `mat-form-field` as well. This includes Angular directives such as
 `ngModel` and `formControl`.
 
 The only limitations are that the `type` attribute can only be one of the values supported by
-`mdInput` and the native element cannot specify a `placeholder` attribute if the `md-form-field`
-also contains an `md-placeholder` element.
+`matInput` and the native element cannot specify a `placeholder` attribute if the `mat-form-field`
+also contains an `mat-placeholder` element.
 
 ### Supported `input` types
 
 The following [input types](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input) can
-be used with `mdInput`:
+be used with `matInput`:
 * date
 * datetime-local
 * email
@@ -35,10 +35,10 @@ be used with `mdInput`:
 
 ### Error messages
 
-Error messages can be shown beneath an input by specifying `md-error` elements inside the
-`md-form-field`. Errors are hidden by default and will be displayed on invalid inputs after
+Error messages can be shown beneath an input by specifying `mat-error` elements inside the
+`mat-form-field`. Errors are hidden by default and will be displayed on invalid inputs after
 the user has interacted with the element or the parent form has been submitted. In addition,
-whenever errors are displayed, the container's `md-hint` labels will be hidden.
+whenever errors are displayed, the container's `mat-hint` labels will be hidden.
 
 If an input element can have more than one error state, it is up to the consumer to toggle which
 messages should be displayed. This can be done with CSS, `ngIf` or `ngSwitch`.
@@ -53,22 +53,22 @@ only show one at a time.
 A placeholder is an indicative text displayed in the input zone when the input does not contain
 text. When text is present, the indicative text will float above this input zone.
 
-The `floatPlaceholder` attribute of `md-form-field` can be set to `never` to hide the
+The `floatPlaceholder` attribute of `mat-form-field` can be set to `never` to hide the
 indicative text instead when text is present in the input.
 
 When setting `floatPlaceholder` to `always`, the floating label will always show above the input.
 
 A placeholder for the input can be specified in one of two ways: either using the `placeholder`
-attribute on the `input` or `textarea`, or using an `md-placeholder` element in the
-`md-form-field`. Using both will raise an error.
+attribute on the `input` or `textarea`, or using an `mat-placeholder` element in the
+`mat-form-field`. Using both will raise an error.
 
-Global default placeholder options can be specified by setting the `MD_PLACEHOLDER_GLOBAL_OPTIONS`
+Global default placeholder options can be specified by setting the `MAT_PLACEHOLDER_GLOBAL_OPTIONS`
 provider. This setting will apply to all components that support the floating placeholder.
 
 ```ts
 @NgModule({
   providers: [
-    {provide: MD_PLACEHOLDER_GLOBAL_OPTIONS, useValue: {float: 'always'}}
+    {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: {float: 'always'}}
   ]
 })
 ```
@@ -84,19 +84,19 @@ Here are the available global options:
 HTML can be included before and after the input tag, as a prefix or suffix. It will be underlined
 as per the Material specification, and clicking it will focus the input.
 
-Adding the `mdPrefix` attribute to an element inside the `md-form-field` will designate it as
-the prefix. Similarly, adding `mdSuffix` will designate it as the suffix.
+Adding the `matPrefix` attribute to an element inside the `mat-form-field` will designate it as
+the prefix. Similarly, adding `matSuffix` will designate it as the suffix.
 
 <!-- example(input-prefix-suffix) -->
 
 ### Hint Labels
 
-Hint labels are the labels that show below the underline. An `md-form-field` can have up to two
+Hint labels are the labels that show below the underline. An `mat-form-field` can have up to two
 hint labels; one on the `start` of the line (left in an LTR language, right in RTL), and one on the
 `end`.
 
 Hint labels are specified in one of two ways: either using the `hintLabel` attribute of
-`md-form-field`, or using an `md-hint` element inside the `md-form-field`, which takes an
+`mat-form-field`, or using an `mat-hint` element inside the `mat-form-field`, which takes an
 `align` attribute containing the side. The attribute version is assumed to be at the `start`.
 Specifying a side twice will result in an exception during initialization.
 
@@ -105,7 +105,7 @@ Specifying a side twice will result in an exception during initialization.
 ### Underline Color
 
 The underline (line under the `input` content) color can be changed by using the `color`
-attribute of `md-form-field`. A value of `primary` is the default and will correspond to the
+attribute of `mat-form-field`. A value of `primary` is the default and will correspond to the
 theme primary color. Alternatively, `accent` or `warn` can be specified to use the theme's accent or
 warn color.
 
@@ -114,15 +114,15 @@ warn color.
 By default, error messages are shown when the control is invalid and either the user has interacted with
 (touched) the element or the parent form has been submitted. If you wish to override this
 behavior (e.g. to show the error as soon as the invalid control is dirty or when a parent form group
-is invalid), you can use the `errorStateMatcher` property of the `mdInput`. To use this property,
+is invalid), you can use the `errorStateMatcher` property of the `matInput`. To use this property,
 create a function in your component class that returns a boolean. A result of `true` will display
 the error messages.
 
 ```html
-<md-form-field>
-  <input mdInput [(ngModel)]="myInput" required [errorStateMatcher]="myErrorStateMatcher">
-  <md-error>This field is required</md-error>
-</md-form-field>
+<mat-form-field>
+  <input matInput [(ngModel)]="myInput" required [errorStateMatcher]="myErrorStateMatcher">
+  <mat-error>This field is required</mat-error>
+</mat-form-field>
 ```
 
 ```ts
@@ -133,14 +133,14 @@ function myErrorStateMatcher(control: FormControl, form: FormGroupDirective | Ng
 }
 ```
 
-A global error state matcher can be specified by setting the `MD_ERROR_GLOBAL_OPTIONS` provider. This applies
+A global error state matcher can be specified by setting the `MAT_ERROR_GLOBAL_OPTIONS` provider. This applies
 to all inputs. For convenience, `showOnDirtyErrorStateMatcher` is available in order to globally set
 input errors to show when the input is dirty and invalid.
 
 ```ts
 @NgModule({
   providers: [
-    {provide: MD_ERROR_GLOBAL_OPTIONS, useValue: {errorStateMatcher: showOnDirtyErrorStateMatcher}}
+    {provide: MAT_ERROR_GLOBAL_OPTIONS, useValue: {errorStateMatcher: showOnDirtyErrorStateMatcher}}
   ]
 })
 ```
@@ -152,11 +152,11 @@ Here are the available global options:
 | errorStateMatcher | Function | Returns a boolean specifying if the error should be shown |
 
 ### Accessibility
-The `mdInput` directive works with native `<input>` to provide an accessible experience.
+The `matInput` directive works with native `<input>` to provide an accessible experience.
 
-If a placeholder attribute is added to the input, or a `md-placeholder` element is added
+If a placeholder attribute is added to the input, or a `mat-placeholder` element is added
 in the form field, the placeholder text will automatically be used as the label for the input.
 If there's no placeholder specified, `aria-label`, `aria-labelledby` or `<label for=...>` should be
 added.
 
-Any `md-error` and `md-hint` are automatically added to the input's `aria-describedby`.
+Any `mat-error` and `mat-hint` are automatically added to the input's `aria-describedby`.
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 5c083fdd825b..1743fca7fde3 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -12,62 +12,62 @@ import {
   Validators,
 } from '@angular/forms';
 import {
-  MD_ERROR_GLOBAL_OPTIONS,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  MAT_ERROR_GLOBAL_OPTIONS,
+  MAT_PLACEHOLDER_GLOBAL_OPTIONS,
   showOnDirtyErrorStateMatcher,
 } from '@angular/material/core';
 import {
-  getMdFormFieldDuplicatedHintError,
-  getMdFormFieldMissingControlError,
-  getMdFormFieldPlaceholderConflictError,
-  MdFormField,
-  MdFormFieldModule,
+  getMatFormFieldDuplicatedHintError,
+  getMatFormFieldMissingControlError,
+  getMatFormFieldPlaceholderConflictError,
+  MatFormField,
+  MatFormFieldModule,
 } from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdInputModule} from './index';
-import {MdInput} from './input';
+import {MatInputModule} from './index';
+import {MatInput} from './input';
 
-describe('MdInput without forms', function () {
+describe('MatInput without forms', function () {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
-        MdFormFieldModule,
-        MdInputModule,
+        MatFormFieldModule,
+        MatInputModule,
         NoopAnimationsModule,
         PlatformModule,
         ReactiveFormsModule,
       ],
       declarations: [
-        MdInputDateTestController,
-        MdInputHintLabel2TestController,
-        MdInputHintLabelTestController,
-        MdInputInvalidHint2TestController,
-        MdInputInvalidHintTestController,
-        MdInputInvalidPlaceholderTestController,
-        MdInputInvalidTypeTestController,
-        MdInputMissingMdInputTestController,
-        MdInputMultipleHintMixedTestController,
-        MdInputMultipleHintTestController,
-        MdInputNumberTestController,
-        MdInputPasswordTestController,
-        MdInputPlaceholderAttrTestComponent,
-        MdInputPlaceholderElementTestComponent,
-        MdInputPlaceholderRequiredTestComponent,
-        MdInputTextTestController,
-        MdInputWithDisabled,
-        MdInputWithDynamicPlaceholder,
-        MdInputWithId,
-        MdInputWithPrefixAndSuffix,
-        MdInputWithRequired,
-        MdInputWithStaticPlaceholder,
-        MdInputWithType,
-        MdInputWithValueBinding,
-        MdInputTextareaWithBindings,
-        MdInputWithNgIf,
-        MdInputOnPush,
-        MdInputWithReadonlyInput,
+        MatInputDateTestController,
+        MatInputHintLabel2TestController,
+        MatInputHintLabelTestController,
+        MatInputInvalidHint2TestController,
+        MatInputInvalidHintTestController,
+        MatInputInvalidPlaceholderTestController,
+        MatInputInvalidTypeTestController,
+        MatInputMissingMatInputTestController,
+        MatInputMultipleHintMixedTestController,
+        MatInputMultipleHintTestController,
+        MatInputNumberTestController,
+        MatInputPasswordTestController,
+        MatInputPlaceholderAttrTestComponent,
+        MatInputPlaceholderElementTestComponent,
+        MatInputPlaceholderRequiredTestComponent,
+        MatInputTextTestController,
+        MatInputWithDisabled,
+        MatInputWithDynamicPlaceholder,
+        MatInputWithId,
+        MatInputWithPrefixAndSuffix,
+        MatInputWithRequired,
+        MatInputWithStaticPlaceholder,
+        MatInputWithType,
+        MatInputWithValueBinding,
+        MatInputTextareaWithBindings,
+        MatInputWithNgIf,
+        MatInputOnPush,
+        MatInputWithReadonlyInput,
       ],
     });
 
@@ -75,13 +75,13 @@ describe('MdInput without forms', function () {
   }));
 
   it('should default to floating placeholders', () => {
-    let fixture = TestBed.createComponent(MdInputWithId);
+    let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
-    let formField = fixture.debugElement.query(By.directive(MdFormField))
-        .componentInstance as MdFormField;
+    let formField = fixture.debugElement.query(By.directive(MatFormField))
+        .componentInstance as MatFormField;
     expect(formField.floatPlaceholder).toBe('auto',
-        'Expected MdInput to set floatingLabel to auto by default.');
+        'Expected MatInput to set floatingLabel to auto by default.');
   });
 
   it('should default to global floating placeholder type', () => {
@@ -89,29 +89,29 @@ describe('MdInput without forms', function () {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
-        MdFormFieldModule,
-        MdInputModule,
+        MatFormFieldModule,
+        MatInputModule,
         NoopAnimationsModule
       ],
       declarations: [
-        MdInputWithId
+        MatInputWithId
       ],
-      providers: [{ provide: MD_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
+      providers: [{ provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
     });
 
-    let fixture = TestBed.createComponent(MdInputWithId);
+    let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
-    let formField = fixture.debugElement.query(By.directive(MdFormField))
-        .componentInstance as MdFormField;
+    let formField = fixture.debugElement.query(By.directive(MatFormField))
+        .componentInstance as MatFormField;
     expect(formField.floatPlaceholder).toBe('always',
-        'Expected MdInput to set floatingLabel to always from global option.');
+        'Expected MatInput to set floatingLabel to always from global option.');
   });
 
   it('should not be treated as empty if type is date',
       inject([Platform], (platform: Platform) => {
         if (!(platform.TRIDENT || platform.FIREFOX || (platform.SAFARI && !platform.IOS))) {
-          let fixture = TestBed.createComponent(MdInputDateTestController);
+          let fixture = TestBed.createComponent(MatInputDateTestController);
           fixture.detectChanges();
 
           let el = fixture.debugElement.query(By.css('label')).nativeElement;
@@ -124,7 +124,7 @@ describe('MdInput without forms', function () {
   it('should be treated as empty if type is date on Firefox and IE',
       inject([Platform], (platform: Platform) => {
         if (platform.TRIDENT || platform.FIREFOX || (platform.SAFARI && !platform.IOS)) {
-          let fixture = TestBed.createComponent(MdInputDateTestController);
+          let fixture = TestBed.createComponent(MatInputDateTestController);
           fixture.detectChanges();
 
           let el = fixture.debugElement.query(By.css('label')).nativeElement;
@@ -134,7 +134,7 @@ describe('MdInput without forms', function () {
       }));
 
   it('should treat text input type as empty at init', () => {
-    let fixture = TestBed.createComponent(MdInputTextTestController);
+    let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label')).nativeElement;
@@ -143,7 +143,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should treat password input type as empty at init', () => {
-    let fixture = TestBed.createComponent(MdInputPasswordTestController);
+    let fixture = TestBed.createComponent(MatInputPasswordTestController);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label')).nativeElement;
@@ -152,7 +152,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should treat number input type as empty at init', () => {
-    let fixture = TestBed.createComponent(MdInputNumberTestController);
+    let fixture = TestBed.createComponent(MatInputNumberTestController);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label')).nativeElement;
@@ -161,7 +161,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should not be empty after input entered', async(() => {
-    let fixture = TestBed.createComponent(MdInputTextTestController);
+    let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input'));
@@ -179,7 +179,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('should update the placeholder when input entered', async(() => {
-    let fixture = TestBed.createComponent(MdInputWithStaticPlaceholder);
+    let fixture = TestBed.createComponent(MatInputWithStaticPlaceholder);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input'));
@@ -199,7 +199,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('should not be empty when the value set before view init', async(() => {
-    let fixture = TestBed.createComponent(MdInputWithValueBinding);
+    let fixture = TestBed.createComponent(MatInputWithValueBinding);
     fixture.detectChanges();
 
     let placeholderEl =
@@ -214,7 +214,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('should add id', () => {
-    let fixture = TestBed.createComponent(MdInputTextTestController);
+    let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
     const inputElement: HTMLInputElement =
@@ -227,7 +227,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should add aria-owns to the label for the associated control', () => {
-    let fixture = TestBed.createComponent(MdInputTextTestController);
+    let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
     const inputElement: HTMLInputElement =
@@ -239,7 +239,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should not overwrite existing id', () => {
-    let fixture = TestBed.createComponent(MdInputWithId);
+    let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
     const inputElement: HTMLInputElement =
@@ -252,58 +252,58 @@ describe('MdInput without forms', function () {
   });
 
   it('validates there\'s only one hint label per side', () => {
-    let fixture = TestBed.createComponent(MdInputInvalidHintTestController);
+    let fixture = TestBed.createComponent(MatInputInvalidHintTestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
-        wrappedErrorMessage(getMdFormFieldDuplicatedHintError('start')));
+        wrappedErrorMessage(getMatFormFieldDuplicatedHintError('start')));
   });
 
   it('validates there\'s only one hint label per side (attribute)', () => {
-    let fixture = TestBed.createComponent(MdInputInvalidHint2TestController);
+    let fixture = TestBed.createComponent(MatInputInvalidHint2TestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
-        wrappedErrorMessage(getMdFormFieldDuplicatedHintError('start')));
+        wrappedErrorMessage(getMatFormFieldDuplicatedHintError('start')));
   });
 
   it('validates there\'s only one placeholder', () => {
-    let fixture = TestBed.createComponent(MdInputInvalidPlaceholderTestController);
+    let fixture = TestBed.createComponent(MatInputInvalidPlaceholderTestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
-        wrappedErrorMessage(getMdFormFieldPlaceholderConflictError()));
+        wrappedErrorMessage(getMatFormFieldPlaceholderConflictError()));
   });
 
-  it('validates that mdInput child is present', () => {
-    let fixture = TestBed.createComponent(MdInputMissingMdInputTestController);
+  it('validates that matInput child is present', () => {
+    let fixture = TestBed.createComponent(MatInputMissingMatInputTestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
-        wrappedErrorMessage(getMdFormFieldMissingControlError()));
+        wrappedErrorMessage(getMatFormFieldMissingControlError()));
   });
 
-  it('validates that mdInput child is present after initialization', async(() => {
-    let fixture = TestBed.createComponent(MdInputWithNgIf);
+  it('validates that matInput child is present after initialization', async(() => {
+    let fixture = TestBed.createComponent(MatInputWithNgIf);
 
     expect(() => fixture.detectChanges()).not.toThrowError(
-        wrappedErrorMessage(getMdFormFieldMissingControlError()));
+        wrappedErrorMessage(getMatFormFieldMissingControlError()));
 
     fixture.componentInstance.renderInput = false;
 
     expect(() => fixture.detectChanges()).toThrowError(
-        wrappedErrorMessage(getMdFormFieldMissingControlError()));
+        wrappedErrorMessage(getMatFormFieldMissingControlError()));
   }));
 
   it('validates the type', () => {
-    let fixture = TestBed.createComponent(MdInputInvalidTypeTestController);
+    let fixture = TestBed.createComponent(MatInputInvalidTypeTestController);
 
     // Technically this throws during the OnChanges detection phase,
     // so the error is really a ChangeDetectionError and it becomes
     // hard to build a full exception to compare with.
     // We just check for any exception in this case.
     expect(() => fixture.detectChanges()).toThrow(
-        /* new MdInputUnsupportedTypeError('file') */);
+        /* new MatInputUnsupportedTypeError('file') */);
   });
 
   it('supports hint labels attribute', () => {
-    let fixture = TestBed.createComponent(MdInputHintLabelTestController);
+    let fixture = TestBed.createComponent(MatInputHintLabelTestController);
     fixture.detectChanges();
 
     // If the hint label is empty, expect no label.
@@ -315,7 +315,7 @@ describe('MdInput without forms', function () {
   });
 
   it('sets an id on hint labels', () => {
-    let fixture = TestBed.createComponent(MdInputHintLabelTestController);
+    let fixture = TestBed.createComponent(MatInputHintLabelTestController);
 
     fixture.componentInstance.label = 'label';
     fixture.detectChanges();
@@ -326,32 +326,32 @@ describe('MdInput without forms', function () {
   });
 
   it('supports hint labels elements', () => {
-    let fixture = TestBed.createComponent(MdInputHintLabel2TestController);
+    let fixture = TestBed.createComponent(MatInputHintLabel2TestController);
     fixture.detectChanges();
 
-    // In this case, we should have an empty <md-hint>.
-    let el = fixture.debugElement.query(By.css('md-hint')).nativeElement;
+    // In this case, we should have an empty <mat-hint>.
+    let el = fixture.debugElement.query(By.css('mat-hint')).nativeElement;
     expect(el.textContent).toBeFalsy();
 
     fixture.componentInstance.label = 'label';
     fixture.detectChanges();
-    el = fixture.debugElement.query(By.css('md-hint')).nativeElement;
+    el = fixture.debugElement.query(By.css('mat-hint')).nativeElement;
     expect(el.textContent).toBe('label');
   });
 
   it('sets an id on the hint element', () => {
-    let fixture = TestBed.createComponent(MdInputHintLabel2TestController);
+    let fixture = TestBed.createComponent(MatInputHintLabel2TestController);
 
     fixture.componentInstance.label = 'label';
     fixture.detectChanges();
 
-    let hint = fixture.debugElement.query(By.css('md-hint')).nativeElement;
+    let hint = fixture.debugElement.query(By.css('mat-hint')).nativeElement;
 
     expect(hint.getAttribute('id')).toBeTruthy();
   });
 
   it('supports placeholder attribute', async(() => {
-    let fixture = TestBed.createComponent(MdInputPlaceholderAttrTestComponent);
+    let fixture = TestBed.createComponent(MatInputPlaceholderAttrTestComponent);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -371,7 +371,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('supports placeholder element', async(() => {
-    let fixture = TestBed.createComponent(MdInputPlaceholderElementTestComponent);
+    let fixture = TestBed.createComponent(MatInputPlaceholderElementTestComponent);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label'));
@@ -388,7 +388,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('supports placeholder required star', () => {
-    let fixture = TestBed.createComponent(MdInputPlaceholderRequiredTestComponent);
+    let fixture = TestBed.createComponent(MatInputPlaceholderRequiredTestComponent);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label'));
@@ -397,7 +397,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should hide the required star from screen readers', () => {
-    let fixture = TestBed.createComponent(MdInputPlaceholderRequiredTestComponent);
+    let fixture = TestBed.createComponent(MatInputPlaceholderRequiredTestComponent);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('.mat-form-field-required-marker')).nativeElement;
@@ -406,7 +406,7 @@ describe('MdInput without forms', function () {
   });
 
   it('hide placeholder required star when set to hide the required marker', () => {
-    let fixture = TestBed.createComponent(MdInputPlaceholderRequiredTestComponent);
+    let fixture = TestBed.createComponent(MatInputPlaceholderRequiredTestComponent);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label'));
@@ -420,7 +420,7 @@ describe('MdInput without forms', function () {
   });
 
   it('supports the disabled attribute as binding', async(() => {
-    const fixture = TestBed.createComponent(MdInputWithDisabled);
+    const fixture = TestBed.createComponent(MatInputWithDisabled);
     fixture.detectChanges();
 
     const underlineEl =
@@ -440,7 +440,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('supports the required attribute as binding', async(() => {
-    let fixture = TestBed.createComponent(MdInputWithRequired);
+    let fixture = TestBed.createComponent(MatInputWithRequired);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -454,7 +454,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('supports the type attribute as binding', async(() => {
-    let fixture = TestBed.createComponent(MdInputWithType);
+    let fixture = TestBed.createComponent(MatInputWithType);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -468,7 +468,7 @@ describe('MdInput without forms', function () {
   }));
 
   it('supports textarea', () => {
-    let fixture = TestBed.createComponent(MdInputTextareaWithBindings);
+    let fixture = TestBed.createComponent(MatInputTextareaWithBindings);
     fixture.detectChanges();
 
     const textarea: HTMLTextAreaElement = fixture.nativeElement.querySelector('textarea');
@@ -476,7 +476,7 @@ describe('MdInput without forms', function () {
   });
 
   it('sets the aria-describedby when a hintLabel is set', () => {
-    let fixture = TestBed.createComponent(MdInputHintLabelTestController);
+    let fixture = TestBed.createComponent(MatInputHintLabelTestController);
 
     fixture.componentInstance.label = 'label';
     fixture.detectChanges();
@@ -487,8 +487,8 @@ describe('MdInput without forms', function () {
     expect(input.getAttribute('aria-describedby')).toBe(hint.getAttribute('id'));
   });
 
-  it('sets the aria-describedby to the id of the md-hint', () => {
-    let fixture = TestBed.createComponent(MdInputHintLabel2TestController);
+  it('sets the aria-describedby to the id of the mat-hint', () => {
+    let fixture = TestBed.createComponent(MatInputHintLabel2TestController);
 
     fixture.componentInstance.label = 'label';
     fixture.detectChanges();
@@ -499,8 +499,8 @@ describe('MdInput without forms', function () {
     expect(input.getAttribute('aria-describedby')).toBe(hint.getAttribute('id'));
   });
 
-  it('sets the aria-describedby with multiple md-hint instances', () => {
-    let fixture = TestBed.createComponent(MdInputMultipleHintTestController);
+  it('sets the aria-describedby with multiple mat-hint instances', () => {
+    let fixture = TestBed.createComponent(MatInputMultipleHintTestController);
 
     fixture.componentInstance.startId = 'start';
     fixture.componentInstance.endId = 'end';
@@ -511,8 +511,8 @@ describe('MdInput without forms', function () {
     expect(input.getAttribute('aria-describedby')).toBe('start end');
   });
 
-  it('sets the aria-describedby when a hintLabel is set, in addition to a md-hint', () => {
-    let fixture = TestBed.createComponent(MdInputMultipleHintMixedTestController);
+  it('sets the aria-describedby when a hintLabel is set, in addition to a mat-hint', () => {
+    let fixture = TestBed.createComponent(MatInputMultipleHintMixedTestController);
 
     fixture.detectChanges();
 
@@ -525,7 +525,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should float when floatPlaceholder is set to default and text is entered', () => {
-    let fixture = TestBed.createComponent(MdInputWithDynamicPlaceholder);
+    let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -551,7 +551,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should always float the placeholder when floatPlaceholder is set to true', () => {
-    let fixture = TestBed.createComponent(MdInputWithDynamicPlaceholder);
+    let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -574,7 +574,7 @@ describe('MdInput without forms', function () {
 
 
   it('should never float the placeholder when floatPlaceholder is set to false', () => {
-    let fixture = TestBed.createComponent(MdInputWithDynamicPlaceholder);
+    let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
 
     fixture.componentInstance.shouldFloat = 'never';
     fixture.detectChanges();
@@ -596,12 +596,12 @@ describe('MdInput without forms', function () {
   });
 
   it('should be able to toggle the floating placeholder programmatically', () => {
-    const fixture = TestBed.createComponent(MdInputWithId);
+    const fixture = TestBed.createComponent(MatInputWithId);
 
     fixture.detectChanges();
 
-    const formField = fixture.debugElement.query(By.directive(MdFormField));
-    const containerInstance = formField.componentInstance as MdFormField;
+    const formField = fixture.debugElement.query(By.directive(MatFormField));
+    const containerInstance = formField.componentInstance as MatFormField;
     const placeholder = formField.nativeElement.querySelector('.mat-form-field-placeholder');
 
     expect(containerInstance.floatPlaceholder).toBe('auto');
@@ -616,7 +616,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should not have prefix and suffix elements when none are specified', () => {
-    let fixture = TestBed.createComponent(MdInputWithId);
+    let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
     let prefixEl = fixture.debugElement.query(By.css('.mat-form-field-prefix'));
@@ -627,7 +627,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should add prefix and suffix elements when specified', () => {
-    let fixture = TestBed.createComponent(MdInputWithPrefixAndSuffix);
+    let fixture = TestBed.createComponent(MatInputWithPrefixAndSuffix);
     fixture.detectChanges();
 
     let prefixEl = fixture.debugElement.query(By.css('.mat-form-field-prefix'));
@@ -640,7 +640,7 @@ describe('MdInput without forms', function () {
   });
 
   it('should update empty class when value changes programmatically and OnPush', () => {
-    let fixture = TestBed.createComponent(MdInputOnPush);
+    let fixture = TestBed.createComponent(MatInputOnPush);
     fixture.detectChanges();
 
     let component = fixture.componentInstance;
@@ -656,12 +656,12 @@ describe('MdInput without forms', function () {
   });
 
   it('should set the focused class when the input is focused', () => {
-    let fixture = TestBed.createComponent(MdInputTextTestController);
+    let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
-    let input = fixture.debugElement.query(By.directive(MdInput))
-      .injector.get<MdInput>(MdInput);
-    let container = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
+    let input = fixture.debugElement.query(By.directive(MatInput))
+      .injector.get<MatInput>(MatInput);
+    let container = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
 
     // Call the focus handler directly to avoid flakyness where
     // browsers don't focus elements if the window is minimized.
@@ -672,11 +672,11 @@ describe('MdInput without forms', function () {
   });
 
   it('should be able to animate the placeholder up and lock it in position', () => {
-    let fixture = TestBed.createComponent(MdInputTextTestController);
+    let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
-    let inputContainer = fixture.debugElement.query(By.directive(MdFormField))
-        .componentInstance as MdFormField;
+    let inputContainer = fixture.debugElement.query(By.directive(MatFormField))
+        .componentInstance as MatFormField;
     let placeholder = fixture.debugElement.query(By.css('.mat-input-placeholder')).nativeElement;
 
     expect(inputContainer.floatPlaceholder).toBe('auto');
@@ -699,24 +699,24 @@ describe('MdInput without forms', function () {
   });
 });
 
-describe('MdInput with forms', () => {
+describe('MatInput with forms', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
-        MdFormFieldModule,
-        MdInputModule,
+        MatFormFieldModule,
+        MatInputModule,
         NoopAnimationsModule,
         PlatformModule,
         ReactiveFormsModule,
       ],
       declarations: [
-        MdInputWithFormControl,
-        MdInputWithFormErrorMessages,
-        MdInputWithCustomErrorStateMatcher,
-        MdInputWithFormGroupErrorMessages,
-        MdInputZeroTestController,
+        MatInputWithFormControl,
+        MatInputWithFormErrorMessages,
+        MatInputWithCustomErrorStateMatcher,
+        MatInputWithFormGroupErrorMessages,
+        MatInputZeroTestController,
       ],
     });
 
@@ -724,29 +724,29 @@ describe('MdInput with forms', () => {
   }));
 
   describe('error messages', () => {
-    let fixture: ComponentFixture<MdInputWithFormErrorMessages>;
-    let testComponent: MdInputWithFormErrorMessages;
+    let fixture: ComponentFixture<MatInputWithFormErrorMessages>;
+    let testComponent: MatInputWithFormErrorMessages;
     let containerEl: HTMLElement;
     let inputEl: HTMLElement;
 
     beforeEach(() => {
-      fixture = TestBed.createComponent(MdInputWithFormErrorMessages);
+      fixture = TestBed.createComponent(MatInputWithFormErrorMessages);
       fixture.detectChanges();
       testComponent = fixture.componentInstance;
-      containerEl = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
+      containerEl = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
       inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
     });
 
     it('should not show any errors if the user has not interacted', () => {
       expect(testComponent.formControl.untouched).toBe(true, 'Expected untouched form control');
-      expect(containerEl.querySelectorAll('md-error').length).toBe(0, 'Expected no error messages');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
       expect(inputEl.getAttribute('aria-invalid'))
         .toBe('false', 'Expected aria-invalid to be set to "false".');
     });
 
     it('should display an error message when the input is touched and invalid', async(() => {
       expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid');
-      expect(containerEl.querySelectorAll('md-error').length).toBe(0, 'Expected no error messages');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
 
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
@@ -754,7 +754,7 @@ describe('MdInput with forms', () => {
       fixture.whenStable().then(() => {
         expect(containerEl.classList)
           .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('md-error').length)
+        expect(containerEl.querySelectorAll('mat-error').length)
           .toBe(1, 'Expected one error message to have been rendered.');
         expect(inputEl.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to "true".');
@@ -764,7 +764,7 @@ describe('MdInput with forms', () => {
     it('should display an error message when the parent form is submitted', async(() => {
       expect(testComponent.form.submitted).toBe(false, 'Expected form not to have been submitted');
       expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid');
-      expect(containerEl.querySelectorAll('md-error').length).toBe(0, 'Expected no error messages');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
 
       dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
       fixture.detectChanges();
@@ -773,7 +773,7 @@ describe('MdInput with forms', () => {
         expect(testComponent.form.submitted).toBe(true, 'Expected form to have been submitted');
         expect(containerEl.classList)
           .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('md-error').length)
+        expect(containerEl.querySelectorAll('mat-error').length)
           .toBe(1, 'Expected one error message to have been rendered.');
         expect(inputEl.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to "true".');
@@ -783,16 +783,16 @@ describe('MdInput with forms', () => {
     it('should display an error message when the parent form group is submitted', async(() => {
       fixture.destroy();
 
-      let groupFixture = TestBed.createComponent(MdInputWithFormGroupErrorMessages);
-      let component: MdInputWithFormGroupErrorMessages;
+      let groupFixture = TestBed.createComponent(MatInputWithFormGroupErrorMessages);
+      let component: MatInputWithFormGroupErrorMessages;
 
       groupFixture.detectChanges();
       component = groupFixture.componentInstance;
-      containerEl = groupFixture.debugElement.query(By.css('md-form-field')).nativeElement;
+      containerEl = groupFixture.debugElement.query(By.css('mat-form-field')).nativeElement;
       inputEl = groupFixture.debugElement.query(By.css('input')).nativeElement;
 
       expect(component.formGroup.invalid).toBe(true, 'Expected form control to be invalid');
-      expect(containerEl.querySelectorAll('md-error').length).toBe(0, 'Expected no error messages');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
       expect(inputEl.getAttribute('aria-invalid'))
         .toBe('false', 'Expected aria-invalid to be set to "false".');
       expect(component.formGroupDirective.submitted)
@@ -806,7 +806,7 @@ describe('MdInput with forms', () => {
           .toBe(true, 'Expected form to have been submitted');
         expect(containerEl.classList)
           .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('md-error').length)
+        expect(containerEl.querySelectorAll('mat-error').length)
           .toBe(1, 'Expected one error message to have been rendered.');
         expect(inputEl.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to "true".');
@@ -820,9 +820,9 @@ describe('MdInput with forms', () => {
       fixture.whenStable().then(() => {
         expect(containerEl.classList)
           .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('md-error').length)
+        expect(containerEl.querySelectorAll('mat-error').length)
           .toBe(1, 'Expected one error message to have been rendered.');
-        expect(containerEl.querySelectorAll('md-hint').length)
+        expect(containerEl.querySelectorAll('mat-hint').length)
           .toBe(0, 'Expected no hints to be shown.');
 
         testComponent.formControl.setValue('something');
@@ -831,9 +831,9 @@ describe('MdInput with forms', () => {
         fixture.whenStable().then(() => {
           expect(containerEl.classList).not.toContain('mat-form-field-invalid',
             'Expected container not to have the invalid class when valid.');
-          expect(containerEl.querySelectorAll('md-error').length)
+          expect(containerEl.querySelectorAll('mat-error').length)
             .toBe(0, 'Expected no error messages when the input is valid.');
-          expect(containerEl.querySelectorAll('md-hint').length)
+          expect(containerEl.querySelectorAll('mat-hint').length)
             .toBe(1, 'Expected one hint to be shown once the input is valid.');
         });
       });
@@ -843,14 +843,14 @@ describe('MdInput with forms', () => {
       testComponent.renderError = false;
       fixture.detectChanges();
 
-      expect(containerEl.querySelectorAll('md-hint').length)
+      expect(containerEl.querySelectorAll('mat-hint').length)
         .toBe(1, 'Expected one hint to be shown on load.');
 
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        expect(containerEl.querySelectorAll('md-hint').length)
+        expect(containerEl.querySelectorAll('mat-hint').length)
           .toBe(1, 'Expected one hint to still be shown.');
       });
     }));
@@ -859,7 +859,7 @@ describe('MdInput with forms', () => {
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
 
-      expect(containerEl.querySelector('md-error')!.getAttribute('role')).toBe('alert');
+      expect(containerEl.querySelector('mat-error')!.getAttribute('role')).toBe('alert');
     });
 
     it('sets the aria-describedby to reference errors when in error state', () => {
@@ -884,28 +884,28 @@ describe('MdInput with forms', () => {
   describe('custom error behavior', () => {
 
     it('should display an error message when a custom error matcher returns true', () => {
-      let fixture = TestBed.createComponent(MdInputWithCustomErrorStateMatcher);
+      let fixture = TestBed.createComponent(MatInputWithCustomErrorStateMatcher);
       fixture.detectChanges();
 
       let component = fixture.componentInstance;
-      let containerEl = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
+      let containerEl = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
 
       const control = component.formGroup.get('name')!;
 
       expect(control.invalid).toBe(true, 'Expected form control to be invalid');
-      expect(containerEl.querySelectorAll('md-error').length)
+      expect(containerEl.querySelectorAll('mat-error').length)
         .toBe(0, 'Expected no error messages');
 
       control.markAsTouched();
       fixture.detectChanges();
 
-      expect(containerEl.querySelectorAll('md-error').length)
+      expect(containerEl.querySelectorAll('mat-error').length)
         .toBe(0, 'Expected no error messages after being touched.');
 
       component.errorState = true;
       fixture.detectChanges();
 
-      expect(containerEl.querySelectorAll('md-error').length)
+      expect(containerEl.querySelectorAll('mat-error').length)
         .toBe(1, 'Expected one error messages to have been rendered.');
     });
 
@@ -920,31 +920,31 @@ describe('MdInput with forms', () => {
       TestBed.configureTestingModule({
         imports: [
           FormsModule,
-          MdFormFieldModule,
-          MdInputModule,
+          MatFormFieldModule,
+          MatInputModule,
           NoopAnimationsModule,
           ReactiveFormsModule,
         ],
         declarations: [
-          MdInputWithFormErrorMessages
+          MatInputWithFormErrorMessages
         ],
         providers: [
           {
-            provide: MD_ERROR_GLOBAL_OPTIONS,
+            provide: MAT_ERROR_GLOBAL_OPTIONS,
             useValue: { errorStateMatcher: globalErrorStateMatcher } }
         ]
       });
 
-      let fixture = TestBed.createComponent(MdInputWithFormErrorMessages);
+      let fixture = TestBed.createComponent(MatInputWithFormErrorMessages);
 
       fixture.detectChanges();
 
-      let containerEl = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
+      let containerEl = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
       let testComponent = fixture.componentInstance;
 
       // Expect the control to still be untouched but the error to show due to the global setting
       expect(testComponent.formControl.untouched).toBe(true, 'Expected untouched form control');
-      expect(containerEl.querySelectorAll('md-error').length).toBe(1, 'Expected an error message');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(1, 'Expected an error message');
     });
 
     it('should display an error message when using showOnDirtyErrorStateMatcher', async(() => {
@@ -952,51 +952,51 @@ describe('MdInput with forms', () => {
       TestBed.configureTestingModule({
         imports: [
           FormsModule,
-          MdFormFieldModule,
-          MdInputModule,
+          MatFormFieldModule,
+          MatInputModule,
           NoopAnimationsModule,
           ReactiveFormsModule,
         ],
         declarations: [
-          MdInputWithFormErrorMessages
+          MatInputWithFormErrorMessages
         ],
         providers: [
           {
-            provide: MD_ERROR_GLOBAL_OPTIONS,
+            provide: MAT_ERROR_GLOBAL_OPTIONS,
             useValue: { errorStateMatcher: showOnDirtyErrorStateMatcher }
           }
         ]
       });
 
-      let fixture = TestBed.createComponent(MdInputWithFormErrorMessages);
+      let fixture = TestBed.createComponent(MatInputWithFormErrorMessages);
       fixture.detectChanges();
 
-      let containerEl = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
+      let containerEl = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
       let testComponent = fixture.componentInstance;
 
       expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid');
-      expect(containerEl.querySelectorAll('md-error').length).toBe(0, 'Expected no error messages');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
 
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
 
-      expect(containerEl.querySelectorAll('md-error').length)
+      expect(containerEl.querySelectorAll('mat-error').length)
         .toBe(0, 'Expected no error messages when touched');
 
       testComponent.formControl.markAsDirty();
       fixture.detectChanges();
 
-      expect(containerEl.querySelectorAll('md-error').length)
+      expect(containerEl.querySelectorAll('mat-error').length)
         .toBe(1, 'Expected one error message when dirty');
     }));
   });
 
   it('should update the value when using FormControl.setValue', () => {
-    let fixture = TestBed.createComponent(MdInputWithFormControl);
+    let fixture = TestBed.createComponent(MatInputWithFormControl);
     fixture.detectChanges();
 
-    let input = fixture.debugElement.query(By.directive(MdInput))
-      .injector.get<MdInput>(MdInput);
+    let input = fixture.debugElement.query(By.directive(MatInput))
+      .injector.get<MatInput>(MatInput);
 
     expect(input.value).toBeFalsy();
 
@@ -1006,7 +1006,7 @@ describe('MdInput with forms', () => {
   });
 
   it('should display disabled styles when using FormControl.disable()', () => {
-    const fixture = TestBed.createComponent(MdInputWithFormControl);
+    const fixture = TestBed.createComponent(MatInputWithFormControl);
     fixture.detectChanges();
 
     const underlineEl =
@@ -1026,7 +1026,7 @@ describe('MdInput with forms', () => {
   });
 
   it('should not treat the number 0 as empty', async(() => {
-    let fixture = TestBed.createComponent(MdInputZeroTestController);
+    let fixture = TestBed.createComponent(MatInputZeroTestController);
     fixture.detectChanges();
 
     fixture.whenStable().then(() => {
@@ -1041,236 +1041,236 @@ describe('MdInput with forms', () => {
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput id="test-id" placeholder="test">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput id="test-id" placeholder="test">
+    </mat-form-field>`
 })
-class MdInputWithId {}
+class MatInputWithId {}
 
 @Component({
-  template: `<md-form-field><input mdInput [disabled]="disabled"></md-form-field>`
+  template: `<mat-form-field><input matInput [disabled]="disabled"></mat-form-field>`
 })
-class MdInputWithDisabled {
+class MatInputWithDisabled {
   disabled: boolean;
 }
 
 @Component({
-  template: `<md-form-field><input mdInput [required]="required"></md-form-field>`
+  template: `<mat-form-field><input matInput [required]="required"></mat-form-field>`
 })
-class MdInputWithRequired {
+class MatInputWithRequired {
   required: boolean;
 }
 
 @Component({
-  template: `<md-form-field><input mdInput [type]="type"></md-form-field>`
+  template: `<mat-form-field><input matInput [type]="type"></mat-form-field>`
 })
-class MdInputWithType {
+class MatInputWithType {
   type: string;
 }
 
 @Component({
-  template: `<md-form-field [hideRequiredMarker]="hideRequiredMarker">
-                <input mdInput required placeholder="hello">
-             </md-form-field>`
+  template: `<mat-form-field [hideRequiredMarker]="hideRequiredMarker">
+                <input matInput required placeholder="hello">
+             </mat-form-field>`
 })
-class MdInputPlaceholderRequiredTestComponent {
+class MatInputPlaceholderRequiredTestComponent {
   hideRequiredMarker: boolean;
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput>
-      <md-placeholder>{{placeholder}}</md-placeholder>
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput>
+      <mat-placeholder>{{placeholder}}</mat-placeholder>
+    </mat-form-field>`
 })
-class MdInputPlaceholderElementTestComponent {
+class MatInputPlaceholderElementTestComponent {
   placeholder: string = 'Default Placeholder';
 }
 
 @Component({
-  template: `<md-form-field><input mdInput [formControl]="formControl"></md-form-field>`
+  template: `<mat-form-field><input matInput [formControl]="formControl"></mat-form-field>`
 })
-class MdInputWithFormControl {
+class MatInputWithFormControl {
   formControl = new FormControl();
 }
 
 @Component({
-  template: `<md-form-field><input mdInput [placeholder]="placeholder"></md-form-field>`
+  template: `<mat-form-field><input matInput [placeholder]="placeholder"></mat-form-field>`
 })
-class MdInputPlaceholderAttrTestComponent {
+class MatInputPlaceholderAttrTestComponent {
   placeholder: string = '';
 }
 
 @Component({
-  template: `<md-form-field><input mdInput><md-hint>{{label}}</md-hint></md-form-field>`
+  template: `<mat-form-field><input matInput><mat-hint>{{label}}</mat-hint></mat-form-field>`
 })
-class MdInputHintLabel2TestController {
+class MatInputHintLabel2TestController {
   label: string = '';
 }
 
 @Component({
-  template: `<md-form-field [hintLabel]="label"><input mdInput></md-form-field>`
+  template: `<mat-form-field [hintLabel]="label"><input matInput></mat-form-field>`
 })
-class MdInputHintLabelTestController {
+class MatInputHintLabelTestController {
   label: string = '';
 }
 
 @Component({
-  template: `<md-form-field><input mdInput type="file"></md-form-field>`
+  template: `<mat-form-field><input matInput type="file"></mat-form-field>`
 })
-class MdInputInvalidTypeTestController {}
+class MatInputInvalidTypeTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput placeholder="Hello">
-      <md-placeholder>World</md-placeholder>
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput placeholder="Hello">
+      <mat-placeholder>World</mat-placeholder>
+    </mat-form-field>`
 })
-class MdInputInvalidPlaceholderTestController {}
+class MatInputInvalidPlaceholderTestController {}
 
 @Component({
   template: `
-    <md-form-field hintLabel="Hello">
-      <input mdInput>
-      <md-hint>World</md-hint>
-    </md-form-field>`
+    <mat-form-field hintLabel="Hello">
+      <input matInput>
+      <mat-hint>World</mat-hint>
+    </mat-form-field>`
 })
-class MdInputInvalidHint2TestController {}
+class MatInputInvalidHint2TestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput>
-      <md-hint>Hello</md-hint>
-      <md-hint>World</md-hint>
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput>
+      <mat-hint>Hello</mat-hint>
+      <mat-hint>World</mat-hint>
+    </mat-form-field>`
 })
-class MdInputInvalidHintTestController {}
+class MatInputInvalidHintTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput>
-      <md-hint align="start" [id]="startId">Hello</md-hint>
-      <md-hint align="end" [id]="endId">World</md-hint>
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput>
+      <mat-hint align="start" [id]="startId">Hello</mat-hint>
+      <mat-hint align="end" [id]="endId">World</mat-hint>
+    </mat-form-field>`
 })
-class MdInputMultipleHintTestController {
+class MatInputMultipleHintTestController {
   startId: string;
   endId: string;
 }
 
 @Component({
   template: `
-    <md-form-field hintLabel="Hello">
-      <input mdInput>
-      <md-hint align="end">World</md-hint>
-    </md-form-field>`
+    <mat-form-field hintLabel="Hello">
+      <input matInput>
+      <mat-hint align="end">World</mat-hint>
+    </mat-form-field>`
 })
-class MdInputMultipleHintMixedTestController {}
+class MatInputMultipleHintMixedTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput type="date" placeholder="Placeholder">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput type="date" placeholder="Placeholder">
+    </mat-form-field>`
 })
-class MdInputDateTestController {}
+class MatInputDateTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput type="text" placeholder="Placeholder">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput type="text" placeholder="Placeholder">
+    </mat-form-field>`
 })
-class MdInputTextTestController {}
+class MatInputTextTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput type="password" placeholder="Placeholder">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput type="password" placeholder="Placeholder">
+    </mat-form-field>`
 })
-class MdInputPasswordTestController {}
+class MatInputPasswordTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput type="number" placeholder="Placeholder">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput type="number" placeholder="Placeholder">
+    </mat-form-field>`
 })
-class MdInputNumberTestController {}
+class MatInputNumberTestController {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput type="number" placeholder="Placeholder" [(ngModel)]="value">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput type="number" placeholder="Placeholder" [(ngModel)]="value">
+    </mat-form-field>`
 })
-class MdInputZeroTestController {
+class MatInputZeroTestController {
   value = 0;
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput placeholder="Label" [value]="value">
-    </md-form-field>`
+    <mat-form-field>
+      <input matInput placeholder="Label" [value]="value">
+    </mat-form-field>`
 })
-class MdInputWithValueBinding {
+class MatInputWithValueBinding {
   value: string = 'Initial';
 }
 
 @Component({
   template: `
-    <md-form-field floatPlaceholder="never">
-      <input mdInput placeholder="Label">
-    </md-form-field>
+    <mat-form-field floatPlaceholder="never">
+      <input matInput placeholder="Label">
+    </mat-form-field>
   `
 })
-class MdInputWithStaticPlaceholder {}
+class MatInputWithStaticPlaceholder {}
 
 @Component({
   template: `
-    <md-form-field [floatPlaceholder]="shouldFloat">
-      <input mdInput placeholder="Label">
-    </md-form-field>`
+    <mat-form-field [floatPlaceholder]="shouldFloat">
+      <input matInput placeholder="Label">
+    </mat-form-field>`
 })
-class MdInputWithDynamicPlaceholder {
+class MatInputWithDynamicPlaceholder {
   shouldFloat: string = 'always';
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <textarea mdInput [rows]="rows" [cols]="cols" [wrap]="wrap" placeholder="Snacks"></textarea>
-    </md-form-field>`
+    <mat-form-field>
+      <textarea matInput [rows]="rows" [cols]="cols" [wrap]="wrap" placeholder="Snacks"></textarea>
+    </mat-form-field>`
 })
-class MdInputTextareaWithBindings {
+class MatInputTextareaWithBindings {
   rows: number = 4;
   cols: number = 8;
   wrap: string = 'hard';
 }
 
 @Component({
-  template: `<md-form-field><input></md-form-field>`
+  template: `<mat-form-field><input></mat-form-field>`
 })
-class MdInputMissingMdInputTestController {}
+class MatInputMissingMatInputTestController {}
 
 @Component({
   template: `
     <form #form="ngForm" novalidate>
-      <md-form-field>
-        <input mdInput [formControl]="formControl">
-        <md-hint>Please type something</md-hint>
-        <md-error *ngIf="renderError">This field is required</md-error>
-      </md-form-field>
+      <mat-form-field>
+        <input matInput [formControl]="formControl">
+        <mat-hint>Please type something</mat-hint>
+        <mat-error *ngIf="renderError">This field is required</mat-error>
+      </mat-form-field>
     </form>
   `
 })
-class MdInputWithFormErrorMessages {
+class MatInputWithFormErrorMessages {
   @ViewChild('form') form: NgForm;
   formControl = new FormControl('', Validators.required);
   renderError = true;
@@ -1279,17 +1279,17 @@ class MdInputWithFormErrorMessages {
 @Component({
   template: `
     <form [formGroup]="formGroup">
-      <md-form-field>
-        <input mdInput
+      <mat-form-field>
+        <input matInput
             formControlName="name"
             [errorStateMatcher]="customErrorStateMatcher.bind(this)">
-        <md-hint>Please type something</md-hint>
-        <md-error>This field is required</md-error>
-      </md-form-field>
+        <mat-hint>Please type something</mat-hint>
+        <mat-error>This field is required</mat-error>
+      </mat-form-field>
     </form>
   `
 })
-class MdInputWithCustomErrorStateMatcher {
+class MatInputWithCustomErrorStateMatcher {
   formGroup = new FormGroup({
     name: new FormControl('', Validators.required)
   });
@@ -1304,15 +1304,15 @@ class MdInputWithCustomErrorStateMatcher {
 @Component({
   template: `
     <form [formGroup]="formGroup" novalidate>
-      <md-form-field>
-        <input mdInput formControlName="name">
-        <md-hint>Please type something</md-hint>
-        <md-error>This field is required</md-error>
-      </md-form-field>
+      <mat-form-field>
+        <input matInput formControlName="name">
+        <mat-hint>Please type something</mat-hint>
+        <mat-error>This field is required</mat-error>
+      </mat-form-field>
     </form>
   `
 })
-class MdInputWithFormGroupErrorMessages {
+class MatInputWithFormGroupErrorMessages {
   @ViewChild(FormGroupDirective) formGroupDirective: FormGroupDirective;
   formGroup = new FormGroup({
     name: new FormControl('', Validators.required)
@@ -1321,43 +1321,43 @@ class MdInputWithFormGroupErrorMessages {
 
 @Component({
   template: `
-    <md-form-field>
-      <div mdPrefix>Prefix</div>
-      <input mdInput>
-      <div mdSuffix>Suffix</div>
-    </md-form-field>
+    <mat-form-field>
+      <div matPrefix>Prefix</div>
+      <input matInput>
+      <div matSuffix>Suffix</div>
+    </mat-form-field>
   `
 })
-class MdInputWithPrefixAndSuffix {}
+class MatInputWithPrefixAndSuffix {}
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput *ngIf="renderInput">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput *ngIf="renderInput">
+    </mat-form-field>
   `
 })
-class MdInputWithNgIf {
+class MatInputWithNgIf {
   renderInput = true;
 }
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <md-form-field>
-      <input mdInput placeholder="Label" [formControl]="formControl">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Label" [formControl]="formControl">
+    </mat-form-field>
   `
 })
-class MdInputOnPush {
+class MatInputOnPush {
   formControl = new FormControl('');
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <input mdInput readonly value="Only for reading">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput readonly value="Only for reading">
+    </mat-form-field>
   `
 })
-class MdInputWithReadonlyInput {}
+class MatInputWithReadonlyInput {}
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 85b47dce9dc5..c8f357117244 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -21,18 +21,18 @@ import {
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {FormControl, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
 import {Platform, getSupportedInputTypes} from '@angular/cdk/platform';
-import {getMdInputUnsupportedTypeError} from './input-errors';
+import {getMatInputUnsupportedTypeError} from './input-errors';
 import {
   defaultErrorStateMatcher,
   ErrorOptions,
   ErrorStateMatcher,
-  MD_ERROR_GLOBAL_OPTIONS
+  MAT_ERROR_GLOBAL_OPTIONS
 } from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
-import {MdFormFieldControl} from '@angular/material/form-field';
+import {MatFormFieldControl} from '@angular/material/form-field';
 
-// Invalid input type. Using one of these will throw an MdInputUnsupportedTypeError.
-const MD_INPUT_INVALID_TYPES = [
+// Invalid input type. Using one of these will throw an MatInputUnsupportedTypeError.
+const MAT_INPUT_INVALID_TYPES = [
   'button',
   'checkbox',
   'color',
@@ -48,9 +48,9 @@ const MD_INPUT_INVALID_TYPES = [
 let nextUniqueId = 0;
 
 
-/** Directive that allows a native input to work inside a `MdFormField`. */
+/** Directive that allows a native input to work inside a `MatFormField`. */
 @Directive({
-  selector: `input[mdInput], textarea[mdInput], input[matInput], textarea[matInput]`,
+  selector: `input[matInput], textarea[matInput]`,
   host: {
     'class': 'mat-input-element mat-form-field-autofill-control',
     // Native input properties that are overwritten by Angular inputs need to be synced with
@@ -65,15 +65,15 @@ let nextUniqueId = 0;
     '(focus)': '_focusChanged(true)',
     '(input)': '_onInput()',
   },
-  providers: [{provide: MdFormFieldControl, useExisting: MdInput}],
+  providers: [{provide: MatFormFieldControl, useExisting: MatInput}],
 })
-export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, DoCheck {
+export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy, DoCheck {
   /** Variables used as cache for getters and setters. */
   protected _type = 'text';
   protected _disabled = false;
   protected _required = false;
   protected _id: string;
-  protected _uid = `md-input-${nextUniqueId++}`;
+  protected _uid = `mat-input-${nextUniqueId++}`;
   protected _errorOptions: ErrorOptions;
   protected _previousNativeValue = this.value;
 
@@ -87,12 +87,12 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
   _ariaDescribedby: string;
 
   /**
-   * Stream that emits whenever the state of the input changes such that the wrapping `MdFormField`
+   * Stream that emits whenever the state of the input changes such that the wrapping `MatFormField`
    * needs to run change detection.
    */
   stateChanges = new Subject<void>();
 
-  /** A name for this control that can be used by `md-form-field`. */
+  /** A name for this control that can be used by `mat-form-field`. */
   controlType = 'mat-input';
 
   /** Whether the element is disabled. */
@@ -156,7 +156,7 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
               @Optional() @Self() public ngControl: NgControl,
               @Optional() protected _parentForm: NgForm,
               @Optional() protected _parentFormGroup: FormGroupDirective,
-              @Optional() @Inject(MD_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
+              @Optional() @Inject(MAT_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
 
     // Force setter to be called in case id was not specified.
     this.id = this.id;
@@ -246,8 +246,8 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
 
   /** Make sure the input is a supported type. */
   protected _validateType() {
-    if (MD_INPUT_INVALID_TYPES.indexOf(this._type) > -1) {
-      throw getMdInputUnsupportedTypeError(this._type);
+    if (MAT_INPUT_INVALID_TYPES.indexOf(this._type) > -1) {
+      throw getMatInputUnsupportedTypeError(this._type);
     }
   }
 
@@ -274,7 +274,7 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
     return nodeName ? nodeName.toLowerCase() === 'textarea' : false;
   }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   get empty(): boolean {
     return !this._isNeverEmpty() &&
         (this.value == null || this.value === '') &&
@@ -284,12 +284,12 @@ export class MdInput implements MdFormFieldControl<any>, OnChanges, OnDestroy, D
         !this._isBadInput();
   }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   get shouldPlaceholderFloat(): boolean { return this.focused || !this.empty; }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   onContainerClick() { this.focus(); }
 }
diff --git a/src/lib/input/mat-exports.ts b/src/lib/input/mat-exports.ts
deleted file mode 100644
index c3b588d4fd16..000000000000
--- a/src/lib/input/mat-exports.ts
+++ /dev/null
@@ -1,16 +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 {MdInput} from './input';
-import {MdTextareaAutosize} from './autosize';
-import {MdInputModule} from './input-module';
-
-
-export {MdInput as MatInput};
-export {MdInputModule as MatInputModule};
-export {MdTextareaAutosize as MatTextareaAutosize};
diff --git a/src/lib/input/public_api.ts b/src/lib/input/public_api.ts
index ce320312d33b..9e8ec8323b49 100644
--- a/src/lib/input/public_api.ts
+++ b/src/lib/input/public_api.ts
@@ -12,4 +12,4 @@ export * from './autosize';
 export * from './input';
 export * from './input-errors';
 
-export * from './mat-exports';
+
diff --git a/src/lib/list/list-item.html b/src/lib/list/list-item.html
index 4550bc470c2d..1d49a0c95949 100644
--- a/src/lib/list/list-item.html
+++ b/src/lib/list/list-item.html
@@ -4,12 +4,10 @@
        [matRippleDisabled]="_isRippleDisabled()">
   </div>
 
-  <ng-content
-      select="[md-list-avatar], [md-list-icon], [mat-list-avatar], [mat-list-icon],
-              [mdListAvatar], [mdListIcon], [matListAvatar], [matListIcon]">
+  <ng-content select="[mat-list-avatar], [mat-list-icon], [matListAvatar], [matListIcon]">
   </ng-content>
 
-  <div class="mat-list-text"><ng-content select="[md-line], [mat-line], [mdLine], [matLine]"></ng-content></div>
+  <div class="mat-list-text"><ng-content select="[mat-line], [matLine]"></ng-content></div>
 
   <ng-content></ng-content>
 </div>
diff --git a/src/lib/list/list-module.ts b/src/lib/list/list-module.ts
index 177bec5758b9..509f5ea0ad7e 100644
--- a/src/lib/list/list-module.ts
+++ b/src/lib/list/list-module.ts
@@ -9,55 +9,55 @@
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {
-  MdCommonModule,
-  MdLineModule,
-  MdPseudoCheckboxModule,
-  MdRippleModule,
+  MatCommonModule,
+  MatLineModule,
+  MatPseudoCheckboxModule,
+  MatRippleModule,
 } from '@angular/material/core';
 import {
-  MdDividerCssMatStyler,
-  MdList,
-  MdListAvatarCssMatStyler,
-  MdListCssMatStyler,
-  MdListDivider,
-  MdListIconCssMatStyler,
-  MdListItem,
-  MdListSubheaderCssMatStyler,
-  MdNavListCssMatStyler,
+  MatDividerCssMatStyler,
+  MatList,
+  MatListAvatarCssMatStyler,
+  MatListCssMatStyler,
+  MatListDivider,
+  MatListIconCssMatStyler,
+  MatListItem,
+  MatListSubheaderCssMatStyler,
+  MatNavListCssMatStyler,
 } from './list';
-import {MdListOption, MdSelectionList} from './selection-list';
+import {MatListOption, MatSelectionList} from './selection-list';
 
 
 @NgModule({
-  imports: [MdLineModule, MdRippleModule, MdCommonModule, MdPseudoCheckboxModule, CommonModule],
+  imports: [MatLineModule, MatRippleModule, MatCommonModule, MatPseudoCheckboxModule, CommonModule],
   exports: [
-    MdList,
-    MdListItem,
-    MdListDivider,
-    MdListAvatarCssMatStyler,
-    MdLineModule,
-    MdCommonModule,
-    MdListIconCssMatStyler,
-    MdListCssMatStyler,
-    MdNavListCssMatStyler,
-    MdDividerCssMatStyler,
-    MdListSubheaderCssMatStyler,
-    MdPseudoCheckboxModule,
-    MdSelectionList,
-    MdListOption
+    MatList,
+    MatListItem,
+    MatListDivider,
+    MatListAvatarCssMatStyler,
+    MatLineModule,
+    MatCommonModule,
+    MatListIconCssMatStyler,
+    MatListCssMatStyler,
+    MatNavListCssMatStyler,
+    MatDividerCssMatStyler,
+    MatListSubheaderCssMatStyler,
+    MatPseudoCheckboxModule,
+    MatSelectionList,
+    MatListOption
   ],
   declarations: [
-    MdList,
-    MdListItem,
-    MdListDivider,
-    MdListAvatarCssMatStyler,
-    MdListIconCssMatStyler,
-    MdListCssMatStyler,
-    MdNavListCssMatStyler,
-    MdDividerCssMatStyler,
-    MdListSubheaderCssMatStyler,
-    MdSelectionList,
-    MdListOption
+    MatList,
+    MatListItem,
+    MatListDivider,
+    MatListAvatarCssMatStyler,
+    MatListIconCssMatStyler,
+    MatListCssMatStyler,
+    MatNavListCssMatStyler,
+    MatDividerCssMatStyler,
+    MatListSubheaderCssMatStyler,
+    MatSelectionList,
+    MatListOption
   ],
 })
-export class MdListModule {}
+export class MatListModule {}
diff --git a/src/lib/list/list.md b/src/lib/list/list.md
index f9ad2ae169dd..b26595f5becf 100644
--- a/src/lib/list/list.md
+++ b/src/lib/list/list.md
@@ -1,4 +1,4 @@
-`<md-list>` is a container component that wraps and formats a series of line items. As the base 
+`<mat-list>` is a container component that wraps and formats a series of line items. As the base 
 list component, it provides Material Design styling, but no behavior of its own.
 
 <!-- example(list-overview) -->
@@ -6,40 +6,40 @@ list component, it provides Material Design styling, but no behavior of its own.
 
 ### Simple lists
 
-An `<md-list>` element contains a number of `<md-list-item>` elements.
+An `<mat-list>` element contains a number of `<mat-list-item>` elements.
 
 ```html
-<md-list>
- <md-list-item> Pepper </md-list-item>
- <md-list-item> Salt </md-list-item>
- <md-list-item> Paprika </md-list-item>
-</md-list>
+<mat-list>
+ <mat-list-item> Pepper </mat-list-item>
+ <mat-list-item> Salt </mat-list-item>
+ <mat-list-item> Paprika </mat-list-item>
+</mat-list>
 ```
 
 ### Navigation lists
 
-Use `md-nav-list` tags for navigation lists (i.e. lists that have anchor tags).
+Use `mat-nav-list` tags for navigation lists (i.e. lists that have anchor tags).
 
-Simple navigation lists can use the `md-list-item` attribute on anchor tag elements directly:
+Simple navigation lists can use the `mat-list-item` attribute on anchor tag elements directly:
 
 ```html
-<md-nav-list>
-   <a md-list-item href="..." *ngFor="let link of links"> {{ link }} </a>
-</md-nav-list>
+<mat-nav-list>
+   <a mat-list-item href="..." *ngFor="let link of links"> {{ link }} </a>
+</mat-nav-list>
 ```
 
 For more complex navigation lists (e.g. with more than one target per item), wrap the anchor 
-element in an `<md-list-item>`.
+element in an `<mat-list-item>`.
 
 ```html
-<md-nav-list>
-  <md-list-item *ngFor="let link of links">
-     <a mdLine href="...">{{ link }}</a>
-     <button md-icon-button (click)="showInfo(link)">
-        <md-icon>info</md-icon>
+<mat-nav-list>
+  <mat-list-item *ngFor="let link of links">
+     <a matLine href="...">{{ link }}</a>
+     <button mat-icon-button (click)="showInfo(link)">
+        <mat-icon>info</mat-icon>
      </button>
-  </md-list-item>
-</md-nav-list>
+  </mat-list-item>
+</mat-nav-list>
 ```
 
 ### Selection lists
@@ -52,101 +52,101 @@ as buttons and anchors.
 
 
 ### Multi-line lists
-For lists that require multiple lines per item, annotate each line with an `mdLine` attribute.
+For lists that require multiple lines per item, annotate each line with an `matLine` attribute.
 Whichever heading tag is appropriate for your DOM hierarchy should be used (not necessarily `<h3>`
 as shown in the example).
 
 ```html
 <!-- two line list -->
-<md-list>
-  <md-list-item *ngFor="let message of messages">
-    <h3 mdLine> {{message.from}} </h3>
-    <p mdLine>
+<mat-list>
+  <mat-list-item *ngFor="let message of messages">
+    <h3 matLine> {{message.from}} </h3>
+    <p matLine>
       <span> {{message.subject}} </span>
       <span class="demo-2"> -- {{message.content}} </span>
     </p>
-  </md-list-item>
-</md-list>
+  </mat-list-item>
+</mat-list>
 
 <!-- three line list -->
-<md-list>
-  <md-list-item *ngFor="let message of messages">
-    <h3 mdLine> {{message.from}} </h3>
-    <p mdLine> {{message.subject}} </p>
-    <p mdLine class="demo-2"> {{message.content}} </p>
-  </md-list-item>
-</md-list>
+<mat-list>
+  <mat-list-item *ngFor="let message of messages">
+    <h3 matLine> {{message.from}} </h3>
+    <p matLine> {{message.subject}} </p>
+    <p matLine class="demo-2"> {{message.content}} </p>
+  </mat-list-item>
+</mat-list>
 ```
 
 ### Lists with icons
 
-To add an icon to your list item, use the `mdListIcon` attribute.
+To add an icon to your list item, use the `matListIcon` attribute.
 
 
 ```html
-<md-list>
-  <md-list-item *ngFor="let message of messages">
-    <md-icon mdListIcon>folder</md-icon>
-    <h3 mdLine> {{message.from}} </h3>
-    <p mdLine>
+<mat-list>
+  <mat-list-item *ngFor="let message of messages">
+    <mat-icon matListIcon>folder</mat-icon>
+    <h3 matLine> {{message.from}} </h3>
+    <p matLine>
       <span> {{message.subject}} </span>
       <span class="demo-2"> -- {{message.content}} </span>
     </p>
-  </md-list-item>
-</md-list>
+  </mat-list-item>
+</mat-list>
 ```
 
 ### Lists with avatars
 
-To include an avatar image, add an image tag with an `mdListAvatar` attribute. 
+To include an avatar image, add an image tag with an `matListAvatar` attribute. 
 
 ```html
-<md-list>
-  <md-list-item *ngFor="let message of messages">
-    <img mdListAvatar src="..." alt="...">
-    <h3 mdLine> {{message.from}} </h3>
-    <p mdLine>
+<mat-list>
+  <mat-list-item *ngFor="let message of messages">
+    <img matListAvatar src="..." alt="...">
+    <h3 matLine> {{message.from}} </h3>
+    <p matLine>
       <span> {{message.subject}} </span>
       <span class="demo-2"> -- {{message.content}} </span>
     </p>
-  </md-list-item>
-</md-list>
+  </mat-list-item>
+</mat-list>
 ```
 
 ### Dense lists
 Lists are also available in "dense layout" mode, which shrinks the font size and height of the list
 to suit UIs that may need to display more information. To enable this mode, add a `dense` attribute
-to the main `md-list` tag.
+to the main `mat-list` tag.
 
 
 ```html
-<md-list dense>
- <md-list-item> Pepper </md-list-item>
- <md-list-item> Salt </md-list-item>
- <md-list-item> Paprika </md-list-item>
-</md-list>
+<mat-list dense>
+ <mat-list-item> Pepper </mat-list-item>
+ <mat-list-item> Salt </mat-list-item>
+ <mat-list-item> Paprika </mat-list-item>
+</mat-list>
 ```
 
 
 ### Lists with multiple sections
 
-Subheader can be added to a list by annotating a heading tag with an `mdSubheader` attribute. 
-To add a divider, use `<md-divider>`.
+Subheader can be added to a list by annotating a heading tag with an `matSubheader` attribute. 
+To add a divider, use `<mat-divider>`.
 
 ```html
-<md-list>
-   <h3 mdSubheader>Folders</h3>
-   <md-list-item *ngFor="let folder of folders">
-      <md-icon mdListIcon>folder</md-icon>
-      <h4 mdLine>{{folder.name}}</h4>
-      <p mdLine class="demo-2"> {{folder.updated}} </p>
-   </md-list-item>
-   <md-divider></md-divider>
-   <h3 mdSubheader>Notes</h3>
-   <md-list-item *ngFor="let note of notes">
-      <md-icon mdListIcon>note</md-icon>
-      <h4 mdLine>{{note.name}}</h4>
-      <p mdLine class="demo-2"> {{note.updated}} </p>
-   </md-list-item>
-</md-list>
+<mat-list>
+   <h3 matSubheader>Folders</h3>
+   <mat-list-item *ngFor="let folder of folders">
+      <mat-icon matListIcon>folder</mat-icon>
+      <h4 matLine>{{folder.name}}</h4>
+      <p matLine class="demo-2"> {{folder.updated}} </p>
+   </mat-list-item>
+   <mat-divider></mat-divider>
+   <h3 matSubheader>Notes</h3>
+   <mat-list-item *ngFor="let note of notes">
+      <mat-icon matListIcon>note</mat-icon>
+      <h4 matLine>{{note.name}}</h4>
+      <p matLine class="demo-2"> {{note.updated}} </p>
+   </mat-list-item>
+</mat-list>
 ```
diff --git a/src/lib/list/list.spec.ts b/src/lib/list/list.spec.ts
index d9854cf1dfdf..f2b60c500aef 100644
--- a/src/lib/list/list.spec.ts
+++ b/src/lib/list/list.spec.ts
@@ -1,14 +1,14 @@
 import {async, TestBed} from '@angular/core/testing';
 import {Component, QueryList, ViewChildren} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdListItem, MdListModule} from './index';
+import {MatListItem, MatListModule} from './index';
 
 
-describe('MdList', () => {
+describe('MatList', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdListModule],
+      imports: [MatListModule],
       declarations: [
         ListWithOneAnchorItem,
         ListWithOneItem,
@@ -29,7 +29,7 @@ describe('MdList', () => {
   it('should add and remove focus class on focus/blur', () => {
     let fixture = TestBed.createComponent(ListWithOneAnchorItem);
     fixture.detectChanges();
-    let listItem = fixture.debugElement.query(By.directive(MdListItem));
+    let listItem = fixture.debugElement.query(By.directive(MatListItem));
     let listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
 
     expect(listItemEl.nativeElement.classList).not.toContain('mat-list-item-focus');
@@ -45,7 +45,7 @@ describe('MdList', () => {
 
   it('should not apply any additional class to a list without lines', () => {
     let fixture = TestBed.createComponent(ListWithOneItem);
-    let listItem = fixture.debugElement.query(By.css('md-list-item'));
+    let listItem = fixture.debugElement.query(By.css('mat-list-item'));
     fixture.detectChanges();
     expect(listItem.nativeElement.className).toBe('mat-list-item');
   });
@@ -54,7 +54,7 @@ describe('MdList', () => {
     let fixture = TestBed.createComponent(ListWithTwoLineItem);
     fixture.detectChanges();
 
-    let listItems = fixture.debugElement.children[0].queryAll(By.css('md-list-item'));
+    let listItems = fixture.debugElement.children[0].queryAll(By.css('mat-list-item'));
     expect(listItems[0].nativeElement.className).toContain('mat-2-line');
     expect(listItems[1].nativeElement.className).toContain('mat-2-line');
   });
@@ -63,7 +63,7 @@ describe('MdList', () => {
     let fixture = TestBed.createComponent(ListWithThreeLineItem);
     fixture.detectChanges();
 
-    let listItems = fixture.debugElement.children[0].queryAll(By.css('md-list-item'));
+    let listItems = fixture.debugElement.children[0].queryAll(By.css('mat-list-item'));
     expect(listItems[0].nativeElement.className).toContain('mat-3-line');
     expect(listItems[1].nativeElement.className).toContain('mat-3-line');
   });
@@ -72,7 +72,7 @@ describe('MdList', () => {
     let fixture = TestBed.createComponent(ListWithManyLines);
     fixture.detectChanges();
 
-    let listItems = fixture.debugElement.children[0].queryAll(By.css('md-list-item'));
+    let listItems = fixture.debugElement.children[0].queryAll(By.css('mat-list-item'));
     expect(listItems[0].nativeElement.className).toContain('mat-multi-line');
     expect(listItems[1].nativeElement.className).toContain('mat-multi-line');
   });
@@ -81,7 +81,7 @@ describe('MdList', () => {
     let fixture = TestBed.createComponent(ListWithAvatar);
     fixture.detectChanges();
 
-    let listItems = fixture.debugElement.children[0].queryAll(By.css('md-list-item'));
+    let listItems = fixture.debugElement.children[0].queryAll(By.css('mat-list-item'));
     expect(listItems[0].nativeElement.className).toContain('mat-list-item-avatar');
     expect(listItems[1].nativeElement.className).not.toContain('mat-list-item-avatar');
   });
@@ -90,7 +90,7 @@ describe('MdList', () => {
     let fixture = TestBed.createComponent(ListWithItemWithCssClass);
     fixture.detectChanges();
 
-    let listItems = fixture.debugElement.children[0].queryAll(By.css('md-list-item'));
+    let listItems = fixture.debugElement.children[0].queryAll(By.css('mat-list-item'));
     expect(listItems[0].nativeElement.classList.contains('test-class')).toBe(true);
   });
 
@@ -99,7 +99,7 @@ describe('MdList', () => {
     fixture.debugElement.componentInstance.showThirdLine = false;
     fixture.detectChanges();
 
-    let listItem = fixture.debugElement.children[0].query(By.css('md-list-item'));
+    let listItem = fixture.debugElement.children[0].query(By.css('mat-list-item'));
     expect(listItem.nativeElement.classList.length).toBe(2);
     expect(listItem.nativeElement.classList).toContain('mat-2-line');
     expect(listItem.nativeElement.classList).toContain('mat-list-item');
@@ -114,7 +114,7 @@ describe('MdList', () => {
     fixture.detectChanges();
 
     let list = fixture.debugElement.children[0];
-    let listItem = fixture.debugElement.children[0].query(By.css('md-list-item'));
+    let listItem = fixture.debugElement.children[0].query(By.css('mat-list-item'));
     expect(list.nativeElement.getAttribute('role')).toBe('list');
     expect(listItem.nativeElement.getAttribute('role')).toBe('listitem');
   });
@@ -123,7 +123,7 @@ describe('MdList', () => {
     let fixture = TestBed.createComponent(ListWithOneAnchorItem);
     fixture.detectChanges();
 
-    const items: QueryList<MdListItem> = fixture.debugElement.componentInstance.listItems;
+    const items: QueryList<MatListItem> = fixture.debugElement.componentInstance.listItems;
     expect(items.length).toBeGreaterThan(0);
     items.forEach(item => expect(item._isRippleDisabled()).toBe(true));
   });
@@ -172,103 +172,103 @@ class BaseTestList {
 }
 
 @Component({template: `
-  <md-list>
-    <a md-list-item>
+  <mat-list>
+    <a mat-list-item>
       Paprika
     </a>
-  </md-list>`})
+  </mat-list>`})
 class ListWithOneAnchorItem extends BaseTestList {
   // This needs to be declared directly on the class; if declared on the BaseTestList superclass,
   // it doesn't get populated.
-  @ViewChildren(MdListItem) listItems: QueryList<MdListItem>;
+  @ViewChildren(MatListItem) listItems: QueryList<MatListItem>;
 }
 
 @Component({template: `
-  <md-nav-list [disableRipple]="disableListRipple">
-    <a md-list-item [disableRipple]="disableItemRipple">
+  <mat-nav-list [disableRipple]="disableListRipple">
+    <a mat-list-item [disableRipple]="disableItemRipple">
       Paprika
     </a>
-  </md-nav-list>`})
+  </mat-nav-list>`})
 class NavListWithOneAnchorItem extends BaseTestList {
-  @ViewChildren(MdListItem) listItems: QueryList<MdListItem>;
+  @ViewChildren(MatListItem) listItems: QueryList<MatListItem>;
   disableItemRipple: boolean = false;
   disableListRipple: boolean = false;
 }
 
 @Component({template: `
-  <md-list>
-    <md-list-item>
+  <mat-list>
+    <mat-list-item>
       Paprika
-    </md-list-item>
-  </md-list>`})
+    </mat-list-item>
+  </mat-list>`})
 class ListWithOneItem extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item *ngFor="let item of items">
+  <mat-list>
+    <mat-list-item *ngFor="let item of items">
       <img src="">
-      <h3 md-line>{{item.name}}</h3>
-      <p md-line>{{item.description}}</p>
-    </md-list-item>
-  </md-list>`})
+      <h3 mat-line>{{item.name}}</h3>
+      <p mat-line>{{item.description}}</p>
+    </mat-list-item>
+  </mat-list>`})
 class ListWithTwoLineItem extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item *ngFor="let item of items">
-      <h3 md-line>{{item.name}}</h3>
-      <p md-line>{{item.description}}</p>
-      <p md-line>Some other text</p>
-    </md-list-item>
-  </md-list>`})
+  <mat-list>
+    <mat-list-item *ngFor="let item of items">
+      <h3 mat-line>{{item.name}}</h3>
+      <p mat-line>{{item.description}}</p>
+      <p mat-line>Some other text</p>
+    </mat-list-item>
+  </mat-list>`})
 class ListWithThreeLineItem extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item *ngFor="let item of items">
-      <h3 md-line>Line 1</h3>
-      <p md-line>Line 2</p>
-      <p md-line>Line 3</p>
-      <p md-line>Line 4</p>
-    </md-list-item>
-  </md-list>`})
+  <mat-list>
+    <mat-list-item *ngFor="let item of items">
+      <h3 mat-line>Line 1</h3>
+      <p mat-line>Line 2</p>
+      <p mat-line>Line 3</p>
+      <p mat-line>Line 4</p>
+    </mat-list-item>
+  </mat-list>`})
 class ListWithManyLines extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item>
-      <img src="" md-list-avatar>
+  <mat-list>
+    <mat-list-item>
+      <img src="" mat-list-avatar>
       Paprika
-    </md-list-item>
-    <md-list-item>
+    </mat-list-item>
+    <mat-list-item>
       Pepper
-    </md-list-item>
-  </md-list>`})
+    </mat-list-item>
+  </mat-list>`})
 class ListWithAvatar extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item class="test-class" *ngFor="let item of items">
-      <h3 md-line>{{item.name}}</h3>
-      <p md-line>{{item.description}}</p>
-    </md-list-item>
-  </md-list>`})
+  <mat-list>
+    <mat-list-item class="test-class" *ngFor="let item of items">
+      <h3 mat-line>{{item.name}}</h3>
+      <p mat-line>{{item.description}}</p>
+    </mat-list-item>
+  </mat-list>`})
 class ListWithItemWithCssClass extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item *ngFor="let item of items">
-      <h3 md-line>{{item.name}}</h3>
-      <p md-line>{{item.description}}</p>
-      <p md-line *ngIf="showThirdLine">Some other text</p>
-    </md-list-item>
-  </md-list>`})
+  <mat-list>
+    <mat-list-item *ngFor="let item of items">
+      <h3 mat-line>{{item.name}}</h3>
+      <p mat-line>{{item.description}}</p>
+      <p mat-line *ngIf="showThirdLine">Some other text</p>
+    </mat-list-item>
+  </mat-list>`})
 class ListWithDynamicNumberOfLines extends BaseTestList { }
 
 @Component({template: `
-  <md-list>
-    <md-list-item *ngFor="let item of items">
+  <mat-list>
+    <mat-list-item *ngFor="let item of items">
       {{item.name}}
-    </md-list-item>
-  </md-list>`})
+    </mat-list-item>
+  </mat-list>`})
 class ListWithMultipleItems extends BaseTestList { }
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 183b8c81dd80..ab7d90daa514 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -8,6 +8,7 @@
 
 import {
   AfterContentInit,
+  ChangeDetectionStrategy,
   Component,
   ContentChild,
   ContentChildren,
@@ -17,36 +18,34 @@ import {
   QueryList,
   Renderer2,
   ViewEncapsulation,
-  ChangeDetectionStrategy,
 } from '@angular/core';
-import {MATERIAL_COMPATIBILITY_MODE, MdLine, MdLineSetter} from '@angular/material/core';
-import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
+import {CanDisableRipple, MatLine, MatLineSetter, mixinDisableRipple} from '@angular/material/core';
 
-// Boilerplate for applying mixins to MdList.
+// Boilerplate for applying mixins to MatList.
 /** @docs-private */
-export class MdListBase {}
-export const _MdListMixinBase = mixinDisableRipple(MdListBase);
+export class MatListBase {}
+export const _MatListMixinBase = mixinDisableRipple(MatListBase);
 
-// Boilerplate for applying mixins to MdListItem.
+// Boilerplate for applying mixins to MatListItem.
 /** @docs-private */
-export class MdListItemBase {}
-export const _MdListItemMixinBase = mixinDisableRipple(MdListItemBase);
+export class MatListItemBase {}
+export const _MatListItemMixinBase = mixinDisableRipple(MatListItemBase);
 
 
 /** Divider between items within a list. */
 @Directive({
-  selector: 'md-divider, mat-divider',
+  selector: 'mat-divider',
   host: {
     'role': 'separator',
     'aria-orientation': 'horizontal'
   }
 })
-export class MdListDivider {}
+export class MatListDivider {}
 
 /** A Material Design list component. */
 @Component({
   moduleId: module.id,
-  selector: 'md-list, mat-list, md-nav-list, mat-nav-list',
+  selector: 'mat-list, mat-nav-list',
   host: {'role': 'list'},
   template: '<ng-content></ng-content>',
   styleUrls: ['list.css'],
@@ -55,72 +54,72 @@ export class MdListDivider {}
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdList extends _MdListMixinBase implements CanDisableRipple {}
+export class MatList extends _MatListMixinBase implements CanDisableRipple {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: 'md-list, mat-list',
+  selector: 'mat-list',
   host: {'class': 'mat-list'}
 })
-export class MdListCssMatStyler {}
+export class MatListCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: 'md-nav-list, mat-nav-list',
+  selector: 'mat-nav-list',
   host: {'class': 'mat-nav-list'}
 })
-export class MdNavListCssMatStyler {}
+export class MatNavListCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: 'md-divider, mat-divider',
+  selector: 'mat-divider',
   host: {'class': 'mat-divider'}
 })
-export class MdDividerCssMatStyler {}
+export class MatDividerCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: '[md-list-avatar], [mat-list-avatar], [mdListAvatar], [matListAvatar]',
+  selector: '[mat-list-avatar], [matListAvatar]',
   host: {'class': 'mat-list-avatar'}
 })
-export class MdListAvatarCssMatStyler {}
+export class MatListAvatarCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: '[md-list-icon], [mat-list-icon], [mdListIcon], [matListIcon]',
+  selector: '[mat-list-icon], [matListIcon]',
   host: {'class': 'mat-list-icon'}
 })
-export class MdListIconCssMatStyler {}
+export class MatListIconCssMatStyler {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
  * @docs-private
  */
 @Directive({
-  selector: '[md-subheader], [mat-subheader], [mdSubheader], [matSubheader]',
+  selector: '[mat-subheader], [matSubheader]',
   host: {'class': 'mat-subheader'}
 })
-export class MdListSubheaderCssMatStyler {}
+export class MatListSubheaderCssMatStyler {}
 
 /** An item within a Material Design list. */
 @Component({
   moduleId: module.id,
-  selector: 'md-list-item, mat-list-item, a[md-list-item], a[mat-list-item]',
+  selector: 'mat-list-item, a[mat-list-item]',
   host: {
     'role': 'listitem',
     'class': 'mat-list-item',
@@ -132,16 +131,16 @@ export class MdListSubheaderCssMatStyler {}
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdListItem extends _MdListItemMixinBase implements AfterContentInit, CanDisableRipple {
-  private _lineSetter: MdLineSetter;
+export class MatListItem extends _MatListItemMixinBase implements AfterContentInit,
+    CanDisableRipple {
+  private _lineSetter: MatLineSetter;
   private _isNavList: boolean = false;
 
-  @ContentChildren(MdLine) _lines: QueryList<MdLine>;
+  @ContentChildren(MatLine) _lines: QueryList<MatLine>;
 
-  @ContentChild(MdListAvatarCssMatStyler)
-  set _hasAvatar(avatar: MdListAvatarCssMatStyler) {
+  @ContentChild(MatListAvatarCssMatStyler)
+  set _hasAvatar(avatar: MatListAvatarCssMatStyler) {
     if (avatar != null) {
       this._renderer.addClass(this._element.nativeElement, 'mat-list-item-avatar');
     } else {
@@ -151,14 +150,14 @@ export class MdListItem extends _MdListItemMixinBase implements AfterContentInit
 
   constructor(private _renderer: Renderer2,
               private _element: ElementRef,
-              @Optional() private _list: MdList,
-              @Optional() navList: MdNavListCssMatStyler) {
+              @Optional() private _list: MatList,
+              @Optional() navList: MatNavListCssMatStyler) {
     super();
     this._isNavList = !!navList;
   }
 
   ngAfterContentInit() {
-    this._lineSetter = new MdLineSetter(this._lines, this._renderer, this._element);
+    this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
   }
 
   /** Whether this list item should show a ripple effect when clicked.  */
diff --git a/src/lib/list/mat-exports.ts b/src/lib/list/mat-exports.ts
deleted file mode 100644
index e8f8a9e89e40..000000000000
--- a/src/lib/list/mat-exports.ts
+++ /dev/null
@@ -1,48 +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 {
-  MdDividerCssMatStyler,
-  MdList,
-  MdListAvatarCssMatStyler,
-  MdListBase,
-  MdListCssMatStyler,
-  MdListDivider,
-  MdListIconCssMatStyler,
-  MdListItem,
-  MdListItemBase,
-  MdListSubheaderCssMatStyler,
-  MdNavListCssMatStyler,
-} from './list';
-import {
-  MdListOption,
-  MdListOptionBase,
-  MdSelectionList,
-  MdSelectionListBase,
-  MdSelectionListOptionEvent,
-} from './selection-list';
-import {MdListModule} from './list-module';
-
-
-export {MdDividerCssMatStyler as MatDividerCssMatStyler};
-export {MdList as MatList};
-export {MdListAvatarCssMatStyler as MatListAvatarCssMatStyler};
-export {MdListBase as MatListBase};
-export {MdListCssMatStyler as MatListCssMatStyler};
-export {MdListDivider as MatListDivider};
-export {MdListIconCssMatStyler as MatListIconCssMatStyler};
-export {MdListItem as MatListItem};
-export {MdListItemBase as MatListItemBase};
-export {MdListModule as MatListModule};
-export {MdListOption as MatListOption};
-export {MdListOptionBase as MatListOptionBase};
-export {MdListSubheaderCssMatStyler as MatListSubheaderCssMatStyler};
-export {MdNavListCssMatStyler as MatNavListCssMatStyler};
-export {MdSelectionList as MatSelectionList};
-export {MdSelectionListBase as MatSelectionListBase};
-export {MdSelectionListOptionEvent as MatSelectionListOptionEvent};
diff --git a/src/lib/list/public_api.ts b/src/lib/list/public_api.ts
index 98b17cb93de7..bea6b187f243 100644
--- a/src/lib/list/public_api.ts
+++ b/src/lib/list/public_api.ts
@@ -9,4 +9,4 @@
 export * from './list-module';
 export * from './list';
 export * from './selection-list';
-export * from './mat-exports';
+
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index bb3752c3fdd9..457d0b1532ea 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -4,10 +4,10 @@ import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdListModule, MdListOption, MdSelectionList} from './index';
+import {MatListModule, MatListOption, MatSelectionList} from './index';
 
 
-describe('MdSelectionList', () => {
+describe('MatSelectionList', () => {
   describe('with list option', () => {
     let fixture: ComponentFixture<SelectionListWithListOptions>;
     let listOption: DebugElement[];
@@ -16,7 +16,7 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [
           SelectionListWithListOptions,
           SelectionListWithCheckboxPositionAfter,
@@ -30,9 +30,9 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithListOptions);
-      listOption = fixture.debugElement.queryAll(By.directive(MdListOption));
+      listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
       listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
-      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
     }));
 
@@ -57,8 +57,9 @@ describe('MdSelectionList', () => {
     });
 
     it('should be able to dispatch one selected item', () => {
-      let testListItem = listOption[2].injector.get<MdListOption>(MdListOption);
-      let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
+      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
+      let selectList =
+          selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
       expect(listOption[2].nativeElement.getAttribute('aria-selected')).toBe('false');
@@ -72,9 +73,10 @@ describe('MdSelectionList', () => {
     });
 
     it('should be able to dispatch multiple selected items', () => {
-      let testListItem = listOption[2].injector.get<MdListOption>(MdListOption);
-      let testListItem2 = listOption[1].injector.get<MdListOption>(MdListOption);
-      let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
+      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
+      let testListItem2 = listOption[1].injector.get<MatListOption>(MatListOption);
+      let selectList =
+          selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
       expect(listOption[2].nativeElement.getAttribute('aria-selected')).toBe('false');
@@ -94,8 +96,9 @@ describe('MdSelectionList', () => {
     });
 
     it('should be able to deselect an option', () => {
-      let testListItem = listOption[2].injector.get<MdListOption>(MdListOption);
-      let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
+      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
+      let selectList =
+          selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
 
@@ -111,8 +114,9 @@ describe('MdSelectionList', () => {
     });
 
     it('should not allow selection of disabled items', () => {
-      let testListItem = listOption[0].injector.get<MdListOption>(MdListOption);
-      let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
+      let testListItem = listOption[0].injector.get<MatListOption>(MatListOption);
+      let selectList =
+          selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
       expect(listOption[0].nativeElement.getAttribute('aria-disabled')).toBe('true');
@@ -124,7 +128,7 @@ describe('MdSelectionList', () => {
     });
 
     it('should be able to un-disable disabled items', () => {
-      let testListItem = listOption[0].injector.get<MdListOption>(MdListOption);
+      let testListItem = listOption[0].injector.get<MatListOption>(MatListOption);
 
       expect(listOption[0].nativeElement.getAttribute('aria-disabled')).toBe('true');
 
@@ -138,7 +142,8 @@ describe('MdSelectionList', () => {
       let testListItem = listOption[1].nativeElement as HTMLElement;
       let SPACE_EVENT: KeyboardEvent =
         createKeyboardEvent('keydown', SPACE, testListItem);
-      let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
+      let selectList =
+          selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
       let options = selectionList.componentInstance.options;
       let array = options.toArray();
       let focusItem = array[1];
@@ -191,7 +196,7 @@ describe('MdSelectionList', () => {
     });
 
     it('should be able to select all options', () => {
-      const list: MdSelectionList = selectionList.componentInstance;
+      const list: MatSelectionList = selectionList.componentInstance;
 
       expect(list.options.toArray().every(option => option.selected)).toBe(false);
 
@@ -202,7 +207,7 @@ describe('MdSelectionList', () => {
     });
 
     it('should be able to deselect all options', () => {
-      const list: MdSelectionList = selectionList.componentInstance;
+      const list: MatSelectionList = selectionList.componentInstance;
 
       list.options.forEach(option => option.toggle());
       expect(list.options.toArray().every(option => option.selected)).toBe(true);
@@ -223,7 +228,7 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [
           SelectionListWithListOptions,
           SelectionListWithCheckboxPositionAfter,
@@ -237,9 +242,9 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithOnlyOneOption);
-      listOption = fixture.debugElement.query(By.directive(MdListOption));
+      listOption = fixture.debugElement.query(By.directive(MatListOption));
       listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
-      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
     }));
 
@@ -266,11 +271,11 @@ describe('MdSelectionList', () => {
   describe('with option disabled', () => {
     let fixture: ComponentFixture<SelectionListWithDisabledOption>;
     let listOptionEl: HTMLElement;
-    let listOption: MdListOption;
+    let listOption: MatListOption;
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [SelectionListWithDisabledOption]
       });
 
@@ -280,7 +285,7 @@ describe('MdSelectionList', () => {
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithDisabledOption);
 
-      const listOptionDebug = fixture.debugElement.query(By.directive(MdListOption));
+      const listOptionDebug = fixture.debugElement.query(By.directive(MatListOption));
 
       listOption = listOptionDebug.componentInstance;
       listOptionEl = listOptionDebug.nativeElement;
@@ -317,7 +322,7 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [
           SelectionListWithListOptions,
           SelectionListWithCheckboxPositionAfter,
@@ -331,15 +336,16 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithListDisabled);
-      listOption = fixture.debugElement.queryAll(By.directive(MdListOption));
+      listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
       listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
-      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
     }));
 
     it('should not allow selection on disabled selection-list', () => {
-      let testListItem = listOption[2].injector.get<MdListOption>(MdListOption);
-      let selectList = selectionList.injector.get<MdSelectionList>(MdSelectionList).selectedOptions;
+      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
+      let selectList =
+          selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
 
@@ -358,7 +364,7 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [
           SelectionListWithListOptions,
           SelectionListWithCheckboxPositionAfter,
@@ -372,9 +378,9 @@ describe('MdSelectionList', () => {
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithCheckboxPositionAfter);
-      listOption = fixture.debugElement.queryAll(By.directive(MdListOption));
+      listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
       listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
-      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
     }));
 
@@ -388,62 +394,62 @@ describe('MdSelectionList', () => {
 
 @Component({template: `
   <mat-selection-list id="selection-list-1">
-    <md-list-option checkboxPosition="before" disabled="true" value="inbox">
+    <mat-list-option checkboxPosition="before" disabled="true" value="inbox">
       Inbox (disabled selection-option)
-    </md-list-option>
-    <md-list-option id="testSelect" checkboxPosition="before" class="test-native-focus"
+    </mat-list-option>
+    <mat-list-option id="testSelect" checkboxPosition="before" class="test-native-focus"
                     value="starred">
       Starred
-    </md-list-option>
-    <md-list-option checkboxPosition="before" value="sent-mail">
+    </mat-list-option>
+    <mat-list-option checkboxPosition="before" value="sent-mail">
       Sent Mail
-    </md-list-option>
-    <md-list-option checkboxPosition="before" value="drafts">
+    </mat-list-option>
+    <mat-list-option checkboxPosition="before" value="drafts">
       Drafts
-    </md-list-option>
+    </mat-list-option>
   </mat-selection-list>`})
 class SelectionListWithListOptions {
 }
 
 @Component({template: `
   <mat-selection-list id = "selection-list-2">
-    <md-list-option checkboxPosition = "after">
+    <mat-list-option checkboxPosition = "after">
       Inbox (disabled selection-option)
-    </md-list-option>
-    <md-list-option id = "testSelect" checkboxPosition = "after">
+    </mat-list-option>
+    <mat-list-option id = "testSelect" checkboxPosition = "after">
       Starred
-    </md-list-option>
-    <md-list-option checkboxPosition = "after">
+    </mat-list-option>
+    <mat-list-option checkboxPosition = "after">
       Sent Mail
-    </md-list-option>
-    <md-list-option checkboxPosition = "after">
+    </mat-list-option>
+    <mat-list-option checkboxPosition = "after">
       Drafts
-    </md-list-option>
+    </mat-list-option>
   </mat-selection-list>`})
 class SelectionListWithCheckboxPositionAfter {
 }
 
 @Component({template: `
   <mat-selection-list id = "selection-list-3" [disabled] = true>
-    <md-list-option checkboxPosition = "after">
+    <mat-list-option checkboxPosition = "after">
       Inbox (disabled selection-option)
-    </md-list-option>
-    <md-list-option id = "testSelect" checkboxPosition = "after">
+    </mat-list-option>
+    <mat-list-option id = "testSelect" checkboxPosition = "after">
       Starred
-    </md-list-option>
-    <md-list-option checkboxPosition = "after">
+    </mat-list-option>
+    <mat-list-option checkboxPosition = "after">
       Sent Mail
-    </md-list-option>
-    <md-list-option checkboxPosition = "after">
+    </mat-list-option>
+    <mat-list-option checkboxPosition = "after">
       Drafts
-    </md-list-option>
+    </mat-list-option>
   </mat-selection-list>`})
 class SelectionListWithListDisabled {
 }
 
 @Component({template: `
   <mat-selection-list>
-    <md-list-option [disabled]="disableItem">Item</md-list-option>
+    <mat-list-option [disabled]="disableItem">Item</mat-list-option>
   </mat-selection-list>
   `})
 class SelectionListWithDisabledOption {
@@ -452,9 +458,9 @@ class SelectionListWithDisabledOption {
 
 @Component({template: `
   <mat-selection-list id = "selection-list-4">
-    <md-list-option checkboxPosition = "after" class="test-focus" id="123">
+    <mat-list-option checkboxPosition = "after" class="test-focus" id="123">
       Inbox
-    </md-list-option>
+    </mat-list-option>
   </mat-selection-list>`})
 class SelectionListWithOnlyOneOption {
 }
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 5cd645a33c1d..3f939fa600c7 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -32,9 +32,8 @@ import {
 import {
   CanDisable,
   CanDisableRipple,
-  MATERIAL_COMPATIBILITY_MODE,
-  MdLine,
-  MdLineSetter,
+  MatLine,
+  MatLineSetter,
   mixinDisabled,
   mixinDisableRipple,
 } from '@angular/material/core';
@@ -43,16 +42,16 @@ import {Subscription} from 'rxjs/Subscription';
 
 
 /** @docs-private */
-export class MdSelectionListBase {}
-export const _MdSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MdSelectionListBase));
+export class MatSelectionListBase {}
+export const _MatSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MatSelectionListBase));
 
 /** @docs-private */
-export class MdListOptionBase {}
-export const _MdListOptionMixinBase = mixinDisableRipple(MdListOptionBase);
+export class MatListOptionBase {}
+export const _MatListOptionMixinBase = mixinDisableRipple(MatListOptionBase);
 
 /** Event emitted by a selection-list whenever the state of an option is changed. */
-export interface MdSelectionListOptionEvent {
-  option: MdListOption;
+export interface MatSelectionListOptionEvent {
+  option: MatListOption;
 }
 
 const FOCUSED_STYLE: string = 'mat-list-item-focus';
@@ -64,7 +63,7 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-list-option, mat-list-option',
+  selector: 'mat-list-option',
   inputs: ['disableRipple'],
   host: {
     'role': 'option',
@@ -81,19 +80,18 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdListOption extends _MdListOptionMixinBase
+export class MatListOption extends _MatListOptionMixinBase
     implements AfterContentInit, OnDestroy, FocusableOption, CanDisableRipple {
 
-  private _lineSetter: MdLineSetter;
+  private _lineSetter: MatLineSetter;
   private _selected: boolean = false;
   private _disabled: boolean = false;
 
   /** Whether the option has focus. */
   _hasFocus: boolean = false;
 
-  @ContentChildren(MdLine) _lines: QueryList<MdLine>;
+  @ContentChildren(MatLine) _lines: QueryList<MatLine>;
 
   /** Whether the label should appear before or after the checkbox. Defaults to 'after' */
   @Input() checkboxPosition: 'before' | 'after' = 'after';
@@ -112,27 +110,27 @@ export class MdListOption extends _MdListOptionMixinBase
   set selected(value: boolean) { this._selected = coerceBooleanProperty(value); }
 
   /** Emitted when the option is focused. */
-  onFocus = new EventEmitter<MdSelectionListOptionEvent>();
+  onFocus = new EventEmitter<MatSelectionListOptionEvent>();
 
   /** Emitted when the option is selected. */
-  @Output() selectChange = new EventEmitter<MdSelectionListOptionEvent>();
+  @Output() selectChange = new EventEmitter<MatSelectionListOptionEvent>();
 
   /** Emitted when the option is deselected. */
-  @Output() deselected = new EventEmitter<MdSelectionListOptionEvent>();
+  @Output() deselected = new EventEmitter<MatSelectionListOptionEvent>();
 
   /** Emitted when the option is destroyed. */
-  @Output() destroyed = new EventEmitter<MdSelectionListOptionEvent>();
+  @Output() destroyed = new EventEmitter<MatSelectionListOptionEvent>();
 
   constructor(private _renderer: Renderer2,
               private _element: ElementRef,
               private _changeDetector: ChangeDetectorRef,
-              @Optional() @Inject(forwardRef(() => MdSelectionList))
-              public selectionList: MdSelectionList) {
+              @Optional() @Inject(forwardRef(() => MatSelectionList))
+              public selectionList: MatSelectionList) {
     super();
   }
 
   ngAfterContentInit() {
-    this._lineSetter = new MdLineSetter(this._lines, this._renderer, this._element);
+    this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
 
     if (this.selectionList.disabled) {
       this.disabled = true;
@@ -188,7 +186,7 @@ export class MdListOption extends _MdListOptionMixinBase
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-selection-list, mat-selection-list',
+  selector: 'mat-selection-list',
   inputs: ['disabled', 'disableRipple'],
   host: {
     'role': 'listbox',
@@ -203,7 +201,7 @@ export class MdListOption extends _MdListOptionMixinBase
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MdSelectionList extends _MdSelectionListMixinBase
+export class MatSelectionList extends _MatSelectionListMixinBase
     implements FocusableOption, CanDisable, CanDisableRipple, AfterContentInit, OnDestroy {
 
   /** Tab index for the selection-list. */
@@ -216,20 +214,20 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   private _optionDestroyStream = Subscription.EMPTY;
 
   /** The FocusKeyManager which handles focus. */
-  _keyManager: FocusKeyManager<MdListOption>;
+  _keyManager: FocusKeyManager<MatListOption>;
 
   /** The option components contained within this selection-list. */
-  @ContentChildren(MdListOption) options: QueryList<MdListOption>;
+  @ContentChildren(MatListOption) options: QueryList<MatListOption>;
 
   /** The currently selected options. */
-  selectedOptions: SelectionModel<MdListOption> = new SelectionModel<MdListOption>(true);
+  selectedOptions: SelectionModel<MatListOption> = new SelectionModel<MatListOption>(true);
 
   constructor(private _element: ElementRef) {
     super();
   }
 
   ngAfterContentInit(): void {
-    this._keyManager = new FocusKeyManager<MdListOption>(this.options).withWrap();
+    this._keyManager = new FocusKeyManager<MatListOption>(this.options).withWrap();
 
     if (this.disabled) {
       this._tabIndex = -1;
@@ -271,9 +269,9 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   private _onDestroySubscription(): Subscription {
     return RxChain.from(this.options.changes)
       .call(startWith, this.options)
-      .call(switchMap, (options: MdListOption[]) => {
+      .call(switchMap, (options: MatListOption[]) => {
         return merge(...options.map(option => option.destroyed));
-      }).subscribe((e: MdSelectionListOptionEvent) => {
+      }).subscribe((e: MatSelectionListOptionEvent) => {
         let optionIndex: number = this.options.toArray().indexOf(e.option);
         if (e.option._hasFocus) {
           // Check whether the option is the last item
@@ -291,9 +289,9 @@ export class MdSelectionList extends _MdSelectionListMixinBase
   private _onFocusSubscription(): Subscription {
     return RxChain.from(this.options.changes)
       .call(startWith, this.options)
-      .call(switchMap, (options: MdListOption[]) => {
+      .call(switchMap, (options: MatListOption[]) => {
         return merge(...options.map(option => option.onFocus));
-      }).subscribe((e: MdSelectionListOptionEvent) => {
+      }).subscribe((e: MatSelectionListOptionEvent) => {
       let optionIndex: number = this.options.toArray().indexOf(e.option);
       this._keyManager.updateActiveItemIndex(optionIndex);
     });
@@ -317,7 +315,7 @@ export class MdSelectionList extends _MdSelectionListMixinBase
     let focusedIndex = this._keyManager.activeItemIndex;
 
     if (focusedIndex != null && this._isValidIndex(focusedIndex)) {
-      let focusedOption: MdListOption = this.options.toArray()[focusedIndex];
+      let focusedOption: MatListOption = this.options.toArray()[focusedIndex];
 
       if (focusedOption) {
         focusedOption.toggle();
diff --git a/src/lib/menu/mat-exports.ts b/src/lib/menu/mat-exports.ts
deleted file mode 100644
index 1c123fbebf03..000000000000
--- a/src/lib/menu/mat-exports.ts
+++ /dev/null
@@ -1,26 +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 {
-  MD_MENU_DEFAULT_OPTIONS,
-  MdMenu,
-  MdMenuDefaultOptions,
-  MdMenuItem,
-  MdMenuPanel,
-  MdMenuTrigger,
-} from './menu';
-import {MdMenuModule} from './menu-module';
-
-
-export {MD_MENU_DEFAULT_OPTIONS as MAT_MENU_DEFAULT_OPTIONS};
-export {MdMenu as MatMenu};
-export {MdMenuDefaultOptions as MatMenuDefaultOptions};
-export {MdMenuItem as MatMenuItem};
-export {MdMenuModule as MatMenuModule};
-export {MdMenuPanel as MatMenuPanel};
-export {MdMenuTrigger as MatMenuTrigger};
diff --git a/src/lib/menu/menu-animations.ts b/src/lib/menu/menu-animations.ts
index ff709feb4b18..7a594819fc85 100644
--- a/src/lib/menu/menu-animations.ts
+++ b/src/lib/menu/menu-animations.ts
@@ -16,7 +16,7 @@ import{
 } from '@angular/animations';
 
 /**
- * Below are all the animations for the md-menu component.
+ * Below are all the animations for the mat-menu component.
  * Animation duration and timing values are based on:
  * https://material.io/guidelines/components/menus.html#menus-usage
  */
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index aa7d1c8dfef1..81243ac07b97 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -32,33 +32,33 @@ import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
 import {fadeInItems, transformMenu} from './menu-animations';
-import {throwMdMenuInvalidPositionX, throwMdMenuInvalidPositionY} from './menu-errors';
-import {MdMenuItem} from './menu-item';
-import {MdMenuPanel} from './menu-panel';
+import {throwMatMenuInvalidPositionX, throwMatMenuInvalidPositionY} from './menu-errors';
+import {MatMenuItem} from './menu-item';
+import {MatMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 
 
-/** Default `md-menu` options that can be overridden. */
-export interface MdMenuDefaultOptions {
+/** Default `mat-menu` options that can be overridden. */
+export interface MatMenuDefaultOptions {
   xPosition: MenuPositionX;
   yPosition: MenuPositionY;
   overlapTrigger: boolean;
 }
 
-/** Injection token to be used to override the default options for `md-menu`. */
-export const MD_MENU_DEFAULT_OPTIONS =
-    new InjectionToken<MdMenuDefaultOptions>('md-menu-default-options');
+/** Injection token to be used to override the default options for `mat-menu`. */
+export const MAT_MENU_DEFAULT_OPTIONS =
+    new InjectionToken<MatMenuDefaultOptions>('mat-menu-default-options');
 
 /**
  * Start elevation for the menu panel.
  * @docs-private
  */
-const MD_MENU_BASE_ELEVATION = 2;
+const MAT_MENU_BASE_ELEVATION = 2;
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-menu, mat-menu',
+  selector: 'mat-menu',
   templateUrl: 'menu.html',
   styleUrls: ['menu.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -68,10 +68,10 @@ const MD_MENU_BASE_ELEVATION = 2;
     transformMenu,
     fadeInItems
   ],
-  exportAs: 'mdMenu, matMenu'
+  exportAs: 'matMenu'
 })
-export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
-  private _keyManager: FocusKeyManager<MdMenuItem>;
+export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
+  private _keyManager: FocusKeyManager<MatMenuItem>;
   private _xPosition: MenuPositionX = this._defaultOptions.xPosition;
   private _yPosition: MenuPositionY = this._defaultOptions.yPosition;
   private _previousElevation: string;
@@ -86,7 +86,7 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   _panelAnimationState: 'void' | 'enter-start' | 'enter' = 'void';
 
   /** Parent menu of the current menu panel. */
-  parentMenu: MdMenuPanel | undefined;
+  parentMenu: MatMenuPanel | undefined;
 
   /** Layout direction of the menu. */
   direction: Direction;
@@ -96,7 +96,7 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   get xPosition() { return this._xPosition; }
   set xPosition(value: MenuPositionX) {
     if (value !== 'before' && value !== 'after') {
-      throwMdMenuInvalidPositionX();
+      throwMatMenuInvalidPositionX();
     }
     this._xPosition = value;
     this.setPositionClasses();
@@ -107,7 +107,7 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   get yPosition() { return this._yPosition; }
   set yPosition(value: MenuPositionY) {
     if (value !== 'above' && value !== 'below') {
-      throwMdMenuInvalidPositionY();
+      throwMatMenuInvalidPositionY();
     }
     this._yPosition = value;
     this.setPositionClasses();
@@ -116,13 +116,13 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   @ViewChild(TemplateRef) templateRef: TemplateRef<any>;
 
   /** List of the items inside of a menu. */
-  @ContentChildren(MdMenuItem) items: QueryList<MdMenuItem>;
+  @ContentChildren(MatMenuItem) items: QueryList<MatMenuItem>;
 
   /** Whether the menu should overlap its trigger. */
   @Input() overlapTrigger = this._defaultOptions.overlapTrigger;
 
   /**
-   * This method takes classes set on the host md-menu element and applies them on the
+   * This method takes classes set on the host mat-menu element and applies them on the
    * menu template that displays in the overlay container.  Otherwise, it's difficult
    * to style the containing menu from outside the component.
    * @param classes list of class names
@@ -145,10 +145,10 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
 
   constructor(
     private _elementRef: ElementRef,
-    @Inject(MD_MENU_DEFAULT_OPTIONS) private _defaultOptions: MdMenuDefaultOptions) { }
+    @Inject(MAT_MENU_DEFAULT_OPTIONS) private _defaultOptions: MatMenuDefaultOptions) { }
 
   ngAfterContentInit() {
-    this._keyManager = new FocusKeyManager<MdMenuItem>(this.items).withWrap();
+    this._keyManager = new FocusKeyManager<MatMenuItem>(this.items).withWrap();
     this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close.emit('keydown'));
   }
 
@@ -159,10 +159,10 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   }
 
   /** Stream that emits whenever the hovered menu item changes. */
-  hover(): Observable<MdMenuItem> {
+  hover(): Observable<MatMenuItem> {
     return RxChain.from(this.items.changes)
       .call(startWith, this.items)
-      .call(switchMap, (items: MdMenuItem[]) => merge(...items.map(item => item.hover)))
+      .call(switchMap, (items: MatMenuItem[]) => merge(...items.map(item => item.hover)))
       .result();
   }
 
@@ -213,7 +213,7 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
    */
   setElevation(depth: number): void {
     // The elevation starts at the base and increases by one for each level.
-    const newElevation = `mat-elevation-z${MD_MENU_BASE_ELEVATION + depth}`;
+    const newElevation = `mat-elevation-z${MAT_MENU_BASE_ELEVATION + depth}`;
     const customElevation = Object.keys(this._classList).find(c => c.startsWith('mat-elevation-z'));
 
     if (!customElevation || customElevation === this._previousElevation) {
diff --git a/src/lib/menu/menu-errors.ts b/src/lib/menu/menu-errors.ts
index 4090e71fa812..0ab32e469c05 100644
--- a/src/lib/menu/menu-errors.ts
+++ b/src/lib/menu/menu-errors.ts
@@ -7,15 +7,15 @@
  */
 
 /**
- * Throws an exception for the case when menu trigger doesn't have a valid md-menu instance
+ * Throws an exception for the case when menu trigger doesn't have a valid mat-menu instance
  * @docs-private
  */
-export function throwMdMenuMissingError() {
-  throw Error(`md-menu-trigger: must pass in an md-menu instance.
+export function throwMatMenuMissingError() {
+  throw Error(`mat-menu-trigger: must pass in an mat-menu instance.
 
     Example:
-      <md-menu #menu="mdMenu"></md-menu>
-      <button [mdMenuTriggerFor]="menu"></button>`);
+      <mat-menu #menu="matMenu"></mat-menu>
+      <button [matMenuTriggerFor]="menu"></button>`);
 }
 
 /**
@@ -23,9 +23,9 @@ export function throwMdMenuMissingError() {
  * In other words, it doesn't match 'before' or 'after'.
  * @docs-private
  */
-export function throwMdMenuInvalidPositionX() {
+export function throwMatMenuInvalidPositionX() {
   throw Error(`x-position value must be either 'before' or after'.
-      Example: <md-menu x-position="before" #menu="mdMenu"></md-menu>`);
+      Example: <mat-menu x-position="before" #menu="matMenu"></mat-menu>`);
 }
 
 /**
@@ -33,7 +33,7 @@ export function throwMdMenuInvalidPositionX() {
  * In other words, it doesn't match 'above' or 'below'.
  * @docs-private
  */
-export function throwMdMenuInvalidPositionY() {
+export function throwMatMenuInvalidPositionY() {
   throw Error(`y-position value must be either 'above' or below'.
-      Example: <md-menu y-position="above" #menu="mdMenu"></md-menu>`);
+      Example: <mat-menu y-position="above" #menu="matMenu"></mat-menu>`);
 }
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index fe9ff3dcbb55..c08a7e39cf3a 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -14,21 +14,21 @@ import {
   OnDestroy,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanDisable, MATERIAL_COMPATIBILITY_MODE, mixinDisabled} from '@angular/material/core';
+import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
-// Boilerplate for applying mixins to MdMenuItem.
+// Boilerplate for applying mixins to MatMenuItem.
 /** @docs-private */
-export class MdMenuItemBase {}
-export const _MdMenuItemMixinBase = mixinDisabled(MdMenuItemBase);
+export class MatMenuItemBase {}
+export const _MatMenuItemMixinBase = mixinDisabled(MatMenuItemBase);
 
 /**
- * This directive is intended to be used inside an md-menu tag.
+ * This directive is intended to be used inside an mat-menu tag.
  * It exists mostly to set the role attribute.
  */
 @Component({
   moduleId: module.id,
-  selector: '[md-menu-item], [mat-menu-item]',
+  selector: '[mat-menu-item]',
   inputs: ['disabled'],
   host: {
     'role': 'menuitem',
@@ -45,14 +45,13 @@ export const _MdMenuItemMixinBase = mixinDisabled(MdMenuItemBase);
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   templateUrl: 'menu-item.html',
-  exportAs: 'mdMenuItem, matMenuItem',
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
+  exportAs: 'matMenuItem',
 })
-export class MdMenuItem extends _MdMenuItemMixinBase implements FocusableOption, CanDisable,
+export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOption, CanDisable,
   OnDestroy {
 
   /** Stream that emits when the menu item is hovered. */
-  hover: Subject<MdMenuItem> = new Subject();
+  hover: Subject<MatMenuItem> = new Subject();
 
   /** Whether the menu item is highlighted. */
   _highlighted: boolean = false;
diff --git a/src/lib/menu/menu-module.ts b/src/lib/menu/menu-module.ts
index 2ebfabe5a916..3c35206d6e46 100644
--- a/src/lib/menu/menu-module.ts
+++ b/src/lib/menu/menu-module.ts
@@ -8,27 +8,27 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '@angular/material/core';
 import {OverlayModule} from '@angular/cdk/overlay';
-import {MdMenu, MD_MENU_DEFAULT_OPTIONS} from './menu-directive';
-import {MdMenuItem} from './menu-item';
-import {MdMenuTrigger, MD_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
-import {MdRippleModule} from '@angular/material/core';
+import {MatMenu, MAT_MENU_DEFAULT_OPTIONS} from './menu-directive';
+import {MatMenuItem} from './menu-item';
+import {MatMenuTrigger, MAT_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
+import {MatRippleModule} from '@angular/material/core';
 
 
 @NgModule({
   imports: [
     OverlayModule,
     CommonModule,
-    MdRippleModule,
-    MdCommonModule,
+    MatRippleModule,
+    MatCommonModule,
   ],
-  exports: [MdMenu, MdMenuItem, MdMenuTrigger, MdCommonModule],
-  declarations: [MdMenu, MdMenuItem, MdMenuTrigger],
+  exports: [MatMenu, MatMenuItem, MatMenuTrigger, MatCommonModule],
+  declarations: [MatMenu, MatMenuItem, MatMenuTrigger],
   providers: [
-    MD_MENU_SCROLL_STRATEGY_PROVIDER,
+    MAT_MENU_SCROLL_STRATEGY_PROVIDER,
     {
-      provide: MD_MENU_DEFAULT_OPTIONS,
+      provide: MAT_MENU_DEFAULT_OPTIONS,
       useValue: {
         overlapTrigger: true,
         xPosition: 'after',
@@ -37,4 +37,4 @@ import {MdRippleModule} from '@angular/material/core';
     }
   ],
 })
-export class MdMenuModule {}
+export class MatMenuModule {}
diff --git a/src/lib/menu/menu-panel.ts b/src/lib/menu/menu-panel.ts
index 073d40805267..3f1a6eb18492 100644
--- a/src/lib/menu/menu-panel.ts
+++ b/src/lib/menu/menu-panel.ts
@@ -10,13 +10,13 @@ import {EventEmitter, TemplateRef} from '@angular/core';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 import {Direction} from '@angular/cdk/bidi';
 
-export interface MdMenuPanel {
+export interface MatMenuPanel {
   xPosition: MenuPositionX;
   yPosition: MenuPositionY;
   overlapTrigger: boolean;
   templateRef: TemplateRef<any>;
   close: EventEmitter<void | 'click' | 'keydown'>;
-  parentMenu?: MdMenuPanel | undefined;
+  parentMenu?: MatMenuPanel | undefined;
   direction?: Direction;
   focusFirstItem: () => void;
   setPositionClasses: (x: MenuPositionX, y: MenuPositionY) => void;
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 09d2e9c63764..32e520353ee6 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -38,28 +38,28 @@ import {
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subscription} from 'rxjs/Subscription';
-import {MdMenu} from './menu-directive';
-import {throwMdMenuMissingError} from './menu-errors';
-import {MdMenuItem} from './menu-item';
-import {MdMenuPanel} from './menu-panel';
+import {MatMenu} from './menu-directive';
+import {throwMatMenuMissingError} from './menu-errors';
+import {MatMenuItem} from './menu-item';
+import {MatMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 
 
 /** Injection token that determines the scroll handling while the menu is open. */
-export const MD_MENU_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-menu-scroll-strategy');
+export const MAT_MENU_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-menu-scroll-strategy');
 
 /** @docs-private */
-export function MD_MENU_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_MENU_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition();
 }
 
 /** @docs-private */
-export const MD_MENU_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_MENU_SCROLL_STRATEGY,
+export const MAT_MENU_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_MENU_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_MENU_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: MAT_MENU_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 
@@ -69,21 +69,20 @@ export const MD_MENU_SCROLL_STRATEGY_PROVIDER = {
 export const MENU_PANEL_TOP_PADDING = 8;
 
 /**
- * This directive is intended to be used in conjunction with an md-menu tag.  It is
+ * This directive is intended to be used in conjunction with an mat-menu tag.  It is
  * responsible for toggling the display of the provided menu instance.
  */
 @Directive({
-  selector: `[md-menu-trigger-for], [mat-menu-trigger-for],
-             [mdMenuTriggerFor], [matMenuTriggerFor]`,
+  selector: `[mat-menu-trigger-for], [matMenuTriggerFor]`,
   host: {
     'aria-haspopup': 'true',
     '(mousedown)': '_handleMousedown($event)',
     '(keydown)': '_handleKeydown($event)',
     '(click)': '_handleClick($event)',
   },
-  exportAs: 'mdMenuTrigger, matMenuTrigger'
+  exportAs: 'matMenuTrigger'
 })
-export class MdMenuTrigger implements AfterViewInit, OnDestroy {
+export class MatMenuTrigger implements AfterViewInit, OnDestroy {
   private _portal: TemplatePortal<any>;
   private _overlayRef: OverlayRef | null = null;
   private _menuOpen: boolean = false;
@@ -95,38 +94,18 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   // the first item of the list when the menu is opened via the keyboard
   private _openedByMouse: boolean = false;
 
-  /** @deprecated */
-  @Input('md-menu-trigger-for')
-  get _deprecatedMdMenuTriggerFor(): MdMenuPanel {
-    return this.menu;
-  }
-
-  set _deprecatedMdMenuTriggerFor(v: MdMenuPanel) {
-    this.menu = v;
-  }
-
   /** @deprecated */
   @Input('mat-menu-trigger-for')
-  get _deprecatedMatMenuTriggerFor(): MdMenuPanel {
-    return this.menu;
-  }
-
-  set _deprecatedMatMenuTriggerFor(v: MdMenuPanel) {
-    this.menu = v;
-  }
-
-  // Trigger input for compatibility mode
-  @Input('matMenuTriggerFor')
-  get _matMenuTriggerFor(): MdMenuPanel {
+  get _deprecatedMatMenuTriggerFor(): MatMenuPanel {
     return this.menu;
   }
 
-  set _matMenuTriggerFor(v: MdMenuPanel) {
+  set _deprecatedMatMenuTriggerFor(v: MatMenuPanel) {
     this.menu = v;
   }
 
   /** References the menu instance that the trigger is associated with. */
-  @Input('mdMenuTriggerFor') menu: MdMenuPanel;
+  @Input('matMenuTriggerFor') menu: MatMenuPanel;
 
   /** Event emitted when the associated menu is opened. */
   @Output() onMenuOpen = new EventEmitter<void>();
@@ -137,9 +116,9 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   constructor(private _overlay: Overlay,
               private _element: ElementRef,
               private _viewContainerRef: ViewContainerRef,
-              @Inject(MD_MENU_SCROLL_STRATEGY) private _scrollStrategy,
-              @Optional() private _parentMenu: MdMenu,
-              @Optional() @Self() private _menuItemInstance: MdMenuItem,
+              @Inject(MAT_MENU_SCROLL_STRATEGY) private _scrollStrategy,
+              @Optional() private _parentMenu: MatMenu,
+              @Optional() @Self() private _menuItemInstance: MatMenuItem,
               @Optional() private _dir: Directionality) {
 
     if (_menuItemInstance) {
@@ -206,7 +185,7 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
       this._closeSubscription = this._menuClosingActions().subscribe(() => this.menu.close.emit());
       this._initMenu();
 
-      if (this.menu instanceof MdMenu) {
+      if (this.menu instanceof MatMenu) {
         this.menu._startAnimation();
       }
     }
@@ -220,7 +199,7 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
       this._closeSubscription.unsubscribe();
       this.menu.close.emit();
 
-      if (this.menu instanceof MdMenu) {
+      if (this.menu instanceof MatMenu) {
         this.menu._resetAnimation();
       }
     }
@@ -291,12 +270,12 @@ export class MdMenuTrigger implements AfterViewInit, OnDestroy {
   }
 
   /**
-   * This method checks that a valid instance of MdMenu has been passed into
-   * mdMenuTriggerFor. If not, an exception is thrown.
+   * This method checks that a valid instance of MatMenu has been passed into
+   * matMenuTriggerFor. If not, an exception is thrown.
    */
   private _checkMenu() {
     if (!this.menu) {
-      throwMdMenuMissingError();
+      throwMatMenuMissingError();
     }
   }
 
diff --git a/src/lib/menu/menu.md b/src/lib/menu/menu.md
index 70529834470e..f202c21ce9c5 100644
--- a/src/lib/menu/menu.md
+++ b/src/lib/menu/menu.md
@@ -1,28 +1,28 @@
-`<md-menu>` is a floating panel containing list of options.
+`<mat-menu>` is a floating panel containing list of options.
 
 <!-- example(menu-overview) -->
 <!-- example(nested-menu) -->
 
-By itself, the `<md-menu>` element does not render anything. The menu is attached to and opened
-via application of the `mdMenuTriggerFor` directive:
+By itself, the `<mat-menu>` element does not render anything. The menu is attached to and opened
+via application of the `matMenuTriggerFor` directive:
 ```html
-<md-menu #appMenu="mdMenu">
-  <button md-menu-item> Settings </button>
-  <button md-menu-item> Help </button>
-</md-menu>
+<mat-menu #appMenu="matMenu">
+  <button mat-menu-item> Settings </button>
+  <button mat-menu-item> Help </button>
+</mat-menu>
 
-<button md-icon-button [mdMenuTriggerFor]="appMenu">
-   <md-icon>more_vert</md-icon>
+<button mat-icon-button [matMenuTriggerFor]="appMenu">
+   <mat-icon>more_vert</mat-icon>
 </button>
 ```
 
 ### Toggling the menu programmatically
 The menu exposes an API to open/close programmatically. Please note that in this case, an
-`mdMenuTriggerFor` directive is still necessary to attach the menu to a trigger element in the DOM.
+`matMenuTriggerFor` directive is still necessary to attach the menu to a trigger element in the DOM.
 
 ```ts
 class MyComponent {
-  @ViewChild(MdMenuTrigger) trigger: MdMenuTrigger;
+  @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
 
   someMethod() {
     this.trigger.openMenu();
@@ -31,24 +31,24 @@ class MyComponent {
 ```
 
 ### Icons
-Menus support displaying `md-icon` elements before the menu item text.
+Menus support displaying `mat-icon` elements before the menu item text.
 
 *my-comp.html*
 ```html
-<md-menu #menu="mdMenu">
-  <button md-menu-item>
-    <md-icon> dialpad </md-icon>
+<mat-menu #menu="matMenu">
+  <button mat-menu-item>
+    <mat-icon> dialpad </mat-icon>
     <span> Redial </span>
   </button>
-  <button md-menu-item disabled>
-    <md-icon> voicemail </md-icon>
+  <button mat-menu-item disabled>
+    <mat-icon> voicemail </mat-icon>
     <span> Check voicemail </span>
   </button>
-  <button md-menu-item>
-    <md-icon> notifications_off </md-icon>
+  <button mat-menu-item>
+    <mat-icon> notifications_off </mat-icon>
     <span> Disable alerts </span>
   </button>
-</md-menu>
+</mat-menu>
 ```
 
 ### Customizing menu position
@@ -59,36 +59,36 @@ The position can be changed using the `xPosition` (`before | after`) and `yPosit
 `[overlapTrigger]="false"` attribute.
 
 ```html
-<md-menu #appMenu="mdMenu" yPosition="above">
-  <button md-menu-item> Settings </button>
-  <button md-menu-item> Help </button>
-</md-menu>
+<mat-menu #appMenu="matMenu" yPosition="above">
+  <button mat-menu-item> Settings </button>
+  <button mat-menu-item> Help </button>
+</mat-menu>
 
-<button md-icon-button [mdMenuTriggerFor]="appMenu">
-  <md-icon>more_vert</md-icon>
+<button mat-icon-button [matMenuTriggerFor]="appMenu">
+  <mat-icon>more_vert</mat-icon>
 </button>
 ```
 
 ### Nested menu
 
-Material supports the ability for an `md-menu-item` to open a sub-menu. To do so, you have to define
-your root menu and sub-menus, in addition to setting the `[mdMenuTriggerFor]` on the `md-menu-item`
+Material supports the ability for an `mat-menu-item` to open a sub-menu. To do so, you have to define
+your root menu and sub-menus, in addition to setting the `[matMenuTriggerFor]` on the `mat-menu-item`
 that should trigger the sub-menu:
 
 ```html
-<md-menu #rootMenu="mdMenu">
-  <button md-menu-item [mdMenuTriggerFor]="subMenu">Power</button>
-  <button md-menu-item>System settings</button>
-</md-menu>
-
-<md-menu #subMenu="mdMenu">
-  <button md-menu-item>Shut down</button>
-  <button md-menu-item>Restart</button>
-  <button md-menu-item>Hibernate</button>
-</md-menu>
-
-<button md-icon-button [mdMenuTriggerFor]="rootMenu">
-  <md-icon>more_vert</md-icon>
+<mat-menu #rootMenu="matMenu">
+  <button mat-menu-item [matMenuTriggerFor]="subMenu">Power</button>
+  <button mat-menu-item>System settings</button>
+</mat-menu>
+
+<mat-menu #subMenu="matMenu">
+  <button mat-menu-item>Shut down</button>
+  <button mat-menu-item>Restart</button>
+  <button mat-menu-item>Hibernate</button>
+</mat-menu>
+
+<button mat-icon-button [matMenuTriggerFor]="rootMenu">
+  <mat-icon>more_vert</mat-icon>
 </button>
 ```
 
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 8b07cf95975c..1b82873a61d3 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -14,11 +14,11 @@ import {Direction, Directionality} from '@angular/cdk/bidi';
 import {OverlayContainer} from '@angular/cdk/overlay';
 import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
 import {
-  MD_MENU_DEFAULT_OPTIONS,
-  MdMenu,
-  MdMenuModule,
-  MdMenuPanel,
-  MdMenuTrigger,
+  MAT_MENU_DEFAULT_OPTIONS,
+  MatMenu,
+  MatMenuModule,
+  MatMenuPanel,
+  MatMenuTrigger,
   MenuPositionX,
   MenuPositionY,
 } from './index';
@@ -33,14 +33,14 @@ import {
 } from '@angular/cdk/testing';
 
 
-describe('MdMenu', () => {
+describe('MatMenu', () => {
   let overlayContainerElement: HTMLElement;
   let dir: Direction;
 
   beforeEach(async(() => {
     dir = 'ltr';
     TestBed.configureTestingModule({
-      imports: [MdMenuModule, NoopAnimationsModule],
+      imports: [MatMenuModule, NoopAnimationsModule],
       declarations: [
         SimpleMenu,
         PositionedMenu,
@@ -145,7 +145,7 @@ describe('MdMenu', () => {
     fixture.detectChanges();
     fixture.componentInstance.trigger.openMenu();
 
-    const menuEl = fixture.debugElement.query(By.css('md-menu')).nativeElement;
+    const menuEl = fixture.debugElement.query(By.css('mat-menu')).nativeElement;
     const panel = overlayContainerElement.querySelector('.mat-menu-panel')!;
 
     expect(menuEl.classList).not.toContain('custom-one');
@@ -489,7 +489,7 @@ describe('MdMenu', () => {
     });
 
     it('should emit an event when a menu item is clicked', () => {
-      const menuItem = overlayContainerElement.querySelector('[md-menu-item]') as HTMLElement;
+      const menuItem = overlayContainerElement.querySelector('[mat-menu-item]') as HTMLElement;
 
       menuItem.click();
       fixture.detectChanges();
@@ -576,7 +576,7 @@ describe('MdMenu', () => {
 
       const spy = jasmine.createSpy('hover spy');
       const subscription = instance.rootMenu.hover().subscribe(spy);
-      const menuItems = overlay.querySelectorAll('[md-menu-item]');
+      const menuItems = overlay.querySelectorAll('[mat-menu-item]');
 
       dispatchMouseEvent(menuItems[0], 'mouseenter');
       fixture.detectChanges();
@@ -597,7 +597,7 @@ describe('MdMenu', () => {
       fixture.detectChanges();
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(1, 'Expected one open menu');
 
-      const items = Array.from(overlay.querySelectorAll('.mat-menu-panel [md-menu-item]'));
+      const items = Array.from(overlay.querySelectorAll('.mat-menu-panel [mat-menu-item]'));
       const levelOneTrigger = overlay.querySelector('#level-one-trigger')!;
 
       dispatchMouseEvent(levelOneTrigger, 'mouseenter');
@@ -621,7 +621,7 @@ describe('MdMenu', () => {
         instance.rootTriggerEl.nativeElement.click();
         fixture.detectChanges();
 
-        const items = Array.from(overlay.querySelectorAll('.mat-menu-panel [md-menu-item]'));
+        const items = Array.from(overlay.querySelectorAll('.mat-menu-panel [mat-menu-item]'));
         const levelOneTrigger = overlay.querySelector('#level-one-trigger')!;
 
         dispatchMouseEvent(levelOneTrigger, 'mouseenter');
@@ -895,7 +895,7 @@ describe('MdMenu', () => {
       instance.rootTrigger.openMenu();
       fixture.detectChanges();
 
-      const menuItems = overlay.querySelectorAll('[md-menu-item]');
+      const menuItems = overlay.querySelectorAll('[mat-menu-item]');
 
       expect(menuItems[0].classList).toContain('mat-menu-item-submenu-trigger');
       expect(menuItems[1].classList).not.toContain('mat-menu-item-submenu-trigger');
@@ -1025,7 +1025,7 @@ describe('MdMenu', () => {
       Object.defineProperty(event, 'buttons', {get: () => 1});
       event.preventDefault = jasmine.createSpy('preventDefault spy');
 
-      dispatchMouseEvent(overlay.querySelector('[md-menu-item]')!, 'mousedown', 0, 0, event);
+      dispatchMouseEvent(overlay.querySelector('[mat-menu-item]')!, 'mousedown', 0, 0, event);
       expect(event.preventDefault).toHaveBeenCalled();
     });
 
@@ -1033,13 +1033,13 @@ describe('MdMenu', () => {
 
 });
 
-describe('MdMenu default overrides', () => {
+describe('MatMenu default overrides', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdMenuModule, NoopAnimationsModule],
+      imports: [MatMenuModule, NoopAnimationsModule],
       declarations: [SimpleMenu],
       providers: [{
-        provide: MD_MENU_DEFAULT_OPTIONS,
+        provide: MAT_MENU_DEFAULT_OPTIONS,
         useValue: {overlapTrigger: false, xPosition: 'before', yPosition: 'above'},
       }],
     }).compileComponents();
@@ -1058,50 +1058,50 @@ describe('MdMenu default overrides', () => {
 
 @Component({
   template: `
-    <button [mdMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <md-menu class="custom-one custom-two" #menu="mdMenu" (close)="closeCallback()">
-      <button md-menu-item> Item </button>
-      <button md-menu-item disabled> Disabled </button>
-    </md-menu>
+    <button [matMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
+    <mat-menu class="custom-one custom-two" #menu="matMenu" (close)="closeCallback()">
+      <button mat-menu-item> Item </button>
+      <button mat-menu-item disabled> Disabled </button>
+    </mat-menu>
   `
 })
 class SimpleMenu {
-  @ViewChild(MdMenuTrigger) trigger: MdMenuTrigger;
+  @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
   @ViewChild('triggerEl') triggerEl: ElementRef;
-  @ViewChild(MdMenu) menu: MdMenu;
+  @ViewChild(MatMenu) menu: MatMenu;
   closeCallback = jasmine.createSpy('menu closed callback');
 }
 
 @Component({
   template: `
-    <button [mdMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <md-menu [xPosition]="xPosition" [yPosition]="yPosition" #menu="mdMenu">
-      <button md-menu-item> Positioned Content </button>
-    </md-menu>
+    <button [matMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
+    <mat-menu [xPosition]="xPosition" [yPosition]="yPosition" #menu="matMenu">
+      <button mat-menu-item> Positioned Content </button>
+    </mat-menu>
   `
 })
 class PositionedMenu {
-  @ViewChild(MdMenuTrigger) trigger: MdMenuTrigger;
+  @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
   @ViewChild('triggerEl') triggerEl: ElementRef;
   xPosition: MenuPositionX = 'before';
   yPosition: MenuPositionY = 'above';
 }
 
 interface TestableMenu {
-  trigger: MdMenuTrigger;
+  trigger: MatMenuTrigger;
   triggerEl: ElementRef;
 }
 @Component({
   template: `
-    <button [mdMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <md-menu [overlapTrigger]="overlapTrigger" #menu="mdMenu">
-      <button md-menu-item> Not overlapped Content </button>
-    </md-menu>
+    <button [matMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
+    <mat-menu [overlapTrigger]="overlapTrigger" #menu="matMenu">
+      <button mat-menu-item> Not overlapped Content </button>
+    </mat-menu>
   `
 })
 class OverlapMenu implements TestableMenu {
   @Input() overlapTrigger: boolean;
-  @ViewChild(MdMenuTrigger) trigger: MdMenuTrigger;
+  @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
   @ViewChild('triggerEl') triggerEl: ElementRef;
 }
 
@@ -1113,14 +1113,14 @@ class OverlapMenu implements TestableMenu {
       <ng-content></ng-content>
     </ng-template>
   `,
-  exportAs: 'mdCustomMenu, matCustomMenu'
+  exportAs: 'matCustomMenu'
 })
-class CustomMenuPanel implements MdMenuPanel {
+class CustomMenuPanel implements MatMenuPanel {
   direction: Direction;
   xPosition: MenuPositionX = 'after';
   yPosition: MenuPositionY = 'below';
   overlapTrigger = true;
-  parentMenu: MdMenuPanel;
+  parentMenu: MatMenuPanel;
 
   @ViewChild(TemplateRef) templateRef: TemplateRef<any>;
   @Output() close = new EventEmitter<void | 'click' | 'keydown'>();
@@ -1130,96 +1130,96 @@ class CustomMenuPanel implements MdMenuPanel {
 
 @Component({
   template: `
-    <button [mdMenuTriggerFor]="menu">Toggle menu</button>
-    <custom-menu #menu="mdCustomMenu">
-      <button md-menu-item> Custom Content </button>
+    <button [matMenuTriggerFor]="menu">Toggle menu</button>
+    <custom-menu #menu="matCustomMenu">
+      <button mat-menu-item> Custom Content </button>
     </custom-menu>
   `
 })
 class CustomMenu {
-  @ViewChild(MdMenuTrigger) trigger: MdMenuTrigger;
+  @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
 }
 
 
 @Component({
   template: `
     <button
-      [mdMenuTriggerFor]="root"
-      #rootTrigger="mdMenuTrigger"
+      [matMenuTriggerFor]="root"
+      #rootTrigger="matMenuTrigger"
       #rootTriggerEl>Toggle menu</button>
 
     <button
-      [mdMenuTriggerFor]="levelTwo"
-      #alternateTrigger="mdMenuTrigger">Toggle alternate menu</button>
+      [matMenuTriggerFor]="levelTwo"
+      #alternateTrigger="matMenuTrigger">Toggle alternate menu</button>
 
-    <md-menu #root="mdMenu">
-      <button md-menu-item
+    <mat-menu #root="matMenu">
+      <button mat-menu-item
         id="level-one-trigger"
-        [mdMenuTriggerFor]="levelOne"
-        #levelOneTrigger="mdMenuTrigger">One</button>
-      <button md-menu-item>Two</button>
-      <button md-menu-item
+        [matMenuTriggerFor]="levelOne"
+        #levelOneTrigger="matMenuTrigger">One</button>
+      <button mat-menu-item>Two</button>
+      <button mat-menu-item
         *ngIf="showLazy"
         id="lazy-trigger"
-        [mdMenuTriggerFor]="lazy"
-        #lazyTrigger="mdMenuTrigger">Three</button>
-    </md-menu>
+        [matMenuTriggerFor]="lazy"
+        #lazyTrigger="matMenuTrigger">Three</button>
+    </mat-menu>
 
-    <md-menu #levelOne="mdMenu">
-      <button md-menu-item>Four</button>
-      <button md-menu-item
+    <mat-menu #levelOne="matMenu">
+      <button mat-menu-item>Four</button>
+      <button mat-menu-item
         id="level-two-trigger"
-        [mdMenuTriggerFor]="levelTwo"
-        #levelTwoTrigger="mdMenuTrigger">Five</button>
-      <button md-menu-item>Six</button>
-    </md-menu>
-
-    <md-menu #levelTwo="mdMenu">
-      <button md-menu-item>Seven</button>
-      <button md-menu-item>Eight</button>
-      <button md-menu-item>Nine</button>
-    </md-menu>
-
-    <md-menu #lazy="mdMenu">
-      <button md-menu-item>Ten</button>
-      <button md-menu-item>Eleven</button>
-      <button md-menu-item>Twelve</button>
-    </md-menu>
+        [matMenuTriggerFor]="levelTwo"
+        #levelTwoTrigger="matMenuTrigger">Five</button>
+      <button mat-menu-item>Six</button>
+    </mat-menu>
+
+    <mat-menu #levelTwo="matMenu">
+      <button mat-menu-item>Seven</button>
+      <button mat-menu-item>Eight</button>
+      <button mat-menu-item>Nine</button>
+    </mat-menu>
+
+    <mat-menu #lazy="matMenu">
+      <button mat-menu-item>Ten</button>
+      <button mat-menu-item>Eleven</button>
+      <button mat-menu-item>Twelve</button>
+    </mat-menu>
   `
 })
 class NestedMenu {
-  @ViewChild('root') rootMenu: MdMenu;
-  @ViewChild('rootTrigger') rootTrigger: MdMenuTrigger;
+  @ViewChild('root') rootMenu: MatMenu;
+  @ViewChild('rootTrigger') rootTrigger: MatMenuTrigger;
   @ViewChild('rootTriggerEl') rootTriggerEl: ElementRef;
-  @ViewChild('alternateTrigger') alternateTrigger: MdMenuTrigger;
+  @ViewChild('alternateTrigger') alternateTrigger: MatMenuTrigger;
 
-  @ViewChild('levelOne') levelOneMenu: MdMenu;
-  @ViewChild('levelOneTrigger') levelOneTrigger: MdMenuTrigger;
+  @ViewChild('levelOne') levelOneMenu: MatMenu;
+  @ViewChild('levelOneTrigger') levelOneTrigger: MatMenuTrigger;
 
-  @ViewChild('levelTwo') levelTwoMenu: MdMenu;
-  @ViewChild('levelTwoTrigger') levelTwoTrigger: MdMenuTrigger;
+  @ViewChild('levelTwo') levelTwoMenu: MatMenu;
+  @ViewChild('levelTwoTrigger') levelTwoTrigger: MatMenuTrigger;
 
-  @ViewChild('lazy') lazyMenu: MdMenu;
-  @ViewChild('lazyTrigger') lazyTrigger: MdMenuTrigger;
+  @ViewChild('lazy') lazyMenu: MatMenu;
+  @ViewChild('lazyTrigger') lazyTrigger: MatMenuTrigger;
   showLazy = false;
 }
 
 @Component({
   template: `
-    <button [mdMenuTriggerFor]="root" #rootTrigger="mdMenuTrigger">Toggle menu</button>
+    <button [matMenuTriggerFor]="root" #rootTrigger="matMenuTrigger">Toggle menu</button>
 
-    <md-menu #root="mdMenu">
-      <button md-menu-item
-        [mdMenuTriggerFor]="levelOne"
-        #levelOneTrigger="mdMenuTrigger">One</button>
-    </md-menu>
+    <mat-menu #root="matMenu">
+      <button mat-menu-item
+        [matMenuTriggerFor]="levelOne"
+        #levelOneTrigger="matMenuTrigger">One</button>
+    </mat-menu>
 
-    <md-menu #levelOne="mdMenu" class="mat-elevation-z24">
-      <button md-menu-item>Two</button>
-    </md-menu>
+    <mat-menu #levelOne="matMenu" class="mat-elevation-z24">
+      <button mat-menu-item>Two</button>
+    </mat-menu>
   `
 })
 class NestedMenuCustomElevation {
-  @ViewChild('rootTrigger') rootTrigger: MdMenuTrigger;
-  @ViewChild('levelOneTrigger') levelOneTrigger: MdMenuTrigger;
+  @ViewChild('rootTrigger') rootTrigger: MatMenuTrigger;
+  @ViewChild('levelOneTrigger') levelOneTrigger: MatMenuTrigger;
 }
diff --git a/src/lib/menu/menu.ts b/src/lib/menu/menu.ts
index 1eff665c413b..4d0993cd6763 100644
--- a/src/lib/menu/menu.ts
+++ b/src/lib/menu/menu.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {MdMenu, MdMenuDefaultOptions, MD_MENU_DEFAULT_OPTIONS} from './menu-directive';
-export {MdMenuItem} from './menu-item';
-export {MdMenuTrigger} from './menu-trigger';
-export {MdMenuPanel} from './menu-panel';
+export {MatMenu, MatMenuDefaultOptions, MAT_MENU_DEFAULT_OPTIONS} from './menu-directive';
+export {MatMenuItem} from './menu-item';
+export {MatMenuTrigger} from './menu-trigger';
+export {MatMenuPanel} from './menu-panel';
 export {MenuPositionX, MenuPositionY} from './menu-positions';
diff --git a/src/lib/menu/public_api.ts b/src/lib/menu/public_api.ts
index 21d9f21df158..39c6fdda609b 100644
--- a/src/lib/menu/public_api.ts
+++ b/src/lib/menu/public_api.ts
@@ -8,6 +8,6 @@
 
 export * from './menu-module';
 export * from './menu';
-export {MD_MENU_SCROLL_STRATEGY} from './menu-trigger';
+export {MAT_MENU_SCROLL_STRATEGY} from './menu-trigger';
 export {fadeInItems, transformMenu} from './menu-animations';
-export * from './mat-exports';
+
diff --git a/src/lib/paginator/mat-exports.ts b/src/lib/paginator/mat-exports.ts
deleted file mode 100644
index 26c46461f0bb..000000000000
--- a/src/lib/paginator/mat-exports.ts
+++ /dev/null
@@ -1,16 +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 {MdPaginator} from './paginator';
-import {MdPaginatorIntl} from './paginator-intl';
-import {MdPaginatorModule} from './paginator-module';
-
-
-export {MdPaginator as MatPaginator};
-export {MdPaginatorIntl as MatPaginatorIntl};
-export {MdPaginatorModule as MatPaginatorModule};
diff --git a/src/lib/paginator/paginator-intl.ts b/src/lib/paginator/paginator-intl.ts
index 1c9f6ec4c6f8..5e0bac5dda7e 100644
--- a/src/lib/paginator/paginator-intl.ts
+++ b/src/lib/paginator/paginator-intl.ts
@@ -10,11 +10,11 @@ import {Injectable} from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 
 /**
- * To modify the labels and text displayed, create a new instance of MdPaginatorIntl and
+ * To modify the labels and text displayed, create a new instance of MatPaginatorIntl and
  * include it in a custom provider
  */
 @Injectable()
-export class MdPaginatorIntl {
+export class MatPaginatorIntl {
   /**
    * Stream that emits whenever the labels here are changed. Use this to notify
    * components if the labels have changed after initialization.
diff --git a/src/lib/paginator/paginator-module.ts b/src/lib/paginator/paginator-module.ts
index a9873e73e2da..c5eede24e2ff 100644
--- a/src/lib/paginator/paginator-module.ts
+++ b/src/lib/paginator/paginator-module.ts
@@ -8,22 +8,22 @@
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdButtonModule} from '@angular/material/button';
-import {MdSelectModule} from '@angular/material/select';
-import {MdTooltipModule} from '@angular/material/tooltip';
-import {MdPaginator} from './paginator';
-import {MdPaginatorIntl} from './paginator-intl';
+import {MatButtonModule} from '@angular/material/button';
+import {MatSelectModule} from '@angular/material/select';
+import {MatTooltipModule} from '@angular/material/tooltip';
+import {MatPaginator} from './paginator';
+import {MatPaginatorIntl} from './paginator-intl';
 
 
 @NgModule({
   imports: [
     CommonModule,
-    MdButtonModule,
-    MdSelectModule,
-    MdTooltipModule,
+    MatButtonModule,
+    MatSelectModule,
+    MatTooltipModule,
   ],
-  exports: [MdPaginator],
-  declarations: [MdPaginator],
-  providers: [MdPaginatorIntl],
+  exports: [MatPaginator],
+  declarations: [MatPaginator],
+  providers: [MatPaginatorIntl],
 })
-export class MdPaginatorModule {}
+export class MatPaginatorModule {}
diff --git a/src/lib/paginator/paginator.md b/src/lib/paginator/paginator.md
index a744fb95002d..7284bb8829eb 100644
--- a/src/lib/paginator/paginator.md
+++ b/src/lib/paginator/paginator.md
@@ -1,4 +1,4 @@
-`<md-paginator>` provides navigation for paged information, typically used with a table.
+`<mat-paginator>` provides navigation for paged information, typically used with a table.
 
 <!-- example(paginator-overview) -->
 
@@ -19,11 +19,11 @@ dropdown can be set via `pageSizeOptions`
 The current pageSize will always appear in the dropdown, even if it is not included in pageSizeOptions.
 
 ### Internationalization
-The labels for the paginator can be customized by providing your own instance of `MdPaginatorIntl`.
+The labels for the paginator can be customized by providing your own instance of `MatPaginatorIntl`.
 This will allow you to change the following:
  1. The label for the length of each page.
  2. The range text displayed to the user.
  3. The tooltip messages on the navigation buttons.
 
 ### Accessibility
-The `aria-label`s for next page and previous page buttons can be set in `MdPaginatorIntl`.
+The `aria-label`s for next page and previous page buttons can be set in `MatPaginatorIntl`.
diff --git a/src/lib/paginator/paginator.spec.ts b/src/lib/paginator/paginator.spec.ts
index bf3d9cd96ef0..234b5f32808e 100644
--- a/src/lib/paginator/paginator.spec.ts
+++ b/src/lib/paginator/paginator.spec.ts
@@ -1,37 +1,37 @@
 import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
-import {MdPaginatorModule} from './index';
-import {MdPaginator, PageEvent} from './paginator';
+import {MatPaginatorModule} from './index';
+import {MatPaginator, PageEvent} from './paginator';
 import {Component, ViewChild} from '@angular/core';
-import {MdPaginatorIntl} from './paginator-intl';
+import {MatPaginatorIntl} from './paginator-intl';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {dispatchMouseEvent} from '@angular/cdk/testing';
 
 
-describe('MdPaginator', () => {
-  let fixture: ComponentFixture<MdPaginatorApp>;
-  let component: MdPaginatorApp;
-  let paginator: MdPaginator;
+describe('MatPaginator', () => {
+  let fixture: ComponentFixture<MatPaginatorApp>;
+  let component: MatPaginatorApp;
+  let paginator: MatPaginator;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        MdPaginatorModule,
+        MatPaginatorModule,
         NoopAnimationsModule,
       ],
       declarations: [
-        MdPaginatorApp,
-        MdPaginatorWithoutPageSizeApp,
-        MdPaginatorWithoutOptionsApp,
-        MdPaginatorWithoutInputsApp,
+        MatPaginatorApp,
+        MatPaginatorWithoutPageSizeApp,
+        MatPaginatorWithoutOptionsApp,
+        MatPaginatorWithoutInputsApp,
       ],
-      providers: [MdPaginatorIntl]
+      providers: [MatPaginatorIntl]
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(MdPaginatorApp);
+    fixture = TestBed.createComponent(MatPaginatorApp);
     component = fixture.componentInstance;
-    paginator = component.mdPaginator;
+    paginator = component.paginator;
 
     fixture.detectChanges();
   });
@@ -92,7 +92,7 @@ describe('MdPaginator', () => {
     });
 
     it('should re-render when the i18n labels change',
-      inject([MdPaginatorIntl], (intl: MdPaginatorIntl) => {
+      inject([MatPaginatorIntl], (intl: MatPaginatorIntl) => {
         const label = fixture.nativeElement.querySelector('.mat-paginator-page-size-label');
 
         intl.itemsPerPageLabel = '1337 items per page';
@@ -175,18 +175,18 @@ describe('MdPaginator', () => {
   });
 
   it('should default the page size options to the page size if no options provided', () => {
-    const withoutOptionsAppFixture = TestBed.createComponent(MdPaginatorWithoutOptionsApp);
+    const withoutOptionsAppFixture = TestBed.createComponent(MatPaginatorWithoutOptionsApp);
     withoutOptionsAppFixture.detectChanges();
 
-    expect(withoutOptionsAppFixture.componentInstance.mdPaginator._displayedPageSizeOptions)
+    expect(withoutOptionsAppFixture.componentInstance.paginator._displayedPageSizeOptions)
         .toEqual([10]);
   });
 
   it('should default the page size to the first page size option if not provided', () => {
-    const withoutPageSizeAppFixture = TestBed.createComponent(MdPaginatorWithoutPageSizeApp);
+    const withoutPageSizeAppFixture = TestBed.createComponent(MatPaginatorWithoutPageSizeApp);
     withoutPageSizeAppFixture.detectChanges();
 
-    expect(withoutPageSizeAppFixture.componentInstance.mdPaginator.pageSize).toEqual(10);
+    expect(withoutPageSizeAppFixture.componentInstance.paginator.pageSize).toEqual(10);
   });
 
   it('should show a sorted list of page size options including the current page size', () => {
@@ -263,15 +263,15 @@ function getNextButton(fixture: ComponentFixture<any>) {
 
 @Component({
   template: `
-    <md-paginator [pageIndex]="pageIndex"
+    <mat-paginator [pageIndex]="pageIndex"
                   [pageSize]="pageSize"
                   [pageSizeOptions]="pageSizeOptions"
                   [length]="length"
                   (page)="latestPageEvent = $event">
-    </md-paginator>
+    </mat-paginator>
   `,
 })
-class MdPaginatorApp {
+class MatPaginatorApp {
   pageIndex = 0;
   pageSize = 10;
   pageSizeOptions = [5, 10, 25, 100];
@@ -279,7 +279,7 @@ class MdPaginatorApp {
 
   latestPageEvent: PageEvent | null;
 
-  @ViewChild(MdPaginator) mdPaginator: MdPaginator;
+  @ViewChild(MatPaginator) paginator: MatPaginator;
 
   goToLastPage() {
     this.pageIndex = Math.ceil(this.length / this.pageSize);
@@ -288,27 +288,27 @@ class MdPaginatorApp {
 
 @Component({
   template: `
-    <md-paginator></md-paginator>
+    <mat-paginator></mat-paginator>
   `,
 })
-class MdPaginatorWithoutInputsApp {
-  @ViewChild(MdPaginator) mdPaginator: MdPaginator;
+class MatPaginatorWithoutInputsApp {
+  @ViewChild(MatPaginator) paginator: MatPaginator;
 }
 
 @Component({
   template: `
-    <md-paginator [pageSizeOptions]="[10, 20, 30]"></md-paginator>
+    <mat-paginator [pageSizeOptions]="[10, 20, 30]"></mat-paginator>
   `,
 })
-class MdPaginatorWithoutPageSizeApp {
-  @ViewChild(MdPaginator) mdPaginator: MdPaginator;
+class MatPaginatorWithoutPageSizeApp {
+  @ViewChild(MatPaginator) paginator: MatPaginator;
 }
 
 @Component({
   template: `
-    <md-paginator [pageSize]="10"></md-paginator>
+    <mat-paginator [pageSize]="10"></mat-paginator>
   `,
 })
-class MdPaginatorWithoutOptionsApp {
-  @ViewChild(MdPaginator) mdPaginator: MdPaginator;
+class MatPaginatorWithoutOptionsApp {
+  @ViewChild(MatPaginator) paginator: MatPaginator;
 }
diff --git a/src/lib/paginator/paginator.ts b/src/lib/paginator/paginator.ts
index 22391029aaf9..5e45fd2a1205 100644
--- a/src/lib/paginator/paginator.ts
+++ b/src/lib/paginator/paginator.ts
@@ -17,9 +17,8 @@ import {
   Output,
   ViewEncapsulation,
 } from '@angular/core';
-import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 import {Subscription} from 'rxjs/Subscription';
-import {MdPaginatorIntl} from './paginator-intl';
+import {MatPaginatorIntl} from './paginator-intl';
 
 /** The default page size if there is no page size and there are no provided page size options. */
 const DEFAULT_PAGE_SIZE = 50;
@@ -46,18 +45,17 @@ export class PageEvent {
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-paginator, mat-paginator',
+  selector: 'mat-paginator',
   templateUrl: 'paginator.html',
   styleUrls: ['paginator.css'],
   host: {
     'class': 'mat-paginator',
   },
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdPaginator implements OnInit, OnDestroy {
+export class MatPaginator implements OnInit, OnDestroy {
   private _initialized: boolean;
   private _intlChanges: Subscription;
 
@@ -103,7 +101,7 @@ export class MdPaginator implements OnInit, OnDestroy {
   /** Displayed set of page size options. Will be sorted and include current page size. */
   _displayedPageSizeOptions: number[];
 
-  constructor(public _intl: MdPaginatorIntl,
+  constructor(public _intl: MatPaginatorIntl,
               private _changeDetectorRef: ChangeDetectorRef) {
     this._intlChanges = _intl.changes.subscribe(() => this._changeDetectorRef.markForCheck());
   }
diff --git a/src/lib/paginator/public_api.ts b/src/lib/paginator/public_api.ts
index f8689f8d2280..0dc5a6a5505c 100644
--- a/src/lib/paginator/public_api.ts
+++ b/src/lib/paginator/public_api.ts
@@ -9,4 +9,4 @@
 export * from './paginator-module';
 export * from './paginator';
 export * from './paginator-intl';
-export * from './mat-exports';
+
diff --git a/src/lib/progress-bar/mat-exports.ts b/src/lib/progress-bar/mat-exports.ts
deleted file mode 100644
index 7550fc80e7df..000000000000
--- a/src/lib/progress-bar/mat-exports.ts
+++ /dev/null
@@ -1,14 +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 {MdProgressBar} from './progress-bar';
-import {MdProgressBarModule} from './progress-bar-module';
-
-
-export {MdProgressBar as MatProgressBar};
-export {MdProgressBarModule as MatProgressBarModule};
diff --git a/src/lib/progress-bar/progress-bar-module.ts b/src/lib/progress-bar/progress-bar-module.ts
index c67dbcd654b7..0d8bf6c1086c 100644
--- a/src/lib/progress-bar/progress-bar-module.ts
+++ b/src/lib/progress-bar/progress-bar-module.ts
@@ -8,13 +8,13 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '@angular/material/core';
-import {MdProgressBar} from './progress-bar';
+import {MatCommonModule} from '@angular/material/core';
+import {MatProgressBar} from './progress-bar';
 
 
 @NgModule({
-  imports: [CommonModule, MdCommonModule],
-  exports: [MdProgressBar, MdCommonModule],
-  declarations: [MdProgressBar],
+  imports: [CommonModule, MatCommonModule],
+  exports: [MatProgressBar, MatCommonModule],
+  declarations: [MatProgressBar],
 })
-export class MdProgressBarModule {}
+export class MatProgressBarModule {}
diff --git a/src/lib/progress-bar/progress-bar.md b/src/lib/progress-bar/progress-bar.md
index a6ceee2cfd62..98c3d301913f 100644
--- a/src/lib/progress-bar/progress-bar.md
+++ b/src/lib/progress-bar/progress-bar.md
@@ -1,4 +1,4 @@
-`<md-progress-bar>` is a horizontal progress-bar for indicating progress and activity.
+`<mat-progress-bar>` is a horizontal progress-bar for indicating progress and activity.
 
 <!-- example(progress-bar-overview) -->
 
diff --git a/src/lib/progress-bar/progress-bar.scss b/src/lib/progress-bar/progress-bar.scss
index cf537f16bcde..1d82aadfb7e3 100644
--- a/src/lib/progress-bar/progress-bar.scss
+++ b/src/lib/progress-bar/progress-bar.scss
@@ -7,11 +7,11 @@ $mat-progress-bar-piece-animation-duration: 250ms !default;
 
 .mat-progress-bar {
   display: block;
-  // Height is provided for md-progress-bar to act as a default.
+  // Height is provided for mat-progress-bar to act as a default.
   height: $mat-progress-bar-height;
   overflow: hidden;
   position: relative;
-  // translateZ is added to force the md-progress-bar into its own GPU layer.
+  // translateZ is added to force the mat-progress-bar into its own GPU layer.
   transform: translateZ(0);
   transition: opacity $mat-progress-bar-piece-animation-duration linear;
   width: 100%;
@@ -110,7 +110,7 @@ $mat-progress-bar-piece-animation-duration: 250ms !default;
 }
 
 
-// The values used for animations in md-progress-bar, both timing and transformation, can be
+// The values used for animations in mat-progress-bar, both timing and transformation, can be
 // considered magic values. They are sourced from the Material Design example spec and duplicate
 // the values of the original designers definitions.
 //
diff --git a/src/lib/progress-bar/progress-bar.spec.ts b/src/lib/progress-bar/progress-bar.spec.ts
index f5208b321f65..be8337dcbd14 100644
--- a/src/lib/progress-bar/progress-bar.spec.ts
+++ b/src/lib/progress-bar/progress-bar.spec.ts
@@ -1,14 +1,14 @@
 import {TestBed, async, ComponentFixture} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdProgressBarModule} from './index';
+import {MatProgressBarModule} from './index';
 
 
-describe('MdProgressBar', () => {
+describe('MatProgressBar', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdProgressBarModule],
+      imports: [MatProgressBarModule],
       declarations: [
         BasicProgressBar,
         BufferProgressBar,
@@ -28,18 +28,18 @@ describe('MdProgressBar', () => {
     });
 
     it('should apply a mode of "determinate" if no mode is provided.', () => {
-      let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
+      let progressElement = fixture.debugElement.query(By.css('mat-progress-bar'));
       expect(progressElement.componentInstance.mode).toBe('determinate');
     });
 
     it('should define default values for value and bufferValue attributes', () => {
-      let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
+      let progressElement = fixture.debugElement.query(By.css('mat-progress-bar'));
       expect(progressElement.componentInstance.value).toBe(0);
       expect(progressElement.componentInstance.bufferValue).toBe(0);
     });
 
     it('should clamp value and bufferValue between 0 and 100', () => {
-      let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
+      let progressElement = fixture.debugElement.query(By.css('mat-progress-bar'));
       let progressComponent = progressElement.componentInstance;
 
       progressComponent.value = 50;
@@ -62,7 +62,7 @@ describe('MdProgressBar', () => {
     });
 
     it('should return the transform attribute for bufferValue and mode', () => {
-      let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
+      let progressElement = fixture.debugElement.query(By.css('mat-progress-bar'));
       let progressComponent = progressElement.componentInstance;
 
       expect(progressComponent._primaryTransform()).toEqual({transform: 'scaleX(0)'});
@@ -98,15 +98,15 @@ describe('MdProgressBar', () => {
     });
 
     it('should not modify the mode if a valid mode is provided.', () => {
-      let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
+      let progressElement = fixture.debugElement.query(By.css('mat-progress-bar'));
       expect(progressElement.componentInstance.mode).toBe('buffer');
     });
   });
 });
 
 
-@Component({template: '<md-progress-bar></md-progress-bar>'})
+@Component({template: '<mat-progress-bar></mat-progress-bar>'})
 class BasicProgressBar { }
 
-@Component({template: '<md-progress-bar mode="buffer"></md-progress-bar>'})
+@Component({template: '<mat-progress-bar mode="buffer"></mat-progress-bar>'})
 class BufferProgressBar { }
diff --git a/src/lib/progress-bar/progress-bar.ts b/src/lib/progress-bar/progress-bar.ts
index 36bdc00aa7d5..2396d693e012 100644
--- a/src/lib/progress-bar/progress-bar.ts
+++ b/src/lib/progress-bar/progress-bar.ts
@@ -13,11 +13,11 @@ import {Component, ChangeDetectionStrategy, Input, ViewEncapsulation} from '@ang
 
 
 /**
- * <md-progress-bar> component.
+ * <mat-progress-bar> component.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-progress-bar, mat-progress-bar',
+  selector: 'mat-progress-bar',
   host: {
     'role': 'progressbar',
     'aria-valuemin': '0',
@@ -35,7 +35,7 @@ import {Component, ChangeDetectionStrategy, Input, ViewEncapsulation} from '@ang
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdProgressBar {
+export class MatProgressBar {
   /** Color of the progress bar. */
   @Input() color: 'primary' | 'accent' | 'warn' = 'primary';
 
diff --git a/src/lib/progress-bar/public_api.ts b/src/lib/progress-bar/public_api.ts
index e4284632b898..4d60aeebce2a 100644
--- a/src/lib/progress-bar/public_api.ts
+++ b/src/lib/progress-bar/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './progress-bar-module';
 export * from './progress-bar';
-export * from './mat-exports';
+
diff --git a/src/lib/progress-spinner/mat-exports.ts b/src/lib/progress-spinner/mat-exports.ts
deleted file mode 100644
index 6b1c3708aa8d..000000000000
--- a/src/lib/progress-spinner/mat-exports.ts
+++ /dev/null
@@ -1,22 +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 {
-  MdProgressSpinner,
-  MdProgressSpinnerBase,
-  MdProgressSpinnerCssMatStyler,
-  MdSpinner,
-} from './progress-spinner';
-import {MdProgressSpinnerModule} from './progress-spinner-module';
-
-
-export {MdProgressSpinner as MatProgressSpinner};
-export {MdProgressSpinnerBase as MatProgressSpinnerBase};
-export {MdProgressSpinnerCssMatStyler as MatProgressSpinnerCssMatStyler};
-export {MdProgressSpinnerModule as MatProgressSpinnerModule};
-export {MdSpinner as MatSpinner};
diff --git a/src/lib/progress-spinner/progress-spinner-module.ts b/src/lib/progress-spinner/progress-spinner-module.ts
index cb106eaee75b..11e7e841acab 100644
--- a/src/lib/progress-spinner/progress-spinner-module.ts
+++ b/src/lib/progress-spinner/progress-spinner-module.ts
@@ -7,26 +7,26 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '@angular/material/core';
 import {
-  MdProgressSpinner,
-  MdSpinner,
-  MdProgressSpinnerCssMatStyler,
+  MatProgressSpinner,
+  MatSpinner,
+  MatProgressSpinnerCssMatStyler,
 } from './progress-spinner';
 
 
 @NgModule({
-  imports: [MdCommonModule],
+  imports: [MatCommonModule],
   exports: [
-    MdProgressSpinner,
-    MdSpinner,
-    MdCommonModule,
-    MdProgressSpinnerCssMatStyler
+    MatProgressSpinner,
+    MatSpinner,
+    MatCommonModule,
+    MatProgressSpinnerCssMatStyler
   ],
   declarations: [
-    MdProgressSpinner,
-    MdSpinner,
-    MdProgressSpinnerCssMatStyler
+    MatProgressSpinner,
+    MatSpinner,
+    MatProgressSpinnerCssMatStyler
   ],
 })
-export class MdProgressSpinnerModule {}
+export class MatProgressSpinnerModule {}
diff --git a/src/lib/progress-spinner/progress-spinner.md b/src/lib/progress-spinner/progress-spinner.md
index 1843e1fe40b4..0b591738df9c 100644
--- a/src/lib/progress-spinner/progress-spinner.md
+++ b/src/lib/progress-spinner/progress-spinner.md
@@ -1,10 +1,10 @@
-`<md-progress-spinner>` and `<md-spinner>` are a circular indicators of progress and activity.
+`<mat-progress-spinner>` and `<mat-spinner>` are a circular indicators of progress and activity.
 
 <!-- example(progress-spinner-overview) -->
 
 ### Progress mode
 The progress-spinner supports two modes, "determinate" and "indeterminate". 
-The `<md-spinner>` component is an alias for `<md-progress-spinner mode="indeterminate">`.
+The `<mat-spinner>` component is an alias for `<mat-progress-spinner mode="indeterminate">`.
 
 | Mode          | Description                                                                      |
 |---------------|----------------------------------------------------------------------------------|
diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index fc8efd45a373..755b499398b1 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -1,15 +1,15 @@
 import {TestBed, async} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MdProgressSpinnerModule} from './index';
+import {MatProgressSpinnerModule} from './index';
 import {PROGRESS_SPINNER_STROKE_WIDTH} from './progress-spinner';
 
 
-describe('MdProgressSpinner', () => {
+describe('MatProgressSpinner', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdProgressSpinnerModule],
+      imports: [MatProgressSpinnerModule],
       declarations: [
         BasicProgressSpinner,
         IndeterminateProgressSpinner,
@@ -29,7 +29,7 @@ describe('MdProgressSpinner', () => {
     let fixture = TestBed.createComponent(BasicProgressSpinner);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
     expect(progressElement.componentInstance.mode).toBe('determinate');
   });
 
@@ -37,7 +37,7 @@ describe('MdProgressSpinner', () => {
     let fixture = TestBed.createComponent(IndeterminateProgressSpinner);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
     expect(progressElement.componentInstance.mode).toBe('indeterminate');
   });
 
@@ -45,13 +45,13 @@ describe('MdProgressSpinner', () => {
     let fixture = TestBed.createComponent(BasicProgressSpinner);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
     expect(progressElement.componentInstance.value).toBeUndefined();
   });
 
   it('should set the value to 0 when the mode is set to indeterminate', () => {
     let fixture = TestBed.createComponent(ProgressSpinnerWithValueAndBoundMode);
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
     fixture.componentInstance.mode = 'determinate';
     fixture.detectChanges();
 
@@ -65,7 +65,7 @@ describe('MdProgressSpinner', () => {
     let fixture = TestBed.createComponent(BasicProgressSpinner);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
     let progressComponent = progressElement.componentInstance;
 
     progressComponent.value = 50;
@@ -88,7 +88,7 @@ describe('MdProgressSpinner', () => {
     let fixture = TestBed.createComponent(IndeterminateProgressSpinnerWithNgIf);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
     expect(progressElement.componentInstance.interdeterminateInterval).toBeTruthy();
 
     fixture.componentInstance.isHidden = true;
@@ -100,7 +100,7 @@ describe('MdProgressSpinner', () => {
     let fixture = TestBed.createComponent(SpinnerWithNgIf);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-spinner'));
 
     expect(progressElement.componentInstance.interdeterminateInterval).toBeTruthy();
 
@@ -131,11 +131,11 @@ describe('MdProgressSpinner', () => {
       .toBe(40, 'Expected the custom stroke width to be applied to the path element.');
   });
 
-  it('should set the color class on the md-spinner', () => {
+  it('should set the color class on the mat-spinner', () => {
     let fixture = TestBed.createComponent(SpinnerWithColor);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-spinner'));
 
     expect(progressElement.nativeElement.classList).toContain('mat-primary');
 
@@ -146,11 +146,11 @@ describe('MdProgressSpinner', () => {
     expect(progressElement.nativeElement.classList).not.toContain('mat-primary');
   });
 
-  it('should set the color class on the md-progress-spinner', () => {
+  it('should set the color class on the mat-progress-spinner', () => {
     let fixture = TestBed.createComponent(ProgressSpinnerWithColor);
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner'));
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
 
     expect(progressElement.nativeElement.classList).toContain('mat-primary');
 
@@ -163,7 +163,7 @@ describe('MdProgressSpinner', () => {
 
   it('should re-render the circle when switching from indeterminate to determinate mode', () => {
     let fixture = TestBed.createComponent(ProgressSpinnerWithValueAndBoundMode);
-    let progressElement = fixture.debugElement.query(By.css('md-progress-spinner')).nativeElement;
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner')).nativeElement;
 
     fixture.componentInstance.mode = 'indeterminate';
     fixture.detectChanges();
@@ -189,29 +189,29 @@ describe('MdProgressSpinner', () => {
 });
 
 
-@Component({template: '<md-progress-spinner></md-progress-spinner>'})
+@Component({template: '<mat-progress-spinner></mat-progress-spinner>'})
 class BasicProgressSpinner {}
 
-@Component({template: '<md-progress-spinner [strokeWidth]="strokeWidth"></md-progress-spinner>'})
+@Component({template: '<mat-progress-spinner [strokeWidth]="strokeWidth"></mat-progress-spinner>'})
 class ProgressSpinnerCustomStrokeWidth {
   strokeWidth: number;
 }
 
-@Component({template: '<md-progress-spinner mode="indeterminate"></md-progress-spinner>'})
+@Component({template: '<mat-progress-spinner mode="indeterminate"></mat-progress-spinner>'})
 class IndeterminateProgressSpinner { }
 
-@Component({template: '<md-progress-spinner value="50" [mode]="mode"></md-progress-spinner>'})
+@Component({template: '<mat-progress-spinner value="50" [mode]="mode"></mat-progress-spinner>'})
 class ProgressSpinnerWithValueAndBoundMode { mode = 'indeterminate'; }
 
 @Component({template: `
-    <md-progress-spinner mode="indeterminate" *ngIf="!isHidden"></md-progress-spinner>`})
+    <mat-progress-spinner mode="indeterminate" *ngIf="!isHidden"></mat-progress-spinner>`})
 class IndeterminateProgressSpinnerWithNgIf { isHidden = false; }
 
-@Component({template: `<md-spinner *ngIf="!isHidden"></md-spinner>`})
+@Component({template: `<mat-spinner *ngIf="!isHidden"></mat-spinner>`})
 class SpinnerWithNgIf { isHidden = false; }
 
-@Component({template: `<md-spinner [color]="color"></md-spinner>`})
+@Component({template: `<mat-spinner [color]="color"></mat-spinner>`})
 class SpinnerWithColor { color: string = 'primary'; }
 
-@Component({template: `<md-progress-spinner value="50" [color]="color"></md-progress-spinner>`})
+@Component({template: `<mat-progress-spinner value="50" [color]="color"></mat-progress-spinner>`})
 class ProgressSpinnerWithColor { color: string = 'primary'; }
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 136a18335815..56b4f1e872f8 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -51,24 +51,24 @@ type EasingFn = (currentTime: number, startValue: number,
  * @docs-private
  */
 @Directive({
-  selector: 'md-progress-spinner, mat-progress-spinner',
+  selector: 'mat-progress-spinner',
   host: {'class': 'mat-progress-spinner'}
 })
-export class MdProgressSpinnerCssMatStyler {}
+export class MatProgressSpinnerCssMatStyler {}
 
-// Boilerplate for applying mixins to MdProgressSpinner.
+// Boilerplate for applying mixins to MatProgressSpinner.
 /** @docs-private */
-export class MdProgressSpinnerBase {
+export class MatProgressSpinnerBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdProgressSpinnerMixinBase = mixinColor(MdProgressSpinnerBase, 'primary');
+export const _MatProgressSpinnerMixinBase = mixinColor(MatProgressSpinnerBase, 'primary');
 
 /**
- * <md-progress-spinner> component.
+ * <mat-progress-spinner> component.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-progress-spinner, mat-progress-spinner',
+  selector: 'mat-progress-spinner',
   host: {
     'role': 'progressbar',
     'class': 'mat-progress-spinner',
@@ -84,7 +84,7 @@ export const _MdProgressSpinnerMixinBase = mixinColor(MdProgressSpinnerBase, 'pr
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdProgressSpinner extends _MdProgressSpinnerMixinBase
+export class MatProgressSpinner extends _MatProgressSpinnerMixinBase
     implements OnDestroy, CanColor {
 
   /** The id of the last requested animation. */
@@ -272,14 +272,14 @@ export class MdProgressSpinner extends _MdProgressSpinnerMixinBase
 
 
 /**
- * <md-spinner> component.
+ * <mat-spinner> component.
  *
  * This is a component definition to be used as a convenience reference to create an
- * indeterminate <md-progress-spinner> instance.
+ * indeterminate <mat-progress-spinner> instance.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-spinner, mat-spinner',
+  selector: 'mat-spinner',
   host: {
     'role': 'progressbar',
     'mode': 'indeterminate',
@@ -292,7 +292,7 @@ export class MdProgressSpinner extends _MdProgressSpinnerMixinBase
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdSpinner extends MdProgressSpinner {
+export class MatSpinner extends MatProgressSpinner {
   constructor(elementRef: ElementRef, ngZone: NgZone, renderer: Renderer2) {
     super(renderer, elementRef, ngZone);
     this.mode = 'indeterminate';
diff --git a/src/lib/progress-spinner/public_api.ts b/src/lib/progress-spinner/public_api.ts
index 563453f03d91..fc42969ad9c2 100644
--- a/src/lib/progress-spinner/public_api.ts
+++ b/src/lib/progress-spinner/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './progress-spinner-module';
 export * from './progress-spinner';
-export * from './mat-exports';
+
diff --git a/src/lib/radio/mat-exports.ts b/src/lib/radio/mat-exports.ts
deleted file mode 100644
index 75ef35bdb6f4..000000000000
--- a/src/lib/radio/mat-exports.ts
+++ /dev/null
@@ -1,26 +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 {
-  MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR,
-  MdRadioButton,
-  MdRadioButtonBase,
-  MdRadioChange,
-  MdRadioGroup,
-  MdRadioGroupBase,
-} from './radio';
-import {MdRadioModule} from './radio-module';
-
-
-export {MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR as MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR};
-export {MdRadioButton as MatRadioButton};
-export {MdRadioButtonBase as MatRadioButtonBase};
-export {MdRadioChange as MatRadioChange};
-export {MdRadioGroup as MatRadioGroup};
-export {MdRadioGroupBase as MatRadioGroupBase};
-export {MdRadioModule as MatRadioModule};
diff --git a/src/lib/radio/public_api.ts b/src/lib/radio/public_api.ts
index 0d89666ce7db..0456641c48fa 100644
--- a/src/lib/radio/public_api.ts
+++ b/src/lib/radio/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './radio-module';
 export * from './radio';
-export * from './mat-exports';
+
diff --git a/src/lib/radio/radio-module.ts b/src/lib/radio/radio-module.ts
index 114970a7ff10..59238a1682f1 100644
--- a/src/lib/radio/radio-module.ts
+++ b/src/lib/radio/radio-module.ts
@@ -10,17 +10,17 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
 import {
-  MdRippleModule,
-  MdCommonModule,
+  MatRippleModule,
+  MatCommonModule,
   UNIQUE_SELECTION_DISPATCHER_PROVIDER,
 } from '@angular/material/core';
-import {MdRadioGroup, MdRadioButton} from './radio';
+import {MatRadioGroup, MatRadioButton} from './radio';
 import {A11yModule} from '@angular/cdk/a11y';
 
 @NgModule({
-  imports: [CommonModule, MdRippleModule, MdCommonModule, A11yModule],
-  exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
+  imports: [CommonModule, MatRippleModule, MatCommonModule, A11yModule],
+  exports: [MatRadioGroup, MatRadioButton, MatCommonModule],
   providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER],
-  declarations: [MdRadioGroup, MdRadioButton],
+  declarations: [MatRadioGroup, MatRadioButton],
 })
-export class MdRadioModule {}
+export class MatRadioModule {}
diff --git a/src/lib/radio/radio.md b/src/lib/radio/radio.md
index da7b56704516..4a50e8c72c9e 100644
--- a/src/lib/radio/radio.md
+++ b/src/lib/radio/radio.md
@@ -1,4 +1,4 @@
-`<md-radio>` provides the same functionality as a native `<input type="radio">` enhanced with
+`<mat-radio>` provides the same functionality as a native `<input type="radio">` enhanced with
 Material Design styling and animations.
 
 <!-- example(radio-overview) -->
@@ -6,7 +6,7 @@ Material Design styling and animations.
 All radio-buttons with the same `name` comprise a set from which only one may be selected at a time.
 
 ### Radio-button label
-The radio-button label is provided as the content to the `<md-radio-button>` element. The label can
+The radio-button label is provided as the content to the `<mat-radio-button>` element. The label can
 be positioned before or after the radio-button by setting the `labelPosition` property to `'before'`
 or `'after'`.
 
@@ -17,7 +17,7 @@ specify an appropriate label.
 
 
 ### Radio groups
-Radio-buttons should typically be placed inside of an `<md-radio-group>` unless the DOM structure
+Radio-buttons should typically be placed inside of an `<mat-radio-group>` unless the DOM structure
 would make that impossible (e.g., radio-buttons inside of table cells). The radio-group has a
 `value` property that reflects the currently selected radio-button inside of the group.
 
@@ -25,12 +25,12 @@ Individual radio-buttons inside of a radio-group will inherit the `name` of the
 
 
 ### Use with `@angular/forms`
-`<md-radio-group>` is compatible with `@angular/forms` and supports both `FormsModule`
+`<mat-radio-group>` is compatible with `@angular/forms` and supports both `FormsModule`
 and `ReactiveFormsModule`.
 
 ### Accessibility
-The `<md-radio-button>` uses an internal `<input type="radio">` to provide an accessible experience.
+The `<mat-radio-button>` uses an internal `<input type="radio">` to provide an accessible experience.
 This internal radio button receives focus and is automatically labelled by the text content of the
-`<md-radio-button>` element.
+`<mat-radio-button>` element.
 
 Radio button groups should should be given a meaningful label via `aria-label` or `aria-labelledby`.
diff --git a/src/lib/radio/radio.spec.ts b/src/lib/radio/radio.spec.ts
index d87f5a623271..96f0447a9f37 100644
--- a/src/lib/radio/radio.spec.ts
+++ b/src/lib/radio/radio.spec.ts
@@ -5,13 +5,13 @@ import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
-import {MdRadioButton, MdRadioChange, MdRadioGroup, MdRadioModule} from './index';
+import {MatRadioButton, MatRadioChange, MatRadioGroup, MatRadioModule} from './index';
 
-describe('MdRadio', () => {
+describe('MatRadio', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdRadioModule, FormsModule, ReactiveFormsModule],
+      imports: [MatRadioModule, FormsModule, ReactiveFormsModule],
       declarations: [
         FocusableRadioButton,
         RadiosInsideRadioGroup,
@@ -35,8 +35,8 @@ describe('MdRadio', () => {
     let radioNativeElements: HTMLElement[];
     let radioLabelElements: HTMLLabelElement[];
     let radioInputElements: HTMLInputElement[];
-    let groupInstance: MdRadioGroup;
-    let radioInstances: MdRadioButton[];
+    let groupInstance: MatRadioGroup;
+    let radioInstances: MatRadioButton[];
     let testComponent: RadiosInsideRadioGroup;
 
     beforeEach(async(() => {
@@ -45,11 +45,11 @@ describe('MdRadio', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      groupDebugElement = fixture.debugElement.query(By.directive(MdRadioGroup));
+      groupDebugElement = fixture.debugElement.query(By.directive(MatRadioGroup));
       groupNativeElement = groupDebugElement.nativeElement;
-      groupInstance = groupDebugElement.injector.get<MdRadioGroup>(MdRadioGroup);
+      groupInstance = groupDebugElement.injector.get<MatRadioGroup>(MatRadioGroup);
 
-      radioDebugElements = fixture.debugElement.queryAll(By.directive(MdRadioButton));
+      radioDebugElements = fixture.debugElement.queryAll(By.directive(MatRadioButton));
       radioNativeElements = radioDebugElements.map(debugEl => debugEl.nativeElement);
       radioInstances = radioDebugElements.map(debugEl => debugEl.componentInstance);
 
@@ -269,7 +269,7 @@ describe('MdRadio', () => {
         .toBe(1, 'Expected an enabled radio button to show ripples');
     });
 
-    it('should not show ripples if mdRippleDisabled input is set', () => {
+    it('should not show ripples if matRippleDisabled input is set', () => {
       testComponent.disableRipple = true;
       fixture.detectChanges();
 
@@ -385,8 +385,8 @@ describe('MdRadio', () => {
     let radioDebugElements: DebugElement[];
     let innerRadios: DebugElement[];
     let radioLabelElements: HTMLLabelElement[];
-    let groupInstance: MdRadioGroup;
-    let radioInstances: MdRadioButton[];
+    let groupInstance: MatRadioGroup;
+    let radioInstances: MatRadioButton[];
     let testComponent: RadioGroupWithNgModel;
     let groupNgModel: NgModel;
 
@@ -396,12 +396,12 @@ describe('MdRadio', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      groupDebugElement = fixture.debugElement.query(By.directive(MdRadioGroup));
+      groupDebugElement = fixture.debugElement.query(By.directive(MatRadioGroup));
       groupNativeElement = groupDebugElement.nativeElement;
-      groupInstance = groupDebugElement.injector.get<MdRadioGroup>(MdRadioGroup);
+      groupInstance = groupDebugElement.injector.get<MatRadioGroup>(MatRadioGroup);
       groupNgModel = groupDebugElement.injector.get<NgModel>(NgModel);
 
-      radioDebugElements = fixture.debugElement.queryAll(By.directive(MdRadioButton));
+      radioDebugElements = fixture.debugElement.queryAll(By.directive(MatRadioButton));
       radioInstances = radioDebugElements.map(debugEl => debugEl.componentInstance);
       innerRadios = fixture.debugElement.queryAll(By.css('input[type="radio"]'));
 
@@ -494,7 +494,7 @@ describe('MdRadio', () => {
   describe('group with FormControl', () => {
     let fixture: ComponentFixture<RadioGroupWithFormControl>;
     let groupDebugElement: DebugElement;
-    let groupInstance: MdRadioGroup;
+    let groupInstance: MatRadioGroup;
     let testComponent: RadioGroupWithFormControl;
 
     beforeEach(() => {
@@ -502,8 +502,8 @@ describe('MdRadio', () => {
       fixture.detectChanges();
 
       testComponent = fixture.debugElement.componentInstance;
-      groupDebugElement = fixture.debugElement.query(By.directive(MdRadioGroup));
-      groupInstance = groupDebugElement.injector.get<MdRadioGroup>(MdRadioGroup);
+      groupDebugElement = fixture.debugElement.query(By.directive(MatRadioGroup));
+      groupInstance = groupDebugElement.injector.get<MatRadioGroup>(MatRadioGroup);
     });
 
     it('should toggle the disabled state', () => {
@@ -524,9 +524,9 @@ describe('MdRadio', () => {
   describe('as standalone', () => {
     let fixture: ComponentFixture<StandaloneRadioButtons>;
     let radioDebugElements: DebugElement[];
-    let seasonRadioInstances: MdRadioButton[];
-    let weatherRadioInstances: MdRadioButton[];
-    let fruitRadioInstances: MdRadioButton[];
+    let seasonRadioInstances: MatRadioButton[];
+    let weatherRadioInstances: MatRadioButton[];
+    let fruitRadioInstances: MatRadioButton[];
     let fruitRadioNativeInputs: HTMLElement[];
     let testComponent: StandaloneRadioButtons;
 
@@ -536,7 +536,7 @@ describe('MdRadio', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      radioDebugElements = fixture.debugElement.queryAll(By.directive(MdRadioButton));
+      radioDebugElements = fixture.debugElement.queryAll(By.directive(MatRadioButton));
       seasonRadioInstances = radioDebugElements
           .filter(debugEl => debugEl.componentInstance.name == 'season')
           .map(debugEl => debugEl.componentInstance);
@@ -665,22 +665,22 @@ describe('MdRadio', () => {
 
 @Component({
   template: `
-  <md-radio-group [disabled]="isGroupDisabled"
+  <mat-radio-group [disabled]="isGroupDisabled"
                   [labelPosition]="labelPos"
                   [required]="isGroupRequired"
                   [value]="groupValue"
                   name="test-name">
-    <md-radio-button value="fire" [disableRipple]="disableRipple" [disabled]="isFirstDisabled"
+    <mat-radio-button value="fire" [disableRipple]="disableRipple" [disabled]="isFirstDisabled"
                      [color]="color">
       Charmander
-    </md-radio-button>
-    <md-radio-button value="water" [disableRipple]="disableRipple" [color]="color">
+    </mat-radio-button>
+    <mat-radio-button value="water" [disableRipple]="disableRipple" [color]="color">
       Squirtle
-    </md-radio-button>
-    <md-radio-button value="leaf" [disableRipple]="disableRipple" [color]="color">
+    </mat-radio-button>
+    <mat-radio-button value="leaf" [disableRipple]="disableRipple" [color]="color">
       Bulbasaur
-    </md-radio-button>
-  </md-radio-group>
+    </mat-radio-button>
+  </mat-radio-group>
   `
 })
 class RadiosInsideRadioGroup {
@@ -696,21 +696,21 @@ class RadiosInsideRadioGroup {
 
 @Component({
   template: `
-    <md-radio-button name="season" value="spring">Spring</md-radio-button>
-    <md-radio-button name="season" value="summer">Summer</md-radio-button>
-    <md-radio-button name="season" value="autum">Autumn</md-radio-button>
+    <mat-radio-button name="season" value="spring">Spring</mat-radio-button>
+    <mat-radio-button name="season" value="summer">Summer</mat-radio-button>
+    <mat-radio-button name="season" value="autum">Autumn</mat-radio-button>
 
-    <md-radio-button name="weather" value="warm">Spring</md-radio-button>
-    <md-radio-button name="weather" value="hot">Summer</md-radio-button>
-    <md-radio-button name="weather" value="cool">Autumn</md-radio-button>
+    <mat-radio-button name="weather" value="warm">Spring</mat-radio-button>
+    <mat-radio-button name="weather" value="hot">Summer</mat-radio-button>
+    <mat-radio-button name="weather" value="cool">Autumn</mat-radio-button>
 
     <span id="xyz">Baby Banana</span>
-    <md-radio-button name="fruit"
+    <mat-radio-button name="fruit"
                      value="banana"
                      [aria-label]="ariaLabel"
                      [aria-labelledby]="ariaLabelledby">
-    </md-radio-button>
-    <md-radio-button name="fruit" value="raspberry">Raspberry</md-radio-button>
+    </mat-radio-button>
+    <mat-radio-button name="fruit" value="raspberry">Raspberry</mat-radio-button>
   `
 })
 class StandaloneRadioButtons {
@@ -721,11 +721,11 @@ class StandaloneRadioButtons {
 
 @Component({
   template: `
-  <md-radio-group [(ngModel)]="modelValue" (change)="lastEvent = $event">
-    <md-radio-button *ngFor="let option of options" [value]="option.value">
+  <mat-radio-group [(ngModel)]="modelValue" (change)="lastEvent = $event">
+    <mat-radio-button *ngFor="let option of options" [value]="option.value">
       {{option.label}}
-    </md-radio-button>
-  </md-radio-group>
+    </mat-radio-button>
+  </mat-radio-group>
   `
 })
 class RadioGroupWithNgModel {
@@ -735,14 +735,14 @@ class RadioGroupWithNgModel {
     {label: 'Chocolate', value: 'chocolate'},
     {label: 'Strawberry', value: 'strawberry'},
   ];
-  lastEvent: MdRadioChange;
+  lastEvent: MatRadioChange;
 }
 
 @Component({
   template: `
-  <md-radio-group [formControl]="formControl">
-    <md-radio-button value="1">One</md-radio-button>
-  </md-radio-group>
+  <mat-radio-group [formControl]="formControl">
+    <mat-radio-button value="1">One</mat-radio-button>
+  </mat-radio-group>
   `
 })
 class RadioGroupWithFormControl {
@@ -750,6 +750,6 @@ class RadioGroupWithFormControl {
 }
 
 @Component({
-  template: `<md-radio-button tabindex="-1"></md-radio-button>`
+  template: `<mat-radio-button tabindex="-1"></mat-radio-button>`
 })
 class FocusableRadioButton {}
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 406dd39f715a..530c77f85a0b 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -8,78 +8,81 @@
 
 import {
   AfterContentInit,
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
   ContentChildren,
   Directive,
   ElementRef,
-  Renderer2,
   EventEmitter,
+  forwardRef,
   Input,
+  OnDestroy,
   OnInit,
   Optional,
   Output,
   QueryList,
-  ViewEncapsulation,
-  forwardRef,
+  Renderer2,
   ViewChild,
-  OnDestroy,
-  AfterViewInit,
+  ViewEncapsulation,
 } from '@angular/core';
-import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {
+  CanColor,
+  CanDisable,
+  CanDisableRipple,
+  MatRipple,
+  mixinColor,
+  mixinDisabled,
+  mixinDisableRipple,
   RippleRef,
   UniqueSelectionDispatcher,
-  MdRipple, MATERIAL_COMPATIBILITY_MODE,
 } from '@angular/material/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {mixinDisabled, CanDisable} from '@angular/material/core';
-import {CanColor, mixinColor} from '@angular/material/core';
-import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for radio components.
 let nextUniqueId = 0;
 
 /**
- * Provider Expression that allows md-radio-group to register as a ControlValueAccessor. This
+ * Provider Expression that allows mat-radio-group to register as a ControlValueAccessor. This
  * allows it to support [(ngModel)] and ngControl.
  * @docs-private
  */
-export const MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR: any = {
+export const MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdRadioGroup),
+  useExisting: forwardRef(() => MatRadioGroup),
   multi: true
 };
 
-/** Change event object emitted by MdRadio and MdRadioGroup. */
-export class MdRadioChange {
-  /** The MdRadioButton that emits the change event. */
-  source: MdRadioButton | null;
-  /** The value of the MdRadioButton. */
+/** Change event object emitted by MatRadio and MatRadioGroup. */
+export class MatRadioChange {
+  /** The MatRadioButton that emits the change event. */
+  source: MatRadioButton | null;
+  /** The value of the MatRadioButton. */
   value: any;
 }
 
 
-// Boilerplate for applying mixins to MdRadioGroup.
+// Boilerplate for applying mixins to MatRadioGroup.
 /** @docs-private */
-export class MdRadioGroupBase { }
-export const _MdRadioGroupMixinBase = mixinDisabled(MdRadioGroupBase);
+export class MatRadioGroupBase { }
+export const _MatRadioGroupMixinBase = mixinDisabled(MatRadioGroupBase);
 
 /**
- * A group of radio buttons. May contain one or more `<md-radio-button>` elements.
+ * A group of radio buttons. May contain one or more `<mat-radio-button>` elements.
  */
 @Directive({
-  selector: 'md-radio-group, mat-radio-group',
-  providers: [MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR],
+  selector: 'mat-radio-group',
+  providers: [MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR],
   host: {
     'role': 'radiogroup',
     'class': 'mat-radio-group',
   },
   inputs: ['disabled'],
 })
-export class MdRadioGroup extends _MdRadioGroupMixinBase
+export class MatRadioGroup extends _MatRadioGroupMixinBase
     implements AfterContentInit, ControlValueAccessor, CanDisable {
   /**
    * Selected value for group. Should equal the value of the selected radio button if there *is*
@@ -90,10 +93,10 @@ export class MdRadioGroup extends _MdRadioGroupMixinBase
   private _value: any = null;
 
   /** The HTML name attribute applied to radio buttons in this group. */
-  private _name: string = `md-radio-group-${nextUniqueId++}`;
+  private _name: string = `mat-radio-group-${nextUniqueId++}`;
 
   /** The currently selected radio button. Should match value. */
-  private _selected: MdRadioButton | null = null;
+  private _selected: MatRadioButton | null = null;
 
   /** Whether the `value` has been set to its initial value. */
   private _isInitialized: boolean = false;
@@ -121,10 +124,10 @@ export class MdRadioGroup extends _MdRadioGroupMixinBase
    * Change events are only emitted when the value changes due to user interaction with
    * a radio button (the same behavior as `<input type-"radio">`).
    */
-  @Output() change: EventEmitter<MdRadioChange> = new EventEmitter<MdRadioChange>();
+  @Output() change: EventEmitter<MatRadioChange> = new EventEmitter<MatRadioChange>();
 
   /** Child radio buttons. */
-  @ContentChildren(forwardRef(() => MdRadioButton)) _radios: QueryList<MdRadioButton>;
+  @ContentChildren(forwardRef(() => MatRadioButton)) _radios: QueryList<MatRadioButton>;
 
   /** Name of the radio button group. All radio buttons inside this group will use this name. */
   @Input()
@@ -183,7 +186,7 @@ export class MdRadioGroup extends _MdRadioGroupMixinBase
   /** Whether the radio button is selected. */
   @Input()
   get selected() { return this._selected; }
-  set selected(selected: MdRadioButton | null) {
+  set selected(selected: MatRadioButton | null) {
     this._selected = selected;
     this.value = selected ? selected.value : null;
     this._checkSelectedRadioButton();
@@ -215,8 +218,8 @@ export class MdRadioGroup extends _MdRadioGroupMixinBase
    */
   ngAfterContentInit() {
     // Mark this component as initialized in AfterContentInit because the initial value can
-    // possibly be set by NgModel on MdRadioGroup, and it is possible that the OnInit of the
-    // NgModel occurs *after* the OnInit of the MdRadioGroup.
+    // possibly be set by NgModel on MatRadioGroup, and it is possible that the OnInit of the
+    // NgModel occurs *after* the OnInit of the MatRadioGroup.
     this._isInitialized = true;
   }
 
@@ -257,7 +260,7 @@ export class MdRadioGroup extends _MdRadioGroupMixinBase
   /** Dispatch change event with current selection and group value. */
   _emitChangeEvent(): void {
     if (this._isInitialized) {
-      const event = new MdRadioChange();
+      const event = new MatRadioChange();
       event.source = this._selected;
       event.value = this._value;
       this.change.emit(event);
@@ -307,21 +310,22 @@ export class MdRadioGroup extends _MdRadioGroupMixinBase
   }
 }
 
-// Boilerplate for applying mixins to MdRadioButton.
+// Boilerplate for applying mixins to MatRadioButton.
 /** @docs-private */
-export class MdRadioButtonBase {
+export class MatRadioButtonBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
 // As per Material design specifications the selection control radio should use the accent color
 // palette by default. https://material.io/guidelines/components/selection-controls.html
-export const _MdRadioButtonMixinBase = mixinColor(mixinDisableRipple(MdRadioButtonBase), 'accent');
+export const _MatRadioButtonMixinBase =
+    mixinColor(mixinDisableRipple(MatRadioButtonBase), 'accent');
 
 /**
  * A radio-button. May be inside of
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-radio-button, mat-radio-button',
+  selector: 'mat-radio-button',
   templateUrl: 'radio.html',
   styleUrls: ['radio.css'],
   inputs: ['color', 'disableRipple'],
@@ -338,12 +342,11 @@ export const _MdRadioButtonMixinBase = mixinColor(mixinDisableRipple(MdRadioButt
     '(focus)': '_inputElement.nativeElement.focus()',
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdRadioButton extends _MdRadioButtonMixinBase
+export class MatRadioButton extends _MatRadioButtonMixinBase
     implements OnInit, AfterViewInit, OnDestroy, CanColor, CanDisableRipple {
 
-  private _uniqueId: string = `md-radio-${++nextUniqueId}`;
+  private _uniqueId: string = `mat-radio-${++nextUniqueId}`;
 
   /** The unique ID for the radio button. */
   @Input() id: string = this._uniqueId;
@@ -454,12 +457,12 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
    * Change events are only emitted when the value changes due to user interaction with
    * the radio button (the same behavior as `<input type-"radio">`).
    */
-  @Output() change: EventEmitter<MdRadioChange> = new EventEmitter<MdRadioChange>();
+  @Output() change: EventEmitter<MatRadioChange> = new EventEmitter<MatRadioChange>();
 
   /** The parent radio group. May or may not be present. */
-  radioGroup: MdRadioGroup;
+  radioGroup: MatRadioGroup;
 
-  /** ID of the native input element inside `<md-radio-button>` */
+  /** ID of the native input element inside `<mat-radio-button>` */
   get inputId(): string { return `${this.id || this._uniqueId}-input`; }
 
   /** Whether this radio is checked. */
@@ -475,7 +478,7 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
   private _value: any = null;
 
   /** The child ripple instance. */
-  @ViewChild(MdRipple) _ripple: MdRipple;
+  @ViewChild(MatRipple) _ripple: MatRipple;
 
   /** Reference to the current focus ripple. */
   private _focusRipple: RippleRef | null;
@@ -486,7 +489,7 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
   /** The native `<input type=radio>` element */
   @ViewChild('input') _inputElement: ElementRef;
 
-  constructor(@Optional() radioGroup: MdRadioGroup,
+  constructor(@Optional() radioGroup: MatRadioGroup,
               elementRef: ElementRef,
               renderer: Renderer2,
               private _changeDetector: ChangeDetectorRef,
@@ -544,7 +547,7 @@ export class MdRadioButton extends _MdRadioButtonMixinBase
 
   /** Dispatch change event with current value. */
   private _emitChangeEvent(): void {
-    const event = new MdRadioChange();
+    const event = new MatRadioChange();
     event.source = this;
     event.value = this._value;
     this.change.emit(event);
diff --git a/src/lib/select/mat-exports.ts b/src/lib/select/mat-exports.ts
deleted file mode 100644
index 4028df76cc0b..000000000000
--- a/src/lib/select/mat-exports.ts
+++ /dev/null
@@ -1,28 +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 {
-  MD_SELECT_SCROLL_STRATEGY,
-  MD_SELECT_SCROLL_STRATEGY_PROVIDER,
-  MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdSelect,
-  MdSelectBase,
-  MdSelectChange,
-  MdSelectTrigger,
-} from './select';
-import {MdSelectModule} from './select-module';
-
-
-export {MD_SELECT_SCROLL_STRATEGY as MAT_SELECT_SCROLL_STRATEGY};
-export {MD_SELECT_SCROLL_STRATEGY_PROVIDER as MAT_SELECT_SCROLL_STRATEGY_PROVIDER};
-export {MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY};
-export {MdSelect as MatSelect};
-export {MdSelectBase as MatSelectBase};
-export {MdSelectChange as MatSelectChange};
-export {MdSelectModule as MatSelectModule};
-export {MdSelectTrigger as MatSelectTrigger};
diff --git a/src/lib/select/public_api.ts b/src/lib/select/public_api.ts
index 01ccc2f3e727..b51fac91de9a 100644
--- a/src/lib/select/public_api.ts
+++ b/src/lib/select/public_api.ts
@@ -9,4 +9,3 @@
 export * from './select-module';
 export * from './select';
 export * from './select-animations';
-export * from './mat-exports';
diff --git a/src/lib/select/select-animations.ts b/src/lib/select/select-animations.ts
index 2813519212ef..870081304b46 100644
--- a/src/lib/select/select-animations.ts
+++ b/src/lib/select/select-animations.ts
@@ -16,10 +16,10 @@ import {
 } from '@angular/animations';
 
 /**
- * The following are all the animations for the md-select component, with each
+ * The following are all the animations for the mat-select component, with each
  * const containing the metadata for one animation.
  *
- * The values below match the implementation of the AngularJS Material md-select animation.
+ * The values below match the implementation of the AngularJS Material mat-select animation.
  */
 
 /**
diff --git a/src/lib/select/select-errors.ts b/src/lib/select/select-errors.ts
index f0578131858b..8075a08d2452 100644
--- a/src/lib/select/select-errors.ts
+++ b/src/lib/select/select-errors.ts
@@ -11,7 +11,7 @@
  * after initialization.
  * @docs-private
  */
-export function getMdSelectDynamicMultipleError(): Error {
+export function getMatSelectDynamicMultipleError(): Error {
   return Error('Cannot change `multiple` mode of select after initialization.');
 }
 
@@ -21,7 +21,7 @@ export function getMdSelectDynamicMultipleError(): Error {
  * resetting the value.
  * @docs-private
  */
-export function getMdSelectNonArrayValueError(): Error {
+export function getMatSelectNonArrayValueError(): Error {
   return Error('Cannot assign truthy non-array value to select in `multiple` mode.');
 }
 
@@ -30,6 +30,6 @@ export function getMdSelectNonArrayValueError(): Error {
  * used to determine if a value corresponds to an option. Note that whether the function
  * actually takes two values and returns a boolean is not checked.
  */
-export function getMdSelectNonFunctionValueError(): Error {
+export function getMatSelectNonFunctionValueError(): Error {
   return Error('Cannot assign a non-function value to `compareWith`.');
 }
diff --git a/src/lib/select/select-module.ts b/src/lib/select/select-module.ts
index 0b0c397b3680..99b154bfc2e0 100644
--- a/src/lib/select/select-module.ts
+++ b/src/lib/select/select-module.ts
@@ -8,8 +8,8 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {MdSelect, MdSelectTrigger, MD_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
-import {MdCommonModule, MdOptionModule} from '@angular/material/core';
+import {MatSelect, MatSelectTrigger, MAT_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
+import {MatCommonModule, MatOptionModule} from '@angular/material/core';
 import {OverlayModule} from '@angular/cdk/overlay';
 
 
@@ -17,11 +17,11 @@ import {OverlayModule} from '@angular/cdk/overlay';
   imports: [
     CommonModule,
     OverlayModule,
-    MdOptionModule,
-    MdCommonModule,
+    MatOptionModule,
+    MatCommonModule,
   ],
-  exports: [MdSelect, MdSelectTrigger, MdOptionModule, MdCommonModule],
-  declarations: [MdSelect, MdSelectTrigger],
-  providers: [MD_SELECT_SCROLL_STRATEGY_PROVIDER]
+  exports: [MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
+  declarations: [MatSelect, MatSelectTrigger],
+  providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER]
 })
-export class MdSelectModule {}
+export class MatSelectModule {}
diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index 9379f0980a2e..b16a0b2e959e 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -12,7 +12,7 @@
     <ng-container *ngIf="empty">{{'\xa0'}}</ng-container>
     <span class="mat-select-value-text" *ngIf="!empty" [ngSwitch]="!!customTrigger">
       <span *ngSwitchDefault>{{ triggerValue }}</span>
-      <ng-content select="md-select-trigger, mat-select-trigger" *ngSwitchCase="true"></ng-content>
+      <ng-content select="mat-select-trigger" *ngSwitchCase="true"></ng-content>
     </span>
   </div>
 
diff --git a/src/lib/select/select.md b/src/lib/select/select.md
index 389060fb44c0..1a0014e929c6 100644
--- a/src/lib/select/select.md
+++ b/src/lib/select/select.md
@@ -1,23 +1,23 @@
-`<md-select>` is a form control for selecting a value from a set of options, similar to the native
+`<mat-select>` is a form control for selecting a value from a set of options, similar to the native
 `<select>` element. You can read more about selects in the
 [Material Design spec](https://material.google.com/components/menus.html). It is designed to work
-inside of an `<md-form-field>` element.
+inside of an `<mat-form-field>` element.
 
 <!-- example(select-overview) -->
 
 ### Simple select
 
-In your template, create an `md-select` element. For each option you'd like in your select, add an
-`md-option` tag. Note that you can disable items by adding the `disabled` boolean attribute or
+In your template, create an `mat-select` element. For each option you'd like in your select, add an
+`mat-option` tag. Note that you can disable items by adding the `disabled` boolean attribute or
 binding to it.
 
 *my-comp.html*
 ```html
-<md-form-field>
-  <md-select placeholder="State">
-    <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-  </md-select>
-</md-form-field>
+<mat-form-field>
+  <mat-select placeholder="State">
+    <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
+  </mat-select>
+</mat-form-field>
 ```
 
 ### Getting and setting the select value
@@ -27,11 +27,11 @@ any of the form directives from the core `FormsModule` or `ReactiveFormsModule`:
 
 *my-comp.html*
 ```html
-<md-form-field>
-  <md-select placeholder="State" [(ngModel)]="myState">
-    <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-  </md-select>
-</md-form-field>
+<mat-form-field>
+  <mat-select placeholder="State" [(ngModel)]="myState">
+    <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
+  </mat-select>
+</mat-form-field>
 ```
 
 *my-comp.ts*
@@ -48,12 +48,12 @@ If you want one of your options to reset the select's value, you can omit specif
 
 *my-comp.html*
 ```html
-<md-form-field>
-  <md-select placeholder="State">
-    <md-option>None</md-option>
-    <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-  </md-select>
-</md-form-field>
+<mat-form-field>
+  <mat-select placeholder="State">
+    <mat-option>None</mat-option>
+    <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
+  </mat-select>
+</mat-form-field>
 ```
 
 ### Setting a static placeholder
@@ -64,33 +64,33 @@ It's possible to turn off the placeholder's floating animation using the `floatP
 - `'always'`: This makes the placeholder permanently float above the input. It will not animate up or down.
 
 ```html
-<md-form-field floatPlaceholder="never">
-  <md-select placeholder="State" [(ngModel)]="myState">
-  <md-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</md-option>
-  </md-select>
-</md-form-field>
+<mat-form-field floatPlaceholder="never">
+  <mat-select placeholder="State" [(ngModel)]="myState">
+  <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
+  </mat-select>
+</mat-form-field>
 ```
 
-Global default placeholder options can be specified by setting the `MD_PLACEHOLDER_GLOBAL_OPTIONS` provider. This setting will apply to all components that support the floating placeholder.
+Global default placeholder options can be specified by setting the `MAT_PLACEHOLDER_GLOBAL_OPTIONS` provider. This setting will apply to all components that support the floating placeholder.
 
 ```ts
 @NgModule({
   providers: [
-    {provide: MD_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' }}
+    {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' }}
   ]
 })
 ```
 
 ### Customizing the trigger label
-If you want to display a custom trigger label inside a select, you can use the `md-select-trigger` element:
+If you want to display a custom trigger label inside a select, you can use the `mat-select-trigger` element:
 
 ```html
-<md-form-field>
-  <md-select placeholder="Favorite food" #select="mdSelect">
-    <md-select-trigger>You have selected: {{ select.selected?.viewValue }}</md-select-trigger>
-    <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-  </md-select>
-</md-form-field>
+<mat-form-field>
+  <mat-select placeholder="Favorite food" #select="matSelect">
+    <mat-select-trigger>You have selected: {{ select.selected?.viewValue }}</mat-select-trigger>
+    <mat-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</mat-option>
+  </mat-select>
+</mat-form-field>
 ```
 
 Here are the available global options:
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index b894b50a1a3c..7f34d929f08c 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -27,24 +27,24 @@ import {
 import {
   extendObject,
   FloatPlaceholderType,
-  MD_PLACEHOLDER_GLOBAL_OPTIONS,
-  MdOption
+  MAT_PLACEHOLDER_GLOBAL_OPTIONS,
+  MatOption
 } from '@angular/material/core';
-import {MdFormFieldModule} from '@angular/material/form-field';
+import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {map} from 'rxjs/operator/map';
 import {Subject} from 'rxjs/Subject';
-import {MdSelectModule} from './index';
-import {MdSelect} from './select';
+import {MatSelectModule} from './index';
+import {MatSelect} from './select';
 import {
-  getMdSelectDynamicMultipleError,
-  getMdSelectNonArrayValueError,
-  getMdSelectNonFunctionValueError
+  getMatSelectDynamicMultipleError,
+  getMatSelectNonArrayValueError,
+  getMatSelectNonFunctionValueError
 } from './select-errors';
 
 
-describe('MdSelect', () => {
+describe('MatSelect', () => {
   let overlayContainerElement: HTMLElement;
   let dir: {value: 'ltr'|'rtl'};
   let scrolledSubject = new Subject();
@@ -53,8 +53,8 @@ describe('MdSelect', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        MdFormFieldModule,
-        MdSelectModule,
+        MatFormFieldModule,
+        MatSelectModule,
         ReactiveFormsModule,
         FormsModule,
         NoopAnimationsModule
@@ -171,7 +171,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
 
@@ -308,7 +308,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option')!;
+      const option = overlayContainerElement.querySelector('mat-option')!;
       const event = dispatchKeyboardEvent(option, 'keydown', SPACE);
 
       expect(event.defaultPrevented).toBe(true);
@@ -318,7 +318,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option')!;
+      const option = overlayContainerElement.querySelector('mat-option')!;
       const event = dispatchKeyboardEvent(option, 'keydown', ENTER);
 
       expect(event.defaultPrevented).toBe(true);
@@ -369,14 +369,14 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      let option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      let option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
 
       trigger.click();
       fixture.detectChanges();
 
-      option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
       expect(option.classList).toContain('mat-selected');
       expect(fixture.componentInstance.options.first.selected).toBe(true);
@@ -389,7 +389,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       let options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
@@ -398,7 +398,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList).not.toContain('mat-selected');
       expect(options[2].classList).not.toContain('mat-selected');
 
@@ -415,7 +415,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       let options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
@@ -427,7 +427,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       expect(options[0].classList)
         .not.toContain('mat-selected', 'Expected first option to no longer be selected');
@@ -448,7 +448,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      let firstOption = overlayContainerElement.querySelectorAll('md-option')[0] as HTMLElement;
+      let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
 
       firstOption.click();
       fixture.detectChanges();
@@ -468,7 +468,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
 
@@ -502,7 +502,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[8].click();
       fixture.detectChanges();
 
@@ -516,7 +516,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-        overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[2].click();
       fixture.detectChanges();
 
@@ -533,8 +533,8 @@ describe('MdSelect', () => {
       groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
       groupFixture.detectChanges();
 
-      const disabledGroup = overlayContainerElement.querySelectorAll('md-optgroup')[1];
-      const options = disabledGroup.querySelectorAll('md-option');
+      const disabledGroup = overlayContainerElement.querySelectorAll('mat-optgroup')[1];
+      const options = disabledGroup.querySelectorAll('mat-option');
 
       (options[0] as HTMLElement).click();
       groupFixture.detectChanges();
@@ -569,7 +569,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList)
           .toContain('mat-selected',
               `Expected option with the control's initial value to be selected.`);
@@ -590,7 +590,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList).toContain('mat-selected',
           `Expected option with the control's new value to be selected.`);
     });
@@ -602,7 +602,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
 
@@ -627,7 +627,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList)
           .not.toContain('mat-selected', `Expected option with the old value not to be selected.`);
     });
@@ -650,7 +650,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList)
           .not.toContain('mat-selected', `Expected option with the old value not to be selected.`);
     });
@@ -692,7 +692,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
 
@@ -736,7 +736,7 @@ describe('MdSelect', () => {
 
       expect(falsyFixture.componentInstance.options.first.selected)
         .toBe(true, 'Expected first option to be selected');
-      expect(overlayContainerElement.querySelectorAll('md-option')[0].classList)
+      expect(overlayContainerElement.querySelectorAll('mat-option')[0].classList)
         .toContain('mat-selected', 'Expected first option to be selected');
     });
 
@@ -754,7 +754,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('md-option') as HTMLElement).click();
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
 
       expect(fixture.componentInstance.selectedFood).toBe('steak-0');
@@ -764,7 +764,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      (overlayContainerElement.querySelectorAll('md-option')[2] as HTMLElement).click();
+      (overlayContainerElement.querySelectorAll('mat-option')[2] as HTMLElement).click();
       fixture.detectChanges();
 
       expect(fixture.componentInstance.selectedFood).toBe('sandwich-2');
@@ -785,7 +785,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelectorAll('md-option')[2];
+      const option = overlayContainerElement.querySelectorAll('mat-option')[2];
 
       expect(option.classList).toContain('mat-selected');
       expect(fixture.componentInstance.select.value).toBe('sandwich-2');
@@ -802,7 +802,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('md-option') as HTMLElement).click();
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
 
       expect(fixture.componentInstance.selectedFood).toBe('steak-0');
@@ -829,7 +829,7 @@ describe('MdSelect', () => {
         trigger.click();
         fixture.detectChanges();
 
-        const option = overlayContainerElement.querySelectorAll('md-option')[1];
+        const option = overlayContainerElement.querySelectorAll('mat-option')[1];
 
         expect(option.classList).toContain('mat-selected');
         expect(fixture.componentInstance.select.value).toBe('pizza-1');
@@ -848,7 +848,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       const options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
@@ -957,7 +957,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       expect(fixture.componentInstance.customAccessor.select.ngControl)
-          .toBe(null, 'Expected md-select NOT to inherit control from parent value accessor.');
+          .toBe(null, 'Expected mat-select NOT to inherit control from parent value accessor.');
       expect(fixture.componentInstance.customAccessor.writeValue).toHaveBeenCalled();
     });
 
@@ -1019,14 +1019,14 @@ describe('MdSelect', () => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      select = fixture.debugElement.query(By.css('md-select')).nativeElement;
-      formField = fixture.debugElement.query(By.css('md-form-field')).nativeElement;
+      select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      formField = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
     });
 
     /**
      * Asserts that the given option is aligned with the trigger.
      * @param index The index of the option.
-     * @param selectInstance Instance of the `md-select` component to check against.
+     * @param selectInstance Instance of the `mat-select` component to check against.
      */
     function checkTriggerAlignedWithOption(index: number, selectInstance =
       fixture.componentInstance.select): void {
@@ -1034,7 +1034,7 @@ describe('MdSelect', () => {
       const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
       const triggerTop = trigger.getBoundingClientRect().top;
       const overlayTop = overlayPane.getBoundingClientRect().top;
-      const options = overlayPane.querySelectorAll('md-option');
+      const options = overlayPane.querySelectorAll('mat-option');
       const optionTop = options[index].getBoundingClientRect().top;
       const triggerFontSize = parseInt(window.getComputedStyle(trigger)['font-size']);
       const triggerLineHeightEm = 1.125;
@@ -1139,7 +1139,7 @@ describe('MdSelect', () => {
         let groupFixture = TestBed.createComponent(SelectWithGroups);
         groupFixture.detectChanges();
         trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        select = groupFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         formField.style.position = 'fixed';
         formField.style.top = '200px';
@@ -1199,7 +1199,7 @@ describe('MdSelect', () => {
             idealSpaceAboveSelectedItem + selectMenuViewportPadding +
             (selectItemHeight - triggerHeight) / 2;
 
-        // Position of select relative to top edge of md-form-field.
+        // Position of select relative to top edge of mat-form-field.
         const formFieldTopSpace =
             trigger.getBoundingClientRect().top - formField.getBoundingClientRect().top;
 
@@ -1252,7 +1252,7 @@ describe('MdSelect', () => {
             idealSpaceAboveSelectedItem + selectMenuViewportPadding +
             (selectItemHeight - triggerHeight) / 2;
 
-        // Position of select relative to bottom edge of md-form-field:
+        // Position of select relative to bottom edge of mat-form-field:
         const formFieldBottomSpace =
             formField.getBoundingClientRect().bottom - trigger.getBoundingClientRect().bottom;
 
@@ -1563,7 +1563,7 @@ describe('MdSelect', () => {
         fixture.detectChanges();
 
         const triggerLeft = trigger.getBoundingClientRect().left;
-        const firstOptionLeft = document.querySelector('.cdk-overlay-pane md-option')!
+        const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
             .getBoundingClientRect().left;
 
         // Each option is 32px wider than the trigger, so it must be adjusted 16px
@@ -1582,7 +1582,7 @@ describe('MdSelect', () => {
 
         const triggerRight = trigger.getBoundingClientRect().right;
         const firstOptionRight =
-            document.querySelector('.cdk-overlay-pane md-option')!.getBoundingClientRect().right;
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
 
         // Each option is 32px wider than the trigger, so it must be adjusted 16px
         // to ensure the text overlaps correctly.
@@ -1600,7 +1600,7 @@ describe('MdSelect', () => {
         multiFixture.detectChanges();
         formField = multiFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
         trigger = multiFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        select = multiFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         formField.style.position = 'fixed';
         formField.style.left = '60px';
@@ -1613,7 +1613,7 @@ describe('MdSelect', () => {
         multiFixture.whenStable().then(() => {
           const triggerLeft = trigger.getBoundingClientRect().left;
           const firstOptionLeft =
-              document.querySelector('.cdk-overlay-pane md-option')!.getBoundingClientRect().left;
+              document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().left;
 
           // 44px accounts for the checkbox size, margin and the panel's padding.
           expect(Math.floor(firstOptionLeft))
@@ -1630,7 +1630,7 @@ describe('MdSelect', () => {
 
         const triggerRight = trigger.getBoundingClientRect().right;
         const firstOptionRight =
-            document.querySelector('.cdk-overlay-pane md-option')!.getBoundingClientRect().right;
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
 
         // 44px accounts for the checkbox size, margin and the panel's padding.
         expect(Math.floor(firstOptionRight))
@@ -1647,7 +1647,7 @@ describe('MdSelect', () => {
         groupFixture.detectChanges();
         formField = groupFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
         trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        select = groupFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         formField.style.position = 'fixed';
         formField.style.left = '60px';
@@ -1660,9 +1660,9 @@ describe('MdSelect', () => {
         trigger.click();
         groupFixture.detectChanges();
 
-        const group = document.querySelector('.cdk-overlay-pane md-optgroup')!;
+        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
         const triggerLeft = trigger.getBoundingClientRect().left;
-        const selectedOptionLeft = group.querySelector('md-option.mat-selected')!
+        const selectedOptionLeft = group.querySelector('mat-option.mat-selected')!
             .getBoundingClientRect().left;
 
         // 32px is the 16px default padding plus 16px of padding when an option is in a group.
@@ -1678,9 +1678,9 @@ describe('MdSelect', () => {
         trigger.click();
         groupFixture.detectChanges();
 
-        const group = document.querySelector('.cdk-overlay-pane md-optgroup')!;
+        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
         const triggerRight = trigger.getBoundingClientRect().right;
-        const selectedOptionRight = group.querySelector('md-option.mat-selected')!
+        const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
             .getBoundingClientRect().right;
 
         // 32px is the 16px default padding plus 16px of padding when an option is in a group.
@@ -1696,7 +1696,7 @@ describe('MdSelect', () => {
           trigger.click();
           groupFixture.detectChanges();
 
-          const selected = document.querySelector('.cdk-overlay-pane md-option.mat-selected')!;
+          const selected = document.querySelector('.cdk-overlay-pane mat-option.mat-selected')!;
           const selectedOptionLeft = selected.getBoundingClientRect().left;
           const triggerLeft = trigger.getBoundingClientRect().left;
 
@@ -1719,7 +1719,7 @@ describe('MdSelect', () => {
         fixture.whenStable().then(() => {
           const triggerTop = trigger.getBoundingClientRect().top;
 
-          const option = overlayContainerElement.querySelector('.cdk-overlay-pane md-option');
+          const option = overlayContainerElement.querySelector('.cdk-overlay-pane mat-option');
           const optionTop = option ? option.getBoundingClientRect().top : 0;
 
           // There appears to be a small rounding error on IE, so we verify that the value is close,
@@ -1747,7 +1747,7 @@ describe('MdSelect', () => {
       beforeEach(() => {
         fixture = TestBed.createComponent(BasicSelect);
         fixture.detectChanges();
-        select = fixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
       });
 
       it('should set the role of the select to listbox', () => {
@@ -1790,7 +1790,7 @@ describe('MdSelect', () => {
         const plainTabindexFixture = TestBed.createComponent(SelectWithPlainTabindex);
 
         plainTabindexFixture.detectChanges();
-        select = plainTabindexFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = plainTabindexFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         expect(select.getAttribute('tabindex')).toBe('5');
       });
@@ -1882,7 +1882,7 @@ describe('MdSelect', () => {
         const instance = multiFixture.componentInstance;
 
         multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         const initialValue = instance.control.value;
 
@@ -1926,12 +1926,12 @@ describe('MdSelect', () => {
           const multiFixture = TestBed.createComponent(MultiSelect);
 
           multiFixture.detectChanges();
-          select = multiFixture.debugElement.query(By.css('md-select')).nativeElement;
+          select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
           multiFixture.componentInstance.select.open();
           multiFixture.detectChanges();
 
           const options =
-              overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
           options[3].focus();
           expect(document.activeElement).toBe(options[3], 'Expected fourth option to be focused.');
@@ -1973,7 +1973,7 @@ describe('MdSelect', () => {
         const multiFixture = TestBed.createComponent(MultiSelect);
 
         multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         expect(multiFixture.componentInstance.select.panelOpen)
             .toBe(false, 'Expected panel to be closed initially.');
@@ -2024,7 +2024,7 @@ describe('MdSelect', () => {
         const multiFixture = TestBed.createComponent(MultiSelect);
 
         multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('md-select')).nativeElement;
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         expect(select.getAttribute('aria-multiselectable')).toBe('true');
       });
@@ -2048,10 +2048,10 @@ describe('MdSelect', () => {
         fixture.detectChanges();
 
         options =
-          overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       });
 
-      it('should set the role of md-option to option', () => {
+      it('should set the role of mat-option to option', () => {
         expect(options[0].getAttribute('role')).toEqual('option');
         expect(options[1].getAttribute('role')).toEqual('option');
         expect(options[2].getAttribute('role')).toEqual('option');
@@ -2105,7 +2105,8 @@ describe('MdSelect', () => {
         trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
         trigger.click();
         fixture.detectChanges();
-        groups = overlayContainerElement.querySelectorAll('md-optgroup') as NodeListOf<HTMLElement>;
+        groups =
+            overlayContainerElement.querySelectorAll('mat-optgroup') as NodeListOf<HTMLElement>;
       });
 
       it('should set the appropriate role', () => {
@@ -2141,11 +2142,11 @@ describe('MdSelect', () => {
         fixture.detectChanges();
 
         options =
-            overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       });
 
       it('should set aria-owns properly', async(() => {
-        const selects = fixture.debugElement.queryAll(By.css('md-select'));
+        const selects = fixture.debugElement.queryAll(By.css('mat-select'));
 
         expect(selects[0].nativeElement.getAttribute('aria-owns'))
             .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
@@ -2162,7 +2163,7 @@ describe('MdSelect', () => {
 
           fixture.detectChanges();
           options =
-              overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
           expect(selects[1].nativeElement.getAttribute('aria-owns'))
               .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
           expect(selects[1].nativeElement.getAttribute('aria-owns'))
@@ -2175,7 +2176,7 @@ describe('MdSelect', () => {
         let firstOptionID = options[0].id;
 
         expect(options[0].id)
-            .toContain('md-option', `Expected option ID to have the correct prefix.`);
+            .toContain('mat-option', `Expected option ID to have the correct prefix.`);
         expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
 
         const backdrop =
@@ -2188,9 +2189,9 @@ describe('MdSelect', () => {
 
           fixture.detectChanges();
           options =
-              overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
           expect(options[0].id)
-              .toContain('md-option', `Expected option ID to have the correct prefix.`);
+              .toContain('mat-option', `Expected option ID to have the correct prefix.`);
           expect(options[0].id).not.toEqual(firstOptionID, `Expected option IDs to be unique.`);
           expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
         });
@@ -2277,7 +2278,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('md-option') as HTMLElement).click();
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
 
       expect(fixture.componentInstance.changeListener).toHaveBeenCalled();
     });
@@ -2286,7 +2287,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
       option.click();
       option.click();
@@ -2337,8 +2338,8 @@ describe('MdSelect', () => {
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
         imports: [
-          MdFormFieldModule,
-          MdSelectModule,
+          MatFormFieldModule,
+          MatSelectModule,
           ReactiveFormsModule,
           FormsModule,
           NoopAnimationsModule
@@ -2346,7 +2347,7 @@ describe('MdSelect', () => {
         declarations: [
           FloatPlaceholderSelect
         ],
-        providers: [{ provide: MD_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
+        providers: [{ provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
       });
 
       fixture = TestBed.createComponent(FloatPlaceholderSelect);
@@ -2411,7 +2412,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const options = overlayContainerElement.querySelectorAll('md-option') as
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
 
       options[0].click();
@@ -2426,7 +2427,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('md-option') as HTMLElement;
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
       option.click();
       fixture.detectChanges();
@@ -2444,7 +2445,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const options = overlayContainerElement.querySelectorAll('md-option') as
+        const options = overlayContainerElement.querySelectorAll('mat-option') as
             NodeListOf<HTMLElement>;
 
         options[0].click();
@@ -2468,7 +2469,7 @@ describe('MdSelect', () => {
       testInstance.control.setValue(['steak-0', 'eggs-5']);
       fixture.detectChanges();
 
-      const optionNodes = overlayContainerElement.querySelectorAll('md-option') as
+      const optionNodes = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
 
       const optionInstances = testInstance.options.toArray();
@@ -2484,7 +2485,7 @@ describe('MdSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      const options = overlayContainerElement.querySelectorAll('md-option') as
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
 
       options[0].click();
@@ -2505,7 +2506,7 @@ describe('MdSelect', () => {
 
       expect(testInstance.select.panelOpen).toBe(true);
 
-      const options = overlayContainerElement.querySelectorAll('md-option') as
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
 
       options[0].click();
@@ -2520,7 +2521,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const options = overlayContainerElement.querySelectorAll('md-option') as
+        const options = overlayContainerElement.querySelectorAll('mat-option') as
             NodeListOf<HTMLElement>;
 
         options[2].click();
@@ -2539,7 +2540,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const options = overlayContainerElement.querySelectorAll('md-option') as
+        const options = overlayContainerElement.querySelectorAll('mat-option') as
             NodeListOf<HTMLElement>;
 
         options[2].click();
@@ -2576,13 +2577,13 @@ describe('MdSelect', () => {
     it('should throw an exception when trying to set a non-array value', async(() => {
       expect(() => {
         testInstance.control.setValue('not-an-array');
-      }).toThrowError(wrappedErrorMessage(getMdSelectNonArrayValueError()));
+      }).toThrowError(wrappedErrorMessage(getMatSelectNonArrayValueError()));
     }));
 
     it('should throw an exception when trying to change multiple mode after init', async(() => {
       expect(() => {
         testInstance.select.multiple = false;
-      }).toThrowError(wrappedErrorMessage(getMdSelectDynamicMultipleError()));
+      }).toThrowError(wrappedErrorMessage(getMatSelectDynamicMultipleError()));
     }));
 
     it('should pass the `multiple` value to all of the option instances', async(() => {
@@ -2650,7 +2651,7 @@ describe('MdSelect', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        options = overlayContainerElement.querySelectorAll('md-option') as NodeListOf<HTMLElement>;
+        options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
         options[0].click();
         fixture.detectChanges();
@@ -2721,7 +2722,7 @@ describe('MdSelect', () => {
       fixture = TestBed.createComponent(SelectInsideFormGroup);
       fixture.detectChanges();
       testComponent = fixture.componentInstance;
-      select = fixture.debugElement.query(By.css('md-select')).nativeElement;
+      select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
     });
 
     it('should not set the invalid class on a clean select', () => {
@@ -2795,7 +2796,7 @@ describe('MdSelect', () => {
     describe('when comparing by value', () => {
 
       it('should have a selection', () => {
-        const selectedOption = instance.select.selected as MdOption;
+        const selectedOption = instance.select.selected as MatOption;
         expect(selectedOption.value.value).toEqual('pizza-1');
       });
 
@@ -2803,7 +2804,7 @@ describe('MdSelect', () => {
         instance.options.last._selectViaInteraction();
         fixture.detectChanges();
         fixture.whenStable().then(() => {
-          const selectedOption = instance.select.selected as MdOption;
+          const selectedOption = instance.select.selected as MatOption;
           expect(instance.selectedFood.value).toEqual('tacos-2');
           expect(selectedOption.value.value).toEqual('tacos-2');
         });
@@ -2846,7 +2847,7 @@ describe('MdSelect', () => {
       it('should throw an error', () => {
         expect(() => {
           fixture.detectChanges();
-        }).toThrowError(wrappedErrorMessage(getMdSelectNonFunctionValueError()));
+        }).toThrowError(wrappedErrorMessage(getMatSelectNonFunctionValueError()));
       });
     });
   });
@@ -2856,15 +2857,15 @@ describe('MdSelect', () => {
   selector: 'basic-select',
   template: `
     <div [style.height.px]="heightAbove"></div>
-    <md-form-field>
-      <md-select placeholder="Food" [formControl]="control" [required]="isRequired"
+    <mat-form-field>
+      <mat-select placeholder="Food" [formControl]="control" [required]="isRequired"
         [tabIndex]="tabIndexOverride" [aria-label]="ariaLabel" [aria-labelledby]="ariaLabelledby"
         [panelClass]="panelClass" [disableRipple]="disableRipple">
-        <md-option *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
+        <mat-option *ngFor="let food of foods" [value]="food.value" [disabled]="food.disabled">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
     <div [style.height.px]="heightBelow"></div>
   `
 })
@@ -2889,18 +2890,20 @@ class BasicSelect {
   panelClass = ['custom-one', 'custom-two'];
   disableRipple: boolean;
 
-  @ViewChild(MdSelect) select: MdSelect;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
 @Component({
   selector: 'ng-model-select',
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" ngModel [disabled]="isDisabled">
-        <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select placeholder="Food" ngModel [disabled]="isDisabled">
+        <mat-option *ngFor="let food of foods"
+                    [value]="food.value">{{ food.viewValue }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class NgModelSelect {
@@ -2911,25 +2914,25 @@ class NgModelSelect {
   ];
   isDisabled: boolean;
 
-  @ViewChild(MdSelect) select: MdSelect;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
 @Component({
   selector: 'many-selects',
   template: `
-    <md-form-field>
-      <md-select placeholder="First">
-        <md-option value="one">one</md-option>
-        <md-option value="two">two</md-option>
-      </md-select>
-    </md-form-field>
-    <md-form-field>
-      <md-select placeholder="Second">
-        <md-option value="three">three</md-option>
-        <md-option value="four">four</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select placeholder="First">
+        <mat-option value="one">one</mat-option>
+        <mat-option value="two">two</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-select placeholder="Second">
+        <mat-option value="three">three</mat-option>
+        <mat-option value="four">four</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class ManySelects {}
@@ -2938,13 +2941,13 @@ class ManySelects {}
   selector: 'ng-if-select',
   template: `
     <div *ngIf="isShowing">
-      <md-form-field>
-        <md-select placeholder="Food I want to eat right now" [formControl]="control">
-          <md-option *ngFor="let food of foods" [value]="food.value">
+      <mat-form-field>
+        <mat-select placeholder="Food I want to eat right now" [formControl]="control">
+          <mat-option *ngFor="let food of foods" [value]="food.value">
             {{ food.viewValue }}
-          </md-option>
-        </md-select>
-      </md-form-field>
+          </mat-option>
+        </mat-select>
+      </mat-form-field>
     </div>
   `,
 })
@@ -2957,17 +2960,17 @@ class NgIfSelect {
   ];
   control = new FormControl('pizza-1');
 
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 }
 
 @Component({
   selector: 'select-with-change-event',
   template: `
-    <md-form-field>
-      <md-select (change)="changeListener($event)">
-        <md-option *ngFor="let food of foods" [value]="food">{{ food }}</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select (change)="changeListener($event)">
+        <mat-option *ngFor="let food of foods" [value]="food">{{ food }}</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class SelectWithChangeEvent {
@@ -2982,27 +2985,27 @@ class SelectWithChangeEvent {
     'sushi-7'
   ];
 
-  changeListener = jasmine.createSpy('MdSelect change listener');
+  changeListener = jasmine.createSpy('MatSelect change listener');
 }
 
 @Component({
   selector: 'select-init-without-options',
   template: `
-    <md-form-field>
-      <md-select placeholder="Food I want to eat right now" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food I want to eat right now" [formControl]="control">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class SelectInitWithoutOptions {
   foods: any[];
   control = new FormControl('pizza-1');
 
-  @ViewChild(MdSelect) select: MdSelect;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 
   addOptions() {
     this.foods = [
@@ -3015,7 +3018,7 @@ class SelectInitWithoutOptions {
 
 @Component({
   selector: 'custom-select-accessor',
-  template: `<md-form-field><md-select></md-select></md-form-field>`,
+  template: `<mat-form-field><mat-select></mat-select></mat-form-field>`,
   providers: [{
     provide: NG_VALUE_ACCESSOR,
     useExisting: CustomSelectAccessor,
@@ -3023,7 +3026,7 @@ class SelectInitWithoutOptions {
   }]
 })
 class CustomSelectAccessor implements ControlValueAccessor {
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 
   writeValue: (value?: any) => void = () => {};
   registerOnChange: (changeFn?: (value: any) => void) => void = () => {};
@@ -3047,9 +3050,9 @@ class CompWithCustomSelect {
 @Component({
   selector: 'select-infinite-loop',
   template: `
-    <md-form-field>
-      <md-select [(ngModel)]="value"></md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select [(ngModel)]="value"></mat-select>
+    </mat-form-field>
     <throws-error-on-init></throws-error-on-init>
   `
 })
@@ -3071,13 +3074,13 @@ export class ThrowsErrorOnInit implements OnInit {
   selector: 'basic-select-on-push',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food" [formControl]="control">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectOnPush {
@@ -3093,13 +3096,13 @@ class BasicSelectOnPush {
   selector: 'basic-select-on-push-preselected',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food" [formControl]="control">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectOnPushPreselected {
@@ -3114,13 +3117,13 @@ class BasicSelectOnPushPreselected {
 @Component({
   selector: 'floating-placeholder-select',
   template: `
-    <md-form-field [floatPlaceholder]="floatPlaceholder">
-      <md-select placeholder="Food I want to eat right now" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field [floatPlaceholder]="floatPlaceholder">
+      <mat-select placeholder="Food I want to eat right now" [formControl]="control">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
     `,
 })
 class FloatPlaceholderSelect {
@@ -3132,17 +3135,19 @@ class FloatPlaceholderSelect {
     { value: 'tacos-2', viewValue: 'Tacos'}
   ];
 
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 }
 
 @Component({
   selector: 'multi-select',
   template: `
-    <md-form-field>
-      <md-select multiple placeholder="Food" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select multiple placeholder="Food" [formControl]="control">
+        <mat-option *ngFor="let food of foods"
+                    [value]="food.value">{{ food.viewValue }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class MultiSelect {
@@ -3158,22 +3163,22 @@ class MultiSelect {
   ];
   control = new FormControl();
 
-  @ViewChild(MdSelect) select: MdSelect;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
 @Component({
   selector: 'select-with-plain-tabindex',
-  template: `<md-form-field><md-select tabindex="5"></md-select></md-form-field>`
+  template: `<mat-form-field><mat-select tabindex="5"></mat-select></mat-form-field>`
 })
 class SelectWithPlainTabindex { }
 
 @Component({
   selector: 'select-early-sibling-access',
   template: `
-    <md-form-field>
-      <md-select #select="mdSelect"></md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select #select="matSelect"></mat-select>
+    </mat-form-field>
     <div *ngIf="select.selected"></div>
   `
 })
@@ -3182,11 +3187,11 @@ class SelectEarlyAccessSibling { }
 @Component({
   selector: 'basic-select-initially-hidden',
   template: `
-    <md-form-field>
-      <md-select [style.display]="isVisible ? 'block' : 'none'">
-        <md-option value="value">There are no other options</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select [style.display]="isVisible ? 'block' : 'none'">
+        <mat-option value="value">There are no other options</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectInitiallyHidden {
@@ -3196,11 +3201,11 @@ class BasicSelectInitiallyHidden {
 @Component({
   selector: 'basic-select-no-placeholder',
   template: `
-    <md-form-field>
-      <md-select>
-        <md-option value="value">There are no other options</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select>
+        <mat-option value="value">There are no other options</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectNoPlaceholder { }
@@ -3208,16 +3213,16 @@ class BasicSelectNoPlaceholder { }
 @Component({
   selector: 'basic-select-with-theming',
   template: `
-    <md-form-field [color]="theme">
-      <md-select placeholder="Food">
-        <md-option value="steak-0">Steak</md-option>
-        <md-option value="pizza-1">Pizza</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field [color]="theme">
+      <mat-select placeholder="Food">
+        <mat-option value="steak-0">Steak</mat-option>
+        <mat-option value="pizza-1">Pizza</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectWithTheming {
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
   theme: string;
 }
 
@@ -3225,14 +3230,14 @@ class BasicSelectWithTheming {
 @Component({
   selector: 'reset-values-select',
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food" [formControl]="control">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-        <md-option>None</md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+        <mat-option>None</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class ResetValuesSelect {
@@ -3246,16 +3251,18 @@ class ResetValuesSelect {
   ];
   control = new FormControl();
 
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <md-select [formControl]="control">
-        <md-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</md-option>
-      </md-select>
-    </md-form-field>
+    <mat-form-field>
+      <mat-select [formControl]="control">
+        <mat-option *ngFor="let food of foods"
+                    [value]="food.value">{{ food.viewValue }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class FalsyValueSelect {
@@ -3264,24 +3271,24 @@ class FalsyValueSelect {
     { value: 1, viewValue: 'Pizza' },
   ];
   control = new FormControl();
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
 
 @Component({
   selector: 'select-with-groups',
   template: `
-    <md-form-field>
-      <md-select placeholder="Pokemon" [formControl]="control">
-        <md-optgroup *ngFor="let group of pokemonTypes" [label]="group.name"
+    <mat-form-field>
+      <mat-select placeholder="Pokemon" [formControl]="control">
+        <mat-optgroup *ngFor="let group of pokemonTypes" [label]="group.name"
           [disabled]="group.disabled">
-          <md-option *ngFor="let pokemon of group.pokemon" [value]="pokemon.value">
+          <mat-option *ngFor="let pokemon of group.pokemon" [value]="pokemon.value">
             {{ pokemon.viewValue }}
-          </md-option>
-        </md-optgroup>
-        <md-option value="mime-11">Mr. Mime</md-option>
-      </md-select>
-    </md-form-field>
+          </mat-option>
+        </mat-optgroup>
+        <mat-option value="mime-11">Mr. Mime</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class SelectWithGroups {
@@ -3321,17 +3328,17 @@ class SelectWithGroups {
     }
   ];
 
-  @ViewChild(MdSelect) select: MdSelect;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
 
 @Component({
   template: `
     <form>
-      <md-form-field>
-        <md-select [(ngModel)]="value"></md-select>
-      </md-form-field>
+      <mat-form-field>
+        <mat-select [(ngModel)]="value"></mat-select>
+      </mat-form-field>
     </form>
   `
 })
@@ -3343,12 +3350,12 @@ class InvalidSelectInForm {
 @Component({
   template: `
     <form [formGroup]="formGroup">
-      <md-form-field>
-        <md-select placeholder="Food" formControlName="food">
-          <md-option value="steak-0">Steak</md-option>
-          <md-option value="pizza-1">Pizza</md-option>
-        </md-select>
-      </md-form-field>
+      <mat-form-field>
+        <mat-select placeholder="Food" formControlName="food">
+          <mat-option value="steak-0">Steak</mat-option>
+          <mat-option value="pizza-1">Pizza</mat-option>
+        </mat-select>
+      </mat-form-field>
     </form>
   `
 })
@@ -3363,13 +3370,13 @@ class SelectInsideFormGroup {
 
 @Component({
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [(value)]="selectedFood">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food" [(value)]="selectedFood">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectWithoutForms {
@@ -3380,18 +3387,18 @@ class BasicSelectWithoutForms {
     { value: 'sandwich-2', viewValue: 'Sandwich' },
   ];
 
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [(value)]="selectedFood">
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food" [(value)]="selectedFood">
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectWithoutFormsPreselected {
@@ -3401,18 +3408,18 @@ class BasicSelectWithoutFormsPreselected {
     { value: 'pizza-1', viewValue: 'Pizza' },
   ];
 
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 }
 
 @Component({
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [(value)]="selectedFoods" multiple>
-        <md-option *ngFor="let food of foods" [value]="food.value">
+    <mat-form-field>
+      <mat-select placeholder="Food" [(value)]="selectedFoods" multiple>
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class BasicSelectWithoutFormsMultiple {
@@ -3423,23 +3430,23 @@ class BasicSelectWithoutFormsMultiple {
     { value: 'sandwich-2', viewValue: 'Sandwich' },
   ];
 
-  @ViewChild(MdSelect) select: MdSelect;
+  @ViewChild(MatSelect) select: MatSelect;
 }
 
 
 @Component({
   selector: 'select-with-custom-trigger',
   template: `
-    <md-form-field>
-      <md-select placeholder="Food" [formControl]="control" #select="mdSelect">
-        <md-select-trigger>
+    <mat-form-field>
+      <mat-select placeholder="Food" [formControl]="control" #select="matSelect">
+        <mat-select-trigger>
           {{ select.selected?.viewValue.split('').reverse().join('') }}
-        </md-select-trigger>
-        <md-option *ngFor="let food of foods" [value]="food.value">
+        </mat-select-trigger>
+        <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
-        </md-option>
-      </md-select>
-    </md-form-field>
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class SelectWithCustomTrigger {
@@ -3454,12 +3461,12 @@ class SelectWithCustomTrigger {
 @Component({
   selector: 'ng-model-compare-with',
   template: `
-    <md-form-field>
-      <md-select [ngModel]="selectedFood" (ngModelChange)="setFoodByCopy($event)"
+    <mat-form-field>
+      <mat-select [ngModel]="selectedFood" (ngModelChange)="setFoodByCopy($event)"
                  [compareWith]="comparator">
-        <md-option *ngFor="let food of foods" [value]="food">{{ food.viewValue }}</md-option>
-      </md-select>
-    </md-form-field>
+        <mat-option *ngFor="let food of foods" [value]="food">{{ food.viewValue }}</mat-option>
+      </mat-select>
+    </mat-form-field>
   `
 })
 class NgModelCompareWithSelect {
@@ -3471,8 +3478,8 @@ class NgModelCompareWithSelect {
   selectedFood: {value: string, viewValue: string} = { value: 'pizza-1', viewValue: 'Pizza' };
   comparator: ((f1: any, f2: any) => boolean)|null = this.compareByValue;
 
-  @ViewChild(MdSelect) select: MdSelect;
-  @ViewChildren(MdOption) options: QueryList<MdOption>;
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
 
   useCompareByValue() { this.comparator = this.compareByValue; }
 
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 1b164472f319..7869b73dc543 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -49,22 +49,22 @@ import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angu
 import {
   CanDisable,
   HasTabIndex,
-  MdOptgroup,
-  MdOption,
-  MdOptionSelectionChange,
+  MatOptgroup,
+  MatOption,
+  MatOptionSelectionChange,
   mixinDisabled,
   mixinTabIndex,
 } from '@angular/material/core';
-import {MdFormFieldControl} from '@angular/material/form-field';
+import {MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {fadeInContent, transformPanel} from './select-animations';
 import {
-  getMdSelectDynamicMultipleError,
-  getMdSelectNonArrayValueError,
-  getMdSelectNonFunctionValueError,
+  getMatSelectDynamicMultipleError,
+  getMatSelectNonArrayValueError,
+  getMatSelectNonFunctionValueError,
 } from './select-errors';
 
 
@@ -105,47 +105,47 @@ export const SELECT_MULTIPLE_PANEL_PADDING_X = SELECT_PANEL_PADDING_X * 1.5 + 20
 export const SELECT_PANEL_VIEWPORT_PADDING = 8;
 
 /** Injection token that determines the scroll handling while a select is open. */
-export const MD_SELECT_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-select-scroll-strategy');
+export const MAT_SELECT_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-select-scroll-strategy');
 
 /** @docs-private */
-export function MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition();
 }
 
 /** @docs-private */
-export const MD_SELECT_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_SELECT_SCROLL_STRATEGY,
+export const MAT_SELECT_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_SELECT_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 /** Change event object that is emitted when the select value has changed. */
-export class MdSelectChange {
-  constructor(public source: MdSelect, public value: any) { }
+export class MatSelectChange {
+  constructor(public source: MatSelect, public value: any) { }
 }
 
-// Boilerplate for applying mixins to MdSelect.
+// Boilerplate for applying mixins to MatSelect.
 /** @docs-private */
-export class MdSelectBase {
+export class MatSelectBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdSelectMixinBase = mixinTabIndex(mixinDisabled(MdSelectBase));
+export const _MatSelectMixinBase = mixinTabIndex(mixinDisabled(MatSelectBase));
 
 
 /**
  * Allows the user to customize the trigger that is displayed when the select has a value.
  */
 @Directive({
-  selector: 'md-select-trigger, mat-select-trigger'
+  selector: 'mat-select-trigger'
 })
-export class MdSelectTrigger {}
+export class MatSelectTrigger {}
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-select, mat-select',
+  selector: 'mat-select',
   templateUrl: 'select.html',
   styleUrls: ['select.css'],
   inputs: ['disabled', 'tabIndex'],
@@ -176,11 +176,11 @@ export class MdSelectTrigger {}
     transformPanel,
     fadeInContent
   ],
-  providers: [{provide: MdFormFieldControl, useExisting: MdSelect}],
-  exportAs: 'mdSelect, matSelect',
+  providers: [{provide: MatFormFieldControl, useExisting: MatSelect}],
+  exportAs: 'matSelect',
 })
-export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
-    ControlValueAccessor, CanDisable, HasTabIndex, MdFormFieldControl<any> {
+export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
+    ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any> {
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
@@ -221,10 +221,10 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   _triggerFontSize = 0;
 
   /** Deals with the selection logic. */
-  _selectionModel: SelectionModel<MdOption>;
+  _selectionModel: SelectionModel<MatOption>;
 
   /** Manages keyboard events for options in the panel. */
-  _keyManager: FocusKeyManager<MdOption>;
+  _keyManager: FocusKeyManager<MatOption>;
 
   /** View -> model callback called when value changes */
   _onChange: (value: any) => void = () => {};
@@ -273,15 +273,15 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   ];
 
   /**
-   * Stream that emits whenever the state of the select changes such that the wrapping `MdFormField`
-   * needs to run change detection.
+   * Stream that emits whenever the state of the select changes such that the wrapping
+   * `MatFormField` needs to run change detection.
    */
   stateChanges = new Subject<void>();
 
   /** Whether the select is focused. */
   focused = false;
 
-  /** A name for this control that can be used by `md-form-field`. */
+  /** A name for this control that can be used by `mat-form-field`. */
   controlType = 'mat-select';
 
   /** Trigger that opens the select. */
@@ -291,16 +291,16 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   @ViewChild(ConnectedOverlayDirective) overlayDir: ConnectedOverlayDirective;
 
   /** All of the defined select options. */
-  @ContentChildren(MdOption, { descendants: true }) options: QueryList<MdOption>;
+  @ContentChildren(MatOption, { descendants: true }) options: QueryList<MatOption>;
 
   /** All of the defined groups of options. */
-  @ContentChildren(MdOptgroup) optionGroups: QueryList<MdOptgroup>;
+  @ContentChildren(MatOptgroup) optionGroups: QueryList<MatOptgroup>;
 
   /** Classes to be passed to the select panel. Supports the same syntax as `ngClass`. */
   @Input() panelClass: string|string[]|Set<string>|{[key: string]: any};
 
   /** User-supplied override of the trigger element. */
-  @ContentChild(MdSelectTrigger) customTrigger: MdSelectTrigger;
+  @ContentChild(MatSelectTrigger) customTrigger: MatSelectTrigger;
 
   /** Placeholder to be shown if no value has been selected. */
   @Input()
@@ -323,7 +323,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   get multiple(): boolean { return this._multiple; }
   set multiple(value: boolean) {
     if (this._selectionModel) {
-      throw getMdSelectDynamicMultipleError();
+      throw getMatSelectDynamicMultipleError();
     }
 
     this._multiple = coerceBooleanProperty(value);
@@ -338,7 +338,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   get compareWith() { return this._compareWith; }
   set compareWith(fn: (o1: any, o2: any) => boolean) {
     if (typeof fn !== 'function') {
-      throw getMdSelectNonFunctionValueError();
+      throw getMatSelectNonFunctionValueError();
     }
     this._compareWith = fn;
     if (this._selectionModel) {
@@ -381,7 +381,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   private _id: string;
 
   /** Combined stream of all of the child options' change events. */
-  get optionSelectionChanges(): Observable<MdOptionSelectionChange> {
+  get optionSelectionChanges(): Observable<MatOptionSelectionChange> {
     return merge(...this.options.map(option => option.onSelectionChange));
   }
 
@@ -392,7 +392,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   @Output() onClose: EventEmitter<void> = new EventEmitter<void>();
 
   /** Event emitted when the selected value has been changed by the user. */
-  @Output() change: EventEmitter<MdSelectChange> = new EventEmitter<MdSelectChange>();
+  @Output() change: EventEmitter<MatSelectChange> = new EventEmitter<MatSelectChange>();
 
   /**
    * Event that emits whenever the raw value of the select changes. This is here primarily
@@ -412,7 +412,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     @Optional() private _parentFormGroup: FormGroupDirective,
     @Self() @Optional() public ngControl: NgControl,
     @Attribute('tabindex') tabIndex: string,
-    @Inject(MD_SELECT_SCROLL_STRATEGY) private _scrollStrategyFactory) {
+    @Inject(MAT_SELECT_SCROLL_STRATEGY) private _scrollStrategyFactory) {
 
     super(renderer, elementRef);
 
@@ -427,7 +427,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   }
 
   ngOnInit() {
-    this._selectionModel = new SelectionModel<MdOption>(this.multiple, undefined, false);
+    this._selectionModel = new SelectionModel<MatOption>(this.multiple, undefined, false);
     this.stateChanges.next();
   }
 
@@ -536,7 +536,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   }
 
   /** The currently selected option. */
-  get selected(): MdOption | MdOption[] {
+  get selected(): MatOption | MatOption[] {
     return this.multiple ? this._selectionModel.selected : this._selectionModel.selected[0];
   }
 
@@ -683,7 +683,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     const isArray = Array.isArray(value);
 
     if (this.multiple && value && !isArray) {
-      throw getMdSelectNonArrayValueError();
+      throw getMatSelectNonArrayValueError();
     }
 
     this._clearSelection();
@@ -708,8 +708,8 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
    * Finds and selects and option based on its value.
    * @returns Option that has the corresponding value.
    */
-  private _selectValue(value: any, isUserInput = false): MdOption | undefined {
-    const correspondingOption = this.options.find((option: MdOption) => {
+  private _selectValue(value: any, isUserInput = false): MatOption | undefined {
+    const correspondingOption = this.options.find((option: MatOption) => {
       try {
         // Treat null as a special reset value.
         return option.value != null && this._compareWith(option.value,  value);
@@ -736,7 +736,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
    * Clears the select trigger and deselects every option in the list.
    * @param skip Option that should not be deselected.
    */
-  private _clearSelection(skip?: MdOption): void {
+  private _clearSelection(skip?: MatOption): void {
     this._selectionModel.clear();
     this.options.forEach(option => {
       if (option !== skip) {
@@ -748,7 +748,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
   /** Sets up a key manager to listen to keyboard events on the overlay panel. */
   private _initKeyManager() {
-    this._keyManager = new FocusKeyManager<MdOption>(this.options).withTypeAhead();
+    this._keyManager = new FocusKeyManager<MatOption>(this.options).withTypeAhead();
     this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close());
   }
 
@@ -774,7 +774,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   }
 
   /** Invoked when an option is clicked. */
-  private _onSelect(option: MdOption): void {
+  private _onSelect(option: MatOption): void {
     const wasSelected = this._selectionModel.isSelected(option);
 
     // TODO(crisbeto): handle blank/null options inside multi-select.
@@ -833,7 +833,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
 
     this._value = valueToEmit;
     this._onChange(valueToEmit);
-    this.change.emit(new MdSelectChange(this, valueToEmit));
+    this.change.emit(new MatSelectChange(this, valueToEmit));
     this.valueChange.emit(valueToEmit);
     this._changeDetectorRef.markForCheck();
   }
@@ -880,8 +880,8 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
   }
 
   /** Gets the index of the provided option in the option list. */
-  private _getOptionIndex(option: MdOption): number | undefined {
-    return this.options.reduce((result: number, current: MdOption, index: number) => {
+  private _getOptionIndex(option: MatOption): number | undefined {
+    return this.options.reduce((result: number, current: MatOption, index: number) => {
       return result === undefined ? (option === current ? index : undefined) : result;
     }, undefined);
   }
@@ -901,7 +901,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     let selectedOptionOffset =
         this.empty ? 0 : this._getOptionIndex(this._selectionModel.selected[0])!;
 
-    selectedOptionOffset += MdOption.countGroupLabelsBeforeOption(selectedOptionOffset,
+    selectedOptionOffset += MatOption.countGroupLabelsBeforeOption(selectedOptionOffset,
         this.options, this.optionGroups);
 
     // We must maintain a scroll buffer so the selected option will be scrolled to the
@@ -1122,7 +1122,7 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
       // however the key manager only supports up/down at the moment.
       this._keyManager.onKeydown(event);
 
-      const currentActiveItem = this._keyManager.activeItem as MdOption;
+      const currentActiveItem = this._keyManager.activeItem as MatOption;
 
       if (currentActiveItem !== prevActiveItem) {
         this._clearSelection();
@@ -1137,16 +1137,16 @@ export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, On
     return this.options.length + this.optionGroups.length;
   }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   onContainerClick() {
     this.focus();
     this.open();
   }
 
-  // Implemented as part of MdFormFieldControl.
+  // Implemented as part of MatFormFieldControl.
   get shouldPlaceholderFloat() { return this._panelOpen || !this.empty; }
 }
 
diff --git a/src/lib/sidenav/README.md b/src/lib/sidenav/README.md
index 6c4e057b526c..0601c9e29ef3 100644
--- a/src/lib/sidenav/README.md
+++ b/src/lib/sidenav/README.md
@@ -1,21 +1,21 @@
-**NOTE: The <code>md-sidenav-layout</code> element is deprecated. <code>md-sidenav-container</code>
+**NOTE: The <code>mat-sidenav-layout</code> element is deprecated. <code>mat-sidenav-container</code>
 should be used instead.**
 
 
-# MdSidenav
+# MatSidenav
 
-MdSidenav is the side navigation component for Angular Material. It is composed of two components: `<md-sidenav-container>` and `<md-sidenav>`.
+MatSidenav is the side navigation component for Angular Material. It is composed of two components: `<mat-sidenav-container>` and `<mat-sidenav>`.
 
 ## Screenshots
 
 <img src="https://material.angularjs.org/material2_assets/sidenav-example.png">
 
 
-## `<md-sidenav-container>`
+## `<mat-sidenav-container>`
 
 The parent component. Contains the code necessary to coordinate one or two sidenav and the backdrop.
 
-## `<md-sidenav>`
+## `<mat-sidenav>`
 
 The sidenav panel.
 
@@ -24,7 +24,7 @@ The sidenav panel.
 | Name | Type | Description |
 | --- | --- | --- |
 | `position` | `"start"\|"end"` | The position of this sidenav. In LTR direction, `"start"` will be shown on the left, `"end"` on the right. In RTL, it is reversed. `"start"` is used by default. If there is more than 1 sidenav on either side the container will be considered invalid and none of the sidenavs will be visible or toggleable until the container is valid again. |
-| `mode` | `"over"\|"push"\|"side"` | The mode or styling of the sidenav, default being `"over"`. With `"over"` the sidenav will appear above the content, and a backdrop will be shown. With `"push"` the sidenav will push the content of the `<md-sidenav-container>` to the side, and show a backdrop over it. `"side"` will resize the content and keep the sidenav opened. Clicking the backdrop will close sidenavs that do not have `mode="side"`. |
+| `mode` | `"over"\|"push"\|"side"` | The mode or styling of the sidenav, default being `"over"`. With `"over"` the sidenav will appear above the content, and a backdrop will be shown. With `"push"` the sidenav will push the content of the `<mat-sidenav-container>` to the side, and show a backdrop over it. `"side"` will resize the content and keep the sidenav opened. Clicking the backdrop will close sidenavs that do not have `mode="side"`. |
 | `opened` | `boolean` | Whether or not the sidenav is opened. Use this binding to open/close the sidenav. |
 
 ### Events
@@ -46,10 +46,10 @@ The sidenav panel.
 
 ### Notes
 
-The `<md-sidenav>` will resize based on its content. You can also set its width in CSS, like so:
+The `<mat-sidenav>` will resize based on its content. You can also set its width in CSS, like so:
 
 ```css
-md-sidenav {
+mat-sidenav {
   width: 200px;
 }
 ```
@@ -62,38 +62,38 @@ Here's a simple example of using the sidenav:
 
 ```html
 <app>
-  <md-sidenav-container>
-    <md-sidenav #start (open)="closeStartButton.focus()">
+  <mat-sidenav-container>
+    <mat-sidenav #start (open)="closeStartButton.focus()">
       Start Sidenav.
       <br>
-      <button md-button #closeStartButton (click)="start.close()">Close</button>
-    </md-sidenav>
-    <md-sidenav #end position="end">
+      <button mat-button #closeStartButton (click)="start.close()">Close</button>
+    </mat-sidenav>
+    <mat-sidenav #end position="end">
       End Sidenav.
-      <button md-button (click)="end.close()">Close</button>
-    </md-sidenav>
+      <button mat-button (click)="end.close()">Close</button>
+    </mat-sidenav>
 
     My regular content. This will be moved into the proper DOM at runtime.
-    <button md-button (click)="start.open()">Open start sidenav</button>
-    <button md-button (click)="end.open()">Open end sidenav</button>
+    <button mat-button (click)="start.open()">Open start sidenav</button>
+    <button mat-button (click)="end.open()">Open end sidenav</button>
 
-  </md-sidenav-container>
+  </mat-sidenav-container>
 </app>
 ```
 
 For a fullscreen sidenav, the recommended approach is set up the DOM such that the
-`md-sidenav-container` can naturally take up the full space:
+`mat-sidenav-container` can naturally take up the full space:
 
 ```html
 <app>
-  <md-sidenav-container>
-    <md-sidenav mode="side" opened="true">Drawer content</md-sidenav>
+  <mat-sidenav-container>
+    <mat-sidenav mode="side" opened="true">Drawer content</mat-sidenav>
     <div class="my-content">Main content</div>
-  </md-sidenav-container>
+  </mat-sidenav-container>
 </app>
 ```
 ```css
-html, body, material-app, md-sidenav-container, .my-content {
+html, body, material-app, mat-sidenav-container, .my-content {
   margin: 0;
   width: 100%;
   height: 100%;
@@ -105,10 +105,10 @@ outside of the scrollable region and absolutely position it.
 
 ```html
 <app>
-  <md-sidenav-container class="my-container">
-    <md-sidenav mode="side" opened="true">
-      <button md-mini-fab class="my-fab">
-        <md-icon>add</md-icon>
+  <mat-sidenav-container class="my-container">
+    <mat-sidenav mode="side" opened="true">
+      <button mat-mini-fab class="my-fab">
+        <mat-icon>add</mat-icon>
       </button>
       <div class="my-scrolling-content">
         Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus,
@@ -121,9 +121,9 @@ outside of the scrollable region and absolutely position it.
         tristique vehicula nibh ipsum vivamus, proin proin. Porta commodo nibh quis libero amet.
         Taciti dui, sapien consectetuer.
       </div>
-    </md-sidenav>
-    <button md-mini-fab class="my-fab">
-      <md-icon>add</md-icon>
+    </mat-sidenav>
+    <button mat-mini-fab class="my-fab">
+      <mat-icon>add</mat-icon>
     </button>
     <div class="my-scrolling-content">
       Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus, fusce
@@ -136,7 +136,7 @@ outside of the scrollable region and absolutely position it.
       ipsum vivamus, proin proin. Porta commodo nibh quis libero amet. Taciti dui, sapien
       consectetuer.
     </div>
-  </md-sidenav-container>
+  </mat-sidenav-container>
 </app>
 ```
 ```css
@@ -150,7 +150,7 @@ outside of the scrollable region and absolutely position it.
 }
 
 .my-container .mat-sidenav-content,
-.my-container md-sidenav {
+.my-container mat-sidenav {
   display: flex;
 }
 
diff --git a/src/lib/sidenav/drawer-container.html b/src/lib/sidenav/drawer-container.html
index a7f8457f08ca..94c6cafa8034 100644
--- a/src/lib/sidenav/drawer-container.html
+++ b/src/lib/sidenav/drawer-container.html
@@ -1,10 +1,10 @@
 <div class="mat-drawer-backdrop" (click)="_onBackdropClicked()"
      [class.mat-drawer-shown]="_isShowingBackdrop()"></div>
 
-<ng-content select="md-drawer, mat-drawer"></ng-content>
+<ng-content select="mat-drawer"></ng-content>
 
-<ng-content select="md-drawer-content, mat-drawer-content">
+<ng-content select="mat-drawer-content">
 </ng-content>
-<md-drawer-content *ngIf="!_content">
+<mat-drawer-content *ngIf="!_content">
   <ng-content></ng-content>
-</md-drawer-content>
+</mat-drawer-content>
diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index d3efaa66d351..b21b71284195 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -22,7 +22,7 @@ $mat-drawer-over-drawer-z-index: 4;
 
 .mat-drawer-container {
   // We need a stacking context here so that the backdrop and drawers are clipped to the
-  // MdDrawerContainer. This creates a new z-index stack so we use low numbered z-indices.
+  // MatDrawerContainer. This creates a new z-index stack so we use low numbered z-indices.
   // We create another stacking context in the '.mat-drawer-content' and in each drawer so that
   // the application content does not get messed up with our own CSS.
   @include mat-drawer-stacking-context();
diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index d858a6a2d8a1..d5e36955528a 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -2,17 +2,17 @@ import {fakeAsync, async, tick, ComponentFixture, TestBed} from '@angular/core/t
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdDrawer, MdSidenavModule, MdDrawerContainer} from './index';
+import {MatDrawer, MatSidenavModule, MatDrawerContainer} from './index';
 import {A11yModule} from '@angular/cdk/a11y';
 import {PlatformModule} from '@angular/cdk/platform';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 
 
-describe('MdDrawer', () => {
+describe('MatDrawer', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSidenavModule, A11yModule, PlatformModule, NoopAnimationsModule],
+      imports: [MatSidenavModule, A11yModule, PlatformModule, NoopAnimationsModule],
       declarations: [
         BasicTestApp,
         DrawerContainerNoDrawerTestApp,
@@ -33,7 +33,7 @@ describe('MdDrawer', () => {
       fixture.detectChanges();
 
       let testComponent: BasicTestApp = fixture.debugElement.componentInstance;
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer));
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer));
       let drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
 
       fixture.debugElement.query(By.css('.open')).nativeElement.click();
@@ -110,7 +110,7 @@ describe('MdDrawer', () => {
       fixture.detectChanges();
 
       let testComponent: BasicTestApp = fixture.debugElement.componentInstance;
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer));
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer));
 
       drawer.componentInstance.open();
       fixture.detectChanges();
@@ -129,7 +129,7 @@ describe('MdDrawer', () => {
     it('should not close by pressing escape when disableClose is set', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicTestApp);
       let testComponent = fixture.debugElement.componentInstance;
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer));
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer));
 
       drawer.componentInstance.disableClose = true;
       drawer.componentInstance.open();
@@ -146,7 +146,7 @@ describe('MdDrawer', () => {
     it('should not close by clicking on the backdrop when disableClose is set', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicTestApp);
       let testComponent = fixture.debugElement.componentInstance;
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer)).componentInstance;
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer)).componentInstance;
 
       drawer.disableClose = true;
       drawer.open();
@@ -165,7 +165,7 @@ describe('MdDrawer', () => {
 
       fixture.detectChanges();
 
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer)).componentInstance;
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer)).componentInstance;
       let openButton = fixture.componentInstance.openButton.nativeElement;
       let drawerButton = fixture.componentInstance.drawerButton.nativeElement;
 
@@ -185,8 +185,8 @@ describe('MdDrawer', () => {
 
     it('should not restore focus on close if focus is outside drawer', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicTestApp);
-      let drawer: MdDrawer = fixture.debugElement
-          .query(By.directive(MdDrawer)).componentInstance;
+      let drawer: MatDrawer = fixture.debugElement
+          .query(By.directive(MatDrawer)).componentInstance;
       let openButton = fixture.componentInstance.openButton.nativeElement;
       let closeButton = fixture.componentInstance.closeButton.nativeElement;
 
@@ -212,9 +212,9 @@ describe('MdDrawer', () => {
 
       fixture.detectChanges();
 
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer)).componentInstance;
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer)).componentInstance;
 
-      expect((drawer as MdDrawer).opened).toBe(false);
+      expect((drawer as MatDrawer).opened).toBe(false);
     });
 
     it('should correctly parse opened="true"', () => {
@@ -222,16 +222,16 @@ describe('MdDrawer', () => {
 
       fixture.detectChanges();
 
-      let drawer = fixture.debugElement.query(By.directive(MdDrawer)).componentInstance;
+      let drawer = fixture.debugElement.query(By.directive(MatDrawer)).componentInstance;
 
-      expect((drawer as MdDrawer).opened).toBe(true);
+      expect((drawer as MatDrawer).opened).toBe(true);
     });
 
     it('should remove align attr from DOM', () => {
       const fixture = TestBed.createComponent(BasicTestApp);
       fixture.detectChanges();
 
-      const drawerEl = fixture.debugElement.query(By.css('md-drawer')).nativeElement;
+      const drawerEl = fixture.debugElement.query(By.css('mat-drawer')).nativeElement;
       expect(drawerEl.hasAttribute('align'))
           .toBe(false, 'Expected drawer not to have a native align attribute.');
     });
@@ -262,14 +262,14 @@ describe('MdDrawer', () => {
   describe('focus trapping behavior', () => {
     let fixture: ComponentFixture<DrawerWitFocusableElements>;
     let testComponent: DrawerWitFocusableElements;
-    let drawer: MdDrawer;
+    let drawer: MatDrawer;
     let firstFocusableElement: HTMLElement;
     let lastFocusableElement: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(DrawerWitFocusableElements);
       testComponent = fixture.debugElement.componentInstance;
-      drawer = fixture.debugElement.query(By.directive(MdDrawer)).componentInstance;
+      drawer = fixture.debugElement.query(By.directive(MatDrawer)).componentInstance;
       firstFocusableElement = fixture.debugElement.query(By.css('.link1')).nativeElement;
       lastFocusableElement = fixture.debugElement.query(By.css('.link1')).nativeElement;
       lastFocusableElement.focus();
@@ -310,10 +310,10 @@ describe('MdDrawer', () => {
   });
 });
 
-describe('MdDrawerContainer', () => {
+describe('MatDrawerContainer', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSidenavModule, A11yModule, PlatformModule, NoopAnimationsModule],
+      imports: [MatSidenavModule, A11yModule, PlatformModule, NoopAnimationsModule],
       declarations: [DrawerContainerTwoDrawerTestApp, DrawerDelayed],
     });
 
@@ -327,7 +327,7 @@ describe('MdDrawerContainer', () => {
 
     const testComponent: DrawerContainerTwoDrawerTestApp =
       fixture.debugElement.componentInstance;
-    const drawers = fixture.debugElement.queryAll(By.directive(MdDrawer));
+    const drawers = fixture.debugElement.queryAll(By.directive(MatDrawer));
 
     expect(drawers.every(drawer => drawer.componentInstance.opened)).toBe(false);
 
@@ -366,34 +366,34 @@ describe('MdDrawerContainer', () => {
 });
 
 
-/** Test component that contains an MdDrawerContainer but no MdDrawer. */
-@Component({template: `<md-drawer-container></md-drawer-container>`})
+/** Test component that contains an MatDrawerContainer but no MatDrawer. */
+@Component({template: `<mat-drawer-container></mat-drawer-container>`})
 class DrawerContainerNoDrawerTestApp { }
 
-/** Test component that contains an MdDrawerContainer and 2 MdDrawer in the same position. */
+/** Test component that contains an MatDrawerContainer and 2 MatDrawer in the same position. */
 @Component({
   template: `
-    <md-drawer-container>
-      <md-drawer position="start"></md-drawer>
-      <md-drawer position="end"></md-drawer>
-    </md-drawer-container>`,
+    <mat-drawer-container>
+      <mat-drawer position="start"></mat-drawer>
+      <mat-drawer position="end"></mat-drawer>
+    </mat-drawer-container>`,
 })
 class DrawerContainerTwoDrawerTestApp {
-  @ViewChild(MdDrawerContainer) drawerContainer: MdDrawerContainer;
+  @ViewChild(MatDrawerContainer) drawerContainer: MatDrawerContainer;
 }
 
-/** Test component that contains an MdDrawerContainer and one MdDrawer. */
+/** Test component that contains an MatDrawerContainer and one MatDrawer. */
 @Component({
   template: `
-    <md-drawer-container (backdropClick)="backdropClicked()">
-      <md-drawer #drawer position="start"
+    <mat-drawer-container (backdropClick)="backdropClicked()">
+      <mat-drawer #drawer position="start"
                  (open)="open()"
                  (close)="close()">
         <button #drawerButton>Content.</button>
-      </md-drawer>
+      </mat-drawer>
       <button (click)="drawer.open()" class="open" #openButton></button>
       <button (click)="drawer.close()" class="close" #closeButton></button>
-    </md-drawer-container>`,
+    </mat-drawer-container>`,
 })
 class BasicTestApp {
   openCount: number = 0;
@@ -419,30 +419,30 @@ class BasicTestApp {
 
 @Component({
   template: `
-    <md-drawer-container>
-      <md-drawer #drawer mode="side" opened="false">
+    <mat-drawer-container>
+      <mat-drawer #drawer mode="side" opened="false">
         Closed Drawer.
-      </md-drawer>
-    </md-drawer-container>`,
+      </mat-drawer>
+    </mat-drawer-container>`,
 })
 class DrawerSetToOpenedFalse { }
 
 @Component({
   template: `
-    <md-drawer-container>
-      <md-drawer #drawer mode="side" opened="true">
+    <mat-drawer-container>
+      <mat-drawer #drawer mode="side" opened="true">
         Closed Drawer.
-      </md-drawer>
-    </md-drawer-container>`,
+      </mat-drawer>
+    </mat-drawer-container>`,
 })
 class DrawerSetToOpenedTrue { }
 
 @Component({
   template: `
-    <md-drawer-container>
-      <md-drawer #drawer1 [position]="drawer1Position"></md-drawer>
-      <md-drawer #drawer2 [position]="drawer2Position"></md-drawer>
-    </md-drawer-container>`,
+    <mat-drawer-container>
+      <mat-drawer #drawer1 [position]="drawer1Position"></mat-drawer>
+      <mat-drawer #drawer2 [position]="drawer2Position"></mat-drawer>
+    </mat-drawer-container>`,
 })
 class DrawerDynamicPosition {
   drawer1Position = 'start';
@@ -451,12 +451,12 @@ class DrawerDynamicPosition {
 
 @Component({
   template: `
-    <md-drawer-container>
-      <md-drawer position="start" [mode]="mode">
+    <mat-drawer-container>
+      <mat-drawer position="start" [mode]="mode">
         <a class="link1" href="#">link1</a>
-      </md-drawer>
+      </mat-drawer>
       <a class="link2" href="#">link2</a>
-    </md-drawer-container>`,
+    </mat-drawer-container>`,
 })
 class DrawerWitFocusableElements {
   mode: string = 'over';
@@ -465,12 +465,12 @@ class DrawerWitFocusableElements {
 
 @Component({
   template: `
-    <md-drawer-container>
-      <md-drawer *ngIf="showDrawer" #drawer mode="side">Drawer</md-drawer>
-    </md-drawer-container>
+    <mat-drawer-container>
+      <mat-drawer *ngIf="showDrawer" #drawer mode="side">Drawer</mat-drawer>
+    </mat-drawer-container>
   `,
 })
 class DrawerDelayed {
-  @ViewChild(MdDrawer) drawer: MdDrawer;
+  @ViewChild(MatDrawer) drawer: MatDrawer;
   showDrawer = false;
 }
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 3d306303fac0..9cf024098eb5 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -40,8 +40,8 @@ import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 
 
-/** Throws an exception when two MdDrawer are matching the same position. */
-export function throwMdDuplicatedDrawerError(position: string) {
+/** Throws an exception when two MatDrawer are matching the same position. */
+export function throwMatDuplicatedDrawerError(position: string) {
   throw Error(`A drawer was already declared for 'position="${position}"'`);
 }
 
@@ -50,14 +50,14 @@ export function throwMdDuplicatedDrawerError(position: string) {
  * Drawer toggle promise result.
  * @deprecated
  */
-export class MdDrawerToggleResult {
+export class MatDrawerToggleResult {
   constructor(public type: 'open' | 'close', public animationFinished: boolean) {}
 }
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-drawer-content, mat-drawer-content',
+  selector: 'mat-drawer-content',
   template: '<ng-content></ng-content>',
   host: {
     'class': 'mat-drawer-content',
@@ -68,7 +68,7 @@ export class MdDrawerToggleResult {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdDrawerContent implements AfterContentInit {
+export class MatDrawerContent implements AfterContentInit {
   /**
    * Margins to be applied to the content. These are used to push / shrink the drawer content when a
    * drawer is open. We use margin rather than transform even for push mode because transform breaks
@@ -78,7 +78,7 @@ export class MdDrawerContent implements AfterContentInit {
 
   constructor(
       private _changeDetectorRef: ChangeDetectorRef,
-      @Inject(forwardRef(() => MdDrawerContainer)) private _container: MdDrawerContainer) {
+      @Inject(forwardRef(() => MatDrawerContainer)) private _container: MatDrawerContainer) {
   }
 
   ngAfterContentInit() {
@@ -91,7 +91,7 @@ export class MdDrawerContent implements AfterContentInit {
 
 
 /**
- * <md-drawer> component.
+ * <mat-drawer> component.
  *
  * This component corresponds to a drawer that can be opened on the drawer container.
  *
@@ -99,7 +99,7 @@ export class MdDrawerContent implements AfterContentInit {
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-drawer, mat-drawer',
+  selector: 'mat-drawer',
   template: '<ng-content></ng-content>',
   animations: [
     trigger('transform', [
@@ -133,7 +133,7 @@ export class MdDrawerContent implements AfterContentInit {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdDrawer implements AfterContentInit, OnDestroy {
+export class MatDrawer implements AfterContentInit, OnDestroy {
   private _focusTrap: FocusTrap;
   private _elementFocusedBeforeDrawerWasOpened: HTMLElement | null = null;
 
@@ -191,13 +191,13 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
    * compatibility and should be removed next time we do drawer breaking changes.
    * @deprecated
    */
-  private _currentTogglePromise: Promise<MdDrawerToggleResult> | null;
+  private _currentTogglePromise: Promise<MatDrawerToggleResult> | null;
 
   /** Event emitted when the drawer is fully opened. */
-  @Output('open') onOpen = new EventEmitter<MdDrawerToggleResult | void>();
+  @Output('open') onOpen = new EventEmitter<MatDrawerToggleResult | void>();
 
   /** Event emitted when the drawer is fully closed. */
-  @Output('close') onClose = new EventEmitter<MdDrawerToggleResult | void>();
+  @Output('close') onClose = new EventEmitter<MatDrawerToggleResult | void>();
 
   /** Event emitted when the drawer's position changes. */
   @Output('positionChanged') onPositionChanged = new EventEmitter<void>();
@@ -273,12 +273,12 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
 
 
   /** Open the drawer. */
-  open(): Promise<MdDrawerToggleResult> {
+  open(): Promise<MatDrawerToggleResult> {
     return this.toggle(true);
   }
 
   /** Close the drawer. */
-  close(): Promise<MdDrawerToggleResult> {
+  close(): Promise<MatDrawerToggleResult> {
     return this.toggle(false);
   }
 
@@ -286,7 +286,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
    * Toggle this drawer.
    * @param isOpen Whether the drawer should be open.
    */
-  toggle(isOpen: boolean = !this.opened): Promise<MdDrawerToggleResult> {
+  toggle(isOpen: boolean = !this.opened): Promise<MatDrawerToggleResult> {
     if (!this._isAnimating) {
       this._opened = isOpen;
 
@@ -330,9 +330,9 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
     const {fromState, toState} = event;
 
     if (toState === 'open' && fromState === 'void') {
-      this.onOpen.emit(new MdDrawerToggleResult('open', true));
+      this.onOpen.emit(new MatDrawerToggleResult('open', true));
     } else if (toState === 'void' && fromState === 'open') {
-      this.onClose.emit(new MdDrawerToggleResult('close', true));
+      this.onClose.emit(new MatDrawerToggleResult('close', true));
     }
 
     // Note: as of Angular 4.3, the animations module seems to fire the `start` callback before
@@ -351,14 +351,14 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
 
 
 /**
- * <md-drawer-container> component.
+ * <mat-drawer-container> component.
  *
- * This is the parent component to one or two <md-drawer>s that validates the state internally
+ * This is the parent component to one or two <mat-drawer>s that validates the state internally
  * and coordinates the backdrop and content styling.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-drawer-container, mat-drawer-container',
+  selector: 'mat-drawer-container',
   templateUrl: 'drawer-container.html',
   styleUrls: [
     'drawer.css',
@@ -371,10 +371,10 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdDrawerContainer implements AfterContentInit, OnDestroy {
-  @ContentChildren(MdDrawer) _drawers: QueryList<MdDrawer>;
+export class MatDrawerContainer implements AfterContentInit, OnDestroy {
+  @ContentChildren(MatDrawer) _drawers: QueryList<MatDrawer>;
 
-  @ContentChild(MdDrawerContent) _content: MdDrawerContent;
+  @ContentChild(MatDrawerContent) _content: MatDrawerContent;
 
   /** The drawer child with the `start` position. */
   get start() { return this._start; }
@@ -386,8 +386,8 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   @Output() backdropClick = new EventEmitter<void>();
 
   /** The drawer at the start/end position, independent of direction. */
-  private _start: MdDrawer | null;
-  private _end: MdDrawer | null;
+  private _start: MatDrawer | null;
+  private _end: MatDrawer | null;
 
   /**
    * The drawer at the left/right. When direction changes, these will change as well.
@@ -395,8 +395,8 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
    * In LTR, _left == _start and _right == _end.
    * In RTL, _left == _end and _right == _start.
    */
-  private _left: MdDrawer | null;
-  private _right: MdDrawer | null;
+  private _left: MatDrawer | null;
+  private _right: MatDrawer | null;
 
   /** Subscription to the Directionality change EventEmitter. */
   private _dirChangeSubscription = Subscription.EMPTY;
@@ -416,7 +416,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   ngAfterContentInit() {
     startWith.call(this._drawers.changes, null).subscribe(() => {
       this._validateDrawers();
-      this._drawers.forEach((drawer: MdDrawer) => {
+      this._drawers.forEach((drawer: MatDrawer) => {
         this._watchDrawerToggle(drawer);
         this._watchDrawerPosition(drawer);
         this._watchDrawerMode(drawer);
@@ -443,7 +443,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
    * drawer is open and the backdrop is visible. This ensures any overflow on the container element
    * is properly hidden.
    */
-  private _watchDrawerToggle(drawer: MdDrawer): void {
+  private _watchDrawerToggle(drawer: MatDrawer): void {
     takeUntil.call(drawer._animationStarted, this._drawers.changes).subscribe(() => {
       // Set the transition class on the container so that the animations occur. This should not
       // be set initially because animations should only be triggered via a change in state.
@@ -462,7 +462,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
    * Subscribes to drawer onPositionChanged event in order to re-validate drawers when the position
    * changes.
    */
-  private _watchDrawerPosition(drawer: MdDrawer): void {
+  private _watchDrawerPosition(drawer: MatDrawer): void {
     if (!drawer) {
       return;
     }
@@ -476,7 +476,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
   }
 
   /** Subscribes to changes in drawer mode so we can run change detection. */
-  private _watchDrawerMode(drawer: MdDrawer): void {
+  private _watchDrawerMode(drawer: MatDrawer): void {
     if (drawer) {
       takeUntil.call(drawer._modeChanged, this._drawers.changes).subscribe(() => {
         this._updateContentMargins();
@@ -485,7 +485,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
     }
   }
 
-  /** Toggles the 'mat-drawer-opened' class on the main 'md-drawer-container' element. */
+  /** Toggles the 'mat-drawer-opened' class on the main 'mat-drawer-container' element. */
   private _setContainerClass(isAdd: boolean): void {
     if (isAdd) {
       this._renderer.addClass(this._element.nativeElement, 'mat-drawer-opened');
@@ -502,12 +502,12 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
     this._drawers.forEach(drawer => {
       if (drawer.position == 'end') {
         if (this._end != null) {
-          throwMdDuplicatedDrawerError('end');
+          throwMatDuplicatedDrawerError('end');
         }
         this._end = drawer;
       } else {
         if (this._start != null) {
-          throwMdDuplicatedDrawerError('start');
+          throwMatDuplicatedDrawerError('start');
         }
         this._start = drawer;
       }
@@ -542,7 +542,7 @@ export class MdDrawerContainer implements AfterContentInit, OnDestroy {
         || (this._isDrawerOpen(this._end) && this._end!.mode != 'side');
   }
 
-  private _isDrawerOpen(drawer: MdDrawer | null): boolean {
+  private _isDrawerOpen(drawer: MatDrawer | null): boolean {
     return drawer != null && drawer.opened;
   }
 
diff --git a/src/lib/sidenav/mat-exports.ts b/src/lib/sidenav/mat-exports.ts
deleted file mode 100644
index 6257189d29bd..000000000000
--- a/src/lib/sidenav/mat-exports.ts
+++ /dev/null
@@ -1,19 +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 {MdDrawer, MdDrawerContainer, MdDrawerToggleResult} from './drawer';
-import {MdSidenav, MdSidenavContainer} from './sidenav';
-import {MdSidenavModule} from './sidenav-module';
-
-
-export {MdDrawerToggleResult as MatDrawerToggleResult};
-export {MdDrawer as MatDrawer};
-export {MdDrawerContainer as MatDrawerContainer};
-export {MdSidenav as MatSidenav};
-export {MdSidenavContainer as MatSidenavContainer};
-export {MdSidenavModule as MatSidenavModule};
diff --git a/src/lib/sidenav/public_api.ts b/src/lib/sidenav/public_api.ts
index 7b5e4bfa1b28..2c05f01f99eb 100644
--- a/src/lib/sidenav/public_api.ts
+++ b/src/lib/sidenav/public_api.ts
@@ -9,4 +9,4 @@
 export * from './sidenav-module';
 export * from './drawer';
 export * from './sidenav';
-export * from './mat-exports';
+
diff --git a/src/lib/sidenav/sidenav-container.html b/src/lib/sidenav/sidenav-container.html
index 7068bbdf4382..64aca5a79217 100644
--- a/src/lib/sidenav/sidenav-container.html
+++ b/src/lib/sidenav/sidenav-container.html
@@ -1,10 +1,10 @@
 <div class="mat-drawer-backdrop" (click)="_onBackdropClicked()"
      [class.mat-drawer-shown]="_isShowingBackdrop()"></div>
 
-<ng-content select="md-sidenav, mat-sidenav"></ng-content>
+<ng-content select="mat-sidenav"></ng-content>
 
-<ng-content select="md-sidenav-content, mat-sidenav-content">
+<ng-content select="mat-sidenav-content">
 </ng-content>
-<md-sidenav-content *ngIf="!_content">
+<mat-sidenav-content *ngIf="!_content">
   <ng-content></ng-content>
-</md-sidenav-content>
+</mat-sidenav-content>
diff --git a/src/lib/sidenav/sidenav-module.ts b/src/lib/sidenav/sidenav-module.ts
index 577f9205826c..8d9ac0b7df05 100644
--- a/src/lib/sidenav/sidenav-module.ts
+++ b/src/lib/sidenav/sidenav-module.ts
@@ -10,29 +10,29 @@ import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MdDrawer, MdDrawerContainer, MdDrawerContent} from './drawer';
-import {MdSidenav, MdSidenavContainer, MdSidenavContent} from './sidenav';
+import {MatCommonModule} from '@angular/material/core';
+import {MatDrawer, MatDrawerContainer, MatDrawerContent} from './drawer';
+import {MatSidenav, MatSidenavContainer, MatSidenavContent} from './sidenav';
 
 
 @NgModule({
-  imports: [CommonModule, MdCommonModule, A11yModule, OverlayModule],
+  imports: [CommonModule, MatCommonModule, A11yModule, OverlayModule],
   exports: [
-    MdCommonModule,
-    MdDrawer,
-    MdDrawerContainer,
-    MdDrawerContent,
-    MdSidenav,
-    MdSidenavContainer,
-    MdSidenavContent,
+    MatCommonModule,
+    MatDrawer,
+    MatDrawerContainer,
+    MatDrawerContent,
+    MatSidenav,
+    MatSidenavContainer,
+    MatSidenavContent,
   ],
   declarations: [
-    MdDrawer,
-    MdDrawerContainer,
-    MdDrawerContent,
-    MdSidenav,
-    MdSidenavContainer,
-    MdSidenavContent,
+    MatDrawer,
+    MatDrawerContainer,
+    MatDrawerContent,
+    MatSidenav,
+    MatSidenavContainer,
+    MatSidenavContent,
   ],
 })
-export class MdSidenavModule {}
+export class MatSidenavModule {}
diff --git a/src/lib/sidenav/sidenav.md b/src/lib/sidenav/sidenav.md
index ab3a2527c32d..7260c637fd71 100644
--- a/src/lib/sidenav/sidenav.md
+++ b/src/lib/sidenav/sidenav.md
@@ -1,21 +1,21 @@
-`<md-sidenav>` is a panel that can be placed next to or above some primary content. A sidenav is
+`<mat-sidenav>` is a panel that can be placed next to or above some primary content. A sidenav is
 typically used for navigation, but can contain any content.
 
 <!-- example(sidenav-overview) -->
 
-The sidenav and its associated content live inside of an `<md-sidenav-container>`:
+The sidenav and its associated content live inside of an `<mat-sidenav-container>`:
 ```html
-<md-sidenav-container>
-  <md-sidenav>
+<mat-sidenav-container>
+  <mat-sidenav>
     <!-- sidenav content -->
-  </md-sidenav>
+  </mat-sidenav>
 
   <!-- primary content -->
-</md-sidenav-container>
+</mat-sidenav-container>
 ```
 
-A sidenav container may contain one or two `<md-sidenav>` elements. When there are two 
-`<md-sidenav>` elements, each must be placed on a different side of the container.
+A sidenav container may contain one or two `<mat-sidenav>` elements. When there are two 
+`<mat-sidenav>` elements, each must be placed on a different side of the container.
 See the section on positioning below.
 
 ### Sidenav mode
@@ -37,11 +37,11 @@ appears at the start of the container.
 
 
 ### Sizing the sidenav
-The `<md-sidenav>` will, by default, fit the size of its content. The width can be explicitly set
+The `<mat-sidenav>` will, by default, fit the size of its content. The width can be explicitly set
 via CSS:
 
 ```css
-md-sidenav {
+mat-sidenav {
   width: 200px;
 }
 ```
@@ -49,18 +49,18 @@ md-sidenav {
 Try to avoid percent based width as `resize` events are not (yet) supported.
 
 For a fullscreen sidenav, the recommended approach is set up the DOM such that the
-`<md-sidenav-container>` can naturally take up the full space:
+`<mat-sidenav-container>` can naturally take up the full space:
 
 ```html
 <app>
-  <md-sidenav-container>
-    <md-sidenav mode="side" opened="true">Drawer content</md-sidenav>
+  <mat-sidenav-container>
+    <mat-sidenav mode="side" opened="true">Drawer content</mat-sidenav>
     <div class="my-content">Main content</div>
-  </md-sidenav-container>
+  </mat-sidenav-container>
 </app>
 ```
 ```css
-html, body, material-app, md-sidenav-container, .my-content {
+html, body, material-app, mat-sidenav-container, .my-content {
   margin: 0;
   width: 100%;
   height: 100%;
@@ -74,11 +74,11 @@ outside of the scrollable region and absolutely position it.
 
 ### Disabling closing of sidenav
 By default, sidenav can be closed either by clicking on the backdrop or by pressing <kbd>ESCAPE</kbd>.
-The `disableClose` attribute can be set on `md-sidenav` to disable automatic closing when the backdrop
+The `disableClose` attribute can be set on `mat-sidenav` to disable automatic closing when the backdrop
 is clicked or <kbd>ESCAPE</kbd> is pressed. To add custom logic on backdrop click, add a `(backdropClick)` listener to
-`md-sidenav-container`. For custom <kbd>ESCAPE</kbd> logic, a standard `(keydown)` listener will suffice.
+`mat-sidenav-container`. For custom <kbd>ESCAPE</kbd> logic, a standard `(keydown)` listener will suffice.
 ```html
-<md-sidenav-container (backdropClick)="customBackdropClickHandler()">
-  <md-sidenav disableClose (keydown)="customKeydownHandler($event)"></md-sidenav>
-</md-sidenav-container>
+<mat-sidenav-container (backdropClick)="customBackdropClickHandler()">
+  <mat-sidenav disableClose (keydown)="customKeydownHandler($event)"></mat-sidenav>
+</mat-sidenav-container>
 ```
\ No newline at end of file
diff --git a/src/lib/sidenav/sidenav.spec.ts b/src/lib/sidenav/sidenav.spec.ts
index 0de4571a2638..dc84d1c00ae9 100644
--- a/src/lib/sidenav/sidenav.spec.ts
+++ b/src/lib/sidenav/sidenav.spec.ts
@@ -1,17 +1,17 @@
 import {Component} from '@angular/core';
 import {async, TestBed, ComponentFixture} from '@angular/core/testing';
-import {MdSidenav, MdSidenavModule} from './index';
+import {MatSidenav, MatSidenavModule} from './index';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {By} from '@angular/platform-browser';
 
 
-describe('MdSidenav', () => {
+describe('MatSidenav', () => {
   let fixture: ComponentFixture<SidenavWithFixedPosition>;
   let sidenavEl: HTMLElement;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSidenavModule, NoopAnimationsModule],
+      imports: [MatSidenavModule, NoopAnimationsModule],
       declarations: [SidenavWithFixedPosition],
     });
 
@@ -20,7 +20,7 @@ describe('MdSidenav', () => {
     fixture = TestBed.createComponent(SidenavWithFixedPosition);
     fixture.detectChanges();
 
-    sidenavEl = fixture.debugElement.query(By.directive(MdSidenav)).nativeElement;
+    sidenavEl = fixture.debugElement.query(By.directive(MatSidenav)).nativeElement;
   }));
 
   it('should be fixed position when in fixed mode', () => {
@@ -47,18 +47,18 @@ describe('MdSidenav', () => {
 
 @Component({
   template: `
-    <md-sidenav-container>
-      <md-sidenav
+    <mat-sidenav-container>
+      <mat-sidenav
           #drawer
           [fixedInViewport]="fixed"
           [fixedTopGap]="fixedTop"
           [fixedBottomGap]="fixedBottom">
         Drawer.
-      </md-sidenav>
-      <md-sidenav-content>
+      </mat-sidenav>
+      <mat-sidenav-content>
         Some content.
-      </md-sidenav-content>
-    </md-sidenav-container>`,
+      </mat-sidenav-content>
+    </mat-sidenav-container>`,
 })
 class SidenavWithFixedPosition {
   fixed = true;
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index aff0a5b25137..3a7e6bdacf18 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -12,14 +12,14 @@ import {
   ContentChildren, forwardRef, Inject, Input,
   ViewEncapsulation
 } from '@angular/core';
-import {MdDrawer, MdDrawerContainer, MdDrawerContent} from './drawer';
+import {MatDrawer, MatDrawerContainer, MatDrawerContent} from './drawer';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-sidenav-content, mat-sidenav-content',
+  selector: 'mat-sidenav-content',
   template: '<ng-content></ng-content>',
   host: {
     'class': 'mat-drawer-content mat-sidenav-content',
@@ -30,10 +30,10 @@ import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdSidenavContent extends MdDrawerContent {
+export class MatSidenavContent extends MatDrawerContent {
   constructor(
       changeDetectorRef: ChangeDetectorRef,
-      @Inject(forwardRef(() => MdSidenavContainer)) container: MdSidenavContainer) {
+      @Inject(forwardRef(() => MatSidenavContainer)) container: MatSidenavContainer) {
     super(changeDetectorRef, container);
   }
 }
@@ -41,7 +41,7 @@ export class MdSidenavContent extends MdDrawerContent {
 
 @Component({
   moduleId: module.id,
-  selector: 'md-sidenav, mat-sidenav',
+  selector: 'mat-sidenav',
   template: '<ng-content></ng-content>',
   animations: [
     trigger('transform', [
@@ -78,7 +78,7 @@ export class MdSidenavContent extends MdDrawerContent {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdSidenav extends MdDrawer {
+export class MatSidenav extends MatDrawer {
   /** Whether the sidenav is fixed in the viewport. */
   @Input()
   get fixedInViewport() { return this._fixedInViewport; }
@@ -107,7 +107,7 @@ export class MdSidenav extends MdDrawer {
 
 @Component({
   moduleId: module.id,
-  selector: 'md-sidenav-container, mat-sidenav-container',
+  selector: 'mat-sidenav-container',
   templateUrl: 'sidenav-container.html',
   styleUrls: [
     'drawer.css',
@@ -120,8 +120,8 @@ export class MdSidenav extends MdDrawer {
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdSidenavContainer extends MdDrawerContainer {
-  @ContentChildren(MdSidenav) _drawers;
+export class MatSidenavContainer extends MatDrawerContainer {
+  @ContentChildren(MatSidenav) _drawers;
 
-  @ContentChild(MdSidenavContent) _content;
+  @ContentChild(MatSidenavContent) _content;
 }
diff --git a/src/lib/slide-toggle/mat-exports.ts b/src/lib/slide-toggle/mat-exports.ts
deleted file mode 100644
index 3772ee2c686b..000000000000
--- a/src/lib/slide-toggle/mat-exports.ts
+++ /dev/null
@@ -1,22 +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 {
-  MD_SLIDE_TOGGLE_VALUE_ACCESSOR,
-  MdSlideToggle,
-  MdSlideToggleBase,
-  MdSlideToggleChange,
-} from './slide-toggle';
-import {MdSlideToggleModule} from './slide-toggle-module';
-
-
-export {MD_SLIDE_TOGGLE_VALUE_ACCESSOR as MAT_SLIDE_TOGGLE_VALUE_ACCESSOR};
-export {MdSlideToggle as MatSlideToggle};
-export {MdSlideToggleBase as MatSlideToggleBase};
-export {MdSlideToggleChange as MatSlideToggleChange};
-export {MdSlideToggleModule as MatSlideToggleModule};
diff --git a/src/lib/slide-toggle/public_api.ts b/src/lib/slide-toggle/public_api.ts
index 31a809696319..f668652b5c9c 100644
--- a/src/lib/slide-toggle/public_api.ts
+++ b/src/lib/slide-toggle/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './slide-toggle-module';
 export * from './slide-toggle';
-export * from './mat-exports';
+
diff --git a/src/lib/slide-toggle/slide-toggle-module.ts b/src/lib/slide-toggle/slide-toggle-module.ts
index 218e6c36b121..7c5ee84151b3 100644
--- a/src/lib/slide-toggle/slide-toggle-module.ts
+++ b/src/lib/slide-toggle/slide-toggle-module.ts
@@ -11,20 +11,20 @@ import {PlatformModule} from '@angular/cdk/platform';
 import {NgModule} from '@angular/core';
 import {
   GestureConfig,
-  MdCommonModule,
-  MdRippleModule,
+  MatCommonModule,
+  MatRippleModule,
 } from '@angular/material/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
 import {A11yModule} from '@angular/cdk/a11y';
-import {MdSlideToggle} from './slide-toggle';
+import {MatSlideToggle} from './slide-toggle';
 
 
 @NgModule({
-  imports: [MdRippleModule, MdCommonModule, PlatformModule, ObserversModule, A11yModule],
-  exports: [MdSlideToggle, MdCommonModule],
-  declarations: [MdSlideToggle],
+  imports: [MatRippleModule, MatCommonModule, PlatformModule, ObserversModule, A11yModule],
+  exports: [MatSlideToggle, MatCommonModule],
+  declarations: [MatSlideToggle],
   providers: [
     {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}
   ],
 })
-export class MdSlideToggleModule {}
+export class MatSlideToggleModule {}
diff --git a/src/lib/slide-toggle/slide-toggle.md b/src/lib/slide-toggle/slide-toggle.md
index 7f0ffc79fb52..e3d24b600564 100644
--- a/src/lib/slide-toggle/slide-toggle.md
+++ b/src/lib/slide-toggle/slide-toggle.md
@@ -1,14 +1,14 @@
-`<md-slide-toggle>` is an on/off control that can be toggled via clicking or dragging. 
+`<mat-slide-toggle>` is an on/off control that can be toggled via clicking or dragging. 
 
 <!-- example(slide-toggle-overview) -->
 
 The slide-toggle behaves similarly to a checkbox, though it does not support an `indeterminate` 
-state like `<md-checkbox>`.
+state like `<mat-checkbox>`.
 
 _Note: the sliding behavior for this component requires that HammerJS is loaded on the page._
 
 ### Slide-toggle label
-The slide-toggle label is provided as the content to the `<md-slide-toggle>` element. 
+The slide-toggle label is provided as the content to the `<mat-slide-toggle>` element. 
 
 If you don't want the label to appear next to the slide-toggle, you can use 
 [`aria-label`](https://www.w3.org/TR/wai-aria/states_and_properties#aria-label) or 
@@ -16,17 +16,17 @@ If you don't want the label to appear next to the slide-toggle, you can use
 specify an appropriate label.
 
 ### Use with `@angular/forms`
-`<md-slide-toggle>` is compatible with `@angular/forms` and supports both `FormsModule` 
+`<mat-slide-toggle>` is compatible with `@angular/forms` and supports both `FormsModule` 
 and `ReactiveFormsModule`.
 
 ### Theming
-The color of a `<md-slide-toggle>` can be changed by using the `color` property. By default, 
+The color of a `<mat-slide-toggle>` can be changed by using the `color` property. By default, 
 slide-toggles use the theme's accent color. This can be changed to `'primary'` or `'warn'`.  
 
 ### Accessibility
-The `<md-slide-toggle>` uses an internal `<input type="checkbox">` to provide an accessible
+The `<mat-slide-toggle>` uses an internal `<input type="checkbox">` to provide an accessible
 experience. This internal checkbox receives focus and is automatically labelled by the text content
-of the `<md-slide-toggle>` element.
+of the `<mat-slide-toggle>` element.
 
 Slide toggles without text or labels should be given a meaningful label via `aria-label` or
 `aria-labelledby`.
diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index 14794ab96555..bf50e88ec225 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -5,17 +5,17 @@ import {
   flushMicrotasks
 } from '@angular/core/testing';
 import {NgModel, FormsModule, ReactiveFormsModule, FormControl} from '@angular/forms';
-import {MdSlideToggle, MdSlideToggleChange, MdSlideToggleModule} from './index';
+import {MatSlideToggle, MatSlideToggleChange, MatSlideToggleModule} from './index';
 import {TestGestureConfig} from '../slider/test-gesture-config';
 import {dispatchFakeEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
 
-describe('MdSlideToggle without forms', () => {
+describe('MatSlideToggle without forms', () => {
   let gestureConfig: TestGestureConfig;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSlideToggleModule],
+      imports: [MatSlideToggleModule],
       declarations: [
         SlideToggleBasic,
         SlideToggleWithTabindexAttr,
@@ -33,7 +33,7 @@ describe('MdSlideToggle without forms', () => {
     let fixture: ComponentFixture<any>;
 
     let testComponent: SlideToggleBasic;
-    let slideToggle: MdSlideToggle;
+    let slideToggle: MatSlideToggle;
     let slideToggleElement: HTMLElement;
     let labelElement: HTMLLabelElement;
     let inputElement: HTMLInputElement;
@@ -50,7 +50,7 @@ describe('MdSlideToggle without forms', () => {
       // Initialize the slide-toggle component, by triggering the first change detection cycle.
       fixture.detectChanges();
 
-      const slideToggleDebug = fixture.debugElement.query(By.css('md-slide-toggle'));
+      const slideToggleDebug = fixture.debugElement.query(By.css('mat-slide-toggle'));
 
       testComponent = fixture.debugElement.componentInstance;
       slideToggle = slideToggleDebug.componentInstance;
@@ -180,7 +180,7 @@ describe('MdSlideToggle without forms', () => {
       fixture.detectChanges();
 
       // Once the id binding is set to null, the id property should auto-generate a unique id.
-      expect(inputElement.id).toMatch(/md-slide-toggle-\d+-input/);
+      expect(inputElement.id).toMatch(/mat-slide-toggle-\d+-input/);
     });
 
     it('should forward the tabIndex to the underlying input', () => {
@@ -248,7 +248,7 @@ describe('MdSlideToggle without forms', () => {
     }));
 
     it('should support subscription on the change observable', () => {
-      slideToggle.change.subscribe((event: MdSlideToggleChange) => {
+      slideToggle.change.subscribe((event: MatSlideToggleChange) => {
         expect(event.checked).toBe(true);
       });
 
@@ -344,7 +344,7 @@ describe('MdSlideToggle without forms', () => {
       fixture.detectChanges();
 
       const slideToggle = fixture.debugElement
-        .query(By.directive(MdSlideToggle)).componentInstance as MdSlideToggle;
+        .query(By.directive(MatSlideToggle)).componentInstance as MatSlideToggle;
 
       expect(slideToggle.tabIndex)
         .toBe(5, 'Expected tabIndex property to have been set based on the native attribute');
@@ -355,7 +355,7 @@ describe('MdSlideToggle without forms', () => {
     let fixture: ComponentFixture<any>;
 
     let testComponent: SlideToggleBasic;
-    let slideToggle: MdSlideToggle;
+    let slideToggle: MatSlideToggle;
     let slideToggleElement: HTMLElement;
     let slideThumbContainer: HTMLElement;
     let inputElement: HTMLInputElement;
@@ -364,7 +364,7 @@ describe('MdSlideToggle without forms', () => {
       fixture = TestBed.createComponent(SlideToggleBasic);
       fixture.detectChanges();
 
-      const slideToggleDebug = fixture.debugElement.query(By.css('md-slide-toggle'));
+      const slideToggleDebug = fixture.debugElement.query(By.css('mat-slide-toggle'));
       const thumbContainerDebug = slideToggleDebug
           .query(By.css('.mat-slide-toggle-thumb-container'));
 
@@ -507,7 +507,7 @@ describe('MdSlideToggle without forms', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(SlideToggleWithoutLabel);
 
-      const slideToggleDebugEl = fixture.debugElement.query(By.directive(MdSlideToggle));
+      const slideToggleDebugEl = fixture.debugElement.query(By.directive(MatSlideToggle));
 
       testComponent = fixture.componentInstance;
       slideToggleElement = slideToggleDebugEl.nativeElement;
@@ -555,11 +555,11 @@ describe('MdSlideToggle without forms', () => {
   });
 });
 
-describe('MdSlideToggle with forms', () => {
+describe('MatSlideToggle with forms', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSlideToggleModule, FormsModule, ReactiveFormsModule],
+      imports: [MatSlideToggleModule, FormsModule, ReactiveFormsModule],
       declarations: [
         SlideToggleWithForm,
         SlideToggleWithModel,
@@ -574,7 +574,7 @@ describe('MdSlideToggle with forms', () => {
     let fixture: ComponentFixture<SlideToggleWithModel>;
 
     let testComponent: SlideToggleWithModel;
-    let slideToggle: MdSlideToggle;
+    let slideToggle: MatSlideToggle;
     let slideToggleElement: HTMLElement;
     let slideToggleModel: NgModel;
     let inputElement: HTMLInputElement;
@@ -585,7 +585,7 @@ describe('MdSlideToggle with forms', () => {
       fixture = TestBed.createComponent(SlideToggleWithModel);
       fixture.detectChanges();
 
-      const slideToggleDebug = fixture.debugElement.query(By.directive(MdSlideToggle));
+      const slideToggleDebug = fixture.debugElement.query(By.directive(MatSlideToggle));
 
       testComponent = fixture.debugElement.componentInstance;
       slideToggle = slideToggleDebug.componentInstance;
@@ -681,7 +681,7 @@ describe('MdSlideToggle with forms', () => {
 
     it('should update checked state on click if control is checked initially', fakeAsync(() => {
       fixture = TestBed.createComponent(SlideToggleWithModel);
-      slideToggle = fixture.debugElement.query(By.directive(MdSlideToggle)).componentInstance;
+      slideToggle = fixture.debugElement.query(By.directive(MatSlideToggle)).componentInstance;
       labelElement = fixture.debugElement.query(By.css('label')).nativeElement;
 
       fixture.componentInstance.modelValue = true;
@@ -710,7 +710,7 @@ describe('MdSlideToggle with forms', () => {
       fixture.componentInstance.modelValue = true;
       fixture.detectChanges();
 
-      const debugElement = fixture.debugElement.query(By.directive(MdSlideToggle));
+      const debugElement = fixture.debugElement.query(By.directive(MatSlideToggle));
       const modelInstance = debugElement.injector.get<NgModel>(NgModel);
 
       // Flush the microtasks because the forms module updates the model state asynchronously.
@@ -724,7 +724,7 @@ describe('MdSlideToggle with forms', () => {
     let fixture: ComponentFixture<SlideToggleWithFormControl>;
 
     let testComponent: SlideToggleWithFormControl;
-    let slideToggle: MdSlideToggle;
+    let slideToggle: MatSlideToggle;
     let inputElement: HTMLInputElement;
 
     beforeEach(() => {
@@ -732,7 +732,7 @@ describe('MdSlideToggle with forms', () => {
       fixture.detectChanges();
 
       testComponent = fixture.debugElement.componentInstance;
-      slideToggle = fixture.debugElement.query(By.directive(MdSlideToggle)).componentInstance;
+      slideToggle = fixture.debugElement.query(By.directive(MatSlideToggle)).componentInstance;
       inputElement = fixture.debugElement.query(By.css('input')).nativeElement;
     });
 
@@ -799,7 +799,7 @@ describe('MdSlideToggle with forms', () => {
 
 @Component({
   template: `
-    <md-slide-toggle [required]="isRequired"
+    <mat-slide-toggle [required]="isRequired"
                      [disabled]="isDisabled"
                      [color]="slideColor"
                      [id]="slideId"
@@ -813,7 +813,7 @@ describe('MdSlideToggle with forms', () => {
                      (change)="onSlideChange($event)"
                      (click)="onSlideClick($event)">
       <span>Test Slide Toggle</span>
-    </md-slide-toggle>`,
+    </mat-slide-toggle>`,
 })
 class SlideToggleBasic {
   isDisabled: boolean = false;
@@ -826,17 +826,17 @@ class SlideToggleBasic {
   slideLabel: string | null;
   slideLabelledBy: string | null;
   slideTabindex: number;
-  lastEvent: MdSlideToggleChange;
+  lastEvent: MatSlideToggleChange;
   labelPosition: string;
 
   onSlideClick: (event?: Event) => void = () => {};
-  onSlideChange = (event: MdSlideToggleChange) => this.lastEvent = event;
+  onSlideChange = (event: MatSlideToggleChange) => this.lastEvent = event;
 }
 
 @Component({
   template: `
     <form ngNativeValidate (ngSubmit)="isSubmitted = true">
-      <md-slide-toggle name="slide" ngModel [required]="isRequired">Required</md-slide-toggle>
+      <mat-slide-toggle name="slide" ngModel [required]="isRequired">Required</mat-slide-toggle>
       <button type="submit"></button>
     </form>`
 })
@@ -846,7 +846,7 @@ class SlideToggleWithForm {
 }
 
 @Component({
-  template: `<md-slide-toggle [(ngModel)]="modelValue"></md-slide-toggle>`
+  template: `<mat-slide-toggle [(ngModel)]="modelValue"></mat-slide-toggle>`
 })
 class SlideToggleWithModel {
   modelValue = false;
@@ -854,21 +854,21 @@ class SlideToggleWithModel {
 
 @Component({
   template: `
-    <md-slide-toggle [formControl]="formControl">
+    <mat-slide-toggle [formControl]="formControl">
       <span>Test Slide Toggle</span>
-    </md-slide-toggle>`,
+    </mat-slide-toggle>`,
 })
 class SlideToggleWithFormControl {
   formControl = new FormControl();
 }
 
 @Component({
-  template: `<md-slide-toggle tabindex="5"></md-slide-toggle>`
+  template: `<mat-slide-toggle tabindex="5"></mat-slide-toggle>`
 })
 class SlideToggleWithTabindexAttr {}
 
 @Component({
-  template: `<md-slide-toggle>{{label}}</md-slide-toggle>`
+  template: `<mat-slide-toggle>{{label}}</mat-slide-toggle>`
 })
 class SlideToggleWithoutLabel {
   label: string;
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 114bf16e3184..1bd02ed5ed40 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -31,8 +31,7 @@ import {
   CanDisableRipple,
   HammerInput,
   HasTabIndex,
-  MATERIAL_COMPATIBILITY_MODE,
-  MdRipple,
+  MatRipple,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
@@ -45,30 +44,30 @@ import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 // Increasing integer for generating unique ids for slide-toggle components.
 let nextUniqueId = 0;
 
-export const MD_SLIDE_TOGGLE_VALUE_ACCESSOR: any = {
+export const MAT_SLIDE_TOGGLE_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdSlideToggle),
+  useExisting: forwardRef(() => MatSlideToggle),
   multi: true
 };
 
-/** Change event object emitted by a MdSlideToggle. */
-export class MdSlideToggleChange {
-  source: MdSlideToggle;
+/** Change event object emitted by a MatSlideToggle. */
+export class MatSlideToggleChange {
+  source: MatSlideToggle;
   checked: boolean;
 }
 
-// Boilerplate for applying mixins to MdSlideToggle.
+// Boilerplate for applying mixins to MatSlideToggle.
 /** @docs-private */
-export class MdSlideToggleBase {
+export class MatSlideToggleBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdSlideToggleMixinBase =
-  mixinTabIndex(mixinColor(mixinDisableRipple(mixinDisabled(MdSlideToggleBase)), 'accent'));
+export const _MatSlideToggleMixinBase =
+  mixinTabIndex(mixinColor(mixinDisableRipple(mixinDisabled(MatSlideToggleBase)), 'accent'));
 
 /** Represents a slidable "switch" toggle that can be moved between on and off. */
 @Component({
   moduleId: module.id,
-  selector: 'md-slide-toggle, mat-slide-toggle',
+  selector: 'mat-slide-toggle',
   host: {
     'class': 'mat-slide-toggle',
     '[id]': 'id',
@@ -78,20 +77,19 @@ export const _MdSlideToggleMixinBase =
   },
   templateUrl: 'slide-toggle.html',
   styleUrls: ['slide-toggle.css'],
-  providers: [MD_SLIDE_TOGGLE_VALUE_ACCESSOR],
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
+  providers: [MAT_SLIDE_TOGGLE_VALUE_ACCESSOR],
   inputs: ['disabled', 'disableRipple', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy, AfterContentInit,
+export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestroy, AfterContentInit,
     ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple {
 
   private onChange = (_: any) => {};
   private onTouched = () => {};
 
-  private _uniqueId: string = `md-slide-toggle-${++nextUniqueId}`;
+  private _uniqueId: string = `mat-slide-toggle-${++nextUniqueId}`;
   private _slideRenderer: SlideToggleRenderer;
   private _required: boolean = false;
   private _checked: boolean = false;
@@ -129,7 +127,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
     this._changeDetectorRef.markForCheck();
   }
   /** An event will be dispatched each time the slide-toggle changes its value. */
-  @Output() change: EventEmitter<MdSlideToggleChange> = new EventEmitter<MdSlideToggleChange>();
+  @Output() change: EventEmitter<MatSlideToggleChange> = new EventEmitter<MatSlideToggleChange>();
 
   /** Returns the unique id for the visual hidden input. */
   get inputId(): string { return `${this.id || this._uniqueId}-input`; }
@@ -138,7 +136,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
   @ViewChild('input') _inputElement: ElementRef;
 
   /** Reference to the ripple directive on the thumb container. */
-  @ViewChild(MdRipple) _ripple: MdRipple;
+  @ViewChild(MatRipple) _ripple: MatRipple;
 
   constructor(elementRef: ElementRef,
               renderer: Renderer2,
@@ -250,7 +248,7 @@ export class MdSlideToggle extends _MdSlideToggleMixinBase implements OnDestroy,
    * Emits a change event on the `change` output. Also notifies the FormControl about the change.
    */
   private _emitChangeEvent() {
-    let event = new MdSlideToggleChange();
+    let event = new MatSlideToggleChange();
     event.source = this;
     event.checked = this.checked;
     this.change.emit(event);
diff --git a/src/lib/slider/mat-exports.ts b/src/lib/slider/mat-exports.ts
deleted file mode 100644
index 99bad0cf9260..000000000000
--- a/src/lib/slider/mat-exports.ts
+++ /dev/null
@@ -1,22 +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 {
-  MD_SLIDER_VALUE_ACCESSOR,
-  MdSlider,
-  MdSliderBase,
-  MdSliderChange,
-} from './slider';
-import {MdSliderModule} from './slider-module';
-
-
-export {MD_SLIDER_VALUE_ACCESSOR as MAT_SLIDER_VALUE_ACCESSOR};
-export {MdSlider as MatSlider};
-export {MdSliderBase as MatSliderBase};
-export {MdSliderChange as MatSliderChange};
-export {MdSliderModule as MatSliderModule};
diff --git a/src/lib/slider/public_api.ts b/src/lib/slider/public_api.ts
index 96bbf656a58d..b448421096c6 100644
--- a/src/lib/slider/public_api.ts
+++ b/src/lib/slider/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './slider-module';
 export * from './slider';
-export * from './mat-exports';
+
diff --git a/src/lib/slider/slider-module.ts b/src/lib/slider/slider-module.ts
index 979859b91a12..64f6679adb4f 100644
--- a/src/lib/slider/slider-module.ts
+++ b/src/lib/slider/slider-module.ts
@@ -10,15 +10,15 @@ import {A11yModule} from '@angular/cdk/a11y';
 import {BidiModule} from '@angular/cdk/bidi';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {GestureConfig, MdCommonModule} from '@angular/material/core';
+import {GestureConfig, MatCommonModule} from '@angular/material/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {MdSlider} from './slider';
+import {MatSlider} from './slider';
 
 
 @NgModule({
-  imports: [CommonModule, MdCommonModule, BidiModule, A11yModule],
-  exports: [MdSlider, MdCommonModule],
-  declarations: [MdSlider],
+  imports: [CommonModule, MatCommonModule, BidiModule, A11yModule],
+  exports: [MatSlider, MatCommonModule],
+  declarations: [MatSlider],
   providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
 })
-export class MdSliderModule {}
+export class MatSliderModule {}
diff --git a/src/lib/slider/slider.md b/src/lib/slider/slider.md
index d64fb7daf111..9c0dac948c67 100644
--- a/src/lib/slider/slider.md
+++ b/src/lib/slider/slider.md
@@ -1,4 +1,4 @@
-`<md-slider>` allows for the selection of a value from a range via mouse, touch, or keyboard, 
+`<mat-slider>` allows for the selection of a value from a range via mouse, touch, or keyboard, 
 similar to `<input type="range">`.
 
 <!-- example(slider-overview) -->
@@ -12,7 +12,7 @@ in increments of `1`. These values can be changed by setting the `min`, `max`, a
 respectively. The initial value is set to the minimum value unless otherwise specified.
 
 ```html
-<md-slider min="1" max="5" step="0.5" value="1.5"></md-slider>
+<mat-slider min="1" max="5" step="0.5" value="1.5"></mat-slider>
 ```
 
 ### Orientation
@@ -22,7 +22,7 @@ right. The `vertical` attribute can be added to a slider to make it vertical wit
 on bottom and the maximum value on top.
 
 ```html
-<md-slider vertical></md-slider>
+<mat-slider vertical></mat-slider>
 ```
 
 An `invert` attribute is also available which can be specified to flip the axis that the thumb moves
@@ -31,7 +31,7 @@ on the left, while an inverted vertical slider will have the minimum value on to
 value on bottom.
 
 ```html
-<md-slider invert></md-slider>
+<mat-slider invert></mat-slider>
 ```
 
 ### Thumb label
@@ -43,7 +43,7 @@ The [Material Design spec](https://material.google.com/components/sliders.html)
 discrete value (such as a 1-5 rating).
 
 ```html
-<md-slider thumbLabel tickInterval="1"></md-slider>
+<mat-slider thumbLabel tickInterval="1"></mat-slider>
 ```
 
 ### Tick marks
@@ -53,14 +53,14 @@ of steps between between ticks. For example a `tickInterval` of `3` with a `step
 tick marks at every `3` steps, which is the same as every `12` values.
 
 ```html
-<md-slider step="4" tickInterval="3"></md-slider>
+<mat-slider step="4" tickInterval="3"></mat-slider>
 ```
 
 The `tickInterval` can also be set to `auto` which will automatically choose the number of steps
 such that there is at least `30px` of space between ticks.
 
 ```html
-<md-slider tickInterval="auto"></md-slider>
+<mat-slider tickInterval="auto"></mat-slider>
 ```
 
 The slider will always show a tick at the beginning and end of the track. If the remaining space
diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index 72e0ef7d9a06..c8afaa626383 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -15,16 +15,16 @@ import {Component, DebugElement, ViewChild} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {MdSlider, MdSliderModule} from './index';
+import {MatSlider, MatSliderModule} from './index';
 import {TestGestureConfig} from './test-gesture-config';
 
 
-describe('MdSlider without forms', () => {
+describe('MatSlider without forms', () => {
   let gestureConfig: TestGestureConfig;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSliderModule, ReactiveFormsModule, FormsModule, BidiModule],
+      imports: [MatSliderModule, ReactiveFormsModule, FormsModule, BidiModule],
       declarations: [
         StandardSlider,
         DisabledSlider,
@@ -56,7 +56,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<StandardSlider>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let trackFillElement: HTMLElement;
     let sliderWrapperElement: HTMLElement;
 
@@ -64,7 +64,7 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(StandardSlider);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderInstance = sliderDebugElement.componentInstance;
 
@@ -186,14 +186,14 @@ describe('MdSlider without forms', () => {
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
     let sliderWrapperElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let trackFillElement: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(DisabledSlider);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
       sliderInstance = sliderDebugElement.componentInstance;
@@ -247,7 +247,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithMinAndMax>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let trackFillElement: HTMLElement;
     let ticksContainerElement: HTMLElement;
@@ -258,10 +258,10 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithMinAndMax);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       testComponent = fixture.debugElement.componentInstance;
       sliderNativeElement = sliderDebugElement.nativeElement;
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
       trackFillElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-track-fill');
       ticksContainerElement =
@@ -347,16 +347,16 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithValue>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(SliderWithValue);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
     });
 
@@ -385,7 +385,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithStep>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let trackFillElement: HTMLElement;
 
@@ -393,9 +393,9 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithStep);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
       trackFillElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-track-fill');
     });
@@ -467,7 +467,7 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithAutoTickInterval);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       ticksContainerElement =
           <HTMLElement>sliderNativeElement.querySelector('.mat-slider-ticks-container');
@@ -497,7 +497,7 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithSetTickInterval);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       ticksContainerElement =
           <HTMLElement>sliderNativeElement.querySelector('.mat-slider-ticks-container');
@@ -532,7 +532,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithThumbLabel>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let thumbLabelTextElement: Element;
 
@@ -540,7 +540,7 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithThumbLabel);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderInstance = sliderDebugElement.componentInstance;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
@@ -576,7 +576,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithOneWayBinding>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let testComponent: SliderWithOneWayBinding;
     let trackFillElement: HTMLElement;
@@ -587,9 +587,9 @@ describe('MdSlider without forms', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
       trackFillElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-track-fill');
     });
@@ -612,7 +612,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithValueSmallerThanMin>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let trackFillElement: HTMLElement;
 
@@ -620,7 +620,7 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithValueSmallerThanMin);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderInstance = sliderDebugElement.componentInstance;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
@@ -642,7 +642,7 @@ describe('MdSlider without forms', () => {
     let fixture: ComponentFixture<SliderWithValueSmallerThanMin>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let trackFillElement: HTMLElement;
 
@@ -650,7 +650,7 @@ describe('MdSlider without forms', () => {
       fixture = TestBed.createComponent(SliderWithValueGreaterThanMax);
       fixture.detectChanges();
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderInstance = sliderDebugElement.componentInstance;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
@@ -683,7 +683,7 @@ describe('MdSlider without forms', () => {
       spyOn(testComponent, 'onChange');
       spyOn(testComponent, 'onInput');
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
     });
@@ -756,7 +756,7 @@ describe('MdSlider without forms', () => {
       spyOn(testComponent, 'onInput');
       spyOn(testComponent, 'onChange');
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
     });
@@ -796,7 +796,7 @@ describe('MdSlider without forms', () => {
     let sliderNativeElement: HTMLElement;
     let sliderWrapperElement: HTMLElement;
     let testComponent: SliderWithChangeHandler;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(SliderWithChangeHandler);
@@ -806,10 +806,10 @@ describe('MdSlider without forms', () => {
       spyOn(testComponent, 'onInput');
       spyOn(testComponent, 'onChange');
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
     });
 
     it('should increment slider by 1 on up arrow pressed', () => {
@@ -936,7 +936,7 @@ describe('MdSlider without forms', () => {
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
     let sliderWrapperElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let testComponent: SliderWithDirAndInvert;
 
     beforeEach(() => {
@@ -944,8 +944,8 @@ describe('MdSlider without forms', () => {
       fixture.detectChanges();
 
       testComponent = fixture.debugElement.componentInstance;
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
     });
@@ -1079,7 +1079,7 @@ describe('MdSlider without forms', () => {
     let sliderNativeElement: HTMLElement;
     let sliderWrapperElement: HTMLElement;
     let trackFillElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let testComponent: VerticalSlider;
 
     beforeEach(() => {
@@ -1087,8 +1087,8 @@ describe('MdSlider without forms', () => {
       fixture.detectChanges();
 
       testComponent = fixture.debugElement.componentInstance;
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderNativeElement = sliderDebugElement.nativeElement;
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
       trackFillElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-track-fill');
@@ -1138,12 +1138,12 @@ describe('MdSlider without forms', () => {
   });
 });
 
-describe('MdSlider with forms module', () => {
+describe('MatSlider with forms module', () => {
   let gestureConfig: TestGestureConfig;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSliderModule, ReactiveFormsModule, FormsModule, BidiModule],
+      imports: [MatSliderModule, ReactiveFormsModule, FormsModule, BidiModule],
       declarations: [
         SliderWithFormControl,
         SliderWithNgModel,
@@ -1163,7 +1163,7 @@ describe('MdSlider with forms module', () => {
     let fixture: ComponentFixture<SliderWithNgModel>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let testComponent: SliderWithNgModel;
 
@@ -1173,9 +1173,9 @@ describe('MdSlider with forms module', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
     });
 
@@ -1211,7 +1211,7 @@ describe('MdSlider with forms module', () => {
     let fixture: ComponentFixture<SliderWithFormControl>;
     let sliderDebugElement: DebugElement;
     let sliderNativeElement: HTMLElement;
-    let sliderInstance: MdSlider;
+    let sliderInstance: MatSlider;
     let sliderWrapperElement: HTMLElement;
     let testComponent: SliderWithFormControl;
 
@@ -1221,9 +1221,9 @@ describe('MdSlider with forms module', () => {
 
       testComponent = fixture.debugElement.componentInstance;
 
-      sliderDebugElement = fixture.debugElement.query(By.directive(MdSlider));
+      sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
       sliderNativeElement = sliderDebugElement.nativeElement;
-      sliderInstance = sliderDebugElement.injector.get<MdSlider>(MdSlider);
+      sliderInstance = sliderDebugElement.injector.get<MatSlider>(MatSlider);
       sliderWrapperElement = <HTMLElement>sliderNativeElement.querySelector('.mat-slider-wrapper');
     });
 
@@ -1320,19 +1320,19 @@ const styles = `
 `;
 
 @Component({
-  template: `<md-slider></md-slider>`,
+  template: `<mat-slider></mat-slider>`,
   styles: [styles],
 })
 class StandardSlider { }
 
 @Component({
-  template: `<md-slider disabled></md-slider>`,
+  template: `<mat-slider disabled></mat-slider>`,
   styles: [styles],
 })
 class DisabledSlider { }
 
 @Component({
-  template: `<md-slider [min]="min" [max]="max" tickInterval="6"></md-slider>`,
+  template: `<mat-slider [min]="min" [max]="max" tickInterval="6"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithMinAndMax {
@@ -1341,13 +1341,13 @@ class SliderWithMinAndMax {
 }
 
 @Component({
-  template: `<md-slider value="26"></md-slider>`,
+  template: `<mat-slider value="26"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithValue { }
 
 @Component({
-  template: `<md-slider [step]="step"></md-slider>`,
+  template: `<mat-slider [step]="step"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithStep {
@@ -1355,13 +1355,13 @@ class SliderWithStep {
 }
 
 @Component({
-  template: `<md-slider step="5" tickInterval="auto"></md-slider>`,
+  template: `<mat-slider step="5" tickInterval="auto"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithAutoTickInterval { }
 
 @Component({
-  template: `<md-slider step="3" [tickInterval]="tickInterval"></md-slider>`,
+  template: `<mat-slider step="3" [tickInterval]="tickInterval"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithSetTickInterval {
@@ -1369,13 +1369,13 @@ class SliderWithSetTickInterval {
 }
 
 @Component({
-  template: `<md-slider thumbLabel></md-slider>`,
+  template: `<mat-slider thumbLabel></mat-slider>`,
   styles: [styles],
 })
 class SliderWithThumbLabel { }
 
 @Component({
-  template: `<md-slider [value]="val"></md-slider>`,
+  template: `<mat-slider [value]="val"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithOneWayBinding {
@@ -1383,7 +1383,7 @@ class SliderWithOneWayBinding {
 }
 
 @Component({
-  template: `<md-slider [formControl]="control"></md-slider>`,
+  template: `<mat-slider [formControl]="control"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithFormControl {
@@ -1391,7 +1391,7 @@ class SliderWithFormControl {
 }
 
 @Component({
-  template: `<md-slider [(ngModel)]="val"></md-slider>`,
+  template: `<mat-slider [(ngModel)]="val"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithNgModel {
@@ -1399,30 +1399,30 @@ class SliderWithNgModel {
 }
 
 @Component({
-  template: `<md-slider value="3" min="4" max="6"></md-slider>`,
+  template: `<mat-slider value="3" min="4" max="6"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithValueSmallerThanMin { }
 
 @Component({
-  template: `<md-slider value="7" min="4" max="6"></md-slider>`,
+  template: `<mat-slider value="7" min="4" max="6"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithValueGreaterThanMax { }
 
 @Component({
-  template: `<md-slider (change)="onChange($event)" (input)="onInput($event)"></md-slider>`,
+  template: `<mat-slider (change)="onChange($event)" (input)="onInput($event)"></mat-slider>`,
   styles: [styles],
 })
 class SliderWithChangeHandler {
   onChange() { }
   onInput() { }
 
-  @ViewChild(MdSlider) slider: MdSlider;
+  @ViewChild(MatSlider) slider: MatSlider;
 }
 
 @Component({
-  template: `<div [dir]="dir"><md-slider [invert]="invert" tickInterval="5"></md-slider></div>`,
+  template: `<div [dir]="dir"><mat-slider [invert]="invert" tickInterval="5"></mat-slider></div>`,
   styles: [styles],
 })
 class SliderWithDirAndInvert {
@@ -1431,7 +1431,7 @@ class SliderWithDirAndInvert {
 }
 
 @Component({
-  template: `<md-slider vertical [invert]="invert"></md-slider>`,
+  template: `<mat-slider vertical [invert]="invert"></mat-slider>`,
   styles: [styles],
 })
 class VerticalSlider {
@@ -1441,7 +1441,7 @@ class VerticalSlider {
 /**
  * Dispatches a click event sequence (consisting of moueseenter, click) from an element.
  * Note: The mouse event truncates the position for the click.
- * @param sliderElement The md-slider element from which the event will be dispatched.
+ * @param sliderElement The mat-slider element from which the event will be dispatched.
  * @param percentage The percentage of the slider where the click should occur. Used to find the
  * physical location of the click.
  */
@@ -1457,7 +1457,7 @@ function dispatchClickEventSequence(sliderElement: HTMLElement, percentage: numb
 
 /**
  * Dispatches a slide event sequence (consisting of slidestart, slide, slideend) from an element.
- * @param sliderElement The md-slider element from which the event will be dispatched.
+ * @param sliderElement The mat-slider element from which the event will be dispatched.
  * @param startPercent The percentage of the slider where the slide will begin.
  * @param endPercent The percentage of the slider where the slide will end.
  * @param gestureConfig The gesture config for the test to handle emitting the slide events.
@@ -1473,7 +1473,7 @@ function dispatchSlideEventSequence(sliderElement: HTMLElement, startPercent: nu
 
 /**
  * Dispatches a slide event from an element.
- * @param sliderElement The md-slider element from which the event will be dispatched.
+ * @param sliderElement The mat-slider element from which the event will be dispatched.
  * @param percent The percentage of the slider where the slide will happen.
  * @param gestureConfig The gesture config for the test to handle emitting the slide events.
  */
@@ -1492,7 +1492,7 @@ function dispatchSlideEvent(sliderElement: HTMLElement, percent: number,
 
 /**
  * Dispatches a slidestart event from an element.
- * @param sliderElement The md-slider element from which the event will be dispatched.
+ * @param sliderElement The mat-slider element from which the event will be dispatched.
  * @param percent The percentage of the slider where the slide will begin.
  * @param gestureConfig The gesture config for the test to handle emitting the slide events.
  */
@@ -1513,7 +1513,7 @@ function dispatchSlideStartEvent(sliderElement: HTMLElement, percent: number,
 
 /**
  * Dispatches a slideend event from an element.
- * @param sliderElement The md-slider element from which the event will be dispatched.
+ * @param sliderElement The mat-slider element from which the event will be dispatched.
  * @param percent The percentage of the slider where the slide will end.
  * @param gestureConfig The gesture config for the test to handle emitting the slide events.
  */
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 25dda65e0354..e3d2a838327a 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -61,31 +61,31 @@ const MIN_VALUE_NONACTIVE_THUMB_GAP = 7;
 const MIN_VALUE_ACTIVE_THUMB_GAP = 10;
 
 /**
- * Provider Expression that allows md-slider to register as a ControlValueAccessor.
+ * Provider Expression that allows mat-slider to register as a ControlValueAccessor.
  * This allows it to support [(ngModel)] and [formControl].
  */
-export const MD_SLIDER_VALUE_ACCESSOR: any = {
+export const MAT_SLIDER_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => MdSlider),
+  useExisting: forwardRef(() => MatSlider),
   multi: true
 };
 
-/** A simple change event emitted by the MdSlider component. */
-export class MdSliderChange {
-  /** The MdSlider that changed. */
-  source: MdSlider;
+/** A simple change event emitted by the MatSlider component. */
+export class MatSliderChange {
+  /** The MatSlider that changed. */
+  source: MatSlider;
 
   /** The new value of the source slider. */
   value: number | null;
 }
 
 
-// Boilerplate for applying mixins to MdSlider.
+// Boilerplate for applying mixins to MatSlider.
 /** @docs-private */
-export class MdSliderBase {
+export class MatSliderBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdSliderMixinBase = mixinColor(mixinDisabled(MdSliderBase), 'accent');
+export const _MatSliderMixinBase = mixinColor(mixinDisabled(MatSliderBase), 'accent');
 
 /**
  * Allows users to select from a range of values by moving the slider thumb. It is similar in
@@ -93,8 +93,8 @@ export const _MdSliderMixinBase = mixinColor(mixinDisabled(MdSliderBase), 'accen
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-slider, mat-slider',
-  providers: [MD_SLIDER_VALUE_ACCESSOR],
+  selector: 'mat-slider',
+  providers: [MAT_SLIDER_VALUE_ACCESSOR],
   host: {
     '(focus)': '_onFocus()',
     '(blur)': '_onBlur()',
@@ -130,7 +130,7 @@ export const _MdSliderMixinBase = mixinColor(mixinDisabled(MdSliderBase), 'accen
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdSlider extends _MdSliderMixinBase
+export class MatSlider extends _MatSliderMixinBase
     implements ControlValueAccessor, OnDestroy, CanDisable, CanColor, OnInit {
   /** Whether the slider is inverted. */
   @Input()
@@ -246,10 +246,10 @@ export class MdSlider extends _MdSliderMixinBase
   private _vertical = false;
 
   /** Event emitted when the slider value has changed. */
-  @Output() change = new EventEmitter<MdSliderChange>();
+  @Output() change = new EventEmitter<MatSliderChange>();
 
   /** Event emitted when the slider thumb moves. */
-  @Output() input = new EventEmitter<MdSliderChange>();
+  @Output() input = new EventEmitter<MatSliderChange>();
 
   /** The value to be used for display purposes. */
   get displayValue(): string | number {
@@ -644,8 +644,8 @@ export class MdSlider extends _MdSliderMixinBase
   }
 
   /** Creates a slider change object from the specified value. */
-  private _createChangeEvent(value = this.value): MdSliderChange {
-    let event = new MdSliderChange();
+  private _createChangeEvent(value = this.value): MatSliderChange {
+    let event = new MatSliderChange();
 
     event.source = this;
     event.value = value;
diff --git a/src/lib/snack-bar/mat-exports.ts b/src/lib/snack-bar/mat-exports.ts
deleted file mode 100644
index 04dd5838aed8..000000000000
--- a/src/lib/snack-bar/mat-exports.ts
+++ /dev/null
@@ -1,21 +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 {MdSnackBar} from './snack-bar';
-import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
-import {MdSnackBarContainer} from './snack-bar-container';
-import {MdSnackBarModule} from './snack-bar-module';
-import {MdSnackBarRef} from './snack-bar-ref';
-
-
-export {MD_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA};
-export {MdSnackBar as MatSnackBar};
-export {MdSnackBarConfig as MatSnackBarConfig};
-export {MdSnackBarContainer as MatSnackBarContainer};
-export {MdSnackBarModule as MatSnackBarModule};
-export {MdSnackBarRef as MatSnackBarRef};
diff --git a/src/lib/snack-bar/public_api.ts b/src/lib/snack-bar/public_api.ts
index 6799827122dd..14496ed504b4 100644
--- a/src/lib/snack-bar/public_api.ts
+++ b/src/lib/snack-bar/public_api.ts
@@ -12,4 +12,4 @@ export * from './snack-bar-container';
 export * from './snack-bar-config';
 export * from './snack-bar-ref';
 export * from './simple-snack-bar';
-export * from './mat-exports';
+
diff --git a/src/lib/snack-bar/simple-snack-bar.ts b/src/lib/snack-bar/simple-snack-bar.ts
index e0236fd0e4c8..a10c004c61d8 100644
--- a/src/lib/snack-bar/simple-snack-bar.ts
+++ b/src/lib/snack-bar/simple-snack-bar.ts
@@ -7,8 +7,8 @@
  */
 
 import {Component, ViewEncapsulation, Inject, ChangeDetectionStrategy} from '@angular/core';
-import {MdSnackBarRef} from './snack-bar-ref';
-import {MD_SNACK_BAR_DATA} from './snack-bar-config';
+import {MatSnackBarRef} from './snack-bar-ref';
+import {MAT_SNACK_BAR_DATA} from './snack-bar-config';
 
 
 /**
@@ -32,8 +32,8 @@ export class SimpleSnackBar {
   data: { message: string, action: string };
 
   constructor(
-    public snackBarRef: MdSnackBarRef<SimpleSnackBar>,
-    @Inject(MD_SNACK_BAR_DATA) data: any) {
+    public snackBarRef: MatSnackBarRef<SimpleSnackBar>,
+    @Inject(MAT_SNACK_BAR_DATA) data: any) {
     this.data = data;
   }
 
diff --git a/src/lib/snack-bar/snack-bar-config.ts b/src/lib/snack-bar/snack-bar-config.ts
index 4f0f2c1fa9cc..44a6844ef769 100644
--- a/src/lib/snack-bar/snack-bar-config.ts
+++ b/src/lib/snack-bar/snack-bar-config.ts
@@ -10,22 +10,22 @@ import {ViewContainerRef, InjectionToken} from '@angular/core';
 import {AriaLivePoliteness} from '@angular/cdk/a11y';
 import {Direction} from '@angular/cdk/bidi';
 
-export const MD_SNACK_BAR_DATA = new InjectionToken<any>('MdSnackBarData');
+export const MAT_SNACK_BAR_DATA = new InjectionToken<any>('MatSnackBarData');
 
-/** Possible values for horizontalPosition on MdSnackBarConfig. */
-export type MdSnackBarHorizontalPosition = 'start' | 'center' | 'end' | 'left' | 'right';
+/** Possible values for horizontalPosition on MatSnackBarConfig. */
+export type MatSnackBarHorizontalPosition = 'start' | 'center' | 'end' | 'left' | 'right';
 
-/** Possible values for verticalPosition on MdSnackBarConfig. */
-export type MdSnackBarVerticalPosition = 'top' | 'bottom';
+/** Possible values for verticalPosition on MatSnackBarConfig. */
+export type MatSnackBarVerticalPosition = 'top' | 'bottom';
 
 /**
  * Configuration used when opening a snack-bar.
  */
-export class MdSnackBarConfig {
-  /** The politeness level for the MdAriaLiveAnnouncer announcement. */
+export class MatSnackBarConfig {
+  /** The politeness level for the MatAriaLiveAnnouncer announcement. */
   politeness?: AriaLivePoliteness = 'assertive';
 
-  /** Message to be announced by the MdAriaLiveAnnouncer */
+  /** Message to be announced by the MatAriaLiveAnnouncer */
   announcementMessage?: string = '';
 
   /** The view container to place the overlay for the snack bar into. */
@@ -44,8 +44,8 @@ export class MdSnackBarConfig {
   data?: any = null;
 
   /** The horizontal position to place the snack bar. */
-  horizontalPosition?: MdSnackBarHorizontalPosition = 'center';
+  horizontalPosition?: MatSnackBarHorizontalPosition = 'center';
 
   /** The vertical position to place the snack bar. */
-  verticalPosition?: MdSnackBarVerticalPosition = 'bottom';
+  verticalPosition?: MatSnackBarVerticalPosition = 'bottom';
 }
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 79688edc6731..15288df08ef1 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -35,7 +35,7 @@ import {
 import {first} from '@angular/cdk/rxjs';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {MdSnackBarConfig} from './snack-bar-config';
+import {MatSnackBarConfig} from './snack-bar-config';
 
 
 export type SnackBarState = 'visible' | 'hidden' | 'void';
@@ -79,7 +79,7 @@ export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
     ])
   ],
 })
-export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
+export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
   /** Whether the component has been destroyed. */
   private _destroyed = false;
 
@@ -96,7 +96,7 @@ export class MdSnackBarContainer extends BasePortalHost implements OnDestroy {
   private _animationState: SnackBarState;
 
   /** The snack bar configuration. */
-  snackBarConfig: MdSnackBarConfig;
+  snackBarConfig: MatSnackBarConfig;
 
   constructor(
     private _ngZone: NgZone,
diff --git a/src/lib/snack-bar/snack-bar-module.ts b/src/lib/snack-bar/snack-bar-module.ts
index d436a4da504c..7d3da1c1b4d8 100644
--- a/src/lib/snack-bar/snack-bar-module.ts
+++ b/src/lib/snack-bar/snack-bar-module.ts
@@ -11,9 +11,9 @@ import {CommonModule} from '@angular/common';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
 import {LIVE_ANNOUNCER_PROVIDER} from '@angular/cdk/a11y';
-import {MdCommonModule} from '@angular/material/core';
-import {MdSnackBar} from './snack-bar';
-import {MdSnackBarContainer} from './snack-bar-container';
+import {MatCommonModule} from '@angular/material/core';
+import {MatSnackBar} from './snack-bar';
+import {MatSnackBarContainer} from './snack-bar-container';
 import {SimpleSnackBar} from './simple-snack-bar';
 
 
@@ -22,11 +22,11 @@ import {SimpleSnackBar} from './simple-snack-bar';
     OverlayModule,
     PortalModule,
     CommonModule,
-    MdCommonModule,
+    MatCommonModule,
   ],
-  exports: [MdSnackBarContainer, MdCommonModule],
-  declarations: [MdSnackBarContainer, SimpleSnackBar],
-  entryComponents: [MdSnackBarContainer, SimpleSnackBar],
-  providers: [MdSnackBar, LIVE_ANNOUNCER_PROVIDER]
+  exports: [MatSnackBarContainer, MatCommonModule],
+  declarations: [MatSnackBarContainer, SimpleSnackBar],
+  entryComponents: [MatSnackBarContainer, SimpleSnackBar],
+  providers: [MatSnackBar, LIVE_ANNOUNCER_PROVIDER]
 })
-export class MdSnackBarModule {}
+export class MatSnackBarModule {}
diff --git a/src/lib/snack-bar/snack-bar-ref.ts b/src/lib/snack-bar/snack-bar-ref.ts
index b9a5c4dc50ee..b329f5e54c07 100644
--- a/src/lib/snack-bar/snack-bar-ref.ts
+++ b/src/lib/snack-bar/snack-bar-ref.ts
@@ -9,12 +9,12 @@
 import {OverlayRef} from '@angular/cdk/overlay';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {MdSnackBarContainer} from './snack-bar-container';
+import {MatSnackBarContainer} from './snack-bar-container';
 
 /**
  * Reference to a snack bar dispatched from the snack bar service.
  */
-export class MdSnackBarRef<T> {
+export class MatSnackBarRef<T> {
   /** The instance of the component making up the content of the snack bar. */
   instance: T;
 
@@ -22,7 +22,7 @@ export class MdSnackBarRef<T> {
    * The instance of the component making up the content of the snack bar.
    * @docs-private
    */
-  containerInstance: MdSnackBarContainer;
+  containerInstance: MatSnackBarContainer;
 
   /** Subject for notifying the user that the snack bar has closed. */
   private _afterClosed = new Subject<void>();
@@ -39,7 +39,7 @@ export class MdSnackBarRef<T> {
    */
   private _durationTimeoutId: number;
 
-  constructor(containerInstance: MdSnackBarContainer,
+  constructor(containerInstance: MatSnackBarContainer,
               private _overlayRef: OverlayRef) {
     this.containerInstance = containerInstance;
     // Dismiss snackbar on action.
diff --git a/src/lib/snack-bar/snack-bar.md b/src/lib/snack-bar/snack-bar.md
index a468dfa3718a..eee50987e6a8 100644
--- a/src/lib/snack-bar/snack-bar.md
+++ b/src/lib/snack-bar/snack-bar.md
@@ -1,4 +1,4 @@
-`MdSnackBar` is a service for displaying snack-bar notifications.
+`MatSnackBar` is a service for displaying snack-bar notifications.
 
 <!-- example(snack-bar-overview) -->
 
@@ -15,11 +15,11 @@ let snackBarRef = snackBar.open('Message archived', 'Undo');
 let snackBarRef = snackbar.openFromComponent(MessageArchivedComponent);
 ```
 
-In either case, a `MdSnackBarRef` is returned. This can be used to dismiss the snack-bar or to
+In either case, a `MatSnackBarRef` is returned. This can be used to dismiss the snack-bar or to
 receive notification of when the snack-bar is dismissed. For simple messages with an action, the
-`MdSnackBarRef` exposes an observable for when the action is triggered.
+`MatSnackBarRef` exposes an observable for when the action is triggered.
 If you want to close a custom snack-bar that was opened via `openFromComponent`, from within the
-component itself, you can inject the `MdSnackBarRef`.
+component itself, you can inject the `MatSnackBarRef`.
 
 ```ts
 snackBarRef.afterDismissed().subscribe(() => {
@@ -35,7 +35,7 @@ snackBarRef.dismiss();
 ```
 
 ### Dismissal
-A snack-bar can be dismissed manually by calling the `dismiss` method on the `MdSnackBarRef`
+A snack-bar can be dismissed manually by calling the `dismiss` method on the `MatSnackBarRef`
 returned from the call to `open`.
 
 Only one snack-bar can ever be opened at one time. If a new snackbar is opened while a previous
@@ -58,18 +58,18 @@ snackbar.openFromComponent(MessageArchivedComponent, {
 });
 ```
 
-To access the data in your component, you have to use the `MD_SNACK_BAR_DATA` injection token:
+To access the data in your component, you have to use the `MAT_SNACK_BAR_DATA` injection token:
 
 ```ts
 import {Component, Inject} from '@angular/core';
-import {MD_SNACK_BAR_DATA} from '@angular/material';
+import {MAT_SNACK_BAR_DATA} from '@angular/material';
 
 @Component({
   selector: 'your-snack-bar',
   template: 'passed in {{ data }}',
 })
 export class MessageArchivedComponent {
-  constructor(@Inject(MD_SNACK_BAR_DATA) public data: any) { }
+  constructor(@Inject(MAT_SNACK_BAR_DATA) public data: any) { }
 }
 ```
 ### Accessibility
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index fdd1da844e82..91f6adb70f0b 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -13,17 +13,17 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {OverlayContainer} from '@angular/cdk/overlay';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
 import {
-  MdSnackBarModule,
-  MdSnackBar,
-  MdSnackBarConfig,
-  MdSnackBarRef,
+  MatSnackBarModule,
+  MatSnackBar,
+  MatSnackBarConfig,
+  MatSnackBarRef,
   SimpleSnackBar,
-  MD_SNACK_BAR_DATA,
+  MAT_SNACK_BAR_DATA,
 } from './index';
 
 
-describe('MdSnackBar', () => {
-  let snackBar: MdSnackBar;
+describe('MatSnackBar', () => {
+  let snackBar: MatSnackBar;
   let liveAnnouncer: LiveAnnouncer;
   let overlayContainerElement: HTMLElement;
 
@@ -35,7 +35,7 @@ describe('MdSnackBar', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
+      imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerElement = document.createElement('div');
@@ -46,7 +46,7 @@ describe('MdSnackBar', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MdSnackBar, LiveAnnouncer], (sb: MdSnackBar, la: LiveAnnouncer) => {
+  beforeEach(inject([MatSnackBar, LiveAnnouncer], (sb: MatSnackBar, la: LiveAnnouncer) => {
     snackBar = sb;
     liveAnnouncer = la;
   }));
@@ -64,7 +64,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should have the role of alert', () => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     snackBar.open(simpleMessage, simpleActionLabel, config);
 
     let containerElement = overlayContainerElement.querySelector('snack-bar-container')!;
@@ -90,7 +90,7 @@ describe('MdSnackBar', () => {
    }));
 
   it('should open a simple message with a button', () => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, simpleActionLabel, config);
 
     viewContainerFixture.detectChanges();
@@ -114,7 +114,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should open a simple message with no button', () => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
 
     viewContainerFixture.detectChanges();
@@ -132,7 +132,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should dismiss the snack bar and remove itself from the view', async(() => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let dismissObservableCompleted = false;
 
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
@@ -182,7 +182,7 @@ describe('MdSnackBar', () => {
   }));
 
   it('should set the animation state to visible on entry', () => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
 
     viewContainerFixture.detectChanges();
@@ -196,7 +196,7 @@ describe('MdSnackBar', () => {
   });
 
   it('should set the animation state to complete on exit', () => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
     snackBarRef.dismiss();
 
@@ -207,7 +207,7 @@ describe('MdSnackBar', () => {
 
   it(`should set the old snack bar animation state to complete and the new snack bar animation
       state to visible on entry of new snack bar`, async(() => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
     let dismissObservableCompleted = false;
 
@@ -233,7 +233,7 @@ describe('MdSnackBar', () => {
   }));
 
   it('should open a new snackbar after dismissing a previous snackbar', async(() => {
-    let config: MdSnackBarConfig = {viewContainerRef: testViewContainerRef};
+    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, 'Dismiss', config);
 
     viewContainerFixture.detectChanges();
@@ -337,7 +337,7 @@ describe('MdSnackBar', () => {
 
   it('should dismiss automatically after a specified timeout', fakeAsync(() => {
     let dismissObservableCompleted = false;
-    let config = new MdSnackBarConfig();
+    let config = new MatSnackBarConfig();
     config.duration = 250;
     let snackBarRef = snackBar.open('content', 'test', config);
     snackBarRef.afterDismissed().subscribe(() => {
@@ -355,7 +355,7 @@ describe('MdSnackBar', () => {
   }));
 
   it('should clear the dismiss timeout when dismissed before timeout expiration', fakeAsync(() => {
-    let config = new MdSnackBarConfig();
+    let config = new MatSnackBarConfig();
     config.duration = 1000;
     snackBar.open('content', 'test', config);
 
@@ -443,17 +443,17 @@ describe('MdSnackBar', () => {
 
 });
 
-describe('MdSnackBar with parent MdSnackBar', () => {
-  let parentSnackBar: MdSnackBar;
-  let childSnackBar: MdSnackBar;
+describe('MatSnackBar with parent MatSnackBar', () => {
+  let parentSnackBar: MatSnackBar;
+  let childSnackBar: MatSnackBar;
   let overlayContainerElement: HTMLElement;
-  let fixture: ComponentFixture<ComponentThatProvidesMdSnackBar>;
+  let fixture: ComponentFixture<ComponentThatProvidesMatSnackBar>;
   let liveAnnouncer: LiveAnnouncer;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
-      declarations: [ComponentThatProvidesMdSnackBar],
+      imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
+      declarations: [ComponentThatProvidesMatSnackBar],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerElement = document.createElement('div');
@@ -465,11 +465,11 @@ describe('MdSnackBar with parent MdSnackBar', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MdSnackBar, LiveAnnouncer], (sb: MdSnackBar, la: LiveAnnouncer) => {
+  beforeEach(inject([MatSnackBar, LiveAnnouncer], (sb: MatSnackBar, la: LiveAnnouncer) => {
     parentSnackBar = sb;
     liveAnnouncer = la;
 
-    fixture = TestBed.createComponent(ComponentThatProvidesMdSnackBar);
+    fixture = TestBed.createComponent(ComponentThatProvidesMatSnackBar);
     childSnackBar = fixture.componentInstance.snackBar;
     fixture.detectChanges();
   }));
@@ -479,7 +479,7 @@ describe('MdSnackBar with parent MdSnackBar', () => {
     liveAnnouncer.ngOnDestroy();
   });
 
-  it('should close snackBars opened by parent when opening from child MdSnackBar', fakeAsync(() => {
+  it('should close snackBars opened by parent when opening from child', fakeAsync(() => {
     parentSnackBar.open('Pizza');
     fixture.detectChanges();
     tick(1000);
@@ -495,7 +495,7 @@ describe('MdSnackBar with parent MdSnackBar', () => {
         .toContain('Taco', 'Expected parent snackbar msg to be dismissed by opening from child');
   }));
 
-  it('should close snackBars opened by child when opening from parent MdSnackBar', fakeAsync(() => {
+  it('should close snackBars opened by child when opening from parent', fakeAsync(() => {
     childSnackBar.open('Pizza');
     fixture.detectChanges();
     tick(1000);
@@ -513,8 +513,8 @@ describe('MdSnackBar with parent MdSnackBar', () => {
 });
 
 
-describe('MdSnackBar Positioning', () => {
-  let snackBar: MdSnackBar;
+describe('MatSnackBar Positioning', () => {
+  let snackBar: MatSnackBar;
   let liveAnnouncer: LiveAnnouncer;
   let overlayContainerEl: HTMLElement;
 
@@ -526,7 +526,7 @@ describe('MdSnackBar Positioning', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
+      imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerEl = document.createElement('div');
@@ -537,7 +537,7 @@ describe('MdSnackBar Positioning', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MdSnackBar, LiveAnnouncer], (sb: MdSnackBar, la: LiveAnnouncer) => {
+  beforeEach(inject([MatSnackBar, LiveAnnouncer], (sb: MatSnackBar, la: LiveAnnouncer) => {
     snackBar = sb;
     liveAnnouncer = la;
   }));
@@ -555,7 +555,7 @@ describe('MdSnackBar Positioning', () => {
   });
 
   it('should default to bottom center', () => {
-    let config: MdSnackBarConfig = {};
+    let config: MatSnackBarConfig = {};
     snackBar.open(simpleMessage, simpleActionLabel, config);
     let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
     let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
@@ -569,7 +569,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
   it('should be in the bottom left corner', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'bottom',
       horizontalPosition: 'left'
     };
@@ -586,7 +586,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
    it('should be in the bottom right corner', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'bottom',
       horizontalPosition: 'right'
     };
@@ -603,7 +603,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
    it('should be in the bottom center', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'bottom',
       horizontalPosition: 'center'
     };
@@ -620,7 +620,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
    it('should be in the top left corner', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'left'
     };
@@ -637,7 +637,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
    it('should be in the top right corner', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'right'
     };
@@ -654,7 +654,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
    it('should be in the top center', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'center'
     };
@@ -671,7 +671,7 @@ describe('MdSnackBar Positioning', () => {
    });
 
    it('should handle start based on direction (rtl)', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'start',
       direction: 'rtl',
@@ -689,7 +689,7 @@ describe('MdSnackBar Positioning', () => {
   });
 
   it('should handle start based on direction (ltr)', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'start',
       direction: 'ltr',
@@ -708,7 +708,7 @@ describe('MdSnackBar Positioning', () => {
 
 
   it('should handle end based on direction (rtl)', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'end',
       direction: 'rtl',
@@ -726,7 +726,7 @@ describe('MdSnackBar Positioning', () => {
   });
 
   it('should handle end based on direction (ltr)', () => {
-    let config: MdSnackBarConfig = {
+    let config: MatSnackBarConfig = {
       verticalPosition: 'top',
       horizontalPosition: 'end',
       direction: 'ltr',
@@ -769,17 +769,17 @@ class ComponentWithChildViewContainer {
 @Component({template: '<p>Burritos are on the way.</p>'})
 class BurritosNotification {
   constructor(
-    public snackBarRef: MdSnackBarRef<BurritosNotification>,
-    @Inject(MD_SNACK_BAR_DATA) public data: any) { }
+    public snackBarRef: MatSnackBarRef<BurritosNotification>,
+    @Inject(MAT_SNACK_BAR_DATA) public data: any) { }
 }
 
 
 @Component({
   template: '',
-  providers: [MdSnackBar]
+  providers: [MatSnackBar]
 })
-class ComponentThatProvidesMdSnackBar {
-  constructor(public snackBar: MdSnackBar) {}
+class ComponentThatProvidesMatSnackBar {
+  constructor(public snackBar: MatSnackBar) {}
 }
 
 
@@ -791,7 +791,7 @@ const TEST_DIRECTIVES = [ComponentWithChildViewContainer,
                          BurritosNotification,
                          DirectiveWithViewContainer];
 @NgModule({
-  imports: [CommonModule, MdSnackBarModule],
+  imports: [CommonModule, MatSnackBarModule],
   exports: TEST_DIRECTIVES,
   declarations: TEST_DIRECTIVES,
   entryComponents: [ComponentWithChildViewContainer, BurritosNotification],
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 293e2c903e95..25635acfddd8 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -12,30 +12,30 @@ import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/porta
 import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
 import {extendObject} from '@angular/material/core';
 import {SimpleSnackBar} from './simple-snack-bar';
-import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
-import {MdSnackBarContainer} from './snack-bar-container';
-import {MdSnackBarRef} from './snack-bar-ref';
+import {MAT_SNACK_BAR_DATA, MatSnackBarConfig} from './snack-bar-config';
+import {MatSnackBarContainer} from './snack-bar-container';
+import {MatSnackBarRef} from './snack-bar-ref';
 
 
 /**
  * Service to dispatch Material Design snack bar messages.
  */
 @Injectable()
-export class MdSnackBar {
+export class MatSnackBar {
   /**
    * Reference to the current snack bar in the view *at this level* (in the Angular injector tree).
    * If there is a parent snack-bar service, all operations should delegate to that parent
    * via `_openedSnackBarRef`.
    */
-  private _snackBarRefAtThisLevel: MdSnackBarRef<any> | null = null;
+  private _snackBarRefAtThisLevel: MatSnackBarRef<any> | null = null;
 
   /** Reference to the currently opened snackbar at *any* level. */
-  get _openedSnackBarRef(): MdSnackBarRef<any> | null {
+  get _openedSnackBarRef(): MatSnackBarRef<any> | null {
     const parent = this._parentSnackBar;
     return parent ? parent._openedSnackBarRef : this._snackBarRefAtThisLevel;
   }
 
-  set _openedSnackBarRef(value: MdSnackBarRef<any> | null) {
+  set _openedSnackBarRef(value: MatSnackBarRef<any> | null) {
     if (this._parentSnackBar) {
       this._parentSnackBar._openedSnackBarRef = value;
     } else {
@@ -47,7 +47,7 @@ export class MdSnackBar {
       private _overlay: Overlay,
       private _live: LiveAnnouncer,
       private _injector: Injector,
-      @Optional() @SkipSelf() private _parentSnackBar: MdSnackBar) {}
+      @Optional() @SkipSelf() private _parentSnackBar: MatSnackBar) {}
 
   /**
    * Creates and dispatches a snack bar with a custom component for the content, removing any
@@ -56,7 +56,7 @@ export class MdSnackBar {
    * @param component Component to be instantiated.
    * @param config Extra configuration for the snack bar.
    */
-  openFromComponent<T>(component: ComponentType<T>, config?: MdSnackBarConfig): MdSnackBarRef<T> {
+  openFromComponent<T>(component: ComponentType<T>, config?: MatSnackBarConfig): MatSnackBarRef<T> {
     const _config = _applyConfigDefaults(config);
     const snackBarRef = this._attach(component, _config);
 
@@ -99,7 +99,7 @@ export class MdSnackBar {
    * @param action The label for the snackbar action.
    * @param config Additional configuration options for the snackbar.
    */
-  open(message: string, action = '', config?: MdSnackBarConfig): MdSnackBarRef<SimpleSnackBar> {
+  open(message: string, action = '', config?: MatSnackBarConfig): MatSnackBarRef<SimpleSnackBar> {
     const _config = _applyConfigDefaults(config);
 
     // Since the user doesn't have access to the component, we can
@@ -123,9 +123,9 @@ export class MdSnackBar {
    * Attaches the snack bar container component to the overlay.
    */
   private _attachSnackBarContainer(overlayRef: OverlayRef,
-                                   config: MdSnackBarConfig): MdSnackBarContainer {
-    const containerPortal = new ComponentPortal(MdSnackBarContainer, config.viewContainerRef);
-    const containerRef: ComponentRef<MdSnackBarContainer> = overlayRef.attach(containerPortal);
+                                   config: MatSnackBarConfig): MatSnackBarContainer {
+    const containerPortal = new ComponentPortal(MatSnackBarContainer, config.viewContainerRef);
+    const containerRef: ComponentRef<MatSnackBarContainer> = overlayRef.attach(containerPortal);
     containerRef.instance.snackBarConfig = config;
     return containerRef.instance;
   }
@@ -133,10 +133,10 @@ export class MdSnackBar {
   /**
    * Places a new component as the content of the snack bar container.
    */
-  private _attach<T>(component: ComponentType<T>, config: MdSnackBarConfig): MdSnackBarRef<T> {
+  private _attach<T>(component: ComponentType<T>, config: MatSnackBarConfig): MatSnackBarRef<T> {
     const overlayRef = this._createOverlay(config);
     const container = this._attachSnackBarContainer(overlayRef, config);
-    const snackBarRef = new MdSnackBarRef<T>(container, overlayRef);
+    const snackBarRef = new MatSnackBarRef<T>(container, overlayRef);
     const injector = this._createInjector(config, snackBarRef);
     const portal = new ComponentPortal(component, undefined, injector);
     const contentRef = container.attachComponentPortal(portal);
@@ -151,7 +151,7 @@ export class MdSnackBar {
    * Creates a new overlay and places it in the correct location.
    * @param config The user-specified snack bar config.
    */
-  private _createOverlay(config: MdSnackBarConfig): OverlayRef {
+  private _createOverlay(config: MatSnackBarConfig): OverlayRef {
     const state = new OverlayConfig();
     state.direction = config.direction;
 
@@ -187,14 +187,14 @@ export class MdSnackBar {
    * @param snackBarRef Reference to the snack bar.
    */
   private _createInjector<T>(
-      config: MdSnackBarConfig,
-      snackBarRef: MdSnackBarRef<T>): PortalInjector {
+      config: MatSnackBarConfig,
+      snackBarRef: MatSnackBarRef<T>): PortalInjector {
 
     const userInjector = config && config.viewContainerRef && config.viewContainerRef.injector;
     const injectionTokens = new WeakMap();
 
-    injectionTokens.set(MdSnackBarRef, snackBarRef);
-    injectionTokens.set(MD_SNACK_BAR_DATA, config.data);
+    injectionTokens.set(MatSnackBarRef, snackBarRef);
+    injectionTokens.set(MAT_SNACK_BAR_DATA, config.data);
 
     return new PortalInjector(userInjector || this._injector, injectionTokens);
   }
@@ -205,6 +205,6 @@ export class MdSnackBar {
  * @param config The configuration to which the defaults will be applied.
  * @returns The new configuration object with defaults applied.
  */
-function _applyConfigDefaults(config?: MdSnackBarConfig): MdSnackBarConfig {
-  return extendObject(new MdSnackBarConfig(), config);
+function _applyConfigDefaults(config?: MatSnackBarConfig): MatSnackBarConfig {
+  return extendObject(new MatSnackBarConfig(), config);
 }
diff --git a/src/lib/sort/mat-exports.ts b/src/lib/sort/mat-exports.ts
deleted file mode 100644
index 44a7b1ccb49c..000000000000
--- a/src/lib/sort/mat-exports.ts
+++ /dev/null
@@ -1,19 +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 {MdSort, MdSortable} from './sort';
-import {MdSortHeader} from './sort-header';
-import {MdSortHeaderIntl} from './sort-header-intl';
-import {MdSortModule} from './sort-module';
-
-
-export {MdSort as MatSort};
-export {MdSortable as MatSortable};
-export {MdSortHeader as MatSortHeader};
-export {MdSortHeaderIntl as MatSortHeaderIntl};
-export {MdSortModule as MatSortModule};
diff --git a/src/lib/sort/public_api.ts b/src/lib/sort/public_api.ts
index a9cb88a5c038..382f6c9168da 100644
--- a/src/lib/sort/public_api.ts
+++ b/src/lib/sort/public_api.ts
@@ -11,4 +11,4 @@ export * from './sort-direction';
 export * from './sort-header';
 export * from './sort-header-intl';
 export * from './sort';
-export * from './mat-exports';
+
diff --git a/src/lib/sort/sort-errors.ts b/src/lib/sort/sort-errors.ts
index f9eb38da6204..5fb61c38ca34 100644
--- a/src/lib/sort/sort-errors.ts
+++ b/src/lib/sort/sort-errors.ts
@@ -7,16 +7,16 @@
  */
 
 /** @docs-private */
-export function getMdSortDuplicateMdSortableIdError(id: string): Error {
-  return Error(`Cannot have two MdSortables with the same id (${id}).`);
+export function getSortDuplicateSortableIdError(id: string): Error {
+  return Error(`Cannot have two MatSortables with the same id (${id}).`);
 }
 
 /** @docs-private */
-export function getMdSortHeaderNotContainedWithinMdSortError(): Error {
-  return Error(`MdSortHeader must be placed within a parent element with the MdSort directive.`);
+export function getSortHeaderNotContainedWithinSortError(): Error {
+  return Error(`MatSortHeader must be placed within a parent element with the MatSort directive.`);
 }
 
 /** @docs-private */
-export function getMdSortHeaderMissingIdError(): Error {
-  return Error(`MdSortHeader must be provided with a unique id.`);
+export function getSortHeaderMissingIdError(): Error {
+  return Error(`MatSortHeader must be provided with a unique id.`);
 }
diff --git a/src/lib/sort/sort-header-intl.ts b/src/lib/sort/sort-header-intl.ts
index 48c38d0dbd28..35c45470c4c1 100644
--- a/src/lib/sort/sort-header-intl.ts
+++ b/src/lib/sort/sort-header-intl.ts
@@ -11,11 +11,11 @@ import {Subject} from 'rxjs/Subject';
 import {SortDirection} from './sort-direction';
 
 /**
- * To modify the labels and text displayed, create a new instance of MdSortHeaderIntl and
+ * To modify the labels and text displayed, create a new instance of MatSortHeaderIntl and
  * include it in a custom provider.
  */
 @Injectable()
-export class MdSortHeaderIntl {
+export class MatSortHeaderIntl {
   /**
    * Stream that emits whenever the labels here are changed. Use this to notify
    * components if the labels have changed after initialization.
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index 5547cce09be1..b516ee6f6649 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -25,9 +25,9 @@ import {
 import {CdkColumnDef} from '@angular/cdk/table';
 import {Subscription} from 'rxjs/Subscription';
 import {merge} from 'rxjs/observable/merge';
-import {MdSort, MdSortable} from './sort';
-import {MdSortHeaderIntl} from './sort-header-intl';
-import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
+import {MatSort, MatSortable} from './sort';
+import {MatSortHeaderIntl} from './sort-header-intl';
+import {getSortHeaderNotContainedWithinSortError} from './sort-errors';
 import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 
 const SORT_ANIMATION_TRANSITION =
@@ -37,14 +37,14 @@ const SORT_ANIMATION_TRANSITION =
  * Applies sorting behavior (click to change sort) and styles to an element, including an
  * arrow to display the current sort direction.
  *
- * Must be provided with an id and contained within a parent MdSort directive.
+ * Must be provided with an id and contained within a parent MatSort directive.
  *
  * If used on header cells in a CdkTable, it will automatically default its id from its containing
  * column definition.
  */
 @Component({
   moduleId: module.id,
-  selector: '[md-sort-header], [mat-sort-header]',
+  selector: '[mat-sort-header]',
   templateUrl: 'sort-header.html',
   styleUrls: ['sort-header.css'],
   host: {
@@ -73,22 +73,22 @@ const SORT_ANIMATION_TRANSITION =
     ])
   ]
 })
-export class MdSortHeader implements MdSortable {
+export class MatSortHeader implements MatSortable {
   private _rerenderSubscription: Subscription;
 
   /**
    * ID of this sort header. If used within the context of a CdkColumnDef, this will default to
    * the column's name.
    */
-  @Input('md-sort-header') id: string;
+  @Input('mat-sort-header') id: string;
 
   /** Sets the position of the arrow that displays when sorted. */
   @Input() arrowPosition: 'before' | 'after' = 'after';
 
-  /** Overrides the sort start value of the containing MdSort for this MdSortable. */
+  /** Overrides the sort start value of the containing MatSort for this MatSortable. */
   @Input('start') start: 'asc' | 'desc';
 
-  /** Overrides the disable clear value of the containing MdSort for this MdSortable. */
+  /** Overrides the disable clear value of the containing MatSort for this MatSortable. */
   @Input()
   get disableClear() { return this._disableClear; }
   set disableClear(v) { this._disableClear = coerceBooleanProperty(v); }
@@ -98,12 +98,12 @@ export class MdSortHeader implements MdSortable {
   get _id() { return this.id; }
   set _id(v: string) { this.id = v; }
 
-  constructor(public _intl: MdSortHeaderIntl,
+  constructor(public _intl: MatSortHeaderIntl,
               changeDetectorRef: ChangeDetectorRef,
-              @Optional() public _sort: MdSort,
+              @Optional() public _sort: MatSort,
               @Optional() public _cdkColumnDef: CdkColumnDef) {
     if (!_sort) {
-      throw getMdSortHeaderNotContainedWithinMdSortError();
+      throw getSortHeaderNotContainedWithinSortError();
     }
 
     this._rerenderSubscription = merge(_sort.sortChange, _intl.changes).subscribe(() => {
@@ -124,7 +124,7 @@ export class MdSortHeader implements MdSortable {
     this._rerenderSubscription.unsubscribe();
   }
 
-  /** Whether this MdSortHeader is currently sorted in either ascending or descending order. */
+  /** Whether this MatSortHeader is currently sorted in either ascending or descending order. */
   _isSorted() {
     return this._sort.active == this.id && this._sort.direction;
   }
diff --git a/src/lib/sort/sort-module.ts b/src/lib/sort/sort-module.ts
index 3f8cb960f55c..df4ad12434e1 100644
--- a/src/lib/sort/sort-module.ts
+++ b/src/lib/sort/sort-module.ts
@@ -7,16 +7,16 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdSortHeader} from './sort-header';
-import {MdSort} from './sort';
-import {MdSortHeaderIntl} from './sort-header-intl';
+import {MatSortHeader} from './sort-header';
+import {MatSort} from './sort';
+import {MatSortHeaderIntl} from './sort-header-intl';
 import {CommonModule} from '@angular/common';
 
 
 @NgModule({
   imports: [CommonModule],
-  exports: [MdSort, MdSortHeader],
-  declarations: [MdSort, MdSortHeader],
-  providers: [MdSortHeaderIntl]
+  exports: [MatSort, MatSortHeader],
+  declarations: [MatSort, MatSortHeader],
+  providers: [MatSortHeaderIntl]
 })
-export class MdSortModule {}
+export class MatSortModule {}
diff --git a/src/lib/sort/sort.md b/src/lib/sort/sort.md
index fb228e645821..5b331deeb797 100644
--- a/src/lib/sort/sort.md
+++ b/src/lib/sort/sort.md
@@ -1,17 +1,17 @@
-The `mdSort` and `md-sort-header` are used, respectively, to add sorting state and display
+The `matSort` and `mat-sort-header` are used, respectively, to add sorting state and display
 to tabular data.
 
 <!-- example(sort-overview) -->
 
 ### Adding sort to table headers
 
-To add sorting behavior and styling to a set of table headers, add the `<md-sort-header>` component
+To add sorting behavior and styling to a set of table headers, add the `<mat-sort-header>` component
 to each header and provide an `id` that will identify it. These headers should be contained within a
-parent element with the `mdSort` directive, which will emit an `mdSortChange` event when the user
+parent element with the `matSort` directive, which will emit an `matSortChange` event when the user
  triggers sorting on the header.
 
 Users can trigger the sort header through a mouse click or keyboard action. When this happens, the
-`mdSort` will emit an `mdSortChange` event that contains the ID of the header triggered and the
+`matSort` will emit an `matSortChange` event that contains the ID of the header triggered and the
 direction to sort (`asc` or `desc`).
 
 #### Changing the sort order
@@ -19,20 +19,20 @@ direction to sort (`asc` or `desc`).
 By default, a sort header starts its sorting at `asc` and then `desc`. Triggering the sort header
 after `desc` will remove sorting.
 
-To reverse the sort order for all headers, set the `mdSortStart` to `desc` on the `mdSort` 
+To reverse the sort order for all headers, set the `matSortStart` to `desc` on the `matSort` 
 directive. To reverse the order only for a specific header, set the `start` input only on the header 
 instead.
 
 To prevent the user from clearing the sort sort state from an already sorted column, set 
-`mdSortDisableClear` to `true` on the `mdSort` to affect all headers, or set `disableClear` to 
+`matSortDisableClear` to `true` on the `matSort` to affect all headers, or set `disableClear` to 
 `true` on a specific header.
 
-#### Using sort with the md-table
+#### Using sort with the mat-table
 
-When used on an `md-table` header, it is not required to set an `md-sort-header` id on because
+When used on an `mat-table` header, it is not required to set an `mat-sort-header` id on because
 by default it will use the id of the column.
 
 <!-- example(table-sorting) -->
 
 ### Accessibility
-The `aria-label` for the sort button can be set in `MdSortHeaderIntl`.
+The `aria-label` for the sort button can be set in `MatSortHeaderIntl`.
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index 36038f4d0d70..4bc46e516d45 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -7,72 +7,79 @@ import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Observable} from 'rxjs/Observable';
 import {map} from 'rxjs/operator/map';
-import {MdTableModule} from '../table/index';
-import {MdSort, MdSortHeader, MdSortHeaderIntl, MdSortModule, Sort, SortDirection} from './index';
+import {MatTableModule} from '../table/index';
 import {
-  getMdSortDuplicateMdSortableIdError,
-  getMdSortHeaderMissingIdError,
-  getMdSortHeaderNotContainedWithinMdSortError,
+  MatSort,
+  MatSortHeader,
+  MatSortHeaderIntl,
+  MatSortModule,
+  Sort,
+  SortDirection
+} from './index';
+import {
+  getSortDuplicateSortableIdError,
+  getSortHeaderMissingIdError,
+  getSortHeaderNotContainedWithinSortError,
 } from './sort-errors';
 
 
-describe('MdSort', () => {
-  let fixture: ComponentFixture<SimpleMdSortApp>;
+describe('MatSort', () => {
+  let fixture: ComponentFixture<SimpleMatSortApp>;
 
-  let component: SimpleMdSortApp;
+  let component: SimpleMatSortApp;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSortModule, MdTableModule, CdkTableModule, NoopAnimationsModule],
+      imports: [MatSortModule, MatTableModule, CdkTableModule, NoopAnimationsModule],
       declarations: [
-        SimpleMdSortApp,
-        CdkTableMdSortApp,
-        MdTableMdSortApp,
-        MdSortHeaderMissingMdSortApp,
-        MdSortDuplicateMdSortableIdsApp,
-        MdSortableMissingIdApp
+        SimpleMatSortApp,
+        CdkTableMatSortApp,
+        MatTableMatSortApp,
+        MatSortHeaderMissingMatSortApp,
+        MatSortDuplicateMatSortableIdsApp,
+        MatSortableMissingIdApp
       ],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SimpleMdSortApp);
+    fixture = TestBed.createComponent(SimpleMatSortApp);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
 
   it('should have the sort headers register and deregister themselves', () => {
-    const sortables = component.mdSort.sortables;
+    const sortables = component.matSort.sortables;
     expect(sortables.size).toBe(4);
-    expect(sortables.get('defaultSortHeaderA')).toBe(component.mdSortHeaderDefaultA);
-    expect(sortables.get('defaultSortHeaderB')).toBe(component.mdSortHeaderDefaultB);
+    expect(sortables.get('defaultSortHeaderA')).toBe(component.matSortHeaderDefaultA);
+    expect(sortables.get('defaultSortHeaderB')).toBe(component.matSortHeaderDefaultB);
 
     fixture.destroy();
     expect(sortables.size).toBe(0);
   });
 
   it('should use the column definition if used within a cdk table', () => {
-    let cdkTableMdSortAppFixture = TestBed.createComponent(CdkTableMdSortApp);
-    let cdkTableMdSortAppComponent = cdkTableMdSortAppFixture.componentInstance;
+    let cdkTableMatSortAppFixture = TestBed.createComponent(CdkTableMatSortApp);
+    let cdkTableMatSortAppComponent = cdkTableMatSortAppFixture.componentInstance;
 
-    cdkTableMdSortAppFixture.detectChanges();
-    cdkTableMdSortAppFixture.detectChanges();
+    cdkTableMatSortAppFixture.detectChanges();
+    cdkTableMatSortAppFixture.detectChanges();
 
-    const sortables = cdkTableMdSortAppComponent.mdSort.sortables;
+    const sortables = cdkTableMatSortAppComponent.matSort.sortables;
     expect(sortables.size).toBe(3);
     expect(sortables.has('column_a')).toBe(true);
     expect(sortables.has('column_b')).toBe(true);
     expect(sortables.has('column_c')).toBe(true);
   });
 
-  it('should use the column definition if used within an md table', () => {
-    let mdTableMdSortAppFixture = TestBed.createComponent(MdTableMdSortApp);
-    let mdTableMdSortAppComponent = mdTableMdSortAppFixture.componentInstance;
+  it('should use the column definition if used within an mat table', () => {
+    let matTableMatSortAppFixture = TestBed.createComponent(MatTableMatSortApp);
+    let matTableMatSortAppComponent = matTableMatSortAppFixture.componentInstance;
 
-    mdTableMdSortAppFixture.detectChanges();
-    mdTableMdSortAppFixture.detectChanges();
+    matTableMatSortAppFixture.detectChanges();
+    matTableMatSortAppFixture.detectChanges();
 
-    const sortables = mdTableMdSortAppComponent.mdSort.sortables;
+    const sortables = matTableMatSortAppComponent.matSort.sortables;
     expect(sortables.size).toBe(3);
     expect(sortables.has('column_a')).toBe(true);
     expect(sortables.has('column_b')).toBe(true);
@@ -102,34 +109,34 @@ describe('MdSort', () => {
 
   it('should reset sort direction when a different column is sorted', () => {
     component.sort('defaultSortHeaderA');
-    expect(component.mdSort.active).toBe('defaultSortHeaderA');
-    expect(component.mdSort.direction).toBe('asc');
+    expect(component.matSort.active).toBe('defaultSortHeaderA');
+    expect(component.matSort.direction).toBe('asc');
 
     component.sort('defaultSortHeaderA');
-    expect(component.mdSort.active).toBe('defaultSortHeaderA');
-    expect(component.mdSort.direction).toBe('desc');
+    expect(component.matSort.active).toBe('defaultSortHeaderA');
+    expect(component.matSort.direction).toBe('desc');
 
     component.sort('defaultSortHeaderB');
-    expect(component.mdSort.active).toBe('defaultSortHeaderB');
-    expect(component.mdSort.direction).toBe('asc');
+    expect(component.matSort.active).toBe('defaultSortHeaderB');
+    expect(component.matSort.direction).toBe('asc');
   });
 
-  it('should throw an error if an MdSortable is not contained within an MdSort directive', () => {
-    expect(() => TestBed.createComponent(MdSortHeaderMissingMdSortApp).detectChanges())
-        .toThrowError(wrappedErrorMessage(getMdSortHeaderNotContainedWithinMdSortError()));
+  it('should throw an error if an MatSortable is not contained within an MatSort directive', () => {
+    expect(() => TestBed.createComponent(MatSortHeaderMissingMatSortApp).detectChanges())
+        .toThrowError(wrappedErrorMessage(getSortHeaderNotContainedWithinSortError()));
   });
 
-  it('should throw an error if two MdSortables have the same id', () => {
-    expect(() => TestBed.createComponent(MdSortDuplicateMdSortableIdsApp).detectChanges())
-        .toThrowError(wrappedErrorMessage(getMdSortDuplicateMdSortableIdError('duplicateId')));
+  it('should throw an error if two MatSortables have the same id', () => {
+    expect(() => TestBed.createComponent(MatSortDuplicateMatSortableIdsApp).detectChanges())
+        .toThrowError(wrappedErrorMessage(getSortDuplicateSortableIdError('duplicateId')));
   });
 
-  it('should throw an error if an MdSortable is missing an id', () => {
-    expect(() => TestBed.createComponent(MdSortableMissingIdApp).detectChanges())
-        .toThrowError(wrappedErrorMessage(getMdSortHeaderMissingIdError()));
+  it('should throw an error if an MatSortable is missing an id', () => {
+    expect(() => TestBed.createComponent(MatSortableMissingIdApp).detectChanges())
+        .toThrowError(wrappedErrorMessage(getSortHeaderMissingIdError()));
   });
 
-  it('should allow let MdSortable override the default sort parameters', () => {
+  it('should allow let MatSortable override the default sort parameters', () => {
     testSingleColumnSortDirectionSequence(
         fixture, ['asc', 'desc', '']);
 
@@ -146,8 +153,8 @@ describe('MdSort', () => {
   });
 
   it('should re-render when the i18n labels have changed',
-    inject([MdSortHeaderIntl], (intl: MdSortHeaderIntl) => {
-      const header = fixture.debugElement.query(By.directive(MdSortHeader)).nativeElement;
+    inject([MatSortHeaderIntl], (intl: MatSortHeaderIntl) => {
+      const header = fixture.debugElement.query(By.directive(MatSortHeader)).nativeElement;
       const button = header.querySelector('.mat-sort-header-button');
 
       intl.sortButtonLabel = () => 'Sort all of the things';
@@ -161,54 +168,58 @@ describe('MdSort', () => {
 /**
  * Performs a sequence of sorting on a single column to see if the sort directions are
  * consistent with expectations. Detects any changes in the fixture to reflect any changes in
- * the inputs and resets the MdSort to remove any side effects from previous tests.
+ * the inputs and resets the MatSort to remove any side effects from previous tests.
  */
-function testSingleColumnSortDirectionSequence(fixture: ComponentFixture<SimpleMdSortApp>,
+function testSingleColumnSortDirectionSequence(fixture: ComponentFixture<SimpleMatSortApp>,
                                                expectedSequence: SortDirection[],
                                                id: string = 'defaultSortHeaderA') {
   // Detect any changes that were made in preparation for this sort sequence
   fixture.detectChanges();
 
-  // Reset the md sort to make sure there are no side affects from previous tests
+  // Reset the sort to make sure there are no side affects from previous tests
   const component = fixture.componentInstance;
-  component.mdSort.active = '';
-  component.mdSort.direction = '';
+  component.matSort.active = '';
+  component.matSort.direction = '';
 
   // Run through the sequence to confirm the order
   let actualSequence = expectedSequence.map(() => {
     component.sort(id);
 
-    // Check that the sort event's active sort is consistent with the MdSort
-    expect(component.mdSort.active).toBe(id);
+    // Check that the sort event's active sort is consistent with the MatSort
+    expect(component.matSort.active).toBe(id);
     expect(component.latestSortEvent.active).toBe(id);
 
-    // Check that the sort event's direction is consistent with the MdSort
-    expect(component.mdSort.direction).toBe(component.latestSortEvent.direction);
-    return component.mdSort.direction;
+    // Check that the sort event's direction is consistent with the MatSort
+    expect(component.matSort.direction).toBe(component.latestSortEvent.direction);
+    return component.matSort.direction;
   });
   expect(actualSequence).toEqual(expectedSequence);
 
   // Expect that performing one more sort will loop it back to the beginning.
   component.sort(id);
-  expect(component.mdSort.direction).toBe(expectedSequence[0]);
+  expect(component.matSort.direction).toBe(expectedSequence[0]);
 }
 
 @Component({
   template: `
-    <div mdSort
-         [mdSortActive]="active"
-         [mdSortStart]="start"
-         [mdSortDirection]="direction"
-         [mdSortDisableClear]="disableClear"
-         (mdSortChange)="latestSortEvent = $event">
-      <div id="defaultSortHeaderA" #defaultSortHeaderA md-sort-header="defaultSortHeaderA"> A</div>
-      <div id="defaultSortHeaderB" #defaultSortHeaderB md-sort-header="defaultSortHeaderB"> B</div>
-      <div id="overrideStart" md-sort-header="overrideStart" start="desc"> D</div>
-      <div id="overrideDisableClear" md-sort-header="overrideDisableClear" disableClear> E</div>
+    <div matSort
+         [matSortActive]="active"
+         [matSortStart]="start"
+         [matSortDirection]="direction"
+         [matSortDisableClear]="disableClear"
+         (matSortChange)="latestSortEvent = $event">
+      <div id="defaultSortHeaderA" #defaultSortHeaderA mat-sort-header="defaultSortHeaderA">
+        A
+      </div>
+      <div id="defaultSortHeaderB" #defaultSortHeaderB mat-sort-header="defaultSortHeaderB">
+        B
+      </div>
+      <div id="overrideStart" mat-sort-header="overrideStart" start="desc"> D </div>
+      <div id="overrideDisableClear" mat-sort-header="overrideDisableClear" disableClear> E </div>
     </div>
   `
 })
-class SimpleMdSortApp {
+class SimpleMatSortApp {
   latestSortEvent: Sort;
 
   active: string;
@@ -216,9 +227,9 @@ class SimpleMdSortApp {
   direction: SortDirection = '';
   disableClear: boolean;
 
-  @ViewChild(MdSort) mdSort: MdSort;
-  @ViewChild('defaultSortHeaderA') mdSortHeaderDefaultA: MdSortHeader;
-  @ViewChild('defaultSortHeaderB') mdSortHeaderDefaultB: MdSortHeader;
+  @ViewChild(MatSort) matSort: MatSort;
+  @ViewChild('defaultSortHeaderA') matSortHeaderDefaultA: MatSortHeader;
+  @ViewChild('defaultSortHeaderB') matSortHeaderDefaultB: MatSortHeader;
 
   constructor (public elementRef: ElementRef) { }
 
@@ -238,19 +249,19 @@ class FakeDataSource extends DataSource<any> {
 
 @Component({
   template: `
-    <cdk-table [dataSource]="dataSource" mdSort>
+    <cdk-table [dataSource]="dataSource" matSort>
       <ng-container cdkColumnDef="column_a">
-        <cdk-header-cell *cdkHeaderCellDef #sortHeaderA md-sort-header> Column A </cdk-header-cell>
+        <cdk-header-cell *cdkHeaderCellDef #sortHeaderA mat-sort-header> Column A </cdk-header-cell>
         <cdk-cell *cdkCellDef="let row"> {{row.a}} </cdk-cell>
       </ng-container>
 
       <ng-container cdkColumnDef="column_b">
-        <cdk-header-cell *cdkHeaderCellDef #sortHeaderB md-sort-header> Column B </cdk-header-cell>
+        <cdk-header-cell *cdkHeaderCellDef #sortHeaderB mat-sort-header> Column B </cdk-header-cell>
         <cdk-cell *cdkCellDef="let row"> {{row.b}} </cdk-cell>
       </ng-container>
 
       <ng-container cdkColumnDef="column_c">
-        <cdk-header-cell *cdkHeaderCellDef #sortHeaderC md-sort-header> Column C </cdk-header-cell>
+        <cdk-header-cell *cdkHeaderCellDef #sortHeaderC mat-sort-header> Column C </cdk-header-cell>
         <cdk-cell *cdkCellDef="let row"> {{row.c}} </cdk-cell>
       </ng-container>
 
@@ -259,8 +270,8 @@ class FakeDataSource extends DataSource<any> {
     </cdk-table>
   `
 })
-class CdkTableMdSortApp {
-  @ViewChild(MdSort) mdSort: MdSort;
+class CdkTableMatSortApp {
+  @ViewChild(MatSort) matSort: MatSort;
 
   dataSource = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
@@ -268,29 +279,29 @@ class CdkTableMdSortApp {
 
 @Component({
   template: `
-    <md-table [dataSource]="dataSource" mdSort>
-      <ng-container mdColumnDef="column_a">
-        <md-header-cell *mdHeaderCellDef #sortHeaderA md-sort-header> Column A </md-header-cell>
-        <md-cell *mdCellDef="let row"> {{row.a}} </md-cell>
+    <mat-table [dataSource]="dataSource" matSort>
+      <ng-container matColumnDef="column_a">
+        <mat-header-cell *matHeaderCellDef #sortHeaderA mat-sort-header> Column A </mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.a}} </mat-cell>
       </ng-container>
 
-      <ng-container mdColumnDef="column_b">
-        <md-header-cell *mdHeaderCellDef #sortHeaderB md-sort-header> Column B </md-header-cell>
-        <md-cell *mdCellDef="let row"> {{row.b}} </md-cell>
+      <ng-container matColumnDef="column_b">
+        <mat-header-cell *matHeaderCellDef #sortHeaderB mat-sort-header> Column B </mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.b}} </mat-cell>
       </ng-container>
 
-      <ng-container mdColumnDef="column_c">
-        <md-header-cell *mdHeaderCellDef #sortHeaderC md-sort-header> Column C </md-header-cell>
-        <md-cell *mdCellDef="let row"> {{row.c}} </md-cell>
+      <ng-container matColumnDef="column_c">
+        <mat-header-cell *matHeaderCellDef #sortHeaderC mat-sort-header> Column C </mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.c}} </mat-cell>
       </ng-container>
 
-      <md-header-row *mdHeaderRowDef="columnsToRender"></md-header-row>
-      <md-row *mdRowDef="let row; columns: columnsToRender"></md-row>
-    </md-table>
+      <mat-header-row *matHeaderRowDef="columnsToRender"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: columnsToRender"></mat-row>
+    </mat-table>
   `
 })
-class MdTableMdSortApp {
-  @ViewChild(MdSort) mdSort: MdSort;
+class MatTableMatSortApp {
+  @ViewChild(MatSort) matSort: MatSort;
 
   dataSource = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
@@ -298,27 +309,27 @@ class MdTableMdSortApp {
 
 
 @Component({
-  template: `<div md-sort-header="a"> A </div>`
+  template: `<div mat-sort-header="a"> A </div>`
 })
-class MdSortHeaderMissingMdSortApp { }
+class MatSortHeaderMissingMatSortApp { }
 
 
 @Component({
   template: `
-    <div mdSort>
-      <div md-sort-header="duplicateId"> A </div>
-      <div md-sort-header="duplicateId"> A </div>
+    <div matSort>
+      <div mat-sort-header="duplicateId"> A </div>
+      <div mat-sort-header="duplicateId"> A </div>
     </div>
   `
 })
-class MdSortDuplicateMdSortableIdsApp { }
+class MatSortDuplicateMatSortableIdsApp { }
 
 
 @Component({
   template: `
-    <div mdSort>
-      <div md-sort-header> A </div>
+    <div matSort>
+      <div mat-sort-header> A </div>
     </div>
   `
 })
-class MdSortableMissingIdApp { }
+class MatSortableMissingIdApp { }
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index c0151361bfe3..3c5f7078dacf 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -9,9 +9,9 @@
 import {Directive, EventEmitter, Input, Output} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SortDirection} from './sort-direction';
-import {getMdSortDuplicateMdSortableIdError, getMdSortHeaderMissingIdError} from './sort-errors';
+import {getSortDuplicateSortableIdError, getSortHeaderMissingIdError} from './sort-errors';
 
-export interface MdSortable {
+export interface MatSortable {
   id: string;
   start: 'asc' | 'desc';
   disableClear: boolean;
@@ -22,86 +22,63 @@ export interface Sort {
   direction: SortDirection;
 }
 
-/** Container for MdSortables to manage the sort state and provide default sort parameters. */
+/** Container for MatSortables to manage the sort state and provide default sort parameters. */
 @Directive({
-  selector: '[mdSort], [matSort]',
+  selector: '[matSort]',
 })
-export class MdSort {
+export class MatSort {
   /** Collection of all registered sortables that this directive manages. */
-  sortables = new Map<string, MdSortable>();
+  sortables = new Map<string, MatSortable>();
 
-  /** The id of the most recently sorted MdSortable. */
-  @Input('mdSortActive') active: string;
+  /** The id of the most recently sorted MatSortable. */
+  @Input('matSortActive') active: string;
 
   /**
-   * The direction to set when an MdSortable is initially sorted.
-   * May be overriden by the MdSortable's sort start.
+   * The direction to set when an MatSortable is initially sorted.
+   * May be overriden by the MatSortable's sort start.
    */
-  @Input('mdSortStart') start: 'asc' | 'desc' = 'asc';
+  @Input('matSortStart') start: 'asc' | 'desc' = 'asc';
 
-  /** The sort direction of the currently active MdSortable. */
-  @Input('mdSortDirection') direction: SortDirection = '';
+  /** The sort direction of the currently active MatSortable. */
+  @Input('matSortDirection') direction: SortDirection = '';
 
   /**
    * Whether to disable the user from clearing the sort by finishing the sort direction cycle.
-   * May be overriden by the MdSortable's disable clear input.
+   * May be overriden by the MatSortable's disable clear input.
    */
-  @Input('mdSortDisableClear')
+  @Input('matSortDisableClear')
   get disableClear() { return this._disableClear; }
   set disableClear(v) { this._disableClear = coerceBooleanProperty(v); }
   private _disableClear: boolean;
 
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matSortActive')
-  get _matSortActive() { return this.active; }
-  set _matSortActive(v) { this.active = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matSortStart')
-  get _matSortStart() { return this.start; }
-  set _matSortStart(v) { this.start = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matSortDirection')
-  get _matSortDirection() { return this.direction; }
-  set _matSortDirection(v) { this.direction = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matSortDisableClear')
-  get _matSortDisableClear() { return this.disableClear; }
-  set _matSortDisableClear(v) { this.disableClear = v; }
-
   /** Event emitted when the user changes either the active sort or sort direction. */
-  @Output('mdSortChange') readonly sortChange = new EventEmitter<Sort>();
-
-  @Output('matSortChange')
-  get _matSortChange(): EventEmitter<Sort> { return this.sortChange; }
+  @Output('matSortChange') readonly sortChange = new EventEmitter<Sort>();
 
   /**
-   * Register function to be used by the contained MdSortables. Adds the MdSortable to the
-   * collection of MdSortables.
+   * Register function to be used by the contained MatSortables. Adds the MatSortable to the
+   * collection of MatSortables.
    */
-  register(sortable: MdSortable) {
+  register(sortable: MatSortable) {
     if (!sortable.id) {
-      throw getMdSortHeaderMissingIdError();
+      throw getSortHeaderMissingIdError();
     }
 
     if (this.sortables.has(sortable.id)) {
-      throw getMdSortDuplicateMdSortableIdError(sortable.id);
+      throw getSortDuplicateSortableIdError(sortable.id);
     }
     this.sortables.set(sortable.id, sortable);
   }
 
   /**
-   * Unregister function to be used by the contained MdSortables. Removes the MdSortable from the
-   * collection of contained MdSortables.
+   * Unregister function to be used by the contained MatSortables. Removes the MatSortable from the
+   * collection of contained MatSortables.
    */
-  deregister(sortable: MdSortable) {
+  deregister(sortable: MatSortable) {
     this.sortables.delete(sortable.id);
   }
 
   /** Sets the active sort id and determines the new sort direction. */
-  sort(sortable: MdSortable) {
+  sort(sortable: MatSortable) {
     if (this.active != sortable.id) {
       this.active = sortable.id;
       this.direction = sortable.start ? sortable.start : this.start;
@@ -113,7 +90,7 @@ export class MdSort {
   }
 
   /** Returns the next sort direction of the active sortable, checking for potential overrides. */
-  getNextSortDirection(sortable: MdSortable): SortDirection {
+  getNextSortDirection(sortable: MatSortable): SortDirection {
     if (!sortable) { return ''; }
 
     // Get the sort direction cycle with the potential sortable overrides.
diff --git a/src/lib/stepper/mat-exports.ts b/src/lib/stepper/mat-exports.ts
deleted file mode 100644
index f561023416b9..000000000000
--- a/src/lib/stepper/mat-exports.ts
+++ /dev/null
@@ -1,29 +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 {
-  MdHorizontalStepper,
-  MdStep,
-  MdStepper,
-  MdVerticalStepper,
-} from './stepper';
-import {MdStepHeader} from './step-header';
-import {MdStepLabel} from './step-label';
-import {MdStepperNext, MdStepperPrevious} from './stepper-button';
-import {MdStepperModule} from './stepper-module';
-
-
-export {MdStep as MatStep};
-export {MdStepHeader as MatStepHeader};
-export {MdStepLabel as MatStepLabel};
-export {MdStepper as MatStepper};
-export {MdHorizontalStepper as MatHorizontalStepper};
-export {MdStepperModule as MatStepperModule};
-export {MdVerticalStepper as MatVerticalStepper};
-export {MdStepperPrevious as MatStepperPrevious};
-export {MdStepperNext as MatStepperNext};
diff --git a/src/lib/stepper/public_api.ts b/src/lib/stepper/public_api.ts
index f55f0ffc768d..3fa16f569ac9 100644
--- a/src/lib/stepper/public_api.ts
+++ b/src/lib/stepper/public_api.ts
@@ -11,4 +11,4 @@ export * from './step-label';
 export * from './stepper';
 export * from './stepper-button';
 export * from './step-header';
-export * from './mat-exports';
+
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index be0390fc7b58..3b87ea8d4932 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -8,13 +8,12 @@
 
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 import {Component, Input, ViewEncapsulation} from '@angular/core';
-import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
-import {MdStepLabel} from './step-label';
+import {MatStepLabel} from './step-label';
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-step-header, mat-step-header',
+  selector: 'mat-step-header',
   templateUrl: 'step-header.html',
   styleUrls: ['step-header.css'],
   host: {
@@ -23,14 +22,13 @@ import {MdStepLabel} from './step-label';
   },
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdStepHeader {
+export class MatStepHeader {
   /** Icon for the given step. */
   @Input() icon: string;
 
   /** Label of the given step. */
-  @Input() label: MdStepLabel | string;
+  @Input() label: MatStepLabel | string;
 
   /** Index of the given step. */
   @Input()
@@ -66,11 +64,11 @@ export class MdStepHeader {
 
   /** Returns string label of given step if it is a text label. */
   _stringLabel(): string | null {
-    return this.label instanceof MdStepLabel ? null : this.label;
+    return this.label instanceof MatStepLabel ? null : this.label;
   }
 
-  /** Returns MdStepLabel if the label of given step is a template label. */
-  _templateLabel(): MdStepLabel | null {
-    return this.label instanceof MdStepLabel ? this.label : null;
+  /** Returns MatStepLabel if the label of given step is a template label. */
+  _templateLabel(): MatStepLabel | null {
+    return this.label instanceof MatStepLabel ? this.label : null;
   }
 }
diff --git a/src/lib/stepper/step-label.ts b/src/lib/stepper/step-label.ts
index 62e1bc7f60e4..e4f166057a10 100644
--- a/src/lib/stepper/step-label.ts
+++ b/src/lib/stepper/step-label.ts
@@ -10,12 +10,12 @@ import {Directive, TemplateRef} from '@angular/core';
 import {CdkStepLabel} from '@angular/cdk/stepper';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdStepLabel = CdkStepLabel;
+export const _MatStepLabel = CdkStepLabel;
 
 @Directive({
-  selector: '[mdStepLabel], [matStepLabel]',
+  selector: '[matStepLabel]',
 })
-export class MdStepLabel extends _MdStepLabel {
+export class MatStepLabel extends _MatStepLabel {
   constructor(template: TemplateRef<any>) {
     super(template);
   }
diff --git a/src/lib/stepper/stepper-button.ts b/src/lib/stepper/stepper-button.ts
index e1d5bb488bef..46d209710bfd 100644
--- a/src/lib/stepper/stepper-button.ts
+++ b/src/lib/stepper/stepper-button.ts
@@ -8,24 +8,24 @@
 
 import {Directive} from '@angular/core';
 import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
-import {MdStepper} from './stepper';
+import {MatStepper} from './stepper';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdStepperNext = CdkStepperNext;
-export const _MdStepperPrevious = CdkStepperPrevious;
+export const _MatStepperNext = CdkStepperNext;
+export const _MatStepperPrevious = CdkStepperPrevious;
 
 /** Button that moves to the next step in a stepper workflow. */
 @Directive({
-  selector: 'button[mdStepperNext], button[matStepperNext]',
+  selector: 'button[matStepperNext]',
   host: {'(click)': '_stepper.next()'},
-  providers: [{provide: CdkStepper, useExisting: MdStepper}]
+  providers: [{provide: CdkStepper, useExisting: MatStepper}]
 })
-export class MdStepperNext extends _MdStepperNext { }
+export class MatStepperNext extends _MatStepperNext { }
 
 /** Button that moves to the previous step in a stepper workflow. */
 @Directive({
-  selector: 'button[mdStepperPrevious], button[matStepperPrevious]',
+  selector: 'button[matStepperPrevious]',
   host: {'(click)': '_stepper.previous()'},
-  providers: [{provide: CdkStepper, useExisting: MdStepper}]
+  providers: [{provide: CdkStepper, useExisting: MatStepper}]
 })
-export class MdStepperPrevious extends _MdStepperPrevious { }
+export class MatStepperPrevious extends _MatStepperPrevious { }
diff --git a/src/lib/stepper/stepper-module.ts b/src/lib/stepper/stepper-module.ts
index 5737a20e61e8..31d0751b644d 100644
--- a/src/lib/stepper/stepper-module.ts
+++ b/src/lib/stepper/stepper-module.ts
@@ -10,36 +10,36 @@ import {PortalModule} from '@angular/cdk/portal';
 import {CdkStepperModule} from '@angular/cdk/stepper';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdButtonModule} from '@angular/material/button';
-import {MdCommonModule} from '@angular/material/core';
-import {MdIconModule} from '@angular/material/icon';
-import {MdStepHeader} from './step-header';
-import {MdStepLabel} from './step-label';
-import {MdHorizontalStepper, MdStep, MdStepper, MdVerticalStepper} from './stepper';
-import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+import {MatButtonModule} from '@angular/material/button';
+import {MatCommonModule} from '@angular/material/core';
+import {MatIconModule} from '@angular/material/icon';
+import {MatStepHeader} from './step-header';
+import {MatStepLabel} from './step-label';
+import {MatHorizontalStepper, MatStep, MatStepper, MatVerticalStepper} from './stepper';
+import {MatStepperNext, MatStepperPrevious} from './stepper-button';
 
 
 @NgModule({
   imports: [
-    MdCommonModule,
+    MatCommonModule,
     CommonModule,
     PortalModule,
-    MdButtonModule,
+    MatButtonModule,
     CdkStepperModule,
-    MdIconModule
+    MatIconModule
   ],
   exports: [
-    MdCommonModule,
-    MdHorizontalStepper,
-    MdVerticalStepper,
-    MdStep,
-    MdStepLabel,
-    MdStepper,
-    MdStepperNext,
-    MdStepperPrevious,
-    MdStepHeader
+    MatCommonModule,
+    MatHorizontalStepper,
+    MatVerticalStepper,
+    MatStep,
+    MatStepLabel,
+    MatStepper,
+    MatStepperNext,
+    MatStepperPrevious,
+    MatStepHeader
   ],
-  declarations: [MdHorizontalStepper, MdVerticalStepper, MdStep, MdStepLabel, MdStepper,
-    MdStepperNext, MdStepperPrevious, MdStepHeader],
+  declarations: [MatHorizontalStepper, MatVerticalStepper, MatStep, MatStepLabel, MatStepper,
+    MatStepperNext, MatStepperPrevious, MatStepHeader],
 })
-export class MdStepperModule {}
+export class MatStepperModule {}
diff --git a/src/lib/stepper/stepper.md b/src/lib/stepper/stepper.md
index cf3381330478..e41d89b68c39 100644
--- a/src/lib/stepper/stepper.md
+++ b/src/lib/stepper/stepper.md
@@ -7,110 +7,110 @@ that drives a stepped workflow. Material stepper extends the CDK stepper and has
 styling.
 
 ### Stepper variants
-There are two stepper components: `md-horizontal-stepper` and `md-vertical-stepper`. They 
+There are two stepper components: `mat-horizontal-stepper` and `mat-vertical-stepper`. They 
 can be used the same way. The only difference is the orientation of stepper. 
-`md-horizontal-stepper` selector can be used to create a horizontal stepper, and
-`md-vertical-stepper` can be used to create a vertical stepper. `md-step` components need to be
+`mat-horizontal-stepper` selector can be used to create a horizontal stepper, and
+`mat-vertical-stepper` can be used to create a vertical stepper. `mat-step` components need to be
 placed inside either one of the two stepper components.
 
 ### Labels
 If a step's label is only text, then the `label` attribute can be used.
 ```html
-<md-vertical-stepper>
-  <md-step label="Step 1">
+<mat-vertical-stepper>
+  <mat-step label="Step 1">
     Content 1
-  </md-step>
-  <md-step label="Step 1">
+  </mat-step>
+  <mat-step label="Step 1">
     Content 2
-  </md-step>
-</md-vertical-stepper>
+  </mat-step>
+</mat-vertical-stepper>
 ```
 
-For more complex labels, add a template with the `mdStepLabel` directive inside the 
-`md-step`.
+For more complex labels, add a template with the `matStepLabel` directive inside the 
+`mat-step`.
 ```html
-<md-vertical-stepper>
-  <md-step>
-    <ng-template mdStepLabel>...</ng-template>
+<mat-vertical-stepper>
+  <mat-step>
+    <ng-template matStepLabel>...</ng-template>
     ...
-  </md-step>
-</md-vertical-stepper>
+  </mat-step>
+</mat-vertical-stepper>
 ```
 
 ### Stepper buttons
 There are two button directives to support navigation between different steps:
-`mdStepperPrevious` and `mdStepperNext`.
+`matStepperPrevious` and `matStepperNext`.
 ```html
-<md-horizontal-stepper>
-  <md-step>
+<mat-horizontal-stepper>
+  <mat-step>
     ...
     <div>
-      <button md-button mdStepperPrevious>Back</button>
-      <button md-button mdStepperNext>Next</button>
+      <button mat-button matStepperPrevious>Back</button>
+      <button mat-button matStepperNext>Next</button>
     </div>
-  </md-step>
-</md-horizontal-stepper>  
+  </mat-step>
+</mat-horizontal-stepper>  
 ```
 
 ### Linear stepper
-The `linear` attribute can be set on `md-horizontal-stepper` and `md-vertical-stepper` to create
+The `linear` attribute can be set on `mat-horizontal-stepper` and `mat-vertical-stepper` to create
 a linear stepper that requires the user to complete previous steps before proceeding
-to following steps. For each `md-step`, the `stepControl` attribute can be set to the top level
+to following steps. For each `mat-step`, the `stepControl` attribute can be set to the top level
 `AbstractControl` that is used to check the validity of the step. 
 
 There are two possible approaches. One is using a single form for stepper, and the other is
 using a different form for each step.
 
 #### Using a single form
-When using a single form for the stepper, `mdStepperPrevious` and `mdStepperNext` have to be
+When using a single form for the stepper, `matStepperPrevious` and `matStepperNext` have to be
 set to `type="button"` in order to prevent submission of the form before all steps
 are completed. 
 
 ```html
 <form [formGroup]="formGroup">
-  <md-horizontal-stepper formArrayName="formArray" linear>
-    <md-step formGroupName="0" [stepControl]="formArray.get([0])">
+  <mat-horizontal-stepper formArrayName="formArray" linear>
+    <mat-step formGroupName="0" [stepControl]="formArray.get([0])">
       ...
       <div>
-        <button md-button mdStepperNext type="button">Next</button>
+        <button mat-button matStepperNext type="button">Next</button>
       </div>
-    </md-step>
-    <md-step formGroupName="1" [stepControl]="formArray.get([1])">
+    </mat-step>
+    <mat-step formGroupName="1" [stepControl]="formArray.get([1])">
       ...
       <div>
-        <button md-button mdStepperPrevious type="button">Back</button>
-        <button md-button mdStepperNext type="button">Next</button>
+        <button mat-button matStepperPrevious type="button">Back</button>
+        <button mat-button matStepperNext type="button">Next</button>
       </div>
-    </md-step>
+    </mat-step>
     ...
-  </md-horizontal-stepper> 
+  </mat-horizontal-stepper> 
 </form>
 ```
 
 #### Using a different form for each step
 ```html
-<md-vertical-stepper linear>
-  <md-step [stepControl]="formGroup1">
+<mat-vertical-stepper linear>
+  <mat-step [stepControl]="formGroup1">
     <form [formGroup]="formGroup1">
       ...
     </form>
-  </md-step>
-  <md-step [stepControl]="formGroup2">
+  </mat-step>
+  <mat-step [stepControl]="formGroup2">
     <form [formGroup]="formGroup2">
       ...
     </form>
-  </md-step>
-</md-vertical-stepper>
+  </mat-step>
+</mat-vertical-stepper>
 ```
 ### Types of steps
 
 #### Optional step
 If completion of a step in linear stepper is not required, then the `optional` attribute can be set
-on `md-step`. 
+on `mat-step`. 
 
 #### Editable step
 By default, steps are editable, which means users can return to previously completed steps and
-edit their responses. `editable="true"` can be set on `md-step` to change the default. 
+edit their responses. `editable="true"` can be set on `mat-step` to change the default. 
 
 #### Completed step
 By default, the `completed` attribute of a step returns `true` if the step is valid (in case of
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index ec042211fd71..eebd89f6dee9 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -6,22 +6,22 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdStepperModule} from './index';
-import {MdHorizontalStepper, MdStepper, MdVerticalStepper} from './stepper';
-import {MdStepperNext, MdStepperPrevious} from './stepper-button';
+import {MatStepperModule} from './index';
+import {MatHorizontalStepper, MatStepper, MatVerticalStepper} from './stepper';
+import {MatStepperNext, MatStepperPrevious} from './stepper-button';
 
 
 const VALID_REGEX = /valid/;
 
-describe('MdHorizontalStepper', () => {
+describe('MatHorizontalStepper', () => {
   let dir = 'ltr';
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdStepperModule, NoopAnimationsModule, ReactiveFormsModule],
+      imports: [MatStepperModule, NoopAnimationsModule, ReactiveFormsModule],
       declarations: [
-        SimpleMdHorizontalStepperApp,
-        LinearMdHorizontalStepperApp
+        SimpleMatHorizontalStepperApp,
+        LinearMatHorizontalStepperApp
       ],
       providers: [
         {provide: Directionality, useFactory: () => ({value: dir})}
@@ -32,16 +32,16 @@ describe('MdHorizontalStepper', () => {
   }));
 
   describe('basic horizontal stepper', () => {
-    let fixture: ComponentFixture<SimpleMdHorizontalStepperApp>;
+    let fixture: ComponentFixture<SimpleMatHorizontalStepperApp>;
 
     beforeEach(() => {
-      fixture = TestBed.createComponent(SimpleMdHorizontalStepperApp);
+      fixture = TestBed.createComponent(SimpleMatHorizontalStepperApp);
       fixture.detectChanges();
     });
 
     it('should default to the first step', () => {
       let stepperComponent = fixture.debugElement
-          .query(By.css('md-horizontal-stepper')).componentInstance;
+          .query(By.css('mat-horizontal-stepper')).componentInstance;
       expect(stepperComponent.selectedIndex).toBe(0);
     });
 
@@ -51,7 +51,7 @@ describe('MdHorizontalStepper', () => {
     });
 
     it('should set the "tablist" role on stepper', () => {
-      let stepperEl = fixture.debugElement.query(By.css('md-horizontal-stepper')).nativeElement;
+      let stepperEl = fixture.debugElement.query(By.css('mat-horizontal-stepper')).nativeElement;
       expect(stepperEl.getAttribute('role')).toBe('tablist');
     });
 
@@ -99,11 +99,11 @@ describe('MdHorizontalStepper', () => {
   });
 
   describe('RTL', () => {
-    let fixture: ComponentFixture<SimpleMdHorizontalStepperApp>;
+    let fixture: ComponentFixture<SimpleMatHorizontalStepperApp>;
 
     beforeEach(() => {
       dir = 'rtl';
-      fixture = TestBed.createComponent(SimpleMdHorizontalStepperApp);
+      fixture = TestBed.createComponent(SimpleMatHorizontalStepperApp);
       fixture.detectChanges();
     });
 
@@ -118,17 +118,17 @@ describe('MdHorizontalStepper', () => {
   });
 
   describe('linear horizontal stepper', () => {
-    let fixture: ComponentFixture<LinearMdHorizontalStepperApp>;
-    let testComponent: LinearMdHorizontalStepperApp;
-    let stepperComponent: MdHorizontalStepper;
+    let fixture: ComponentFixture<LinearMatHorizontalStepperApp>;
+    let testComponent: LinearMatHorizontalStepperApp;
+    let stepperComponent: MatHorizontalStepper;
 
     beforeEach(() => {
-      fixture = TestBed.createComponent(LinearMdHorizontalStepperApp);
+      fixture = TestBed.createComponent(LinearMatHorizontalStepperApp);
       fixture.detectChanges();
 
       testComponent = fixture.componentInstance;
       stepperComponent = fixture.debugElement
-          .query(By.css('md-horizontal-stepper')).componentInstance;
+          .query(By.css('mat-horizontal-stepper')).componentInstance;
     });
 
     it('should have true linear attribute', () => {
@@ -156,15 +156,15 @@ describe('MdHorizontalStepper', () => {
   });
 });
 
-describe('MdVerticalStepper', () => {
+describe('MatVerticalStepper', () => {
   let dir = 'ltr';
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdStepperModule, NoopAnimationsModule, ReactiveFormsModule],
+      imports: [MatStepperModule, NoopAnimationsModule, ReactiveFormsModule],
       declarations: [
-        SimpleMdVerticalStepperApp,
-        LinearMdVerticalStepperApp
+        SimpleMatVerticalStepperApp,
+        LinearMatVerticalStepperApp
       ],
       providers: [
         {provide: Directionality, useFactory: () => ({value: dir})}
@@ -175,16 +175,16 @@ describe('MdVerticalStepper', () => {
   }));
 
   describe('basic vertical stepper', () => {
-    let fixture: ComponentFixture<SimpleMdVerticalStepperApp>;
+    let fixture: ComponentFixture<SimpleMatVerticalStepperApp>;
 
     beforeEach(() => {
-      fixture = TestBed.createComponent(SimpleMdVerticalStepperApp);
+      fixture = TestBed.createComponent(SimpleMatVerticalStepperApp);
       fixture.detectChanges();
     });
 
     it('should default to the first step', () => {
       let stepperComponent = fixture.debugElement
-          .query(By.css('md-vertical-stepper')).componentInstance;
+          .query(By.css('mat-vertical-stepper')).componentInstance;
       expect(stepperComponent.selectedIndex).toBe(0);
     });
 
@@ -195,7 +195,7 @@ describe('MdVerticalStepper', () => {
     });
 
     it('should set the "tablist" role on stepper', () => {
-      let stepperEl = fixture.debugElement.query(By.css('md-vertical-stepper')).nativeElement;
+      let stepperEl = fixture.debugElement.query(By.css('mat-vertical-stepper')).nativeElement;
       expect(stepperEl.getAttribute('role')).toBe('tablist');
     });
 
@@ -243,11 +243,11 @@ describe('MdVerticalStepper', () => {
   });
 
   describe('RTL', () => {
-    let fixture: ComponentFixture<SimpleMdVerticalStepperApp>;
+    let fixture: ComponentFixture<SimpleMatVerticalStepperApp>;
 
     beforeEach(() => {
       dir = 'rtl';
-      fixture = TestBed.createComponent(SimpleMdVerticalStepperApp);
+      fixture = TestBed.createComponent(SimpleMatVerticalStepperApp);
       fixture.detectChanges();
     });
 
@@ -262,17 +262,17 @@ describe('MdVerticalStepper', () => {
   });
 
   describe('linear vertical stepper', () => {
-    let fixture: ComponentFixture<LinearMdVerticalStepperApp>;
-    let testComponent: LinearMdVerticalStepperApp;
-    let stepperComponent: MdVerticalStepper;
+    let fixture: ComponentFixture<LinearMatVerticalStepperApp>;
+    let testComponent: LinearMatVerticalStepperApp;
+    let stepperComponent: MatVerticalStepper;
 
     beforeEach(() => {
-      fixture = TestBed.createComponent(LinearMdVerticalStepperApp);
+      fixture = TestBed.createComponent(LinearMatVerticalStepperApp);
       fixture.detectChanges();
 
       testComponent = fixture.componentInstance;
       stepperComponent = fixture.debugElement
-          .query(By.css('md-vertical-stepper')).componentInstance;
+          .query(By.css('mat-vertical-stepper')).componentInstance;
     });
 
     it('should have true linear attribute', () => {
@@ -304,7 +304,7 @@ describe('MdVerticalStepper', () => {
 /** Asserts that `selectedIndex` updates correctly when header of another step is clicked. */
 function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
                                             stepHeaders: DebugElement[]) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
 
@@ -326,7 +326,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
 /** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */
 function assertCorrectAriaExpandedAttribute(fixture: ComponentFixture<any>,
                                             stepContents: DebugElement[]) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
   let firstStepContentEl = stepContents[0].nativeElement;
   expect(firstStepContentEl.getAttribute('aria-expanded')).toBe('true');
 
@@ -340,7 +340,7 @@ function assertCorrectAriaExpandedAttribute(fixture: ComponentFixture<any>,
 
 /** Asserts that step has correct label. */
 function assertCorrectStepLabel(fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
   let selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]');
   expect(selectedLabel.textContent).toMatch('Step 1');
 
@@ -357,57 +357,57 @@ function assertCorrectStepLabel(fixture: ComponentFixture<any>) {
   expect(selectedLabel.textContent).toMatch('New Label');
 }
 
-/** Asserts that clicking on MdStepperNext button updates `selectedIndex` correctly. */
+/** Asserts that clicking on MatStepperNext button updates `selectedIndex` correctly. */
 function assertNextStepperButtonClick(fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
 
   let nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[0].nativeElement;
   nextButtonNativeEl.click();
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(1);
 
   nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[1].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[1].nativeElement;
   nextButtonNativeEl.click();
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(2);
 
   nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[2].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[2].nativeElement;
   nextButtonNativeEl.click();
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(2);
 }
 
-/** Asserts that clicking on MdStepperPrevious button updates `selectedIndex` correctly. */
+/** Asserts that clicking on MatStepperPrevious button updates `selectedIndex` correctly. */
 function assertPreviousStepperButtonClick(fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
 
   stepperComponent.selectedIndex = 2;
   let previousButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperPrevious))[2].nativeElement;
+      .queryAll(By.directive(MatStepperPrevious))[2].nativeElement;
   previousButtonNativeEl.click();
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(1);
 
   previousButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperPrevious))[1].nativeElement;
+      .queryAll(By.directive(MatStepperPrevious))[1].nativeElement;
   previousButtonNativeEl.click();
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(0);
 
   previousButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperPrevious))[0].nativeElement;
+      .queryAll(By.directive(MatStepperPrevious))[0].nativeElement;
   previousButtonNativeEl.click();
   fixture.detectChanges();
 
@@ -416,7 +416,7 @@ function assertPreviousStepperButtonClick(fixture: ComponentFixture<any>) {
 
 /** Asserts that step position is correct for animation. */
 function assertCorrectStepAnimationDirection(fixture: ComponentFixture<any>, rtl?: 'rtl') {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent._getAnimationDirection(0)).toBe('current');
   if (rtl === 'rtl') {
@@ -455,7 +455,7 @@ function assertCorrectStepAnimationDirection(fixture: ComponentFixture<any>, rtl
 /** Asserts that keyboard interaction works correctly. */
 function assertCorrectKeyboardInteraction(fixture: ComponentFixture<any>,
                                           stepHeaders: DebugElement[]) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent._focusIndex).toBe(0);
   expect(stepperComponent.selectedIndex).toBe(0);
@@ -514,10 +514,10 @@ function assertCorrectKeyboardInteraction(fixture: ComponentFixture<any>,
 
 /** Asserts that step selection change using stepper buttons does not focus step header. */
 function assertStepHeaderFocusNotCalled(fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
   let stepHeaderEl = fixture.debugElement.queryAll(By.css('mat-step-header'))[1].nativeElement;
   let nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[0].nativeElement;
   spyOn(stepHeaderEl, 'focus');
   nextButtonNativeEl.click();
   fixture.detectChanges();
@@ -529,7 +529,7 @@ function assertStepHeaderFocusNotCalled(fixture: ComponentFixture<any>) {
 /** Asserts that arrow key direction works correctly in RTL mode. */
 function assertArrowKeyInteractionInRtl(fixture: ComponentFixture<any>,
                                         stepHeaders: DebugElement[]) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent._focusIndex).toBe(0);
 
@@ -551,9 +551,10 @@ function assertArrowKeyInteractionInRtl(fixture: ComponentFixture<any>,
  */
 function assertLinearStepperValidity(stepHeaderEl: HTMLElement,
                                      testComponent:
-                                         LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
+                                         LinearMatHorizontalStepperApp |
+                                         LinearMatVerticalStepperApp,
                                      fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   stepHeaderEl.click();
   fixture.detectChanges();
@@ -561,7 +562,7 @@ function assertLinearStepperValidity(stepHeaderEl: HTMLElement,
   expect(stepperComponent.selectedIndex).toBe(0);
 
   let nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[0].nativeElement;
   nextButtonNativeEl.click();
   fixture.detectChanges();
 
@@ -588,12 +589,12 @@ function assertStepHeaderBlurred(fixture: ComponentFixture<any>) {
 
 /** Asserts that it is only possible to go back to a previous step if the step is editable. */
 function assertEditableStepChange(fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   stepperComponent.selectedIndex = 1;
   stepperComponent._steps.toArray()[0].editable = false;
   let previousButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperPrevious))[1].nativeElement;
+      .queryAll(By.directive(MatStepperPrevious))[1].nativeElement;
   previousButtonNativeEl.click();
   fixture.detectChanges();
 
@@ -611,9 +612,9 @@ function assertEditableStepChange(fixture: ComponentFixture<any>) {
  * or the input is valid.
  */
 function assertOptionalStepValidity(testComponent:
-                                        LinearMdHorizontalStepperApp | LinearMdVerticalStepperApp,
+                                        LinearMatHorizontalStepperApp | LinearMatVerticalStepperApp,
                                     fixture: ComponentFixture<any>) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   testComponent.oneGroup.get('oneCtrl')!.setValue('input');
   testComponent.twoGroup.get('twoCtrl')!.setValue('input');
@@ -624,7 +625,7 @@ function assertOptionalStepValidity(testComponent:
   expect(testComponent.threeGroup.get('threeCtrl')!.valid).toBe(true);
 
   let nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[2].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[2].nativeElement;
   nextButtonNativeEl.click();
   fixture.detectChanges();
 
@@ -653,9 +654,9 @@ function assertOptionalStepValidity(testComponent:
 function assertCorrectStepIcon(fixture: ComponentFixture<any>,
                                isEditable: boolean,
                                icon: String) {
-  let stepperComponent = fixture.debugElement.query(By.directive(MdStepper)).componentInstance;
+  let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
   let nextButtonNativeEl = fixture.debugElement
-      .queryAll(By.directive(MdStepperNext))[0].nativeElement;
+      .queryAll(By.directive(MatStepperNext))[0].nativeElement;
   expect(stepperComponent._getIndicatorType(0)).toBe('number');
   stepperComponent._steps.toArray()[0].editable = isEditable;
   nextButtonNativeEl.click();
@@ -666,83 +667,83 @@ function assertCorrectStepIcon(fixture: ComponentFixture<any>,
 
 @Component({
   template: `
-    <md-horizontal-stepper>
-      <md-step>
-        <ng-template mdStepLabel>Step 1</ng-template>
+    <mat-horizontal-stepper>
+      <mat-step>
+        <ng-template matStepLabel>Step 1</ng-template>
         Content 1
         <div>
-          <button md-button mdStepperPrevious>Back</button>
-          <button md-button mdStepperNext>Next</button>
+          <button mat-button matStepperPrevious>Back</button>
+          <button mat-button matStepperNext>Next</button>
         </div>
-      </md-step>
-      <md-step>
-        <ng-template mdStepLabel>Step 2</ng-template>
+      </mat-step>
+      <mat-step>
+        <ng-template matStepLabel>Step 2</ng-template>
         Content 2
         <div>
-          <button md-button mdStepperPrevious>Back</button>
-          <button md-button mdStepperNext>Next</button>
+          <button mat-button matStepperPrevious>Back</button>
+          <button mat-button matStepperNext>Next</button>
         </div>
-      </md-step>
-      <md-step [label]="inputLabel">
+      </mat-step>
+      <mat-step [label]="inputLabel">
         Content 3
         <div>
-          <button md-button mdStepperPrevious>Back</button>
-          <button md-button mdStepperNext>Next</button>
+          <button mat-button matStepperPrevious>Back</button>
+          <button mat-button matStepperNext>Next</button>
         </div>
-      </md-step>
-    </md-horizontal-stepper>
+      </mat-step>
+    </mat-horizontal-stepper>
   `
 })
-class SimpleMdHorizontalStepperApp {
+class SimpleMatHorizontalStepperApp {
   inputLabel = 'Step 3';
 }
 
 @Component({
   template: `
-    <md-horizontal-stepper linear>
-      <md-step [stepControl]="oneGroup">
+    <mat-horizontal-stepper linear>
+      <mat-step [stepControl]="oneGroup">
         <form [formGroup]="oneGroup">
-          <ng-template mdStepLabel>Step one</ng-template>
-          <md-form-field>
-            <input mdInput formControlName="oneCtrl" required>
-          </md-form-field>
+          <ng-template matStepLabel>Step one</ng-template>
+          <mat-form-field>
+            <input matInput formControlName="oneCtrl" required>
+          </mat-form-field>
           <div>
-            <button md-button mdStepperPrevious>Back</button>
-            <button md-button mdStepperNext>Next</button>
+            <button mat-button matStepperPrevious>Back</button>
+            <button mat-button matStepperNext>Next</button>
           </div>
         </form>
-      </md-step>
-      <md-step [stepControl]="twoGroup">
+      </mat-step>
+      <mat-step [stepControl]="twoGroup">
         <form [formGroup]="twoGroup">
-          <ng-template mdStepLabel>Step two</ng-template>
-          <md-form-field>
-            <input mdInput formControlName="twoCtrl" required>
-          </md-form-field>
+          <ng-template matStepLabel>Step two</ng-template>
+          <mat-form-field>
+            <input matInput formControlName="twoCtrl" required>
+          </mat-form-field>
           <div>
-            <button md-button mdStepperPrevious>Back</button>
-            <button md-button mdStepperNext>Next</button>
+            <button mat-button matStepperPrevious>Back</button>
+            <button mat-button matStepperNext>Next</button>
           </div>
         </form>
-      </md-step>
-      <md-step [stepControl]="threeGroup" optional>
+      </mat-step>
+      <mat-step [stepControl]="threeGroup" optional>
         <form [formGroup]="threeGroup">
-          <ng-template mdStepLabel>Step two</ng-template>
-          <md-form-field>
-            <input mdInput formControlName="threeCtrl">
-          </md-form-field>
+          <ng-template matStepLabel>Step two</ng-template>
+          <mat-form-field>
+            <input matInput formControlName="threeCtrl">
+          </mat-form-field>
           <div>
-            <button md-button mdStepperPrevious>Back</button>
-            <button md-button mdStepperNext>Next</button>
+            <button mat-button matStepperPrevious>Back</button>
+            <button mat-button matStepperNext>Next</button>
           </div>
         </form>
-      </md-step>
-      <md-step>
+      </mat-step>
+      <mat-step>
         Done
-      </md-step>
-    </md-horizontal-stepper>
+      </mat-step>
+    </mat-horizontal-stepper>
   `
 })
-class LinearMdHorizontalStepperApp {
+class LinearMatHorizontalStepperApp {
   oneGroup: FormGroup;
   twoGroup: FormGroup;
   threeGroup: FormGroup;
@@ -762,83 +763,83 @@ class LinearMdHorizontalStepperApp {
 
 @Component({
   template: `
-    <md-vertical-stepper>
-      <md-step>
-        <ng-template mdStepLabel>Step 1</ng-template>
+    <mat-vertical-stepper>
+      <mat-step>
+        <ng-template matStepLabel>Step 1</ng-template>
         Content 1
         <div>
-          <button md-button mdStepperPrevious>Back</button>
-          <button md-button mdStepperNext>Next</button>
+          <button mat-button matStepperPrevious>Back</button>
+          <button mat-button matStepperNext>Next</button>
         </div>
-      </md-step>
-      <md-step>
-        <ng-template mdStepLabel>Step 2</ng-template>
+      </mat-step>
+      <mat-step>
+        <ng-template matStepLabel>Step 2</ng-template>
         Content 2
         <div>
-          <button md-button mdStepperPrevious>Back</button>
-          <button md-button mdStepperNext>Next</button>
+          <button mat-button matStepperPrevious>Back</button>
+          <button mat-button matStepperNext>Next</button>
         </div>
-      </md-step>
-      <md-step [label]="inputLabel">
+      </mat-step>
+      <mat-step [label]="inputLabel">
         Content 3
         <div>
-          <button md-button mdStepperPrevious>Back</button>
-          <button md-button mdStepperNext>Next</button>
+          <button mat-button matStepperPrevious>Back</button>
+          <button mat-button matStepperNext>Next</button>
         </div>
-      </md-step>
-    </md-vertical-stepper>
+      </mat-step>
+    </mat-vertical-stepper>
   `
 })
-class SimpleMdVerticalStepperApp {
+class SimpleMatVerticalStepperApp {
   inputLabel = 'Step 3';
 }
 
 @Component({
   template: `
-    <md-vertical-stepper linear>
-      <md-step [stepControl]="oneGroup">
+    <mat-vertical-stepper linear>
+      <mat-step [stepControl]="oneGroup">
         <form [formGroup]="oneGroup">
-          <ng-template mdStepLabel>Step one</ng-template>
-          <md-form-field>
-            <input mdInput formControlName="oneCtrl" required>
-          </md-form-field>
+          <ng-template matStepLabel>Step one</ng-template>
+          <mat-form-field>
+            <input matInput formControlName="oneCtrl" required>
+          </mat-form-field>
           <div>
-            <button md-button mdStepperPrevious>Back</button>
-            <button md-button mdStepperNext>Next</button>
+            <button mat-button matStepperPrevious>Back</button>
+            <button mat-button matStepperNext>Next</button>
           </div>
         </form>
-      </md-step>
-      <md-step [stepControl]="twoGroup">
+      </mat-step>
+      <mat-step [stepControl]="twoGroup">
         <form [formGroup]="twoGroup">
-          <ng-template mdStepLabel>Step two</ng-template>
-          <md-form-field>
-            <input mdInput formControlName="twoCtrl" required>
-          </md-form-field>
+          <ng-template matStepLabel>Step two</ng-template>
+          <mat-form-field>
+            <input matInput formControlName="twoCtrl" required>
+          </mat-form-field>
           <div>
-            <button md-button mdStepperPrevious>Back</button>
-            <button md-button mdStepperNext>Next</button>
+            <button mat-button matStepperPrevious>Back</button>
+            <button mat-button matStepperNext>Next</button>
           </div>
         </form>
-      </md-step>
-      <md-step [stepControl]="threeGroup" optional>
+      </mat-step>
+      <mat-step [stepControl]="threeGroup" optional>
         <form [formGroup]="threeGroup">
-          <ng-template mdStepLabel>Step two</ng-template>
-          <md-form-field>
-            <input mdInput formControlName="threeCtrl">
-          </md-form-field>
+          <ng-template matStepLabel>Step two</ng-template>
+          <mat-form-field>
+            <input matInput formControlName="threeCtrl">
+          </mat-form-field>
           <div>
-            <button md-button mdStepperPrevious>Back</button>
-            <button md-button mdStepperNext>Next</button>
+            <button mat-button matStepperPrevious>Back</button>
+            <button mat-button matStepperNext>Next</button>
           </div>
         </form>
-      </md-step>
-      <md-step>
+      </mat-step>
+      <mat-step>
         Done
-      </md-step>
-    </md-vertical-stepper>
+      </mat-step>
+    </mat-vertical-stepper>
   `
 })
-class LinearMdVerticalStepperApp {
+class LinearMatVerticalStepperApp {
   oneGroup: FormGroup;
   twoGroup: FormGroup;
   threeGroup: FormGroup;
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 1472de27a0fa..120e6dad7923 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -26,34 +26,35 @@ import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
 import {
   defaultErrorStateMatcher,
   ErrorOptions,
-  ErrorStateMatcher, MATERIAL_COMPATIBILITY_MODE,
-  MD_ERROR_GLOBAL_OPTIONS,
+  ErrorStateMatcher,
+  MAT_ERROR_GLOBAL_OPTIONS,
 } from '@angular/material/core';
-import {MdStepHeader} from './step-header';
-import {MdStepLabel} from './step-label';
+import {MatStepHeader} from './step-header';
+import {MatStepLabel} from './step-label';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdStep = CdkStep;
-export const _MdStepper = CdkStepper;
+export const _MatStep = CdkStep;
+export const _MatStepper = CdkStepper;
 
 @Component({
   moduleId: module.id,
-  selector: 'md-step, mat-step',
+  selector: 'mat-step',
   templateUrl: 'step.html',
-  providers: [{provide: MD_ERROR_GLOBAL_OPTIONS, useExisting: MdStep}],
+  providers: [{provide: MAT_ERROR_GLOBAL_OPTIONS, useExisting: MatStep}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdStep extends _MdStep implements ErrorOptions {
-  /** Content for step label given by <ng-template matStepLabel> or <ng-template mdStepLabel>. */
-  @ContentChild(MdStepLabel) stepLabel: MdStepLabel;
+export class MatStep extends _MatStep implements ErrorOptions {
+  /** Content for step label given by <ng-template matStepLabel>. */
+  @ContentChild(MatStepLabel) stepLabel: MatStepLabel;
 
   /** Original ErrorStateMatcher that checks the validity of form control. */
   private _originalErrorStateMatcher: ErrorStateMatcher;
 
-  constructor(@Inject(forwardRef(() => MdStepper)) mdStepper: MdStepper,
-              @Optional() @SkipSelf() @Inject(MD_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
-    super(mdStepper);
+  constructor(@Inject(forwardRef(() => MatStepper)) stepper: MatStepper,
+              @Optional() @SkipSelf() @Inject(MAT_ERROR_GLOBAL_OPTIONS)
+                  errorOptions: ErrorOptions) {
+    super(stepper);
     if (errorOptions && errorOptions.errorStateMatcher) {
       this._originalErrorStateMatcher = errorOptions.errorStateMatcher;
     } else {
@@ -75,19 +76,19 @@ export class MdStep extends _MdStep implements ErrorOptions {
 }
 
 @Directive({
-  selector: '[mdStepper]'
+  selector: '[matStepper]'
 })
-export class MdStepper extends _MdStepper {
+export class MatStepper extends _MatStepper {
   /** The list of step headers of the steps in the stepper. */
-  @ViewChildren(MdStepHeader, {read: ElementRef}) _stepHeader: QueryList<ElementRef>;
+  @ViewChildren(MatStepHeader, {read: ElementRef}) _stepHeader: QueryList<ElementRef>;
 
   /** Steps that the stepper holds. */
-  @ContentChildren(MdStep) _steps: QueryList<MdStep>;
+  @ContentChildren(MatStep) _steps: QueryList<MatStep>;
 }
 
 @Component({
   moduleId: module.id,
-  selector: 'md-horizontal-stepper, mat-horizontal-stepper',
+  selector: 'mat-horizontal-stepper',
   templateUrl: 'stepper-horizontal.html',
   styleUrls: ['stepper.css'],
   inputs: ['selectedIndex'],
@@ -104,16 +105,15 @@ export class MdStepper extends _MdStepper {
           animate('500ms cubic-bezier(0.35, 0, 0.25, 1)'))
     ])
   ],
-  providers: [{provide: MdStepper, useExisting: MdHorizontalStepper}],
+  providers: [{provide: MatStepper, useExisting: MatHorizontalStepper}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdHorizontalStepper extends MdStepper { }
+export class MatHorizontalStepper extends MatStepper { }
 
 @Component({
   moduleId: module.id,
-  selector: 'md-vertical-stepper, mat-vertical-stepper',
+  selector: 'mat-vertical-stepper',
   templateUrl: 'stepper-vertical.html',
   styleUrls: ['stepper.css'],
   inputs: ['selectedIndex'],
@@ -129,9 +129,8 @@ export class MdHorizontalStepper extends MdStepper { }
       transition('* <=> current', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
     ])
   ],
-  providers: [{provide: MdStepper, useExisting: MdVerticalStepper}],
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
+  providers: [{provide: MatStepper, useExisting: MatVerticalStepper}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdVerticalStepper extends MdStepper { }
+export class MatVerticalStepper extends MatStepper { }
diff --git a/src/lib/table/cell.ts b/src/lib/table/cell.ts
index 089103fdfc5e..f7e7fc0407e7 100644
--- a/src/lib/table/cell.ts
+++ b/src/lib/table/cell.ts
@@ -16,59 +16,54 @@ import {
 } from '@angular/cdk/table';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdCellDef = CdkCellDef;
-export const _MdHeaderCellDef = CdkHeaderCellDef;
-export const _MdColumnDef = CdkColumnDef;
-export const _MdHeaderCell = CdkHeaderCell;
-export const _MdCell = CdkCell;
+export const _MatCellDef = CdkCellDef;
+export const _MatHeaderCellDef = CdkHeaderCellDef;
+export const _MatColumnDef = CdkColumnDef;
+export const _MatHeaderCell = CdkHeaderCell;
+export const _MatCell = CdkCell;
 
 /**
- * Cell definition for the md-table.
+ * Cell definition for the mat-table.
  * Captures the template of a column's data row cell as well as cell-specific properties.
  */
 @Directive({
-  selector: '[mdCellDef], [matCellDef]',
-  providers: [{provide: CdkCellDef, useExisting: MdCellDef}]
+  selector: '[matCellDef]',
+  providers: [{provide: CdkCellDef, useExisting: MatCellDef}]
 })
-export class MdCellDef extends _MdCellDef { }
+export class MatCellDef extends _MatCellDef { }
 
 /**
- * Header cell definition for the md-table.
+ * Header cell definition for the mat-table.
  * Captures the template of a column's header cell and as well as cell-specific properties.
  */
 @Directive({
-  selector: '[mdHeaderCellDef], [matHeaderCellDef]',
-  providers: [{provide: CdkHeaderCellDef, useExisting: MdHeaderCellDef}]
+  selector: '[matHeaderCellDef]',
+  providers: [{provide: CdkHeaderCellDef, useExisting: MatHeaderCellDef}]
 })
-export class MdHeaderCellDef extends _MdHeaderCellDef { }
+export class MatHeaderCellDef extends _MatHeaderCellDef { }
 
 /**
- * Column definition for the md-table.
+ * Column definition for the mat-table.
  * Defines a set of cells available for a table column.
  */
 @Directive({
-  selector: '[mdColumnDef], [matColumnDef]',
-  providers: [{provide: CdkColumnDef, useExisting: MdColumnDef}],
+  selector: '[matColumnDef]',
+  providers: [{provide: CdkColumnDef, useExisting: MatColumnDef}],
 })
-export class MdColumnDef extends _MdColumnDef {
+export class MatColumnDef extends _MatColumnDef {
   /** Unique name for this column. */
-  @Input('mdColumnDef') name: string;
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matColumnDef')
-  get _matColumnDefName() { return this.name; }
-  set _matColumnDefName(name) { this.name = name; }
+  @Input('matColumnDef') name: string;
 }
 
 /** Header cell template container that adds the right classes and role. */
 @Directive({
-  selector: 'md-header-cell, mat-header-cell',
+  selector: 'mat-header-cell',
   host: {
     'class': 'mat-header-cell',
     'role': 'columnheader',
   },
 })
-export class MdHeaderCell extends _MdHeaderCell {
+export class MatHeaderCell extends _MatHeaderCell {
   constructor(columnDef: CdkColumnDef,
               elementRef: ElementRef,
               renderer: Renderer2) {
@@ -79,13 +74,13 @@ export class MdHeaderCell extends _MdHeaderCell {
 
 /** Cell template container that adds the right classes and role. */
 @Directive({
-  selector: 'md-cell, mat-cell',
+  selector: 'mat-cell',
   host: {
     'class': 'mat-cell',
     'role': 'gridcell',
   },
 })
-export class MdCell extends _MdCell {
+export class MatCell extends _MatCell {
   constructor(columnDef: CdkColumnDef,
               elementRef: ElementRef,
               renderer: Renderer2) {
diff --git a/src/lib/table/mat-exports.ts b/src/lib/table/mat-exports.ts
deleted file mode 100644
index 9554e6695834..000000000000
--- a/src/lib/table/mat-exports.ts
+++ /dev/null
@@ -1,23 +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 {MdCell, MdCellDef, MdColumnDef, MdHeaderCell, MdHeaderCellDef} from './cell';
-import {MdHeaderRow, MdRow} from './row';
-import {MdTable} from './table';
-import {MdTableModule} from './table-module';
-
-
-export {MdCell as MatCell};
-export {MdCellDef as MatCellDef};
-export {MdColumnDef as MatColumnDef};
-export {MdHeaderCell as MatHeaderCell};
-export {MdHeaderCellDef as MatHeaderCellDef};
-export {MdHeaderRow as MatHeaderRow};
-export {MdRow as MatRow};
-export {MdTable as MatTable};
-export {MdTableModule as MatTableModule};
diff --git a/src/lib/table/public_api.ts b/src/lib/table/public_api.ts
index 8626940dc2e6..50da1057bc1c 100644
--- a/src/lib/table/public_api.ts
+++ b/src/lib/table/public_api.ts
@@ -10,4 +10,4 @@ export * from './table-module';
 export * from './cell';
 export * from './table';
 export * from './row';
-export * from './mat-exports';
+
diff --git a/src/lib/table/row.ts b/src/lib/table/row.ts
index 20857c9ca12a..6fb1b2bbd7ed 100644
--- a/src/lib/table/row.ts
+++ b/src/lib/table/row.ts
@@ -16,53 +16,37 @@ import {
 } from '@angular/cdk/table';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdHeaderRowDef = CdkHeaderRowDef;
-export const _MdCdkRowDef = CdkRowDef;
-export const _MdHeaderRow = CdkHeaderRow;
-export const _MdRow = CdkRow;
+export const _MatHeaderRowDef = CdkHeaderRowDef;
+export const _MatCdkRowDef = CdkRowDef;
+export const _MatHeaderRow = CdkHeaderRow;
+export const _MatRow = CdkRow;
 
 /**
- * Header row definition for the md-table.
+ * Header row definition for the mat-table.
  * Captures the header row's template and other header properties such as the columns to display.
  */
-@Directive({
-  selector: '[mdHeaderRowDef]',
-  providers: [{provide: CdkHeaderRowDef, useExisting: MdHeaderRowDef}],
-  inputs: ['columns: mdHeaderRowDef'],
-})
-export class MdHeaderRowDef extends _MdHeaderRowDef { }
-
-/** Mat-compatible version of MdHeaderRowDef */
 @Directive({
   selector: '[matHeaderRowDef]',
   providers: [{provide: CdkHeaderRowDef, useExisting: MatHeaderRowDef}],
   inputs: ['columns: matHeaderRowDef'],
 })
-export class MatHeaderRowDef extends _MdHeaderRowDef { }
+export class MatHeaderRowDef extends _MatHeaderRowDef { }
 
 /**
- * Data row definition for the md-table.
+ * Data row definition for the mat-table.
  * Captures the header row's template and other row properties such as the columns to display.
  */
-@Directive({
-  selector: '[mdRowDef]',
-  providers: [{provide: CdkRowDef, useExisting: MdRowDef}],
-  inputs: ['columns: mdRowDefColumns'],
-})
-export class MdRowDef extends _MdCdkRowDef { }
-
-/** Mat-compatible version of MdRowDef */
 @Directive({
   selector: '[matRowDef]',
   providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
   inputs: ['columns: matRowDefColumns'],
 })
-export class MatRowDef extends _MdCdkRowDef { }
+export class MatRowDef extends _MatCdkRowDef { }
 
 /** Header template container that contains the cell outlet. Adds the right class and role. */
 @Component({
   moduleId: module.id,
-  selector: 'md-header-row, mat-header-row',
+  selector: 'mat-header-row',
   template: CDK_ROW_TEMPLATE,
   host: {
     'class': 'mat-header-row',
@@ -72,12 +56,12 @@ export class MatRowDef extends _MdCdkRowDef { }
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdHeaderRow extends _MdHeaderRow { }
+export class MatHeaderRow extends _MatHeaderRow { }
 
 /** Data row template container that contains the cell outlet. Adds the right class and role. */
 @Component({
   moduleId: module.id,
-  selector: 'md-row, mat-row',
+  selector: 'mat-row',
   template: CDK_ROW_TEMPLATE,
   host: {
     'class': 'mat-row',
@@ -87,4 +71,4 @@ export class MdHeaderRow extends _MdHeaderRow { }
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MdRow extends _MdRow { }
+export class MatRow extends _MatRow { }
diff --git a/src/lib/table/table-module.ts b/src/lib/table/table-module.ts
index 791d0317b60d..378e92aac47d 100644
--- a/src/lib/table/table-module.ts
+++ b/src/lib/table/table-module.ts
@@ -7,22 +7,20 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdTable} from './table';
+import {MatTable} from './table';
 import {CdkTableModule} from '@angular/cdk/table';
-import {MdCell, MdHeaderCell, MdCellDef, MdHeaderCellDef, MdColumnDef} from './cell';
-import {MdHeaderRow, MdRow, MdHeaderRowDef, MdRowDef, MatHeaderRowDef, MatRowDef} from './row';
+import {MatCell, MatHeaderCell, MatCellDef, MatHeaderCellDef, MatColumnDef} from './cell';
+import {MatHeaderRow, MatRow, MatHeaderRowDef, MatRowDef} from './row';
 import {CommonModule} from '@angular/common';
-import {MdCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '@angular/material/core';
 
 @NgModule({
-  imports: [CdkTableModule, CommonModule, MdCommonModule],
-  exports: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
-    MdHeaderRowDef, MdRowDef,
-    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
+  imports: [CdkTableModule, CommonModule, MatCommonModule],
+  exports: [MatTable, MatCellDef, MatHeaderCellDef, MatColumnDef,
+    MatHeaderCell, MatCell, MatHeaderRow, MatRow,
     MatHeaderRowDef, MatRowDef],
-  declarations: [MdTable, MdCellDef, MdHeaderCellDef, MdColumnDef,
-    MdHeaderRowDef, MdRowDef,
-    MdHeaderCell, MdCell, MdHeaderRow, MdRow,
+  declarations: [MatTable, MatCellDef, MatHeaderCellDef, MatColumnDef,
+    MatHeaderCell, MatCell, MatHeaderRow, MatRow,
     MatHeaderRowDef, MatRowDef],
 })
-export class MdTableModule {}
+export class MatTableModule {}
diff --git a/src/lib/table/table.md b/src/lib/table/table.md
index 8b4a89d4de27..8fbb3601ee11 100644
--- a/src/lib/table/table.md
+++ b/src/lib/table/table.md
@@ -1,9 +1,9 @@
-The `md-table` provides a Material Design styled data-table that can be used to display rows of
+The `mat-table` provides a Material Design styled data-table that can be used to display rows of
 data.
 
 This table builds on the foundation of the CDK data-table and uses a similar interface for its
 data source input and template, except that its element and attribute selectors will be prefixed 
-with `md-` instead of `cdk-`.
+with `mat-` instead of `cdk-`.
 
 For more information on the interface and how it works, see the
 [guide covering the CDK data-table](https://material.angular.io/guide/cdk-table).
@@ -12,7 +12,7 @@ For more information on the interface and how it works, see the
 
 ### Features
 
-The `<md-table>` itself only deals with the rendering of a table structure (rows and cells).
+The `<mat-table>` itself only deals with the rendering of a table structure (rows and cells).
 Additional features can be built on top of the table by adding behavior inside cell templates
 (e.g., sort headers) or next to the table (e.g. a paginator). Interactions that affect the
 rendered data (such as sorting and pagination) should be propagated through the table's data source.
@@ -20,14 +20,14 @@ rendered data (such as sorting and pagination) should be propagated through the
 
 #### Pagination
 
-The `<md-paginator>` adds a pagination UI that can be used in conjunction with the `<md-table>`. The
+The `<mat-paginator>` adds a pagination UI that can be used in conjunction with the `<mat-table>`. The
 paginator emits events that can be used to trigger an update via the table's data source.
 
 <!-- example(table-pagination) -->
 
 #### Sorting
 
-Use the `mdSort` directive and `<md-sort-header>` adds a sorting UI the table's column headers. The
+Use the `matSort` directive and `<mat-sort-header>` adds a sorting UI the table's column headers. The
 sort headers emit events that can be used to trigger an update via the table's data source.
 
 <!-- example(table-sorting) -->
@@ -52,5 +52,5 @@ Tables without text or labels should be given a meaningful label via `aria-label
 
 Table's default role is `grid`, and it can be changed to `treegrid` through `role` attribute.
 
-`md-table` does not manage any focus/keyboard interaction on its own. Users can add desired
+`mat-table` does not manage any focus/keyboard interaction on its own. Users can add desired
 focus/keyboard interactions in their application.
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index 00ec04b84b7b..64b8ff5f1c65 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -3,21 +3,21 @@ import {Component, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
-import {MdTableModule} from './index';
-import {MdTable} from './table';
+import {MatTableModule} from './index';
+import {MatTable} from './table';
 
-describe('MdTable', () => {
-  let fixture: ComponentFixture<SimpleMdTableApp>;
+describe('MatTable', () => {
+  let fixture: ComponentFixture<SimpleMatTableApp>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdTableModule],
-      declarations: [SimpleMdTableApp],
+      imports: [MatTableModule],
+      declarations: [SimpleMatTableApp],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SimpleMdTableApp);
+    fixture = TestBed.createComponent(SimpleMatTableApp);
     fixture.detectChanges();
     fixture.detectChanges();
   });
@@ -85,31 +85,31 @@ class FakeDataSource extends DataSource<TestData> {
 
 @Component({
   template: `
-    <md-table [dataSource]="dataSource">
-      <ng-container mdColumnDef="column_a">
-        <md-header-cell *mdHeaderCellDef> Column A</md-header-cell>
-        <md-cell *mdCellDef="let row"> {{row.a}}</md-cell>
+    <mat-table [dataSource]="dataSource">
+      <ng-container matColumnDef="column_a">
+        <mat-header-cell *matHeaderCellDef> Column A</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.a}}</mat-cell>
       </ng-container>
 
-      <ng-container mdColumnDef="column_b">
-        <md-header-cell *mdHeaderCellDef> Column B</md-header-cell>
-        <md-cell *mdCellDef="let row"> {{row.b}}</md-cell>
+      <ng-container matColumnDef="column_b">
+        <mat-header-cell *matHeaderCellDef> Column B</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.b}}</mat-cell>
       </ng-container>
 
-      <ng-container mdColumnDef="column_c">
-        <md-header-cell *mdHeaderCellDef> Column C</md-header-cell>
-        <md-cell *mdCellDef="let row"> {{row.c}}</md-cell>
+      <ng-container matColumnDef="column_c">
+        <mat-header-cell *matHeaderCellDef> Column C</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.c}}</mat-cell>
       </ng-container>
 
-      <md-header-row *mdHeaderRowDef="columnsToRender"></md-header-row>
-      <md-row *mdRowDef="let row; columns: columnsToRender"></md-row>
-    </md-table>
+      <mat-header-row *matHeaderRowDef="columnsToRender"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: columnsToRender"></mat-row>
+    </mat-table>
   `
 })
-class SimpleMdTableApp {
+class SimpleMatTableApp {
   dataSource: FakeDataSource | null = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
 
-  @ViewChild(MdTable) table: MdTable<TestData>;
+  @ViewChild(MatTable) table: MatTable<TestData>;
 }
 
diff --git a/src/lib/table/table.ts b/src/lib/table/table.ts
index d0ecc92bede3..97f936f1046c 100644
--- a/src/lib/table/table.ts
+++ b/src/lib/table/table.ts
@@ -10,14 +10,14 @@ import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/co
 import {CDK_TABLE_TEMPLATE, CdkTable} from '@angular/cdk/table';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdTable = CdkTable;
+export const _MatTable = CdkTable;
 
 /**
  * Wrapper for the CdkTable with Material design styles.
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-table, mat-table',
+  selector: 'mat-table',
   template: CDK_TABLE_TEMPLATE,
   styleUrls: ['table.css'],
   host: {
@@ -27,4 +27,4 @@ export const _MdTable = CdkTable;
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MdTable<T> extends _MdTable<T> { }
+export class MatTable<T> extends _MatTable<T> { }
diff --git a/src/lib/tabs/ink-bar.ts b/src/lib/tabs/ink-bar.ts
index b5ec5d72ea97..363fe443f1ac 100644
--- a/src/lib/tabs/ink-bar.ts
+++ b/src/lib/tabs/ink-bar.ts
@@ -14,12 +14,12 @@ import {Directive, Renderer2, ElementRef, NgZone} from '@angular/core';
  * @docs-private
  */
 @Directive({
-  selector: 'md-ink-bar, mat-ink-bar',
+  selector: 'mat-ink-bar',
   host: {
     'class': 'mat-ink-bar',
   },
 })
-export class MdInkBar {
+export class MatInkBar {
   constructor(
     private _renderer: Renderer2,
     private _elementRef: ElementRef,
diff --git a/src/lib/tabs/mat-exports.ts b/src/lib/tabs/mat-exports.ts
deleted file mode 100644
index b859f73cff3e..000000000000
--- a/src/lib/tabs/mat-exports.ts
+++ /dev/null
@@ -1,34 +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 {MdInkBar} from './ink-bar';
-import {MdTab} from './tab';
-import {MdTabBody, MdTabBodyOriginState, MdTabBodyPositionState} from './tab-body';
-import {MdTabChangeEvent, MdTabGroup, MdTabGroupBase, MdTabHeaderPosition} from './tab-group';
-import {MdTabHeader} from './tab-header';
-import {MdTabLabel} from './tab-label';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
-import {MdTabLink, MdTabNav} from './tab-nav-bar/index';
-import {MdTabsModule} from './tabs-module';
-
-
-export {MdInkBar as MatInkBar};
-export {MdTab as MatTab};
-export {MdTabBody as MatTabBody};
-export {MdTabBodyOriginState as MatTabBodyOriginState};
-export {MdTabBodyPositionState as MatTabBodyPositionState};
-export {MdTabChangeEvent as MatTabChangeEvent};
-export {MdTabGroup as MatTabGroup};
-export {MdTabGroupBase as MatTabGroupBase};
-export {MdTabHeader as MatTabHeader};
-export {MdTabHeaderPosition as MatTabHeaderPosition};
-export {MdTabLabel as MatTabLabel};
-export {MdTabLabelWrapper as MatTabLabelWrapper};
-export {MdTabLink as MatTabLink};
-export {MdTabNav as MatTabNav};
-export {MdTabsModule as MatTabsModule};
diff --git a/src/lib/tabs/public_api.ts b/src/lib/tabs/public_api.ts
index 75d1ff5c1acc..eaa78fceb60b 100644
--- a/src/lib/tabs/public_api.ts
+++ b/src/lib/tabs/public_api.ts
@@ -8,12 +8,12 @@
 
 export * from './tabs-module';
 export * from './tab-group';
-export {MdInkBar} from './ink-bar';
-export {MdTabBody, MdTabBodyOriginState, MdTabBodyPositionState} from './tab-body';
-export {MdTabHeader, ScrollDirection} from './tab-header';
-export {MdTabLabelWrapper} from './tab-label-wrapper';
-export {MdTab} from './tab';
-export {MdTabLabel} from './tab-label';
-export {MdTabNav, MdTabLink} from './tab-nav-bar/index';
+export {MatInkBar} from './ink-bar';
+export {MatTabBody, MatTabBodyOriginState, MatTabBodyPositionState} from './tab-body';
+export {MatTabHeader, ScrollDirection} from './tab-header';
+export {MatTabLabelWrapper} from './tab-label-wrapper';
+export {MatTab} from './tab';
+export {MatTabLabel} from './tab-label';
+export {MatTabNav, MatTabLink} from './tab-nav-bar/index';
+
 
-export * from './mat-exports';
diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts
index cead88350898..83cf647816a4 100644
--- a/src/lib/tabs/tab-body.spec.ts
+++ b/src/lib/tabs/tab-body.spec.ts
@@ -3,20 +3,20 @@ import {PortalModule, TemplatePortal} from '@angular/cdk/portal';
 import {CommonModule} from '@angular/common';
 import {Component, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
 import {async, ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
-import {MdRippleModule} from '@angular/material/core';
+import {MatRippleModule} from '@angular/material/core';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdTabBody} from './tab-body';
+import {MatTabBody} from './tab-body';
 
 
-describe('MdTabBody', () => {
+describe('MatTabBody', () => {
   let dir: Direction = 'ltr';
 
   beforeEach(async(() => {
     dir = 'ltr';
     TestBed.configureTestingModule({
-      imports: [CommonModule, PortalModule, MdRippleModule, NoopAnimationsModule],
+      imports: [CommonModule, PortalModule, MatRippleModule, NoopAnimationsModule],
       declarations: [
-        MdTabBody,
+        MatTabBody,
         SimpleTabBodyApp,
       ],
       providers: [
@@ -40,7 +40,7 @@ describe('MdTabBody', () => {
         fixture.componentInstance.position = 0;
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.mdTabBody._position).toBe('center');
+        expect(fixture.componentInstance.tabBody._position).toBe('center');
       });
 
       it('should be left-origin-center position with negative or zero origin', () => {
@@ -48,7 +48,7 @@ describe('MdTabBody', () => {
         fixture.componentInstance.origin = 0;
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.mdTabBody._position).toBe('left-origin-center');
+        expect(fixture.componentInstance.tabBody._position).toBe('left-origin-center');
       });
 
       it('should be right-origin-center position with positive nonzero origin', () => {
@@ -56,7 +56,7 @@ describe('MdTabBody', () => {
         fixture.componentInstance.origin = 1;
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.mdTabBody._position).toBe('right-origin-center');
+        expect(fixture.componentInstance.tabBody._position).toBe('right-origin-center');
       });
     });
 
@@ -71,7 +71,7 @@ describe('MdTabBody', () => {
         fixture.componentInstance.origin = 0;
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.mdTabBody._position).toBe('right-origin-center');
+        expect(fixture.componentInstance.tabBody._position).toBe('right-origin-center');
       });
 
       it('should be left-origin-center position with positive nonzero origin', () => {
@@ -79,7 +79,7 @@ describe('MdTabBody', () => {
         fixture.componentInstance.origin = 1;
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.mdTabBody._position).toBe('left-origin-center');
+        expect(fixture.componentInstance.tabBody._position).toBe('left-origin-center');
       });
     });
   });
@@ -97,21 +97,21 @@ describe('MdTabBody', () => {
       fixture.componentInstance.position = -1;
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdTabBody._position).toBe('left');
+      expect(fixture.componentInstance.tabBody._position).toBe('left');
     });
 
     it('to be center position with zero position', () => {
       fixture.componentInstance.position = 0;
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdTabBody._position).toBe('center');
+      expect(fixture.componentInstance.tabBody._position).toBe('center');
     });
 
     it('to be left position with positive position', () => {
       fixture.componentInstance.position = 1;
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdTabBody._position).toBe('right');
+      expect(fixture.componentInstance.tabBody._position).toBe('right');
     });
   });
 
@@ -128,21 +128,21 @@ describe('MdTabBody', () => {
       fixture.componentInstance.position = -1;
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdTabBody._position).toBe('right');
+      expect(fixture.componentInstance.tabBody._position).toBe('right');
     });
 
     it('to be center position with zero position', () => {
       fixture.componentInstance.position = 0;
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdTabBody._position).toBe('center');
+      expect(fixture.componentInstance.tabBody._position).toBe('center');
     });
 
     it('to be left position with positive position', () => {
       fixture.componentInstance.position = 1;
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.mdTabBody._position).toBe('left');
+      expect(fixture.componentInstance.tabBody._position).toBe('left');
     });
   });
 
@@ -156,16 +156,16 @@ describe('MdTabBody', () => {
     it('should attach the content when centered and detach when not', fakeAsync(() => {
       fixture.componentInstance.position = 1;
       fixture.detectChanges();
-      expect(fixture.componentInstance.mdTabBody._portalHost.hasAttached()).toBe(false);
+      expect(fixture.componentInstance.tabBody._portalHost.hasAttached()).toBe(false);
 
       fixture.componentInstance.position = 0;
       fixture.detectChanges();
-      expect(fixture.componentInstance.mdTabBody._portalHost.hasAttached()).toBe(true);
+      expect(fixture.componentInstance.tabBody._portalHost.hasAttached()).toBe(true);
 
       fixture.componentInstance.position = 1;
       fixture.detectChanges();
       flushMicrotasks(); // Finish animation and let it detach in animation done handler
-      expect(fixture.componentInstance.mdTabBody._portalHost.hasAttached()).toBe(false);
+      expect(fixture.componentInstance.tabBody._portalHost.hasAttached()).toBe(false);
     }));
   });
 
@@ -175,7 +175,7 @@ describe('MdTabBody', () => {
 @Component({
   template: `
     <ng-template>Tab Body Content</ng-template>
-    <md-tab-body [content]="content" [position]="position" [origin]="origin"></md-tab-body>
+    <mat-tab-body [content]="content" [position]="position" [origin]="origin"></mat-tab-body>
   `
 })
 class SimpleTabBodyApp {
@@ -183,7 +183,7 @@ class SimpleTabBodyApp {
   position: number;
   origin: number;
 
-  @ViewChild(MdTabBody) mdTabBody: MdTabBody;
+  @ViewChild(MatTabBody) tabBody: MatTabBody;
   @ViewChild(TemplateRef) template: TemplateRef<any>;
 
   constructor(private _viewContainerRef: ViewContainerRef) { }
diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index 7af7a6e8593f..0d738582d7a1 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -41,7 +41,7 @@ import {Directionality, Direction} from '@angular/cdk/bidi';
  * then left-origin-center or right-origin-center can be used, which will use left or right as its
  * psuedo-prior state.
  */
-export type MdTabBodyPositionState =
+export type MatTabBodyPositionState =
     'left' | 'center' | 'right' | 'left-origin-center' | 'right-origin-center';
 
 /**
@@ -50,7 +50,7 @@ export type MdTabBodyPositionState =
  * set to 1, and a new tab is created and selected at index 2, then the tab body would have an
  * origin of right because its index was greater than the prior selected index.
  */
-export type MdTabBodyOriginState = 'left' | 'right';
+export type MatTabBodyOriginState = 'left' | 'right';
 
 /**
  * Wrapper for the contents of a tab.
@@ -58,7 +58,7 @@ export type MdTabBodyOriginState = 'left' | 'right';
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-tab-body, mat-tab-body',
+  selector: 'mat-tab-body',
   templateUrl: 'tab-body.html',
   styleUrls: ['tab-body.css'],
   encapsulation: ViewEncapsulation.None,
@@ -88,7 +88,7 @@ export type MdTabBodyOriginState = 'left' | 'right';
     ])
   ]
 })
-export class MdTabBody implements OnInit, AfterViewChecked {
+export class MatTabBody implements OnInit, AfterViewChecked {
   /** The portal host inside of this container into which the tab body content will be loaded. */
   @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
 
@@ -102,7 +102,7 @@ export class MdTabBody implements OnInit, AfterViewChecked {
   @Input('content') _content: TemplatePortal<any>;
 
   /** The shifted index position of the tab body, where zero represents the active center tab. */
-  _position: MdTabBodyPositionState;
+  _position: MatTabBodyPositionState;
   @Input('position') set position(position: number) {
     if (position < 0) {
       this._position = this._getLayoutDirection() == 'ltr' ? 'left' : 'right';
@@ -114,7 +114,7 @@ export class MdTabBody implements OnInit, AfterViewChecked {
   }
 
   /** The origin position from which this tab should appear when it is centered into view. */
-  _origin: MdTabBodyOriginState;
+  _origin: MatTabBodyOriginState;
 
   /** The origin position from which this tab should appear when it is centered into view. */
   @Input('origin') set origin(origin: number) {
@@ -175,7 +175,7 @@ export class MdTabBody implements OnInit, AfterViewChecked {
   }
 
   /** Whether the provided position state is considered center, regardless of origin. */
-  private _isCenterPosition(position: MdTabBodyPositionState|string): boolean {
+  private _isCenterPosition(position: MatTabBodyPositionState|string): boolean {
     return position == 'center' ||
         position == 'left-origin-center' ||
         position == 'right-origin-center';
diff --git a/src/lib/tabs/tab-group.scss b/src/lib/tabs/tab-group.scss
index 7fdd9a0d57a8..cbd42d7388f0 100644
--- a/src/lib/tabs/tab-group.scss
+++ b/src/lib/tabs/tab-group.scss
@@ -29,7 +29,7 @@
   }
 }
 
-.mat-tab-group[md-stretch-tabs] .mat-tab-label,
+.mat-tab-group[mat-stretch-tabs] .mat-tab-label,
 .mat-tab-group[mat-stretch-tabs] .mat-tab-label {
   flex-basis: 0;
   flex-grow: 1;
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index 651f465319e4..f6c4668c0fb5 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -5,13 +5,13 @@ import {By} from '@angular/platform-browser';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {Observable} from 'rxjs/Observable';
-import {MdTab, MdTabGroup, MdTabHeaderPosition, MdTabsModule} from './index';
+import {MatTab, MatTabGroup, MatTabHeaderPosition, MatTabsModule} from './index';
 
 
-describe('MdTabGroup', () => {
+describe('MatTabGroup', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdTabsModule, NoopAnimationsModule],
+      imports: [MatTabsModule, NoopAnimationsModule],
       declarations: [
         SimpleTabsTestApp,
         SimpleDynamicTabsTestApp,
@@ -91,7 +91,7 @@ describe('MdTabGroup', () => {
 
     it('should change tabs based on selectedIndex', fakeAsync(() => {
       let component = fixture.componentInstance;
-      let tabComponent = fixture.debugElement.query(By.css('md-tab-group')).componentInstance;
+      let tabComponent = fixture.debugElement.query(By.css('mat-tab-group')).componentInstance;
 
       spyOn(component, 'handleSelection').and.callThrough();
 
@@ -108,9 +108,9 @@ describe('MdTabGroup', () => {
 
     it('should update tab positions when selected index is changed', () => {
       fixture.detectChanges();
-      const component: MdTabGroup =
-          fixture.debugElement.query(By.css('md-tab-group')).componentInstance;
-      const tabs: MdTab[] = component._tabs.toArray();
+      const component: MatTabGroup =
+          fixture.debugElement.query(By.css('mat-tab-group')).componentInstance;
+      const tabs: MatTab[] = component._tabs.toArray();
 
       expect(tabs[0].position).toBeLessThan(0);
       expect(tabs[1].position).toBe(0);
@@ -133,8 +133,8 @@ describe('MdTabGroup', () => {
 
     it('should clamp the selected index to the size of the number of tabs', () => {
       fixture.detectChanges();
-      const component: MdTabGroup =
-          fixture.debugElement.query(By.css('md-tab-group')).componentInstance;
+      const component: MatTabGroup =
+          fixture.debugElement.query(By.css('mat-tab-group')).componentInstance;
 
       // Set the index to be negative, expect first tab selected
       fixture.componentInstance.selectedIndex = -1;
@@ -246,10 +246,10 @@ describe('MdTabGroup', () => {
 
     it('should be able to add a new tab, select it, and have correct origin position', () => {
       fixture.detectChanges();
-      const component: MdTabGroup =
-          fixture.debugElement.query(By.css('md-tab-group')).componentInstance;
+      const component: MatTabGroup =
+          fixture.debugElement.query(By.css('mat-tab-group')).componentInstance;
 
-      let tabs: MdTab[] = component._tabs.toArray();
+      let tabs: MatTab[] = component._tabs.toArray();
       expect(tabs[0].origin).toBe(null);
       expect(tabs[1].origin).toBe(0);
       expect(tabs[2].origin).toBe(null);
@@ -274,8 +274,8 @@ describe('MdTabGroup', () => {
 
     it('should update selected index if the last tab removed while selected', () => {
       fixture.detectChanges();
-      const component: MdTabGroup =
-          fixture.debugElement.query(By.css('md-tab-group')).componentInstance;
+      const component: MatTabGroup =
+          fixture.debugElement.query(By.css('mat-tab-group')).componentInstance;
 
       const numberOfTabs = component._tabs.length;
       fixture.componentInstance.selectedIndex = numberOfTabs - 1;
@@ -312,14 +312,14 @@ describe('MdTabGroup', () => {
 
   describe('with simple api', () => {
     let fixture: ComponentFixture<TabGroupWithSimpleApi>;
-    let tabGroup: MdTabGroup;
+    let tabGroup: MatTabGroup;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(TabGroupWithSimpleApi);
       fixture.detectChanges();
 
       tabGroup =
-          fixture.debugElement.query(By.directive(MdTabGroup)).componentInstance as MdTabGroup;
+          fixture.debugElement.query(By.directive(MatTabGroup)).componentInstance as MatTabGroup;
     });
 
     it('should support a tab-group with the simple api', () => {
@@ -345,7 +345,7 @@ describe('MdTabGroup', () => {
     });
 
     it('should support setting the header position', () => {
-      let tabGroupNode = fixture.debugElement.query(By.css('md-tab-group')).nativeElement;
+      let tabGroupNode = fixture.debugElement.query(By.css('mat-tab-group')).nativeElement;
 
       expect(tabGroupNode.classList).not.toContain('mat-tab-group-inverted-header');
 
@@ -363,8 +363,8 @@ describe('MdTabGroup', () => {
   function checkSelectedIndex(expectedIndex: number, fixture: ComponentFixture<any>) {
     fixture.detectChanges();
 
-    let tabComponent: MdTabGroup = fixture.debugElement
-        .query(By.css('md-tab-group')).componentInstance;
+    let tabComponent: MatTabGroup = fixture.debugElement
+        .query(By.css('mat-tab-group')).componentInstance;
     expect(tabComponent.selectedIndex).toBe(expectedIndex);
 
     let tabLabelElement = fixture.debugElement
@@ -386,10 +386,10 @@ describe('MdTabGroup', () => {
 });
 
 
-describe('nested MdTabGroup with enabled animations', () => {
+describe('nested MatTabGroup with enabled animations', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdTabsModule, BrowserAnimationsModule],
+      imports: [MatTabsModule, BrowserAnimationsModule],
       declarations: [NestedTabs]
     });
 
@@ -407,34 +407,34 @@ describe('nested MdTabGroup with enabled animations', () => {
 
 @Component({
   template: `
-    <md-tab-group class="tab-group"
+    <mat-tab-group class="tab-group"
         [(selectedIndex)]="selectedIndex"
         [headerPosition]="headerPosition"
         [disableRipple]="disableRipple"
         (focusChange)="handleFocus($event)"
         (selectChange)="handleSelection($event)">
-      <md-tab>
-        <ng-template md-tab-label>Tab One</ng-template>
+      <mat-tab>
+        <ng-template mat-tab-label>Tab One</ng-template>
         Tab one content
-      </md-tab>
-      <md-tab>
-        <ng-template md-tab-label>Tab Two</ng-template>
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>Tab Two</ng-template>
         Tab two content
-      </md-tab>
-      <md-tab>
-        <ng-template md-tab-label>Tab Three</ng-template>
+      </mat-tab>
+      <mat-tab>
+        <ng-template mat-tab-label>Tab Three</ng-template>
         Tab three content
-      </md-tab>
-    </md-tab-group>
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 class SimpleTabsTestApp {
-  @ViewChildren(MdTab) tabs: QueryList<MdTab>;
+  @ViewChildren(MatTab) tabs: QueryList<MatTab>;
   selectedIndex: number = 1;
   focusEvent: any;
   selectEvent: any;
   disableRipple: boolean = false;
-  headerPosition: MdTabHeaderPosition = 'above';
+  headerPosition: MatTabHeaderPosition = 'above';
   handleFocus(event: any) {
     this.focusEvent = event;
   }
@@ -445,15 +445,15 @@ class SimpleTabsTestApp {
 
 @Component({
   template: `
-    <md-tab-group class="tab-group"
+    <mat-tab-group class="tab-group"
         [(selectedIndex)]="selectedIndex"
         (focusChange)="handleFocus($event)"
         (selectChange)="handleSelection($event)">
-      <md-tab *ngFor="let tab of tabs">
-        <ng-template md-tab-label>{{tab.label}}</ng-template>
+      <mat-tab *ngFor="let tab of tabs">
+        <ng-template mat-tab-label>{{tab.label}}</ng-template>
         {{tab.content}}
-      </md-tab>
-    </md-tab-group>
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 class SimpleDynamicTabsTestApp {
@@ -475,11 +475,11 @@ class SimpleDynamicTabsTestApp {
 
 @Component({
   template: `
-    <md-tab-group class="tab-group" [(selectedIndex)]="selectedIndex">
-      <md-tab *ngFor="let tab of tabs" label="{{tab.label}}">
+    <mat-tab-group class="tab-group" [(selectedIndex)]="selectedIndex">
+      <mat-tab *ngFor="let tab of tabs" label="{{tab.label}}">
         {{tab.content}}
-      </md-tab>
-    </md-tab-group>
+      </mat-tab>
+    </mat-tab-group>
   `
 })
 class BindedTabsTestApp {
@@ -501,35 +501,35 @@ class BindedTabsTestApp {
 @Component({
   selector: 'test-app',
   template: `
-    <md-tab-group class="tab-group">
-      <md-tab>
-        <ng-template md-tab-label>Tab One</ng-template>
+    <mat-tab-group class="tab-group">
+      <mat-tab>
+        <ng-template mat-tab-label>Tab One</ng-template>
         Tab one content
-      </md-tab>
-      <md-tab disabled>
-        <ng-template md-tab-label>Tab Two</ng-template>
+      </mat-tab>
+      <mat-tab disabled>
+        <ng-template mat-tab-label>Tab Two</ng-template>
         Tab two content
-      </md-tab>
-      <md-tab [disabled]="isDisabled">
-        <ng-template md-tab-label>Tab Three</ng-template>
+      </mat-tab>
+      <mat-tab [disabled]="isDisabled">
+        <ng-template mat-tab-label>Tab Three</ng-template>
         Tab three content
-      </md-tab>
-    </md-tab-group>
+      </mat-tab>
+    </mat-tab-group>
   `,
 })
 class DisabledTabsTestApp {
-  @ViewChildren(MdTab) tabs: QueryList<MdTab>;
+  @ViewChildren(MatTab) tabs: QueryList<MatTab>;
   isDisabled = false;
 }
 
 @Component({
   template: `
-    <md-tab-group class="tab-group">
-      <md-tab *ngFor="let tab of tabs | async">
-        <ng-template md-tab-label>{{ tab.label }}</ng-template>
+    <mat-tab-group class="tab-group">
+      <mat-tab *ngFor="let tab of tabs | async">
+        <ng-template mat-tab-label>{{ tab.label }}</ng-template>
         {{ tab.content }}
-      </md-tab>
-   </md-tab-group>
+      </mat-tab>
+   </mat-tab-group>
   `
 })
 class AsyncTabsTestApp {
@@ -551,12 +551,12 @@ class AsyncTabsTestApp {
 
 @Component({
   template: `
-  <md-tab-group>
-    <md-tab label="Junk food"> Pizza, fries </md-tab>
-    <md-tab label="Vegetables"> Broccoli, spinach </md-tab>
-    <md-tab [label]="otherLabel"> {{otherContent}} </md-tab>
-    <md-tab label="Legumes"> <p #legumes>Peanuts</p> </md-tab>
-  </md-tab-group>
+  <mat-tab-group>
+    <mat-tab label="Junk food"> Pizza, fries </mat-tab>
+    <mat-tab label="Vegetables"> Broccoli, spinach </mat-tab>
+    <mat-tab [label]="otherLabel"> {{otherContent}} </mat-tab>
+    <mat-tab label="Legumes"> <p #legumes>Peanuts</p> </mat-tab>
+  </mat-tab-group>
   `
 })
 class TabGroupWithSimpleApi {
@@ -569,16 +569,16 @@ class TabGroupWithSimpleApi {
 @Component({
   selector: 'nested-tabs',
   template: `
-    <md-tab-group>
-      <md-tab label="One">Tab one content</md-tab>
-      <md-tab label="Two">
+    <mat-tab-group>
+      <mat-tab label="One">Tab one content</mat-tab>
+      <mat-tab label="Two">
         Tab two content
-         <md-tab-group [dynamicHeight]="true">
-          <md-tab label="Inner tab one">Inner content one</md-tab>
-          <md-tab label="Inner tab two">Inner content two</md-tab>
-        </md-tab-group>
-      </md-tab>
-    </md-tab-group>
+         <mat-tab-group [dynamicHeight]="true">
+          <mat-tab label="Inner tab one">Inner content one</mat-tab>
+          <mat-tab label="Inner tab two">Inner content two</mat-tab>
+        </mat-tab-group>
+      </mat-tab>
+    </mat-tab-group>
   `,
 })
 class NestedTabs {}
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index a80bc765b5b6..0d232cc2b3ed 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -7,52 +7,54 @@
  */
 
 import {
-  ViewChild,
+  AfterContentChecked,
+  AfterContentInit,
+  AfterViewChecked,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
+  ContentChildren,
+  ElementRef,
+  EventEmitter,
   Input,
+  OnDestroy,
   Output,
-  EventEmitter,
   QueryList,
-  ContentChildren,
-  ElementRef,
   Renderer2,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  AfterViewChecked,
-  AfterContentInit,
-  AfterContentChecked,
-  OnDestroy,
+  ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
-import {MdTab} from './tab';
+import {MatTab} from './tab';
 import {merge} from 'rxjs/observable/merge';
 import {
-  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
-  mixinDisableRipple
+  CanColor,
+  CanDisableRipple,
+  mixinColor,
+  mixinDisableRipple,
+  ThemePalette
 } from '@angular/material/core';
-import {CanColor, mixinColor, ThemePalette} from '@angular/material/core';
 
 
 /** Used to generate unique ID's for each tab component */
 let nextId = 0;
 
 /** A simple change event emitted on focus or selection changes. */
-export class MdTabChangeEvent {
+export class MatTabChangeEvent {
   index: number;
-  tab: MdTab;
+  tab: MatTab;
 }
 
 /** Possible positions for the tab header. */
-export type MdTabHeaderPosition = 'above' | 'below';
+export type MatTabHeaderPosition = 'above' | 'below';
 
-// Boilerplate for applying mixins to MdTabGroup.
+// Boilerplate for applying mixins to MatTabGroup.
 /** @docs-private */
-export class MdTabGroupBase {
+export class MatTabGroupBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdTabGroupMixinBase = mixinColor(mixinDisableRipple(MdTabGroupBase), 'primary');
+export const _MatTabGroupMixinBase = mixinColor(mixinDisableRipple(MatTabGroupBase), 'primary');
 
 /**
  * Material design tab-group component.  Supports basic tab pairs (label + content) and includes
@@ -61,7 +63,7 @@ export const _MdTabGroupMixinBase = mixinColor(mixinDisableRipple(MdTabGroupBase
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-tab-group, mat-tab-group',
+  selector: 'mat-tab-group',
   templateUrl: 'tab-group.html',
   styleUrls: ['tab-group.css'],
   encapsulation: ViewEncapsulation.None,
@@ -73,12 +75,11 @@ export const _MdTabGroupMixinBase = mixinColor(mixinDisableRipple(MdTabGroupBase
     '[class.mat-tab-group-dynamic-height]': 'dynamicHeight',
     '[class.mat-tab-group-inverted-header]': 'headerPosition === "below"',
   },
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit,
+export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentInit,
     AfterContentChecked, AfterViewChecked, OnDestroy, CanColor, CanDisableRipple {
 
-  @ContentChildren(MdTab) _tabs: QueryList<MdTab>;
+  @ContentChildren(MatTab) _tabs: QueryList<MatTab>;
 
   @ViewChild('tabBodyWrapper') _tabBodyWrapper: ElementRef;
 
@@ -104,7 +105,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
   private _dynamicHeight: boolean = false;
 
   /** @deprecated */
-  @Input('md-dynamic-height')
+  @Input('mat-dynamic-height')
   get _dynamicHeightDeprecated(): boolean { return this._dynamicHeight; }
   set _dynamicHeightDeprecated(value: boolean) { this._dynamicHeight = value; }
 
@@ -115,7 +116,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
   private _selectedIndex: number | null = null;
 
   /** Position of the tab header. */
-  @Input() headerPosition: MdTabHeaderPosition = 'above';
+  @Input() headerPosition: MatTabHeaderPosition = 'above';
 
   /** Background color of the tab group. */
   @Input()
@@ -137,10 +138,11 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
   @Output() selectedIndexChange: EventEmitter<number> = new EventEmitter();
 
   /** Event emitted when focus has changed within a tab group. */
-  @Output() focusChange: EventEmitter<MdTabChangeEvent> = new EventEmitter<MdTabChangeEvent>();
+  @Output() focusChange: EventEmitter<MatTabChangeEvent> = new EventEmitter<MatTabChangeEvent>();
 
   /** Event emitted when the tab selection has changed. */
-  @Output() selectChange: EventEmitter<MdTabChangeEvent> = new EventEmitter<MdTabChangeEvent>(true);
+  @Output() selectChange: EventEmitter<MatTabChangeEvent> =
+      new EventEmitter<MatTabChangeEvent>(true);
 
   private _groupId: number;
 
@@ -175,7 +177,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
     }
 
     // Setup the position for each tab and optionally setup an origin on the next selected tab.
-    this._tabs.forEach((tab: MdTab, index: number) => {
+    this._tabs.forEach((tab: MatTab, index: number) => {
       tab.position = index - indexToSelect;
       tab.isActive = index === indexToSelect;
 
@@ -220,8 +222,8 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
     this.focusChange.emit(this._createChangeEvent(index));
   }
 
-  private _createChangeEvent(index: number): MdTabChangeEvent {
-    const event = new MdTabChangeEvent;
+  private _createChangeEvent(index: number): MatTabChangeEvent {
+    const event = new MatTabChangeEvent;
     event.index = index;
     if (this._tabs && this._tabs.length) {
       event.tab = this._tabs.toArray()[index];
@@ -231,7 +233,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
 
   /**
    * Subscribes to changes in the tab labels. This is needed, because the @Input for the label is
-   * on the MdTab component, whereas the data binding is inside the MdTabGroup. In order for the
+   * on the MatTab component, whereas the data binding is inside the MatTabGroup. In order for the
    * binding to be updated, we need to subscribe to changes in it and trigger change detection
    * manually.
    */
@@ -249,12 +251,12 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
 
   /** Returns a unique id for each tab label element */
   _getTabLabelId(i: number): string {
-    return `md-tab-label-${this._groupId}-${i}`;
+    return `mat-tab-label-${this._groupId}-${i}`;
   }
 
   /** Returns a unique id for each tab content element */
   _getTabContentId(i: number): string {
-    return `md-tab-content-${this._groupId}-${i}`;
+    return `mat-tab-content-${this._groupId}-${i}`;
   }
 
   /**
diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index d3a2aceea4e2..19e6f2d67199 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -9,15 +9,15 @@ import {PortalModule} from '@angular/cdk/portal';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {dispatchFakeEvent, dispatchKeyboardEvent, FakeViewportRuler} from '@angular/cdk/testing';
-import {MdTabHeader} from './tab-header';
-import {MdRippleModule} from '@angular/material/core';
-import {MdInkBar} from './ink-bar';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
+import {MatTabHeader} from './tab-header';
+import {MatRippleModule} from '@angular/material/core';
+import {MatInkBar} from './ink-bar';
+import {MatTabLabelWrapper} from './tab-label-wrapper';
 import {Subject} from 'rxjs/Subject';
 
 
 
-describe('MdTabHeader', () => {
+describe('MatTabHeader', () => {
   let dir: Direction = 'ltr';
   let change = new Subject();
   let fixture: ComponentFixture<SimpleTabHeaderApp>;
@@ -26,11 +26,11 @@ describe('MdTabHeader', () => {
   beforeEach(async(() => {
     dir = 'ltr';
     TestBed.configureTestingModule({
-      imports: [CommonModule, PortalModule, MdRippleModule],
+      imports: [CommonModule, PortalModule, MatRippleModule],
       declarations: [
-        MdTabHeader,
-        MdInkBar,
-        MdTabLabelWrapper,
+        MatTabHeader,
+        MatInkBar,
+        MatTabLabelWrapper,
         SimpleTabHeaderApp,
       ],
       providers: [
@@ -52,71 +52,71 @@ describe('MdTabHeader', () => {
 
     it('should initialize to the selected index', () => {
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(appComponent.selectedIndex);
+      expect(appComponent.tabHeader.focusIndex).toBe(appComponent.selectedIndex);
     });
 
     it('should send focus change event', () => {
-      appComponent.mdTabHeader.focusIndex = 2;
+      appComponent.tabHeader.focusIndex = 2;
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(2);
+      expect(appComponent.tabHeader.focusIndex).toBe(2);
     });
 
     it('should not set focus a disabled tab', () => {
-      appComponent.mdTabHeader.focusIndex = 0;
+      appComponent.tabHeader.focusIndex = 0;
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(0);
+      expect(appComponent.tabHeader.focusIndex).toBe(0);
 
       // Set focus on the disabled tab, but focus should remain 0
-      appComponent.mdTabHeader.focusIndex = appComponent.disabledTabIndex;
+      appComponent.tabHeader.focusIndex = appComponent.disabledTabIndex;
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(0);
+      expect(appComponent.tabHeader.focusIndex).toBe(0);
     });
 
     it('should move focus right and skip disabled tabs', () => {
-      appComponent.mdTabHeader.focusIndex = 0;
+      appComponent.tabHeader.focusIndex = 0;
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(0);
+      expect(appComponent.tabHeader.focusIndex).toBe(0);
 
       // Move focus right, verify that the disabled tab is 1 and should be skipped
       expect(appComponent.disabledTabIndex).toBe(1);
-      appComponent.mdTabHeader._focusNextTab();
+      appComponent.tabHeader._focusNextTab();
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(2);
+      expect(appComponent.tabHeader.focusIndex).toBe(2);
 
       // Move focus right to index 3
-      appComponent.mdTabHeader._focusNextTab();
+      appComponent.tabHeader._focusNextTab();
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(3);
+      expect(appComponent.tabHeader.focusIndex).toBe(3);
     });
 
     it('should move focus left and skip disabled tabs', () => {
-      appComponent.mdTabHeader.focusIndex = 3;
+      appComponent.tabHeader.focusIndex = 3;
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(3);
+      expect(appComponent.tabHeader.focusIndex).toBe(3);
 
       // Move focus left to index 3
-      appComponent.mdTabHeader._focusPreviousTab();
+      appComponent.tabHeader._focusPreviousTab();
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(2);
+      expect(appComponent.tabHeader.focusIndex).toBe(2);
 
       // Move focus left, verify that the disabled tab is 1 and should be skipped
       expect(appComponent.disabledTabIndex).toBe(1);
-      appComponent.mdTabHeader._focusPreviousTab();
+      appComponent.tabHeader._focusPreviousTab();
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(0);
+      expect(appComponent.tabHeader.focusIndex).toBe(0);
     });
 
     it('should support key down events to move and select focus', () => {
-      appComponent.mdTabHeader.focusIndex = 0;
+      appComponent.tabHeader.focusIndex = 0;
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(0);
+      expect(appComponent.tabHeader.focusIndex).toBe(0);
 
-      let tabListContainer = appComponent.mdTabHeader._tabListContainer.nativeElement;
+      let tabListContainer = appComponent.tabHeader._tabListContainer.nativeElement;
 
       // Move focus right to 2
       dispatchKeyboardEvent(tabListContainer, 'keydown', RIGHT_ARROW);
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(2);
+      expect(appComponent.tabHeader.focusIndex).toBe(2);
 
       // Select the focused index 2
       expect(appComponent.selectedIndex).toBe(0);
@@ -128,7 +128,7 @@ describe('MdTabHeader', () => {
       // Move focus right to 0
       dispatchKeyboardEvent(tabListContainer, 'keydown', LEFT_ARROW);
       fixture.detectChanges();
-      expect(appComponent.mdTabHeader.focusIndex).toBe(0);
+      expect(appComponent.tabHeader.focusIndex).toBe(0);
 
       // Select the focused 0 using space.
       expect(appComponent.selectedIndex).toBe(2);
@@ -151,37 +151,37 @@ describe('MdTabHeader', () => {
 
       it('should show width when tab list width exceeds container', () => {
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader._showPaginationControls).toBe(false);
+        expect(appComponent.tabHeader._showPaginationControls).toBe(false);
 
         // Add enough tabs that it will obviously exceed the width
         appComponent.addTabsForScrolling();
         fixture.detectChanges();
 
-        expect(appComponent.mdTabHeader._showPaginationControls).toBe(true);
+        expect(appComponent.tabHeader._showPaginationControls).toBe(true);
       });
 
       it('should scroll to show the focused tab label', () => {
         appComponent.addTabsForScrolling();
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader.scrollDistance).toBe(0);
+        expect(appComponent.tabHeader.scrollDistance).toBe(0);
 
         // Focus on the last tab, expect this to be the maximum scroll distance.
-        appComponent.mdTabHeader.focusIndex = appComponent.tabs.length - 1;
+        appComponent.tabHeader.focusIndex = appComponent.tabs.length - 1;
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader.scrollDistance)
-            .toBe(appComponent.mdTabHeader._getMaxScrollDistance());
+        expect(appComponent.tabHeader.scrollDistance)
+            .toBe(appComponent.tabHeader._getMaxScrollDistance());
 
         // Focus on the first tab, expect this to be the maximum scroll distance.
-        appComponent.mdTabHeader.focusIndex = 0;
+        appComponent.tabHeader.focusIndex = 0;
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader.scrollDistance).toBe(0);
+        expect(appComponent.tabHeader.scrollDistance).toBe(0);
       });
 
       it('should show ripples for pagination buttons', () => {
         appComponent.addTabsForScrolling();
         fixture.detectChanges();
 
-        expect(appComponent.mdTabHeader._showPaginationControls).toBe(true);
+        expect(appComponent.tabHeader._showPaginationControls).toBe(true);
 
         const buttonAfter = fixture.debugElement.query(By.css('.mat-tab-header-pagination-after'));
 
@@ -200,7 +200,7 @@ describe('MdTabHeader', () => {
         appComponent.disableRipple = true;
         fixture.detectChanges();
 
-        expect(appComponent.mdTabHeader._showPaginationControls).toBe(true);
+        expect(appComponent.tabHeader._showPaginationControls).toBe(true);
 
         const buttonAfter = fixture.debugElement.query(By.css('.mat-tab-header-pagination-after'));
 
@@ -229,25 +229,25 @@ describe('MdTabHeader', () => {
       it('should scroll to show the focused tab label', () => {
         appComponent.addTabsForScrolling();
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader.scrollDistance).toBe(0);
+        expect(appComponent.tabHeader.scrollDistance).toBe(0);
 
         // Focus on the last tab, expect this to be the maximum scroll distance.
-        appComponent.mdTabHeader.focusIndex = appComponent.tabs.length - 1;
+        appComponent.tabHeader.focusIndex = appComponent.tabs.length - 1;
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader.scrollDistance)
-            .toBe(appComponent.mdTabHeader._getMaxScrollDistance());
+        expect(appComponent.tabHeader.scrollDistance)
+            .toBe(appComponent.tabHeader._getMaxScrollDistance());
 
         // Focus on the first tab, expect this to be the maximum scroll distance.
-        appComponent.mdTabHeader.focusIndex = 0;
+        appComponent.tabHeader.focusIndex = 0;
         fixture.detectChanges();
-        expect(appComponent.mdTabHeader.scrollDistance).toBe(0);
+        expect(appComponent.tabHeader.scrollDistance).toBe(0);
       });
     });
 
     it('should re-align the ink bar when the direction changes', () => {
       fixture = TestBed.createComponent(SimpleTabHeaderApp);
 
-      const inkBar = fixture.componentInstance.mdTabHeader._inkBar;
+      const inkBar = fixture.componentInstance.tabHeader._inkBar;
       spyOn(inkBar, 'alignToElement');
 
       fixture.detectChanges();
@@ -262,7 +262,7 @@ describe('MdTabHeader', () => {
       fixture = TestBed.createComponent(SimpleTabHeaderApp);
       fixture.detectChanges();
 
-      const inkBar = fixture.componentInstance.mdTabHeader._inkBar;
+      const inkBar = fixture.componentInstance.tabHeader._inkBar;
 
       spyOn(inkBar, 'alignToElement');
 
@@ -277,7 +277,7 @@ describe('MdTabHeader', () => {
     it('should update arrows when the window is resized', fakeAsync(() => {
       fixture = TestBed.createComponent(SimpleTabHeaderApp);
 
-      const header = fixture.componentInstance.mdTabHeader;
+      const header = fixture.componentInstance.tabHeader;
 
       spyOn(header, '_checkPaginationEnabled');
 
@@ -300,16 +300,16 @@ interface Tab {
 @Component({
   template: `
   <div [dir]="dir">
-    <md-tab-header [selectedIndex]="selectedIndex" [disableRipple]="disableRipple"
+    <mat-tab-header [selectedIndex]="selectedIndex" [disableRipple]="disableRipple"
                (indexFocused)="focusedIndex = $event"
                (selectFocusedIndex)="selectedIndex = $event">
-      <div mdTabLabelWrapper style="min-width: 30px; width: 30px"
+      <div matTabLabelWrapper style="min-width: 30px; width: 30px"
            *ngFor="let tab of tabs; let i = index"
            [disabled]="!!tab.disabled"
            (click)="selectedIndex = i">
          {{tab.label}}
       </div>
-    </md-tab-header>
+    </mat-tab-header>
   </div>
   `,
   styles: [`
@@ -326,7 +326,7 @@ class SimpleTabHeaderApp {
   tabs: Tab[] = [{label: 'tab one'}, {label: 'tab one'}, {label: 'tab one'}, {label: 'tab one'}];
   dir: Direction = 'ltr';
 
-  @ViewChild(MdTabHeader) mdTabHeader: MdTabHeader;
+  @ViewChild(MatTabHeader) tabHeader: MatTabHeader;
 
   constructor() {
     this.tabs[this.disabledTabIndex].disabled = true;
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 782c20284083..8132ebf6ab3a 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -27,16 +27,13 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {
-  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
-  mixinDisableRipple
-} from '@angular/material/core';
+import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subscription} from 'rxjs/Subscription';
-import {MdInkBar} from './ink-bar';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
+import {MatInkBar} from './ink-bar';
+import {MatTabLabelWrapper} from './tab-label-wrapper';
 
 
 /**
@@ -52,10 +49,10 @@ export type ScrollDirection = 'after' | 'before';
  */
 const EXAGGERATED_OVERSCROLL = 60;
 
-// Boilerplate for applying mixins to MdTabHeader.
+// Boilerplate for applying mixins to MatTabHeader.
 /** @docs-private */
-export class MdTabHeaderBase {}
-export const _MdTabHeaderMixinBase = mixinDisableRipple(MdTabHeaderBase);
+export class MatTabHeaderBase {}
+export const _MatTabHeaderMixinBase = mixinDisableRipple(MatTabHeaderBase);
 
 /**
  * The header of the tab group which displays a list of all the tabs in the tab group. Includes
@@ -66,7 +63,7 @@ export const _MdTabHeaderMixinBase = mixinDisableRipple(MdTabHeaderBase);
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-tab-header, mat-tab-header',
+  selector: 'mat-tab-header',
   templateUrl: 'tab-header.html',
   styleUrls: ['tab-header.css'],
   inputs: ['disableRipple'],
@@ -78,13 +75,12 @@ export const _MdTabHeaderMixinBase = mixinDisableRipple(MdTabHeaderBase);
     '[class.mat-tab-header-pagination-controls-enabled]': '_showPaginationControls',
     '[class.mat-tab-header-rtl]': "_getLayoutDirection() == 'rtl'",
   },
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdTabHeader extends _MdTabHeaderMixinBase
+export class MatTabHeader extends _MatTabHeaderMixinBase
     implements AfterContentChecked, AfterContentInit, OnDestroy, CanDisableRipple {
 
-  @ContentChildren(MdTabLabelWrapper) _labelWrappers: QueryList<MdTabLabelWrapper>;
-  @ViewChild(MdInkBar) _inkBar: MdInkBar;
+  @ContentChildren(MatTabLabelWrapper) _labelWrappers: QueryList<MatTabLabelWrapper>;
+  @ViewChild(MatInkBar) _inkBar: MatInkBar;
   @ViewChild('tabListContainer') _tabListContainer: ElementRef;
   @ViewChild('tabList') _tabList: ElementRef;
 
@@ -277,7 +273,7 @@ export class MdTabHeader extends _MdTabHeaderMixinBase
    */
   _moveFocus(offset: number) {
     if (this._labelWrappers) {
-      const tabs: MdTabLabelWrapper[] = this._labelWrappers.toArray();
+      const tabs: MatTabLabelWrapper[] = this._labelWrappers.toArray();
 
       for (let i = this.focusIndex + offset; i < tabs.length && i >= 0; i += offset) {
         if (this._isValidIndex(i)) {
diff --git a/src/lib/tabs/tab-label-wrapper.ts b/src/lib/tabs/tab-label-wrapper.ts
index 6dcc39f556bf..eecb69e12b9b 100644
--- a/src/lib/tabs/tab-label-wrapper.ts
+++ b/src/lib/tabs/tab-label-wrapper.ts
@@ -9,23 +9,23 @@
 import {Directive, ElementRef} from '@angular/core';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
 
-// Boilerplate for applying mixins to MdTabLabelWrapper.
+// Boilerplate for applying mixins to MatTabLabelWrapper.
 /** @docs-private */
-export class MdTabLabelWrapperBase {}
-export const _MdTabLabelWrapperMixinBase = mixinDisabled(MdTabLabelWrapperBase);
+export class MatTabLabelWrapperBase {}
+export const _MatTabLabelWrapperMixinBase = mixinDisabled(MatTabLabelWrapperBase);
 
 /**
- * Used in the `md-tab-group` view to display tab labels.
+ * Used in the `mat-tab-group` view to display tab labels.
  * @docs-private
  */
 @Directive({
-  selector: '[mdTabLabelWrapper], [matTabLabelWrapper]',
+  selector: '[matTabLabelWrapper]',
   inputs: ['disabled'],
   host: {
     '[class.mat-tab-disabled]': 'disabled'
   }
 })
-export class MdTabLabelWrapper extends _MdTabLabelWrapperMixinBase implements CanDisable {
+export class MatTabLabelWrapper extends _MatTabLabelWrapperMixinBase implements CanDisable {
   constructor(public elementRef: ElementRef) {
     super();
   }
diff --git a/src/lib/tabs/tab-label.ts b/src/lib/tabs/tab-label.ts
index 216feff44efb..6704220f8e08 100644
--- a/src/lib/tabs/tab-label.ts
+++ b/src/lib/tabs/tab-label.ts
@@ -10,13 +10,13 @@ import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
 import {TemplatePortalDirective} from '@angular/cdk/portal';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MdTabLabelBaseClass = TemplatePortalDirective;
+export const _MatTabLabelBaseClass = TemplatePortalDirective;
 
 /** Used to flag tab labels for use with the portal directive */
 @Directive({
-  selector: '[md-tab-label], [mat-tab-label], [mdTabLabel], [matTabLabel]',
+  selector: '[mat-tab-label], [matTabLabel]',
 })
-export class MdTabLabel extends _MdTabLabelBaseClass {
+export class MatTabLabel extends _MatTabLabelBaseClass {
   constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
     super(templateRef, viewContainerRef);
   }
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index e38e006ad6a0..19eb376cd0db 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -5,16 +5,16 @@ import {ViewportRuler} from '@angular/cdk/scrolling';
 import {dispatchFakeEvent, dispatchMouseEvent, FakeViewportRuler} from '@angular/cdk/testing';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {Subject} from 'rxjs/Subject';
-import {MdTabNav, MdTabsModule, MdTabLink} from '../index';
+import {MatTabNav, MatTabsModule, MatTabLink} from '../index';
 
 
-describe('MdTabNavBar', () => {
+describe('MatTabNavBar', () => {
   let dir: Direction = 'ltr';
   let dirChange = new Subject();
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdTabsModule],
+      imports: [MatTabsModule],
       declarations: [
         SimpleTabNavBarTestApp,
         TabLinkWithNgIf,
@@ -80,8 +80,8 @@ describe('MdTabNavBar', () => {
     });
 
     it('should update the disableRipple property on each tab link', () => {
-      const tabLinkElements = fixture.debugElement.queryAll(By.directive(MdTabLink))
-        .map(tabLinkDebug => tabLinkDebug.componentInstance) as MdTabLink[];
+      const tabLinkElements = fixture.debugElement.queryAll(By.directive(MatTabLink))
+        .map(tabLinkDebug => tabLinkDebug.componentInstance) as MatTabLink[];
 
       expect(tabLinkElements.every(tabLink => !tabLink.disableRipple))
         .toBe(true, 'Expected every tab link to have ripples enabled');
@@ -120,7 +120,7 @@ describe('MdTabNavBar', () => {
     it('should be able to disable ripples on a tab link', () => {
       const tabLinkDebug = fixture.debugElement.query(By.css('a'));
       const tabLinkElement = tabLinkDebug.nativeElement;
-      const tabLinkInstance = tabLinkDebug.injector.get(MdTabLink);
+      const tabLinkInstance = tabLinkDebug.injector.get(MatTabLink);
 
       tabLinkInstance.disableRipple = true;
 
@@ -199,8 +199,8 @@ describe('MdTabNavBar', () => {
 @Component({
   selector: 'test-app',
   template: `
-    <nav md-tab-nav-bar [disableRipple]="disableRipple">
-      <a md-tab-link
+    <nav mat-tab-nav-bar [disableRipple]="disableRipple">
+      <a mat-tab-link
          *ngFor="let tab of tabs; let index = index"
          [active]="activeIndex === index"
          [disabled]="disabled"
@@ -211,7 +211,7 @@ describe('MdTabNavBar', () => {
   `
 })
 class SimpleTabNavBarTestApp {
-  @ViewChild(MdTabNav) tabNavBar: MdTabNav;
+  @ViewChild(MatTabNav) tabNavBar: MatTabNav;
 
   label = '';
   disabled: boolean = false;
@@ -223,8 +223,8 @@ class SimpleTabNavBarTestApp {
 
 @Component({
   template: `
-    <nav md-tab-nav-bar>
-      <a md-tab-link *ngIf="!isDestroyed">Link</a>
+    <nav mat-tab-nav-bar>
+      <a mat-tab-link *ngIf="!isDestroyed">Link</a>
     </nav>
   `
 })
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 99eb7ecf993f..8ab3170ce8cd 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -33,9 +33,9 @@ import {
 import {
   CanColor,
   CanDisable,
-  CanDisableRipple, MATERIAL_COMPATIBILITY_MODE,
-  MD_RIPPLE_GLOBAL_OPTIONS,
-  MdRipple,
+  CanDisableRipple,
+  MAT_RIPPLE_GLOBAL_OPTIONS,
+  MatRipple,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
@@ -46,15 +46,15 @@ import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subject} from 'rxjs/Subject';
-import {MdInkBar} from '../ink-bar';
+import {MatInkBar} from '../ink-bar';
 
 
-// Boilerplate for applying mixins to MdTabNav.
+// Boilerplate for applying mixins to MatTabNav.
 /** @docs-private */
-export class MdTabNavBase {
+export class MatTabNavBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdTabNavMixinBase = mixinDisableRipple(mixinColor(MdTabNavBase, 'primary'));
+export const _MatTabNavMixinBase = mixinDisableRipple(mixinColor(MatTabNavBase, 'primary'));
 
 /**
  * Navigation component matching the styles of the tab group header.
@@ -62,7 +62,7 @@ export const _MdTabNavMixinBase = mixinDisableRipple(mixinColor(MdTabNavBase, 'p
  */
 @Component({
   moduleId: module.id,
-  selector: '[md-tab-nav-bar], [mat-tab-nav-bar]',
+  selector: '[mat-tab-nav-bar]',
   inputs: ['color', 'disableRipple'],
   templateUrl: 'tab-nav-bar.html',
   styleUrls: ['tab-nav-bar.css'],
@@ -70,9 +70,8 @@ export const _MdTabNavMixinBase = mixinDisableRipple(mixinColor(MdTabNavBase, 'p
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, CanColor,
+export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit, CanColor,
     CanDisableRipple, OnDestroy {
 
   /** Subject that emits when the component has been destroyed. */
@@ -81,11 +80,11 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
   _activeLinkChanged: boolean;
   _activeLinkElement: ElementRef;
 
-  @ViewChild(MdInkBar) _inkBar: MdInkBar;
+  @ViewChild(MatInkBar) _inkBar: MatInkBar;
 
   /** Query list of all tab links of the tab navigation. */
-  @ContentChildren(forwardRef(() => MdTabLink), {descendants: true})
-  _tabLinks: QueryList<MdTabLink>;
+  @ContentChildren(forwardRef(() => MatTabLink), {descendants: true})
+  _tabLinks: QueryList<MatTabLink>;
 
   /** Background color of the tab nav. */
   @Input()
@@ -173,15 +172,15 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
 }
 
 
-// Boilerplate for applying mixins to MdTabLink.
-export class MdTabLinkBase {}
-export const _MdTabLinkMixinBase = mixinDisabled(MdTabLinkBase);
+// Boilerplate for applying mixins to MatTabLink.
+export class MatTabLinkBase {}
+export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
 
 /**
- * Link inside of a `md-tab-nav-bar`.
+ * Link inside of a `mat-tab-nav-bar`.
  */
 @Directive({
-  selector: '[md-tab-link], [mat-tab-link], [mdTabLink], [matTabLink]',
+  selector: '[mat-tab-link], [matTabLink]',
   inputs: ['disabled'],
   host: {
     'class': 'mat-tab-link',
@@ -190,7 +189,7 @@ export const _MdTabLinkMixinBase = mixinDisabled(MdTabLinkBase);
     '[class.mat-tab-disabled]': 'disabled'
   }
 })
-export class MdTabLink extends _MdTabLinkMixinBase implements OnDestroy, CanDisable {
+export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDisable {
   /** Whether the tab link is active or not. */
   private _isActive: boolean = false;
 
@@ -198,7 +197,7 @@ export class MdTabLink extends _MdTabLinkMixinBase implements OnDestroy, CanDisa
   private _disableRipple: boolean = false;
 
   /** Reference to the instance of the ripple for the tab link. */
-  private _tabLinkRipple: MdRipple;
+  private _tabLinkRipple: MatRipple;
 
   /** Whether the link is active. */
   @Input()
@@ -206,7 +205,7 @@ export class MdTabLink extends _MdTabLinkMixinBase implements OnDestroy, CanDisa
   set active(value: boolean) {
     this._isActive = value;
     if (value) {
-      this._mdTabNavBar.updateActiveLink(this._elementRef);
+      this._tabNavBar.updateActiveLink(this._elementRef);
     }
   }
 
@@ -223,17 +222,17 @@ export class MdTabLink extends _MdTabLinkMixinBase implements OnDestroy, CanDisa
     return this.disabled ? -1 : 0;
   }
 
-  constructor(private _mdTabNavBar: MdTabNav,
+  constructor(private _tabNavBar: MatTabNav,
               private _elementRef: ElementRef,
               ngZone: NgZone,
               ruler: ViewportRuler,
               platform: Platform,
-              @Optional() @Inject(MD_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions) {
+              @Optional() @Inject(MAT_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions) {
     super();
 
     // Manually create a ripple instance that uses the tab link element as trigger element.
     // Notice that the lifecycle hooks for the ripple config won't be called anymore.
-    this._tabLinkRipple = new MdRipple(_elementRef, ngZone, ruler, platform, globalOptions);
+    this._tabLinkRipple = new MatRipple(_elementRef, ngZone, ruler, platform, globalOptions);
   }
 
   ngOnDestroy() {
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index 852c9aa84d92..f1a29aa84d3f 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -23,29 +23,29 @@ import {
 } from '@angular/core';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
-import {MdTabLabel} from './tab-label';
+import {MatTabLabel} from './tab-label';
 
 
-// Boilerplate for applying mixins to MdTab.
+// Boilerplate for applying mixins to MatTab.
 /** @docs-private */
-export class MdTabBase {}
-export const _MdTabMixinBase = mixinDisabled(MdTabBase);
+export class MatTabBase {}
+export const _MatTabMixinBase = mixinDisabled(MatTabBase);
 
 @Component({
   moduleId: module.id,
-  selector: 'md-tab, mat-tab',
+  selector: 'mat-tab',
   templateUrl: 'tab.html',
   inputs: ['disabled'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
-  exportAs: 'mdTab, matTab',
+  exportAs: 'matTab',
 })
-export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChanges, OnDestroy {
-  /** Content for the tab label given by <ng-template md-tab-label>. */
-  @ContentChild(MdTabLabel) templateLabel: MdTabLabel;
+export class MatTab extends _MatTabMixinBase implements OnInit, CanDisable, OnChanges, OnDestroy {
+  /** Content for the tab label given by <ng-template mat-tab-label>. */
+  @ContentChild(MatTabLabel) templateLabel: MatTabLabel;
 
-  /** Template inside the MdTab view that contains an <ng-content>. */
+  /** Template inside the MatTab view that contains an <ng-content>. */
   @ViewChild(TemplateRef) _content: TemplateRef<any>;
 
   /** The plain text label for the tab, used when there is no template label. */
diff --git a/src/lib/tabs/tabs-module.ts b/src/lib/tabs/tabs-module.ts
index ee93f03ec4f4..9c0f0e3c514b 100644
--- a/src/lib/tabs/tabs-module.ts
+++ b/src/lib/tabs/tabs-module.ts
@@ -11,46 +11,46 @@ import {PortalModule} from '@angular/cdk/portal';
 import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdCommonModule, MdRippleModule} from '@angular/material/core';
-import {MdInkBar} from './ink-bar';
-import {MdTab} from './tab';
-import {MdTabBody} from './tab-body';
-import {MdTabGroup} from './tab-group';
-import {MdTabHeader} from './tab-header';
-import {MdTabLabel} from './tab-label';
-import {MdTabLabelWrapper} from './tab-label-wrapper';
-import {MdTabLink, MdTabNav} from './tab-nav-bar/tab-nav-bar';
+import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatInkBar} from './ink-bar';
+import {MatTab} from './tab';
+import {MatTabBody} from './tab-body';
+import {MatTabGroup} from './tab-group';
+import {MatTabHeader} from './tab-header';
+import {MatTabLabel} from './tab-label';
+import {MatTabLabelWrapper} from './tab-label-wrapper';
+import {MatTabLink, MatTabNav} from './tab-nav-bar/tab-nav-bar';
 
 
 @NgModule({
   imports: [
     CommonModule,
-    MdCommonModule,
+    MatCommonModule,
     PortalModule,
-    MdRippleModule,
+    MatRippleModule,
     ObserversModule,
     ScrollDispatchModule,
   ],
   // Don't export all components because some are only to be used internally.
   exports: [
-    MdCommonModule,
-    MdTabGroup,
-    MdTabLabel,
-    MdTab,
-    MdTabNav,
-    MdTabLink,
+    MatCommonModule,
+    MatTabGroup,
+    MatTabLabel,
+    MatTab,
+    MatTabNav,
+    MatTabLink,
   ],
   declarations: [
-    MdTabGroup,
-    MdTabLabel,
-    MdTab,
-    MdInkBar,
-    MdTabLabelWrapper,
-    MdTabNav,
-    MdTabLink,
-    MdTabBody,
-    MdTabHeader
+    MatTabGroup,
+    MatTabLabel,
+    MatTab,
+    MatInkBar,
+    MatTabLabelWrapper,
+    MatTabNav,
+    MatTabLink,
+    MatTabBody,
+    MatTabHeader
   ],
   providers: [VIEWPORT_RULER_PROVIDER],
 })
-export class MdTabsModule {}
+export class MatTabsModule {}
diff --git a/src/lib/tabs/tabs.md b/src/lib/tabs/tabs.md
index 06070051fe68..44eae40a5ddf 100644
--- a/src/lib/tabs/tabs.md
+++ b/src/lib/tabs/tabs.md
@@ -20,37 +20,37 @@ the header, usually through keyboard navigation.
 If a tab's label is only text then the simple tab-group API can be used.
 
 ```html
-<md-tab-group>
-  <md-tab label="One">
+<mat-tab-group>
+  <mat-tab label="One">
     <h1>Some tab content</h1>
     <p>...</p>
-  </md-tab>
-  <md-tab label="Two">
+  </mat-tab>
+  <mat-tab label="Two">
     <h1>Some more tab content</h1>
     <p>...</p>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 ```
 
-For more complex labels, add a template with the `md-tab-label` directive inside the `md-tab`.
+For more complex labels, add a template with the `mat-tab-label` directive inside the `mat-tab`.
 
 ```html
-<md-tab-group>
-  <md-tab>
-    <ng-template md-tab-label>
+<mat-tab-group>
+  <mat-tab>
+    <ng-template mat-tab-label>
       The <em>best</em> pasta
     </ng-template>
     <h1>Best pasta restaurants</h1>
     <p>...</p>
-  </md-tab>
-  <md-tab>
-    <ng-template md-tab-label>
-      <md-icon>thumb_down</md-icon> The worst sushi
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
+      <mat-icon>thumb_down</mat-icon> The worst sushi
     </ng-template>
     <h1>Terrible sushi restaurants</h1>
     <p>...</p>
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 ```
 
 ### Dynamic Height
@@ -60,11 +60,11 @@ change this, set the `dynamicHeight` input to true. The tab body will animate it
  to the height of the active tab.
 
 ### Tabs and navigation
-While `<md-tab-group>` is used to switch between views within a single route, `<nav md-tab-nav-bar>`
+While `<mat-tab-group>` is used to switch between views within a single route, `<nav mat-tab-nav-bar>`
 provides a tab-like UI for navigating between routes.
 ```html
-<nav md-tab-nav-bar>
-  <a md-tab-link
+<nav mat-tab-nav-bar>
+  <a mat-tab-link
      *ngFor="let link of navLinks"
      [routerLink]="link"
      routerLinkActive #rla="routerLinkActive"
@@ -82,7 +82,7 @@ the `active` property to determine which tab is currently active. The correspond
 
 ### Accessibility
 Tabs without text or labels should be given a meaningful label via `aria-label` or
-`aria-labelledby`. For `MdTabNav`, the `<nav>` element should have a label as well.
+`aria-labelledby`. For `MatTabNav`, the `<nav>` element should have a label as well.
 
 
 #### Keyboard shortcuts
diff --git a/src/lib/toolbar/mat-exports.ts b/src/lib/toolbar/mat-exports.ts
deleted file mode 100644
index 3e69041d0ebd..000000000000
--- a/src/lib/toolbar/mat-exports.ts
+++ /dev/null
@@ -1,16 +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 {MdToolbar, MdToolbarBase, MdToolbarRow} from './toolbar';
-import {MdToolbarModule} from './toolbar-module';
-
-
-export {MdToolbar as MatToolbar};
-export {MdToolbarBase as MatToolbarBase};
-export {MdToolbarModule as MatToolbarModule};
-export {MdToolbarRow as MatToolbarRow};
diff --git a/src/lib/toolbar/public_api.ts b/src/lib/toolbar/public_api.ts
index 24b5e4c62462..6a4d6c7635ed 100644
--- a/src/lib/toolbar/public_api.ts
+++ b/src/lib/toolbar/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './toolbar-module';
 export * from './toolbar';
-export * from './mat-exports';
+
diff --git a/src/lib/toolbar/toolbar-module.ts b/src/lib/toolbar/toolbar-module.ts
index b4eee3b54a58..b974fd224417 100644
--- a/src/lib/toolbar/toolbar-module.ts
+++ b/src/lib/toolbar/toolbar-module.ts
@@ -7,13 +7,13 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MdToolbar, MdToolbarRow} from './toolbar';
+import {MatCommonModule} from '@angular/material/core';
+import {MatToolbar, MatToolbarRow} from './toolbar';
 
 
 @NgModule({
-  imports: [MdCommonModule],
-  exports: [MdToolbar, MdToolbarRow, MdCommonModule],
-  declarations: [MdToolbar, MdToolbarRow],
+  imports: [MatCommonModule],
+  exports: [MatToolbar, MatToolbarRow, MatCommonModule],
+  declarations: [MatToolbar, MatToolbarRow],
 })
-export class MdToolbarModule {}
+export class MatToolbarModule {}
diff --git a/src/lib/toolbar/toolbar.html b/src/lib/toolbar/toolbar.html
index 88eed7dbff08..a9f577369010 100644
--- a/src/lib/toolbar/toolbar.html
+++ b/src/lib/toolbar/toolbar.html
@@ -2,5 +2,5 @@
   <mat-toolbar-row>
     <ng-content></ng-content>
   </mat-toolbar-row>
-  <ng-content select="md-toolbar-row, mat-toolbar-row"></ng-content>
+  <ng-content select="mat-toolbar-row"></ng-content>
 </div>
diff --git a/src/lib/toolbar/toolbar.md b/src/lib/toolbar/toolbar.md
index cfc2879b0c17..c6bebe838470 100644
--- a/src/lib/toolbar/toolbar.md
+++ b/src/lib/toolbar/toolbar.md
@@ -1,24 +1,24 @@
-`<md-toolbar>` is a container for headers, titles, or actions.
+`<mat-toolbar>` is a container for headers, titles, or actions.
 
 <!-- example(toolbar-overview) -->
 
 ### Multiple rows
-Toolbars can have multiple rows using `<md-toolbar-row>` elements. Any content outside of an 
-`<md-toolbar-row>` element are automatically placed inside of one at the beginning of the toolbar.
+Toolbars can have multiple rows using `<mat-toolbar-row>` elements. Any content outside of an 
+`<mat-toolbar-row>` element are automatically placed inside of one at the beginning of the toolbar.
 Each toolbar row is a `display: flex` container.
 
 ```html
-<md-toolbar>
+<mat-toolbar>
   <span>First Row</span>
   
-  <md-toolbar-row>
+  <mat-toolbar-row>
     <span>Second Row</span>
-  </md-toolbar-row>
+  </mat-toolbar-row>
   
-  <md-toolbar-row>
+  <mat-toolbar-row>
     <span>Third Row</span>
-  </md-toolbar-row>
-</md-toolbar>
+  </mat-toolbar-row>
+</mat-toolbar>
 ```
 
 ### Positioning toolbar content
@@ -28,14 +28,14 @@ position the content as it suits their application.
 A common pattern is to position a title on the left with some actions on the right. This can be
 easily accomplished with `display: flex`:
 ```html
-<md-toolbar color="primary">
+<mat-toolbar color="primary">
   <span>Application Title</span>
   
   <!-- This fills the remaining space of the current row -->
   <span class="example-fill-remaining-space"></span>
   
   <span>Right Aligned Text</span>
-</md-toolbar>
+</mat-toolbar>
 ```
 ```scss
 .example-fill-remaining-space {
@@ -46,7 +46,7 @@ easily accomplished with `display: flex`:
 ```
 
 ### Theming
-The color of a `<md-toolbar>` can be changed by using the `color` property. By default, toolbars
+The color of a `<mat-toolbar>` can be changed by using the `color` property. By default, toolbars
 use a neutral background color based on the current theme (light or dark). This can be changed to 
 `'primary'`, `'accent'`, or `'warn'`.  
 
diff --git a/src/lib/toolbar/toolbar.spec.ts b/src/lib/toolbar/toolbar.spec.ts
index 6e0c6d4da7cd..bfe43e7d0c2c 100644
--- a/src/lib/toolbar/toolbar.spec.ts
+++ b/src/lib/toolbar/toolbar.spec.ts
@@ -1,10 +1,10 @@
 import {Component} from '@angular/core';
 import {TestBed, async, ComponentFixture} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdToolbarModule} from './index';
+import {MatToolbarModule} from './index';
 
 
-describe('MdToolbar', () => {
+describe('MatToolbar', () => {
 
   let fixture: ComponentFixture<TestApp>;
   let testComponent: TestApp;
@@ -12,7 +12,7 @@ describe('MdToolbar', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdToolbarModule],
+      imports: [MatToolbarModule],
       declarations: [TestApp],
     });
 
@@ -22,7 +22,7 @@ describe('MdToolbar', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(TestApp);
     testComponent = fixture.debugElement.componentInstance;
-    toolbarElement = fixture.debugElement.query(By.css('md-toolbar')).nativeElement;
+    toolbarElement = fixture.debugElement.query(By.css('mat-toolbar')).nativeElement;
   });
 
   it('should apply class based on color attribute', () => {
@@ -51,7 +51,7 @@ describe('MdToolbar', () => {
 });
 
 
-@Component({template: `<md-toolbar [color]="toolbarColor">Test Toolbar</md-toolbar>`})
+@Component({template: `<mat-toolbar [color]="toolbarColor">Test Toolbar</mat-toolbar>`})
 class TestApp {
   toolbarColor: string;
 }
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index 42c852af0460..b27331206107 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -7,33 +7,33 @@
  */
 
 import {
-  Component,
   ChangeDetectionStrategy,
-  ViewEncapsulation,
+  Component,
   Directive,
   ElementRef,
   Renderer2,
+  ViewEncapsulation,
 } from '@angular/core';
-import {CanColor, MATERIAL_COMPATIBILITY_MODE, mixinColor} from '@angular/material/core';
+import {CanColor, mixinColor} from '@angular/material/core';
 
 
 @Directive({
-  selector: 'md-toolbar-row, mat-toolbar-row',
+  selector: 'mat-toolbar-row',
   host: {'class': 'mat-toolbar-row'},
 })
-export class MdToolbarRow {}
+export class MatToolbarRow {}
 
-// Boilerplate for applying mixins to MdToolbar.
+// Boilerplate for applying mixins to MatToolbar.
 /** @docs-private */
-export class MdToolbarBase {
+export class MatToolbarBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MdToolbarMixinBase = mixinColor(MdToolbarBase);
+export const _MatToolbarMixinBase = mixinColor(MatToolbarBase);
 
 
 @Component({
   moduleId: module.id,
-  selector: 'md-toolbar, mat-toolbar',
+  selector: 'mat-toolbar',
   templateUrl: 'toolbar.html',
   styleUrls: ['toolbar.css'],
   inputs: ['color'],
@@ -44,9 +44,8 @@ export const _MdToolbarMixinBase = mixinColor(MdToolbarBase);
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
-  viewProviders: [{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}],
 })
-export class MdToolbar extends _MdToolbarMixinBase implements CanColor {
+export class MatToolbar extends _MatToolbarMixinBase implements CanColor {
 
   constructor(renderer: Renderer2, elementRef: ElementRef) {
     super(renderer, elementRef);
diff --git a/src/lib/tooltip/mat-exports.ts b/src/lib/tooltip/mat-exports.ts
deleted file mode 100644
index 080519017a01..000000000000
--- a/src/lib/tooltip/mat-exports.ts
+++ /dev/null
@@ -1,23 +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 {
-  MD_TOOLTIP_SCROLL_STRATEGY,
-  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER,
-  MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY,
-  MdTooltip,
-} from './tooltip';
-import {MdTooltipModule} from './tooltip-module';
-
-
-/* tslint:disable:max-line-length */
-export {MdTooltip as MatTooltip};
-export {MdTooltipModule as MatTooltipModule};
-export {MD_TOOLTIP_SCROLL_STRATEGY as MAT_TOOLTIP_SCROLL_STRATEGY};
-export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER};
-export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY};
diff --git a/src/lib/tooltip/public_api.ts b/src/lib/tooltip/public_api.ts
index 2de9d7df0b3d..7bb70a658c74 100644
--- a/src/lib/tooltip/public_api.ts
+++ b/src/lib/tooltip/public_api.ts
@@ -8,4 +8,4 @@
 
 export * from './tooltip-module';
 export * from './tooltip';
-export * from './mat-exports';
+
diff --git a/src/lib/tooltip/tooltip-module.ts b/src/lib/tooltip/tooltip-module.ts
index 3ea824d9d0f9..8c49d490fd41 100644
--- a/src/lib/tooltip/tooltip-module.ts
+++ b/src/lib/tooltip/tooltip-module.ts
@@ -11,21 +11,21 @@ import {OverlayModule} from '@angular/cdk/overlay';
 import {PlatformModule} from '@angular/cdk/platform';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MdCommonModule} from '@angular/material/core';
-import {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, MdTooltip, TooltipComponent} from './tooltip';
+import {MatCommonModule} from '@angular/material/core';
+import {MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER, MatTooltip, TooltipComponent} from './tooltip';
 
 
 @NgModule({
   imports: [
     CommonModule,
     OverlayModule,
-    MdCommonModule,
+    MatCommonModule,
     PlatformModule,
     A11yModule,
   ],
-  exports: [MdTooltip, TooltipComponent, MdCommonModule],
-  declarations: [MdTooltip, TooltipComponent],
+  exports: [MatTooltip, TooltipComponent, MatCommonModule],
+  declarations: [MatTooltip, TooltipComponent],
   entryComponents: [TooltipComponent],
-  providers: [MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
+  providers: [MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER, ARIA_DESCRIBER_PROVIDER],
 })
-export class MdTooltipModule {}
+export class MatTooltipModule {}
diff --git a/src/lib/tooltip/tooltip.md b/src/lib/tooltip/tooltip.md
index 5359617aebcd..d9efd12ad87a 100644
--- a/src/lib/tooltip/tooltip.md
+++ b/src/lib/tooltip/tooltip.md
@@ -5,7 +5,7 @@ over or longpresses an element.
 
 ### Positioning
 
-The tooltip will be displayed below the element but this can be configured using the `mdTooltipPosition`
+The tooltip will be displayed below the element but this can be configured using the `matTooltipPosition`
 input.
 The tooltip can be displayed above, below, left, or right of the element. By default the position
 will be below. If the tooltip should switch left/right positions in an RTL layout direction, then
@@ -25,7 +25,7 @@ the positions `before` and `after` should be used instead of `left` and `right`,
 
 The tooltip is immediately shown when the user's mouse hovers over the element and immediately
 hides when the user's mouse leaves. A delay in showing or hiding the tooltip can be added through
-the inputs `mdTooltipShowDelay` and `mdTooltipHideDelay`.
+the inputs `matTooltipShowDelay` and `matTooltipHideDelay`.
 
 On mobile, the tooltip is displayed when the user longpresses the element and hides after a
 delay of 1500ms. The longpress behavior requires HammerJS to be loaded on the page.
@@ -33,11 +33,11 @@ delay of 1500ms. The longpress behavior requires HammerJS to be loaded on the pa
 The tooltip can also be shown and hidden through the `show` and `hide` directive methods,
 which both accept a number in milliseconds to delay before applying the display change.
 
-To turn off the tooltip and prevent it from showing to the user, use the `mdTooltipDisabled` input flag.
+To turn off the tooltip and prevent it from showing to the user, use the `matTooltipDisabled` input flag.
 
 ### Accessibility
 
-Elements with the `mdTooltip` will add an `aria-describedby` label that provides a reference
+Elements with the `matTooltip` will add an `aria-describedby` label that provides a reference
 to a visually hidden element containing the tooltip's message. This provides screenreaders the
 information needed to read out the tooltip's contents when the end-user focuses on the element
 triggering the tooltip.
\ No newline at end of file
diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 1ab5abae667d..26e8f67bf331 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -22,8 +22,8 @@ import {Platform} from '@angular/cdk/platform';
 import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {
-  MdTooltip,
-  MdTooltipModule,
+  MatTooltip,
+  MatTooltipModule,
   SCROLL_THROTTLE_MS,
   TOOLTIP_PANEL_CLASS,
   TooltipPosition
@@ -32,13 +32,13 @@ import {
 
 const initialTooltipMessage = 'initial tooltip message';
 
-describe('MdTooltip', () => {
+describe('MatTooltip', () => {
   let overlayContainerElement: HTMLElement;
   let dir: {value: Direction};
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdTooltipModule, OverlayModule, NoopAnimationsModule],
+      imports: [MatTooltipModule, OverlayModule, NoopAnimationsModule],
       declarations: [
         BasicTooltipDemo,
         ScrollableTooltipDemo,
@@ -69,14 +69,14 @@ describe('MdTooltip', () => {
     let fixture: ComponentFixture<BasicTooltipDemo>;
     let buttonDebugElement: DebugElement;
     let buttonElement: HTMLButtonElement;
-    let tooltipDirective: MdTooltip;
+    let tooltipDirective: MatTooltip;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicTooltipDemo);
       fixture.detectChanges();
       buttonDebugElement = fixture.debugElement.query(By.css('button'));
       buttonElement = <HTMLButtonElement> buttonDebugElement.nativeElement;
-      tooltipDirective = buttonDebugElement.injector.get<MdTooltip>(MdTooltip);
+      tooltipDirective = buttonDebugElement.injector.get<MatTooltip>(MatTooltip);
     });
 
     it('should show and hide the tooltip', fakeAsync(() => {
@@ -273,9 +273,9 @@ describe('MdTooltip', () => {
       // Make sure classes aren't prematurely added
       let tooltipElement = overlayContainerElement.querySelector('.mat-tooltip') as HTMLElement;
       expect(tooltipElement.classList).not.toContain('custom-one',
-        'Expected to not have the class before enabling mdTooltipClass');
+        'Expected to not have the class before enabling matTooltipClass');
       expect(tooltipElement.classList).not.toContain('custom-two',
-        'Expected to not have the class before enabling mdTooltipClass');
+        'Expected to not have the class before enabling matTooltipClass');
 
       // Enable the classes via ngClass syntax
       fixture.componentInstance.showTooltipClass = true;
@@ -284,9 +284,9 @@ describe('MdTooltip', () => {
       // Make sure classes are correctly added
       tooltipElement = overlayContainerElement.querySelector('.mat-tooltip') as HTMLElement;
       expect(tooltipElement.classList).toContain('custom-one',
-        'Expected to have the class after enabling mdTooltipClass');
+        'Expected to have the class after enabling matTooltipClass');
       expect(tooltipElement.classList).toContain('custom-two',
-        'Expected to have the class after enabling mdTooltipClass');
+        'Expected to have the class after enabling matTooltipClass');
     }));
 
     it('should be removed after parent destroyed', fakeAsync(() => {
@@ -483,14 +483,14 @@ describe('MdTooltip', () => {
     let fixture: ComponentFixture<ScrollableTooltipDemo>;
     let buttonDebugElement: DebugElement;
     let buttonElement: HTMLButtonElement;
-    let tooltipDirective: MdTooltip;
+    let tooltipDirective: MatTooltip;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(ScrollableTooltipDemo);
       fixture.detectChanges();
       buttonDebugElement = fixture.debugElement.query(By.css('button'));
       buttonElement = <HTMLButtonElement> buttonDebugElement.nativeElement;
-      tooltipDirective = buttonDebugElement.injector.get<MdTooltip>(MdTooltip);
+      tooltipDirective = buttonDebugElement.injector.get<MatTooltip>(MatTooltip);
     });
 
     it('should hide tooltip if clipped after changing positions', fakeAsync(() => {
@@ -524,14 +524,14 @@ describe('MdTooltip', () => {
     let fixture: ComponentFixture<OnPushTooltipDemo>;
     let buttonDebugElement: DebugElement;
     let buttonElement: HTMLButtonElement;
-    let tooltipDirective: MdTooltip;
+    let tooltipDirective: MatTooltip;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(OnPushTooltipDemo);
       fixture.detectChanges();
       buttonDebugElement = fixture.debugElement.query(By.css('button'));
       buttonElement = <HTMLButtonElement> buttonDebugElement.nativeElement;
-      tooltipDirective = buttonDebugElement.injector.get<MdTooltip>(MdTooltip);
+      tooltipDirective = buttonDebugElement.injector.get<MatTooltip>(MatTooltip);
     });
 
     it('should show and hide the tooltip', fakeAsync(() => {
@@ -582,9 +582,9 @@ describe('MdTooltip', () => {
   selector: 'app',
   template: `
     <button *ngIf="showButton"
-            [mdTooltip]="message"
-            [mdTooltipPosition]="position"
-            [mdTooltipClass]="{'custom-one': showTooltipClass, 'custom-two': showTooltipClass }">
+            [matTooltip]="message"
+            [matTooltipPosition]="position"
+            [matTooltipClass]="{'custom-one': showTooltipClass, 'custom-two': showTooltipClass }">
       Button
     </button>`
 })
@@ -593,7 +593,7 @@ class BasicTooltipDemo {
   message: any = initialTooltipMessage;
   showButton: boolean = true;
   showTooltipClass = false;
-  @ViewChild(MdTooltip) tooltip: MdTooltip;
+  @ViewChild(MatTooltip) tooltip: MatTooltip;
 }
 
 @Component({
@@ -602,8 +602,8 @@ class BasicTooltipDemo {
     <div cdk-scrollable style="padding: 100px; margin: 300px;
                                height: 200px; width: 200px; overflow: auto;">
       <button *ngIf="showButton" style="margin-bottom: 600px"
-              [md-tooltip]="message"
-              [tooltip-position]="position">
+              [matTooltip]="message"
+              [matTooltipPosition]="position">
         Button
       </button>
     </div>`
@@ -629,8 +629,8 @@ class ScrollableTooltipDemo {
 @Component({
   selector: 'app',
   template: `
-    <button [mdTooltip]="message"
-            [mdTooltipPosition]="position">
+    <button [matTooltip]="message"
+            [matTooltipPosition]="position">
       Button
     </button>`,
   changeDetection: ChangeDetectionStrategy.OnPush
@@ -645,7 +645,7 @@ class OnPushTooltipDemo {
   selector: 'app',
   template: `
     <button *ngFor="let tooltip of tooltips"
-            [mdTooltip]="tooltip">
+            [matTooltip]="tooltip">
       Button {{tooltip}}
     </button>`,
 })
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 8fcfabef129f..4c54b6b9cce5 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -56,25 +56,25 @@ export const SCROLL_THROTTLE_MS = 20;
 export const TOOLTIP_PANEL_CLASS = 'mat-tooltip-panel';
 
 /** Creates an error to be thrown if the user supplied an invalid tooltip position. */
-export function getMdTooltipInvalidPositionError(position: string) {
+export function getMatTooltipInvalidPositionError(position: string) {
   return Error(`Tooltip position "${position}" is invalid.`);
 }
 
 /** Injection token that determines the scroll handling while a tooltip is visible. */
-export const MD_TOOLTIP_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('md-tooltip-scroll-strategy');
+export const MAT_TOOLTIP_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('mat-tooltip-scroll-strategy');
 
 /** @docs-private */
-export function MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition({ scrollThrottle: SCROLL_THROTTLE_MS });
 }
 
 /** @docs-private */
-export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
-  provide: MD_TOOLTIP_SCROLL_STRATEGY,
+export const MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
+  provide: MAT_TOOLTIP_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY
+  useFactory: MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY
 };
 /**
  * Directive that attaches a material design tooltip to the host element. Animates the showing and
@@ -83,7 +83,7 @@ export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
  * https://material.google.com/components/tooltips.html
  */
 @Directive({
-  selector: '[md-tooltip], [mdTooltip], [mat-tooltip], [matTooltip]',
+  selector: '[mat-tooltip], [matTooltip]',
   host: {
     '(longpress)': 'show()',
     '(focus)': 'show()',
@@ -91,9 +91,9 @@ export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
     '(keydown)': '_handleKeydown($event)',
     '(touchend)': 'hide(' + TOUCHEND_HIDE_DELAY + ')',
   },
-  exportAs: 'mdTooltip, matTooltip',
+  exportAs: 'matTooltip',
 })
-export class MdTooltip implements OnDestroy {
+export class MatTooltip implements OnDestroy {
   _overlayRef: OverlayRef | null;
   _tooltipInstance: TooltipComponent | null;
 
@@ -102,7 +102,7 @@ export class MdTooltip implements OnDestroy {
   private _tooltipClass: string|string[]|Set<string>|{[key: string]: any};
 
   /** Allows the user to define the position of the tooltip relative to the parent element */
-  @Input('mdTooltipPosition')
+  @Input('matTooltipPosition')
   get position(): TooltipPosition { return this._position; }
   set position(value: TooltipPosition) {
     if (value !== this._position) {
@@ -117,7 +117,7 @@ export class MdTooltip implements OnDestroy {
   }
 
   /** Disables the display of the tooltip. */
-  @Input('mdTooltipDisabled')
+  @Input('matTooltipDisabled')
   get disabled(): boolean { return this._disabled; }
   set disabled(value) {
     this._disabled = coerceBooleanProperty(value);
@@ -134,15 +134,15 @@ export class MdTooltip implements OnDestroy {
   set _positionDeprecated(value: TooltipPosition) { this._position = value; }
 
   /** The default delay in ms before showing the tooltip after show is called */
-  @Input('mdTooltipShowDelay') showDelay = 0;
+  @Input('matTooltipShowDelay') showDelay = 0;
 
   /** The default delay in ms before hiding the tooltip after hide is called */
-  @Input('mdTooltipHideDelay') hideDelay = 0;
+  @Input('matTooltipHideDelay') hideDelay = 0;
 
   private _message = '';
 
   /** The message to be displayed in the tooltip */
-  @Input('mdTooltip') get message() { return this._message; }
+  @Input('matTooltip') get message() { return this._message; }
   set message(value: string) {
     this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message);
 
@@ -153,7 +153,7 @@ export class MdTooltip implements OnDestroy {
   }
 
   /** Classes to be passed to the tooltip. Supports the same syntax as `ngClass`. */
-  @Input('mdTooltipClass')
+  @Input('matTooltipClass')
   get tooltipClass() { return this._tooltipClass; }
   set tooltipClass(value: string|string[]|Set<string>|{[key: string]: any}) {
     this._tooltipClass = value;
@@ -162,41 +162,6 @@ export class MdTooltip implements OnDestroy {
     }
   }
 
-  /** @deprecated */
-  @Input('md-tooltip')
-  get _deprecatedMessage(): string { return this.message; }
-  set _deprecatedMessage(v: string) { this.message = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matTooltip')
-  get _matMessage() { return this.message; }
-  set _matMessage(v) { this.message = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matTooltipPosition')
-  get _matPosition() { return this.position; }
-  set _matPosition(v) { this.position = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matTooltipDisabled')
-  get _matDisabled() { return this.disabled; }
-  set _matDisabled(v) { this.disabled = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matTooltipHideDelay')
-  get _matHideDelay() { return this.hideDelay; }
-  set _matHideDelay(v) { this.hideDelay = v; }
-
-  // Properties with `mat-` prefix for noconflict mode.
-  @Input('matTooltipShowDelay')
-  get _matShowDelay() { return this.showDelay; }
-  set _matShowDelay(v) { this.showDelay = v; }
-
-  // Properties with `mat-` prefix for nonconflict mode.
-  @Input('matTooltipClass')
-  get _matClass() { return this.tooltipClass; }
-  set _matClass(v) { this.tooltipClass = v; }
-
   private _enterListener: Function;
   private _leaveListener: Function;
 
@@ -209,7 +174,7 @@ export class MdTooltip implements OnDestroy {
     private _ngZone: NgZone,
     private _platform: Platform,
     private _ariaDescriber: AriaDescriber,
-    @Inject(MD_TOOLTIP_SCROLL_STRATEGY) private _scrollStrategy,
+    @Inject(MAT_TOOLTIP_SCROLL_STRATEGY) private _scrollStrategy,
     @Optional() private _dir: Directionality) {
 
     // The mouse events shouldn't be bound on iOS devices, because
@@ -350,7 +315,7 @@ export class MdTooltip implements OnDestroy {
       return {originX: 'end', originY: 'center'};
     }
 
-    throw getMdTooltipInvalidPositionError(this.position);
+    throw getMatTooltipInvalidPositionError(this.position);
   }
 
   /** Returns the overlay position based on the user's preference */
@@ -376,7 +341,7 @@ export class MdTooltip implements OnDestroy {
       return {overlayX: 'start', overlayY: 'center'};
     }
 
-    throw getMdTooltipInvalidPositionError(this.position);
+    throw getMatTooltipInvalidPositionError(this.position);
   }
 
   /** Updates the tooltip message and repositions the overlay according to the new message length */
@@ -412,7 +377,7 @@ export type TooltipVisibility = 'initial' | 'visible' | 'hidden';
  */
 @Component({
   moduleId: module.id,
-  selector: 'md-tooltip-component, mat-tooltip-component',
+  selector: 'mat-tooltip-component',
   templateUrl: 'tooltip.html',
   styleUrls: ['tooltip.css'],
   encapsulation: ViewEncapsulation.None,
@@ -526,7 +491,7 @@ export class TooltipComponent {
       case 'right':  this._transformOrigin = 'left'; break;
       case 'above':  this._transformOrigin = 'bottom'; break;
       case 'below':  this._transformOrigin = 'top'; break;
-      default: throw getMdTooltipInvalidPositionError(value);
+      default: throw getMatTooltipInvalidPositionError(value);
     }
   }
 
diff --git a/src/material-examples/autocomplete-display/autocomplete-display-example.html b/src/material-examples/autocomplete-display/autocomplete-display-example.html
index 176d13dcfbb2..6f7be4623bd0 100644
--- a/src/material-examples/autocomplete-display/autocomplete-display-example.html
+++ b/src/material-examples/autocomplete-display/autocomplete-display-example.html
@@ -1,10 +1,10 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input type="text" placeholder="Assignee" aria-label="Assignee" mdInput [formControl]="myControl" [mdAutocomplete]="auto">
-    <md-autocomplete #auto="mdAutocomplete" [displayWith]="displayFn">
-      <md-option *ngFor="let option of filteredOptions | async" [value]="option">
+  <mat-form-field class="example-full-width">
+    <input type="text" placeholder="Assignee" aria-label="Assignee" matInput [formControl]="myControl" [matAutocomplete]="auto">
+    <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
+      <mat-option *ngFor="let option of filteredOptions | async" [value]="option">
         {{ option.name }}
-      </md-option>
-    </md-autocomplete>
-  </md-form-field>
+      </mat-option>
+    </mat-autocomplete>
+  </mat-form-field>
 </form>
diff --git a/src/material-examples/autocomplete-filter/autocomplete-filter-example.html b/src/material-examples/autocomplete-filter/autocomplete-filter-example.html
index 13c64139ea30..3e685d80a233 100644
--- a/src/material-examples/autocomplete-filter/autocomplete-filter-example.html
+++ b/src/material-examples/autocomplete-filter/autocomplete-filter-example.html
@@ -1,10 +1,10 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input type="text" placeholder="Pick one" aria-label="Number" mdInput [formControl]="myControl" [mdAutocomplete]="auto">
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let option of filteredOptions | async" [value]="option">
+  <mat-form-field class="example-full-width">
+    <input type="text" placeholder="Pick one" aria-label="Number" matInput [formControl]="myControl" [matAutocomplete]="auto">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let option of filteredOptions | async" [value]="option">
         {{ option }}
-      </md-option>
-    </md-autocomplete>
-  </md-form-field>
+      </mat-option>
+    </mat-autocomplete>
+  </mat-form-field>
 </form>
diff --git a/src/material-examples/autocomplete-overview/autocomplete-overview-example.html b/src/material-examples/autocomplete-overview/autocomplete-overview-example.html
index 78370e44a246..9b6179e74bc5 100644
--- a/src/material-examples/autocomplete-overview/autocomplete-overview-example.html
+++ b/src/material-examples/autocomplete-overview/autocomplete-overview-example.html
@@ -1,20 +1,20 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input mdInput placeholder="State" aria-label="State" [mdAutocomplete]="auto" [formControl]="stateCtrl">
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let state of filteredStates | async" [value]="state.name">
+  <mat-form-field class="example-full-width">
+    <input matInput placeholder="State" aria-label="State" [matAutocomplete]="auto" [formControl]="stateCtrl">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let state of filteredStates | async" [value]="state.name">
         <img style="vertical-align:middle;" aria-hidden src="{{state.flag}}" height="25" />
         <span>{{ state.name }}</span> |
         <small>Population: {{state.population}}</small>
-      </md-option>
-    </md-autocomplete>
-  </md-form-field>
+      </mat-option>
+    </mat-autocomplete>
+  </mat-form-field>
 
   <br />
 
-  <md-slide-toggle
+  <mat-slide-toggle
     [checked]="stateCtrl.disabled"
     (change)="stateCtrl.disabled ? stateCtrl.enable() : stateCtrl.disable()">
     Disable Input?
-  </md-slide-toggle>
+  </mat-slide-toggle>
 </form>
diff --git a/src/material-examples/autocomplete-simple/autocomplete-simple-example.html b/src/material-examples/autocomplete-simple/autocomplete-simple-example.html
index 3c440f4b319e..57a309431f85 100644
--- a/src/material-examples/autocomplete-simple/autocomplete-simple-example.html
+++ b/src/material-examples/autocomplete-simple/autocomplete-simple-example.html
@@ -1,10 +1,10 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input type="text" placeholder="Pick one" aria-label="Number" mdInput [formControl]="myControl" [mdAutocomplete]="auto">
-    <md-autocomplete #auto="mdAutocomplete">
-      <md-option *ngFor="let option of options" [value]="option">
+  <mat-form-field class="example-full-width">
+    <input type="text" placeholder="Pick one" aria-label="Number" matInput [formControl]="myControl" [matAutocomplete]="auto">
+    <mat-autocomplete #auto="matAutocomplete">
+      <mat-option *ngFor="let option of options" [value]="option">
         {{ option }}
-      </md-option>
-    </md-autocomplete>
-  </md-form-field>
+      </mat-option>
+    </mat-autocomplete>
+  </mat-form-field>
 </form>
diff --git a/src/material-examples/button-overview/button-overview-example.html b/src/material-examples/button-overview/button-overview-example.html
index 56f6fa44fb6b..0dcb901d1d1c 100644
--- a/src/material-examples/button-overview/button-overview-example.html
+++ b/src/material-examples/button-overview/button-overview-example.html
@@ -1 +1 @@
-<button md-button>Click me!</button>
+<button mat-button>Click me!</button>
diff --git a/src/material-examples/button-toggle-exclusive/button-toggle-exclusive-example.html b/src/material-examples/button-toggle-exclusive/button-toggle-exclusive-example.html
index dd5cd2771788..d6f123c2a561 100644
--- a/src/material-examples/button-toggle-exclusive/button-toggle-exclusive-example.html
+++ b/src/material-examples/button-toggle-exclusive/button-toggle-exclusive-example.html
@@ -1,15 +1,15 @@
-<md-button-toggle-group #group="mdButtonToggleGroup">
-  <md-button-toggle value="left">
-    <md-icon>format_align_left</md-icon>
-  </md-button-toggle>
-  <md-button-toggle value="center">
-    <md-icon>format_align_center</md-icon>
-  </md-button-toggle>
-  <md-button-toggle value="right">
-    <md-icon>format_align_right</md-icon>
-  </md-button-toggle>
-  <md-button-toggle value="justify" disabled>
-    <md-icon>format_align_justify</md-icon>
-  </md-button-toggle>
-</md-button-toggle-group>
+<mat-button-toggle-group #group="matButtonToggleGroup">
+  <mat-button-toggle value="left">
+    <mat-icon>format_align_left</mat-icon>
+  </mat-button-toggle>
+  <mat-button-toggle value="center">
+    <mat-icon>format_align_center</mat-icon>
+  </mat-button-toggle>
+  <mat-button-toggle value="right">
+    <mat-icon>format_align_right</mat-icon>
+  </mat-button-toggle>
+  <mat-button-toggle value="justify" disabled>
+    <mat-icon>format_align_justify</mat-icon>
+  </mat-button-toggle>
+</mat-button-toggle-group>
 <div class="example-selected-value">Selected value: {{group.value}}</div>
diff --git a/src/material-examples/button-toggle-overview/button-toggle-overview-example.html b/src/material-examples/button-toggle-overview/button-toggle-overview-example.html
index bb215d5b5425..858458d64280 100644
--- a/src/material-examples/button-toggle-overview/button-toggle-overview-example.html
+++ b/src/material-examples/button-toggle-overview/button-toggle-overview-example.html
@@ -1 +1 @@
-<md-button-toggle>Toggle me!</md-button-toggle>
+<mat-button-toggle>Toggle me!</mat-button-toggle>
diff --git a/src/material-examples/button-types/button-types-example.html b/src/material-examples/button-types/button-types-example.html
index 1a9b5b2015a7..2e06c96f7913 100644
--- a/src/material-examples/button-types/button-types-example.html
+++ b/src/material-examples/button-types/button-types-example.html
@@ -1,64 +1,64 @@
 <h3>Basic Buttons</h3>
 <div class="button-row">
-  <button md-button>Basic</button>
-  <button md-button color="primary">Primary</button>
-  <button md-button color="accent">Accent</button>
-  <button md-button color="warn">Warn</button>
-  <button md-button disabled>Disabled</button>
-  <a md-button routerLink=".">Link</a>
+  <button mat-button>Basic</button>
+  <button mat-button color="primary">Primary</button>
+  <button mat-button color="accent">Accent</button>
+  <button mat-button color="warn">Warn</button>
+  <button mat-button disabled>Disabled</button>
+  <a mat-button routerLink=".">Link</a>
 </div>
 
 <h3>Raised Buttons</h3>
 <div class="button-row">
-  <button md-raised-button>Basic</button>
-  <button md-raised-button color="primary">Primary</button>
-  <button md-raised-button color="accent">Accent</button>
-  <button md-raised-button color="warn">Warn</button>
-  <button md-raised-button disabled>Disabled</button>
-  <a md-raised-button routerLink=".">Link</a>
+  <button mat-raised-button>Basic</button>
+  <button mat-raised-button color="primary">Primary</button>
+  <button mat-raised-button color="accent">Accent</button>
+  <button mat-raised-button color="warn">Warn</button>
+  <button mat-raised-button disabled>Disabled</button>
+  <a mat-raised-button routerLink=".">Link</a>
 </div>
 
 <h3>Icon Buttons</h3>
 <div class="button-row">
-  <button md-icon-button>
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-icon-button>
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
-  <button md-icon-button color="primary">
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-icon-button color="primary">
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
-  <button md-icon-button color="accent">
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-icon-button color="accent">
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
-  <button md-icon-button color="warn">
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-icon-button color="warn">
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
-  <button md-icon-button disabled>
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-icon-button disabled>
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
 </div>
 
 <h3>Fab Buttons</h3>
 <div class="button-row">
-  <button md-fab>Basic</button>
-  <button md-fab color="primary">Primary</button>
-  <button md-fab color="accent">Accent</button>
-  <button md-fab color="warn">Warn</button>
-  <button md-fab disabled>Disabled</button>
-  <button md-fab>
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-fab>Basic</button>
+  <button mat-fab color="primary">Primary</button>
+  <button mat-fab color="accent">Accent</button>
+  <button mat-fab color="warn">Warn</button>
+  <button mat-fab disabled>Disabled</button>
+  <button mat-fab>
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
-  <a md-fab routerLink=".">Link</a>
+  <a mat-fab routerLink=".">Link</a>
 </div>
 
 <h3>Mini Fab Buttons</h3>
 <div class="button-row">
-  <button md-mini-fab>Basic</button>
-  <button md-mini-fab color="primary">Primary</button>
-  <button md-mini-fab color="accent">Accent</button>
-  <button md-mini-fab color="warn">Warn</button>
-  <button md-mini-fab disabled>Disabled</button>
-  <button md-mini-fab>
-    <md-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</md-icon>
+  <button mat-mini-fab>Basic</button>
+  <button mat-mini-fab color="primary">Primary</button>
+  <button mat-mini-fab color="accent">Accent</button>
+  <button mat-mini-fab color="warn">Warn</button>
+  <button mat-mini-fab disabled>Disabled</button>
+  <button mat-mini-fab>
+    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
-  <a md-mini-fab routerLink=".">Link</a>
+  <a mat-mini-fab routerLink=".">Link</a>
 </div>
diff --git a/src/material-examples/card-fancy/card-fancy-example.html b/src/material-examples/card-fancy/card-fancy-example.html
index 45211a831f4f..c80c1bbc495c 100644
--- a/src/material-examples/card-fancy/card-fancy-example.html
+++ b/src/material-examples/card-fancy/card-fancy-example.html
@@ -1,19 +1,19 @@
-<md-card class="example-card">
-  <md-card-header>
-    <div md-card-avatar class="example-header-image"></div>
-    <md-card-title>Shiba Inu</md-card-title>
-    <md-card-subtitle>Dog Breed</md-card-subtitle>
-  </md-card-header>
-  <img md-card-image src="assets/img/examples/shiba2.jpg" alt="Photo of a Shiba Inu">
-  <md-card-content>
+<mat-card class="example-card">
+  <mat-card-header>
+    <div mat-card-avatar class="example-header-image"></div>
+    <mat-card-title>Shiba Inu</mat-card-title>
+    <mat-card-subtitle>Dog Breed</mat-card-subtitle>
+  </mat-card-header>
+  <img mat-card-image src="assets/img/examples/shiba2.jpg" alt="Photo of a Shiba Inu">
+  <mat-card-content>
     <p>
       The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan.
       A small, agile dog that copes very well with mountainous terrain, the Shiba Inu was originally
       bred for hunting.
     </p>
-  </md-card-content>
-  <md-card-actions>
-    <button md-button>LIKE</button>
-    <button md-button>SHARE</button>
-  </md-card-actions>
-</md-card>
+  </mat-card-content>
+  <mat-card-actions>
+    <button mat-button>LIKE</button>
+    <button mat-button>SHARE</button>
+  </mat-card-actions>
+</mat-card>
diff --git a/src/material-examples/card-overview/card-overview-example.html b/src/material-examples/card-overview/card-overview-example.html
index 5e0c2b6dfe13..774531539915 100644
--- a/src/material-examples/card-overview/card-overview-example.html
+++ b/src/material-examples/card-overview/card-overview-example.html
@@ -1 +1 @@
-<md-card>Simple card</md-card>
+<mat-card>Simple card</mat-card>
diff --git a/src/material-examples/checkbox-configurable/checkbox-configurable-example.html b/src/material-examples/checkbox-configurable/checkbox-configurable-example.html
index 7b8fb4c2290e..e39d6e8e1aaf 100644
--- a/src/material-examples/checkbox-configurable/checkbox-configurable-example.html
+++ b/src/material-examples/checkbox-configurable/checkbox-configurable-example.html
@@ -1,40 +1,40 @@
-<md-card>
-  <md-card-content>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Checkbox configuration</h2>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="checked">Checked</md-checkbox>
-      <md-checkbox class="example-margin" [(ngModel)]="indeterminate">Indeterminate</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="checked">Checked</mat-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="indeterminate">Indeterminate</mat-checkbox>
     </section>
 
     <section class="example-section">
       <label class="example-margin">Align:</label>
-      <md-radio-group [(ngModel)]="align">
-        <md-radio-button class="example-margin" value="start">Start</md-radio-button>
-        <md-radio-button class="example-margin" value="end">End</md-radio-button>
-      </md-radio-group>
+      <mat-radio-group [(ngModel)]="align">
+        <mat-radio-button class="example-margin" value="start">Start</mat-radio-button>
+        <mat-radio-button class="example-margin" value="end">End</mat-radio-button>
+      </mat-radio-group>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="disabled">Disabled</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="disabled">Disabled</mat-checkbox>
     </section>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="result">
-  <md-card-content>
+<mat-card class="result">
+  <mat-card-content>
     <h2 class="example-h2">Result</h2>
 
     <section class="example-section">
-      <md-checkbox
+      <mat-checkbox
           class="example-margin"
           [(ngModel)]="checked"
           [(indeterminate)]="indeterminate"
           [align]="align"
           [disabled]="disabled">
         I'm a checkbox
-      </md-checkbox>
+      </mat-checkbox>
     </section>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
diff --git a/src/material-examples/checkbox-overview/checkbox-overview-example.html b/src/material-examples/checkbox-overview/checkbox-overview-example.html
index c301bbe5ccc2..b5b049fae683 100644
--- a/src/material-examples/checkbox-overview/checkbox-overview-example.html
+++ b/src/material-examples/checkbox-overview/checkbox-overview-example.html
@@ -1 +1 @@
-<md-checkbox>Check me!</md-checkbox>
+<mat-checkbox>Check me!</mat-checkbox>
diff --git a/src/material-examples/chips-input/chips-input-example.html b/src/material-examples/chips-input/chips-input-example.html
index f80ef3152670..3d118fcbfd30 100644
--- a/src/material-examples/chips-input/chips-input-example.html
+++ b/src/material-examples/chips-input/chips-input-example.html
@@ -1,14 +1,14 @@
-<md-form-field class="demo-chip-list">
-  <md-chip-list mdPrefix #chipList>
-    <md-chip *ngFor="let fruit of fruits" [selectable]="selectable"
+<mat-form-field class="demo-chip-list">
+  <mat-chip-list matPrefix #chipList>
+    <mat-chip *ngFor="let fruit of fruits" [selectable]="selectable"
              [removable]="removable" (remove)="remove(fruit)">
       {{fruit.name}}
-      <md-icon mdChipRemove *ngIf="removable">cancel</md-icon>
-    </md-chip>
-  </md-chip-list>
-  <input mdInput placeholder="New fruit..."
-         [mdChipInputFor]="chipList"
-         [mdChipInputSeparatorKeyCodes]="separatorKeysCodes"
-         [mdChipInputAddOnBlur]="addOnBlur"
-         (mdChipInputTokenEnd)="add($event)" />
-</md-form-field>
+      <mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
+    </mat-chip>
+  </mat-chip-list>
+  <input matInput placeholder="New fruit..."
+         [matChipInputFor]="chipList"
+         [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+         [matChipInputAddOnBlur]="addOnBlur"
+         (matChipInputTokenEnd)="add($event)" />
+</mat-form-field>
diff --git a/src/material-examples/chips-input/chips-input-example.ts b/src/material-examples/chips-input/chips-input-example.ts
index 89adf943c181..934fdcdc83d3 100644
--- a/src/material-examples/chips-input/chips-input-example.ts
+++ b/src/material-examples/chips-input/chips-input-example.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdChipInputEvent} from '@angular/material';
+import {MatChipInputEvent} from '@angular/material';
 import {ENTER} from '@angular/cdk/keycodes';
 
 const COMMA = 188;
@@ -28,7 +28,7 @@ export class ChipsInputExample {
   ];
 
 
-  add(event: MdChipInputEvent): void {
+  add(event: MatChipInputEvent): void {
     let input = event.input;
     let value = event.value;
 
diff --git a/src/material-examples/chips-overview/chips-overview-example.html b/src/material-examples/chips-overview/chips-overview-example.html
index bb0410569251..3228bc87b2d3 100644
--- a/src/material-examples/chips-overview/chips-overview-example.html
+++ b/src/material-examples/chips-overview/chips-overview-example.html
@@ -1,6 +1,6 @@
-<md-chip-list>
-  <md-chip>One fish</md-chip>
-  <md-chip>Two fish</md-chip>
-  <md-chip color="primary" selected="true">Primary fish</md-chip>
-  <md-chip color="accent" selected="true">Accent fish</md-chip>
-</md-chip-list>
+<mat-chip-list>
+  <mat-chip>One fish</mat-chip>
+  <mat-chip>Two fish</mat-chip>
+  <mat-chip color="primary" selected="true">Primary fish</mat-chip>
+  <mat-chip color="accent" selected="true">Accent fish</mat-chip>
+</mat-chip-list>
diff --git a/src/material-examples/chips-stacked/chips-stacked-example.css b/src/material-examples/chips-stacked/chips-stacked-example.css
index dfb2f8c00aa2..3c84f24c152f 100644
--- a/src/material-examples/chips-stacked/chips-stacked-example.css
+++ b/src/material-examples/chips-stacked/chips-stacked-example.css
@@ -1,3 +1,3 @@
-md-chip {
+mat-chip {
   max-width: 200px;
 }
diff --git a/src/material-examples/chips-stacked/chips-stacked-example.html b/src/material-examples/chips-stacked/chips-stacked-example.html
index 27677b1c6e6d..aa429ab3a8a6 100644
--- a/src/material-examples/chips-stacked/chips-stacked-example.html
+++ b/src/material-examples/chips-stacked/chips-stacked-example.html
@@ -1,7 +1,7 @@
-<md-chip-list class="mat-chip-list-stacked">
-  <md-chip *ngFor="let chipColor of availableColors"
+<mat-chip-list class="mat-chip-list-stacked">
+  <mat-chip *ngFor="let chipColor of availableColors"
       selected="true"
       color="{{chipColor.color}}">
     {{chipColor.name}}
-  </md-chip>
-</md-chip-list>
+  </mat-chip>
+</mat-chip-list>
diff --git a/src/material-examples/datepicker-api/datepicker-api-example.html b/src/material-examples/datepicker-api/datepicker-api-example.html
index a41723d81cbb..453fe29805a5 100644
--- a/src/material-examples/datepicker-api/datepicker-api-example.html
+++ b/src/material-examples/datepicker-api/datepicker-api-example.html
@@ -1,5 +1,5 @@
-<md-form-field class="example-full-width">
-  <input mdInput [mdDatepicker]="picker" placeholder="Choose a date">
-  <md-datepicker #picker></md-datepicker>
-</md-form-field>
-<button md-raised-button (click)="picker.open()">Open</button>
+<mat-form-field class="example-full-width">
+  <input matInput [matDatepicker]="picker" placeholder="Choose a date">
+  <mat-datepicker #picker></mat-datepicker>
+</mat-form-field>
+<button mat-raised-button (click)="picker.open()">Open</button>
diff --git a/src/material-examples/datepicker-filter/datepicker-filter-example.html b/src/material-examples/datepicker-filter/datepicker-filter-example.html
index 4fc367dba397..6a44973b048e 100644
--- a/src/material-examples/datepicker-filter/datepicker-filter-example.html
+++ b/src/material-examples/datepicker-filter/datepicker-filter-example.html
@@ -1,5 +1,5 @@
-<md-form-field class="example-full-width">
-  <input mdInput [mdDatepickerFilter]="myFilter" [mdDatepicker]="picker" placeholder="Choose a date">
-  <md-datepicker-toggle mdSuffix [for]="picker"></md-datepicker-toggle>
-  <md-datepicker #picker></md-datepicker>
-</md-form-field>
+<mat-form-field class="example-full-width">
+  <input matInput [matDatepickerFilter]="myFilter" [matDatepicker]="picker" placeholder="Choose a date">
+  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker #picker></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-min-max/datepicker-min-max-example.html b/src/material-examples/datepicker-min-max/datepicker-min-max-example.html
index 216fcd260a2c..4ee60cdfdd86 100644
--- a/src/material-examples/datepicker-min-max/datepicker-min-max-example.html
+++ b/src/material-examples/datepicker-min-max/datepicker-min-max-example.html
@@ -1,5 +1,5 @@
-<md-form-field class="example-full-width">
-  <input mdInput [min]="minDate" [max]="maxDate" [mdDatepicker]="picker" placeholder="Choose a date">
-  <md-datepicker-toggle mdSuffix [for]="picker"></md-datepicker-toggle>
-  <md-datepicker #picker></md-datepicker>
-</md-form-field>
+<mat-form-field class="example-full-width">
+  <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="picker" placeholder="Choose a date">
+  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker #picker></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-overview/datepicker-overview-example.html b/src/material-examples/datepicker-overview/datepicker-overview-example.html
index 41a2ba3c9ca4..f82880547b24 100644
--- a/src/material-examples/datepicker-overview/datepicker-overview-example.html
+++ b/src/material-examples/datepicker-overview/datepicker-overview-example.html
@@ -1,5 +1,5 @@
-<md-form-field>
-  <input mdInput [mdDatepicker]="picker" placeholder="Choose a date">
-  <md-datepicker-toggle mdSuffix [for]="picker"></md-datepicker-toggle>
-  <md-datepicker #picker></md-datepicker>
-</md-form-field>
+<mat-form-field>
+  <input matInput [matDatepicker]="picker" placeholder="Choose a date">
+  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker #picker></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-start-view/datepicker-start-view-example.html b/src/material-examples/datepicker-start-view/datepicker-start-view-example.html
index 0391c9be8ff5..e10afcab6d26 100644
--- a/src/material-examples/datepicker-start-view/datepicker-start-view-example.html
+++ b/src/material-examples/datepicker-start-view/datepicker-start-view-example.html
@@ -1,5 +1,5 @@
-<md-form-field>
-  <input mdInput [mdDatepicker]="picker" placeholder="Choose a date">
-  <md-datepicker-toggle mdSuffix [for]="picker"></md-datepicker-toggle>
-  <md-datepicker #picker startView="year" [startAt]="startDate"></md-datepicker>
-</md-form-field>
+<mat-form-field>
+  <input matInput [matDatepicker]="picker" placeholder="Choose a date">
+  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker #picker startView="year" [startAt]="startDate"></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-touch/datepicker-touch-example.html b/src/material-examples/datepicker-touch/datepicker-touch-example.html
index a9579710205a..7cec1f8e330a 100644
--- a/src/material-examples/datepicker-touch/datepicker-touch-example.html
+++ b/src/material-examples/datepicker-touch/datepicker-touch-example.html
@@ -1,5 +1,5 @@
-<md-form-field class="example-full-width">
-  <input mdInput [mdDatepicker]="picker" placeholder="Choose a date">
-  <md-datepicker-toggle mdSuffix [for]="picker"></md-datepicker-toggle>
-  <md-datepicker touchUi="true" #picker></md-datepicker>
-</md-form-field>
+<mat-form-field class="example-full-width">
+  <input matInput [matDatepicker]="picker" placeholder="Choose a date">
+  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker touchUi="true" #picker></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/dialog-content/dialog-content-example-dialog.html b/src/material-examples/dialog-content/dialog-content-example-dialog.html
index 46c978dae389..2ecde77595ea 100644
--- a/src/material-examples/dialog-content/dialog-content-example-dialog.html
+++ b/src/material-examples/dialog-content/dialog-content-example-dialog.html
@@ -1,5 +1,5 @@
-<h2 md-dialog-title>Install Angular</h2>
-<md-dialog-content>
+<h2 mat-dialog-title>Install Angular</h2>
+<mat-dialog-content>
   <h3>DEVELOP ACROSS ALL PLATFORMS</h3>
   <p>Learn one way to build applications with Angular and reuse your code and abilities to build 
     apps for any deployment target. For web, mobile web, native mobile and native desktop.</p>
@@ -18,8 +18,8 @@ <h3>INCREDIBLE TOOLING</h3>
   <h3>LOVED BY MILLIONS</h3>
   <p>From prototype through global deployment, Angular delivers the productivity and scalable infrastructure 
     that supports Google's largest applications.</p>
-</md-dialog-content>
-<md-dialog-actions>
-  <button md-button [md-dialog-close]="true" tabindex="1">Install</button>
-  <button md-button md-dialog-close tabindex="-1">Cancel</button>
-</md-dialog-actions>
+</mat-dialog-content>
+<mat-dialog-actions>
+  <button mat-button [mat-dialog-close]="true" tabindex="1">Install</button>
+  <button mat-button mat-dialog-close tabindex="-1">Cancel</button>
+</mat-dialog-actions>
diff --git a/src/material-examples/dialog-content/dialog-content-example.html b/src/material-examples/dialog-content/dialog-content-example.html
index 176a3c411e7f..cdfc2fb33b2a 100644
--- a/src/material-examples/dialog-content/dialog-content-example.html
+++ b/src/material-examples/dialog-content/dialog-content-example.html
@@ -1 +1 @@
-<button md-button (click)="openDialog()">Open dialog</button>
+<button mat-button (click)="openDialog()">Open dialog</button>
diff --git a/src/material-examples/dialog-content/dialog-content-example.ts b/src/material-examples/dialog-content/dialog-content-example.ts
index 39b0d453ddf7..8cd5c6e942f1 100644
--- a/src/material-examples/dialog-content/dialog-content-example.ts
+++ b/src/material-examples/dialog-content/dialog-content-example.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdDialog} from '@angular/material';
+import {MatDialog} from '@angular/material';
 
 /**
  * @title Dialog with header, scrollable content and actions
@@ -9,7 +9,7 @@ import {MdDialog} from '@angular/material';
   templateUrl: 'dialog-content-example.html',
 })
 export class DialogContentExample {
-  constructor(public dialog: MdDialog) {}
+  constructor(public dialog: MatDialog) {}
 
   openDialog() {
     const dialogRef = this.dialog.open(DialogContentExampleDialog, {
diff --git a/src/material-examples/dialog-data/dialog-data-example-dialog.html b/src/material-examples/dialog-data/dialog-data-example-dialog.html
index aa9b428ef8ce..6d263bacf3c9 100644
--- a/src/material-examples/dialog-data/dialog-data-example-dialog.html
+++ b/src/material-examples/dialog-data/dialog-data-example-dialog.html
@@ -1,5 +1,5 @@
-<h1 md-dialog-title>Favorite Animal</h1>
-<div md-dialog-content>
+<h1 mat-dialog-title>Favorite Animal</h1>
+<div mat-dialog-content>
   My favorite animal is:
   <ul>
     <li>
diff --git a/src/material-examples/dialog-data/dialog-data-example.html b/src/material-examples/dialog-data/dialog-data-example.html
index 176a3c411e7f..cdfc2fb33b2a 100644
--- a/src/material-examples/dialog-data/dialog-data-example.html
+++ b/src/material-examples/dialog-data/dialog-data-example.html
@@ -1 +1 @@
-<button md-button (click)="openDialog()">Open dialog</button>
+<button mat-button (click)="openDialog()">Open dialog</button>
diff --git a/src/material-examples/dialog-data/dialog-data-example.ts b/src/material-examples/dialog-data/dialog-data-example.ts
index bdd0f4bc119f..08b00d08de46 100644
--- a/src/material-examples/dialog-data/dialog-data-example.ts
+++ b/src/material-examples/dialog-data/dialog-data-example.ts
@@ -1,5 +1,5 @@
 import {Component, Inject} from '@angular/core';
-import {MdDialog, MD_DIALOG_DATA} from '@angular/material';
+import {MatDialog, MAT_DIALOG_DATA} from '@angular/material';
 
 /**
  * @title Injecting data when opening a dialog
@@ -9,7 +9,7 @@ import {MdDialog, MD_DIALOG_DATA} from '@angular/material';
   templateUrl: 'dialog-data-example.html',
 })
 export class DialogDataExample {
-  constructor(public dialog: MdDialog) {}
+  constructor(public dialog: MatDialog) {}
 
   openDialog() {
     this.dialog.open(DialogDataExampleDialog, {
@@ -25,5 +25,5 @@ export class DialogDataExample {
   templateUrl: 'dialog-data-example-dialog.html',
 })
 export class DialogDataExampleDialog {
-  constructor(@Inject(MD_DIALOG_DATA) public data: any) {}
+  constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
 }
diff --git a/src/material-examples/dialog-elements/dialog-elements-example-dialog.html b/src/material-examples/dialog-elements/dialog-elements-example-dialog.html
index 5238b0eb6c19..1bddf5bfdaa6 100644
--- a/src/material-examples/dialog-elements/dialog-elements-example-dialog.html
+++ b/src/material-examples/dialog-elements/dialog-elements-example-dialog.html
@@ -1,5 +1,5 @@
-<h1 md-dialog-title>Dialog with elements</h1>
-<div md-dialog-content>This dialog showcases the title, close, content and actions elements.</div>
-<div md-dialog-actions>
-  <button md-button md-dialog-close>Close</button>
+<h1 mat-dialog-title>Dialog with elements</h1>
+<div mat-dialog-content>This dialog showcases the title, close, content and actions elements.</div>
+<div mat-dialog-actions>
+  <button mat-button mat-dialog-close>Close</button>
 </div>
diff --git a/src/material-examples/dialog-elements/dialog-elements-example.html b/src/material-examples/dialog-elements/dialog-elements-example.html
index 40637c4bd638..cf2103810fc9 100644
--- a/src/material-examples/dialog-elements/dialog-elements-example.html
+++ b/src/material-examples/dialog-elements/dialog-elements-example.html
@@ -1 +1 @@
-<button md-button (click)="openDialog()">Launch dialog</button>
+<button mat-button (click)="openDialog()">Launch dialog</button>
diff --git a/src/material-examples/dialog-elements/dialog-elements-example.ts b/src/material-examples/dialog-elements/dialog-elements-example.ts
index 37f3703e3aa4..b179ee54b54f 100644
--- a/src/material-examples/dialog-elements/dialog-elements-example.ts
+++ b/src/material-examples/dialog-elements/dialog-elements-example.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdDialog} from '@angular/material';
+import {MatDialog} from '@angular/material';
 
 /**
  * @title Dialog elements
@@ -9,7 +9,7 @@ import {MdDialog} from '@angular/material';
   templateUrl: 'dialog-elements-example.html',
 })
 export class DialogElementsExample {
-  constructor(public dialog: MdDialog) { }
+  constructor(public dialog: MatDialog) { }
 
   openDialog() {
     this.dialog.open(DialogElementsExampleDialog);
diff --git a/src/material-examples/dialog-overview/dialog-overview-example-dialog.html b/src/material-examples/dialog-overview/dialog-overview-example-dialog.html
index b4214fbf1f9f..fbd80e3c287d 100644
--- a/src/material-examples/dialog-overview/dialog-overview-example-dialog.html
+++ b/src/material-examples/dialog-overview/dialog-overview-example-dialog.html
@@ -1,11 +1,11 @@
-<h1 md-dialog-title>Hi {{data.name}}</h1>
-<div md-dialog-content>
+<h1 mat-dialog-title>Hi {{data.name}}</h1>
+<div mat-dialog-content>
   <p>What's your favorite animal?</p>
-  <md-form-field>
-    <input mdInput tabindex="1" [(ngModel)]="data.animal">
-  </md-form-field>
+  <mat-form-field>
+    <input matInput tabindex="1" [(ngModel)]="data.animal">
+  </mat-form-field>
 </div>
-<div md-dialog-actions>
-  <button md-button [md-dialog-close]="data.animal" tabindex="2">Ok</button>
-  <button md-button (click)="onNoClick()" tabindex="-1">No Thanks</button>
+<div mat-dialog-actions>
+  <button mat-button [mat-dialog-close]="data.animal" tabindex="2">Ok</button>
+  <button mat-button (click)="onNoClick()" tabindex="-1">No Thanks</button>
 </div>
diff --git a/src/material-examples/dialog-overview/dialog-overview-example.html b/src/material-examples/dialog-overview/dialog-overview-example.html
index b6911190f152..00e14854f5ca 100644
--- a/src/material-examples/dialog-overview/dialog-overview-example.html
+++ b/src/material-examples/dialog-overview/dialog-overview-example.html
@@ -1,11 +1,11 @@
 <ol>
   <li>
-    <md-form-field>
-      <input mdInput [(ngModel)]="name" placeholder="What's your name?">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput [(ngModel)]="name" placeholder="What's your name?">
+    </mat-form-field>
   </li>
   <li>
-    <button md-raised-button (click)="openDialog()">Pick one</button>
+    <button mat-raised-button (click)="openDialog()">Pick one</button>
   </li>
   <li *ngIf="animal">
     You chose: <i>{{animal}}</i>
diff --git a/src/material-examples/dialog-overview/dialog-overview-example.ts b/src/material-examples/dialog-overview/dialog-overview-example.ts
index 5dec934d877e..53f7db3a5529 100644
--- a/src/material-examples/dialog-overview/dialog-overview-example.ts
+++ b/src/material-examples/dialog-overview/dialog-overview-example.ts
@@ -1,5 +1,5 @@
 import {Component, Inject} from '@angular/core';
-import {MdDialog, MdDialogRef, MD_DIALOG_DATA} from '@angular/material';
+import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
 
 /**
  * @title Dialog Overview
@@ -13,7 +13,7 @@ export class DialogOverviewExample {
   animal: string;
   name: string;
 
-  constructor(public dialog: MdDialog) {}
+  constructor(public dialog: MatDialog) {}
 
   openDialog(): void {
     let dialogRef = this.dialog.open(DialogOverviewExampleDialog, {
@@ -36,8 +36,8 @@ export class DialogOverviewExample {
 export class DialogOverviewExampleDialog {
 
   constructor(
-    public dialogRef: MdDialogRef<DialogOverviewExampleDialog>,
-    @Inject(MD_DIALOG_DATA) public data: any) { }
+    public dialogRef: MatDialogRef<DialogOverviewExampleDialog>,
+    @Inject(MAT_DIALOG_DATA) public data: any) { }
 
   onNoClick(): void {
     this.dialogRef.close();
diff --git a/src/material-examples/expansion-overview/expansion-overview-example.html b/src/material-examples/expansion-overview/expansion-overview-example.html
index 48c0cc50bf86..9d105bef4d64 100644
--- a/src/material-examples/expansion-overview/expansion-overview-example.html
+++ b/src/material-examples/expansion-overview/expansion-overview-example.html
@@ -1,18 +1,18 @@
-<md-expansion-panel>
-  <md-expansion-panel-header>
-    <md-panel-title>
+<mat-expansion-panel>
+  <mat-expansion-panel-header>
+    <mat-panel-title>
       Personal data
-    </md-panel-title>
-    <md-panel-description>
+    </mat-panel-title>
+    <mat-panel-description>
       Type your name and age
-    </md-panel-description>
-  </md-expansion-panel-header>
+    </mat-panel-description>
+  </mat-expansion-panel-header>
   
-  <md-form-field>
-    <input mdInput placeholder="First name">
-  </md-form-field>
+  <mat-form-field>
+    <input matInput placeholder="First name">
+  </mat-form-field>
   
-  <md-form-field>
-    <input mdInput placeholder="Age">
-  </md-form-field>
-</md-expansion-panel>
+  <mat-form-field>
+    <input matInput placeholder="Age">
+  </mat-form-field>
+</mat-expansion-panel>
diff --git a/src/material-examples/expansion-steps/expansion-steps-example.html b/src/material-examples/expansion-steps/expansion-steps-example.html
index e81ede44445c..1a4880c2cdc8 100644
--- a/src/material-examples/expansion-steps/expansion-steps-example.html
+++ b/src/material-examples/expansion-steps/expansion-steps-example.html
@@ -1,69 +1,69 @@
-<md-accordion class="example-headers-align">
-  <md-expansion-panel [expanded]="step === 0" (opened)="setStep(0)" hideToggle="true">
-    <md-expansion-panel-header>
-      <md-panel-title>
+<mat-accordion class="example-headers-align">
+  <mat-expansion-panel [expanded]="step === 0" (opened)="setStep(0)" hideToggle="true">
+    <mat-expansion-panel-header>
+      <mat-panel-title>
         Personal data
-      </md-panel-title>
-      <md-panel-description>
+      </mat-panel-title>
+      <mat-panel-description>
         Type your name and age
-        <md-icon>account_circle</md-icon>
-      </md-panel-description>
-    </md-expansion-panel-header>
+        <mat-icon>account_circle</mat-icon>
+      </mat-panel-description>
+    </mat-expansion-panel-header>
 
-    <md-form-field>
-      <input mdInput placeholder="First name">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="First name">
+    </mat-form-field>
 
-    <md-form-field>
-      <input mdInput type="number" min="1" placeholder="Age">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput type="number" min="1" placeholder="Age">
+    </mat-form-field>
 
-    <md-action-row>
-      <button md-button color="primary" (click)="nextStep()">Next</button>
-    </md-action-row>
-  </md-expansion-panel>
+    <mat-action-row>
+      <button mat-button color="primary" (click)="nextStep()">Next</button>
+    </mat-action-row>
+  </mat-expansion-panel>
 
-  <md-expansion-panel [expanded]="step === 1" (opened)="setStep(1)" hideToggle="true">
-    <md-expansion-panel-header>
-      <md-panel-title>
+  <mat-expansion-panel [expanded]="step === 1" (opened)="setStep(1)" hideToggle="true">
+    <mat-expansion-panel-header>
+      <mat-panel-title>
         Destination
-      </md-panel-title>
-      <md-panel-description>
+      </mat-panel-title>
+      <mat-panel-description>
         Type the country name
-        <md-icon>map</md-icon>
-      </md-panel-description>
-    </md-expansion-panel-header>
+        <mat-icon>map</mat-icon>
+      </mat-panel-description>
+    </mat-expansion-panel-header>
 
-    <md-form-field>
-      <input mdInput placeholder="Country">
-    </md-form-field>
+    <mat-form-field>
+      <input matInput placeholder="Country">
+    </mat-form-field>
 
-    <md-action-row>
-      <button md-button color="warn" (click)="prevStep()">Previous</button>
-      <button md-button color="primary" (click)="nextStep()">Next</button>
-    </md-action-row>
-  </md-expansion-panel>
+    <mat-action-row>
+      <button mat-button color="warn" (click)="prevStep()">Previous</button>
+      <button mat-button color="primary" (click)="nextStep()">Next</button>
+    </mat-action-row>
+  </mat-expansion-panel>
 
-  <md-expansion-panel [expanded]="step === 2" (opened)="setStep(2)" hideToggle="true">
-    <md-expansion-panel-header>
-      <md-panel-title>
+  <mat-expansion-panel [expanded]="step === 2" (opened)="setStep(2)" hideToggle="true">
+    <mat-expansion-panel-header>
+      <mat-panel-title>
         Day of the trip
-      </md-panel-title>
-      <md-panel-description>
+      </mat-panel-title>
+      <mat-panel-description>
         Inform the date you wish to travel
-        <md-icon>date_range</md-icon>
-      </md-panel-description>
-    </md-expansion-panel-header>
+        <mat-icon>date_range</mat-icon>
+      </mat-panel-description>
+    </mat-expansion-panel-header>
 
-    <md-form-field>
-      <input mdInput placeholder="Date" [mdDatepicker]="picker" (focus)="picker.open()" readonly>
-    </md-form-field>
-    <md-datepicker #picker></md-datepicker>
+    <mat-form-field>
+      <input matInput placeholder="Date" [matDatepicker]="picker" (focus)="picker.open()" readonly>
+    </mat-form-field>
+    <mat-datepicker #picker></mat-datepicker>
 
-    <md-action-row>
-      <button md-button color="warn" (click)="prevStep()">Previous</button>
-      <button md-button color="primary" (click)="nextStep()">End</button>
-    </md-action-row>
-  </md-expansion-panel>
+    <mat-action-row>
+      <button mat-button color="warn" (click)="prevStep()">Previous</button>
+      <button mat-button color="primary" (click)="nextStep()">End</button>
+    </mat-action-row>
+  </mat-expansion-panel>
 
-</md-accordion>
+</mat-accordion>
diff --git a/src/material-examples/grid-list-dynamic/grid-list-dynamic-example.html b/src/material-examples/grid-list-dynamic/grid-list-dynamic-example.html
index 19c84dd5b853..c79507b49a6f 100644
--- a/src/material-examples/grid-list-dynamic/grid-list-dynamic-example.html
+++ b/src/material-examples/grid-list-dynamic/grid-list-dynamic-example.html
@@ -1,9 +1,9 @@
-<md-grid-list cols="4" rowHeight="100px">
-  <md-grid-tile
+<mat-grid-list cols="4" rowHeight="100px">
+  <mat-grid-tile
       *ngFor="let tile of tiles"
       [colspan]="tile.cols"
       [rowspan]="tile.rows"
       [style.background]="tile.color">
     {{tile.text}}
-  </md-grid-tile>
-</md-grid-list>
+  </mat-grid-tile>
+</mat-grid-list>
diff --git a/src/material-examples/grid-list-overview/grid-list-overview-example.css b/src/material-examples/grid-list-overview/grid-list-overview-example.css
index 2598f58f5190..fdb01abc34f0 100644
--- a/src/material-examples/grid-list-overview/grid-list-overview-example.css
+++ b/src/material-examples/grid-list-overview/grid-list-overview-example.css
@@ -1,3 +1,3 @@
-md-grid-tile {
+mat-grid-tile {
   background: lightblue;
 }
diff --git a/src/material-examples/grid-list-overview/grid-list-overview-example.html b/src/material-examples/grid-list-overview/grid-list-overview-example.html
index 6651887f603f..ae338547cedb 100644
--- a/src/material-examples/grid-list-overview/grid-list-overview-example.html
+++ b/src/material-examples/grid-list-overview/grid-list-overview-example.html
@@ -1,6 +1,6 @@
-<md-grid-list cols="2" rowHeight="2:1">
-  <md-grid-tile>1</md-grid-tile>
-  <md-grid-tile>2</md-grid-tile>
-  <md-grid-tile>3</md-grid-tile>
-  <md-grid-tile>4</md-grid-tile>
-</md-grid-list>
+<mat-grid-list cols="2" rowHeight="2:1">
+  <mat-grid-tile>1</mat-grid-tile>
+  <mat-grid-tile>2</mat-grid-tile>
+  <mat-grid-tile>3</mat-grid-tile>
+  <mat-grid-tile>4</mat-grid-tile>
+</mat-grid-list>
diff --git a/src/material-examples/icon-overview/icon-overview-example.html b/src/material-examples/icon-overview/icon-overview-example.html
index dd46af80f6cb..7afdf57b1631 100644
--- a/src/material-examples/icon-overview/icon-overview-example.html
+++ b/src/material-examples/icon-overview/icon-overview-example.html
@@ -1 +1 @@
-<md-icon>home</md-icon>
+<mat-icon>home</mat-icon>
diff --git a/src/material-examples/icon-svg-example/icon-svg-example.html b/src/material-examples/icon-svg-example/icon-svg-example.html
index ac74cf7908dd..ed7e8eb9b50e 100644
--- a/src/material-examples/icon-svg-example/icon-svg-example.html
+++ b/src/material-examples/icon-svg-example/icon-svg-example.html
@@ -1 +1 @@
-<md-icon svgIcon="thumbs-up"></md-icon>
+<mat-icon svgIcon="thumbs-up"></mat-icon>
diff --git a/src/material-examples/icon-svg-example/icon-svg-example.ts b/src/material-examples/icon-svg-example/icon-svg-example.ts
index 53775feb59fe..c9a4b5f67b38 100644
--- a/src/material-examples/icon-svg-example/icon-svg-example.ts
+++ b/src/material-examples/icon-svg-example/icon-svg-example.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {DomSanitizer} from '@angular/platform-browser';
-import {MdIconRegistry} from '@angular/material';
+import {MatIconRegistry} from '@angular/material';
 
 /**
  * @title SVG icons
@@ -10,7 +10,7 @@ import {MdIconRegistry} from '@angular/material';
   templateUrl: 'icon-svg-example.html',
 })
 export class IconSvgExample {
-  constructor(iconRegistry: MdIconRegistry, sanitizer: DomSanitizer) {
+  constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) {
     iconRegistry.addSvgIcon(
         'thumbs-up',
         sanitizer.bypassSecurityTrustResourceUrl('assets/img/examples/thumbup-icon.svg'));
diff --git a/src/material-examples/input-clearable/input-clearable-example.html b/src/material-examples/input-clearable/input-clearable-example.html
index c8be13f98150..4e1721a0f44d 100644
--- a/src/material-examples/input-clearable/input-clearable-example.html
+++ b/src/material-examples/input-clearable/input-clearable-example.html
@@ -1,6 +1,6 @@
-<md-form-field class="example-form-field">
-  <input mdInput type="text" placeholder="Clearable input" [(ngModel)]="value"/>
-  <button md-button *ngIf="value" mdSuffix md-icon-button aria-label="Clear" (click)="value=''">
-    <md-icon>close</md-icon>
+<mat-form-field class="example-form-field">
+  <input matInput type="text" placeholder="Clearable input" [(ngModel)]="value"/>
+  <button mat-button *ngIf="value" matSuffix mat-icon-button aria-label="Clear" (click)="value=''">
+    <mat-icon>close</mat-icon>
   </button>
-</md-form-field>
+</mat-form-field>
diff --git a/src/material-examples/input-errors/input-errors-example.html b/src/material-examples/input-errors/input-errors-example.html
index 4434b6ea941c..c8fbba32201c 100644
--- a/src/material-examples/input-errors/input-errors-example.html
+++ b/src/material-examples/input-errors/input-errors-example.html
@@ -1,11 +1,11 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input mdInput placeholder="Email" [formControl]="emailFormControl">
-    <md-error *ngIf="emailFormControl.hasError('pattern')">
+  <mat-form-field class="example-full-width">
+    <input matInput placeholder="Email" [formControl]="emailFormControl">
+    <mat-error *ngIf="emailFormControl.hasError('pattern')">
       Please enter a valid email address
-    </md-error>
-    <md-error *ngIf="emailFormControl.hasError('required')">
+    </mat-error>
+    <mat-error *ngIf="emailFormControl.hasError('required')">
       Email is <strong>required</strong>
-    </md-error>
-  </md-form-field>
+    </mat-error>
+  </mat-form-field>
 </form>
diff --git a/src/material-examples/input-form/input-form-example.html b/src/material-examples/input-form/input-form-example.html
index f7abf80888be..8cf31e056b62 100644
--- a/src/material-examples/input-form/input-form-example.html
+++ b/src/material-examples/input-form/input-form-example.html
@@ -1,36 +1,36 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input mdInput placeholder="Company (disabled)" disabled value="Google">
-  </md-form-field>
+  <mat-form-field class="example-full-width">
+    <input matInput placeholder="Company (disabled)" disabled value="Google">
+  </mat-form-field>
 
   <table class="example-full-width" cellspacing="0"><tr>
-    <td><md-form-field class="example-full-width">
-      <input mdInput placeholder="First name">
-    </md-form-field></td>
-    <td><md-form-field class="example-full-width">
-      <input mdInput placeholder="Long Last Name That Will Be Truncated">
-    </md-form-field></td>
+    <td><mat-form-field class="example-full-width">
+      <input matInput placeholder="First name">
+    </mat-form-field></td>
+    <td><mat-form-field class="example-full-width">
+      <input matInput placeholder="Long Last Name That Will Be Truncated">
+    </mat-form-field></td>
   </tr></table>
 
   <p>
-    <md-form-field class="example-full-width">
-      <textarea mdInput placeholder="Address">1600 Amphitheatre Pkwy</textarea>
-    </md-form-field>
-    <md-form-field class="example-full-width">
-      <textarea mdInput placeholder="Address 2"></textarea>
-    </md-form-field>
+    <mat-form-field class="example-full-width">
+      <textarea matInput placeholder="Address">1600 Amphitheatre Pkwy</textarea>
+    </mat-form-field>
+    <mat-form-field class="example-full-width">
+      <textarea matInput placeholder="Address 2"></textarea>
+    </mat-form-field>
   </p>
 
   <table class="example-full-width" cellspacing="0"><tr>
-    <td><md-form-field class="example-full-width">
-      <input mdInput placeholder="City">
-    </md-form-field></td>
-    <td><md-form-field class="example-full-width">
-      <input mdInput placeholder="State">
-    </md-form-field></td>
-    <td><md-form-field class="example-full-width">
-      <input mdInput #postalCode maxlength="5" placeholder="Postal Code" value="94043">
-      <md-hint align="end">{{postalCode.value.length}} / 5</md-hint>
-    </md-form-field></td>
+    <td><mat-form-field class="example-full-width">
+      <input matInput placeholder="City">
+    </mat-form-field></td>
+    <td><mat-form-field class="example-full-width">
+      <input matInput placeholder="State">
+    </mat-form-field></td>
+    <td><mat-form-field class="example-full-width">
+      <input matInput #postalCode maxlength="5" placeholder="Postal Code" value="94043">
+      <mat-hint align="end">{{postalCode.value.length}} / 5</mat-hint>
+    </mat-form-field></td>
   </tr></table>
 </form>
diff --git a/src/material-examples/input-hint/input-hint-example.html b/src/material-examples/input-hint/input-hint-example.html
index f7e36d1ddb1d..b7595cfa636b 100644
--- a/src/material-examples/input-hint/input-hint-example.html
+++ b/src/material-examples/input-hint/input-hint-example.html
@@ -1,9 +1,9 @@
 <form class="example-form">
 
-  <md-form-field class="example-full-width">
-    <input mdInput #message maxlength="256" placeholder="Message">
-    <md-hint align="start"><strong>Don't disclose personal info</strong> </md-hint>
-    <md-hint align="end">{{message.value.length}} / 256</md-hint>
-  </md-form-field>
+  <mat-form-field class="example-full-width">
+    <input matInput #message maxlength="256" placeholder="Message">
+    <mat-hint align="start"><strong>Don't disclose personal info</strong> </mat-hint>
+    <mat-hint align="end">{{message.value.length}} / 256</mat-hint>
+  </mat-form-field>
   
 </form>
diff --git a/src/material-examples/input-overview/input-overview-example.html b/src/material-examples/input-overview/input-overview-example.html
index cae5b1f0f6c1..c4daebdcc9db 100644
--- a/src/material-examples/input-overview/input-overview-example.html
+++ b/src/material-examples/input-overview/input-overview-example.html
@@ -1,5 +1,5 @@
 <form class="example-form">
-  <md-form-field class="example-full-width">
-    <input mdInput placeholder="Favorite food" value="Sushi">
-  </md-form-field>
+  <mat-form-field class="example-full-width">
+    <input matInput placeholder="Favorite food" value="Sushi">
+  </mat-form-field>
 </form>
diff --git a/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.html b/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.html
index 25485d1fa1c3..7bff7e420fcd 100644
--- a/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.html
+++ b/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.html
@@ -1,9 +1,9 @@
 <form class="example-form">
 
-  <md-form-field class="example-full-width">
-    <span mdPrefix>+1 &nbsp;</span>
-    <input type="tel" mdInput placeholder="Telephone">
-    <md-icon mdSuffix>mode_edit</md-icon>
-  </md-form-field>
+  <mat-form-field class="example-full-width">
+    <span matPrefix>+1 &nbsp;</span>
+    <input type="tel" matInput placeholder="Telephone">
+    <mat-icon matSuffix>mode_edit</mat-icon>
+  </mat-form-field>
   
 </form>
diff --git a/src/material-examples/list-overview/list-overview-example.html b/src/material-examples/list-overview/list-overview-example.html
index ada715ee0acf..4c59db7aa84e 100644
--- a/src/material-examples/list-overview/list-overview-example.html
+++ b/src/material-examples/list-overview/list-overview-example.html
@@ -1,5 +1,5 @@
-<md-list>
-  <md-list-item>Item 1</md-list-item>
-  <md-list-item>Item 2</md-list-item>
-  <md-list-item>Item 3</md-list-item>
-</md-list>
+<mat-list>
+  <mat-list-item>Item 1</mat-list-item>
+  <mat-list-item>Item 2</mat-list-item>
+  <mat-list-item>Item 3</mat-list-item>
+</mat-list>
diff --git a/src/material-examples/list-sections/list-sections-example.html b/src/material-examples/list-sections/list-sections-example.html
index 38d20f97eedc..ecb32bb2e8e6 100644
--- a/src/material-examples/list-sections/list-sections-example.html
+++ b/src/material-examples/list-sections/list-sections-example.html
@@ -1,15 +1,15 @@
-<md-list>
-  <h3 md-subheader>Folders</h3>
-  <md-list-item *ngFor="let folder of folders">
-    <md-icon md-list-icon>folder</md-icon>
-    <h4 md-line>{{folder.name}}</h4>
-    <p md-line> {{folder.updated | date}} </p>
-  </md-list-item>
-  <md-divider></md-divider>
-  <h3 md-subheader>Notes</h3>
-  <md-list-item *ngFor="let note of notes">
-    <md-icon md-list-icon>note</md-icon>
-    <h4 md-line>{{note.name}}</h4>
-    <p md-line> {{note.updated | date}} </p>
-  </md-list-item>
-</md-list>
+<mat-list>
+  <h3 mat-subheader>Folders</h3>
+  <mat-list-item *ngFor="let folder of folders">
+    <mat-icon mat-list-icon>folder</mat-icon>
+    <h4 mat-line>{{folder.name}}</h4>
+    <p mat-line> {{folder.updated | date}} </p>
+  </mat-list-item>
+  <mat-divider></mat-divider>
+  <h3 mat-subheader>Notes</h3>
+  <mat-list-item *ngFor="let note of notes">
+    <mat-icon mat-list-icon>note</mat-icon>
+    <h4 mat-line>{{note.name}}</h4>
+    <p mat-line> {{note.updated | date}} </p>
+  </mat-list-item>
+</mat-list>
diff --git a/src/material-examples/list-selection/list-selection-example.html b/src/material-examples/list-selection/list-selection-example.html
index cd1d9f07353c..d068febecc21 100644
--- a/src/material-examples/list-selection/list-selection-example.html
+++ b/src/material-examples/list-selection/list-selection-example.html
@@ -1,8 +1,8 @@
-<md-selection-list #shoes>
-  <md-list-option *ngFor="let shoe of typesOfShoes">
+<mat-selection-list #shoes>
+  <mat-list-option *ngFor="let shoe of typesOfShoes">
     {{shoe}}
-  </md-list-option>
-</md-selection-list>
+  </mat-list-option>
+</mat-selection-list>
 
 <p>
   Options selected: {{shoes.selectedOptions.selected.length}}
diff --git a/src/material-examples/material-module.ts b/src/material-examples/material-module.ts
index 34309d98dbbd..e399634d801f 100644
--- a/src/material-examples/material-module.ts
+++ b/src/material-examples/material-module.ts
@@ -2,48 +2,48 @@ import {NgModule} from '@angular/core';
 
 import {CdkTableModule} from '@angular/cdk/table';
 import {
-  MdAutocompleteModule, MdButtonModule, MdButtonToggleModule, MdPaginatorModule,
-  MdCardModule, MdCheckboxModule, MdChipsModule, MdDatepickerModule,
-  MdDialogModule, MdGridListModule, MdIconModule, MdInputModule,
-  MdListModule, MdMenuModule, MdProgressBarModule, MdProgressSpinnerModule,
-  MdRadioModule, MdSelectModule, MdSidenavModule, MdSliderModule, MdSortModule,
-  MdSlideToggleModule, MdSnackBarModule, MdTableModule, MdTabsModule, MdToolbarModule,
-  MdTooltipModule, MdFormFieldModule, MdExpansionModule, MdStepperModule
+  MatAutocompleteModule, MatButtonModule, MatButtonToggleModule, MatPaginatorModule,
+  MatCardModule, MatCheckboxModule, MatChipsModule, MatDatepickerModule,
+  MatDialogModule, MatGridListModule, MatIconModule, MatInputModule,
+  MatListModule, MatMenuModule, MatProgressBarModule, MatProgressSpinnerModule,
+  MatRadioModule, MatSelectModule, MatSidenavModule, MatSliderModule, MatSortModule,
+  MatSlideToggleModule, MatSnackBarModule, MatTableModule, MatTabsModule, MatToolbarModule,
+  MatTooltipModule, MatFormFieldModule, MatExpansionModule, MatStepperModule
 } from '@angular/material';
 
 @NgModule({
   exports: [
     CdkTableModule,
-    MdAutocompleteModule,
-    MdButtonModule,
-    MdButtonToggleModule,
-    MdCardModule,
-    MdCheckboxModule,
-    MdChipsModule,
-    MdDatepickerModule,
-    MdDialogModule,
-    MdExpansionModule,
-    MdFormFieldModule,
-    MdGridListModule,
-    MdIconModule,
-    MdInputModule,
-    MdListModule,
-    MdMenuModule,
-    MdProgressBarModule,
-    MdProgressSpinnerModule,
-    MdRadioModule,
-    MdSelectModule,
-    MdSlideToggleModule,
-    MdSliderModule,
-    MdSidenavModule,
-    MdSnackBarModule,
-    MdStepperModule,
-    MdTabsModule,
-    MdToolbarModule,
-    MdTooltipModule,
-    MdPaginatorModule,
-    MdSortModule,
-    MdTableModule
+    MatAutocompleteModule,
+    MatButtonModule,
+    MatButtonToggleModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatChipsModule,
+    MatDatepickerModule,
+    MatDialogModule,
+    MatExpansionModule,
+    MatFormFieldModule,
+    MatGridListModule,
+    MatIconModule,
+    MatInputModule,
+    MatListModule,
+    MatMenuModule,
+    MatProgressBarModule,
+    MatProgressSpinnerModule,
+    MatRadioModule,
+    MatSelectModule,
+    MatSlideToggleModule,
+    MatSliderModule,
+    MatSidenavModule,
+    MatSnackBarModule,
+    MatStepperModule,
+    MatTabsModule,
+    MatToolbarModule,
+    MatTooltipModule,
+    MatPaginatorModule,
+    MatSortModule,
+    MatTableModule
   ]
 })
 export class ExampleMaterialModule {}
diff --git a/src/material-examples/menu-icons/menu-icons-example.html b/src/material-examples/menu-icons/menu-icons-example.html
index e14942451644..a5ea164cf8d6 100644
--- a/src/material-examples/menu-icons/menu-icons-example.html
+++ b/src/material-examples/menu-icons/menu-icons-example.html
@@ -1,17 +1,17 @@
-<button md-icon-button [mdMenuTriggerFor]="menu">
-  <md-icon>more_vert</md-icon>
+<button mat-icon-button [matMenuTriggerFor]="menu">
+  <mat-icon>more_vert</mat-icon>
 </button>
-<md-menu #menu="mdMenu">
-  <button md-menu-item>
-    <md-icon>dialpad</md-icon>
+<mat-menu #menu="matMenu">
+  <button mat-menu-item>
+    <mat-icon>dialpad</mat-icon>
     <span>Redial</span>
   </button>
-  <button md-menu-item disabled>
-    <md-icon>voicemail</md-icon>
+  <button mat-menu-item disabled>
+    <mat-icon>voicemail</mat-icon>
     <span>Check voicemail</span>
   </button>
-  <button md-menu-item>
-    <md-icon>notifications_off</md-icon>
+  <button mat-menu-item>
+    <mat-icon>notifications_off</mat-icon>
     <span>Disable alerts</span>
   </button>
-</md-menu>
+</mat-menu>
diff --git a/src/material-examples/menu-overview/menu-overview-example.html b/src/material-examples/menu-overview/menu-overview-example.html
index 2b5d246c298e..64f76da72b27 100644
--- a/src/material-examples/menu-overview/menu-overview-example.html
+++ b/src/material-examples/menu-overview/menu-overview-example.html
@@ -1,5 +1,5 @@
-<button md-button [mdMenuTriggerFor]="menu">Menu</button>
-<md-menu #menu="mdMenu">
-  <button md-menu-item>Item 1</button>
-  <button md-menu-item>Item 2</button>
-</md-menu>
+<button mat-button [matMenuTriggerFor]="menu">Menu</button>
+<mat-menu #menu="matMenu">
+  <button mat-menu-item>Item 1</button>
+  <button mat-menu-item>Item 2</button>
+</mat-menu>
diff --git a/src/material-examples/nested-menu/nested-menu-example.html b/src/material-examples/nested-menu/nested-menu-example.html
index bd972629fb54..a9f430b12445 100644
--- a/src/material-examples/nested-menu/nested-menu-example.html
+++ b/src/material-examples/nested-menu/nested-menu-example.html
@@ -1,47 +1,47 @@
-<button md-button [mdMenuTriggerFor]="animals">Animal index</button>
+<button mat-button [matMenuTriggerFor]="animals">Animal index</button>
 
-<md-menu #animals="mdMenu">
-  <button md-menu-item [mdMenuTriggerFor]="vertebrates">Vertebrates</button>
-  <button md-menu-item [mdMenuTriggerFor]="invertebrates">Invertebrates</button>
-</md-menu>
+<mat-menu #animals="matMenu">
+  <button mat-menu-item [matMenuTriggerFor]="vertebrates">Vertebrates</button>
+  <button mat-menu-item [matMenuTriggerFor]="invertebrates">Invertebrates</button>
+</mat-menu>
 
-<md-menu #vertebrates="mdMenu">
-  <button md-menu-item [mdMenuTriggerFor]="fish">Fishes</button>
-  <button md-menu-item [mdMenuTriggerFor]="amphibians">Amphibians</button>
-  <button md-menu-item [mdMenuTriggerFor]="reptiles">Reptiles</button>
-  <button md-menu-item>Birds</button>
-  <button md-menu-item>Mammals</button>
-</md-menu>
+<mat-menu #vertebrates="matMenu">
+  <button mat-menu-item [matMenuTriggerFor]="fish">Fishes</button>
+  <button mat-menu-item [matMenuTriggerFor]="amphibians">Amphibians</button>
+  <button mat-menu-item [matMenuTriggerFor]="reptiles">Reptiles</button>
+  <button mat-menu-item>Birds</button>
+  <button mat-menu-item>Mammals</button>
+</mat-menu>
 
-<md-menu #invertebrates="mdMenu">
-  <button md-menu-item>Insects</button>
-  <button md-menu-item>Molluscs</button>
-  <button md-menu-item>Crustaceans</button>
-  <button md-menu-item>Corals</button>
-  <button md-menu-item>Arachnids</button>
-  <button md-menu-item>Velvet worms</button>
-  <button md-menu-item>Horseshoe crabs</button>
-</md-menu>
+<mat-menu #invertebrates="matMenu">
+  <button mat-menu-item>Insects</button>
+  <button mat-menu-item>Molluscs</button>
+  <button mat-menu-item>Crustaceans</button>
+  <button mat-menu-item>Corals</button>
+  <button mat-menu-item>Arachnids</button>
+  <button mat-menu-item>Velvet worms</button>
+  <button mat-menu-item>Horseshoe crabs</button>
+</mat-menu>
 
-<md-menu #fish="mdMenu">
-  <button md-menu-item>Baikal oilfish</button>
-  <button md-menu-item>Bala shark</button>
-  <button md-menu-item>Ballan wrasse</button>
-  <button md-menu-item>Bamboo shark</button>
-  <button md-menu-item>Banded killifish</button>
-</md-menu>
+<mat-menu #fish="matMenu">
+  <button mat-menu-item>Baikal oilfish</button>
+  <button mat-menu-item>Bala shark</button>
+  <button mat-menu-item>Ballan wrasse</button>
+  <button mat-menu-item>Bamboo shark</button>
+  <button mat-menu-item>Banded killifish</button>
+</mat-menu>
 
-<md-menu #amphibians="mdMenu">
-  <button md-menu-item>Sonoran desert toad</button>
-  <button md-menu-item>Western toad</button>
-  <button md-menu-item>Arroyo toad</button>
-  <button md-menu-item>Yosemite toad</button>
-</md-menu>
+<mat-menu #amphibians="matMenu">
+  <button mat-menu-item>Sonoran desert toad</button>
+  <button mat-menu-item>Western toad</button>
+  <button mat-menu-item>Arroyo toad</button>
+  <button mat-menu-item>Yosemite toad</button>
+</mat-menu>
 
-<md-menu #reptiles="mdMenu">
-  <button md-menu-item>Banded Day Gecko</button>
-  <button md-menu-item>Banded Gila Monster</button>
-  <button md-menu-item>Black Tree Monitor</button>
-  <button md-menu-item>Blue Spiny Lizard</button>
-  <button md-menu-item disabled>Velociraptor</button>
-</md-menu>
+<mat-menu #reptiles="matMenu">
+  <button mat-menu-item>Banded Day Gecko</button>
+  <button mat-menu-item>Banded Gila Monster</button>
+  <button mat-menu-item>Black Tree Monitor</button>
+  <button mat-menu-item>Blue Spiny Lizard</button>
+  <button mat-menu-item disabled>Velociraptor</button>
+</mat-menu>
diff --git a/src/material-examples/paginator-configurable/paginator-configurable-example.html b/src/material-examples/paginator-configurable/paginator-configurable-example.html
index e1ce734f74fe..665cacfab07c 100644
--- a/src/material-examples/paginator-configurable/paginator-configurable-example.html
+++ b/src/material-examples/paginator-configurable/paginator-configurable-example.html
@@ -1,24 +1,24 @@
-<md-form-field>
+<mat-form-field>
   List length:
-  <input mdInput [(ngModel)]="length">
-</md-form-field>
+  <input matInput [(ngModel)]="length">
+</mat-form-field>
 
-<md-form-field>
+<mat-form-field>
   Page size:
-  <input mdInput [(ngModel)]="pageSize">
-</md-form-field>
-<md-form-field>
+  <input matInput [(ngModel)]="pageSize">
+</mat-form-field>
+<mat-form-field>
   Page size options:
-  <input mdInput
+  <input matInput
          [ngModel]="pageSizeOptions"
          (ngModelChange)="setPageSizeOptions($event)">
-</md-form-field>
+</mat-form-field>
 
-<md-paginator [length]="length"
+<mat-paginator [length]="length"
               [pageSize]="pageSize"
               [pageSizeOptions]="pageSizeOptions"
               (page)="pageEvent = $event">
-</md-paginator>
+</mat-paginator>
 
 <div *ngIf="pageEvent">
   <h5>Page Change Event Properties</h5>
diff --git a/src/material-examples/paginator-configurable/paginator-configurable-example.ts b/src/material-examples/paginator-configurable/paginator-configurable-example.ts
index ba3df8db743f..5ee316719e63 100644
--- a/src/material-examples/paginator-configurable/paginator-configurable-example.ts
+++ b/src/material-examples/paginator-configurable/paginator-configurable-example.ts
@@ -9,12 +9,12 @@ import {PageEvent} from '@angular/material';
   templateUrl: 'paginator-configurable-example.html',
 })
 export class PaginatorConfigurableExample {
-  // MdPaginator Inputs
+  // MatPaginator Inputs
   length = 100;
   pageSize = 10;
   pageSizeOptions = [5, 10, 25, 100];
 
-  // MdPaginator Output
+  // MatPaginator Output
   pageEvent: PageEvent;
 
   setPageSizeOptions(setPageSizeOptionsInput: string) {
diff --git a/src/material-examples/paginator-overview/paginator-overview-example.html b/src/material-examples/paginator-overview/paginator-overview-example.html
index 010a9e5d4e45..9269f3b47380 100644
--- a/src/material-examples/paginator-overview/paginator-overview-example.html
+++ b/src/material-examples/paginator-overview/paginator-overview-example.html
@@ -1,4 +1,4 @@
-<md-paginator [length]="100"
+<mat-paginator [length]="100"
               [pageSize]="10"
               [pageSizeOptions]="[5, 10, 25, 100]">
-</md-paginator>
+</mat-paginator>
diff --git a/src/material-examples/progress-bar-configurable/progress-bar-configurable-example.html b/src/material-examples/progress-bar-configurable/progress-bar-configurable-example.html
index 93937b77a8b8..bdde8c6126a9 100644
--- a/src/material-examples/progress-bar-configurable/progress-bar-configurable-example.html
+++ b/src/material-examples/progress-bar-configurable/progress-bar-configurable-example.html
@@ -1,63 +1,63 @@
-<md-card>
-  <md-card-content>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Progress bar configuration</h2>
 
     <section class="example-section">
       <label class="example-margin">Color:</label>
-      <md-radio-group [(ngModel)]="color">
-        <md-radio-button class="example-margin" value="primary">
+      <mat-radio-group [(ngModel)]="color">
+        <mat-radio-button class="example-margin" value="primary">
           Primary
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="accent">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="accent">
           Accent
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="warn">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="warn">
           Warn
-        </md-radio-button>
-      </md-radio-group>
+        </mat-radio-button>
+      </mat-radio-group>
     </section>
 
     <section class="example-section">
       <label class="example-margin">Mode:</label>
-      <md-radio-group [(ngModel)]="mode">
-        <md-radio-button class="example-margin" value="determinate">
+      <mat-radio-group [(ngModel)]="mode">
+        <mat-radio-button class="example-margin" value="determinate">
           Determinate
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="indeterminate">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="indeterminate">
           Indeterminate
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="buffer">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="buffer">
           Buffer
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="query">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="query">
           Query
-        </md-radio-button>
-      </md-radio-group>
+        </mat-radio-button>
+      </mat-radio-group>
     </section>
 
     <section class="example-section" *ngIf="mode == 'determinate' || mode == 'buffer'">
       <label class="example-margin">Progress:</label>
-      <md-slider class="example-margin" [(ngModel)]="value"></md-slider>
+      <mat-slider class="example-margin" [(ngModel)]="value"></mat-slider>
     </section>
     <section class="example-section" *ngIf="mode == 'buffer'">
       <label class="example-margin">Buffer:</label>
-      <md-slider class="example-margin" [(ngModel)]="bufferValue"></md-slider>
+      <mat-slider class="example-margin" [(ngModel)]="bufferValue"></mat-slider>
     </section>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card>
-  <md-card-content>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Result</h2>
 
     <section class="example-section">
-      <md-progress-bar
+      <mat-progress-bar
           class="example-margin"
           [color]="color"
           [mode]="mode"
           [value]="value"
           [bufferValue]="bufferValue">
-      </md-progress-bar>
+      </mat-progress-bar>
     </section>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
diff --git a/src/material-examples/progress-bar-overview/progress-bar-overview-example.html b/src/material-examples/progress-bar-overview/progress-bar-overview-example.html
index 8ab16e9cfc13..f6ba0575d4ee 100644
--- a/src/material-examples/progress-bar-overview/progress-bar-overview-example.html
+++ b/src/material-examples/progress-bar-overview/progress-bar-overview-example.html
@@ -1 +1 @@
-<md-progress-bar mode="indeterminate"></md-progress-bar>
+<mat-progress-bar mode="indeterminate"></mat-progress-bar>
diff --git a/src/material-examples/progress-spinner-configurable/progress-spinner-configurable-example.html b/src/material-examples/progress-spinner-configurable/progress-spinner-configurable-example.html
index 1ba3183acebf..538321c81938 100644
--- a/src/material-examples/progress-spinner-configurable/progress-spinner-configurable-example.html
+++ b/src/material-examples/progress-spinner-configurable/progress-spinner-configurable-example.html
@@ -1,49 +1,49 @@
-<md-card>
-  <md-card-content>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Progress spinner configuration</h2>
 
     <section class="example-section">
       <label class="example-margin">Color:</label>
-      <md-radio-group [(ngModel)]="color">
-        <md-radio-button class="example-margin" value="primary">
+      <mat-radio-group [(ngModel)]="color">
+        <mat-radio-button class="example-margin" value="primary">
           Primary
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="accent">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="accent">
           Accent
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="warn">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="warn">
           Warn
-        </md-radio-button>
-      </md-radio-group>
+        </mat-radio-button>
+      </mat-radio-group>
     </section>
 
     <section class="example-section">
       <label class="example-margin">Mode:</label>
-      <md-radio-group [(ngModel)]="mode">
-        <md-radio-button class="example-margin" value="determinate">
+      <mat-radio-group [(ngModel)]="mode">
+        <mat-radio-button class="example-margin" value="determinate">
           Determinate
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="indeterminate">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="indeterminate">
           Indeterminate
-        </md-radio-button>
-      </md-radio-group>
+        </mat-radio-button>
+      </mat-radio-group>
     </section>
 
     <section class="example-section" *ngIf="mode == 'determinate'">
       <label class="example-margin">Progress:</label>
-      <md-slider class="example-margin" [(ngModel)]="value"></md-slider>
+      <mat-slider class="example-margin" [(ngModel)]="value"></mat-slider>
     </section>
-  </md-card-content>
-</md-card>
-<md-card>
-  <md-card-content>
+  </mat-card-content>
+</mat-card>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Result</h2>
 
-    <md-progress-spinner
+    <mat-progress-spinner
         class="example-margin"
         [color]="color"
         [mode]="mode"
         [value]="value">
-    </md-progress-spinner>
-  </md-card-content>
-</md-card>
+    </mat-progress-spinner>
+  </mat-card-content>
+</mat-card>
diff --git a/src/material-examples/progress-spinner-overview/progress-spinner-overview-example.html b/src/material-examples/progress-spinner-overview/progress-spinner-overview-example.html
index cd768c67385c..34e51f70fc2f 100644
--- a/src/material-examples/progress-spinner-overview/progress-spinner-overview-example.html
+++ b/src/material-examples/progress-spinner-overview/progress-spinner-overview-example.html
@@ -1 +1 @@
-<md-spinner></md-spinner>
+<mat-spinner></mat-spinner>
diff --git a/src/material-examples/radio-ng-model/radio-ng-model-example.html b/src/material-examples/radio-ng-model/radio-ng-model-example.html
index 108971b5739a..4dd923173b75 100644
--- a/src/material-examples/radio-ng-model/radio-ng-model-example.html
+++ b/src/material-examples/radio-ng-model/radio-ng-model-example.html
@@ -1,6 +1,6 @@
-<md-radio-group class="example-radio-group" [(ngModel)]="favoriteSeason">
-  <md-radio-button class="example-radio-button" *ngFor="let season of seasons" [value]="season">
+<mat-radio-group class="example-radio-group" [(ngModel)]="favoriteSeason">
+  <mat-radio-button class="example-radio-button" *ngFor="let season of seasons" [value]="season">
     {{season}}
-  </md-radio-button>
-</md-radio-group>
+  </mat-radio-button>
+</mat-radio-group>
 <div class="example-selected-value">Your favorite season is: {{favoriteSeason}}</div>
diff --git a/src/material-examples/radio-overview/radio-overview-example.html b/src/material-examples/radio-overview/radio-overview-example.html
index 4038381cc49e..cadd1b6e8d59 100644
--- a/src/material-examples/radio-overview/radio-overview-example.html
+++ b/src/material-examples/radio-overview/radio-overview-example.html
@@ -1,4 +1,4 @@
-<md-radio-group>
-  <md-radio-button value="1">Option 1</md-radio-button>
-  <md-radio-button value="2">Option 2</md-radio-button>
-</md-radio-group>
+<mat-radio-group>
+  <mat-radio-button value="1">Option 1</mat-radio-button>
+  <mat-radio-button value="2">Option 2</mat-radio-button>
+</mat-radio-group>
diff --git a/src/material-examples/select-form/select-form-example.html b/src/material-examples/select-form/select-form-example.html
index 31252dd70a66..484c7282bc44 100644
--- a/src/material-examples/select-form/select-form-example.html
+++ b/src/material-examples/select-form/select-form-example.html
@@ -1,11 +1,11 @@
 <form>
-  <md-form-field>
-    <md-select placeholder="Favorite food" [(ngModel)]="selectedValue" name="food">
-      <md-option *ngFor="let food of foods" [value]="food.value">
+  <mat-form-field>
+    <mat-select placeholder="Favorite food" [(ngModel)]="selectedValue" name="food">
+      <mat-option *ngFor="let food of foods" [value]="food.value">
         {{food.viewValue}}
-      </md-option>
-    </md-select>
-  </md-form-field>
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
 
   <p> Selected value: {{selectedValue}} </p>
 </form>
diff --git a/src/material-examples/select-overview/select-overview-example.html b/src/material-examples/select-overview/select-overview-example.html
index bf3897383572..f02b07a123ad 100644
--- a/src/material-examples/select-overview/select-overview-example.html
+++ b/src/material-examples/select-overview/select-overview-example.html
@@ -1,7 +1,7 @@
-<md-form-field>
-  <md-select placeholder="Favorite food">
-    <md-option *ngFor="let food of foods" [value]="food.value">
+<mat-form-field>
+  <mat-select placeholder="Favorite food">
+    <mat-option *ngFor="let food of foods" [value]="food.value">
       {{ food.viewValue }}
-    </md-option>
-  </md-select>
-</md-form-field>
+    </mat-option>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.css b/src/material-examples/sidenav-fab/sidenav-fab-example.css
index 6d58f0f24b13..80b88561b599 100644
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.css
+++ b/src/material-examples/sidenav-fab/sidenav-fab-example.css
@@ -4,12 +4,12 @@
   border: 1px solid rgba(0, 0, 0, 0.5);
 }
 
-.example-sidenav-fab-container md-sidenav {
+.example-sidenav-fab-container mat-sidenav {
   max-width: 200px;
 }
 
 .example-sidenav-fab-container .mat-sidenav-content,
-.example-sidenav-fab-container md-sidenav {
+.example-sidenav-fab-container mat-sidenav {
   display: flex;
   overflow: visible;
 }
diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.html b/src/material-examples/sidenav-fab/sidenav-fab-example.html
index f194c09852e2..9053ced258a3 100644
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.html
+++ b/src/material-examples/sidenav-fab/sidenav-fab-example.html
@@ -1,7 +1,7 @@
-<md-sidenav-container class="example-sidenav-fab-container">
-  <md-sidenav #sidenav mode="side" opened="true">
-    <button md-mini-fab class="example-fab" (click)="sidenav.toggle()">
-      <md-icon>add</md-icon>
+<mat-sidenav-container class="example-sidenav-fab-container">
+  <mat-sidenav #sidenav mode="side" opened="true">
+    <button mat-mini-fab class="example-fab" (click)="sidenav.toggle()">
+      <mat-icon>add</mat-icon>
     </button>
     <div class="example-scrolling-content">
       Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus,
@@ -14,9 +14,9 @@
       tristique vehicula nibh ipsum vivamus, proin proin. Porta commodo nibh quis libero amet.
       Taciti dui, sapien consectetuer.
     </div>
-  </md-sidenav>
-  <button md-mini-fab class="example-fab" (click)="sidenav.toggle()">
-    <md-icon>add</md-icon>
+  </mat-sidenav>
+  <button mat-mini-fab class="example-fab" (click)="sidenav.toggle()">
+    <mat-icon>add</mat-icon>
   </button>
   <div class="example-scrolling-content">
     Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus, fusce
@@ -29,4 +29,4 @@
     ipsum vivamus, proin proin. Porta commodo nibh quis libero amet. Taciti dui, sapien
     consectetuer.
   </div>
-</md-sidenav-container>
+</mat-sidenav-container>
diff --git a/src/material-examples/sidenav-overview/sidenav-overview-example.html b/src/material-examples/sidenav-overview/sidenav-overview-example.html
index 757e4b2d43f2..9069c886c896 100644
--- a/src/material-examples/sidenav-overview/sidenav-overview-example.html
+++ b/src/material-examples/sidenav-overview/sidenav-overview-example.html
@@ -1,12 +1,12 @@
-<md-sidenav-container class="example-container">
-  <md-sidenav #sidenav class="example-sidenav">
+<mat-sidenav-container class="example-container">
+  <mat-sidenav #sidenav class="example-sidenav">
     Jolly good!
-  </md-sidenav>
+  </mat-sidenav>
 
   <div class="example-sidenav-content">
-    <button type="button" md-button (click)="sidenav.open()">
+    <button type="button" mat-button (click)="sidenav.open()">
       Open sidenav
     </button>
   </div>
 
-</md-sidenav-container>
+</mat-sidenav-container>
diff --git a/src/material-examples/slide-toggle-configurable/slide-toggle-configurable-example.html b/src/material-examples/slide-toggle-configurable/slide-toggle-configurable-example.html
index 88099f4b0254..b7f41c0090c4 100644
--- a/src/material-examples/slide-toggle-configurable/slide-toggle-configurable-example.html
+++ b/src/material-examples/slide-toggle-configurable/slide-toggle-configurable-example.html
@@ -1,44 +1,44 @@
-<md-card>
-  <md-card-content>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Slider configuration</h2>
 
     <section class="example-section">
       <label class="example-margin">Color:</label>
-      <md-radio-group [(ngModel)]="color">
-        <md-radio-button class="example-margin" value="primary">
+      <mat-radio-group [(ngModel)]="color">
+        <mat-radio-button class="example-margin" value="primary">
           Primary
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="accent">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="accent">
           Accent
-        </md-radio-button>
-        <md-radio-button class="example-margin" value="warn">
+        </mat-radio-button>
+        <mat-radio-button class="example-margin" value="warn">
           Warn
-        </md-radio-button>
-      </md-radio-group>
+        </mat-radio-button>
+      </mat-radio-group>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="checked">Checked</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="checked">Checked</mat-checkbox>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="disabled">Disabled</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="disabled">Disabled</mat-checkbox>
     </section>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="result">
-  <md-card-content>
+<mat-card class="result">
+  <mat-card-content>
     <h2 class="example-h2">Result</h2>
 
     <section class="example-section">
-      <md-slide-toggle
+      <mat-slide-toggle
           class="example-margin"
           [color]="color"
           [checked]="checked"
           [disabled]="disabled">
         Slide me!
-      </md-slide-toggle>
+      </mat-slide-toggle>
     </section>
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
diff --git a/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.css b/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.css
index 8567e7f853bb..aaec1dbc305e 100644
--- a/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.css
+++ b/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.css
@@ -1,4 +1,4 @@
-.example-form md-slide-toggle {
+.example-form mat-slide-toggle {
   margin: 8px 0;
   display: block;
 }
diff --git a/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.html b/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.html
index 0a2b897d22f8..3ce5f440b735 100644
--- a/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.html
+++ b/src/material-examples/slide-toggle-forms/slide-toggle-forms-example.html
@@ -1,25 +1,25 @@
 <p>Slide Toggle using a simple NgModel.</p>
 
-<md-slide-toggle [(ngModel)]="isChecked">Slide Toggle Checked: {{ isChecked }}</md-slide-toggle>
+<mat-slide-toggle [(ngModel)]="isChecked">Slide Toggle Checked: {{ isChecked }}</mat-slide-toggle>
 
 <p>Slide Toggle inside of a Template-driven form</p>
 
 <form class="example-form" #form="ngForm" (ngSubmit)="onFormSubmit(form.value)" ngNativeValidate>
 
-  <md-slide-toggle ngModel name="enableWifi">Enable Wifi</md-slide-toggle>
-  <md-slide-toggle ngModel name="acceptTerms" required>Accept Terms of Service</md-slide-toggle>
+  <mat-slide-toggle ngModel name="enableWifi">Enable Wifi</mat-slide-toggle>
+  <mat-slide-toggle ngModel name="acceptTerms" required>Accept Terms of Service</mat-slide-toggle>
 
-  <button md-raised-button type="submit">Save Settings</button>
+  <button mat-raised-button type="submit">Save Settings</button>
 </form>
 
 <p>Slide Toggle inside of a Reactive form</p>
 
 <form class="example-form" [formGroup]="formGroup" (ngSubmit)="onFormSubmit(formGroup.value)" ngNativeValidate>
 
-  <md-slide-toggle formControlName="enableWifi">Enable Wifi</md-slide-toggle>
-  <md-slide-toggle formControlName="acceptTerms">Accept Terms of Service</md-slide-toggle>
+  <mat-slide-toggle formControlName="enableWifi">Enable Wifi</mat-slide-toggle>
+  <mat-slide-toggle formControlName="acceptTerms">Accept Terms of Service</mat-slide-toggle>
 
   <p>Form Group Status: {{ formGroup.status}}</p>
 
-  <button md-rasied-button type="submit">Save Settings</button>
+  <button mat-rasied-button type="submit">Save Settings</button>
 </form>
diff --git a/src/material-examples/slide-toggle-overview/slide-toggle-overview-example.html b/src/material-examples/slide-toggle-overview/slide-toggle-overview-example.html
index 6b9586e148fc..d9d6ab193f34 100644
--- a/src/material-examples/slide-toggle-overview/slide-toggle-overview-example.html
+++ b/src/material-examples/slide-toggle-overview/slide-toggle-overview-example.html
@@ -1 +1 @@
-<md-slide-toggle>Slide me!</md-slide-toggle>
+<mat-slide-toggle>Slide me!</mat-slide-toggle>
diff --git a/src/material-examples/slider-configurable/slider-configurable-example.html b/src/material-examples/slider-configurable/slider-configurable-example.html
index 5eb3214fd0a1..666753cdf4c6 100644
--- a/src/material-examples/slider-configurable/slider-configurable-example.html
+++ b/src/material-examples/slider-configurable/slider-configurable-example.html
@@ -1,53 +1,53 @@
-<md-card>
-  <md-card-content>
+<mat-card>
+  <mat-card-content>
     <h2 class="example-h2">Slider configuration</h2>
 
     <section class="example-section">
-      <md-form-field class="example-margin">
-        <input mdInput type="number" placeholder="Value" [(ngModel)]="value">
-      </md-form-field>
-      <md-form-field class="example-margin">
-        <input mdInput type="number" placeholder="Min value" [(ngModel)]="min">
-      </md-form-field>
-      <md-form-field class="example-margin">
-        <input mdInput type="number" placeholder="Max value" [(ngModel)]="max">
-      </md-form-field>
-      <md-form-field class="example-margin">
-        <input mdInput type="number" placeholder="Step size" [(ngModel)]="step">
-      </md-form-field>
+      <mat-form-field class="example-margin">
+        <input matInput type="number" placeholder="Value" [(ngModel)]="value">
+      </mat-form-field>
+      <mat-form-field class="example-margin">
+        <input matInput type="number" placeholder="Min value" [(ngModel)]="min">
+      </mat-form-field>
+      <mat-form-field class="example-margin">
+        <input matInput type="number" placeholder="Max value" [(ngModel)]="max">
+      </mat-form-field>
+      <mat-form-field class="example-margin">
+        <input matInput type="number" placeholder="Step size" [(ngModel)]="step">
+      </mat-form-field>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="showTicks">Show ticks</md-checkbox>
-      <md-checkbox class="example-margin" [(ngModel)]="autoTicks" *ngIf="showTicks">
+      <mat-checkbox class="example-margin" [(ngModel)]="showTicks">Show ticks</mat-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="autoTicks" *ngIf="showTicks">
         Auto ticks
-      </md-checkbox>
-      <md-form-field class="example-margin" *ngIf="showTicks && !autoTicks">
-        <input mdInput type="number" placeholder="Tick interval" [(ngModel)]="tickInterval">
-      </md-form-field>
+      </mat-checkbox>
+      <mat-form-field class="example-margin" *ngIf="showTicks && !autoTicks">
+        <input matInput type="number" placeholder="Tick interval" [(ngModel)]="tickInterval">
+      </mat-form-field>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="thumbLabel">Show thumb label</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="thumbLabel">Show thumb label</mat-checkbox>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="vertical">Vertical</md-checkbox>
-      <md-checkbox class="example-margin" [(ngModel)]="invert">Inverted</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="vertical">Vertical</mat-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="invert">Inverted</mat-checkbox>
     </section>
 
     <section class="example-section">
-      <md-checkbox class="example-margin" [(ngModel)]="disabled">Disabled</md-checkbox>
+      <mat-checkbox class="example-margin" [(ngModel)]="disabled">Disabled</mat-checkbox>
     </section>
 
-  </md-card-content>
-</md-card>
+  </mat-card-content>
+</mat-card>
 
-<md-card class="result">
-  <md-card-content>
+<mat-card class="result">
+  <mat-card-content>
     <h2 class="example-h2">Result</h2>
 
-    <md-slider
+    <mat-slider
         class="example-margin"
         [disabled]="disabled"
         [invert]="invert"
@@ -58,6 +58,6 @@ <h2 class="example-h2">Result</h2>
         [tick-interval]="tickInterval"
         [value]="value"
         [vertical]="vertical">
-    </md-slider>
-  </md-card-content>
-</md-card>
+    </mat-slider>
+  </mat-card-content>
+</mat-card>
diff --git a/src/material-examples/slider-overview/slider-overview-example.css b/src/material-examples/slider-overview/slider-overview-example.css
index 8dfe08ccc21d..90bd10ae0222 100644
--- a/src/material-examples/slider-overview/slider-overview-example.css
+++ b/src/material-examples/slider-overview/slider-overview-example.css
@@ -1,4 +1,4 @@
 /** No CSS for this example */
-md-slider {
+mat-slider {
   width: 300px;
 }
diff --git a/src/material-examples/slider-overview/slider-overview-example.html b/src/material-examples/slider-overview/slider-overview-example.html
index 9a92c8f867dd..49162f5fe3ec 100644
--- a/src/material-examples/slider-overview/slider-overview-example.html
+++ b/src/material-examples/slider-overview/slider-overview-example.html
@@ -1 +1 @@
-<md-slider></md-slider>
+<mat-slider></mat-slider>
diff --git a/src/material-examples/snack-bar-component/snack-bar-component-example.html b/src/material-examples/snack-bar-component/snack-bar-component-example.html
index 69fe01bc3dcb..3c8c74b319a9 100644
--- a/src/material-examples/snack-bar-component/snack-bar-component-example.html
+++ b/src/material-examples/snack-bar-component/snack-bar-component-example.html
@@ -1,3 +1,3 @@
-<button md-button (click)="openSnackBar()" aria-label="Show an example snack-bar">
+<button mat-button (click)="openSnackBar()" aria-label="Show an example snack-bar">
   Pizza party
 </button>
diff --git a/src/material-examples/snack-bar-component/snack-bar-component-example.ts b/src/material-examples/snack-bar-component/snack-bar-component-example.ts
index 8aac00a13153..7c685c53985a 100644
--- a/src/material-examples/snack-bar-component/snack-bar-component-example.ts
+++ b/src/material-examples/snack-bar-component/snack-bar-component-example.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 /**
  * @title Snack-bar with a custom component
@@ -9,7 +9,7 @@ import {MdSnackBar} from '@angular/material';
   templateUrl: 'snack-bar-component-example.html',
 })
 export class SnackBarComponentExample {
-  constructor(public snackBar: MdSnackBar) {}
+  constructor(public snackBar: MatSnackBar) {}
 
   openSnackBar() {
     this.snackBar.openFromComponent(PizzaPartyComponent, {
diff --git a/src/material-examples/snack-bar-overview/snack-bar-overview-example.html b/src/material-examples/snack-bar-overview/snack-bar-overview-example.html
index 757612c187f1..67065299a718 100644
--- a/src/material-examples/snack-bar-overview/snack-bar-overview-example.html
+++ b/src/material-examples/snack-bar-overview/snack-bar-overview-example.html
@@ -1,9 +1,9 @@
-<md-form-field>
-  <input mdInput value="Disco party!" placeholder="Message" #message>
-</md-form-field>
+<mat-form-field>
+  <input matInput value="Disco party!" placeholder="Message" #message>
+</mat-form-field>
 
-<md-form-field>
-  <input mdInput value="Dance" placeholder="Action" #action>
-</md-form-field>
+<mat-form-field>
+  <input matInput value="Dance" placeholder="Action" #action>
+</mat-form-field>
 
-<button md-button (click)="openSnackBar(message.value, action.value)">Show snack-bar</button>
+<button mat-button (click)="openSnackBar(message.value, action.value)">Show snack-bar</button>
diff --git a/src/material-examples/snack-bar-overview/snack-bar-overview-example.ts b/src/material-examples/snack-bar-overview/snack-bar-overview-example.ts
index 4d1980dc9d47..010634ef1dca 100644
--- a/src/material-examples/snack-bar-overview/snack-bar-overview-example.ts
+++ b/src/material-examples/snack-bar-overview/snack-bar-overview-example.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 
 /**
  * @title Basic snack-bar
@@ -9,7 +9,7 @@ import {MdSnackBar} from '@angular/material';
   templateUrl: 'snack-bar-overview-example.html',
 })
 export class SnackBarOverviewExample {
-  constructor(public snackBar: MdSnackBar) {}
+  constructor(public snackBar: MatSnackBar) {}
 
   openSnackBar(message: string, action: string) {
     this.snackBar.open(message, action, {
diff --git a/src/material-examples/sort-overview/sort-overview-example.html b/src/material-examples/sort-overview/sort-overview-example.html
index 342f38554140..2b970af18c6a 100644
--- a/src/material-examples/sort-overview/sort-overview-example.html
+++ b/src/material-examples/sort-overview/sort-overview-example.html
@@ -1,10 +1,10 @@
-<table mdSort (mdSortChange)="sortData($event)">
+<table matSort (matSortChange)="sortData($event)">
   <tr>
-    <th md-sort-header="name">Dessert (100g)</th>
-    <th md-sort-header="calories">Calories</th>
-    <th md-sort-header="fat">Fat (g)</th>
-    <th md-sort-header="carbs">Carbs (g)</th>
-    <th md-sort-header="protein">Protein (g)</th>
+    <th mat-sort-header="name">Dessert (100g)</th>
+    <th mat-sort-header="calories">Calories</th>
+    <th mat-sort-header="fat">Fat (g)</th>
+    <th mat-sort-header="carbs">Carbs (g)</th>
+    <th mat-sort-header="protein">Protein (g)</th>
   </tr>
 
   <tr *ngFor="let dessert of sortedData">
diff --git a/src/material-examples/stepper-overview/stepper-overview-example.html b/src/material-examples/stepper-overview/stepper-overview-example.html
index adff42f6f8ba..433cabb09cd2 100644
--- a/src/material-examples/stepper-overview/stepper-overview-example.html
+++ b/src/material-examples/stepper-overview/stepper-overview-example.html
@@ -1,32 +1,32 @@
-<md-horizontal-stepper [linear]="isLinear">
-  <md-step [stepControl]="firstFormGroup">
+<mat-horizontal-stepper [linear]="isLinear">
+  <mat-step [stepControl]="firstFormGroup">
     <form [formGroup]="firstFormGroup">
-      <ng-template mdStepLabel>Fill out your name</ng-template>
-      <md-form-field>
-        <input mdInput placeholder="Last name, First name" formControlName="firstCtrl" required>
-      </md-form-field>
+      <ng-template matStepLabel>Fill out your name</ng-template>
+      <mat-form-field>
+        <input matInput placeholder="Last name, First name" formControlName="firstCtrl" required>
+      </mat-form-field>
       <div>
-        <button md-button mdStepperNext>Next</button>
+        <button mat-button matStepperNext>Next</button>
       </div>
     </form>
-  </md-step>
-  <md-step [stepControl]="secondFormGroup">
+  </mat-step>
+  <mat-step [stepControl]="secondFormGroup">
     <form [formGroup]="secondFormGroup">
-      <ng-template mdStepLabel>Fill out your address</ng-template>
-      <md-form-field>
-        <input mdInput placeholder="Address" formControlName="secondCtrl" required>
-      </md-form-field>
+      <ng-template matStepLabel>Fill out your address</ng-template>
+      <mat-form-field>
+        <input matInput placeholder="Address" formControlName="secondCtrl" required>
+      </mat-form-field>
       <div>
-        <button md-button mdStepperPrevious>Back</button>
-        <button md-button mdStepperNext>Next</button>
+        <button mat-button matStepperPrevious>Back</button>
+        <button mat-button matStepperNext>Next</button>
       </div>
     </form>
-  </md-step>
-  <md-step>
-    <ng-template mdStepLabel>Done</ng-template>
+  </mat-step>
+  <mat-step>
+    <ng-template matStepLabel>Done</ng-template>
     You are now done.
     <div>
-      <button md-button mdStepperPrevious>Back</button>
+      <button mat-button matStepperPrevious>Back</button>
     </div>
-  </md-step>
-</md-horizontal-stepper>
+  </mat-step>
+</mat-horizontal-stepper>
diff --git a/src/material-examples/table-basic/table-basic-example.html b/src/material-examples/table-basic/table-basic-example.html
index 66dd020c6d55..35669c521e53 100644
--- a/src/material-examples/table-basic/table-basic-example.html
+++ b/src/material-examples/table-basic/table-basic-example.html
@@ -1,34 +1,34 @@
 <div class="example-container mat-elevation-z8">
-  <md-table #table [dataSource]="dataSource">
+  <mat-table #table [dataSource]="dataSource">
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
 
     <!-- Position Column -->
-    <ng-container mdColumnDef="position">
-      <md-header-cell *mdHeaderCellDef> No. </md-header-cell>
-      <md-cell *mdCellDef="let element"> {{element.position}} </md-cell>
+    <ng-container matColumnDef="position">
+      <mat-header-cell *matHeaderCellDef> No. </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.position}} </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container mdColumnDef="name">
-      <md-header-cell *mdHeaderCellDef> Name </md-header-cell>
-      <md-cell *mdCellDef="let element"> {{element.name}} </md-cell>
+    <ng-container matColumnDef="name">
+      <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.name}} </mat-cell>
     </ng-container>
 
     <!-- Weight Column -->
-    <ng-container mdColumnDef="weight">
-      <md-header-cell *mdHeaderCellDef> Weight </md-header-cell>
-      <md-cell *mdCellDef="let element"> {{element.weight}} </md-cell>
+    <ng-container matColumnDef="weight">
+      <mat-header-cell *matHeaderCellDef> Weight </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.weight}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container mdColumnDef="symbol">
-      <md-header-cell *mdHeaderCellDef> Symbol </md-header-cell>
-      <md-cell *mdCellDef="let element"> {{element.symbol}} </md-cell>
+    <ng-container matColumnDef="symbol">
+      <mat-header-cell *matHeaderCellDef> Symbol </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.symbol}} </mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns;"></md-row>
-  </md-table>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+  </mat-table>
 </div>
diff --git a/src/material-examples/table-filtering/table-filtering-example.html b/src/material-examples/table-filtering/table-filtering-example.html
index c3d8ca1d9773..0f1f6189d7c9 100644
--- a/src/material-examples/table-filtering/table-filtering-example.html
+++ b/src/material-examples/table-filtering/table-filtering-example.html
@@ -1,40 +1,40 @@
 <div class="example-container mat-elevation-z8">
   <div class="example-header">
-    <md-form-field floatPlaceholder="never">
-      <input mdInput #filter placeholder="Filter users">
-    </md-form-field>
+    <mat-form-field floatPlaceholder="never">
+      <input matInput #filter placeholder="Filter users">
+    </mat-form-field>
   </div>
 
-  <md-table #table [dataSource]="dataSource">
+  <mat-table #table [dataSource]="dataSource">
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
 
     <!-- ID Column -->
-    <ng-container mdColumnDef="userId">
-      <md-header-cell *mdHeaderCellDef> ID </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.id}} </md-cell>
+    <ng-container matColumnDef="userId">
+      <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
     </ng-container>
 
     <!-- Progress Column -->
-    <ng-container mdColumnDef="progress">
-      <md-header-cell *mdHeaderCellDef> Progress </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.progress}}% </md-cell>
+    <ng-container matColumnDef="progress">
+      <mat-header-cell *matHeaderCellDef> Progress </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container mdColumnDef="userName">
-      <md-header-cell *mdHeaderCellDef> Name </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.name}} </md-cell>
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container mdColumnDef="color">
-      <md-header-cell *mdHeaderCellDef> Color </md-header-cell>
-      <md-cell *mdCellDef="let row" [style.color]="row.color"> {{row.color}} </md-cell>
+    <ng-container matColumnDef="color">
+      <mat-header-cell *matHeaderCellDef> Color </mat-header-cell>
+      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns;"></md-row>
-  </md-table>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+  </mat-table>
 </div>
diff --git a/src/material-examples/table-http/table-http-example.html b/src/material-examples/table-http/table-http-example.html
index b74b898a782c..a176f2f624f3 100644
--- a/src/material-examples/table-http/table-http-example.html
+++ b/src/material-examples/table-http/table-http-example.html
@@ -1,51 +1,51 @@
 <div class="example-container mat-elevation-z8">
   <div class="example-loading-shade"
        *ngIf="dataSource.isLoadingResults || dataSource.isRateLimitReached">
-    <md-spinner *ngIf="dataSource.isLoadingResults"></md-spinner>
+    <mat-spinner *ngIf="dataSource.isLoadingResults"></mat-spinner>
     <div class="example-rate-limit-reached" *ngIf="dataSource.isRateLimitReached">
       GitHub's API rate limit has been reached. It will be reset in one minute.
     </div>
   </div>
 
-  <md-table #table [dataSource]="dataSource" class="example-table"
-            mdSort mdSortActive="created_at" mdSortDisableClear mdSortDirection="asc">
+  <mat-table #table [dataSource]="dataSource" class="example-table"
+            matSort matSortActive="created_at" matSortDisableClear matSortDirection="asc">
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
 
     <!-- Number Column -->
-    <ng-container mdColumnDef="number">
-      <md-header-cell *mdHeaderCellDef>#</md-header-cell>
-      <md-cell *mdCellDef="let row">{{ row.number }}</md-cell>
+    <ng-container matColumnDef="number">
+      <mat-header-cell *matHeaderCellDef>#</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.number }}</mat-cell>
     </ng-container>
 
     <!-- Title Column -->
-    <ng-container mdColumnDef="title">
-      <md-header-cell *mdHeaderCellDef>Title</md-header-cell>
-      <md-cell *mdCellDef="let row">{{ row.title }}</md-cell>
+    <ng-container matColumnDef="title">
+      <mat-header-cell *matHeaderCellDef>Title</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.title }}</mat-cell>
     </ng-container>
 
     <!-- State Column -->
-    <ng-container mdColumnDef="state">
-      <md-header-cell *mdHeaderCellDef>State</md-header-cell>
-      <md-cell *mdCellDef="let row">{{ row.state }}</md-cell>
+    <ng-container matColumnDef="state">
+      <mat-header-cell *matHeaderCellDef>State</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.state }}</mat-cell>
     </ng-container>
 
     <!-- Created Column -->
-    <ng-container mdColumnDef="created_at">
-      <md-header-cell *mdHeaderCellDef
-                      md-sort-header
+    <ng-container matColumnDef="created_at">
+      <mat-header-cell *matHeaderCellDef
+                      mat-sort-header
                       disableClear="true">
         Created
-      </md-header-cell>
-      <md-cell *mdCellDef="let row">{{ row.created_at | date }}</md-cell>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.created_at | date }}</mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns;"></md-row>
-  </md-table>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+  </mat-table>
 
-  <md-paginator [length]="dataSource.resultsLength"
+  <mat-paginator [length]="dataSource.resultsLength"
                 [pageSize]="30">
-  </md-paginator>
+  </mat-paginator>
 </div>
diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index bd3fac7c6bae..1283f2b890a2 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {Http} from '@angular/http';
 import {DataSource} from '@angular/cdk/collections';
-import {MdPaginator, MdSort} from '@angular/material';
+import {MatPaginator, MatSort} from '@angular/material';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/observable/of';
@@ -23,8 +23,8 @@ export class TableHttpExample implements OnInit {
   exampleDatabase: ExampleHttpDao | null;
   dataSource: ExampleDataSource | null;
 
-  @ViewChild(MdPaginator) paginator: MdPaginator;
-  @ViewChild(MdSort) sort: MdSort;
+  @ViewChild(MatPaginator) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
 
   constructor(private http: Http) {}
 
@@ -75,8 +75,8 @@ export class ExampleDataSource extends DataSource<GithubIssue> {
   isRateLimitReached = false;
 
   constructor(private exampleDatabase: ExampleHttpDao,
-              private paginator: MdPaginator,
-              private sort: MdSort) {
+              private paginator: MatPaginator,
+              private sort: MatSort) {
     super();
   }
 
diff --git a/src/material-examples/table-overview/table-overview-example.html b/src/material-examples/table-overview/table-overview-example.html
index 35a12176e456..847ec261256a 100644
--- a/src/material-examples/table-overview/table-overview-example.html
+++ b/src/material-examples/table-overview/table-overview-example.html
@@ -1,7 +1,7 @@
 <div class="example-header" [style.display]="selection.isEmpty() ? '' : 'none'">
-  <md-form-field floatPlaceholder="never">
-    <input mdInput #filter placeholder="Filter users">
-  </md-form-field>
+  <mat-form-field floatPlaceholder="never">
+    <input matInput #filter placeholder="Filter users">
+  </mat-form-field>
 </div>
 <div class="example-header example-selection-header"
      *ngIf="!selection.isEmpty()">
@@ -12,67 +12,67 @@
 
 <div class="example-container mat-elevation-z8">
 
-  <md-table #table [dataSource]="dataSource" mdSort>
+  <mat-table #table [dataSource]="dataSource" matSort>
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
 
     <!-- Checkbox Column -->
-    <ng-container mdColumnDef="select">
-      <md-header-cell *mdHeaderCellDef>
-        <md-checkbox (change)="$event ? masterToggle() : null"
+    <ng-container matColumnDef="select">
+      <mat-header-cell *matHeaderCellDef>
+        <mat-checkbox (change)="$event ? masterToggle() : null"
                      [checked]="isAllSelected()"
                      [indeterminate]="selection.hasValue() && !isAllSelected()">
-        </md-checkbox>
-      </md-header-cell>
-      <md-cell *mdCellDef="let row">
-        <md-checkbox (click)="$event.stopPropagation()"
+        </mat-checkbox>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let row">
+        <mat-checkbox (click)="$event.stopPropagation()"
                      (change)="$event ? selection.toggle(row.id) : null"
                      [checked]="selection.isSelected(row.id)">
-        </md-checkbox>
-      </md-cell>
+        </mat-checkbox>
+      </mat-cell>
     </ng-container>
 
     <!-- ID Column -->
-    <ng-container mdColumnDef="userId">
-      <md-header-cell *mdHeaderCellDef md-sort-header> ID </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.id}} </md-cell>
+    <ng-container matColumnDef="userId">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
     </ng-container>
 
     <!-- Progress Column -->
-    <ng-container mdColumnDef="progress">
-      <md-header-cell *mdHeaderCellDef md-sort-header> Progress </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.progress}}% </md-cell>
+    <ng-container matColumnDef="progress">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Progress </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container mdColumnDef="userName">
-      <md-header-cell *mdHeaderCellDef md-sort-header> Name </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.name}} </md-cell>
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container mdColumnDef="color">
-      <md-header-cell *mdHeaderCellDef md-sort-header> Color </md-header-cell>
-      <md-cell *mdCellDef="let row" [style.color]="row.color"> {{row.color}} </md-cell>
+    <ng-container matColumnDef="color">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Color </mat-header-cell>
+      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns;"
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"
             [class.example-selected-row]="selection.isSelected(row.id)"
             (click)="selection.toggle(row.id)">
-    </md-row>
-  </md-table>
+    </mat-row>
+  </mat-table>
 
   <div class="example-no-results"
        [style.display]="dataSource.renderedData.length == 0 ? '' : 'none'">
     No users found matching filter.
   </div>
 
-  <md-paginator #paginator
+  <mat-paginator #paginator
                 [length]="dataSource.filteredData.length"
                 [pageIndex]="0"
                 [pageSize]="25"
                 [pageSizeOptions]="[5, 10, 25, 100]">
-  </md-paginator>
+  </mat-paginator>
 </div>
diff --git a/src/material-examples/table-overview/table-overview-example.ts b/src/material-examples/table-overview/table-overview-example.ts
index 2fd7d0883e47..b9a3e0f30400 100644
--- a/src/material-examples/table-overview/table-overview-example.ts
+++ b/src/material-examples/table-overview/table-overview-example.ts
@@ -1,6 +1,6 @@
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
-import {MdPaginator, MdSort} from '@angular/material';
+import {MatPaginator, MatSort} from '@angular/material';
 import {SelectionModel} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
@@ -25,8 +25,8 @@ export class TableOverviewExample {
   selection = new SelectionModel<string>(true, []);
   dataSource: ExampleDataSource | null;
 
-  @ViewChild(MdPaginator) paginator: MdPaginator;
-  @ViewChild(MdSort) sort: MdSort;
+  @ViewChild(MatPaginator) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
   @ViewChild('filter') filter: ElementRef;
 
   ngOnInit() {
@@ -127,8 +127,8 @@ export class ExampleDataSource extends DataSource<any> {
   renderedData: UserData[] = [];
 
   constructor(private _exampleDatabase: ExampleDatabase,
-              private _paginator: MdPaginator,
-              private _sort: MdSort) {
+              private _paginator: MatPaginator,
+              private _sort: MatSort) {
     super();
 
     // Reset to the first page when the user changes the filter.
diff --git a/src/material-examples/table-pagination/table-pagination-example.html b/src/material-examples/table-pagination/table-pagination-example.html
index 6fa6eaad76b0..97f7d4ac8c17 100644
--- a/src/material-examples/table-pagination/table-pagination-example.html
+++ b/src/material-examples/table-pagination/table-pagination-example.html
@@ -1,42 +1,42 @@
 <div class="example-container mat-elevation-z8">
 
-  <md-table #table [dataSource]="dataSource">
+  <mat-table #table [dataSource]="dataSource">
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
 
     <!-- ID Column -->
-    <ng-container mdColumnDef="userId">
-      <md-header-cell *mdHeaderCellDef> ID </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.id}} </md-cell>
+    <ng-container matColumnDef="userId">
+      <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
     </ng-container>
 
     <!-- Progress Column -->
-    <ng-container mdColumnDef="progress">
-      <md-header-cell *mdHeaderCellDef> Progress </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.progress}}% </md-cell>
+    <ng-container matColumnDef="progress">
+      <mat-header-cell *matHeaderCellDef> Progress </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container mdColumnDef="userName">
-      <md-header-cell *mdHeaderCellDef> Name </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.name}} </md-cell>
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container mdColumnDef="color">
-      <md-header-cell *mdHeaderCellDef> Color </md-header-cell>
-      <md-cell *mdCellDef="let row" [style.color]="row.color"> {{row.color}} </md-cell>
+    <ng-container matColumnDef="color">
+      <mat-header-cell *matHeaderCellDef> Color </mat-header-cell>
+      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns;"></md-row>
-  </md-table>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+  </mat-table>
 
-  <md-paginator #paginator
+  <mat-paginator #paginator
                 [length]="exampleDatabase.data.length"
                 [pageIndex]="0"
                 [pageSize]="25"
                 [pageSizeOptions]="[5, 10, 25, 100]">
-  </md-paginator>
+  </mat-paginator>
 </div>
diff --git a/src/material-examples/table-pagination/table-pagination-example.ts b/src/material-examples/table-pagination/table-pagination-example.ts
index 1434c8f6acd9..3040bfec59d8 100644
--- a/src/material-examples/table-pagination/table-pagination-example.ts
+++ b/src/material-examples/table-pagination/table-pagination-example.ts
@@ -1,6 +1,6 @@
 import {Component, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
-import {MdPaginator} from '@angular/material';
+import {MatPaginator} from '@angular/material';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/operator/startWith';
@@ -20,7 +20,7 @@ export class TablePaginationExample {
   exampleDatabase = new ExampleDatabase();
   dataSource: ExampleDataSource | null;
 
-  @ViewChild(MdPaginator) paginator: MdPaginator;
+  @ViewChild(MatPaginator) paginator: MatPaginator;
 
   ngOnInit() {
     this.dataSource = new ExampleDataSource(this.exampleDatabase, this.paginator);
@@ -82,7 +82,7 @@ export class ExampleDatabase {
  * should be rendered.
  */
 export class ExampleDataSource extends DataSource<any> {
-  constructor(private _exampleDatabase: ExampleDatabase, private _paginator: MdPaginator) {
+  constructor(private _exampleDatabase: ExampleDatabase, private _paginator: MatPaginator) {
     super();
   }
 
diff --git a/src/material-examples/table-sorting/table-sorting-example.html b/src/material-examples/table-sorting/table-sorting-example.html
index cde414b641d7..ec3ed853501a 100644
--- a/src/material-examples/table-sorting/table-sorting-example.html
+++ b/src/material-examples/table-sorting/table-sorting-example.html
@@ -1,34 +1,34 @@
 <div class="example-container mat-elevation-z8">
-  <md-table #table [dataSource]="dataSource" mdSort>
+  <mat-table #table [dataSource]="dataSource" matSort>
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
 
     <!-- ID Column -->
-    <ng-container mdColumnDef="userId">
-      <md-header-cell *mdHeaderCellDef md-sort-header> ID </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.id}} </md-cell>
+    <ng-container matColumnDef="userId">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
     </ng-container>
 
     <!-- Progress Column -->
-    <ng-container mdColumnDef="progress">
-      <md-header-cell *mdHeaderCellDef md-sort-header> Progress </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.progress}}% </md-cell>
+    <ng-container matColumnDef="progress">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Progress </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container mdColumnDef="userName">
-      <md-header-cell *mdHeaderCellDef md-sort-header> Name </md-header-cell>
-      <md-cell *mdCellDef="let row"> {{row.name}} </md-cell>
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container mdColumnDef="color">
-      <md-header-cell *mdHeaderCellDef md-sort-header> Color </md-header-cell>
-      <md-cell *mdCellDef="let row" [style.color]="row.color"> {{row.color}} </md-cell>
+    <ng-container matColumnDef="color">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Color </mat-header-cell>
+      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
     </ng-container>
 
-    <md-header-row *mdHeaderRowDef="displayedColumns"></md-header-row>
-    <md-row *mdRowDef="let row; columns: displayedColumns;"></md-row>
-  </md-table>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+  </mat-table>
 </div>
diff --git a/src/material-examples/table-sorting/table-sorting-example.ts b/src/material-examples/table-sorting/table-sorting-example.ts
index 36df176410c0..36c6eea972a6 100644
--- a/src/material-examples/table-sorting/table-sorting-example.ts
+++ b/src/material-examples/table-sorting/table-sorting-example.ts
@@ -1,6 +1,6 @@
 import {Component, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
-import {MdSort} from '@angular/material';
+import {MatSort} from '@angular/material';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/operator/startWith';
@@ -20,7 +20,7 @@ export class TableSortingExample {
   exampleDatabase = new ExampleDatabase();
   dataSource: ExampleDataSource | null;
 
-  @ViewChild(MdSort) sort: MdSort;
+  @ViewChild(MatSort) sort: MatSort;
 
   ngOnInit() {
     this.dataSource = new ExampleDataSource(this.exampleDatabase, this.sort);
@@ -82,7 +82,7 @@ export class ExampleDatabase {
  * should be rendered.
  */
 export class ExampleDataSource extends DataSource<any> {
-  constructor(private _exampleDatabase: ExampleDatabase, private _sort: MdSort) {
+  constructor(private _exampleDatabase: ExampleDatabase, private _sort: MatSort) {
     super();
   }
 
diff --git a/src/material-examples/tabs-overview/tabs-overview-example.html b/src/material-examples/tabs-overview/tabs-overview-example.html
index 173ece5dc477..2883cea104dd 100644
--- a/src/material-examples/tabs-overview/tabs-overview-example.html
+++ b/src/material-examples/tabs-overview/tabs-overview-example.html
@@ -1,4 +1,4 @@
-<md-tab-group>
-  <md-tab label="Tab 1">Content 1</md-tab>
-  <md-tab label="Tab 2">Content 2</md-tab>
-</md-tab-group>
+<mat-tab-group>
+  <mat-tab label="Tab 1">Content 1</mat-tab>
+  <mat-tab label="Tab 2">Content 2</mat-tab>
+</mat-tab-group>
diff --git a/src/material-examples/tabs-template-label/tabs-template-label-example.html b/src/material-examples/tabs-template-label/tabs-template-label-example.html
index 75b5b19dafa0..d35bdb5ae63c 100644
--- a/src/material-examples/tabs-template-label/tabs-template-label-example.html
+++ b/src/material-examples/tabs-template-label/tabs-template-label-example.html
@@ -1,5 +1,5 @@
-<md-tab-group class="demo-tab-group">
-  <md-tab label="Tab 1">
+<mat-tab-group class="demo-tab-group">
+  <mat-tab label="Tab 1">
     <div class="demo-tab-content">
       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
       Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
@@ -7,9 +7,9 @@
       feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
       orci enim rutrum enim, vel tempor sapien arcu a tellus.
     </div>
-  </md-tab>
-  <md-tab label="Tab 2">
-    <ng-template md-tab-label>
+  </mat-tab>
+  <mat-tab label="Tab 2">
+    <ng-template mat-tab-label>
       ⭐
     </ng-template>
     <div class="demo-tab-content">
@@ -19,11 +19,11 @@
       feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
       orci enim rutrum enim, vel tempor sapien arcu a tellus.
     </div>  
-  </md-tab>
-  <md-tab label="Tab 3" disabled>
+  </mat-tab>
+  <mat-tab label="Tab 3" disabled>
     No content  
-  </md-tab>
-  <md-tab label="Tab 4">
+  </mat-tab>
+  <mat-tab label="Tab 4">
    <div class="demo-tab-content">
       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla venenatis ante augue.
       Phasellus volutpat neque ac dui mattis vulputate. Etiam consequat aliquam cursus.
@@ -38,11 +38,11 @@
       feugiat ultricies mi. Aliquam erat volutpat. Nam placerat, tortor in ultrices porttitor,
       orci enim rutrum enim, vel tempor sapien arcu a tellus.
     </div>  
-  </md-tab>
-  <md-tab label="Tab 5">
+  </mat-tab>
+  <mat-tab label="Tab 5">
     No content  
-  </md-tab>
-  <md-tab label="Tab 6">
+  </mat-tab>
+  <mat-tab label="Tab 6">
     No content  
-  </md-tab>
-</md-tab-group>
\ No newline at end of file
+  </mat-tab>
+</mat-tab-group>
\ No newline at end of file
diff --git a/src/material-examples/toolbar-multirow/toolbar-multirow-example.html b/src/material-examples/toolbar-multirow/toolbar-multirow-example.html
index 9b178a21249f..a0c0e9cfde84 100644
--- a/src/material-examples/toolbar-multirow/toolbar-multirow-example.html
+++ b/src/material-examples/toolbar-multirow/toolbar-multirow-example.html
@@ -1,16 +1,16 @@
-<md-toolbar color="primary">
+<mat-toolbar color="primary">
   <span>Custom Toolbar</span>
 
-  <md-toolbar-row>
+  <mat-toolbar-row>
     <span>Second Line</span>
     <span class="example-spacer"></span>
-    <md-icon class="example-icon">verified_user</md-icon>
-  </md-toolbar-row>
+    <mat-icon class="example-icon">verified_user</mat-icon>
+  </mat-toolbar-row>
 
-  <md-toolbar-row>
+  <mat-toolbar-row>
     <span>Third Line</span>
     <span class="example-spacer"></span>
-    <md-icon class="example-icon">favorite</md-icon>
-    <md-icon class="example-icon">delete</md-icon>
-  </md-toolbar-row>
-</md-toolbar>
+    <mat-icon class="example-icon">favorite</mat-icon>
+    <mat-icon class="example-icon">delete</mat-icon>
+  </mat-toolbar-row>
+</mat-toolbar>
diff --git a/src/material-examples/toolbar-overview/toolbar-overview-example.html b/src/material-examples/toolbar-overview/toolbar-overview-example.html
index bf8cc3998630..05520fda8642 100644
--- a/src/material-examples/toolbar-overview/toolbar-overview-example.html
+++ b/src/material-examples/toolbar-overview/toolbar-overview-example.html
@@ -1 +1 @@
-<md-toolbar>My App</md-toolbar>
+<mat-toolbar>My App</mat-toolbar>
diff --git a/src/material-examples/tooltip-overview/tooltip-overview-example.html b/src/material-examples/tooltip-overview/tooltip-overview-example.html
index 8319a8545846..3a2a27493673 100644
--- a/src/material-examples/tooltip-overview/tooltip-overview-example.html
+++ b/src/material-examples/tooltip-overview/tooltip-overview-example.html
@@ -1 +1 @@
-<span mdTooltip="Tooltip!">I have a tooltip</span>
+<span matTooltip="Tooltip!">I have a tooltip</span>
diff --git a/src/material-examples/tooltip-position/tooltip-position-example.html b/src/material-examples/tooltip-position/tooltip-position-example.html
index 2187a60c71f4..a0fa7759ce21 100644
--- a/src/material-examples/tooltip-position/tooltip-position-example.html
+++ b/src/material-examples/tooltip-position/tooltip-position-example.html
@@ -1,13 +1,13 @@
-<div class="example-tooltip-host" mdTooltip="Tooltip!" [mdTooltipPosition]="position">
+<div class="example-tooltip-host" matTooltip="Tooltip!" [matTooltipPosition]="position">
   <span>Show tooltip</span>
-  <md-form-field>
-    <md-select class="example-select" [(ngModel)]="position">
-      <md-option value="before">Before</md-option>
-      <md-option value="after">After</md-option>
-      <md-option value="above">Above</md-option>
-      <md-option value="below">Below</md-option>
-      <md-option value="left">Left</md-option>
-      <md-option value="right">Right</md-option>
-    </md-select>
-  </md-form-field>
+  <mat-form-field>
+    <mat-select class="example-select" [(ngModel)]="position">
+      <mat-option value="before">Before</mat-option>
+      <mat-option value="after">After</mat-option>
+      <mat-option value="above">Above</mat-option>
+      <mat-option value="below">Below</mat-option>
+      <mat-option value="left">Left</mat-option>
+      <mat-option value="right">Right</mat-option>
+    </mat-select>
+  </mat-form-field>
 </div>
diff --git a/src/material-moment-adapter/adapter/index.ts b/src/material-moment-adapter/adapter/index.ts
index df84c7dabace..300f6e4e323f 100644
--- a/src/material-moment-adapter/adapter/index.ts
+++ b/src/material-moment-adapter/adapter/index.ts
@@ -11,10 +11,10 @@ import {
   DateAdapter,
   MAT_DATE_LOCALE,
   MAT_DATE_LOCALE_PROVIDER,
-  MD_DATE_FORMATS
+  MAT_DATE_FORMATS
 } from '@angular/material';
 import {MomentDateAdapter} from './moment-date-adapter';
-import {MD_MOMENT_DATE_FORMATS} from './moment-date-formats';
+import {MAT_MOMENT_DATE_FORMATS} from './moment-date-formats';
 
 export * from './moment-date-adapter';
 export * from './moment-date-formats';
@@ -31,6 +31,6 @@ export class MomentDateModule {}
 
 @NgModule({
   imports: [MomentDateModule],
-  providers: [{provide: MD_DATE_FORMATS, useValue: MD_MOMENT_DATE_FORMATS}],
+  providers: [{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}],
 })
-export class MdMomentDateModule {}
+export class MatMomentDateModule {}
diff --git a/src/material-moment-adapter/adapter/moment-date-formats.ts b/src/material-moment-adapter/adapter/moment-date-formats.ts
index 6f4747f0493c..caec58f8a603 100644
--- a/src/material-moment-adapter/adapter/moment-date-formats.ts
+++ b/src/material-moment-adapter/adapter/moment-date-formats.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MdDateFormats} from '@angular/material';
+import {MatDateFormats} from '@angular/material';
 
 
-export const MD_MOMENT_DATE_FORMATS: MdDateFormats = {
+export const MAT_MOMENT_DATE_FORMATS: MatDateFormats = {
   parse: {
     dateInput: 'l',
   },
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 988a6d2cb34d..6d0d3a6b77f0 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -1,227 +1,227 @@
 <h1>Kitchen sink app</h1>
 
 <h2>Autocomplete</h2>
-<md-autocomplete>
-  <md-option>Grace Hopper</md-option>
-  <md-option>Anita Borg</md-option>
-  <md-option>Ada Lovelace</md-option>
-</md-autocomplete>
+<mat-autocomplete>
+  <mat-option>Grace Hopper</mat-option>
+  <mat-option>Anita Borg</mat-option>
+  <mat-option>Ada Lovelace</mat-option>
+</mat-autocomplete>
 
 <h2>Button</h2>
 
-<button md-button>go</button>
-<button md-icon-button>go</button>
-<button md-raised-button>go</button>
-<button md-fab>go</button>
-<button md-mini-fab>go</button>
+<button mat-button>go</button>
+<button mat-icon-button>go</button>
+<button mat-raised-button>go</button>
+<button mat-fab>go</button>
+<button mat-mini-fab>go</button>
 
-<a md-button href="https://google.com">Google</a>
-<a md-icon-button href="https://google.com">Google</a>
-<a md-raised-button href="https://google.com">Google</a>
-<a md-fab href="https://google.com">Google</a>
-<a md-mini-fab href="https://google.com">Google</a>
+<a mat-button href="https://google.com">Google</a>
+<a mat-icon-button href="https://google.com">Google</a>
+<a mat-raised-button href="https://google.com">Google</a>
+<a mat-fab href="https://google.com">Google</a>
+<a mat-mini-fab href="https://google.com">Google</a>
 
 <h2>Button toggle</h2>
 
 <h3>Single selection</h3>
-<md-button-toggle-group>
-  <md-button-toggle>Ketchup</md-button-toggle>
-  <md-button-toggle>Mustard</md-button-toggle>
-  <md-button-toggle>Mayo</md-button-toggle>
-</md-button-toggle-group>
+<mat-button-toggle-group>
+  <mat-button-toggle>Ketchup</mat-button-toggle>
+  <mat-button-toggle>Mustard</mat-button-toggle>
+  <mat-button-toggle>Mayo</mat-button-toggle>
+</mat-button-toggle-group>
 
 <h3>Multi selection</h3>
-<md-button-toggle-group multiple>
-  <md-button-toggle>Ketchup</md-button-toggle>
-  <md-button-toggle>Mustard</md-button-toggle>
-  <md-button-toggle>Mayo</md-button-toggle>
-</md-button-toggle-group>
+<mat-button-toggle-group multiple>
+  <mat-button-toggle>Ketchup</mat-button-toggle>
+  <mat-button-toggle>Mustard</mat-button-toggle>
+  <mat-button-toggle>Mayo</mat-button-toggle>
+</mat-button-toggle-group>
 
 <h3>Standalone</h3>
-<md-button-toggle>Hyperspinner enabled</md-button-toggle>
+<mat-button-toggle>Hyperspinner enabled</mat-button-toggle>
 
 <h3>Card</h3>
 
-<md-card>
+<mat-card>
   Simple card
-</md-card>
+</mat-card>
 
-<md-card>
-  <md-card-title>Complicated card</md-card-title>
-  <md-card-subtitle>Subtitle</md-card-subtitle>
-  <md-card-content>
+<mat-card>
+  <mat-card-title>Complicated card</mat-card-title>
+  <mat-card-subtitle>Subtitle</mat-card-subtitle>
+  <mat-card-content>
     <p>This is some stuff</p>
     <p>And more stuff</p>
-  </md-card-content>
-  <md-card-actions>
-    <button md-button>LIKE</button>
-    <button md-button>SHARE</button>
-  </md-card-actions>
-  <md-card-footer>
+  </mat-card-content>
+  <mat-card-actions>
+    <button mat-button>LIKE</button>
+    <button mat-button>SHARE</button>
+  </mat-card-actions>
+  <mat-card-footer>
     Hurray
-  </md-card-footer>
-</md-card>
+  </mat-card-footer>
+</mat-card>
 
 <h2>Checkbox</h2>
 
-<md-checkbox>With a label</md-checkbox>
-<md-checkbox></md-checkbox>Without a label
+<mat-checkbox>With a label</mat-checkbox>
+<mat-checkbox></mat-checkbox>Without a label
 
 <h2>Chips</h2>
 
-<md-chip-list>
-  <md-chip>Barbeque Cheddar</md-chip>
-  <md-chip>Sea Salt and Vinegar</md-chip>
-  <md-chip>Manta Ray</md-chip>
-</md-chip-list>
+<mat-chip-list>
+  <mat-chip>Barbeque Cheddar</mat-chip>
+  <mat-chip>Sea Salt and Vinegar</mat-chip>
+  <mat-chip>Manta Ray</mat-chip>
+</mat-chip-list>
 
-<md-chip-list>
-  <md-basic-chip>Tomato</md-basic-chip>
-  <md-basic-chip>Scallion</md-basic-chip>
-  <md-basic-chip>Cilantro</md-basic-chip>
-</md-chip-list>
+<mat-chip-list>
+  <mat-basic-chip>Tomato</mat-basic-chip>
+  <mat-basic-chip>Scallion</mat-basic-chip>
+  <mat-basic-chip>Cilantro</mat-basic-chip>
+</mat-chip-list>
 
 <h2>Datepicker</h2>
 
-<md-form-field>
-  <input type="text" mdInput [mdDatepicker]="birthday" placeholder="Birthday">
-  <md-datepicker-toggle mdSuffix [for]="birthday"></md-datepicker-toggle>
-  <md-datepicker #birthday></md-datepicker>
-</md-form-field>
+<mat-form-field>
+  <input type="text" matInput [matDatepicker]="birthday" placeholder="Birthday">
+  <mat-datepicker-toggle matSuffix [for]="birthday"></mat-datepicker-toggle>
+  <mat-datepicker #birthday></mat-datepicker>
+</mat-form-field>
 
 <h2>Grid list</h2>
 
-<md-grid-list cols="4">
-  <md-grid-tile>Fry</md-grid-tile>
-  <md-grid-tile>Leela</md-grid-tile>
-  <md-grid-tile>Amy</md-grid-tile>
-  <md-grid-tile>Bender</md-grid-tile>
-</md-grid-list>
+<mat-grid-list cols="4">
+  <mat-grid-tile>Fry</mat-grid-tile>
+  <mat-grid-tile>Leela</mat-grid-tile>
+  <mat-grid-tile>Amy</mat-grid-tile>
+  <mat-grid-tile>Bender</mat-grid-tile>
+</mat-grid-list>
 
 <h2>Icon</h2>
-<md-icon>ligature</md-icon>
+<mat-icon>ligature</mat-icon>
 
 <h2>Input</h2>
 
-<md-form-field>
-  <input type="number" mdInput placeholder="amount">
-  <span mdPrefix>$&nbsp;</span>
-  <span mdSuffix>.00</span>
-  <md-hint>Dolla dolla bills</md-hint>
-  <md-error>Recession</md-error>
-</md-form-field>
+<mat-form-field>
+  <input type="number" matInput placeholder="amount">
+  <span matPrefix>$&nbsp;</span>
+  <span matSuffix>.00</span>
+  <mat-hint>Dolla dolla bills</mat-hint>
+  <mat-error>Recession</mat-error>
+</mat-form-field>
 
 <h2>List</h2>
 
-<md-list>
-  <md-list-item>Robot</md-list-item>
-  <md-list-item>Android</md-list-item>
-  <md-list-item>Cyborg</md-list-item>
-</md-list>
+<mat-list>
+  <mat-list-item>Robot</mat-list-item>
+  <mat-list-item>Android</mat-list-item>
+  <mat-list-item>Cyborg</mat-list-item>
+</mat-list>
 
-<md-nav-list>
-  <a md-list-item href="https://google.com">Search</a>
-  <a md-list-item href="https://google.com">Find</a>
-  <a md-list-item href="https://google.com">Seek</a>
-</md-nav-list>
+<mat-nav-list>
+  <a mat-list-item href="https://google.com">Search</a>
+  <a mat-list-item href="https://google.com">Find</a>
+  <a mat-list-item href="https://google.com">Seek</a>
+</mat-nav-list>
 
 
 <h2>Menu</h2>
 
-<button md-button [mdMenuTriggerFor]="menu">Open</button>
-<md-menu #menu="mdMenu">
-  <button md-menu-item>Mercy</button>
-  <button md-menu-item>Lucio</button>
-  <button md-menu-item disabled>Sombra</button>
-</md-menu>
+<button mat-button [matMenuTriggerFor]="menu">Open</button>
+<mat-menu #menu="matMenu">
+  <button mat-menu-item>Mercy</button>
+  <button mat-menu-item>Lucio</button>
+  <button mat-menu-item disabled>Sombra</button>
+</mat-menu>
 
 <h2>Progress bar</h2>
 
-<md-progress-bar value="25"></md-progress-bar>
-<md-progress-bar mode="buffer" value="25" bufferValue="60"></md-progress-bar>
-<md-progress-bar mode="indeterminate"></md-progress-bar>
-<md-progress-bar mode="query"></md-progress-bar>
+<mat-progress-bar value="25"></mat-progress-bar>
+<mat-progress-bar mode="buffer" value="25" bufferValue="60"></mat-progress-bar>
+<mat-progress-bar mode="indeterminate"></mat-progress-bar>
+<mat-progress-bar mode="query"></mat-progress-bar>
 
 
 <h2>Radio buttons</h2>
 
 <h3>Radio group</h3>
-<md-radio-group>
-  <md-radio-button>Charmander</md-radio-button>
-  <md-radio-button>Squirtle</md-radio-button>
-  <md-radio-button>Bulbasaur</md-radio-button>
-</md-radio-group>
+<mat-radio-group>
+  <mat-radio-button>Charmander</mat-radio-button>
+  <mat-radio-button>Squirtle</mat-radio-button>
+  <mat-radio-button>Bulbasaur</mat-radio-button>
+</mat-radio-group>
 
 <h3>Standalone radios</h3>
-<md-radio-button name="onions">White</md-radio-button>
-<md-radio-button name="onions">Yellow</md-radio-button>
-<md-radio-button name="onions">Green</md-radio-button>
-<md-radio-button name="onions" disabled>Red</md-radio-button>
+<mat-radio-button name="onions">White</mat-radio-button>
+<mat-radio-button name="onions">Yellow</mat-radio-button>
+<mat-radio-button name="onions">Green</mat-radio-button>
+<mat-radio-button name="onions" disabled>Red</mat-radio-button>
 
 <h2>Select</h2>
-<md-form-field>
-  <md-select value="ceramic">
-    <md-option value="glass">Glass</md-option>
-    <md-option value="ceramic">Ceramic</md-option>
-    <md-option value="steel">Steel</md-option>
-  </md-select>
-</md-form-field>
+<mat-form-field>
+  <mat-select value="ceramic">
+    <mat-option value="glass">Glass</mat-option>
+    <mat-option value="ceramic">Ceramic</mat-option>
+    <mat-option value="steel">Steel</mat-option>
+  </mat-select>
+</mat-form-field>
 
 <h2>Sidenav</h2>
-<md-sidenav-container>
-  <md-sidenav>On the side</md-sidenav>
+<mat-sidenav-container>
+  <mat-sidenav>On the side</mat-sidenav>
   Main content
-</md-sidenav-container>
+</mat-sidenav-container>
 
 <h2>Slide-toggle</h2>
-<md-slide-toggle>With a label</md-slide-toggle>
-<md-slide-toggle></md-slide-toggle>Without a label
+<mat-slide-toggle>With a label</mat-slide-toggle>
+<mat-slide-toggle></mat-slide-toggle>Without a label
 
 <h2>Slider</h2>
-<md-slider></md-slider>
-<md-slider value="50"></md-slider>
-<md-slider tickInterval="1" min="1" max="10" value="5" thumbLabel></md-slider>
+<mat-slider></mat-slider>
+<mat-slider value="50"></mat-slider>
+<mat-slider tickInterval="1" min="1" max="10" value="5" thumbLabel></mat-slider>
 
 <h2>Tabs</h2>
-<md-tab-group>
-  <md-tab label="Overview">
+<mat-tab-group>
+  <mat-tab label="Overview">
     The overview
-  </md-tab>
-  <md-tab>
-    <ng-template md-tab-label>
+  </mat-tab>
+  <mat-tab>
+    <ng-template mat-tab-label>
       API docs
     </ng-template>
     The API docs
-  </md-tab>
-</md-tab-group>
+  </mat-tab>
+</mat-tab-group>
 
-<nav md-tab-nav-bar>
- <a md-tab-link href="https://google.com">Google</a>
- <a md-tab-link href="https://google.com" active>Also Google</a>
+<nav mat-tab-nav-bar>
+ <a mat-tab-link href="https://google.com">Google</a>
+ <a mat-tab-link href="https://google.com" active>Also Google</a>
 </nav>
 
 <h2>Paginator</h2>
 
-<md-paginator [length]="100"
+<mat-paginator [length]="100"
               [pageSizeOptions]="[5, 10, 25, 100]">
-</md-paginator>
+</mat-paginator>
 
 <h2>Toolbar</h2>
-<md-toolbar>Basic toolbar</md-toolbar>
-<md-toolbar>
-  <md-toolbar-row>Multi row</md-toolbar-row>
-  <md-toolbar-row>Toolbar</md-toolbar-row>
-</md-toolbar>
+<mat-toolbar>Basic toolbar</mat-toolbar>
+<mat-toolbar>
+  <mat-toolbar-row>Multi row</mat-toolbar-row>
+  <mat-toolbar-row>Toolbar</mat-toolbar-row>
+</mat-toolbar>
 
 <h2>Sort</h2>
 
-<table mdSort>
+<table matSort>
   <tr>
-    <th md-sort-header="name">Name</th>
-    <th md-sort-header="calories">Calories</th>
-    <th md-sort-header="fat">Fat</th>
-    <th md-sort-header="carbs">Carbs</th>
-    <th md-sort-header="protein">Protein</th>
+    <th mat-sort-header="name">Name</th>
+    <th mat-sort-header="calories">Calories</th>
+    <th mat-sort-header="fat">Fat</th>
+    <th mat-sort-header="carbs">Carbs</th>
+    <th mat-sort-header="protein">Protein</th>
   </tr>
 
   <tr>
@@ -235,20 +235,20 @@ <h2>Sort</h2>
 
 <h2>Tooltip</h2>
 
-<button mdTooltip="Action!">Go</button>
+<button matTooltip="Action!">Go</button>
 
 <h2>Autosize textarea</h2>
-<textarea mdTextareaAutosize mdAutosizeMaxRows="10"></textarea>
+<textarea matTextareaAutosize matAutosizeMaxRows="10"></textarea>
 
 <h2>Expansion Panel</h2>
-<md-expansion-panel>
-  <md-expansion-panel-header>
+<mat-expansion-panel>
+  <mat-expansion-panel-header>
     <mat-panel-description>This is a panel description.</mat-panel-description>
     <mat-panel-title>Panel Title</mat-panel-title>
-  </md-expansion-panel-header>
+  </mat-expansion-panel-header>
   This is the content text that makes sense here.
-  <md-action-row>Action</md-action-row>
-</md-expansion-panel>
+  <mat-action-row>Action</mat-action-row>
+</mat-expansion-panel>
 
 <h2>CDK Table</h2>
 
@@ -264,12 +264,12 @@ <h2>CDK Table</h2>
 
 <h2>Material Table</h2>
 
-<md-table [dataSource]="tableDataSource">
+<mat-table [dataSource]="tableDataSource">
   <ng-container cdkColumnDef="userId">
-    <md-header-cell *cdkHeaderCellDef>ID</md-header-cell>
-    <md-cell *cdkCellDef="let row"> {{row.userId}} </md-cell>
+    <mat-header-cell *cdkHeaderCellDef>ID</mat-header-cell>
+    <mat-cell *cdkCellDef="let row"> {{row.userId}} </mat-cell>
   </ng-container>
 
-  <md-header-row *cdkHeaderRowDef="tableColumns"></md-header-row>
-  <md-row *cdkRowDef="let row; columns: tableColumns;"></md-row>
-</md-table>
+  <mat-header-row *cdkHeaderRowDef="tableColumns"></mat-header-row>
+  <mat-row *cdkRowDef="let row; columns: tableColumns;"></mat-row>
+</mat-table>
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index a2ae0f71140c..5fdda06149bb 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -3,35 +3,35 @@ import {ServerModule} from '@angular/platform-server';
 import {BrowserModule} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
 import {
-  MdAutocompleteModule,
-  MdButtonModule,
-  MdCardModule,
-  MdChipsModule,
-  MdDatepickerModule,
-  MdDialogModule,
-  MdExpansionModule,
-  MdFormFieldModule,
-  MdGridListModule,
-  MdIconModule,
-  MdInputModule,
-  MdListModule,
-  MdMenuModule,
-  MdNativeDateModule,
-  MdPaginatorModule,
-  MdProgressBarModule,
-  MdProgressSpinnerModule,
-  MdRadioModule,
-  MdRippleModule,
-  MdSelectModule,
-  MdSidenavModule,
-  MdSliderModule,
-  MdSlideToggleModule,
-  MdSnackBarModule,
-  MdSortModule,
-  MdTableModule,
-  MdTabsModule,
-  MdToolbarModule,
-  MdTooltipModule,
+  MatAutocompleteModule,
+  MatButtonModule,
+  MatCardModule,
+  MatChipsModule,
+  MatDatepickerModule,
+  MatDialogModule,
+  MatExpansionModule,
+  MatFormFieldModule,
+  MatGridListModule,
+  MatIconModule,
+  MatInputModule,
+  MatListModule,
+  MatMenuModule,
+  MatNativeDateModule,
+  MatPaginatorModule,
+  MatProgressBarModule,
+  MatProgressSpinnerModule,
+  MatRadioModule,
+  MatRippleModule,
+  MatSelectModule,
+  MatSidenavModule,
+  MatSliderModule,
+  MatSlideToggleModule,
+  MatSnackBarModule,
+  MatSortModule,
+  MatTableModule,
+  MatTabsModule,
+  MatToolbarModule,
+  MatTooltipModule,
 } from '@angular/material';
 import {
   CdkTableModule,
@@ -65,38 +65,38 @@ export class KitchenSink {
 @NgModule({
   imports: [
     BrowserModule.withServerTransition({appId: 'kitchen-sink'}),
-    MdAutocompleteModule,
-    MdButtonModule,
+    MatAutocompleteModule,
+    MatButtonModule,
     // Button toggle and checkbox can't work due to https://github.com/angular/angular/issues/17050
-    // MdButtonToggleModule,
-    MdCardModule,
-    // MdCheckboxModule,
-    MdChipsModule,
-    MdDatepickerModule,
-    MdDialogModule,
-    MdFormFieldModule,
-    MdGridListModule,
-    MdIconModule,
-    MdInputModule,
-    MdListModule,
-    MdMenuModule,
-    MdNativeDateModule,
-    MdPaginatorModule,
-    MdProgressBarModule,
-    MdProgressSpinnerModule,
-    MdRadioModule,
-    MdRippleModule,
-    MdSelectModule,
-    MdSidenavModule,
-    MdSliderModule,
-    MdSlideToggleModule,
-    MdSnackBarModule,
-    MdTabsModule,
-    MdToolbarModule,
-    MdTooltipModule,
-    MdExpansionModule,
-    MdSortModule,
-    MdTableModule,
+    // MatButtonToggleModule,
+    MatCardModule,
+    // MatCheckboxModule,
+    MatChipsModule,
+    MatDatepickerModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatGridListModule,
+    MatIconModule,
+    MatInputModule,
+    MatListModule,
+    MatMenuModule,
+    MatNativeDateModule,
+    MatPaginatorModule,
+    MatProgressBarModule,
+    MatProgressSpinnerModule,
+    MatRadioModule,
+    MatRippleModule,
+    MatSelectModule,
+    MatSidenavModule,
+    MatSliderModule,
+    MatSlideToggleModule,
+    MatSnackBarModule,
+    MatTabsModule,
+    MatToolbarModule,
+    MatTooltipModule,
+    MatExpansionModule,
+    MatSortModule,
+    MatTableModule,
 
     // CDK Modules
     CdkTableModule
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 83fa1471839e..64c3c146f66b 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -25,8 +25,8 @@ const config = {
       path: '../tools/axe-protractor/axe-protractor.js',
 
       rules: [
-        // Exclude md-menu elements because those are empty if not active.
-        { id: 'aria-required-children', selector: '*:not(md-menu)' },
+        // Exclude mat-menu elements because those are empty if not active.
+        { id: 'aria-required-children', selector: '*:not(mat-menu)' },
 
         // Disable color constrast checks since the final colors will vary based on the theme.
         { id: 'color-contrast', enabled: false },
diff --git a/tools/dashboard/src/app/coverage-chart/coverage-chart.html b/tools/dashboard/src/app/coverage-chart/coverage-chart.html
index d566cbd5aea1..8779d008b6d6 100644
--- a/tools/dashboard/src/app/coverage-chart/coverage-chart.html
+++ b/tools/dashboard/src/app/coverage-chart/coverage-chart.html
@@ -14,4 +14,4 @@
   [autoScale]="true">
 </ngx-charts-line-chart>
 
-<md-spinner *ngIf="!chartData.length" class="coverage-chart-loading"></md-spinner>
+<mat-spinner *ngIf="!chartData.length" class="coverage-chart-loading"></mat-spinner>
diff --git a/tools/dashboard/src/app/dashboard-app.html b/tools/dashboard/src/app/dashboard-app.html
index 59e513cdeb8b..484e468f3011 100644
--- a/tools/dashboard/src/app/dashboard-app.html
+++ b/tools/dashboard/src/app/dashboard-app.html
@@ -1,21 +1,21 @@
-<md-toolbar color="primary">
+<mat-toolbar color="primary">
   <span>Angular Material - Board</span>
-</md-toolbar>
+</mat-toolbar>
 
 <div class="dashboard-content">
 
-  <md-card class="dashboard-panel-card">
-    <md-card-title>Payload Size Chart</md-card-title>
-    <md-card-content>
+  <mat-card class="dashboard-panel-card">
+    <mat-card-title>Payload Size Chart</mat-card-title>
+    <mat-card-content>
       <payload-chart [data]="payloads | async"></payload-chart>
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 
-  <md-card class="dashboard-panel-card">
-    <md-card-title>Coverage Reports</md-card-title>
-    <md-card-content>
+  <mat-card class="dashboard-panel-card">
+    <mat-card-title>Coverage Reports</mat-card-title>
+    <mat-card-content>
       <coverage-chart [data]="coverage | async"></coverage-chart>
-    </md-card-content>
-  </md-card>
+    </mat-card-content>
+  </mat-card>
 
 </div>
diff --git a/tools/dashboard/src/app/dashboard-module.ts b/tools/dashboard/src/app/dashboard-module.ts
index 8d01d9af088a..7f7b55f679ce 100644
--- a/tools/dashboard/src/app/dashboard-module.ts
+++ b/tools/dashboard/src/app/dashboard-module.ts
@@ -4,7 +4,7 @@ import {AngularFireDatabaseModule} from 'angularfire2/database';
 import {NgModule} from '@angular/core';
 import {DashboardApp} from './dashboard-app';
 import {environment} from '../environments/environment';
-import {MdCardModule, MdProgressSpinnerModule, MdToolbarModule} from '@angular/material';
+import {MatCardModule, MatProgressSpinnerModule, MatToolbarModule} from '@angular/material';
 import {NgxChartsModule} from '@swimlane/ngx-charts';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {PayloadChart} from './payload-chart/payload-chart';
@@ -12,9 +12,9 @@ import {CoverageChart} from './coverage-chart/coverage-chart';
 
 @NgModule({
   exports: [
-    MdCardModule,
-    MdToolbarModule,
-    MdProgressSpinnerModule
+    MatCardModule,
+    MatToolbarModule,
+    MatProgressSpinnerModule
   ]
 })
 export class DashboardMaterialModule {}
diff --git a/tools/dashboard/src/app/payload-chart/payload-chart.html b/tools/dashboard/src/app/payload-chart/payload-chart.html
index a7b907d9bce3..0583940b4d97 100644
--- a/tools/dashboard/src/app/payload-chart/payload-chart.html
+++ b/tools/dashboard/src/app/payload-chart/payload-chart.html
@@ -14,4 +14,4 @@
   [autoScale]="true">
 </ngx-charts-line-chart>
 
-<md-spinner *ngIf="!chartData.length" class="payload-chart-loading"></md-spinner>
+<mat-spinner *ngIf="!chartData.length" class="payload-chart-loading"></mat-spinner>
diff --git a/tools/dgeni/processors/categorizer.js b/tools/dgeni/processors/categorizer.js
index d10a92f9d00d..b10a947fa900 100644
--- a/tools/dgeni/processors/categorizer.js
+++ b/tools/dgeni/processors/categorizer.js
@@ -6,7 +6,7 @@
 const SELECTOR_BLACKLIST  = new Set([
   '[portal]',
   '[portalHost]',
-  'textarea[md-autosize]',
+  'textarea[mat-autosize]',
   '[overlay-origin]',
   '[connected-overlay]',
 ]);
diff --git a/tools/screenshot-test/src/app/nav/nav.component.html b/tools/screenshot-test/src/app/nav/nav.component.html
index e7904d4f56ed..fd8bb87e70fe 100644
--- a/tools/screenshot-test/src/app/nav/nav.component.html
+++ b/tools/screenshot-test/src/app/nav/nav.component.html
@@ -1,6 +1,6 @@
-<md-toolbar color="primary">
+<mat-toolbar color="primary">
   <div *ngIf="user">{{user.email}}</div>
-  <button md-button (click)="signIntoGithub()" *ngIf="!user">Sign In with Github</button>
-  <button md-button (click)="signOutFromGithub()" *ngIf="user">Sign out</button>
-</md-toolbar>
+  <button mat-button (click)="signIntoGithub()" *ngIf="!user">Sign In with Github</button>
+  <button mat-button (click)="signOutFromGithub()" *ngIf="user">Sign out</button>
+</mat-toolbar>
 
diff --git a/tools/screenshot-test/src/app/pixacto.dashboard.module.ts b/tools/screenshot-test/src/app/pixacto.dashboard.module.ts
index 3cff5d19cf5d..03e1f733edb9 100644
--- a/tools/screenshot-test/src/app/pixacto.dashboard.module.ts
+++ b/tools/screenshot-test/src/app/pixacto.dashboard.module.ts
@@ -6,8 +6,8 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {FirebaseService} from './firebase.service';
 import {routing} from './routes';
 import {
-  MdToolbarModule, MdButtonModule, MdCardModule, MdButtonToggleModule, MdIconModule,
-  MdSnackBarModule, MdTooltipModule
+  MatToolbarModule, MatButtonModule, MatCardModule, MatButtonToggleModule, MatIconModule,
+  MatSnackBarModule, MatTooltipModule
 } from '@angular/material';
 
 import {PixactoDashboardComponent} from './pixacto.dashboard.component';
@@ -17,13 +17,13 @@ import {NavComponent} from './nav/nav.component';
 
 @NgModule({
   exports: [
-    MdToolbarModule,
-    MdButtonModule,
-    MdCardModule,
-    MdButtonToggleModule,
-    MdIconModule,
-    MdTooltipModule,
-    MdSnackBarModule
+    MatToolbarModule,
+    MatButtonModule,
+    MatCardModule,
+    MatButtonToggleModule,
+    MatIconModule,
+    MatTooltipModule,
+    MatSnackBarModule
   ]
 })
 export class PixactoMaterialModule {}
diff --git a/tools/screenshot-test/src/app/result/result.component.html b/tools/screenshot-test/src/app/result/result.component.html
index cfe3312f2f71..112a188c523d 100644
--- a/tools/screenshot-test/src/app/result/result.component.html
+++ b/tools/screenshot-test/src/app/result/result.component.html
@@ -1,12 +1,12 @@
-<md-card>
-  <md-card-header>
-    <md-card-title>
-      <md-icon (click)="toggleCollapse()">{{collapseIcon}}</md-icon>
+<mat-card>
+  <mat-card-header>
+    <mat-card-title>
+      <mat-icon (click)="toggleCollapse()">{{collapseIcon}}</mat-icon>
       {{testName}}
-    </md-card-title>
-    <md-card-subtitle [ngClass]="resultText.toLowerCase()">{{resultText}}</md-card-subtitle>
-  </md-card-header>
-  <md-card-content *ngIf="!collapse">
+    </mat-card-title>
+    <mat-card-subtitle [ngClass]="resultText.toLowerCase()">{{resultText}}</mat-card-subtitle>
+  </mat-card-header>
+  <mat-card-content *ngIf="!collapse">
     <div class="images-section" [ngClass]="mode" [class.flipping]="flipping">
       <div class="image-section test-section" >
         <div class="image-title">Test image</div>
@@ -21,19 +21,19 @@
         <div><img [src]="goldImageUrl"/></div>
       </div>
     </div>
-  </md-card-content>
-  <md-card-actions>
-    <md-button-toggle-group [(ngModel)]="mode" class="mode-section">
-      <md-button-toggle value="diff">
+  </mat-card-content>
+  <mat-card-actions>
+    <mat-button-toggle-group [(ngModel)]="mode" class="mode-section">
+      <mat-button-toggle value="diff">
         Diff
-      </md-button-toggle>
-      <md-button-toggle value="flip">
+      </mat-button-toggle>
+      <mat-button-toggle value="flip">
         Flip
-      </md-button-toggle>
-      <md-button-toggle value="side">
+      </mat-button-toggle>
+      <mat-button-toggle value="side">
         Side by side
-      </md-button-toggle>
-    </md-button-toggle-group>
-    <button md-button color="primary" (click)="flip()" *ngIf="mode === 'flip'">Flip</button>
-  </md-card-actions>
-</md-card>
+      </mat-button-toggle>
+    </mat-button-toggle-group>
+    <button mat-button color="primary" (click)="flip()" *ngIf="mode === 'flip'">Flip</button>
+  </mat-card-actions>
+</mat-card>
diff --git a/tools/screenshot-test/src/app/viewer/viewer.component.html b/tools/screenshot-test/src/app/viewer/viewer.component.html
index 8de5f92b50e0..4e40617ac876 100644
--- a/tools/screenshot-test/src/app/viewer/viewer.component.html
+++ b/tools/screenshot-test/src/app/viewer/viewer.component.html
@@ -1,18 +1,18 @@
 <div *ngIf="screenshotResultSummary.prNumber">
-  <md-card>
+  <mat-card>
     <p>
-      <a md-button [href]="screenshotResultSummary.prUrl" target="_blank" color="primary">
+      <a mat-button [href]="screenshotResultSummary.prUrl" target="_blank" color="primary">
         Pull Request: {{screenshotResultSummary.prNumber}}
       </a>
-      <a md-button [href]="screenshotResultSummary.commitLink" target="_blank" color="primary">
+      <a mat-button [href]="screenshotResultSummary.commitLink" target="_blank" color="primary">
         Commit: {{screenshotResultSummary.sha}}
       </a>
-      <a md-button [href]="screenshotResultSummary.travisLink" target="_blank" color="primary">
+      <a mat-button [href]="screenshotResultSummary.travisLink" target="_blank" color="primary">
         Travis: {{screenshotResultSummary.travis}}
       </a>
     </p>
     <p *ngIf="!isApproved">
-      <button md-button (click)="approve()" color="primary" >
+      <button mat-button (click)="approve()" color="primary" >
         Copy To Goldens
       </button>
       <span class="description">
@@ -21,23 +21,23 @@
       </span>
     </p>
     <p *ngIf="isApproved">
-      <button md-button disabled>Approved.</button>
-      <button md-button (click)="approve()">Copy to Goldens (Again)</button>
+      <button mat-button disabled>Approved.</button>
+      <button mat-button (click)="approve()">Copy to Goldens (Again)</button>
       <span class="description">
         Test images should be the same as golden images. Expand all to verify.
       </span>
     </p>
     <p>
-      <button md-button
+      <button mat-button
               [disabled]="screenshotResultSummary.allTestsPassedOrApproved" color="primary"
               (click)="updateGithubStatus()">
         Set Github to Success
       </button>
-      <a md-icon-button *ngIf="githubStatus" [ngClass]="githubClass">
-        <md-icon>{{githubIcon}}</md-icon>
+      <a mat-icon-button *ngIf="githubStatus" [ngClass]="githubClass">
+        <mat-icon>{{githubIcon}}</mat-icon>
       </a>
-      <a md-tooltip="Refresh Github Status" (click)="refreshGithubStatus()" md-icon-button>
-        <md-icon>refresh</md-icon>
+      <a mat-tooltip="Refresh Github Status" (click)="refreshGithubStatus()" mat-icon-button>
+        <mat-icon>refresh</mat-icon>
       </a>
       <br>
       <span class="description">
@@ -45,15 +45,15 @@
         Once the PR checked in, the golds will be updated automatically.
       </span>
     </p>
-    <md-card-actions>
-      <button md-raised-button color="primary" (click)="screenshotResultSummary.setCollapse(true)">
+    <mat-card-actions>
+      <button mat-raised-button color="primary" (click)="screenshotResultSummary.setCollapse(true)">
         Collapse All
       </button>
-      <button md-raised-button color="primary" (click)="screenshotResultSummary.setCollapse(false)">
+      <button mat-raised-button color="primary" (click)="screenshotResultSummary.setCollapse(false)">
         Expand All
       </button>
-    </md-card-actions>
-  </md-card>
+    </mat-card-actions>
+  </mat-card>
 
   <div *ngFor="let testname of screenshotResultSummary.testNames; let i = index">
     <app-result [filename]="testname"
diff --git a/tools/screenshot-test/src/app/viewer/viewer.component.ts b/tools/screenshot-test/src/app/viewer/viewer.component.ts
index 68f159aceac4..9f88e4dcfe2f 100644
--- a/tools/screenshot-test/src/app/viewer/viewer.component.ts
+++ b/tools/screenshot-test/src/app/viewer/viewer.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
-import {MdSnackBar} from '@angular/material';
+import {MatSnackBar} from '@angular/material';
 import {FirebaseService} from '../firebase.service';
 
 /**
@@ -38,7 +38,7 @@ export class ViewerComponent {
   }
 
   constructor(private _service: FirebaseService,
-              public snackBar: MdSnackBar,
+              public snackBar: MatSnackBar,
               activatedRoute: ActivatedRoute) {
     activatedRoute.params.subscribe(p => {
       this._service.prNumber = p['id'];

From 657287925b0aa3eaa8e52e1fbf2637c8009bfedf Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:27:09 +0200
Subject: [PATCH 133/575] chore(tabs): fix e2e failures (#7360)

Fixes a couple of e2e test failures in the tabs due to a wrong selector.

From 3bbbb8a36f860aece65773a4027596248f96870d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:27:25 +0200
Subject: [PATCH 134/575] chore: stepper e2e failures (#7237)

Fixes some selectors that weren't renamed in the e2e tests.

From f5d1a23ba11d0d9b9945b7a030bc0949de7d6b5a Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Thu, 28 Sep 2017 15:28:22 -0700
Subject: [PATCH 135/575] chore: update issue template & readme w/ stackblitz
 links (#7395)

---
 .github/ISSUE_TEMPLATE.md | 6 +++---
 README.md                 | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 68123cd0c4a7..29524ffc3f7a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -8,9 +8,9 @@
 
 
 #### What are the steps to reproduce?
-
-Providing a Plunker (or similar) is the *best* way to get the team to see your issue.
-Plunker template: https://goo.gl/DlHd6U
+Providing a StackBlitz/Plunker (or similar) is the *best* way to get the team to see your issue. <br/>
+Plunker starter (using on `@master`): https://goo.gl/DlHd6U<br/>
+StackBlitz starter (using latest `npm` release): https://goo.gl/wwnhMV<br/>
 
 
 #### What is the use-case or motivation for changing an existing behavior?
diff --git a/README.md b/README.md
index 44e1ab75a379..e8621baa8075 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@ This is the home for the Angular team's Material Design components built for and
 [Documentation, demos, and guides][aio] |
 [Google group](https://groups.google.com/forum/#!forum/angular-material2) |
 [Contributing](https://github.com/angular/material2/blob/master/CONTRIBUTING.md) |
-[Plunker Template](http://plnkr.co/edit/o077B6uEiiIgkC0S06dd?p=preview)
+[Plunker Template](http://plnkr.co/edit/o077B6uEiiIgkC0S06dd?p=preview) |
+[StackBlitz Template](https://stackblitz.com/edit/angular-material2-issue?file=app%2Fapp.component.ts)
 
 ### Getting started
 

From aa6cd060a3d76aa31aabb022d9e5427654b0766f Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 28 Sep 2017 15:28:36 -0700
Subject: [PATCH 136/575] docs: add StyleModule deprecation to changelog
 (#7380)

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 530770803df0..fe2c026729be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,10 @@ library's styles such that they wouldn't affect the Angular Material components
 the specificity. This would have been a significant breaking change, as it would have potentially
 broken countless custom styles that relied on a particular specificity working.
 
+### Other deprecations
+* `StyleModule` is deprecated. `FocusOriginMonitor` (the only thing it contained) has been renamed
+to `FocusMonitor` and moved to `@angular/cdk/a11y` (`A11yModule`).
+
 
 ### Bug Fixes
 

From 822e71e69bfaafcc644ced0f8f39a36dd335f3dd Mon Sep 17 00:00:00 2001
From: Sean Harrington <seanharr11@gmail.com>
Date: Thu, 28 Sep 2017 18:29:43 -0400
Subject: [PATCH 137/575] docs(changelog): mention mdSortChange rename (#7362)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe2c026729be..5a8ab702792d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@ overlayContainer.getContainerElement().classList.add('my-theme-class');
 ```
 * DateAdapter method `getISODateString` has been renamed to `toIso8601` and a new method
 `fromIso8601` has been added.
-
+* **sort:** The sort-change stream `mdSortChange` has been renamed to `sortChange`.
 
 ### Deprecation of "md" prefix.
 

From ae0791cabad144ae0df1b6436f2ac704ee4c9707 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:30:01 +0200
Subject: [PATCH 138/575] chore: remove dead link from demo app (#7343)

Gets rid of the `/styles` link from the demo app since it was renamed to `/focus-origin` a few days ago.
---
 src/demo-app/demo-app/demo-app.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index f1f9fa5cd178..7409cbccef3e 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -73,7 +73,6 @@ export class DemoApp {
     {name: 'Slider', route: '/slider'},
     {name: 'Snack Bar', route: '/snack-bar'},
     {name: 'Stepper', route: '/stepper'},
-    {name: 'Style', route: '/style'},
     {name: 'Table', route: '/table'},
     {name: 'Tabs', route: '/tabs'},
     {name: 'Toolbar', route: '/toolbar'},

From 40ec11cc493c3eae469285930ed710d7ddd88409 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:30:38 +0200
Subject: [PATCH 139/575] build: faster demo-app building (#7280)

* The demo-app no longer builds every secondary entry-point separately. Now the everything of a package is built at the same time (as for the tests). This is significantly faster than before.
* No longer builds the CDK package twice when building the tests or demo-app.
---
 src/demo-app/system-config.ts                | 79 ++++++++++++++------
 tools/gulp/packages.ts                       |  3 +-
 tools/gulp/tasks/aot.ts                      |  2 +-
 tools/gulp/tasks/development.ts              | 34 ++++++---
 tools/gulp/tasks/unit-test.ts                |  2 +-
 tools/gulp/util/task_helpers.ts              | 17 +----
 tools/package-tools/gulp/build-tasks-gulp.ts |  4 +-
 tools/package-tools/gulp/watch-files.ts      |  8 +-
 8 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 96b0a3d3e9e3..1e2a4aabb251 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -1,10 +1,10 @@
 /** Type declaration for ambient System. */
 declare const System: any;
 
-// Apply the CLI SystemJS configuration.
+// Configure the base path and map the different node packages.
 System.config({
   paths: {
-    'node:*': 'node_modules/*',
+    'node:*': 'node_modules/*'
   },
   map: {
     'rxjs': 'node:rxjs',
@@ -17,36 +17,69 @@ System.config({
     '@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
     '@angular/http': 'node:@angular/http/bundles/http.umd.js',
     '@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
-    '@angular/router': 'node:@angular/router/bundles/router.umd.js',
     '@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
+    '@angular/router': 'node:@angular/router/bundles/router.umd.js',
     '@angular/animations/browser': 'node:@angular/animations/bundles/animations-browser.umd.js',
-    '@angular/platform-browser': 'node:@angular/platform-browser/bundles/platform-browser.umd.js',
     '@angular/platform-browser/animations':
-      'node:@angular/platform-browser/bundles/platform-browser-animations.umd.js',
+      'node:@angular/platform-browser/bundles/platform-browser-animations.umd',
+    '@angular/platform-browser':
+      'node:@angular/platform-browser/bundles/platform-browser.umd.js',
     '@angular/platform-browser-dynamic':
       'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
 
-    '@angular/material': 'dist/bundles/material.umd.js',
-    '@angular/material-moment-adapter': 'dist/bundles/material-moment-adapter.umd.js',
-    '@angular/cdk': 'dist/bundles/cdk.umd.js',
-    '@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
-    '@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
-    '@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
-    '@angular/cdk/collections': 'dist/bundles/cdk-collections.umd.js',
-    '@angular/cdk/keycodes': 'dist/bundles/cdk-keycodes.umd.js',
-    '@angular/cdk/observers': 'dist/bundles/cdk-observers.umd.js',
-    '@angular/cdk/overlay': 'dist/bundles/cdk-overlay.umd.js',
-    '@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
-    '@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
-    '@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',
-    '@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js',
-    '@angular/cdk/stepper': 'dist/bundles/cdk-stepper.umd.js',
-    '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
-    '@angular/cdk/testing': 'dist/bundles/cdk-testing.umd.js',
+    // TODO(devversion): replace once the index.ts file for the Material package has been added.
+    '@angular/material': 'dist/packages/material/public_api.js',
+    '@angular/cdk': 'dist/packages/cdk/index.js',
+    '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
+    '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
+    '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
+    '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
+    '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
+    '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
+    '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
+    '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
+    '@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
+    '@angular/cdk/rxjs': 'dist/packages/cdk/rxjs/index.js',
+    '@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
+    '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
+    '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
+
+    '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
+    '@angular/material/button': 'dist/packages/material/button/index.js',
+    '@angular/material/button-toggle': 'dist/packages/material/button-toggle/index.js',
+    '@angular/material/card': 'dist/packages/material/card/index.js',
+    '@angular/material/checkbox': 'dist/packages/material/checkbox/index.js',
+    '@angular/material/chips': 'dist/packages/material/chips/index.js',
+    '@angular/material/core': 'dist/packages/material/core/index.js',
+    '@angular/material/datepicker': 'dist/packages/material/datepicker/index.js',
+    '@angular/material/dialog': 'dist/packages/material/dialog/index.js',
+    '@angular/material/expansion': 'dist/packages/material/expansion/index.js',
+    '@angular/material/form-field': 'dist/packages/material/form-field/index.js',
+    '@angular/material/grid-list': 'dist/packages/material/grid-list/index.js',
+    '@angular/material/icon': 'dist/packages/material/icon/index.js',
+    '@angular/material/input': 'dist/packages/material/input/index.js',
+    '@angular/material/list': 'dist/packages/material/list/index.js',
+    '@angular/material/menu': 'dist/packages/material/menu/index.js',
+    '@angular/material/paginator': 'dist/packages/material/paginator/index.js',
+    '@angular/material/progress-bar': 'dist/packages/material/progress-bar/index.js',
+    '@angular/material/progress-spinner': 'dist/packages/material/progress-spinner/index.js',
+    '@angular/material/radio': 'dist/packages/material/radio/index.js',
+    '@angular/material/select': 'dist/packages/material/select/index.js',
+    '@angular/material/sidenav': 'dist/packages/material/sidenav/index.js',
+    '@angular/material/slide-toggle': 'dist/packages/material/slide-toggle/index.js',
+    '@angular/material/slider': 'dist/packages/material/slider/index.js',
+    '@angular/material/snack-bar': 'dist/packages/material/snack-bar/index.js',
+    '@angular/material/sort': 'dist/packages/material/sort/index.js',
+    '@angular/material/stepper': 'dist/packages/material/stepper/index.js',
+    '@angular/material/table': 'dist/packages/material/table/index.js',
+    '@angular/material/tabs': 'dist/packages/material/tabs/index.js',
+    '@angular/material/toolbar': 'dist/packages/material/toolbar/index.js',
+    '@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
   },
   packages: {
     // Thirdparty barrels.
-    'rxjs': { main: 'index' },
+    'rxjs': {main: 'index'},
+
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
     '.': {
diff --git a/tools/gulp/packages.ts b/tools/gulp/packages.ts
index 890c435f52ad..4186ee478d9e 100644
--- a/tools/gulp/packages.ts
+++ b/tools/gulp/packages.ts
@@ -4,8 +4,7 @@ import {join} from 'path';
 export const cdkPackage = new BuildPackage('cdk');
 export const materialPackage = new BuildPackage('material', [cdkPackage]);
 export const examplesPackage = new BuildPackage('material-examples', [materialPackage, cdkPackage]);
-export const momentAdapterPackage = new BuildPackage('material-moment-adapter',
-    [materialPackage, cdkPackage]);
+export const momentAdapterPackage = new BuildPackage('material-moment-adapter', [materialPackage]);
 
 // The material package re-exports its secondary entry-points at the root so that all of the
 // components can still be imported through `@angular/material`.
diff --git a/tools/gulp/tasks/aot.ts b/tools/gulp/tasks/aot.ts
index 425e95bebccd..379986f49336 100644
--- a/tools/gulp/tasks/aot.ts
+++ b/tools/gulp/tasks/aot.ts
@@ -32,7 +32,7 @@ task('aot:copy-release', () => {
 });
 
 /** Build the demo-app and a release to confirm that the library is AOT-compatible. */
-task('aot:build', sequenceTask('aot:deps', 'aot:compiler-cli'));
+task('aot:build', sequenceTask('clean', 'aot:deps', 'aot:compiler-cli'));
 
 /** Build the demo-app and a release to confirm that the library is AOT-compatible. */
 task('aot:compiler-cli', execNodeTask(
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index cb3cec505951..1774098b4095 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -1,9 +1,10 @@
 import {task} from 'gulp';
-import {tsBuildTask, copyTask, buildAppTask, serverTask} from '../util/task_helpers';
+import {tsBuildTask, copyTask, serverTask} from '../util/task_helpers';
 import {join} from 'path';
 import {
   buildConfig, copyFiles, buildScssTask, sequenceTask, watchFiles
 } from 'material2-build-tools';
+import {cdkPackage, materialPackage, momentAdapterPackage} from '../packages';
 
 // These imports don't have any typings provided.
 const firebaseTools = require('firebase-tools');
@@ -16,9 +17,6 @@ const bundlesDir = join(outputDir, 'bundles');
 const appDir = join(packagesDir, 'demo-app');
 const outDir = join(outputDir, 'packages', 'demo-app');
 
-/** Path to the output of the Material package. */
-const materialOutPath = join(outDir, 'packages', 'material');
-
 /** Array of vendors that are required to serve the demo-app. */
 const appVendors = [
   '@angular', 'systemjs', 'zone.js', 'rxjs', 'hammerjs', 'core-js', 'web-animations-js', 'moment',
@@ -32,9 +30,13 @@ task(':watch:devapp', () => {
   watchFiles(join(appDir, '**/*.scss'), [':build:devapp:scss']);
   watchFiles(join(appDir, '**/*.html'), [':build:devapp:assets']);
 
-  // The themes for the demo-app are built by the demo-app using the SCSS mixins from Material.
-  // Therefore when SCSS files have been changed, the custom theme needs to be rebuilt.
-  watchFiles(join(materialOutPath, '**/*.scss'), [':build:devapp:scss']);
+  // Custom watchers for the CDK, Material and Moment adapter package. This is necessary because
+  // we only want to build the package as a single entry-point (using the tests task).
+  watchFiles(join(cdkPackage.sourceDir, '**/*'), ['cdk:build-no-bundles']);
+  watchFiles(join(materialPackage.sourceDir, '**/!(*.scss)'), ['material:build-no-bundles']);
+  watchFiles(join(materialPackage.sourceDir, '**/*.scss'), [':build:devapp:material-with-styles']);
+  watchFiles(join(momentAdapterPackage.sourceDir, '**/*'),
+      ['material-moment-adapter:build-no-bundles']);
 });
 
 /** Path to the demo-app tsconfig file. */
@@ -43,19 +45,27 @@ const tsconfigPath = join(appDir, 'tsconfig-build.json');
 task(':build:devapp:ts', tsBuildTask(tsconfigPath));
 task(':build:devapp:scss', buildScssTask(outDir, appDir));
 task(':build:devapp:assets', copyTask(appDir, outDir));
-task('build:devapp', buildAppTask('devapp'));
-
 task(':serve:devapp', serverTask(outDir, true));
 
-task('serve:devapp', ['build:devapp'], sequenceTask(
-  [':serve:devapp', 'material:watch', ':watch:devapp']
+// The themes for the demo-app are built by using the SCSS mixins from Material.
+// Therefore when SCSS files have been changed, the custom theme needs to be rebuilt.
+task(':build:devapp:material-with-styles', sequenceTask(
+  'material:build-no-bundles', ':build:devapp:scss'
 ));
 
+task('build:devapp', sequenceTask(
+  ['material-moment-adapter:build-no-bundles', ':build:devapp:assets'],
+  [':build:devapp:scss', ':build:devapp:ts']
+));
+
+task('serve:devapp', ['build:devapp'], sequenceTask([':serve:devapp', ':watch:devapp']));
+
 /** Task that copies all vendors into the demo-app package. Allows hosting the app on firebase. */
 task('stage-deploy:devapp', ['build:devapp'], () => {
   copyFiles(join(projectDir, 'node_modules'), vendorGlob, join(outDir, 'node_modules'));
   copyFiles(bundlesDir, '*.+(js|map)', join(outDir, 'dist/bundles'));
-  copyFiles(materialOutPath, '**/prebuilt/*.+(css|map)', join(outDir, 'dist/packages/material'));
+  copyFiles(materialPackage.outputDir, '**/prebuilt/*.+(css|map)',
+      join(outDir, 'dist/packages/material'));
 });
 
 /**
diff --git a/tools/gulp/tasks/unit-test.ts b/tools/gulp/tasks/unit-test.ts
index 210f0f8b0929..3c70bd50f68d 100644
--- a/tools/gulp/tasks/unit-test.ts
+++ b/tools/gulp/tasks/unit-test.ts
@@ -12,7 +12,7 @@ task(':test:build', sequenceTask(
   'clean',
   // Build tests for all different packages by just building the tests of the moment-adapter
   // package. All dependencies of that package (material, cdk) will be built as well.
-  'material-moment-adapter:build-tests'
+  'material-moment-adapter:build-no-bundles'
 ));
 
 /**
diff --git a/tools/gulp/util/task_helpers.ts b/tools/gulp/util/task_helpers.ts
index 8a109e8ae27b..2613cd101786 100644
--- a/tools/gulp/util/task_helpers.ts
+++ b/tools/gulp/util/task_helpers.ts
@@ -2,7 +2,7 @@ import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as gulp from 'gulp';
 import * as path from 'path';
-import {buildConfig, sequenceTask} from 'material2-build-tools';
+import {buildConfig} from 'material2-build-tools';
 
 /* Those imports lack typings. */
 const gulpClean = require('gulp-clean');
@@ -122,21 +122,6 @@ export function cleanTask(glob: string) {
   return () => gulp.src(glob, { read: false }).pipe(gulpClean(null));
 }
 
-
-/** Build an task that depends on all application build tasks. */
-export function buildAppTask(appName: string) {
-  const buildTasks = ['ts', 'scss', 'assets']
-    .map(taskName => `:build:${appName}:${taskName}`)
-    .filter(taskName => gulp.hasTask(taskName));
-
-  return sequenceTask(
-    // Build all required packages for serving the devapp by just building the moment-adapter
-    // package. All dependencies of that package (material, cdk) will be built automatically.
-    'material-moment-adapter:clean-build',
-    [...buildTasks]
-  );
-}
-
 /**
  * Create a task that serves a given directory in the project.
  * The server rewrites all node_module/ or dist/ requests to the correct directory.
diff --git a/tools/package-tools/gulp/build-tasks-gulp.ts b/tools/package-tools/gulp/build-tasks-gulp.ts
index 94e610891175..39731bfed111 100644
--- a/tools/package-tools/gulp/build-tasks-gulp.ts
+++ b/tools/package-tools/gulp/build-tasks-gulp.ts
@@ -52,9 +52,9 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
     `${taskName}:build:bundles`,
   ));
 
-  task(`${taskName}:build-tests`, sequenceTask(
+  task(`${taskName}:build-no-bundles`, sequenceTask(
     // Build all required tests before building.
-    ...dependencyNames.map(pkgName => `${pkgName}:build-tests`),
+    ...dependencyNames.map(pkgName => `${pkgName}:build-no-bundles`),
     // Build the ESM output that includes all test files. Also build assets for the package.
     [`${taskName}:build:esm:tests`, `${taskName}:assets`],
     // Inline assets into ESM output.
diff --git a/tools/package-tools/gulp/watch-files.ts b/tools/package-tools/gulp/watch-files.ts
index 174badf9caaa..73f34dfe23e1 100644
--- a/tools/package-tools/gulp/watch-files.ts
+++ b/tools/package-tools/gulp/watch-files.ts
@@ -1,13 +1,11 @@
 import {watch} from 'gulp';
 import {triggerLivereload} from './trigger-livereload';
 
-/** Options that will be passed to the watch function of Gulp.*/
-const gulpWatchOptions = { debounceDelay: 700 };
-
 /**
  * Function that watches a set of file globs and runs given Gulp tasks if a given file changes.
  * By default the livereload server will be also called on file change.
  */
-export function watchFiles(fileGlob: string | string[], tasks: string[], livereload = true) {
-  watch(fileGlob, gulpWatchOptions, [...tasks, () => livereload && triggerLivereload()]);
+export function watchFiles(fileGlob: string | string[], tasks: string[], livereload = true,
+                            debounceDelay = 700) {
+  watch(fileGlob, {debounceDelay}, [...tasks, () => livereload && triggerLivereload()]);
 }

From 807ce38ae4bd8393fd9304e602b82de3c625b0b2 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:31:06 +0200
Subject: [PATCH 140/575] build: fix metadata exports for moment-adapter
 (#7272)

Due to a re-export that uses the index shorthand, the exports inside of the bundled metadata file are empty. This seems to be caused by a bug in `@angular/compiler-cli`. A temporary fix is just using the expanded important.

Fixes #7262
---
 src/material-moment-adapter/public_api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material-moment-adapter/public_api.ts b/src/material-moment-adapter/public_api.ts
index 8d50b96839d7..26149a398c2c 100644
--- a/src/material-moment-adapter/public_api.ts
+++ b/src/material-moment-adapter/public_api.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './adapter';
+export * from './adapter/index';

From c54b83ba58ba963f9e240055c46440cb4244b398 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:31:55 +0200
Subject: [PATCH 141/575] chore: fix validate release task (#7359)

Updates the `gulp validate-release` task to work with the current package structure.
---
 tools/gulp/tasks/validate-release.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/gulp/tasks/validate-release.ts b/tools/gulp/tasks/validate-release.ts
index c538b0ed75ce..1c8a266865a2 100644
--- a/tools/gulp/tasks/validate-release.ts
+++ b/tools/gulp/tasks/validate-release.ts
@@ -37,7 +37,17 @@ task('validate-release:check-bundles', () => {
 
 /** Task that validates the given release package before releasing. */
 function checkReleasePackage(packageName: string): string[] {
-  const bundlePath = join(releasesDir, packageName, '@angular', `${packageName}.js`);
+  return glob(join(releasesDir, packageName, 'esm2015/*.js'))
+    .reduce((failures: string[], bundlePath: string) => {
+      return failures.concat(checkEs2015ReleaseBundle(packageName, bundlePath));
+    }, []);
+}
+
+/**
+ * Checks an ES2015 bundle inside of a release package. Secondary entry-point bundles will be
+ * checked as well.
+ */
+function checkEs2015ReleaseBundle(packageName: string, bundlePath: string): string[] {
   const bundleContent = readFileSync(bundlePath, 'utf8');
   let failures: string[] = [];
 

From 128442db1c9df055da098bd7cc37a216aa9169b6 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Thu, 28 Sep 2017 18:32:42 -0400
Subject: [PATCH 142/575] docs(bidi): update to secondary entry-points (#7332)

---
 guides/bidirectionality.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guides/bidirectionality.md b/guides/bidirectionality.md
index 9b21647e416e..1b7bca1a2d76 100644
--- a/guides/bidirectionality.md
+++ b/guides/bidirectionality.md
@@ -9,9 +9,9 @@ All Angular Material components automatically reflect the LTR/RTL direction
 of their container. 
 
 ### Reading the text-direction in your own components
-`@angular/cdk` provides a `Directionality` injectable that can be used by any component
+`@angular/cdk/bidi` provides a `Directionality` injectable that can be used by any component
 in your application. To consume this injectable, you must import `BidiModule`
-from `@angular/cdk`.
+from `@angular/cdk/bidi`.
 
 `Directionality` provides two useful properties:
 * `value`: the current text direction, either `'ltr'` or `'rtl'`.
@@ -32,4 +32,4 @@ export class MyCustomComponent {
     });
   }
 }
-```
\ No newline at end of file
+```

From 3bc9ae985429762c2d547ab44dbaaccdeabd9e7a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:33:13 +0200
Subject: [PATCH 143/575] build: add placeholder for Angular version (#7303)

Adds the `0.0.0-NG` placeholder that will ensure that all published packages will have the same Angular requirements.
---
 build-config.js                             |  8 +++++++-
 src/cdk/package.json                        |  4 ++--
 src/lib/package.json                        |  4 ++--
 src/material-examples/package.json          |  6 +++---
 src/material-moment-adapter/package.json    |  2 +-
 tools/package-tools/build-config.ts         |  2 ++
 tools/package-tools/version-placeholders.ts | 16 +++++++++++-----
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/build-config.js b/build-config.js
index 26b3f8199bc7..46438a76edb1 100644
--- a/build-config.js
+++ b/build-config.js
@@ -4,8 +4,13 @@
  */
 const {join} = require('path');
 
+const package = require('./package.json');
+
 /** Current version of the project*/
-const buildVersion = require('./package.json').version;
+const buildVersion = package.version;
+
+/** Required Angular version for the project. */
+const angularVersion = package.dependencies['@angular/core'];
 
 /** License that will be placed inside of all created bundles. */
 const buildLicense = `/**
@@ -18,6 +23,7 @@ const buildLicense = `/**
 
 module.exports = {
   projectVersion: buildVersion,
+  angularVersion: angularVersion,
   projectDir: __dirname,
   packagesDir: join(__dirname, 'src'),
   outputDir: join(__dirname, 'dist'),
diff --git a/src/cdk/package.json b/src/cdk/package.json
index 58d20d0c69d9..b6345a26b6a7 100644
--- a/src/cdk/package.json
+++ b/src/cdk/package.json
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular/core": "^4.4.3",
-    "@angular/common": "^4.4.3"
+    "@angular/core": "0.0.0-NG",
+    "@angular/common": "0.0.0-NG"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/lib/package.json b/src/lib/package.json
index 0f65801d568d..35915f831e4b 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -23,8 +23,8 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/cdk": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.4.3",
-    "@angular/common": "^4.4.3"
+    "@angular/core": "0.0.0-NG",
+    "@angular/common": "0.0.0-NG"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/material-examples/package.json b/src/material-examples/package.json
index bc7eb5584a7b..466b289923e1 100644
--- a/src/material-examples/package.json
+++ b/src/material-examples/package.json
@@ -24,9 +24,9 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/cdk": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.4.3",
-    "@angular/common": "^4.4.3",
-    "@angular/http": "^4.4.3",
+    "@angular/core": "0.0.0-NG",
+    "@angular/common": "0.0.0-NG",
+    "@angular/http": "0.0.0-NG",
     "@angular/material": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
diff --git a/src/material-moment-adapter/package.json b/src/material-moment-adapter/package.json
index 607510a6bb14..a7ac704cf2b9 100644
--- a/src/material-moment-adapter/package.json
+++ b/src/material-moment-adapter/package.json
@@ -17,7 +17,7 @@
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
     "@angular/material": "0.0.0-PLACEHOLDER",
-    "@angular/core": "^4.4.3",
+    "@angular/core": "0.0.0-NG",
     "moment": "^2.18.1"
   },
   "dependencies": {
diff --git a/tools/package-tools/build-config.ts b/tools/package-tools/build-config.ts
index 63229d97acf6..04f3411f1e6a 100644
--- a/tools/package-tools/build-config.ts
+++ b/tools/package-tools/build-config.ts
@@ -3,6 +3,8 @@ import {findBuildConfig} from './find-build-config';
 export interface BuildConfig {
   /** Current version of the project. */
   projectVersion: string;
+  /** Required Angular version for the project. */
+  angularVersion: string;
   /** Path to the root of the project. */
   projectDir: string;
   /** Path to the directory where all packages are living. */
diff --git a/tools/package-tools/version-placeholders.ts b/tools/package-tools/version-placeholders.ts
index 497a8ea1da21..7af4c61dd06f 100644
--- a/tools/package-tools/version-placeholders.ts
+++ b/tools/package-tools/version-placeholders.ts
@@ -6,7 +6,13 @@ import {spawnSync} from 'child_process';
 /** Variable that is set to the string for version placeholders. */
 const versionPlaceholderText = '0.0.0-PLACEHOLDER';
 
+/** Placeholder that will be replaced with the required Angular version. */
+const ngVersionPlaceholderText = '0.0.0-NG';
+
 /** RegExp that matches version placeholders inside of a file. */
+const ngVersionPlaceholderRegex = new RegExp(ngVersionPlaceholderText, 'g');
+
+/** Expression that matches Angular version placeholders within a file. */
 const versionPlaceholderRegex = new RegExp(versionPlaceholderText, 'g');
 
 /**
@@ -21,9 +27,9 @@ export function replaceVersionPlaceholders(packageDir: string) {
   // Walk through every file that contains version placeholders and replace those with the current
   // version of the root package.json file.
   files.forEach(filePath => {
-    let fileContent = readFileSync(filePath, 'utf-8');
-
-    fileContent = fileContent.replace(versionPlaceholderRegex, buildConfig.projectVersion);
+    const fileContent = readFileSync(filePath, 'utf-8')
+      .replace(ngVersionPlaceholderRegex, buildConfig.angularVersion)
+      .replace(versionPlaceholderRegex, buildConfig.projectVersion);
 
     writeFileSync(filePath, fileContent);
   });
@@ -43,12 +49,12 @@ function buildPlaceholderFindCommand(packageDir: string) {
   if (platform() === 'win32') {
     return {
       binary: 'findstr',
-      args: ['/msi', `/c:${versionPlaceholderText}`, `${packageDir}\\*`]
+      args: ['/msi', `"${ngVersionPlaceholderText} ${versionPlaceholderText}"`, `${packageDir}\\*`]
     };
   } else {
     return {
       binary: 'grep',
-      args: ['-ril', versionPlaceholderText, packageDir]
+      args: ['-ril', `"${ngVersionPlaceholderText}\\|${versionPlaceholderText}"`, packageDir]
     };
   }
 }

From 7cb7f384f5373495838628b5ac1ef43e655b1144 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Thu, 28 Sep 2017 18:33:31 -0400
Subject: [PATCH 144/575] docs(tabs): fix inconsistency in tab-nav snippet
 (#7295)

Also escapes a couple inline code elements
---
 src/lib/tabs/tabs.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/tabs/tabs.md b/src/lib/tabs/tabs.md
index 44eae40a5ddf..2a6f7465c007 100644
--- a/src/lib/tabs/tabs.md
+++ b/src/lib/tabs/tabs.md
@@ -66,17 +66,17 @@ provides a tab-like UI for navigating between routes.
 <nav mat-tab-nav-bar>
   <a mat-tab-link
      *ngFor="let link of navLinks"
-     [routerLink]="link"
+     [routerLink]="link.path"
      routerLinkActive #rla="routerLinkActive"
      [active]="rla.isActive">
-    {{tabLink.label}}
+    {{link.label}}
   </a>
 </nav>
 
 <router-outlet></router-outlet>
 ```
 
-The tab-nav-bar is not tied to any particular router; it works with normal `<a>` elements and uses
+The `tab-nav-bar` is not tied to any particular router; it works with normal `<a>` elements and uses
 the `active` property to determine which tab is currently active. The corresponding
 `<router-outlet>` can be placed anywhere in the view.
 
@@ -91,4 +91,4 @@ Tabs without text or labels should be given a meaningful label via `aria-label`
 |----------------------|----------------------------|
 | `LEFT_ARROW`         | Move focus to previous tab |
 | `RIGHT_ARROW`        | Move focus to next tab     |
-| `SPACE` or 'ENTER'   | Switch to focused tab      |
+| `SPACE` or `ENTER`   | Switch to focused tab      |

From 3982cc8b60facd3c1d6baf493c8de955ccd0682d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:33:44 +0200
Subject: [PATCH 145/575] chore(select): avoid test flakes due to sub-pixel
 deviations (#7281)

Fixes some tests that were failing when they're run against Chrome on Windows due to sub-pixel measurement differences.
---
 src/lib/select/select.spec.ts | 46 +++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 7f34d929f08c..5285279db833 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -1042,10 +1042,14 @@ describe('MatSelect', () => {
       // Extra trigger height beyond the font size caused by the fact that the line-height is
       // greater than 1em.
       const triggerExtraLineSpaceAbove = (1 - triggerLineHeightEm) * triggerFontSize / 2;
+      const topDifference = Math.floor(optionTop) -
+          Math.floor(triggerTop - triggerFontSize - triggerExtraLineSpaceAbove);
 
-      expect(Math.floor(optionTop))
-          .toBe(Math.floor(triggerTop - triggerFontSize - triggerExtraLineSpaceAbove),
-              `Expected trigger to align with option ${index}.`);
+      // Expect the coordinates to be within a pixel of each other. We can't rely on comparing
+      // the exact value, because different browsers report the various sizes with slight (< 1px)
+      // deviations.
+      expect(Math.abs(topDifference) < 2)
+          .toBe(true, `Expected trigger to align with option ${index}.`);
 
       // For the animation to start at the option's center, its origin must be the distance
       // from the top of the overlay to the option top + half the option height (48/2 = 24).
@@ -1218,8 +1222,8 @@ describe('MatSelect', () => {
         const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
         fixture.whenStable().then(() => {
-          expect(scrollContainer.scrollTop)
-              .toEqual(idealScrollTop + 5,
+          expect(Math.ceil(scrollContainer.scrollTop))
+              .toEqual(Math.ceil(idealScrollTop + 5),
                   `Expected panel to adjust scroll position to fit in viewport.`);
 
           checkTriggerAlignedWithOption(4);
@@ -1280,9 +1284,14 @@ describe('MatSelect', () => {
             // (56px from the bottom of the screen - 8px padding = 48px)
             // and the height of the panel below the option (113px).
             // 113px - 48px = 75px difference. Original scrollTop 88px - 75px = 23px
-            expect(scrollContainer.scrollTop)
-                .toEqual(idealScrollTop - expectedExtraScroll,
-                    `Expected panel to adjust scroll position to fit in viewport.`);
+            const difference = Math.ceil(scrollContainer.scrollTop) -
+                Math.ceil(idealScrollTop - expectedExtraScroll);
+
+            // Note that different browser/OS combinations report the different dimensions with
+            // slight deviations (< 1px). We round the expectation and check that the values
+            // are within a pixel of each other to avoid flakes.
+            expect(Math.abs(difference) < 2)
+                .toBe(true, `Expected panel to adjust scroll position to fit in viewport.`);
 
             checkTriggerAlignedWithOption(4);
           });
@@ -1309,9 +1318,12 @@ describe('MatSelect', () => {
         // Expect no scroll to be attempted
         expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
 
-        expect(Math.floor(overlayBottom))
-            .toEqual(Math.floor(triggerBottom),
-                `Expected trigger bottom to align with overlay bottom.`);
+        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
+
+        // Check that the values are within a pixel of each other. This avoids sub-pixel
+        // deviations between OS and browser versions.
+        expect(Math.abs(difference) < 2)
+            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
 
         expect(fixture.componentInstance.select._transformOrigin)
             .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
@@ -1521,10 +1533,12 @@ describe('MatSelect', () => {
         const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
         const triggerBottom = trigger.getBoundingClientRect().bottom;
         const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
 
-        expect(Math.floor(overlayBottom))
-            .toEqual(Math.floor(triggerBottom),
-                `Expected trigger bottom to align with overlay bottom.`);
+        // Check that the values are within a pixel of each other. This avoids sub-pixel
+        // deviations between OS and browser versions.
+        expect(Math.abs(difference) < 2)
+            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
       });
 
       it('should fall back to "below" positioning properly when scrolled', () => {
@@ -1731,8 +1745,8 @@ describe('MatSelect', () => {
             expect(difference)
                 .toBeLessThan(0.1, 'Expected trigger to align with the first option.');
           } else {
-            expect(optionTop + (menuItemHeight - triggerHeight) / 2)
-                .toBe(triggerTop, 'Expected trigger to align with the first option.');
+            expect(Math.floor(optionTop + (menuItemHeight - triggerHeight) / 2))
+                .toBe(Math.floor(triggerTop), 'Expected trigger to align with the first option.');
           }
         });
       }));

From 1ac3fd25c97728224a2eac9e86a632fe0ed01b6e Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:39:40 +0200
Subject: [PATCH 146/575] chore: remove screenshot timeout check (#7206)

Removes the screenshot timeout check, which will cancel the screenshot diff if the last action took longer than 6 minutes. Travis CI will automatically cancel the job if there was no console output for 10 minutes.
---
 tools/gulp/tasks/screenshots.ts | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/tools/gulp/tasks/screenshots.ts b/tools/gulp/tasks/screenshots.ts
index e7475fc8d155..fd5ffbd1fffa 100644
--- a/tools/gulp/tasks/screenshots.ts
+++ b/tools/gulp/tasks/screenshots.ts
@@ -34,12 +34,6 @@ const FIREBASE_IMAGE = `${TEMP_FOLDER}/screenshot/images`;
 const FIREBASE_DATA_GOLDENS = `screenshot/goldens`;
 const FIREBASE_STORAGE_GOLDENS = 'goldens';
 
-/** Time in ms until the process will be exited if the last action took too long (6 minutes). */
-const lastActionTimeout = 1000 * 60 * 6;
-
-/** Time in ms that specifies how often the last action should be checked (45 seconds). */
-const lastActionRefreshInterval = 1000 * 45;
-
 /** Task which upload screenshots generated from e2e test. */
 task('screenshots', () => {
   const prNumber = process.env['TRAVIS_PULL_REQUEST'];
@@ -52,16 +46,6 @@ task('screenshots', () => {
     const database = firebaseApp.database();
     let lastActionTime = Date.now();
 
-    // If the last action of the task takes longer than 6 minutes, close the firebase connection.
-    const timeoutId = setInterval(() => {
-      if (lastActionTime + lastActionTimeout <= Date.now()) {
-        clearTimeout(timeoutId);
-        console.error('Last action for screenshot tests did not finish in ' +
-            (lastActionTimeout / 1000 / 60) + ' minutes. Closing Firebase connection...');
-        return firebaseApp.delete().then(() => process.exit(1));
-      }
-    }, lastActionRefreshInterval);
-
     console.log(`  Starting screenshots task with results from e2e task...`);
 
     return uploadTravisJobInfo(database, prNumber)
@@ -89,13 +73,11 @@ task('screenshots', () => {
       .then(() => {
         console.log(`  Uploading results done (took ${Date.now() - lastActionTime}ms)`);
         firebaseApp.delete();
-        clearTimeout(timeoutId);
       })
       .catch((err: any) => {
         console.error(`  Screenshot tests encountered an error!`);
         console.error(err);
         firebaseApp.delete();
-        clearTimeout(timeoutId);
       });
   }
 });

From afa92a8d6085efc9221dc389e995c743695b5d75 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:40:16 +0200
Subject: [PATCH 147/575] build: copy stylesheets to release output (#7204)

* Copies stylesheets of secondary entry-points to the root of the release output
* Better deduping for the `_theming.scss` file (currently includes multiple `cdk-a11y` mixins)
* Removes unused `cdk-a11y` import in the `button-toggle` component.
* Moves some logic out of the `BuildPackage` class (in favor of readability)
---
 src/cdk/a11y/a11y-prebuilt.scss            |  3 +
 src/lib/button/button.scss                 |  2 +-
 src/lib/chips/chips.scss                   |  2 +-
 src/lib/core/option/_option.scss           |  2 +-
 src/lib/menu/menu.scss                     |  3 +-
 tools/gulp/packages.ts                     |  5 ++
 tools/gulp/tasks/material-release.ts       |  4 +-
 tools/package-tools/build-package.ts       | 65 ++++------------------
 tools/package-tools/build-release.ts       | 14 +++++
 tools/package-tools/compile-entry-point.ts | 48 ++++++++++++++++
 10 files changed, 88 insertions(+), 60 deletions(-)
 create mode 100644 src/cdk/a11y/a11y-prebuilt.scss
 create mode 100644 tools/package-tools/compile-entry-point.ts

diff --git a/src/cdk/a11y/a11y-prebuilt.scss b/src/cdk/a11y/a11y-prebuilt.scss
new file mode 100644
index 000000000000..e30963e8ccf9
--- /dev/null
+++ b/src/cdk/a11y/a11y-prebuilt.scss
@@ -0,0 +1,3 @@
+@import './a11y';
+
+@include cdk-a11y();
diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index 277c0be3f9a7..f698b24bbeea 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -1,8 +1,8 @@
 // TODO(jelbourn): Measure perf benefits for translate3d and will-change.
 // TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser.
 @import 'button-base';
-@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
+@import '../../cdk/a11y/a11y';
 
 .mat-button, .mat-icon-button {
   @extend %mat-button-base;
diff --git a/src/lib/chips/chips.scss b/src/lib/chips/chips.scss
index fc1b13a851b5..ba5a529a3767 100644
--- a/src/lib/chips/chips.scss
+++ b/src/lib/chips/chips.scss
@@ -1,5 +1,5 @@
-@import '../../cdk/a11y/a11y';
 @import '../core/style/elevation';
+@import '../../cdk/a11y/a11y';
 
 $mat-chip-vertical-padding: 7px;
 $mat-chip-horizontal-padding: 12px;
diff --git a/src/lib/core/option/_option.scss b/src/lib/core/option/_option.scss
index 6cbae7e330ed..c87b65e598d5 100644
--- a/src/lib/core/option/_option.scss
+++ b/src/lib/core/option/_option.scss
@@ -1,7 +1,7 @@
 @import '../style/menu-common';
 @import '../style/vendor-prefixes';
-@import '../../../cdk/a11y/a11y';
 @import '../style/layout-common';
+@import '../../../cdk/a11y/a11y';
 
 /**
  * This mixin contains shared option styles between the select and
diff --git a/src/lib/menu/menu.scss b/src/lib/menu/menu.scss
index 5fcc8a889650..b2173add544b 100644
--- a/src/lib/menu/menu.scss
+++ b/src/lib/menu/menu.scss
@@ -1,10 +1,9 @@
 // TODO(kara): update vars for desktop when MD team responds
-
 @import '../core/style/button-common';
 @import '../core/style/layout-common';
 @import '../core/style/menu-common';
-@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
+@import '../../cdk/a11y/a11y';
 
 $mat-menu-vertical-padding: 8px !default;
 $mat-menu-border-radius: 2px !default;
diff --git a/tools/gulp/packages.ts b/tools/gulp/packages.ts
index 4186ee478d9e..c65002dad845 100644
--- a/tools/gulp/packages.ts
+++ b/tools/gulp/packages.ts
@@ -12,3 +12,8 @@ materialPackage.exportsSecondaryEntryPointsAtRoot = true;
 
 // To avoid refactoring of the project the material package will map to the source path `lib/`.
 materialPackage.sourceDir = join(buildConfig.packagesDir, 'lib');
+
+// Some CDK secondary entry-points include SCSS files that should be exposed individually at the
+// release output root. This is different in the Material package because here a full SCSS bundle
+// will be generated.
+cdkPackage.copySecondaryEntryPointStylesToRoot = true;
diff --git a/tools/gulp/tasks/material-release.ts b/tools/gulp/tasks/material-release.ts
index 201ab1c17991..be3a259e1db4 100644
--- a/tools/gulp/tasks/material-release.ts
+++ b/tools/gulp/tasks/material-release.ts
@@ -22,8 +22,8 @@ const themingEntryPointPath = join(sourceDir, 'core', 'theming', '_all-theme.scs
 const themingBundlePath = join(releasePath, '_theming.scss');
 // Matches all pre-built theme css files
 const prebuiltThemeGlob = join(outputDir, '**/theming/prebuilt/*.css?(.map)');
-// Matches all SCSS files in the library.
-const allScssGlob = join(sourceDir, '**/*.scss');
+// Matches all SCSS files in the different packages.
+const allScssGlob = join(buildConfig.packagesDir, '**/*.scss');
 
 /**
  * Overwrite the release task for the material package. The material release will include special
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index 381955c58f7c..ba6b32276089 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -1,13 +1,9 @@
-import {red} from 'chalk';
-import {spawn} from 'child_process';
-import {readFileSync, writeFileSync} from 'fs';
-import {sync as glob} from 'glob';
-import {join, resolve as resolvePath} from 'path';
+import {join} from 'path';
 import {main as ngc} from '@angular/tsc-wrapped';
 import {PackageBundler} from './build-bundles';
 import {buildConfig} from './build-config';
 import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
-
+import {compileEntryPoint, renamePrivateReExportsToBeUnique} from './compile-entry-point';
 
 const {packagesDir, outputDir} = buildConfig;
 
@@ -17,9 +13,6 @@ const buildTsconfigName = 'tsconfig-build.json';
 /** Name of the tsconfig file that is responsible for building the tests. */
 const testsTsconfigName = 'tsconfig-tests.json';
 
-/** Incrementing ID counter. */
-let nextId = 0;
-
 export class BuildPackage {
   /** Path to the package sources. */
   sourceDir: string;
@@ -30,6 +23,9 @@ export class BuildPackage {
   /** Whether this package will re-export its secondary-entry points at the root module. */
   exportsSecondaryEntryPointsAtRoot = false;
 
+  /** Whether the secondary entry-point styles should be copied to the release output. */
+  copySecondaryEntryPointStylesToRoot = false;
+
   /** Path to the entry file of the package in the output directory. */
   readonly entryFilePath: string;
 
@@ -39,22 +35,22 @@ export class BuildPackage {
   /** Path to the tsconfig file, which will be used to build the tests. */
   private readonly tsconfigTests: string;
 
-  private _secondaryEntryPoints: string[];
-  private _secondaryEntryPointsByDepth: string[][];
+  /** Package bundler instance. */
+  private bundler = new PackageBundler(this);
 
   /** Secondary entry-points partitioned by their build depth. */
   private get secondaryEntryPointsByDepth(): string[][] {
     this.cacheSecondaryEntryPoints();
     return this._secondaryEntryPointsByDepth;
   }
-
-  private readonly bundler = new PackageBundler(this);
+  private _secondaryEntryPointsByDepth: string[][];
 
   /** Secondary entry points for the package. */
   get secondaryEntryPoints(): string[] {
     this.cacheSecondaryEntryPoints();
     return this._secondaryEntryPoints;
   }
+  private _secondaryEntryPoints: string[];
 
   constructor(public readonly name: string, public readonly dependencies: BuildPackage[] = []) {
     this.sourceDir = join(packagesDir, name);
@@ -74,11 +70,11 @@ export class BuildPackage {
     // Depth 1: a11y, scrolling
     // Depth 2: overlay
     for (const entryPointGroup of this.secondaryEntryPointsByDepth) {
-      await Promise.all(entryPointGroup.map(p => this._compileEntryPoint(buildTsconfigName, p)));
+      await Promise.all(entryPointGroup.map(p => compileEntryPoint(this, buildTsconfigName, p)));
     }
 
     // Compile the primary entry-point.
-    await this._compileEntryPoint(buildTsconfigName);
+    await compileEntryPoint(this, buildTsconfigName);
   }
 
   /** Compiles the TypeScript test source files for the package. */
@@ -91,50 +87,13 @@ export class BuildPackage {
     await this.bundler.createBundles();
   }
 
-  /** Compiles the TypeScript sources of a primary or secondary entry point. */
-  private async _compileEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
-    const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
-    const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
-
-    return new Promise((resolve, reject) => {
-      const ngcPath = resolvePath('./node_modules/.bin/ngc');
-      const childProcess = spawn(ngcPath, ['-p', entryPointTsconfigPath], {shell: true});
-
-      // Pipe stdout and stderr from the child process.
-      childProcess.stdout.on('data', (data: any) => console.log(`${data}`));
-      childProcess.stderr.on('data', (data: any) => console.error(red(`${data}`)));
-
-      childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
-    })
-    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)))
-    .then(() => this.renamePrivateReExportsToBeUnique(secondaryEntryPoint));
-  }
-
   /** Compiles the TypeScript sources of a primary or secondary entry point. */
   private async _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
     const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
     const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
 
     await ngc(entryPointTsconfigPath, {basePath: entryPointPath});
-    this.renamePrivateReExportsToBeUnique(secondaryEntryPoint);
-  }
-
-  /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
-  private renamePrivateReExportsToBeUnique(secondaryEntryPoint = '') {
-    // When we compiled the typescript sources with ngc, we do entry-point individually.
-    // If the root-level module re-exports multiple of these entry-points, the private-export
-    // identifiers (e.g., `ɵa`) generated by ngc will collide. We work around this by suffixing
-    // each of these identifiers with an ID specific to this entry point. We make this
-    // replacement in the js, d.ts, and metadata output.
-    if (this.exportsSecondaryEntryPointsAtRoot && secondaryEntryPoint) {
-      const entryPointId = nextId++;
-      const outputPath = join(this.outputDir, secondaryEntryPoint);
-      glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
-        let fileContent = readFileSync(filePath, 'utf-8');
-        fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
-        writeFileSync(filePath, fileContent, 'utf-8');
-      });
-    }
+    renamePrivateReExportsToBeUnique(this, secondaryEntryPoint);
   }
 
   /** Stores the secondary entry-points for this package if they haven't been computed already. */
diff --git a/tools/package-tools/build-release.ts b/tools/package-tools/build-release.ts
index 9ddb0150f538..6eb7991e6869 100644
--- a/tools/package-tools/build-release.ts
+++ b/tools/package-tools/build-release.ts
@@ -54,6 +54,10 @@ export function composeRelease(buildPackage: BuildPackage) {
     createFilesForSecondaryEntryPoint(buildPackage, releasePath);
   }
 
+  if (buildPackage.copySecondaryEntryPointStylesToRoot) {
+    copySecondaryEntryPointStylesheets(buildPackage, releasePath);
+  }
+
   if (buildPackage.exportsSecondaryEntryPointsAtRoot) {
     // Add re-exports to the root d.ts file to prevent errors of the form
     // "@angular/material/material has no exported member 'MATERIAL_SANITY_CHECKS."
@@ -102,3 +106,13 @@ function createFilesForSecondaryEntryPoint(buildPackage: BuildPackage, releasePa
     createMetadataReexportFile(releasePath, `./${entryPointName}/index`, entryPointName);
   });
 }
+
+/** Copies the stylesheets for secondary entry-points that generate one to the release output. */
+function copySecondaryEntryPointStylesheets(buildPackage: BuildPackage, releasePath: string) {
+  buildPackage.secondaryEntryPoints.forEach(entryPointName => {
+    const entryPointDir = join(buildPackage.outputDir, entryPointName);
+
+    copyFiles(entryPointDir, `_${entryPointName}.scss`, releasePath);
+    copyFiles(entryPointDir, `${entryPointName}-prebuilt.css`, releasePath);
+  });
+}
diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts
new file mode 100644
index 000000000000..40dd9b2d46b0
--- /dev/null
+++ b/tools/package-tools/compile-entry-point.ts
@@ -0,0 +1,48 @@
+import {join, resolve as resolvePath} from 'path';
+import {spawn} from 'child_process';
+import {writeFileSync, readFileSync} from 'fs';
+import {sync as glob} from 'glob';
+import {red} from 'chalk';
+import {BuildPackage} from './build-package';
+
+/** Incrementing ID counter. */
+let nextId = 0;
+
+/** Compiles the TypeScript sources of a primary or secondary entry point. */
+export async function compileEntryPoint(buildPackage: BuildPackage, tsconfigName: string,
+                                          secondaryEntryPoint = '') {
+  const entryPointPath = join(buildPackage.sourceDir, secondaryEntryPoint);
+  const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
+
+  return new Promise((resolve, reject) => {
+    const ngcPath = resolvePath('./node_modules/.bin/ngc');
+    const childProcess = spawn(ngcPath, ['-p', entryPointTsconfigPath], {shell: true});
+
+    // Pipe stdout and stderr from the child process.
+    childProcess.stdout.on('data', (data: any) => console.log(`${data}`));
+    childProcess.stderr.on('data', (data: any) => console.error(red(`${data}`)));
+
+    childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
+  })
+    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)))
+    .then(() => renamePrivateReExportsToBeUnique(buildPackage, secondaryEntryPoint));
+}
+
+/** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
+export function renamePrivateReExportsToBeUnique(buildPackage: BuildPackage,
+                                                  secondaryEntryPoint = '') {
+  // When we compiled the typescript sources with ngc, we do entry-point individually.
+  // If the root-level module re-exports multiple of these entry-points, the private-export
+  // identifiers (e.g., `ɵa`) generated by ngc will collide. We work around this by suffixing
+  // each of these identifiers with an ID specific to this entry point. We make this
+  // replacement in the js, d.ts, and metadata output.
+  if (buildPackage.exportsSecondaryEntryPointsAtRoot && secondaryEntryPoint) {
+    const entryPointId = nextId++;
+    const outputPath = join(buildPackage.outputDir, secondaryEntryPoint);
+    glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
+      let fileContent = readFileSync(filePath, 'utf-8');
+      fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
+      writeFileSync(filePath, fileContent, 'utf-8');
+    });
+  }
+}

From 13d0160c742cf834576407f9bfb4b8850dbeb949 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 28 Sep 2017 15:40:44 -0700
Subject: [PATCH 148/575] build: include typings/index in root metadata export
 (#7190)

---
 tools/package-tools/build-release.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/package-tools/build-release.ts b/tools/package-tools/build-release.ts
index 6eb7991e6869..87f2c4668968 100644
--- a/tools/package-tools/build-release.ts
+++ b/tools/package-tools/build-release.ts
@@ -69,7 +69,7 @@ export function composeRelease(buildPackage: BuildPackage) {
     // re-exports everything.
     createMetadataReexportFile(
         releasePath,
-        buildPackage.secondaryEntryPoints.map(p => `./${p}`),
+        buildPackage.secondaryEntryPoints.concat(['typings/index']).map(p => `./${p}`),
         name);
   }
 }

From 39c7b8124dfbdaa2db82cdcb0625b4579e3d97af Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 29 Sep 2017 06:41:05 +0800
Subject: [PATCH 149/575] chore: make accessibility demo page focus goes to
 header after clicking on links (#7188)

---
 src/demo-app/a11y/a11y.html |  5 +++--
 src/demo-app/a11y/a11y.ts   | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/demo-app/a11y/a11y.html b/src/demo-app/a11y/a11y.html
index fefa22fecac3..3a0f318264e9 100644
--- a/src/demo-app/a11y/a11y.html
+++ b/src/demo-app/a11y/a11y.html
@@ -2,11 +2,12 @@ <h1>Accessibility Demo</h1>
 
 <nav>
   <a (click)="skipNavigation()" href="javascript:void(0)">Skip navigation</a>
-  <a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]">
+  <a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]" (click)="skipNavigation()">
     {{navItem.name}}
   </a>
 </nav>
 
-<div #maincontent tabindex="0">
+<div #maincontent tabindex="-1">
+  <h1 #header tabindex="-1" *ngIf="!!currentComponent">{{currentComponent}} Demo</h1>
   <router-outlet></router-outlet>
 </div>
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index f522717c5b2e..c517d188282e 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -1,4 +1,5 @@
 import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
+import {NavigationEnd, Router} from '@angular/router';
 
 @Component({
   moduleId: module.id,
@@ -16,7 +17,10 @@ export class AccessibilityHome {}
   preserveWhitespaces: false,
 })
 export class AccessibilityDemo {
+  currentComponent: string = '';
+
   @ViewChild('maincontent') mainContent: ElementRef;
+  @ViewChild('header') sectionHeader: ElementRef;
 
   navItems = [
     {name: 'Home', route: '.'},
@@ -44,8 +48,17 @@ export class AccessibilityDemo {
     {name: 'Tooltip', route: 'tooltip'},
   ];
 
+  constructor(private router: Router) {
+    router.events.subscribe(event => {
+      let nav = this.navItems.find(navItem => {
+        let fragments = (event as NavigationEnd).url.split('/');
+        return fragments[fragments.length - 1] === navItem.route;
+      });
+      this.currentComponent = nav ? nav.name : '';
+    });
+  }
+
   skipNavigation() {
-    this.mainContent.nativeElement.scrollIntoView();
-    this.mainContent.nativeElement.focus();
+    (this.currentComponent ? this.sectionHeader : this.mainContent).nativeElement.focus();
   }
 }

From 3948381d64d5bc4b782510ff7be900b20a95ff9e Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:51:34 +0200
Subject: [PATCH 150/575] build: round payload size for comparison (#7174)

In some cases the payload is still showing up in the CI even if there was no change to the library. This seems to be because the file sizes are not rounded and can sometimes be not very exact. Resulting in numbers like: `material_fesm_2014": 1004.1319999999998`.

To have a better output in the GitHub statuses, the file size should be rounded
---
 tools/gulp/tasks/payload.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/gulp/tasks/payload.ts b/tools/gulp/tasks/payload.ts
index 7c0023245749..70fd69962067 100644
--- a/tools/gulp/tasks/payload.ts
+++ b/tools/gulp/tasks/payload.ts
@@ -93,10 +93,10 @@ async function calculatePayloadDiff(database: firebaseAdmin.database.Database, c
 
   // Calculate the payload diffs by subtracting the previous size of the FESM ES2015 bundles.
   const cdkFullSize = currentPayload.cdk_fesm_2015;
-  const cdkDiff = cdkFullSize - previousPayload.cdk_fesm_2015;
+  const cdkDiff = roundFileSize(cdkFullSize - previousPayload.cdk_fesm_2015);
 
   const materialFullSize = currentPayload.material_fesm_2015;
-  const materialDiff = materialFullSize - previousPayload.material_fesm_2015;
+  const materialDiff = roundFileSize(materialFullSize - previousPayload.material_fesm_2015);
 
   // Set the Github statuses for the packages by sending a HTTP request to the dashboard functions.
   await Promise.all([
@@ -174,3 +174,8 @@ function getCommitFromPreviousPayloadUpload(): string {
     return spawnSync('git', ['rev-parse', process.env['TRAVIS_BRANCH']]).stdout.toString().trim();
   }
 }
+
+/** Rounds the specified file size to two decimal places. */
+function roundFileSize(fileSize: number) {
+  return Math.round(fileSize * 100) / 100;
+}

From 248dee8265e6a82814a0bacc08e779776602b4b6 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 00:52:31 +0200
Subject: [PATCH 151/575] chore: remove cdk testing from rollup globals (#7169)

Previously the `missingRollupGlobals` tslint rule checked every TS file in the `src/` directory. This meant that the `@angular/cdk/testing` package from spec files needs to be added there as well.

With the recent switcht to Minimatch for our custom TSLint rules, the spec files are no longer linted and the testing package can be removed there.
---
 tools/package-tools/rollup-globals.ts | 8 ++------
 tools/tslint-rules/tsLoaderRule.js    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 3319cbb76465..e274f8d80498 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -42,7 +42,8 @@ export const rollupGlobals = {
   '@angular/common/testing': 'ng.common.testing',
   '@angular/http/testing': 'ng.http.testing',
 
-
+  // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
+  '@angular/material-examples': 'ng.materialExamples',
   '@angular/material': 'ng.material',
   '@angular/cdk': 'ng.cdk',
 
@@ -50,11 +51,6 @@ export const rollupGlobals = {
   ...rollupCdkEntryPoints,
   ...rollupMatEntryPoints,
 
-  // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
-  // TODO(devversion): remove by adding minimatch and better globbing to rules
-  '@angular/cdk/testing': 'ng.cdk.testing',
-  '@angular/material-examples': 'ng.materialExamples',
-
   'rxjs/BehaviorSubject': 'Rx',
   'rxjs/Observable': 'Rx',
   'rxjs/Subject': 'Rx',
diff --git a/tools/tslint-rules/tsLoaderRule.js b/tools/tslint-rules/tsLoaderRule.js
index 4ba565f1b9de..85cf80d6ea2a 100644
--- a/tools/tslint-rules/tsLoaderRule.js
+++ b/tools/tslint-rules/tsLoaderRule.js
@@ -10,4 +10,4 @@ require('ts-node').register({
 // Add a noop rule so tslint doesn't complain.
 exports.Rule = class Rule extends Lint.Rules.AbstractRule {
   apply() {}
-}
+};

From c021e94fcec24bff89d93cbdeff62d82472f1452 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 01:05:46 +0200
Subject: [PATCH 152/575] chore(dashboard): http function to list pull requests
 with conflicts (#6675)

Introduces a new http trigger in the Dashboard functions that returns all Pull Requests with merge conflicts. This allows us to show a list of PRs with merge conflicts in the dashboard.

To ensure that the API calls are as fast as possible, the pull requests with conflicts are queried using Github's new GraphQL API.
---
 tools/dashboard/functions/functions.ts        |  1 +
 .../dashboard/functions/github/github-api.ts  | 22 ++++++++++
 .../github/github-graphql-queries.ts          | 43 +++++++++++++++++++
 .../functions/github/github-status.ts         | 30 +++----------
 tools/dashboard/functions/package.json        |  2 +
 .../functions/pull-requests-with-conflicts.ts | 13 ++++++
 6 files changed, 87 insertions(+), 24 deletions(-)
 create mode 100644 tools/dashboard/functions/github/github-api.ts
 create mode 100644 tools/dashboard/functions/github/github-graphql-queries.ts
 create mode 100644 tools/dashboard/functions/pull-requests-with-conflicts.ts

diff --git a/tools/dashboard/functions/functions.ts b/tools/dashboard/functions/functions.ts
index ff59155dee72..82583391d20d 100644
--- a/tools/dashboard/functions/functions.ts
+++ b/tools/dashboard/functions/functions.ts
@@ -1 +1,2 @@
 export {payloadGithubStatus} from './payload-github-status';
+export {pullRequestsWithConflicts} from './pull-requests-with-conflicts';
diff --git a/tools/dashboard/functions/github/github-api.ts b/tools/dashboard/functions/github/github-api.ts
new file mode 100644
index 000000000000..0790045103cf
--- /dev/null
+++ b/tools/dashboard/functions/github/github-api.ts
@@ -0,0 +1,22 @@
+import {GraphQLClient} from 'graphql-request';
+import {config} from 'firebase-functions';
+import * as GithubApi from 'github';
+
+/** API token for the Github repository. Required to set the github status on commits and PRs. */
+const githubAccessToken = config().secret.github;
+
+/** API Endpoint for the Github API v4 using GraphQL. */
+const githubApiV4Endpoint = 'https://api.github.com/graphql';
+
+/** Export the GitHub V3 API instance that is authenticated. */
+export const githubApiV3 = new GithubApi();
+
+/** Export the GraphQL client that can be used to query the Github API v4. */
+export const githubApiV4 = new GraphQLClient(githubApiV4Endpoint, {
+  headers: {
+    Authorization: `Bearer ${githubAccessToken}`,
+  }
+});
+
+// Authenticate the Github API package with the user token.
+githubApiV3.authenticate({type: 'token', token: githubAccessToken});
diff --git a/tools/dashboard/functions/github/github-graphql-queries.ts b/tools/dashboard/functions/github/github-graphql-queries.ts
new file mode 100644
index 000000000000..a0aa582ce196
--- /dev/null
+++ b/tools/dashboard/functions/github/github-graphql-queries.ts
@@ -0,0 +1,43 @@
+import {githubApiV4} from './github-api';
+
+/** GraphQL query that finds all Pull Requests and their mergeable state. */
+const getOpenPullRequestsWithMergeableStateQuery = `
+ query getOpenPullRequestsWithMergeableState($lastCursor: String) {
+   repository(owner: "angular", name: "material2") {
+     pullRequests(states: OPEN, first: 100, after: $lastCursor) {
+       pageInfo {
+         hasNextPage,
+         endCursor
+       }
+       nodes {
+         number,
+         mergeable
+       }
+     }
+   }
+ }`;
+
+/** Pull Request node that will be returned by the Github V4 API. */
+export interface PullRequestWithMergeableState {
+  number: number;
+  mergeable: string;
+}
+
+/** Queries the GitHub API to find all open pull requests and their mergeable state. */
+export async function getOpenPullRequestsWithMergeableState()
+    : Promise<PullRequestWithMergeableState[]> {
+  const nodes: PullRequestWithMergeableState[] = [];
+  let lastData: any|null = null;
+
+  while (!lastData || lastData.repository.pullRequests.pageInfo.hasNextPage) {
+    lastData = await githubApiV4.request(getOpenPullRequestsWithMergeableStateQuery, {
+      lastCursor: lastData && lastData.repository.pullRequests.pageInfo.endCursor
+    });
+
+    nodes.push(...lastData.repository.pullRequests.nodes);
+  }
+
+  return nodes;
+}
+
+
diff --git a/tools/dashboard/functions/github/github-status.ts b/tools/dashboard/functions/github/github-status.ts
index ac02ee39787a..b0fd674ad3a2 100644
--- a/tools/dashboard/functions/github/github-status.ts
+++ b/tools/dashboard/functions/github/github-status.ts
@@ -1,10 +1,4 @@
-import {config} from 'firebase-functions';
-
-const request = require('request');
-const {version, name} = require('../package.json');
-
-/** API token for the Github repository. Required to set the github status on commits and PRs. */
-const repoToken = config().secret.github;
+import {githubApiV3} from './github-api';
 
 /** Data that must be specified to set a Github PR status. */
 export type GithubStatusData = {
@@ -18,25 +12,13 @@ export type GithubStatusData = {
 export function setGithubStatus(commitSHA: string, data: GithubStatusData) {
   const state = data.result ? 'success' : 'failure';
 
-  const requestData = {
+  return githubApiV3.repos.createStatus({
+    owner: 'angular',
+    repo: 'material2',
+    sha: commitSHA,
     state: state,
     target_url: data.url,
+    description: data.description,
     context: data.name,
-    description: data.description
-  };
-
-  const headers = {
-    'Authorization': `token ${repoToken}`,
-    'User-Agent': `${name}/${version}`
-  };
-
-  return new Promise((resolve, reject) => {
-    request({
-      url: `https://api.github.com/repos/angular/material2/statuses/${commitSHA}`,
-      method: 'POST',
-      body: requestData,
-      headers: headers,
-      json: true
-    }, (error: any, response: any) => error ? reject(error) : resolve(response.statusCode));
   });
 }
diff --git a/tools/dashboard/functions/package.json b/tools/dashboard/functions/package.json
index 5ea08a76d2c0..b51fc4c4b057 100644
--- a/tools/dashboard/functions/package.json
+++ b/tools/dashboard/functions/package.json
@@ -6,6 +6,8 @@
     "@types/jsonwebtoken": "^7.2.1",
     "firebase-admin": "~4.2.1",
     "firebase-functions": "^0.5.7",
+    "github": "^10.0.0",
+    "graphql-request": "^1.3.4",
     "jsonwebtoken": "^7.4.1",
     "request": "^2.81.0",
     "ts-node": "^3.0.6",
diff --git a/tools/dashboard/functions/pull-requests-with-conflicts.ts b/tools/dashboard/functions/pull-requests-with-conflicts.ts
new file mode 100644
index 000000000000..c0ddc7cb11a1
--- /dev/null
+++ b/tools/dashboard/functions/pull-requests-with-conflicts.ts
@@ -0,0 +1,13 @@
+import {https} from 'firebase-functions';
+import {getOpenPullRequestsWithMergeableState} from './github/github-graphql-queries';
+
+/**
+ * Firebase HTTP trigger that responds with a list of Pull Requests that have merge conflicts.
+ */
+export const pullRequestsWithConflicts = https.onRequest(async (_request, response) => {
+  const pullRequests = (await getOpenPullRequestsWithMergeableState())
+    .filter(pullRequest => pullRequest.mergeable === 'CONFLICTING');
+
+  response.status(200).json(pullRequests);
+});
+

From 1a7d0e3608f9b447c4258843baebf992eff5d92c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 01:27:36 +0200
Subject: [PATCH 153/575] chore: re-add missing button to stepper e2e spec
 (#7400)

Re-adds a button that was missing from the stepper e2e setup, causing one of the tests to fail.
---
 .../stepper-overview/stepper-overview-example.html              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/material-examples/stepper-overview/stepper-overview-example.html b/src/material-examples/stepper-overview/stepper-overview-example.html
index 433cabb09cd2..2e4b12c42600 100644
--- a/src/material-examples/stepper-overview/stepper-overview-example.html
+++ b/src/material-examples/stepper-overview/stepper-overview-example.html
@@ -1,3 +1,5 @@
+<button mat-raised-button (click)="isLinear = true" id="toggle-linear">Enable linear mode</button>
+
 <mat-horizontal-stepper [linear]="isLinear">
   <mat-step [stepControl]="firstFormGroup">
     <form [formGroup]="firstFormGroup">

From 53c42a45ca9c0c57609bcfc66446f64dec28058f Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Thu, 28 Sep 2017 16:45:21 -0700
Subject: [PATCH 154/575] chore: fix lint error in a11y demo (#7401)

---
 src/demo-app/a11y/a11y.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index c517d188282e..63f6c7c63414 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -48,7 +48,7 @@ export class AccessibilityDemo {
     {name: 'Tooltip', route: 'tooltip'},
   ];
 
-  constructor(private router: Router) {
+  constructor(router: Router) {
     router.events.subscribe(event => {
       let nav = this.navItems.find(navItem => {
         let fragments = (event as NavigationEnd).url.split('/');

From 1823b2fa8e4c69f0a19a7be23a6cd30ae42d6d4c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 21:58:12 +0200
Subject: [PATCH 155/575] fix(list-key-manager): don't focus disabled items in
 typeahead mode (#7382)

Fixes the list key manager attempting to focus disabled items in typeahead mode.
---
 src/cdk/a11y/list-key-manager.spec.ts | 10 ++++++++++
 src/cdk/a11y/list-key-manager.ts      |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index 012fa45d8e9b..ac0e83a45e91 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -481,6 +481,16 @@ describe('Key managers', () => {
         expect(keyManager.activeItem).toBe(itemList.items[0]);
       }));
 
+      it('should not focus disabled items', fakeAsync(() => {
+        expect(keyManager.activeItem).toBeFalsy();
+
+        itemList.items[0].disabled = true;
+        keyManager.onKeydown(createKeyboardEvent('keydown', 79, undefined, 'o')); // types "o"
+        tick(debounceInterval);
+
+        expect(keyManager.activeItem).toBeFalsy();
+      }));
+
     });
 
   });
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index cb8a1850518a..c3a3def7175e 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -74,7 +74,9 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
         const items = this._items.toArray();
 
         for (let i = 0; i < items.length; i++) {
-          if (items[i].getLabel!().toUpperCase().trim().indexOf(inputString) === 0) {
+          let item = items[i];
+
+          if (!item.disabled && item.getLabel!().toUpperCase().trim().indexOf(inputString) === 0) {
             this.setActiveItem(i);
             break;
           }

From cc6f39ea11be42c7b678380b095ef993dd11d3ec Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 29 Sep 2017 12:58:29 -0700
Subject: [PATCH 156/575] fix(sort): throw error on invalid direction (#7378)

---
 src/lib/sort/sort-errors.ts |  5 +++++
 src/lib/sort/sort-header.ts |  3 ++-
 src/lib/sort/sort.spec.ts   | 19 ++++++++++++++++++-
 src/lib/sort/sort.ts        | 18 +++++++++++++++---
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/lib/sort/sort-errors.ts b/src/lib/sort/sort-errors.ts
index 5fb61c38ca34..bcbc82d8f4e4 100644
--- a/src/lib/sort/sort-errors.ts
+++ b/src/lib/sort/sort-errors.ts
@@ -20,3 +20,8 @@ export function getSortHeaderNotContainedWithinSortError(): Error {
 export function getSortHeaderMissingIdError(): Error {
   return Error(`MatSortHeader must be provided with a unique id.`);
 }
+
+/** @docs-private */
+export function getSortInvalidDirectionError(direction: string): Error {
+  return Error(`${direction} is not a valid sort direction ('asc' or 'desc').`);
+}
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index b516ee6f6649..5cf719da9017 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -126,6 +126,7 @@ export class MatSortHeader implements MatSortable {
 
   /** Whether this MatSortHeader is currently sorted in either ascending or descending order. */
   _isSorted() {
-    return this._sort.active == this.id && this._sort.direction;
+    return this._sort.active == this.id &&
+        this._sort.direction === 'asc' || this._sort.direction === 'desc';
   }
 }
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index 4bc46e516d45..59d3f8df9c8a 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -20,6 +20,7 @@ import {
   getSortDuplicateSortableIdError,
   getSortHeaderMissingIdError,
   getSortHeaderNotContainedWithinSortError,
+  getSortInvalidDirectionError,
 } from './sort-errors';
 
 
@@ -37,7 +38,8 @@ describe('MatSort', () => {
         MatTableMatSortApp,
         MatSortHeaderMissingMatSortApp,
         MatSortDuplicateMatSortableIdsApp,
-        MatSortableMissingIdApp
+        MatSortableMissingIdApp,
+        MatSortableInvalidDirection
       ],
     }).compileComponents();
   }));
@@ -136,6 +138,11 @@ describe('MatSort', () => {
         .toThrowError(wrappedErrorMessage(getSortHeaderMissingIdError()));
   });
 
+  it('should throw an error if the provided direction is invalid', () => {
+    expect(() => TestBed.createComponent(MatSortableInvalidDirection).detectChanges())
+        .toThrowError(wrappedErrorMessage(getSortInvalidDirectionError('ascending')));
+  });
+
   it('should allow let MatSortable override the default sort parameters', () => {
     testSingleColumnSortDirectionSequence(
         fixture, ['asc', 'desc', '']);
@@ -333,3 +340,13 @@ class MatSortDuplicateMatSortableIdsApp { }
   `
 })
 class MatSortableMissingIdApp { }
+
+
+@Component({
+  template: `
+    <div matSort matSortDirection="ascending">
+      <div mat-sort-header="a"> A </div>
+    </div>
+  `
+})
+class MatSortableInvalidDirection { }
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index 3c5f7078dacf..c9b1225f71b2 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -6,10 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, EventEmitter, Input, Output} from '@angular/core';
+import {Directive, EventEmitter, Input, isDevMode, Output} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SortDirection} from './sort-direction';
-import {getSortDuplicateSortableIdError, getSortHeaderMissingIdError} from './sort-errors';
+import {
+  getSortInvalidDirectionError,
+  getSortDuplicateSortableIdError,
+  getSortHeaderMissingIdError
+} from './sort-errors';
 
 export interface MatSortable {
   id: string;
@@ -40,7 +44,15 @@ export class MatSort {
   @Input('matSortStart') start: 'asc' | 'desc' = 'asc';
 
   /** The sort direction of the currently active MatSortable. */
-  @Input('matSortDirection') direction: SortDirection = '';
+  @Input('matSortDirection')
+  set direction(direction: SortDirection) {
+    if (isDevMode() && direction && direction !== 'asc' && direction !== 'desc') {
+      throw getSortInvalidDirectionError(direction);
+    }
+    this._direction = direction;
+  }
+  get direction(): SortDirection { return this._direction; }
+  private _direction: SortDirection = '';
 
   /**
    * Whether to disable the user from clearing the sort by finishing the sort direction cycle.

From 75f26e86a1b8b8c98b17f6bc8ce144dc3a971ad2 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 29 Sep 2017 12:59:15 -0700
Subject: [PATCH 157/575] fix(sort): style changes to fix IE (#7375)

* fix(sort): style changes to fix IE

* Update sort-header.scss
---
 src/lib/sort/sort-header.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/sort/sort-header.scss b/src/lib/sort/sort-header.scss
index 53d333132555..25310804a255 100644
--- a/src/lib/sort/sort-header.scss
+++ b/src/lib/sort/sort-header.scss
@@ -54,6 +54,7 @@ $mat-sort-header-arrow-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1);
   align-items: center;
   position: absolute;
   top: 0;
+  left: 0;
   transition: $mat-sort-header-arrow-transition;
 }
 
@@ -72,6 +73,7 @@ $mat-sort-header-arrow-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1);
   height: $mat-sort-header-arrow-thickness;
   transition: $mat-sort-header-arrow-transition;
   position: absolute;
+  top: 0;
 }
 
 .mat-sort-header-pointer-left {

From b1ac7b096be0991611e2b7e2f8362ac3185d277c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 21:59:34 +0200
Subject: [PATCH 158/575] refactor: rename all OverlayState references to match
 the new naming (#7367)

Renames all of the "state" references in the overlays to refer to a "config" instead. This makes everything consistent with the recent rename of OverlayState to OverlayConfig.

BREAKING CHANGE: The `OverlayRef.getState` method has been renamed to `OverlayRef.getConfig`.
---
 src/cdk/overlay/overlay-config.ts            |  6 +-
 src/cdk/overlay/overlay-directives.spec.ts   |  2 +-
 src/cdk/overlay/overlay-directives.ts        |  2 +-
 src/cdk/overlay/overlay-ref.ts               | 82 ++++++++++----------
 src/cdk/overlay/overlay.spec.ts              | 58 +++++++-------
 src/cdk/overlay/overlay.ts                   | 10 +--
 src/lib/autocomplete/autocomplete-trigger.ts |  2 +-
 src/lib/datepicker/datepicker.ts             |  4 +-
 src/lib/dialog/dialog-ref.ts                 |  2 +-
 src/lib/dialog/dialog.ts                     |  8 +-
 src/lib/snack-bar/snack-bar.ts               |  8 +-
 11 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/src/cdk/overlay/overlay-config.ts b/src/cdk/overlay/overlay-config.ts
index b314847d65cb..cde1d5050da3 100644
--- a/src/cdk/overlay/overlay-config.ts
+++ b/src/cdk/overlay/overlay-config.ts
@@ -50,9 +50,9 @@ export class OverlayConfig {
   /** The direction of the text in the overlay panel. */
   direction?: Direction = 'ltr';
 
-  constructor(state?: OverlayConfig) {
-    if (state) {
-      Object.keys(state).forEach(key => this[key] = state[key]);
+  constructor(config?: OverlayConfig) {
+    if (config) {
+      Object.keys(config).forEach(key => this[key] = config[key]);
     }
   }
 }
diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index e0876038d708..2e0830acb922 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -76,7 +76,7 @@ describe('Overlay directives', () => {
     let overlayDirective = testComponent.connectedOverlayDirective;
 
     let strategy =
-        <ConnectedPositionStrategy> overlayDirective.overlayRef.getState().positionStrategy;
+        <ConnectedPositionStrategy> overlayDirective.overlayRef.getConfig().positionStrategy;
     expect(strategy instanceof ConnectedPositionStrategy).toBe(true);
 
     let positions = strategy.positions;
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index bda7b7661274..67eb87452881 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -337,7 +337,7 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
     }
 
     this._position.withDirection(this.dir);
-    this._overlayRef.getState().direction = this.dir;
+    this._overlayRef.getConfig().direction = this.dir;
     this._initEscapeListener();
 
     if (!this._overlayRef.hasAttached()) {
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 8d1eae2687f1..915104dfb3f0 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -26,11 +26,11 @@ export class OverlayRef implements PortalHost {
   constructor(
       private _portalHost: PortalHost,
       private _pane: HTMLElement,
-      private _state: OverlayConfig,
+      private _config: OverlayConfig,
       private _ngZone: NgZone) {
 
-    if (_state.scrollStrategy) {
-      _state.scrollStrategy.attach(this);
+    if (_config.scrollStrategy) {
+      _config.scrollStrategy.attach(this);
     }
   }
 
@@ -47,33 +47,33 @@ export class OverlayRef implements PortalHost {
   attach(portal: Portal<any>): any {
     let attachResult = this._portalHost.attach(portal);
 
-    if (this._state.positionStrategy) {
-      this._state.positionStrategy.attach(this);
+    if (this._config.positionStrategy) {
+      this._config.positionStrategy.attach(this);
     }
 
-    // Update the pane element with the given state configuration.
+    // Update the pane element with the given configuration.
     this._updateStackingOrder();
     this.updateSize();
     this.updateDirection();
     this.updatePosition();
 
-    if (this._state.scrollStrategy) {
-      this._state.scrollStrategy.enable();
+    if (this._config.scrollStrategy) {
+      this._config.scrollStrategy.enable();
     }
 
     // Enable pointer events for the overlay pane element.
     this._togglePointerEvents(true);
 
-    if (this._state.hasBackdrop) {
+    if (this._config.hasBackdrop) {
       this._attachBackdrop();
     }
 
-    if (this._state.panelClass) {
+    if (this._config.panelClass) {
       // We can't do a spread here, because IE doesn't support setting multiple classes.
-      if (Array.isArray(this._state.panelClass)) {
-        this._state.panelClass.forEach(cls => this._pane.classList.add(cls));
+      if (Array.isArray(this._config.panelClass)) {
+        this._config.panelClass.forEach(cls => this._pane.classList.add(cls));
       } else {
-        this._pane.classList.add(this._state.panelClass);
+        this._pane.classList.add(this._config.panelClass);
       }
     }
 
@@ -95,8 +95,8 @@ export class OverlayRef implements PortalHost {
     // pointer events therefore. Depends on the position strategy and the applied pane boundaries.
     this._togglePointerEvents(false);
 
-    if (this._state.scrollStrategy) {
-      this._state.scrollStrategy.disable();
+    if (this._config.scrollStrategy) {
+      this._config.scrollStrategy.disable();
     }
 
     let detachmentResult = this._portalHost.detach();
@@ -111,12 +111,12 @@ export class OverlayRef implements PortalHost {
    * Cleans up the overlay from the DOM.
    */
   dispose(): void {
-    if (this._state.positionStrategy) {
-      this._state.positionStrategy.dispose();
+    if (this._config.positionStrategy) {
+      this._config.positionStrategy.dispose();
     }
 
-    if (this._state.scrollStrategy) {
-      this._state.scrollStrategy.disable();
+    if (this._config.scrollStrategy) {
+      this._config.scrollStrategy.disable();
     }
 
     this.detachBackdrop();
@@ -152,48 +152,48 @@ export class OverlayRef implements PortalHost {
   }
 
   /**
-   * Gets the current state config of the overlay.
+   * Gets the current config of the overlay.
    */
-  getState(): OverlayConfig {
-    return this._state;
+  getConfig(): OverlayConfig {
+    return this._config;
   }
 
   /** Updates the position of the overlay based on the position strategy. */
   updatePosition() {
-    if (this._state.positionStrategy) {
-      this._state.positionStrategy.apply();
+    if (this._config.positionStrategy) {
+      this._config.positionStrategy.apply();
     }
   }
 
   /** Updates the text direction of the overlay panel. */
   private updateDirection() {
-    this._pane.setAttribute('dir', this._state.direction!);
+    this._pane.setAttribute('dir', this._config.direction!);
   }
 
   /** Updates the size of the overlay based on the overlay config. */
   updateSize() {
-    if (this._state.width || this._state.width === 0) {
-      this._pane.style.width = formatCssUnit(this._state.width);
+    if (this._config.width || this._config.width === 0) {
+      this._pane.style.width = formatCssUnit(this._config.width);
     }
 
-    if (this._state.height || this._state.height === 0) {
-      this._pane.style.height = formatCssUnit(this._state.height);
+    if (this._config.height || this._config.height === 0) {
+      this._pane.style.height = formatCssUnit(this._config.height);
     }
 
-    if (this._state.minWidth || this._state.minWidth === 0) {
-      this._pane.style.minWidth = formatCssUnit(this._state.minWidth);
+    if (this._config.minWidth || this._config.minWidth === 0) {
+      this._pane.style.minWidth = formatCssUnit(this._config.minWidth);
     }
 
-    if (this._state.minHeight || this._state.minHeight === 0) {
-      this._pane.style.minHeight = formatCssUnit(this._state.minHeight);
+    if (this._config.minHeight || this._config.minHeight === 0) {
+      this._pane.style.minHeight = formatCssUnit(this._config.minHeight);
     }
 
-    if (this._state.maxWidth || this._state.maxWidth === 0) {
-      this._pane.style.maxWidth = formatCssUnit(this._state.maxWidth);
+    if (this._config.maxWidth || this._config.maxWidth === 0) {
+      this._pane.style.maxWidth = formatCssUnit(this._config.maxWidth);
     }
 
-    if (this._state.maxHeight || this._state.maxHeight === 0) {
-      this._pane.style.maxHeight = formatCssUnit(this._state.maxHeight);
+    if (this._config.maxHeight || this._config.maxHeight === 0) {
+      this._pane.style.maxHeight = formatCssUnit(this._config.maxHeight);
     }
   }
 
@@ -207,8 +207,8 @@ export class OverlayRef implements PortalHost {
     this._backdropElement = document.createElement('div');
     this._backdropElement.classList.add('cdk-overlay-backdrop');
 
-    if (this._state.backdropClass) {
-      this._backdropElement.classList.add(this._state.backdropClass);
+    if (this._config.backdropClass) {
+      this._backdropElement.classList.add(this._config.backdropClass);
     }
 
     // Insert the backdrop before the pane in the DOM order,
@@ -261,8 +261,8 @@ export class OverlayRef implements PortalHost {
 
       backdropToDetach.classList.remove('cdk-overlay-backdrop-showing');
 
-      if (this._state.backdropClass) {
-        backdropToDetach.classList.remove(this._state.backdropClass);
+      if (this._config.backdropClass) {
+        backdropToDetach.classList.remove(this._config.backdropClass);
       }
 
       backdropToDetach.addEventListener('transitionend', finishDetach);
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index 6763e9432262..e8af0f9ff4ab 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -133,9 +133,9 @@ describe('Overlay', () => {
   });
 
   it('should set the direction', () => {
-    const state = new OverlayConfig({direction: 'rtl'});
+    const config = new OverlayConfig({direction: 'rtl'});
 
-    overlay.create(state).attach(componentPortal);
+    overlay.create(config).attach(componentPortal);
 
     const pane = overlayContainerElement.children[0] as HTMLElement;
     expect(pane.getAttribute('dir')).toEqual('rtl');
@@ -152,8 +152,8 @@ describe('Overlay', () => {
   });
 
   it('should emit the attachment event after everything is added to the DOM', () => {
-    let state = new OverlayConfig({hasBackdrop: true});
-    let overlayRef = overlay.create(state);
+    let config = new OverlayConfig({hasBackdrop: true});
+    let overlayRef = overlay.create(config);
 
     overlayRef.attachments().subscribe(() => {
       expect(overlayContainerElement.querySelector('pizza'))
@@ -220,99 +220,99 @@ describe('Overlay', () => {
   });
 
   describe('positioning', () => {
-    let state: OverlayConfig;
+    let config: OverlayConfig;
 
     beforeEach(() => {
-      state = new OverlayConfig();
+      config = new OverlayConfig();
     });
 
     it('should apply the positioning strategy', () => {
-      state.positionStrategy = new FakePositionStrategy();
+      config.positionStrategy = new FakePositionStrategy();
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
 
       expect(overlayContainerElement.querySelectorAll('.fake-positioned').length).toBe(1);
     });
   });
 
   describe('size', () => {
-    let state: OverlayConfig;
+    let config: OverlayConfig;
 
     beforeEach(() => {
-      state = new OverlayConfig();
+      config = new OverlayConfig();
     });
 
     it('should apply the width set in the config', () => {
-      state.width = 500;
+      config.width = 500;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.width).toEqual('500px');
     });
 
     it('should support using other units if a string width is provided', () => {
-      state.width = '200%';
+      config.width = '200%';
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.width).toEqual('200%');
     });
 
     it('should apply the height set in the config', () => {
-      state.height = 500;
+      config.height = 500;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.height).toEqual('500px');
     });
 
     it('should support using other units if a string height is provided', () => {
-      state.height = '100vh';
+      config.height = '100vh';
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.height).toEqual('100vh');
     });
 
     it('should apply the min width set in the config', () => {
-      state.minWidth = 200;
+      config.minWidth = 200;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minWidth).toEqual('200px');
     });
 
 
     it('should apply the min height set in the config', () => {
-      state.minHeight = 500;
+      config.minHeight = 500;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minHeight).toEqual('500px');
     });
 
     it('should apply the max width set in the config', () => {
-      state.maxWidth = 200;
+      config.maxWidth = 200;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.maxWidth).toEqual('200px');
     });
 
 
     it('should apply the max height set in the config', () => {
-      state.maxHeight = 500;
+      config.maxHeight = 500;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.maxHeight).toEqual('500px');
     });
 
     it('should support zero widths and heights', () => {
-      state.width = 0;
-      state.height = 0;
+      config.width = 0;
+      config.height = 0;
 
-      overlay.create(state).attach(componentPortal);
+      overlay.create(config).attach(componentPortal);
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.width).toEqual('0px');
       expect(pane.style.height).toEqual('0px');
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 1de3690e71f0..651f7e6d4f2f 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -24,8 +24,8 @@ import {ScrollStrategyOptions} from './scroll/index';
 /** Next overlay unique ID. */
 let nextUniqueId = 0;
 
-/** The default state for newly created overlays. */
-let defaultState = new OverlayConfig();
+/** The default config for newly created overlays. */
+let defaultConfig = new OverlayConfig();
 
 
 /**
@@ -48,13 +48,13 @@ export class Overlay {
 
   /**
    * Creates an overlay.
-   * @param state State to apply to the overlay.
+   * @param config Config to apply to the overlay.
    * @returns Reference to the created overlay.
    */
-  create(state: OverlayConfig = defaultState): OverlayRef {
+  create(config: OverlayConfig = defaultConfig): OverlayRef {
     const pane = this._createPaneElement();
     const portalHost = this._createPortalHost(pane);
-    return new OverlayRef(portalHost, pane, state, this._ngZone);
+    return new OverlayRef(portalHost, pane, config, this._ngZone);
   }
 
   /**
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 33d5510dcc61..9fb0e8a763b1 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -440,7 +440,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
       this._overlayRef = this._overlay.create(this._getOverlayConfig());
     } else {
       /** Update the panel width, in case the host width has changed */
-      this._overlayRef.getState().width = this._getHostWidth();
+      this._overlayRef.getConfig().width = this._getHostWidth();
       this._overlayRef.updateSize();
     }
 
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 8c9d10adafb3..cc25a957df13 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -332,7 +332,7 @@ export class MatDatepicker<D> implements OnDestroy {
 
   /** Create the popup. */
   private _createPopup(): void {
-    const overlayState = new OverlayConfig({
+    const overlayConfig = new OverlayConfig({
       positionStrategy: this._createPopupPositionStrategy(),
       hasBackdrop: true,
       backdropClass: 'mat-overlay-transparent-backdrop',
@@ -340,7 +340,7 @@ export class MatDatepicker<D> implements OnDestroy {
       scrollStrategy: this._scrollStrategy()
     });
 
-    this._popupRef = this._overlay.create(overlayState);
+    this._popupRef = this._overlay.create(overlayConfig);
   }
 
   /** Create the popup PositionStrategy. */
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 98f1c5914ca6..0c45a1060888 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -157,6 +157,6 @@ export class MatDialogRef<T> {
 
   /** Fetches the position strategy object from the overlay ref. */
   private _getPositionStrategy(): GlobalPositionStrategy {
-    return this._overlayRef.getState().positionStrategy as GlobalPositionStrategy;
+    return this._overlayRef.getConfig().positionStrategy as GlobalPositionStrategy;
   }
 }
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 7bbb1793cbb2..2f891d2372d1 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -173,16 +173,16 @@ export class MatDialog {
    * @returns A promise resolving to the OverlayRef for the created overlay.
    */
   private _createOverlay(config: MatDialogConfig): OverlayRef {
-    const overlayState = this._getOverlayState(config);
-    return this._overlay.create(overlayState);
+    const overlayConfig = this._getOverlayConfig(config);
+    return this._overlay.create(overlayConfig);
   }
 
   /**
-   * Creates an overlay state from a dialog config.
+   * Creates an overlay config from a dialog config.
    * @param dialogConfig The dialog configuration.
    * @returns The overlay configuration.
    */
-  private _getOverlayState(dialogConfig: MatDialogConfig): OverlayConfig {
+  private _getOverlayConfig(dialogConfig: MatDialogConfig): OverlayConfig {
     const state = new OverlayConfig({
       positionStrategy: this._overlay.position().global(),
       scrollStrategy: this._scrollStrategy(),
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 25635acfddd8..6fc6c9a147b9 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -152,8 +152,8 @@ export class MatSnackBar {
    * @param config The user-specified snack bar config.
    */
   private _createOverlay(config: MatSnackBarConfig): OverlayRef {
-    const state = new OverlayConfig();
-    state.direction = config.direction;
+    const overlayConfig = new OverlayConfig();
+    overlayConfig.direction = config.direction;
 
     let positionStrategy = this._overlay.position().global();
     // Set horizontal position.
@@ -177,8 +177,8 @@ export class MatSnackBar {
       positionStrategy.bottom('0');
     }
 
-    state.positionStrategy = positionStrategy;
-    return this._overlay.create(state);
+    overlayConfig.positionStrategy = positionStrategy;
+    return this._overlay.create(overlayConfig);
   }
 
   /**

From 2e71cac8a7b5da246276c5bb919356ab21ff465b Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 29 Sep 2017 12:59:51 -0700
Subject: [PATCH 159/575] fix(select): prevent nbsp from getting butchered in
 AOT (#7363)

---
 src/lib/select/select.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index b16a0b2e959e..fca93137357a 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -9,7 +9,7 @@
       TODO(mmalerba): &nbsp; is currently broken in components with preserveWhitespace: false, so we
       evaluate it as a JS string binding instead. Change back to &nbsp; once it works again.
     -->
-    <ng-container *ngIf="empty">{{'\xa0'}}</ng-container>
+    <ng-container *ngIf="empty">{{'\u00A0'}}</ng-container>
     <span class="mat-select-value-text" *ngIf="!empty" [ngSwitch]="!!customTrigger">
       <span *ngSwitchDefault>{{ triggerValue }}</span>
       <ng-content select="mat-select-trigger" *ngSwitchCase="true"></ng-content>

From 505611049e3162d42e96cfa968d0a5a11c65062d Mon Sep 17 00:00:00 2001
From: Adam <admosity@users.noreply.github.com>
Date: Fri, 29 Sep 2017 16:00:07 -0400
Subject: [PATCH 160/575] chore(table): remove redundant condition (#7345)

---
 src/cdk/table/row.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 989355a209dd..e0c8b7bc3046 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -44,7 +44,7 @@ export abstract class BaseRowDef {
     // Create a new columns differ if one does not yet exist. Initialize it based on initial value
     // of the columns property or an empty array if none is provided.
     const columns = changes['columns'].currentValue || [];
-    if (!this._columnsDiffer && columns) {
+    if (!this._columnsDiffer) {
       this._columnsDiffer = this._differs.find(columns).create();
       this._columnsDiffer.diff(columns);
     }

From 6b70ca6ce3ab0d65964381a741d100a07c8dd7b0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:00:40 +0200
Subject: [PATCH 161/575] fix(select): theme not being transferred to the panel
 (#7342)

* Fixes the theme from the form field not being transferred to the panel, causing the options to have the wrong color. This seems to have happened during the switch to the form field, but interestingly AoT didn't catch us not having a `color` anymore (possible because it's in a binding expression).
* Moves a test to another test suite since it doesn't belong with the theming tests.
---
 src/lib/select/select.html    |  2 +-
 src/lib/select/select.spec.ts | 36 +++++++++++++++++++----------------
 src/lib/select/select.ts      |  8 +++++++-
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index fca93137357a..7782c2192349 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -34,7 +34,7 @@
   (detach)="close()">
 
   <div
-    class="mat-select-panel {{ 'mat-' + color }}"
+    class="mat-select-panel {{ _getPanelTheme() }}"
     [ngClass]="panelClass"
     [@transformPanel]="multiple ? 'showing-multiple' : 'showing'"
     (@transformPanel.done)="_onPanelDone()"
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 5285279db833..e6fc6bbe910b 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -2275,6 +2275,19 @@ describe('MatSelect', () => {
 
       expect(() => fixture.componentInstance.select.triggerValue).not.toThrow();
     });
+
+    it('should allow the user to customize the label', () => {
+      const fixture = TestBed.createComponent(SelectWithCustomTrigger);
+      fixture.detectChanges();
+
+      fixture.componentInstance.control.setValue('pizza-1');
+      fixture.detectChanges();
+
+      const label = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
+
+      expect(label.textContent).toContain('azziP',
+          'Expected the displayed text to be "Pizza" in reverse.');
+    });
   });
 
   describe('change event', () => {
@@ -2622,30 +2635,21 @@ describe('MatSelect', () => {
 
   describe('theming', () => {
     let fixture: ComponentFixture<BasicSelectWithTheming>;
-    let testInstance: BasicSelectWithTheming;
-    let selectElement: HTMLElement;
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(BasicSelectWithTheming);
-      testInstance = fixture.componentInstance;
       fixture.detectChanges();
-
-      selectElement = fixture.debugElement.query(By.css('.mat-select')).nativeElement;
     }));
 
-    it('should allow the user to customize the label', () => {
-      fixture.destroy();
-
-      const labelFixture = TestBed.createComponent(SelectWithCustomTrigger);
-      labelFixture.detectChanges();
-
-      labelFixture.componentInstance.control.setValue('pizza-1');
-      labelFixture.detectChanges();
+    it('should transfer the theme to the select panel', () => {
+      fixture.componentInstance.theme = 'warn';
+      fixture.detectChanges();
 
-      const label = labelFixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
+      fixture.componentInstance.select.open();
+      fixture.detectChanges();
 
-      expect(label.textContent).toContain('azziP',
-          'Expected the displayed text to be "Pizza" in reverse.');
+      const panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
+      expect(panel.classList).toContain('mat-warn');
     });
   });
 
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 7869b73dc543..7e5dfacbb073 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -55,7 +55,7 @@ import {
   mixinDisabled,
   mixinTabIndex,
 } from '@angular/material/core';
-import {MatFormFieldControl} from '@angular/material/form-field';
+import {MatFormField, MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
@@ -410,6 +410,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     @Optional() private _dir: Directionality,
     @Optional() private _parentForm: NgForm,
     @Optional() private _parentFormGroup: FormGroupDirective,
+    @Optional() private _parentFormField: MatFormField,
     @Self() @Optional() public ngControl: NgControl,
     @Attribute('tabindex') tabIndex: string,
     @Inject(MAT_SELECT_SCROLL_STRATEGY) private _scrollStrategyFactory) {
@@ -641,6 +642,11 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._setScrollTop();
   }
 
+  /** Returns the theme to be used on the panel. */
+  _getPanelTheme(): string {
+    return this._parentFormField ? `mat-${this._parentFormField.color}` : '';
+  }
+
   /** Whether the select has a value. */
   get empty(): boolean {
     return !this._selectionModel || this._selectionModel.isEmpty();

From f1664687a7a0ebd377e2a29bcd3f726f948a6d9a Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 29 Sep 2017 13:00:52 -0700
Subject: [PATCH 162/575] fix(chips): fix chip list focus and keyboard
 behaviors (#7319)

---
 src/lib/chips/chip-list.spec.ts | 12 ++++++------
 src/lib/chips/chip-list.ts      |  8 +++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index bb9a5b33eb71..5b7e9e2e25e5 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -279,7 +279,7 @@ describe('MatChipList', () => {
 
       describe('when the input has focus', () => {
 
-        it('should focus the last chip when press DELETE', () => {
+        it('should not focus the last chip when press DELETE', () => {
           let nativeInput = fixture.nativeElement.querySelector('input');
           let DELETE_EVENT: KeyboardEvent =
               createKeyboardEvent('keydown', DELETE, nativeInput);
@@ -292,8 +292,8 @@ describe('MatChipList', () => {
           chipListInstance._keydown(DELETE_EVENT);
           fixture.detectChanges();
 
-          // It focuses the last chip
-          expect(manager.activeItemIndex).toEqual(chips.length - 1);
+          // It doesn't focus the last chip
+          expect(manager.activeItemIndex).toEqual(-1);
         });
 
         it('should focus the last chip when press BACKSPACE', () => {
@@ -786,7 +786,7 @@ describe('MatChipList', () => {
 
       describe('when the input has focus', () => {
 
-        it('should focus the last chip when press DELETE', () => {
+        it('should not focus the last chip when press DELETE', () => {
           let nativeInput = fixture.nativeElement.querySelector('input');
           let DELETE_EVENT: KeyboardEvent =
             createKeyboardEvent('keydown', DELETE, nativeInput);
@@ -799,8 +799,8 @@ describe('MatChipList', () => {
           chipListInstance._keydown(DELETE_EVENT);
           fixture.detectChanges();
 
-          // It focuses the last chip
-          expect(manager.activeItemIndex).toEqual(chips.length - 1);
+          // It doesn't focus the last chip
+          expect(manager.activeItemIndex).toEqual(-1);
         });
 
         it('should focus the last chip when press BACKSPACE', () => {
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index ae7bdfe0b177..879d1cda432b 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -10,7 +10,7 @@ import {FocusKeyManager} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
-import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW} from '@angular/cdk/keycodes';
+import {BACKSPACE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
 import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
@@ -432,8 +432,8 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
 
     let isPrevKey = (code === (isRtl ? RIGHT_ARROW : LEFT_ARROW));
     let isNextKey = (code === (isRtl ? LEFT_ARROW : RIGHT_ARROW));
-    let isBackKey = (code === BACKSPACE || code == DELETE || code == UP_ARROW || isPrevKey);
-    // If they are on an empty input and hit backspace/delete/left arrow, focus the last chip
+    let isBackKey = code === BACKSPACE;
+    // If they are on an empty input and hit backspace, focus the last chip
     if (isInputEmpty && isBackKey) {
       this._keyManager.setLastItemActive();
       event.preventDefault();
@@ -504,8 +504,6 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
       if (focusChip) {
         focusChip.focus();
       }
-    } else if (chipsArray.length === 0) {
-      this._focusInput();
     }
 
     // Reset our destroyed index

From d05dcfa492df3fb0fcf119ddfb72ffb94529ebeb Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 29 Sep 2017 13:01:22 -0700
Subject: [PATCH 163/575] fix(sidenav): change content from md- to mat- (#7307)


From 92a868e40b998448c6bcd47aef83ed37514098ac Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:01:39 +0200
Subject: [PATCH 164/575] fix(button): allow for elevation to be overwritten
 (#7305)

Allows for the consumer to set the button elevation through the elevation classes, similarly to the menu, card and expansion components.

Fixes #7264.
---
 src/lib/button/_button-base.scss       |  8 ++++----
 src/lib/card/card.scss                 |  5 +----
 src/lib/core/_core.scss                |  2 +-
 src/lib/core/style/_elevation.scss     | 11 +++++++++++
 src/lib/core/style/_menu-common.scss   |  7 +------
 src/lib/expansion/expansion-panel.scss |  5 +----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/lib/button/_button-base.scss b/src/lib/button/_button-base.scss
index cb15d5391fbb..44b9e39e3aa8 100644
--- a/src/lib/button/_button-base.scss
+++ b/src/lib/button/_button-base.scss
@@ -66,7 +66,7 @@ $mat-mini-fab-padding: 8px !default;
 %mat-raised-button {
   @extend %mat-button-base;
 
-  @include mat-elevation(2);
+  @include mat-overridable-elevation(2);
 
   // Force hardware acceleration.
   transform: translate3d(0, 0, 0);
@@ -76,7 +76,7 @@ $mat-mini-fab-padding: 8px !default;
               mat-elevation-transition-property-value();
 
   &:not([disabled]):active {
-    @include mat-elevation(8);
+    @include mat-overridable-elevation(8);
   }
 
   &[disabled] {
@@ -88,7 +88,7 @@ $mat-mini-fab-padding: 8px !default;
 @mixin mat-fab($size, $padding) {
   @extend %mat-raised-button;
 
-  @include mat-elevation(6);
+  @include mat-overridable-elevation(6);
 
   // Reset the min-width from the button base.
   min-width: 0;
@@ -101,7 +101,7 @@ $mat-mini-fab-padding: 8px !default;
   flex-shrink: 0;
 
   &:not([disabled]):active {
-    @include mat-elevation(12);
+    @include mat-overridable-elevation(12);
   }
 
   .mat-button-wrapper {
diff --git a/src/lib/card/card.scss b/src/lib/card/card.scss
index 584fef8af43c..cb627b841a9e 100644
--- a/src/lib/card/card.scss
+++ b/src/lib/card/card.scss
@@ -10,15 +10,12 @@ $mat-card-header-size: 40px !default;
 
 .mat-card {
   @include mat-elevation-transition;
+  @include mat-overridable-elevation(2);
   display: block;
   position: relative;
   padding: $mat-card-default-padding;
   border-radius: $mat-card-border-radius;
 
-  &:not([class*='mat-elevation-z']) {
-    @include mat-elevation(2);
-  }
-
   @include cdk-high-contrast {
     outline: solid 1px;
   }
diff --git a/src/lib/core/_core.scss b/src/lib/core/_core.scss
index 7a4372719261..a4aef3daca70 100644
--- a/src/lib/core/_core.scss
+++ b/src/lib/core/_core.scss
@@ -19,7 +19,7 @@
   // `mat-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the element is
   // elevated.
   @for $zValue from 0 through 24 {
-    .mat-elevation-z#{$zValue} {
+    .#{$_mat-elevation-prefix}#{$zValue} {
       @include mat-elevation($zValue);
     }
   }
diff --git a/src/lib/core/style/_elevation.scss b/src/lib/core/style/_elevation.scss
index 80dff61f1860..c8fa0de039ac 100644
--- a/src/lib/core/style/_elevation.scss
+++ b/src/lib/core/style/_elevation.scss
@@ -126,6 +126,9 @@ $mat-elevation-transition-duration: 280ms !default;
 // The default easing value for elevation transitions.
 $mat-elevation-transition-timing-function: $mat-fast-out-slow-in-timing-function;
 
+// Prefix for elevation-related selectors.
+$_mat-elevation-prefix: 'mat-elevation-z';
+
 // Applies the correct css rules to an element to give it the elevation specified by $zValue.
 // The $zValue must be between 0 and 24.
 @mixin mat-elevation($zValue) {
@@ -141,6 +144,14 @@ $mat-elevation-transition-timing-function: $mat-fast-out-slow-in-timing-function
               #{map-get($_ambient-elevation-map, $zValue)};
 }
 
+// Applies the elevation to an element in a manner that allows
+// consumers to override it via the Material elevation classes.
+@mixin mat-overridable-elevation($zValue) {
+  &:not([class*='#{$_mat-elevation-prefix}']) {
+    @include mat-elevation($zValue);
+  }
+}
+
 // Returns a string that can be used as the value for a transition property for elevation.
 // Calling this function directly is useful in situations where a component needs to transition
 // more than one property.
diff --git a/src/lib/core/style/_menu-common.scss b/src/lib/core/style/_menu-common.scss
index ba363b1bcaa9..74800cfec21f 100644
--- a/src/lib/core/style/_menu-common.scss
+++ b/src/lib/core/style/_menu-common.scss
@@ -14,14 +14,9 @@ $mat-menu-icon-margin: 16px !default;
 
 
 @mixin mat-menu-base($default-elevation) {
+  @include mat-overridable-elevation($default-elevation);
   min-width: $mat-menu-overlay-min-width;
   max-width: $mat-menu-overlay-max-width;
-
-  // Allow elevation to be overwritten.
-  &:not([class*='mat-elevation-z']) {
-    @include mat-elevation($default-elevation);
-  }
-
   overflow: auto;
   -webkit-overflow-scrolling: touch;   // for momentum scroll on mobile
 }
diff --git a/src/lib/expansion/expansion-panel.scss b/src/lib/expansion/expansion-panel.scss
index cbaa59dc7fbf..24215855ddeb 100644
--- a/src/lib/expansion/expansion-panel.scss
+++ b/src/lib/expansion/expansion-panel.scss
@@ -3,14 +3,11 @@
 
 .mat-expansion-panel {
   @include mat-elevation-transition;
+  @include mat-overridable-elevation(2);
   box-sizing: content-box;
   display: block;
   margin: 0;
   transition: margin 225ms $mat-fast-out-slow-in-timing-function;
-
-  &:not([class*='mat-elevation-z']) {
-    @include mat-elevation(2);
-  }
 }
 
 .mat-expansion-panel-content {

From fe0864b8a9bce04a6cd50f4c8195ec2cfe013499 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:03:29 +0200
Subject: [PATCH 165/575] fix(ripple): handle touch events (#7299)

* fix(ripple): handle touch events

* Ripples are now launched on touchstart for touch devices. Before they were just launched after the click happened.

Fixes #7062

* Address feedback
---
 src/cdk/testing/dispatch-events.ts     | 12 +++++++-
 src/cdk/testing/event-objects.ts       | 20 ++++++++++++-
 src/lib/core/ripple/ripple-renderer.ts | 41 +++++++++++++++++---------
 src/lib/core/ripple/ripple.spec.ts     | 16 +++++++++-
 4 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/src/cdk/testing/dispatch-events.ts b/src/cdk/testing/dispatch-events.ts
index f815fce1a4b9..9163c33db07f 100644
--- a/src/cdk/testing/dispatch-events.ts
+++ b/src/cdk/testing/dispatch-events.ts
@@ -6,7 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {createFakeEvent, createKeyboardEvent, createMouseEvent} from './event-objects';
+import {
+  createFakeEvent,
+  createKeyboardEvent,
+  createMouseEvent,
+  createTouchEvent
+} from './event-objects';
 
 /** Utility to dispatch any event on a Node. */
 export function dispatchEvent(node: Node | Window, event: Event): Event {
@@ -29,3 +34,8 @@ export function dispatchMouseEvent(node: Node, type: string, x = 0, y = 0,
   event = createMouseEvent(type, x, y)): MouseEvent {
   return dispatchEvent(node, event) as MouseEvent;
 }
+
+/** Shorthand to dispatch a touch event on the specified coordinates. */
+export function dispatchTouchEvent(node: Node, type: string, x = 0, y = 0) {
+  return dispatchEvent(node, createTouchEvent(type, x, y));
+}
diff --git a/src/cdk/testing/event-objects.ts b/src/cdk/testing/event-objects.ts
index 856aad2f09f4..7b2fe2407bc4 100644
--- a/src/cdk/testing/event-objects.ts
+++ b/src/cdk/testing/event-objects.ts
@@ -8,7 +8,7 @@
 
 /** Creates a browser MouseEvent with the specified options. */
 export function createMouseEvent(type: string, x = 0, y = 0) {
-  let event = document.createEvent('MouseEvent');
+  const event = document.createEvent('MouseEvent');
 
   event.initMouseEvent(type,
     false, /* canBubble */
@@ -29,6 +29,24 @@ export function createMouseEvent(type: string, x = 0, y = 0) {
   return event;
 }
 
+/** Creates a browser TouchEvent with the specified pointer coordinates. */
+export function createTouchEvent(type: string, pageX = 0, pageY = 0) {
+  // In favor of creating events that work for most of the browsers, the event is created
+  // as a basic UI Event. The necessary details for the event will be set manually.
+  const event = document.createEvent('UIEvent');
+  const touchDetails = {pageX, pageY};
+
+  event.initUIEvent(type, true, true, window, 0);
+
+  // Most of the browsers don't have a "initTouchEvent" method that can be used to define
+  // the touch details.
+  Object.defineProperties(event, {
+    touches: {value: [touchDetails]}
+  });
+
+  return event;
+}
+
 /** Dispatches a keydown event from an element. */
 export function createKeyboardEvent(type: string, keyCode: number, target?: Element, key?: string) {
   let event = document.createEvent('KeyboardEvent') as any;
diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
index b6875b691ac3..1ab8013123ee 100644
--- a/src/lib/core/ripple/ripple-renderer.ts
+++ b/src/lib/core/ripple/ripple-renderer.ts
@@ -41,8 +41,8 @@ export class RippleRenderer {
   /** Element which triggers the ripple elements on mouse events. */
   private _triggerElement: HTMLElement | null;
 
-  /** Whether the mouse is currently down or not. */
-  private _isMousedown: boolean = false;
+  /** Whether the pointer is currently being held on the trigger or not. */
+  private _isPointerDown: boolean = false;
 
   /** Events to be registered on the trigger element. */
   private _triggerEvents = new Map<string, any>();
@@ -67,8 +67,12 @@ export class RippleRenderer {
 
       // Specify events which need to be registered on the trigger.
       this._triggerEvents.set('mousedown', this.onMousedown.bind(this));
-      this._triggerEvents.set('mouseup', this.onMouseup.bind(this));
-      this._triggerEvents.set('mouseleave', this.onMouseLeave.bind(this));
+      this._triggerEvents.set('touchstart', this.onTouchstart.bind(this));
+
+      this._triggerEvents.set('mouseup', this.onPointerUp.bind(this));
+      this._triggerEvents.set('touchend', this.onPointerUp.bind(this));
+
+      this._triggerEvents.set('mouseleave', this.onPointerLeave.bind(this));
 
       // By default use the host element as trigger element.
       this.setTriggerElement(this._containerElement);
@@ -128,7 +132,7 @@ export class RippleRenderer {
     this.runTimeoutOutsideZone(() => {
       rippleRef.state = RippleState.VISIBLE;
 
-      if (!config.persistent && !this._isMousedown) {
+      if (!config.persistent && !this._isPointerDown) {
         rippleRef.fadeOut();
       }
     }, duration);
@@ -181,17 +185,17 @@ export class RippleRenderer {
     this._triggerElement = element;
   }
 
-  /** Listener being called on mousedown event. */
+  /** Function being called whenever the trigger is being pressed. */
   private onMousedown(event: MouseEvent) {
     if (!this.rippleDisabled) {
-      this._isMousedown = true;
+      this._isPointerDown = true;
       this.fadeInRipple(event.pageX, event.pageY, this.rippleConfig);
     }
   }
 
-  /** Listener being called on mouseup event. */
-  private onMouseup() {
-    this._isMousedown = false;
+  /** Function being called whenever the pointer is being released. */
+  private onPointerUp() {
+    this._isPointerDown = false;
 
     // Fade-out all ripples that are completely visible and not persistent.
     this._activeRipples.forEach(ripple => {
@@ -201,10 +205,19 @@ export class RippleRenderer {
     });
   }
 
-  /** Listener being called on mouseleave event. */
-  private onMouseLeave() {
-    if (this._isMousedown) {
-      this.onMouseup();
+  /** Function being called whenever the pointer leaves the trigger. */
+  private onPointerLeave() {
+    if (this._isPointerDown) {
+      this.onPointerUp();
+    }
+  }
+
+  /** Function being called whenever the trigger is being touched. */
+  private onTouchstart(event: TouchEvent) {
+    if (!this.rippleDisabled) {
+      const {pageX, pageY} = event.touches[0];
+      this._isPointerDown = true;
+      this.fadeInRipple(pageX, pageY, this.rippleConfig);
     }
   }
 
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index 765637567fe8..d12613b5fe66 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -2,7 +2,7 @@ import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/
 import {Component, ViewChild} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
 import {ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchMouseEvent} from '@angular/cdk/testing';
+import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
   MatRipple, MatRippleModule, MAT_RIPPLE_GLOBAL_OPTIONS, RippleState, RippleGlobalOptions
@@ -107,6 +107,20 @@ describe('MatRipple', () => {
       expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(2);
     });
 
+    it('should launch ripples on touchstart', fakeAsync(() => {
+      dispatchTouchEvent(rippleTarget, 'touchstart');
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
+
+      tick(RIPPLE_FADE_IN_DURATION);
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
+
+      dispatchTouchEvent(rippleTarget, 'touchend');
+
+      tick(RIPPLE_FADE_OUT_DURATION);
+
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
+    }));
+
     it('removes ripple after timeout', fakeAsync(() => {
       dispatchMouseEvent(rippleTarget, 'mousedown');
       dispatchMouseEvent(rippleTarget, 'mouseup');

From ce6cc0bb78d93c9dddbb5b34831092905e2af387 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 29 Sep 2017 13:03:44 -0700
Subject: [PATCH 166/575] Make `isFocusTrapEnabled` internal, removing it from
 docs. (#7298)

BREAKING CHANGE: `isFocusTrapEnabled` is now properly marked internal.
---
 src/cdk/a11y/focus-trap.spec.ts | 6 +++---
 src/lib/sidenav/drawer.ts       | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cdk/a11y/focus-trap.spec.ts b/src/cdk/a11y/focus-trap.spec.ts
index 4ccae5688498..debc77a138f4 100644
--- a/src/cdk/a11y/focus-trap.spec.ts
+++ b/src/cdk/a11y/focus-trap.spec.ts
@@ -103,7 +103,7 @@ describe('FocusTrap', () => {
 
       expect(anchors.every(current => current.getAttribute('tabindex') === '0')).toBe(true);
 
-      fixture.componentInstance.isFocusTrapEnabled = false;
+      fixture.componentInstance._isFocusTrapEnabled = false;
       fixture.detectChanges();
 
       expect(anchors.every(current => current.getAttribute('tabindex') === '-1')).toBe(true);
@@ -172,7 +172,7 @@ class SimpleFocusTrap {
 
 @Component({
   template: `
-    <div *ngIf="renderFocusTrap" [cdkTrapFocus]="isFocusTrapEnabled">
+    <div *ngIf="renderFocusTrap" [cdkTrapFocus]="_isFocusTrapEnabled">
       <input>
       <button>SAVE</button>
     </div>
@@ -181,7 +181,7 @@ class SimpleFocusTrap {
 class FocusTrapWithBindings {
   @ViewChild(FocusTrapDirective) focusTrapDirective: FocusTrapDirective;
   renderFocusTrap = true;
-  isFocusTrapEnabled = true;
+  _isFocusTrapEnabled = true;
 }
 
 
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 9cf024098eb5..deb90d49abb2 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -211,7 +211,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
    */
   _modeChanged = new Subject();
 
-  get isFocusTrapEnabled() {
+  get _isFocusTrapEnabled() {
     // The focus trap is only enabled when the drawer is open in any mode other than side.
     return this.opened && this.mode !== 'side';
   }
@@ -224,7 +224,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
         this._elementFocusedBeforeDrawerWasOpened = this._doc.activeElement as HTMLElement;
       }
 
-      if (this.isFocusTrapEnabled && this._focusTrap) {
+      if (this._isFocusTrapEnabled && this._focusTrap) {
         this._focusTrap.focusInitialElementWhenReady();
       }
     });
@@ -251,7 +251,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
 
   ngAfterContentInit() {
     this._focusTrap = this._focusTrapFactory.create(this._elementRef.nativeElement);
-    this._focusTrap.enabled = this.isFocusTrapEnabled;
+    this._focusTrap.enabled = this._isFocusTrapEnabled;
     this._enableAnimations = true;
   }
 
@@ -301,7 +301,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
       });
 
       if (this._focusTrap) {
-        this._focusTrap.enabled = this.isFocusTrapEnabled;
+        this._focusTrap.enabled = this._isFocusTrapEnabled;
       }
     }
 

From 86bea9174b68c86a9c7bdd8c9c61be2d287014f9 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:04:13 +0200
Subject: [PATCH 167/575] fix(select): losing focus when selecting values
 through binding (#7296)

Fixes an issue that caused focus to be lost after selecting a value on a select that doesn't use Angular forms.

Fixes #7092.
---
 src/lib/select/select.spec.ts | 15 +++++++++++++++
 src/lib/select/select.ts      |  6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index e6fc6bbe910b..57e9d54b2cef 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -872,6 +872,21 @@ describe('MatSelect', () => {
       expect(trigger.textContent).toContain('Steak, Pizza, Sandwich');
     });
 
+    it('should restore focus to the host element', () => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
+
+      fixture.detectChanges();
+      fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
+      fixture.detectChanges();
+
+      (overlayContainerElement.querySelector('md-option') as HTMLElement).click();
+      fixture.detectChanges();
+
+      const select = fixture.debugElement.nativeElement.querySelector('md-select');
+
+      expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
+    });
+
   });
 
   describe('disabled behavior', () => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 7e5dfacbb073..634617007a51 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -351,8 +351,10 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   @Input()
   get value() { return this._value; }
   set value(newValue: any) {
-    this.writeValue(newValue);
-    this._value = newValue;
+    if (newValue !== this._value) {
+      this.writeValue(newValue);
+      this._value = newValue;
+    }
   }
   private _value: any;
 

From d9ba13fc590294032c374ad822e6fa637b7d3fee Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 29 Sep 2017 13:04:25 -0700
Subject: [PATCH 168/575] fix(chips): do not set chips value if there's no
 ngControl or value (#7285)

---
 src/lib/chips/chip-list.spec.ts | 34 +++++++++++++++++++++++++++++++++
 src/lib/chips/chip-list.ts      |  6 ++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 5b7e9e2e25e5..ba9ca9c80a43 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -41,6 +41,7 @@ describe('MatChipList', () => {
         InputChipList,
         MultiSelectionChipList,
         FalsyValueChipList,
+        SelectedChipList
       ],
       providers: [{
         provide: Directionality, useFactory: () => {
@@ -63,6 +64,21 @@ describe('MatChipList', () => {
       });
     });
 
+    describe('with selected chips', () => {
+      beforeEach(async(() => {
+        fixture = TestBed.createComponent(SelectedChipList);
+        fixture.detectChanges();
+      }));
+
+      it('should not override chips selected', () => {
+        const instanceChips = fixture.componentInstance.chips.toArray();
+
+        expect(instanceChips[0].selected).toBe(true, 'Expected first option to be selected.');
+        expect(instanceChips[1].selected).toBe(false, 'Expected second option to be not selected.');
+        expect(instanceChips[2].selected).toBe(true, 'Expected third option to be selected.');
+      });
+    });
+
     describe('focus behaviors', () => {
       beforeEach(async(() => {
         setupStandardList();
@@ -1027,3 +1043,21 @@ class FalsyValueChipList {
   control = new FormControl();
   @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
+
+@Component({
+  template: `
+    <mat-chip-list>
+        <mat-chip *ngFor="let food of foods" [value]="food.value" [selected]="food.selected">
+            {{ food.viewValue }}
+        </mat-chip>
+    </mat-chip-list>
+  `
+})
+class SelectedChipList {
+  foods: any[] = [
+    { value: 0, viewValue: 'Steak', selected: true },
+    { value: 1, viewValue: 'Pizza', selected: false },
+    { value: 2, viewValue: 'Pasta', selected: true },
+  ];
+  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+}
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 879d1cda432b..844315d01eb7 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -570,8 +570,10 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
     // Defer setting the value in order to avoid the "Expression
     // has changed after it was checked" errors from Angular.
     Promise.resolve().then(() => {
-      this._setSelectionByValue(this.ngControl ? this.ngControl.value : this._value, false);
-      this.stateChanges.next();
+      if (this.ngControl || this._value) {
+        this._setSelectionByValue(this.ngControl ? this.ngControl.value : this._value, false);
+        this.stateChanges.next();
+      }
     });
   }
 

From 4122ae2b101bd7c2e5f16fa47bfc65403576dc96 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:04:33 +0200
Subject: [PATCH 169/575] fix(stepper): align appearance with spec (#7279)

Aligns the stepper appearance closer to the spec by:
* Removing the focused background when focused by mouse. Now it only shows up for programmatic and keyboard focus.
* Adding ripples to the step header.
* Using a slightly heavier font font the active step.
* Using `cursor: pointer` to show that the step is clickable.

Fixes #7260.
---
 src/lib/stepper/_stepper-theme.scss | 17 ++++++++++++++++-
 src/lib/stepper/step-header.html    |  4 +++-
 src/lib/stepper/step-header.scss    | 14 ++++++++++++++
 src/lib/stepper/step-header.ts      | 22 ++++++++++++++++++++--
 src/lib/stepper/stepper-module.ts   |  7 +++++--
 src/lib/stepper/stepper.scss        |  5 -----
 6 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/lib/stepper/_stepper-theme.scss b/src/lib/stepper/_stepper-theme.scss
index c7b17278a122..47458fb80614 100644
--- a/src/lib/stepper/_stepper-theme.scss
+++ b/src/lib/stepper/_stepper-theme.scss
@@ -8,7 +8,8 @@
   $primary: map-get($theme, primary);
 
   .mat-step-header {
-    &:focus,
+    &.cdk-keyboard-focused,
+    &.cdk-program-focused,
     &:hover {
       background-color: mat-color($background, hover);
     }
@@ -50,4 +51,18 @@
   .mat-stepper-vertical, .mat-stepper-horizontal {
     font-family: mat-font-family($config);
   }
+
+  .mat-step-label {
+    font: {
+      size: mat-font-size($config, body-1);
+      weight: mat-font-weight($config, body-1);
+    };
+  }
+
+  .mat-step-label-selected {
+    font: {
+      size: mat-font-size($config, body-2);
+      weight: mat-font-weight($config, body-2);
+    };
+  }
 }
diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index 57b983544512..580a382e4b22 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -1,3 +1,4 @@
+<div class="mat-step-header-ripple" mat-ripple [matRippleTrigger]="_getHostElement()"></div>
 <div [class.mat-step-icon]="icon !== 'number' || selected"
      [class.mat-step-icon-not-touched]="icon == 'number' && !selected"
      [ngSwitch]="icon">
@@ -6,7 +7,8 @@
   <mat-icon *ngSwitchCase="'done'">done</mat-icon>
 </div>
 <div class="mat-step-label"
-     [class.mat-step-label-active]="active">
+     [class.mat-step-label-active]="active"
+     [class.mat-step-label-selected]="selected">
   <!-- If there is a label template, use it. -->
   <ng-container *ngIf="_templateLabel()" [ngTemplateOutlet]="label.template">
   </ng-container>
diff --git a/src/lib/stepper/step-header.scss b/src/lib/stepper/step-header.scss
index 33cb813902ac..6d775486c4d0 100644
--- a/src/lib/stepper/step-header.scss
+++ b/src/lib/stepper/step-header.scss
@@ -1,3 +1,5 @@
+@import '../core/style/layout-common';
+
 $mat-stepper-label-header-height: 24px !default;
 $mat-stepper-label-min-width: 50px !default;
 $mat-stepper-side-gap: 24px !default;
@@ -6,6 +8,13 @@ $mat-stepper-line-gap: 8px !default;
 $mat-step-optional-font-size: 12px;
 $mat-step-header-icon-size: 16px !default;
 
+.mat-step-header {
+  overflow: hidden;
+  outline: none;
+  cursor: pointer;
+  position: relative;
+}
+
 .mat-step-optional {
   font-size: $mat-step-optional-font-size;
 }
@@ -39,3 +48,8 @@ $mat-step-header-icon-size: 16px !default;
   text-overflow: ellipsis;
   overflow: hidden;
 }
+
+.mat-step-header-ripple {
+  @include mat-fill;
+  pointer-events: none;
+}
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 3b87ea8d4932..ccba9d7da358 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor} from '@angular/cdk/a11y';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
-import {Component, Input, ViewEncapsulation} from '@angular/core';
+import {Component, Input, ViewEncapsulation, ElementRef, OnDestroy, Renderer2} from '@angular/core';
+import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 import {MatStepLabel} from './step-label';
 
 
@@ -23,7 +25,7 @@ import {MatStepLabel} from './step-label';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MatStepHeader {
+export class MatStepHeader implements OnDestroy {
   /** Icon for the given step. */
   @Input() icon: string;
 
@@ -62,6 +64,17 @@ export class MatStepHeader {
   }
   private _optional: boolean;
 
+  constructor(
+    private _focusMonitor: FocusMonitor,
+    private _element: ElementRef,
+    renderer: Renderer2) {
+    _focusMonitor.monitor(_element.nativeElement, renderer, true);
+  }
+
+  ngOnDestroy() {
+    this._focusMonitor.stopMonitoring(this._element.nativeElement);
+  }
+
   /** Returns string label of given step if it is a text label. */
   _stringLabel(): string | null {
     return this.label instanceof MatStepLabel ? null : this.label;
@@ -71,4 +84,9 @@ export class MatStepHeader {
   _templateLabel(): MatStepLabel | null {
     return this.label instanceof MatStepLabel ? this.label : null;
   }
+
+  /** Returns the host HTML element. */
+  _getHostElement() {
+    return this._element.nativeElement;
+  }
 }
diff --git a/src/lib/stepper/stepper-module.ts b/src/lib/stepper/stepper-module.ts
index 31d0751b644d..02f8b4f65867 100644
--- a/src/lib/stepper/stepper-module.ts
+++ b/src/lib/stepper/stepper-module.ts
@@ -6,12 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {A11yModule} from '@angular/cdk/a11y';
 import {PortalModule} from '@angular/cdk/portal';
 import {CdkStepperModule} from '@angular/cdk/stepper';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {MatButtonModule} from '@angular/material/button';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '@angular/material/core';
 import {MatIconModule} from '@angular/material/icon';
 import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
@@ -26,7 +27,9 @@ import {MatStepperNext, MatStepperPrevious} from './stepper-button';
     PortalModule,
     MatButtonModule,
     CdkStepperModule,
-    MatIconModule
+    MatIconModule,
+    A11yModule,
+    MatRippleModule,
   ],
   exports: [
     MatCommonModule,
diff --git a/src/lib/stepper/stepper.scss b/src/lib/stepper/stepper.scss
index b05c8ef8672d..3d207a2f3670 100644
--- a/src/lib/stepper/stepper.scss
+++ b/src/lib/stepper/stepper.scss
@@ -12,11 +12,6 @@ $mat-stepper-line-gap: 8px !default;
   display: block;
 }
 
-.mat-step-header {
-  overflow: hidden;
-  outline: none;
-}
-
 .mat-horizontal-stepper-header-container {
   white-space: nowrap;
   display: flex;

From 39543a3bf23b96f95677a3c0bde80d048ef1f854 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:05:08 +0200
Subject: [PATCH 170/575] fix(slider): change event is not being emitted
 (#7278)

* In some situations, the change event of the `<mat-slider>` is not being emitted if the user drags the thumb of the slider. This is because the `slidestart` event fires a second time before the sliding ends. This causes the slider to think that there was no value change.

Fixes #7207
---
 src/lib/slider/slider.spec.ts | 27 +++++++++++++++++++++++++++
 src/lib/slider/slider.ts      |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index c8afaa626383..4846abddebe9 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -142,6 +142,33 @@ describe('MatSlider without forms', () => {
       expect(sliderNativeElement.classList).not.toContain('mat-slider-sliding');
     });
 
+    it('should not change value without emitting a change event', () => {
+      const onChangeSpy = jasmine.createSpy('slider onChange');
+
+      sliderInstance.change.subscribe(onChangeSpy);
+      sliderInstance.value = 50;
+      fixture.detectChanges();
+
+      dispatchSlideStartEvent(sliderNativeElement, 0, gestureConfig);
+      fixture.detectChanges();
+
+      dispatchSlideEvent(sliderNativeElement, 10, gestureConfig);
+      fixture.detectChanges();
+
+      // In some situations, HammerJS will fire a second "slidestart" event because the user
+      // holds the thumb and drags it around. This would mean that the `_valueOnSlideStart`
+      // value will be updated to the actual end value. Causing the slider to think that the value
+      // didn't change at all.
+      dispatchSlideStartEvent(sliderNativeElement, 10, gestureConfig);
+      fixture.detectChanges();
+
+      dispatchSlideEndEvent(sliderNativeElement, 10, gestureConfig);
+      fixture.detectChanges();
+
+      expect(sliderNativeElement.classList).not.toContain('mat-slider-sliding');
+      expect(onChangeSpy).toHaveBeenCalledTimes(1);
+    });
+
     it('should reset active state upon blur', () => {
       sliderInstance._isActive = true;
 
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index e3d2a838327a..d9cf7dadac61 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -492,7 +492,7 @@ export class MatSlider extends _MatSliderMixinBase
   }
 
   _onSlideStart(event: HammerInput | null) {
-    if (this.disabled) {
+    if (this.disabled || this._isSliding) {
       return;
     }
 

From f076390010bffe5a4640867ff85b237cf1e21562 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:05:19 +0200
Subject: [PATCH 171/575] fix(input): don't highlight container when readonly
 input is focused (#7273)

Prevents readonly inputs from being highlighted when they're focused. This is consistent with the native input behavior.

Note: This was introduced initially through #5776, but it looks like it didn't make it through the transition to `mat-form-field`.
---
 src/lib/input/input.spec.ts | 16 ++++++++++++++++
 src/lib/input/input.ts      |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 1743fca7fde3..b3ba3a3ded67 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -697,6 +697,22 @@ describe('MatInput without forms', function () {
     expect(inputContainer._shouldAlwaysFloat).toBe(true);
     expect(inputContainer.floatPlaceholder).toBe('always');
   });
+
+  it('should not highlight when focusing a readonly input', () => {
+    let fixture = TestBed.createComponent(MatInputWithReadonlyInput);
+    fixture.detectChanges();
+
+    let input = fixture.debugElement.query(By.directive(MatInput)).injector.get<MatInput>(MatInput);
+    let container = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
+
+    // Call the focus handler directly to avoid flakyness where
+    // browsers don't focus elements if the window is minimized.
+    input._focusChanged(true);
+    fixture.detectChanges();
+
+    expect(input.focused).toBe(false);
+    expect(container.classList).not.toContain('mat-focused');
+  });
 });
 
 describe('MatInput with forms', () => {
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index c8f357117244..c1681a97c2bf 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -76,6 +76,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   protected _uid = `mat-input-${nextUniqueId++}`;
   protected _errorOptions: ErrorOptions;
   protected _previousNativeValue = this.value;
+  private _readonly = false;
 
   /** Whether the input is focused. */
   focused = false;
@@ -141,6 +142,11 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
     }
   }
 
+  /** Whether the element is readonly. */
+  @Input()
+  get readonly() { return this._readonly; }
+  set readonly(value: any) { this._readonly = coerceBooleanProperty(value); }
+
   protected _neverEmptyInputTypes = [
     'date',
     'datetime',
@@ -205,7 +211,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
 
   /** Callback for the cases where the focused state of the input changes. */
   _focusChanged(isFocused: boolean) {
-    if (isFocused !== this.focused) {
+    if (isFocused !== this.focused && !this.readonly) {
       this.focused = isFocused;
       this.stateChanges.next();
     }

From 5f8615fdbcc52fe7ff9f3a9dad8adf7da390a1f4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:05:49 +0200
Subject: [PATCH 172/575] fix(autocomplete): don't open panel for readonly
 inputs (#7271)

Prevents the autocomplete panel from opening if the associated input is readonly.

Fixes #7269.
---
 src/lib/autocomplete/autocomplete-trigger.ts |  6 ++++--
 src/lib/autocomplete/autocomplete.spec.ts    | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 9fb0e8a763b1..f4f27bfa2c9f 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -296,8 +296,10 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   }
 
   _handleFocus(): void {
-    this._attachOverlay();
-    this._floatPlaceholder(true);
+    if (!this._element.nativeElement.readOnly) {
+      this._attachOverlay();
+      this._floatPlaceholder(true);
+    }
   }
 
   /**
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index eb3e117a2d15..c5e5b007faa9 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -118,6 +118,20 @@ describe('MatAutocomplete', () => {
       });
     }));
 
+    it('should not open the panel on focus if the input is readonly', async(() => {
+      const trigger = fixture.componentInstance.trigger;
+      input.readOnly = true;
+      fixture.detectChanges();
+
+      expect(trigger.panelOpen).toBe(false, 'Expected panel state to start out closed.');
+      dispatchFakeEvent(input, 'focusin');
+
+      fixture.whenStable().then(() => {
+        fixture.detectChanges();
+        expect(trigger.panelOpen).toBe(false, 'Expected panel to stay closed.');
+      });
+    }));
+
     it('should open the panel programmatically', async(() => {
       expect(fixture.componentInstance.trigger.panelOpen)
           .toBe(false, `Expected panel state to start out closed.`);

From 6be046261a14172e3a91a4a38400dd22d8fcfcfa Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:06:03 +0200
Subject: [PATCH 173/575] fix(autocomplete): empty not cleaning up on tab
 (#7270)

Fixes an issue that caused the autocomplete not to be cleaned up when the user tabs away, if there were no results when the autocomplete was open.

Fixes #7268.
---
 src/lib/autocomplete/autocomplete-trigger.ts | 12 ++++----
 src/lib/autocomplete/autocomplete.spec.ts    | 29 ++++++++++++++++++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index f4f27bfa2c9f..c353518e57ff 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -7,7 +7,7 @@
  */
 
 import {Directionality} from '@angular/cdk/bidi';
-import {DOWN_ARROW, ENTER, ESCAPE, UP_ARROW} from '@angular/cdk/keycodes';
+import {DOWN_ARROW, ENTER, ESCAPE, UP_ARROW, TAB} from '@angular/cdk/keycodes';
 import {
   ConnectedPositionStrategy,
   Overlay,
@@ -259,19 +259,21 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   }
 
   _handleKeydown(event: KeyboardEvent): void {
-    if (event.keyCode === ESCAPE && this.panelOpen) {
+    const keyCode = event.keyCode;
+
+    if (keyCode === ESCAPE && this.panelOpen) {
       this._resetActiveItem();
       this.closePanel();
       event.stopPropagation();
-    } else if (this.activeOption && event.keyCode === ENTER && this.panelOpen) {
+    } else if (this.activeOption && keyCode === ENTER && this.panelOpen) {
       this.activeOption._selectViaInteraction();
       this._resetActiveItem();
       event.preventDefault();
     } else {
       const prevActiveItem = this.autocomplete._keyManager.activeItem;
-      const isArrowKey = event.keyCode === UP_ARROW || event.keyCode === DOWN_ARROW;
+      const isArrowKey = keyCode === UP_ARROW || keyCode === DOWN_ARROW;
 
-      if (this.panelOpen) {
+      if (this.panelOpen || keyCode === TAB) {
         this.autocomplete._keyManager.onKeydown(event);
       } else if (isArrowKey) {
         this.openPanel();
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index c5e5b007faa9..a92d5b312668 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1,9 +1,14 @@
 import {Direction, Directionality} from '@angular/cdk/bidi';
-import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW, TAB} from '@angular/cdk/keycodes';
 import {OverlayContainer} from '@angular/cdk/overlay';
 import {map, RxChain, startWith} from '@angular/cdk/rxjs';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
-import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
+import {
+  createKeyboardEvent,
+  dispatchKeyboardEvent,
+  dispatchFakeEvent,
+  typeInElement,
+} from '@angular/cdk/testing';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -958,6 +963,26 @@ describe('MatAutocomplete', () => {
       });
     }));
 
+    it('should close the panel when tabbing away from a trigger without results', async(() => {
+      const trigger = fixture.componentInstance.trigger;
+
+      fixture.componentInstance.states = [];
+      fixture.componentInstance.filteredStates = [];
+      fixture.detectChanges();
+      input.focus();
+
+      fixture.whenStable().then(() => {
+        expect(overlayContainerElement.querySelector('.mat-autocomplete-panel'))
+            .toBeTruthy('Expected panel to be rendered.');
+
+        dispatchKeyboardEvent(input, 'keydown', TAB);
+        fixture.detectChanges();
+
+        expect(overlayContainerElement.querySelector('.mat-autocomplete-panel'))
+            .toBeFalsy('Expected panel to be removed.');
+      });
+    }));
+
     it('should reset the active option when closing with the escape key', fakeAsync(() => {
       const trigger = fixture.componentInstance.trigger;
 

From eb012cc9b750684cf9796e193adfc39855e4a86b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:06:18 +0200
Subject: [PATCH 174/575] fix(calendar): not reacting to min/max boundary
 changes (#7234)

Fixes the calendar not re-rendering when the `minDate`, `maxDate` or `dateFilter` change. The issue was due to the fact that the `minDate`, `maxDate` and `dateFilter` weren't being passed down to the views via `@Input`.

Fixes #7202.
---
 src/lib/datepicker/calendar.spec.ts | 51 +++++++++++++++++++++++++++++
 src/lib/datepicker/calendar.ts      | 25 +++++++++++++-
 src/lib/datepicker/month-view.ts    |  7 ++--
 src/lib/datepicker/year-view.ts     |  7 ++--
 4 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/src/lib/datepicker/calendar.spec.ts b/src/lib/datepicker/calendar.spec.ts
index 35d1c4bcfeae..d5fe98145610 100644
--- a/src/lib/datepicker/calendar.spec.ts
+++ b/src/lib/datepicker/calendar.spec.ts
@@ -528,6 +528,57 @@ describe('MatCalendar', () => {
 
       expect(calendarInstance._activeDate).toEqual(new Date(2018, JAN, 1));
     });
+
+    it('should re-render the month view when the minDate changes', () => {
+      fixture.detectChanges();
+      spyOn(calendarInstance.monthView, '_init').and.callThrough();
+
+      testComponent.minDate = new Date(2017, NOV, 1);
+      fixture.detectChanges();
+
+      expect(calendarInstance.monthView._init).toHaveBeenCalled();
+    });
+
+    it('should re-render the month view when the maxDate changes', () => {
+      fixture.detectChanges();
+      spyOn(calendarInstance.monthView, '_init').and.callThrough();
+
+      testComponent.maxDate = new Date(2017, DEC, 1);
+      fixture.detectChanges();
+
+      expect(calendarInstance.monthView._init).toHaveBeenCalled();
+    });
+
+    it('should re-render the year view when the minDate changes', () => {
+      fixture.detectChanges();
+      const periodButton =
+          calendarElement.querySelector('.mat-calendar-period-button') as HTMLElement;
+      periodButton.click();
+      fixture.detectChanges();
+
+      spyOn(calendarInstance.yearView, '_init').and.callThrough();
+
+      testComponent.minDate = new Date(2017, NOV, 1);
+      fixture.detectChanges();
+
+      expect(calendarInstance.yearView._init).toHaveBeenCalled();
+    });
+
+    it('should re-render the year view when the maxDate changes', () => {
+      fixture.detectChanges();
+      const periodButton =
+          calendarElement.querySelector('.mat-calendar-period-button') as HTMLElement;
+      periodButton.click();
+      fixture.detectChanges();
+
+      spyOn(calendarInstance.yearView, '_init').and.callThrough();
+
+      testComponent.maxDate = new Date(2017, DEC, 1);
+      fixture.detectChanges();
+
+      expect(calendarInstance.yearView._init).toHaveBeenCalled();
+    });
+
   });
 
   describe('calendar with date filter', () => {
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index a046757fdbce..e73d36795b73 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -31,6 +31,9 @@ import {
   Optional,
   Output,
   ViewEncapsulation,
+  ViewChild,
+  OnChanges,
+  SimpleChanges,
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {first} from 'rxjs/operator/first';
@@ -38,6 +41,8 @@ import {Subscription} from 'rxjs/Subscription';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MatDatepickerIntl} from './datepicker-intl';
+import {MatMonthView} from './month-view';
+import {MatYearView} from './year-view';
 
 
 /**
@@ -56,7 +61,7 @@ import {MatDatepickerIntl} from './datepicker-intl';
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MatCalendar<D> implements AfterContentInit, OnDestroy {
+export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   private _intlChanges: Subscription;
 
   /** A date representing the period (month or year) to start the calendar in. */
@@ -95,6 +100,12 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy {
   /** Emits when any date is selected. */
   @Output() userSelection = new EventEmitter<void>();
 
+  /** Reference to the current month view component. */
+  @ViewChild(MatMonthView) monthView: MatMonthView<D>;
+
+  /** Reference to the current year view component. */
+  @ViewChild(MatYearView) yearView: MatYearView<D>;
+
   /** Date filter for the month and year views. */
   _dateFilterForViews = (date: D) => {
     return !!date &&
@@ -166,6 +177,18 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy {
     this._intlChanges.unsubscribe();
   }
 
+  ngOnChanges(changes: SimpleChanges) {
+    const change = changes.minDate || changes.maxDate || changes.dateFilter;
+
+    if (change && !change.firstChange) {
+      const view = this.monthView || this.yearView;
+
+      if (view) {
+        view._init();
+      }
+    }
+  }
+
   /** Handles date selection in the month view. */
   _dateSelected(date: D): void {
     if (!this._dateAdapter.sameDate(date, this.selected)) {
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index 4ac52fe8b251..f7a4c2fc4ac8 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -16,6 +16,7 @@ import {
   Optional,
   Output,
   ViewEncapsulation,
+  ChangeDetectorRef,
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {MatCalendarCell} from './calendar-body';
@@ -93,7 +94,8 @@ export class MatMonthView<D> implements AfterContentInit {
   _weekdays: {long: string, narrow: string}[];
 
   constructor(@Optional() public _dateAdapter: DateAdapter<D>,
-              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats) {
+              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats,
+              private _changeDetectorRef: ChangeDetectorRef) {
     if (!this._dateAdapter) {
       throw createMissingDateImplError('DateAdapter');
     }
@@ -132,7 +134,7 @@ export class MatMonthView<D> implements AfterContentInit {
   }
 
   /** Initializes this month view. */
-  private _init() {
+  _init() {
     this._selectedDate = this._getDateInCurrentMonth(this.selected);
     this._todayDate = this._getDateInCurrentMonth(this._dateAdapter.today());
     this._monthLabel =
@@ -146,6 +148,7 @@ export class MatMonthView<D> implements AfterContentInit {
          this._dateAdapter.getFirstDayOfWeek()) % DAYS_PER_WEEK;
 
     this._createWeekCells();
+    this._changeDetectorRef.markForCheck();
   }
 
   /** Creates MatCalendarCells for the dates in this month. */
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index 11f95149e317..36c3c1babade 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -16,6 +16,7 @@ import {
   Optional,
   Output,
   ViewEncapsulation,
+  ChangeDetectorRef,
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {MatCalendarCell} from './calendar-body';
@@ -79,7 +80,8 @@ export class MatYearView<D> implements AfterContentInit {
   _selectedMonth: number | null;
 
   constructor(@Optional() public _dateAdapter: DateAdapter<D>,
-              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats) {
+              @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats,
+              private _changeDetectorRef: ChangeDetectorRef) {
     if (!this._dateAdapter) {
       throw createMissingDateImplError('DateAdapter');
     }
@@ -104,7 +106,7 @@ export class MatYearView<D> implements AfterContentInit {
   }
 
   /** Initializes this month view. */
-  private _init() {
+  _init() {
     this._selectedMonth = this._getMonthInCurrentYear(this.selected);
     this._todayMonth = this._getMonthInCurrentYear(this._dateAdapter.today());
     this._yearLabel = this._dateAdapter.getYearName(this.activeDate);
@@ -113,6 +115,7 @@ export class MatYearView<D> implements AfterContentInit {
     // First row of months only contains 5 elements so we can fit the year label on the same row.
     this._months = [[0, 1, 2, 3], [4, 5, 6, 7], [8, 9, 10, 11]].map(row => row.map(
         month => this._createCellForMonth(month, monthNames[month])));
+    this._changeDetectorRef.markForCheck();
   }
 
   /**

From c7ab828b0a630b20b9499aa35207d63a198d4927 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:06:49 +0200
Subject: [PATCH 175/575] fix(select): multiple change events emitted when
 changing options of a closed select (#7232)

Prevents two change events being fired the same change when selecting an option via the arrow keys on a closed select.

Fixes #7227.
---
 src/lib/select/select.spec.ts | 8 ++++++++
 src/lib/select/select.ts      | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 57e9d54b2cef..8a8bb96260df 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -2336,6 +2336,14 @@ describe('MatSelect', () => {
 
       expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
     });
+
+    it('should only emit one event when pressing the arrow keys on a closed select', () => {
+      const select = fixture.debugElement.query(By.css('md-select')).nativeElement;
+      dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+
+      expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
+    });
+
   });
 
   describe('floatPlaceholder option', () => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 634617007a51..8a5f3d46259d 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -1135,7 +1135,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
       if (currentActiveItem !== prevActiveItem) {
         this._clearSelection();
         this._setSelectionByValue(currentActiveItem.value, true);
-        this._propagateChanges();
       }
     }
   }

From ba5653db2098fe247b4594f641ac878ab95d4a33 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:06:57 +0200
Subject: [PATCH 176/575] fix(drawer): open event not firing on init (#7214)

Fixes a regression that caused the drawer not to fire its `open` event if it is open on init.

Fixes #7208.
---
 src/lib/sidenav/drawer.spec.ts | 15 +++++++++++++--
 src/lib/sidenav/drawer.ts      |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index d5e36955528a..f5f0b458b150 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -126,6 +126,15 @@ describe('MatDrawer', () => {
       expect(testComponent.closeCount).toBe(1, 'Expected one close event.');
     }));
 
+    it('should fire the open event when open on init', fakeAsync(() => {
+      let fixture = TestBed.createComponent(DrawerSetToOpenedTrue);
+
+      fixture.detectChanges();
+      tick();
+
+      expect(fixture.componentInstance.openCallback).toHaveBeenCalledTimes(1);
+    }));
+
     it('should not close by pressing escape when disableClose is set', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicTestApp);
       let testComponent = fixture.debugElement.componentInstance;
@@ -430,12 +439,14 @@ class DrawerSetToOpenedFalse { }
 @Component({
   template: `
     <mat-drawer-container>
-      <mat-drawer #drawer mode="side" opened="true">
+      <mat-drawer #drawer mode="side" opened="true" (open)="openCallback()">
         Closed Drawer.
       </mat-drawer>
     </mat-drawer-container>`,
 })
-class DrawerSetToOpenedTrue { }
+class DrawerSetToOpenedTrue {
+  openCallback = jasmine.createSpy('open callback');
+}
 
 @Component({
   template: `
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index deb90d49abb2..95b1ac23eece 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -329,9 +329,9 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   _onAnimationEnd(event: AnimationEvent) {
     const {fromState, toState} = event;
 
-    if (toState === 'open' && fromState === 'void') {
+    if (toState.indexOf('open') === 0 && fromState === 'void') {
       this.onOpen.emit(new MatDrawerToggleResult('open', true));
-    } else if (toState === 'void' && fromState === 'open') {
+    } else if (toState === 'void' && fromState.indexOf('open') === 0) {
       this.onClose.emit(new MatDrawerToggleResult('close', true));
     }
 

From 217840c5b9c26a4584ea79306ba28b9d71d50859 Mon Sep 17 00:00:00 2001
From: NothingEverHappens <kirjs@google.com>
Date: Fri, 29 Sep 2017 16:07:35 -0400
Subject: [PATCH 177/575] fix(stepper): selected is always undefined (#7213)

---
 src/cdk/stepper/stepper.ts      | 2 +-
 src/lib/stepper/stepper.spec.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 30b12781b759..d4637008ec1b 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -150,7 +150,7 @@ export class CdkStepper {
 
   /** The step that is selected. */
   @Input()
-  get selected() { return this._steps[this.selectedIndex]; }
+  get selected() { return this._steps.toArray()[this.selectedIndex]; }
   set selected(step: CdkStep) {
     this.selectedIndex = this._steps.toArray().indexOf(step);
   }
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index eebd89f6dee9..76904b22a16a 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -10,7 +10,6 @@ import {MatStepperModule} from './index';
 import {MatHorizontalStepper, MatStepper, MatVerticalStepper} from './stepper';
 import {MatStepperNext, MatStepperPrevious} from './stepper-button';
 
-
 const VALID_REGEX = /valid/;
 
 describe('MatHorizontalStepper', () => {
@@ -307,6 +306,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
+  expect(stepperComponent.selected instanceof MdStep).toBe(true);
 
   // select the second step
   let stepHeaderEl = stepHeaders[1].nativeElement;
@@ -314,6 +314,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(1);
+  expect(stepperComponent.selected instanceof MdStep).toBe(true);
 
   // select the third step
   stepHeaderEl = stepHeaders[2].nativeElement;
@@ -321,6 +322,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(2);
+  expect(stepperComponent.selected instanceof MdStep).toBe(true);
 }
 
 /** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */

From f19f19cf637f417f4dbf5662dd09c45f7d641999 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 29 Sep 2017 13:08:09 -0700
Subject: [PATCH 178/575] Set selected state of list option item in selection
 list OnInit. (#7189)

---
 src/lib/list/selection-list.spec.ts | 35 +++++++++++++++++++++++++++++
 src/lib/list/selection-list.ts      | 10 +++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 457d0b1532ea..0c692695d4a3 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -219,6 +219,34 @@ describe('MatSelectionList', () => {
     });
   });
 
+  describe('with list option selected', () => {
+    let fixture: ComponentFixture<SelectionListWithListOptions>;
+    let listItemEl: DebugElement;
+    let selectionList: DebugElement;
+
+    beforeEach(async(() => {
+      TestBed.configureTestingModule({
+        imports: [MdListModule],
+        declarations: [SelectionListWithSelecedOption],
+      });
+
+      TestBed.compileComponents();
+    }));
+
+    beforeEach(async(() => {
+      fixture = TestBed.createComponent(SelectionListWithSelecedOption);
+      listItemEl = fixture.debugElement.query(By.directive(MdListOption));
+      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      fixture.detectChanges();
+    }));
+
+    it('should set its initial selected state in the selectedOptions', () => {
+      let optionEl = listItemEl.injector.get(MdListOption);
+      let selectedOptions = selectionList.componentInstance.selectedOptions;
+      expect(selectedOptions.isSelected(optionEl)).toBeTruthy();
+    });
+  });
+
   describe('with single option', () => {
     let fixture: ComponentFixture<SelectionListWithOnlyOneOption>;
     let listOption: DebugElement;
@@ -456,6 +484,13 @@ class SelectionListWithDisabledOption {
   disableItem: boolean = false;
 }
 
+@Component({template: `
+  <mat-selection-list>
+    <md-list-option [selected]="true">Item</md-list-option>
+  </mat-selection-list>`})
+class SelectionListWithSelecedOption {
+}
+
 @Component({template: `
   <mat-selection-list id = "selection-list-4">
     <mat-list-option checkboxPosition = "after" class="test-focus" id="123">
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 3f939fa600c7..f476fa95cd9a 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -23,6 +23,7 @@ import {
   Inject,
   Input,
   OnDestroy,
+  OnInit,
   Optional,
   Output,
   QueryList,
@@ -82,8 +83,7 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatListOption extends _MatListOptionMixinBase
-    implements AfterContentInit, OnDestroy, FocusableOption, CanDisableRipple {
-
+    implements AfterContentInit, OnInit, OnDestroy, FocusableOption, CanDisableRipple {
   private _lineSetter: MatLineSetter;
   private _selected: boolean = false;
   private _disabled: boolean = false;
@@ -129,6 +129,12 @@ export class MatListOption extends _MatListOptionMixinBase
     super();
   }
 
+  ngOnInit() {
+    if (this.selected) {
+      this.selectionList.selectedOptions.select(this);
+    }
+  }
+
   ngAfterContentInit() {
     this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
 

From 2d350a0893886481ed1cac13da79b4e0130605d5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:08:25 +0200
Subject: [PATCH 179/575] feat(sort): add enter and leave arrow animations
 (#7180)

Adds animations for when the sorting arrow is added and removed from the DOM.
---
 src/lib/sort/sort-header.html |  2 +-
 src/lib/sort/sort-header.ts   | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/lib/sort/sort-header.html b/src/lib/sort/sort-header.html
index bf16458d5038..b181902952cf 100644
--- a/src/lib/sort/sort-header.html
+++ b/src/lib/sort/sort-header.html
@@ -5,7 +5,7 @@
     <ng-content></ng-content>
   </button>
 
-  <div *ngIf="_isSorted()" class="mat-sort-header-arrow">
+  <div *ngIf="_isSorted()" class="mat-sort-header-arrow" [@indicatorToggle]="_sort.direction">
     <div class="mat-sort-header-stem"></div>
     <div class="mat-sort-header-indicator" [@indicator]="_sort.direction" >
       <div class="mat-sort-header-pointer-left" [@leftPointer]="_sort.direction"></div>
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index 5cf719da9017..87f497d40c23 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -20,7 +20,8 @@ import {
   state,
   style,
   animate,
-  transition
+  transition,
+  keyframes,
 } from '@angular/animations';
 import {CdkColumnDef} from '@angular/cdk/table';
 import {Subscription} from 'rxjs/Subscription';
@@ -70,6 +71,24 @@ const SORT_ANIMATION_TRANSITION =
       state('asc', style({transform: 'rotate(45deg)'})),
       state('desc', style({transform: 'rotate(-45deg)'})),
       transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
+    ]),
+    trigger('indicatorToggle', [
+      transition('void => asc', animate(SORT_ANIMATION_TRANSITION, keyframes([
+        style({transform: 'translateY(25%)', opacity: 0}),
+        style({transform: 'none', opacity: 1})
+      ]))),
+      transition('asc => void', animate(SORT_ANIMATION_TRANSITION, keyframes([
+        style({transform: 'none', opacity: 1}),
+        style({transform: 'translateY(-25%)', opacity: 0})
+      ]))),
+      transition('void => desc', animate(SORT_ANIMATION_TRANSITION, keyframes([
+        style({transform: 'translateY(-25%)', opacity: 0}),
+        style({transform: 'none', opacity: 1})
+      ]))),
+      transition('desc => void', animate(SORT_ANIMATION_TRANSITION, keyframes([
+        style({transform: 'none', opacity: 1}),
+        style({transform: 'translateY(25%)', opacity: 0})
+      ]))),
     ])
   ]
 })

From f8cd7906ff22dd7383aaca38cbd781ddb534ec0c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:10:18 +0200
Subject: [PATCH 180/575] feat(autocomplete): add md-autocomplete classes to
 overlay panel (#7176)

Transfers any classes added to `md-autocomplete` to the resulting panel, allowing for easier styling similarly to `md-menu`.

Fixes #4196.
---
 src/lib/autocomplete/autocomplete.html    |  2 +-
 src/lib/autocomplete/autocomplete.spec.ts | 21 +++++++++++++++++-
 src/lib/autocomplete/autocomplete.ts      | 26 ++++++++++++++---------
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete.html b/src/lib/autocomplete/autocomplete.html
index 41227961fe5c..aa27ebc27c47 100644
--- a/src/lib/autocomplete/autocomplete.html
+++ b/src/lib/autocomplete/autocomplete.html
@@ -1,5 +1,5 @@
 <ng-template>
-  <div class="mat-autocomplete-panel" role="listbox" [id]="id" [ngClass]="_getClassList()" #panel>
+  <div class="mat-autocomplete-panel" role="listbox" [id]="id" [ngClass]="_classList" #panel>
     <ng-content></ng-content>
   </div>
 </ng-template>
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index a92d5b312668..638745d29ef6 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1521,6 +1521,25 @@ describe('MatAutocomplete', () => {
         expect(placeholder.classList).not.toContain('mat-form-field-empty');
       }));
 
+    it('should transfer the mat-autocomplete classes to the panel element', fakeAsync(() => {
+      const fixture = TestBed.createComponent(SimpleAutocomplete);
+      fixture.detectChanges();
+
+      fixture.componentInstance.trigger.openPanel();
+      tick();
+      fixture.detectChanges();
+
+      const autocomplete = fixture.debugElement.nativeElement.querySelector('mat-autocomplete');
+      const panel = overlayContainerElement.querySelector('.mat-autocomplete-panel')!;
+
+      expect(autocomplete.classList).not.toContain('class-one');
+      expect(autocomplete.classList).not.toContain('class-two');
+
+      expect(panel.classList).toContain('class-one');
+      expect(panel.classList).toContain('class-two');
+    }));
+
+
   });
 
   it('should have correct width when opened', () => {
@@ -1646,7 +1665,7 @@ describe('MatAutocomplete', () => {
       <input matInput placeholder="State" [matAutocomplete]="auto" [formControl]="stateCtrl">
     </mat-form-field>
 
-    <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
+    <mat-autocomplete class="class-one class-two" #auto="matAutocomplete" [displayWith]="displayFn">
       <mat-option *ngFor="let state of filteredStates" [value]="state">
         <span> {{ state.code }}: {{ state.name }}  </span>
       </mat-option>
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index 86b415352932..8113bacb19c9 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -77,10 +77,23 @@ export class MatAutocomplete implements AfterContentInit {
   @Output() optionSelected: EventEmitter<MatAutocompleteSelectedEvent> =
       new EventEmitter<MatAutocompleteSelectedEvent>();
 
+  /**
+   * Takes classes set on the host md-autocomplete element and applies them to the panel
+   * inside the overlay container to allow for easy styling.
+   */
+  @Input('class')
+  set classList(classList: string) {
+    if (classList && classList.length) {
+      classList.split(' ').forEach(className => this._classList[className.trim()] = true);
+      this._elementRef.nativeElement.className = '';
+    }
+  }
+  _classList: {[key: string]: boolean} = {};
+
   /** Unique ID to be used by autocomplete trigger's "aria-owns" property. */
   id: string = `mat-autocomplete-${_uniqueAutocompleteIdCounter++}`;
 
-  constructor(private _changeDetectorRef: ChangeDetectorRef) { }
+  constructor(private _changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef) { }
 
   ngAfterContentInit() {
     this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withWrap();
@@ -105,6 +118,8 @@ export class MatAutocomplete implements AfterContentInit {
   _setVisibility(): void {
     Promise.resolve().then(() => {
       this.showPanel = !!this.options.length;
+      this._classList['mat-autocomplete-visible'] = this.showPanel;
+      this._classList['mat-autocomplete-hidden'] = !this.showPanel;
       this._changeDetectorRef.markForCheck();
     });
   }
@@ -114,14 +129,5 @@ export class MatAutocomplete implements AfterContentInit {
     const event = new MatAutocompleteSelectedEvent(this, option);
     this.optionSelected.emit(event);
   }
-
-  /** Sets a class on the panel based on whether it is visible. */
-  _getClassList() {
-    return {
-      'mat-autocomplete-visible': this.showPanel,
-      'mat-autocomplete-hidden': !this.showPanel
-    };
-  }
-
 }
 

From c5c96d9f6d9b5df87e44873790d54b338a55e155 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 29 Sep 2017 13:10:30 -0700
Subject: [PATCH 181/575] - Remove extra `<md-autocomplete>` blocks in example.
 (#7149)

- Add isOpen attribute to `MdAutocomplete` component.
---
 src/demo-app/autocomplete/autocomplete-demo.html | 13 -------------
 src/lib/autocomplete/autocomplete-trigger.ts     |  4 ++--
 src/lib/autocomplete/autocomplete.spec.ts        | 11 +++++++++++
 src/lib/autocomplete/autocomplete.ts             |  8 ++++++++
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/demo-app/autocomplete/autocomplete-demo.html b/src/demo-app/autocomplete/autocomplete-demo.html
index e31478d10b25..3a844aa81a8a 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.html
+++ b/src/demo-app/autocomplete/autocomplete-demo.html
@@ -66,19 +66,6 @@
   </mat-card>
 </div>
 
-<mat-autocomplete #reactiveAuto="matAutocomplete" [displayWith]="displayFn">
-  <mat-option *ngFor="let state of reactiveStates | async" [value]="state">
-    <span>{{ state.name }}</span>
-    <span class="demo-secondary-text"> ({{state.code}}) </span>
-  </mat-option>
-</mat-autocomplete>
-
-<mat-autocomplete #tdAuto="matAutocomplete">
-  <mat-option *ngFor="let state of tdStates" [value]="state.name">
-    <span>{{ state.name }}</span>
-  </mat-option>
-</mat-autocomplete>
-
 <mat-autocomplete #groupedAuto="matAutocomplete">
   <mat-optgroup *ngFor="let group of filteredGroupedStates"
     [label]="'States starting with ' + group.letter">
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index c353518e57ff..15cfe649a844 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -169,7 +169,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     this._resetPlaceholder();
 
     if (this._panelOpen) {
-      this._panelOpen = false;
+      this.autocomplete._isOpen = this._panelOpen = false;
 
       // We need to trigger change detection manually, because
       // `fromEvent` doesn't seem to do it at the proper time.
@@ -454,7 +454,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     }
 
     this.autocomplete._setVisibility();
-    this._panelOpen = true;
+    this.autocomplete._isOpen = this._panelOpen = true;
   }
 
   private _getOverlayConfig(): OverlayConfig {
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 638745d29ef6..3096f21e8fc2 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -409,6 +409,17 @@ describe('MatAutocomplete', () => {
       expect(inputContainer._animateAndLockPlaceholder).toHaveBeenCalled();
     });
 
+    it('should provide the open state of the panel', async(() => {
+      expect(fixture.componentInstance.panel.isOpen).toBeFalsy(
+        `Expected the panel to be unopened initially.`);
+
+      dispatchFakeEvent(input, 'focusin');
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        expect(fixture.componentInstance.panel.isOpen).toBeTruthy(
+          `Expected the panel to be opened on focus.`);
+      });
+    }));
   });
 
   it('should have the correct text direction in RTL', () => {
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index 8113bacb19c9..f1df42923710 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -58,6 +58,12 @@ export class MatAutocomplete implements AfterContentInit {
   /** Whether the autocomplete panel should be visible, depending on option length. */
   showPanel = false;
 
+  /** Whether the autocomplete panel is open. */
+  get isOpen(): boolean {
+    return this._isOpen && this.showPanel;
+  }
+  _isOpen: boolean = false;
+
   /** @docs-private */
   @ViewChild(TemplateRef) template: TemplateRef<any>;
 
@@ -97,6 +103,8 @@ export class MatAutocomplete implements AfterContentInit {
 
   ngAfterContentInit() {
     this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withWrap();
+    // Set the initial visibiity state.
+    this._setVisibility();
   }
 
   /**

From c5e162b1b0b6cbf9a50f075651c13dcc9312062e Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:10:43 +0200
Subject: [PATCH 182/575] fix(radio): defaulting to invalid name attribute
 (#7131)

Fixes the radio button defaulting to `name="undefined"` for the underlying input, if the consumer hasn't passed in a name.

Relates to #7130.
---
 src/lib/radio/radio.html    | 2 +-
 src/lib/radio/radio.spec.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lib/radio/radio.html b/src/lib/radio/radio.html
index c6280776061d..bd68e10b34ff 100644
--- a/src/lib/radio/radio.html
+++ b/src/lib/radio/radio.html
@@ -15,7 +15,7 @@
          [id]="inputId"
          [checked]="checked"
          [disabled]="disabled"
-         [name]="name"
+         [attr.name]="name"
          [required]="required"
          [attr.aria-label]="ariaLabel"
          [attr.aria-labelledby]="ariaLabelledby"
diff --git a/src/lib/radio/radio.spec.ts b/src/lib/radio/radio.spec.ts
index 96f0447a9f37..88c3b1175a85 100644
--- a/src/lib/radio/radio.spec.ts
+++ b/src/lib/radio/radio.spec.ts
@@ -638,6 +638,12 @@ describe('MatRadio', () => {
         expect(document.activeElement).toBe(fruitRadioNativeInputs[i]);
       }
     });
+
+    it('should not add the "name" attribute if it is not passed in', () => {
+      const radio = fixture.debugElement.nativeElement.querySelector('#nameless input');
+      expect(radio.hasAttribute('name')).toBe(false);
+    });
+
   });
 
   describe('with tabindex', () => {
@@ -711,6 +717,7 @@ class RadiosInsideRadioGroup {
                      [aria-labelledby]="ariaLabelledby">
     </mat-radio-button>
     <mat-radio-button name="fruit" value="raspberry">Raspberry</mat-radio-button>
+    <mat-radio-button id="nameless" value="no-name">No name</mat-radio-button>
   `
 })
 class StandaloneRadioButtons {

From 26788f19c77ce1061c405c62e8ad1f2696d185fe Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:11:08 +0200
Subject: [PATCH 183/575] fix(checkbox): defaulting to invalid name and value
 attributes (#7130)

Fixes the checkbox defaulting to `name="null"` and `value="undefined"` for the underlying input, if the user hasn't passed them in.
---
 src/lib/checkbox/checkbox.html    |  4 ++--
 src/lib/checkbox/checkbox.spec.ts | 11 +++++++++++
 src/lib/checkbox/checkbox.ts      |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index 1361d9362485..3174c6804464 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -6,9 +6,9 @@
            [id]="inputId"
            [required]="required"
            [checked]="checked"
-           [value]="value"
+           [attr.value]="value"
            [disabled]="disabled"
-           [name]="name"
+           [attr.name]="name"
            [tabIndex]="tabIndex"
            [indeterminate]="indeterminate"
            [attr.aria-label]="ariaLabel"
diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
index 73b6f50177f6..d71a3daeb225 100644
--- a/src/lib/checkbox/checkbox.spec.ts
+++ b/src/lib/checkbox/checkbox.spec.ts
@@ -873,6 +873,17 @@ describe('MatCheckbox', () => {
           .not.toContain('mat-checkbox-inner-container-no-side-margin');
       }, 1);
     }));
+
+    it('should not add the "name" attribute if it is not passed in', () => {
+      fixture.detectChanges();
+      expect(checkboxInnerContainer.querySelector('input')!.hasAttribute('name')).toBe(false);
+    });
+
+    it('should not add the "value" attribute if it is not passed in', () => {
+      fixture.detectChanges();
+      expect(checkboxInnerContainer.querySelector('input')!.hasAttribute('value')).toBe(false);
+    });
+
   });
 });
 
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 97ffec3de20d..c17cc728bc0d 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -169,7 +169,7 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   @Output() indeterminateChange: EventEmitter<boolean> = new EventEmitter<boolean>();
 
   /** The value attribute of the native input element */
-  @Input() value: string ;
+  @Input() value: string;
 
   /** The native `<input type="checkbox"> element */
   @ViewChild('input') _inputElement: ElementRef;

From e05f93981aa1e966f265ec1c9691c04af63eb773 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:11:22 +0200
Subject: [PATCH 184/575] fix(selection-list): restore focus if active item is
 destroyed (#7125)

* Removes the `destroyed` and `onFocus` observables and instead just calls methods on the injected `MdSelectionList` instance.

* Fixes that the active item is not updating if the active item is being destroyed.
---
 src/lib/list/selection-list.spec.ts | 50 ++++++++++-------
 src/lib/list/selection-list.ts      | 87 +++++++++--------------------
 2 files changed, 55 insertions(+), 82 deletions(-)

diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 0c692695d4a3..3fa335190d87 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -1,6 +1,6 @@
 import {DOWN_ARROW, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
 import {Platform} from '@angular/cdk/platform';
-import {createKeyboardEvent} from '@angular/cdk/testing';
+import {createKeyboardEvent, dispatchFakeEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
@@ -28,24 +28,29 @@ describe('MatSelectionList', () => {
       TestBed.compileComponents();
     }));
 
+
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithListOptions);
+      fixture.detectChanges();
+
       listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
       listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
       selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
-      fixture.detectChanges();
     }));
 
     it('should add and remove focus class on focus/blur', () => {
-      expect(listItemEl.nativeElement.classList).not.toContain('mat-list-item-focus');
+      // Use the second list item, because the first one is always disabled.
+      const listItem = listOption[1].nativeElement;
 
-      listOption[0].componentInstance._handleFocus();
+      expect(listItem.classList).not.toContain('mat-list-item-focus');
+
+      dispatchFakeEvent(listItem, 'focus');
       fixture.detectChanges();
-      expect(listItemEl.nativeElement.className).toContain('mat-list-item-focus');
+      expect(listItem.className).toContain('mat-list-item-focus');
 
-      listOption[0].componentInstance._handleBlur();
+      dispatchFakeEvent(listItem, 'blur');
       fixture.detectChanges();
-      expect(listItemEl.nativeElement.className).not.toContain('mat-list-item-focus');
+      expect(listItem.className).not.toContain('mat-list-item-focus');
     });
 
     it('should be able to set a value on a list option', () => {
@@ -144,12 +149,9 @@ describe('MatSelectionList', () => {
         createKeyboardEvent('keydown', SPACE, testListItem);
       let selectList =
           selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
-      let options = selectionList.componentInstance.options;
-      let array = options.toArray();
-      let focusItem = array[1];
       expect(selectList.selected.length).toBe(0);
 
-      focusItem.focus();
+      dispatchFakeEvent(testListItem, 'focus');
       selectionList.componentInstance._keydown(SPACE_EVENT);
 
       fixture.detectChanges();
@@ -157,16 +159,26 @@ describe('MatSelectionList', () => {
       expect(selectList.selected.length).toBe(1);
     });
 
+    it('should restore focus if active option is destroyed', () => {
+      const manager = selectionList.componentInstance._keyManager;
+
+      listOption[3].componentInstance._handleFocus();
+
+      expect(manager.activeItemIndex).toBe(3);
+
+      fixture.componentInstance.showLastOption = false;
+      fixture.detectChanges();
+
+      expect(manager.activeItemIndex).toBe(2);
+    });
+
     it('should focus previous item when press UP ARROW', () => {
       let testListItem = listOption[2].nativeElement as HTMLElement;
       let UP_EVENT: KeyboardEvent =
         createKeyboardEvent('keydown', UP_ARROW, testListItem);
-      let options = selectionList.componentInstance.options;
-      let array = options.toArray();
-      let focusItem = array[2];
       let manager = selectionList.componentInstance._keyManager;
 
-      focusItem.focus();
+      dispatchFakeEvent(listOption[2].nativeElement, 'focus');
       expect(manager.activeItemIndex).toEqual(2);
 
       selectionList.componentInstance._keydown(UP_EVENT);
@@ -180,12 +192,9 @@ describe('MatSelectionList', () => {
       let testListItem = listOption[2].nativeElement as HTMLElement;
       let DOWN_EVENT: KeyboardEvent =
         createKeyboardEvent('keydown', DOWN_ARROW, testListItem);
-      let options = selectionList.componentInstance.options;
-      let array = options.toArray();
-      let focusItem = array[2];
       let manager = selectionList.componentInstance._keyManager;
 
-      focusItem.focus();
+      dispatchFakeEvent(listOption[2].nativeElement, 'focus');
       expect(manager.activeItemIndex).toEqual(2);
 
       selectionList.componentInstance._keydown(DOWN_EVENT);
@@ -432,11 +441,12 @@ describe('MatSelectionList', () => {
     <mat-list-option checkboxPosition="before" value="sent-mail">
       Sent Mail
     </mat-list-option>
-    <mat-list-option checkboxPosition="before" value="drafts">
+    <mat-list-option checkboxPosition="before" value="drafts" *ngIf="showLastOption">
       Drafts
     </mat-list-option>
   </mat-selection-list>`})
 class SelectionListWithListOptions {
+  showLastOption: boolean = true;
 }
 
 @Component({template: `
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index f476fa95cd9a..80fe6de4eab8 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -10,7 +10,6 @@ import {FocusableOption, FocusKeyManager} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
 import {SPACE} from '@angular/cdk/keycodes';
-import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -38,8 +37,6 @@ import {
   mixinDisabled,
   mixinDisableRipple,
 } from '@angular/material/core';
-import {merge} from 'rxjs/observable/merge';
-import {Subscription} from 'rxjs/Subscription';
 
 
 /** @docs-private */
@@ -55,8 +52,6 @@ export interface MatSelectionListOptionEvent {
   option: MatListOption;
 }
 
-const FOCUSED_STYLE: string = 'mat-list-item-focus';
-
 /**
  * Component for list-options of selection-list. Each list-option can automatically
  * generate a checkbox and can put current item into the selectionModel of selection-list
@@ -70,10 +65,11 @@ const FOCUSED_STYLE: string = 'mat-list-item-focus';
     'role': 'option',
     'class': 'mat-list-item mat-list-option',
     '(focus)': '_handleFocus()',
-    '(blur)': '_handleBlur()',
+    '(blur)': '_hasFocus = false',
     '(click)': '_handleClick()',
     'tabindex': '-1',
     '[class.mat-list-item-disabled]': 'disabled',
+    '[class.mat-list-item-focus]': '_hasFocus',
     '[attr.aria-selected]': 'selected.toString()',
     '[attr.aria-disabled]': 'disabled.toString()',
   },
@@ -109,18 +105,12 @@ export class MatListOption extends _MatListOptionMixinBase
   get selected() { return this._selected; }
   set selected(value: boolean) { this._selected = coerceBooleanProperty(value); }
 
-  /** Emitted when the option is focused. */
-  onFocus = new EventEmitter<MatSelectionListOptionEvent>();
-
   /** Emitted when the option is selected. */
   @Output() selectChange = new EventEmitter<MatSelectionListOptionEvent>();
 
   /** Emitted when the option is deselected. */
   @Output() deselected = new EventEmitter<MatSelectionListOptionEvent>();
 
-  /** Emitted when the option is destroyed. */
-  @Output() destroyed = new EventEmitter<MatSelectionListOptionEvent>();
-
   constructor(private _renderer: Renderer2,
               private _element: ElementRef,
               private _changeDetector: ChangeDetectorRef,
@@ -144,7 +134,7 @@ export class MatListOption extends _MatListOptionMixinBase
   }
 
   ngOnDestroy(): void {
-    this.destroyed.emit({option: this});
+    this.selectionList._removeOptionFromList(this);
   }
 
   /** Toggles the selection state of the option. */
@@ -157,7 +147,6 @@ export class MatListOption extends _MatListOptionMixinBase
   /** Allows for programmatic focusing of the option. */
   focus(): void {
     this._element.nativeElement.focus();
-    this.onFocus.emit({option: this});
   }
 
   /** Whether this list item should show a ripple effect when clicked.  */
@@ -173,11 +162,7 @@ export class MatListOption extends _MatListOptionMixinBase
 
   _handleFocus() {
     this._hasFocus = true;
-    this._renderer.addClass(this._element.nativeElement, FOCUSED_STYLE);
-  }
-
-  _handleBlur() {
-    this._renderer.removeClass(this._element.nativeElement, FOCUSED_STYLE);
+    this.selectionList._setFocusedOption(this);
   }
 
   /** Retrieves the DOM element of the component host. */
@@ -208,17 +193,11 @@ export class MatListOption extends _MatListOptionMixinBase
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatSelectionList extends _MatSelectionListMixinBase
-    implements FocusableOption, CanDisable, CanDisableRipple, AfterContentInit, OnDestroy {
+    implements FocusableOption, CanDisable, CanDisableRipple, AfterContentInit {
 
   /** Tab index for the selection-list. */
   _tabIndex = 0;
 
-  /** Subscription to all list options' onFocus events */
-  private _optionFocusSubscription = Subscription.EMPTY;
-
-  /** Subscription to all list options' destroy events  */
-  private _optionDestroyStream = Subscription.EMPTY;
-
   /** The FocusKeyManager which handles focus. */
   _keyManager: FocusKeyManager<MatListOption>;
 
@@ -238,14 +217,6 @@ export class MatSelectionList extends _MatSelectionListMixinBase
     if (this.disabled) {
       this._tabIndex = -1;
     }
-
-    this._optionFocusSubscription = this._onFocusSubscription();
-    this._optionDestroyStream = this._onDestroySubscription();
-  }
-
-  ngOnDestroy(): void {
-    this._optionDestroyStream.unsubscribe();
-    this._optionFocusSubscription.unsubscribe();
   }
 
   /** Focus the selection-list. */
@@ -271,36 +242,23 @@ export class MatSelectionList extends _MatSelectionListMixinBase
     });
   }
 
-  /** Map all the options' destroy event subscriptions and merge them into one stream. */
-  private _onDestroySubscription(): Subscription {
-    return RxChain.from(this.options.changes)
-      .call(startWith, this.options)
-      .call(switchMap, (options: MatListOption[]) => {
-        return merge(...options.map(option => option.destroyed));
-      }).subscribe((e: MatSelectionListOptionEvent) => {
-        let optionIndex: number = this.options.toArray().indexOf(e.option);
-        if (e.option._hasFocus) {
-          // Check whether the option is the last item
-          if (optionIndex < this.options.length - 1) {
-            this._keyManager.setActiveItem(optionIndex);
-          } else if (optionIndex - 1 >= 0) {
-            this._keyManager.setActiveItem(optionIndex - 1);
-          }
-        }
-        e.option.destroyed.unsubscribe();
-      });
+  /** Sets the focused option of the selection-list. */
+  _setFocusedOption(option: MatListOption) {
+    this._keyManager.updateActiveItemIndex(this._getOptionIndex(option));
   }
 
-  /** Map all the options' onFocus event subscriptions and merge them into one stream. */
-  private _onFocusSubscription(): Subscription {
-    return RxChain.from(this.options.changes)
-      .call(startWith, this.options)
-      .call(switchMap, (options: MatListOption[]) => {
-        return merge(...options.map(option => option.onFocus));
-      }).subscribe((e: MatSelectionListOptionEvent) => {
-      let optionIndex: number = this.options.toArray().indexOf(e.option);
-      this._keyManager.updateActiveItemIndex(optionIndex);
-    });
+  /** Removes an option from the selection list and updates the active item. */
+  _removeOptionFromList(option: MatListOption) {
+    if (option._hasFocus) {
+      const optionIndex = this._getOptionIndex(option);
+
+      // Check whether the option is the last item
+      if (optionIndex > 0) {
+        this._keyManager.setPreviousItemActive();
+      } else if (optionIndex === 0 && this.options.length > 1) {
+        this._keyManager.setNextItemActive();
+      }
+    }
   }
 
   /** Passes relevant key presses to our key manager. */
@@ -338,4 +296,9 @@ export class MatSelectionList extends _MatSelectionListMixinBase
   private _isValidIndex(index: number): boolean {
     return index >= 0 && index < this.options.length;
   }
+
+  /** Returns the index of the specified list option. */
+  private _getOptionIndex(option: MatListOption): number {
+    return this.options.toArray().indexOf(option);
+  }
 }

From daa388013b7fa477b99fcb54cc154e92e94ef05f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:12:13 +0200
Subject: [PATCH 185/575] fix(dialog): directionality not injected into child
 components (#7111)

Since the `direction` option from the overlay only sets the `dir` attribute, it means that any components that depend on the `Directionality` service (e.g. `md-slider`) won't be able to pick it up. These changes add the proper direction to the custom dialog injector.
---
 src/lib/dialog/dialog.spec.ts | 12 +++++++++++-
 src/lib/dialog/dialog.ts      |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index dcd1489553d2..1ce22f92d319 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -22,6 +22,7 @@ import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Location} from '@angular/common';
 import {SpyLocation} from '@angular/common/testing';
+import {Directionality} from '@angular/cdk/bidi';
 import {MatDialogContainer} from './dialog-container';
 import {OverlayContainer} from '@angular/cdk/overlay';
 import {ESCAPE} from '@angular/cdk/keycodes';
@@ -433,6 +434,14 @@ describe('MatDialog', () => {
     expect(overlayPane.getAttribute('dir')).toBe('rtl');
   });
 
+  it('should inject the correct layout direction in the component instance', () => {
+    const dialogRef = dialog.open(PizzaMsg, { direction: 'rtl' });
+
+    viewContainerFixture.detectChanges();
+
+    expect(dialogRef.componentInstance.directionality.value).toBe('rtl');
+  });
+
   it('should close all of the dialogs', async(() => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
@@ -970,7 +979,8 @@ class ComponentWithTemplateRef {
 @Component({template: '<p>Pizza</p> <input> <button>Close</button>'})
 class PizzaMsg {
   constructor(public dialogRef: MatDialogRef<PizzaMsg>,
-              public dialogInjector: Injector) {}
+              public dialogInjector: Injector,
+              public directionality: Directionality) {}
 }
 
 @Component({
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 2f891d2372d1..38621ce96286 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -28,12 +28,14 @@ import {
   TemplateRef,
 } from '@angular/core';
 import {extendObject} from '@angular/material/core';
+import {Directionality} from '@angular/cdk/bidi';
 import {Observable} from 'rxjs/Observable';
 import {defer} from 'rxjs/observable/defer';
 import {Subject} from 'rxjs/Subject';
 import {MatDialogConfig} from './dialog-config';
 import {MatDialogContainer} from './dialog-container';
 import {MatDialogRef} from './dialog-ref';
+import {of as observableOf} from 'rxjs/observable/of';
 
 
 export const MAT_DIALOG_DATA = new InjectionToken<any>('MatDialogData');
@@ -277,6 +279,10 @@ export class MatDialog {
     injectionTokens.set(MatDialogRef, dialogRef);
     injectionTokens.set(MatDialogContainer, dialogContainer);
     injectionTokens.set(MAT_DIALOG_DATA, config.data);
+    injectionTokens.set(Directionality, {
+      value: config.direction,
+      change: observableOf()
+    });
 
     return new PortalInjector(userInjector || this._injector, injectionTokens);
   }

From 6bd6b9f1ebb260eaa2670dfb45bef3702dbc76ed Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:12:25 +0200
Subject: [PATCH 186/575] fix(autocomplete): remove invalid aria markup (#7107)

Removes the `aria-multiline` attribute, because it is not allowed on a `role="combobox"`.

Fixes #7100.
---
 src/lib/autocomplete/autocomplete-trigger.ts | 1 -
 src/lib/autocomplete/autocomplete.spec.ts    | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 15cfe649a844..abbc2c0fbda5 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -99,7 +99,6 @@ export function getMatAutocompleteMissingPanelError(): Error {
     'role': 'combobox',
     'autocomplete': 'off',
     'aria-autocomplete': 'list',
-    'aria-multiline': 'false',
     '[attr.aria-activedescendant]': 'activeOption?.id',
     '[attr.aria-expanded]': 'panelOpen.toString()',
     '[attr.aria-owns]': 'autocomplete?.id',
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 3096f21e8fc2..9957cf4b03ba 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1154,11 +1154,6 @@ describe('MatAutocomplete', () => {
           .toEqual('list', 'Expected aria-autocomplete attribute to equal list.');
     });
 
-    it('should set aria-multiline to false', () => {
-      expect(input.getAttribute('aria-multiline'))
-          .toEqual('false', 'Expected aria-multiline attribute to equal false.');
-    });
-
     it('should set aria-activedescendant based on the active option', async(() => {
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();

From 8e7726102b9d41c7bb7fcc08e58af9f276b9a8ab Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:12:47 +0200
Subject: [PATCH 187/575] fix(snack-bar): subsequent snack bars not opening;
 animation issues (#7086)

* Fixes subsequent snack bars not showing up if they are opened while another snack bar is open. This was due to the latter snack bar getting closed immediately, because one of the animation events coming in is `void->void`.
* Simplifies the logic for determining the animation state. Using the getter ended up passing returning an invalid state in some cases (e.g. `undefined-top` or `undefined-bottom`).

Fixes #7063.
---
 src/lib/snack-bar/snack-bar-container.ts | 24 ++++++++----------------
 src/lib/snack-bar/snack-bar.spec.ts      | 14 +++++++-------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 15288df08ef1..84eeeea76c53 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -38,8 +38,6 @@ import {Subject} from 'rxjs/Subject';
 import {MatSnackBarConfig} from './snack-bar-config';
 
 
-export type SnackBarState = 'visible' | 'hidden' | 'void';
-
 // TODO(jelbourn): we can't use constants from animation.ts here because you can't use
 // a text interpolation in anything that is analyzed statically with ngc (for AoT compile).
 export const SHOW_ANIMATION = '225ms cubic-bezier(0.4,0.0,1,1)';
@@ -60,7 +58,7 @@ export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
   host: {
     'role': 'alert',
     'class': 'mat-snack-bar-container',
-    '[@state]': 'getAnimationState()',
+    '[@state]': '_animationState',
     '(@state.done)': 'onAnimationEnd($event)'
   },
   animations: [
@@ -93,7 +91,7 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
   _onEnter: Subject<any> = new Subject();
 
   /** The state of the snack bar animations. */
-  private _animationState: SnackBarState;
+  _animationState = 'void';
 
   /** The snack bar configuration. */
   snackBarConfig: MatSnackBarConfig;
@@ -106,14 +104,6 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
     super();
   }
 
-  /**
-   * Gets the current animation state both combining one of the possibilities from
-   * SnackBarState and the vertical location.
-   */
-  getAnimationState(): string {
-    return `${this._animationState}-${this.snackBarConfig.verticalPosition}`;
-  }
-
   /** Attach a component portal as content to this snack bar container. */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
     if (this._portalHost.hasAttached()) {
@@ -146,11 +136,13 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
 
   /** Handle end of animations, updating the state of the snackbar. */
   onAnimationEnd(event: AnimationEvent) {
-    if (event.toState === 'void' || event.toState.startsWith('hidden')) {
+    const {fromState, toState} = event;
+
+    if ((toState === 'void' && fromState !== 'void') || toState.startsWith('hidden')) {
       this._completeExit();
     }
 
-    if (event.toState.startsWith('visible')) {
+    if (toState.startsWith('visible')) {
       // Note: we shouldn't use `this` inside the zone callback,
       // because it can cause a memory leak.
       const onEnter = this._onEnter;
@@ -165,14 +157,14 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
   /** Begin animation of snack bar entrance into view. */
   enter(): void {
     if (!this._destroyed) {
-      this._animationState = 'visible';
+      this._animationState = `visible-${this.snackBarConfig.verticalPosition}`;
       this._changeDetectorRef.detectChanges();
     }
   }
 
   /** Begin animation of the snack bar exiting from view. */
   exit(): Observable<void> {
-    this._animationState = 'hidden';
+    this._animationState = `hidden-${this.snackBarConfig.verticalPosition}`;
     return this._onExit;
   }
 
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 91f6adb70f0b..2133b84d810f 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -186,12 +186,12 @@ describe('MatSnackBar', () => {
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.getAnimationState())
+    expect(snackBarRef.containerInstance._animationState)
         .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
     snackBarRef.dismiss();
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.getAnimationState())
+    expect(snackBarRef.containerInstance._animationState)
         .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
   });
 
@@ -201,7 +201,7 @@ describe('MatSnackBar', () => {
     snackBarRef.dismiss();
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.getAnimationState())
+    expect(snackBarRef.containerInstance._animationState)
         .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
   });
 
@@ -212,7 +212,7 @@ describe('MatSnackBar', () => {
     let dismissObservableCompleted = false;
 
     viewContainerFixture.detectChanges();
-    expect(snackBarRef.containerInstance.getAnimationState())
+    expect(snackBarRef.containerInstance._animationState)
         .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
 
     let config2 = {viewContainerRef: testViewContainerRef};
@@ -225,9 +225,9 @@ describe('MatSnackBar', () => {
 
     viewContainerFixture.whenStable().then(() => {
       expect(dismissObservableCompleted).toBe(true);
-      expect(snackBarRef.containerInstance.getAnimationState())
+      expect(snackBarRef.containerInstance._animationState)
           .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
-      expect(snackBarRef2.containerInstance.getAnimationState())
+      expect(snackBarRef2.containerInstance._animationState)
           .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
     });
   }));
@@ -248,7 +248,7 @@ describe('MatSnackBar', () => {
 
       // Wait for the snackbar open animation to finish.
       viewContainerFixture.whenStable().then(() => {
-        expect(snackBarRef.containerInstance.getAnimationState())
+        expect(snackBarRef.containerInstance._animationState)
             .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
       });
     });

From 504ba70abdeb7c3ecdf0eb53e5b8a23867325487 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:13:12 +0200
Subject: [PATCH 188/575] fix(autocomplete): error if panel is added
 asynchronously (#7078)

Fixes an error that was thrown when an autocomplete trigger is initialized without a panel. Note that an error will still be thrown, but only if the user attempts to open the panel.

Fixes #7069.
---
 src/lib/autocomplete/autocomplete-trigger.ts |  4 +++-
 src/lib/autocomplete/autocomplete.spec.ts    | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index abbc2c0fbda5..f1622d6c93fc 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -390,7 +390,9 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   }
 
   private _setTriggerValue(value: any): void {
-    const toDisplay = this.autocomplete.displayWith ? this.autocomplete.displayWith(value) : value;
+    const toDisplay = this.autocomplete && this.autocomplete.displayWith ?
+      this.autocomplete.displayWith(value) :
+      value;
 
     // Simply falling back to an empty string if the display value is falsy does not work properly.
     // The display value can also be the number zero and shouldn't fall back to an empty string.
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 9957cf4b03ba..ed23ad7f38e9 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1512,6 +1512,15 @@ describe('MatAutocomplete', () => {
       }).toThrow(getMatAutocompleteMissingPanelError());
     }));
 
+    it('should not throw on init, even if the panel is not defined', fakeAsync(() => {
+      expect(() => {
+        const fixture = TestBed.createComponent(AutocompleteWithoutPanel);
+        fixture.componentInstance.control.setValue('Something');
+        fixture.detectChanges();
+        tick();
+      }).not.toThrow();
+    }));
+
     it('should hide the placeholder with a preselected form control value ' +
       'and a disabled floating placeholder', fakeAsync(() => {
         const fixture = TestBed.createComponent(AutocompleteWithFormsAndNonfloatingPlaceholder);
@@ -1885,10 +1894,11 @@ class AutocompleteWithNativeInput {
 
 
 @Component({
-  template: `<input placeholder="Choose" [matAutocomplete]="auto">`
+  template: `<input placeholder="Choose" [matAutocomplete]="auto" [formControl]="control">`
 })
 class AutocompleteWithoutPanel {
   @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
+  control = new FormControl();
 }
 
 

From c82fca8626b8400861a0e79a57677d71e3ef5b4b Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:13:35 +0200
Subject: [PATCH 189/575] fix(slide-toggle): report change to model before
 firing a change event (#7076)

Whenever the value of the slide-toggle changes through interaction, a `change` event will be emitted. The value change then will be reported to the `ControlValueAccessor` which fires the `ngModelChange` output.

Right now the `ngModelChange` output fires after the normal `change` output. This should be the other way around because developers expect the two-way data binding to already reflect the change.

Fixes #7074
---
 src/lib/slide-toggle/slide-toggle.spec.ts | 29 ++++++++++++++++++++++-
 src/lib/slide-toggle/slide-toggle.ts      |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index bf50e88ec225..c4234540c725 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -563,7 +563,8 @@ describe('MatSlideToggle with forms', () => {
       declarations: [
         SlideToggleWithForm,
         SlideToggleWithModel,
-        SlideToggleWithFormControl
+        SlideToggleWithFormControl,
+        SlideToggleWithModelAndChangeEvent,
       ]
     });
 
@@ -795,6 +796,24 @@ describe('MatSlideToggle with forms', () => {
       expect(testComponent.isSubmitted).toBe(true);
     });
   });
+
+  describe('with model and change event', () => {
+    it('should report changes to NgModel before emitting change event', () => {
+      const fixture = TestBed.createComponent(SlideToggleWithModelAndChangeEvent);
+      fixture.detectChanges();
+
+      const labelEl = fixture.debugElement.query(By.css('label')).nativeElement;
+
+      spyOn(fixture.componentInstance, 'onChange').and.callFake(() => {
+        expect(fixture.componentInstance.checked)
+          .toBe(true, 'Expected the model value to have changed before the change event fired.');
+      });
+
+      labelEl.click();
+
+      expect(fixture.componentInstance.onChange).toHaveBeenCalledTimes(1);
+    });
+  });
 });
 
 @Component({
@@ -873,3 +892,11 @@ class SlideToggleWithTabindexAttr {}
 class SlideToggleWithoutLabel {
   label: string;
 }
+
+@Component({
+  template: `<md-slide-toggle [(ngModel)]="checked" (change)="onChange()"></md-slide-toggle>`
+})
+class SlideToggleWithModelAndChangeEvent {
+  checked: boolean;
+  onChange: () => void = () => {};
+}
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 1bd02ed5ed40..240052f138e4 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -251,8 +251,8 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
     let event = new MatSlideToggleChange();
     event.source = this;
     event.checked = this.checked;
-    this.change.emit(event);
     this.onChange(this.checked);
+    this.change.emit(event);
   }
 
   _onDragStart() {

From b0b91f430799ed807bbdb011f054d743b5141ce3 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:13:50 +0200
Subject: [PATCH 190/575] fix(drawer): drawer container not reacting to drawer
 removal (#7060)

Fixes the drawer container not reacting if one of the drawers is destroyed.

Fixes #6271.
---
 src/lib/sidenav/drawer.spec.ts | 63 +++++++++++++++++++++++++++++++++-
 src/lib/sidenav/drawer.ts      | 27 ++++++++++-----
 2 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index f5f0b458b150..d5e03ec8fa4e 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -323,7 +323,11 @@ describe('MatDrawerContainer', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MatSidenavModule, A11yModule, PlatformModule, NoopAnimationsModule],
-      declarations: [DrawerContainerTwoDrawerTestApp, DrawerDelayed],
+      declarations: [
+        DrawerContainerTwoDrawerTestApp,
+        DrawerDelayed,
+        DrawerContainerStateChangesTestApp,
+      ],
     });
 
     TestBed.compileComponents();
@@ -372,6 +376,47 @@ describe('MatDrawerContainer', () => {
 
     expect(parseInt(contentElement.style.marginLeft)).toBeGreaterThan(0);
   }));
+
+  it('should recalculate the margin if a drawer is destroyed', fakeAsync(() => {
+    const fixture = TestBed.createComponent(DrawerContainerStateChangesTestApp);
+
+    fixture.detectChanges();
+    fixture.componentInstance.drawer.open();
+    fixture.detectChanges();
+    tick();
+    fixture.detectChanges();
+
+    const contentElement = fixture.debugElement.nativeElement.querySelector('.mat-drawer-content');
+    const initialMargin = parseInt(contentElement.style.marginLeft);
+
+    expect(initialMargin).toBeGreaterThan(0);
+
+    fixture.componentInstance.renderDrawer = false;
+    fixture.detectChanges();
+
+    expect(parseInt(contentElement.style.marginLeft)).toBeLessThan(initialMargin);
+  }));
+
+  it('should recalculate the margin if the drawer mode is changed', fakeAsync(() => {
+    const fixture = TestBed.createComponent(DrawerContainerStateChangesTestApp);
+
+    fixture.detectChanges();
+    fixture.componentInstance.drawer.open();
+    fixture.detectChanges();
+    tick();
+    fixture.detectChanges();
+
+    const contentElement = fixture.debugElement.nativeElement.querySelector('.mat-drawer-content');
+    const initialMargin = parseInt(contentElement.style.marginLeft);
+
+    expect(initialMargin).toBeGreaterThan(0);
+
+    fixture.componentInstance.mode = 'over';
+    fixture.detectChanges();
+
+    expect(parseInt(contentElement.style.marginLeft)).toBeLessThan(initialMargin);
+  }));
+
 });
 
 
@@ -485,3 +530,19 @@ class DrawerDelayed {
   @ViewChild(MatDrawer) drawer: MatDrawer;
   showDrawer = false;
 }
+
+
+@Component({
+  template: `
+    <mat-drawer-container>
+      <mat-drawer *ngIf="renderDrawer" [mode]="mode"></mat-drawer>
+    </mat-drawer-container>`,
+})
+class DrawerContainerStateChangesTestApp {
+  @ViewChild(MatDrawer) drawer: MatDrawer;
+  @ViewChild(MatDrawerContainer) drawerContainer: MatDrawerContainer;
+
+  mode = 'side';
+  renderDrawer = true;
+}
+
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 95b1ac23eece..b17f9e03d162 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -398,8 +398,8 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   private _left: MatDrawer | null;
   private _right: MatDrawer | null;
 
-  /** Subscription to the Directionality change EventEmitter. */
-  private _dirChangeSubscription = Subscription.EMPTY;
+  /** Emits when the component is destroyed. */
+  private _destroyed = new Subject<void>();
 
   _contentMargins = new Subject<{left: number, right: number}>();
 
@@ -409,23 +409,33 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
     // If a `Dir` directive exists up the tree, listen direction changes and update the left/right
     // properties to point to the proper start/end.
     if (_dir != null) {
-      this._dirChangeSubscription = _dir.change.subscribe(() => this._validateDrawers());
+      takeUntil.call(_dir.change, this._destroyed).subscribe(() => this._validateDrawers());
     }
   }
 
   ngAfterContentInit() {
     startWith.call(this._drawers.changes, null).subscribe(() => {
       this._validateDrawers();
+
       this._drawers.forEach((drawer: MatDrawer) => {
         this._watchDrawerToggle(drawer);
         this._watchDrawerPosition(drawer);
         this._watchDrawerMode(drawer);
       });
+
+      if (!this._drawers.length ||
+          this._isDrawerOpen(this._start) ||
+          this._isDrawerOpen(this._end)) {
+        this._updateContentMargins();
+      }
+
+      this._changeDetectorRef.markForCheck();
     });
   }
 
   ngOnDestroy() {
-    this._dirChangeSubscription.unsubscribe();
+    this._destroyed.next();
+    this._destroyed.complete();
   }
 
   /** Calls `open` of both start and end drawers */
@@ -478,10 +488,11 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   /** Subscribes to changes in drawer mode so we can run change detection. */
   private _watchDrawerMode(drawer: MatDrawer): void {
     if (drawer) {
-      takeUntil.call(drawer._modeChanged, this._drawers.changes).subscribe(() => {
-        this._updateContentMargins();
-        this._changeDetectorRef.markForCheck();
-      });
+      takeUntil.call(drawer._modeChanged, merge(this._drawers.changes, this._destroyed))
+        .subscribe(() => {
+          this._updateContentMargins();
+          this._changeDetectorRef.markForCheck();
+        });
     }
   }
 

From 2dcb76c8f9661776c407313f4cbf753495b1c82c Mon Sep 17 00:00:00 2001
From: Philip Pham <phillypham@google.com>
Date: Fri, 29 Sep 2017 13:14:22 -0700
Subject: [PATCH 191/575] fix(menu): multiple close events for a single close
 (#7037)

Don't emit a closed event when another event will be emitted. Previously, if one clicked on a menu item, one would get two events: `undefined` and `click` in that order. One would see similar behavior for `keydown` or clicking the backdrop. Unit tests were updated to prevent a regression.
---
 src/lib/menu/menu-trigger.ts | 27 +++++++++++++----------
 src/lib/menu/menu.spec.ts    | 42 ++++++++++++++++++++++++++----------
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 32e520353ee6..81808968e894 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -44,7 +44,6 @@ import {MatMenuItem} from './menu-item';
 import {MatMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 
-
 /** Injection token that determines the scroll handling while the menu is open. */
 export const MAT_MENU_SCROLL_STRATEGY =
     new InjectionToken<() => ScrollStrategy>('mat-menu-scroll-strategy');
@@ -130,7 +129,7 @@ export class MatMenuTrigger implements AfterViewInit, OnDestroy {
     this._checkMenu();
 
     this.menu.close.subscribe(reason => {
-      this.closeMenu();
+      this._destroyMenu();
 
       // If a click closed the menu, we should close the entire chain of nested menus.
       if (reason === 'click' && this._parentMenu) {
@@ -182,7 +181,9 @@ export class MatMenuTrigger implements AfterViewInit, OnDestroy {
   openMenu(): void {
     if (!this._menuOpen) {
       this._createOverlay().attach(this._portal);
-      this._closeSubscription = this._menuClosingActions().subscribe(() => this.menu.close.emit());
+      this._closeSubscription = this._menuClosingActions().subscribe(() => {
+        this.menu.close.emit();
+      });
       this._initMenu();
 
       if (this.menu instanceof MatMenu) {
@@ -193,11 +194,20 @@ export class MatMenuTrigger implements AfterViewInit, OnDestroy {
 
   /** Closes the menu. */
   closeMenu(): void {
+    this.menu.close.emit();
+  }
+
+  /** Focuses the menu trigger. */
+  focus() {
+    this._element.nativeElement.focus();
+  }
+
+  /** Closes the menu and does the necessary cleanup. */
+  private _destroyMenu() {
     if (this._overlayRef && this.menuOpen) {
       this._resetMenu();
       this._overlayRef.detach();
       this._closeSubscription.unsubscribe();
-      this.menu.close.emit();
 
       if (this.menu instanceof MatMenu) {
         this.menu._resetAnimation();
@@ -205,11 +215,6 @@ export class MatMenuTrigger implements AfterViewInit, OnDestroy {
     }
   }
 
-  /** Focuses the menu trigger. */
-  focus() {
-    this._element.nativeElement.focus();
-  }
-
   /**
    * This method sets the menu state to open and focuses the first item if
    * the menu was opened via the keyboard.
@@ -377,11 +382,11 @@ export class MatMenuTrigger implements AfterViewInit, OnDestroy {
   /** Returns a stream that emits whenever an action that should close the menu occurs. */
   private _menuClosingActions() {
     const backdrop = this._overlayRef!.backdropClick();
-    const parentClose = this._parentMenu ? this._parentMenu.close : observableOf(null);
+    const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
     const hover = this._parentMenu ? RxChain.from(this._parentMenu.hover())
         .call(filter, active => active !== this._menuItemInstance)
         .call(filter, () => this._menuOpen)
-        .result() : observableOf(null);
+        .result() : observableOf();
 
     return merge(backdrop, parentClose, hover);
   }
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 1b82873a61d3..0370cd13d8fb 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -98,7 +98,7 @@ describe('MatMenu', () => {
     expect(overlayContainerElement.textContent).toBe('');
   }));
 
-  it('should close the menu when pressing escape', fakeAsync(() => {
+  it('should close the menu when pressing ESCAPE', fakeAsync(() => {
     const fixture = TestBed.createComponent(SimpleMenu);
     fixture.detectChanges();
     fixture.componentInstance.trigger.openMenu();
@@ -494,26 +494,40 @@ describe('MatMenu', () => {
       menuItem.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalled();
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith('click');
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
     });
 
     it('should emit a close event when the backdrop is clicked', () => {
-      const backdrop = <HTMLElement>overlayContainerElement.querySelector('.cdk-overlay-backdrop');
+      const backdrop = overlayContainerElement
+          .querySelector('.cdk-overlay-backdrop') as HTMLElement;
 
       backdrop.click();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.closeCallback).toHaveBeenCalled();
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith(undefined);
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
+    });
+
+    it('should emit an event when pressing ESCAPE', () => {
+      const menu = overlayContainerElement.querySelector('.mat-menu-panel') as HTMLElement;
+
+      dispatchKeyboardEvent(menu, 'keydown', ESCAPE);
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledWith('keydown');
+      expect(fixture.componentInstance.closeCallback).toHaveBeenCalledTimes(1);
     });
 
     it('should complete the callback when the menu is destroyed', () => {
-      let emitCallback = jasmine.createSpy('emit callback');
-      let completeCallback = jasmine.createSpy('complete callback');
+      const emitCallback = jasmine.createSpy('emit callback');
+      const completeCallback = jasmine.createSpy('complete callback');
 
       fixture.componentInstance.menu.close.subscribe(emitCallback, null, completeCallback);
       fixture.destroy();
 
-      expect(emitCallback).toHaveBeenCalled();
+      expect(emitCallback).toHaveBeenCalledWith(undefined);
+      expect(emitCallback).toHaveBeenCalledTimes(1);
       expect(completeCallback).toHaveBeenCalled();
     });
   });
@@ -995,6 +1009,9 @@ describe('MatMenu', () => {
       tick(500);
 
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(0, 'Expected no open menus');
+      expect(instance.rootCloseCallback).toHaveBeenCalledTimes(1);
+      expect(instance.levelOneCloseCallback).toHaveBeenCalledTimes(1);
+      expect(instance.levelTwoCloseCallback).toHaveBeenCalledTimes(1);
     }));
 
     it('should toggle a nested menu when its trigger is added after init', fakeAsync(() => {
@@ -1059,7 +1076,7 @@ describe('MatMenu default overrides', () => {
 @Component({
   template: `
     <button [matMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <mat-menu class="custom-one custom-two" #menu="matMenu" (close)="closeCallback()">
+    <mat-menu class="custom-one custom-two" #menu="matMenu" (close)="closeCallback($event)">
       <button mat-menu-item> Item </button>
       <button mat-menu-item disabled> Disabled </button>
     </mat-menu>
@@ -1152,7 +1169,7 @@ class CustomMenu {
       [matMenuTriggerFor]="levelTwo"
       #alternateTrigger="matMenuTrigger">Toggle alternate menu</button>
 
-    <mat-menu #root="matMenu">
+    <mat-menu #root="matMenu" (close)="rootCloseCallback($event)">
       <button mat-menu-item
         id="level-one-trigger"
         [matMenuTriggerFor]="levelOne"
@@ -1165,7 +1182,7 @@ class CustomMenu {
         #lazyTrigger="matMenuTrigger">Three</button>
     </mat-menu>
 
-    <mat-menu #levelOne="matMenu">
+    <mat-menu #levelOne="matMenu" (close)="levelOneCloseCallback($event)">
       <button mat-menu-item>Four</button>
       <button mat-menu-item
         id="level-two-trigger"
@@ -1174,7 +1191,7 @@ class CustomMenu {
       <button mat-menu-item>Six</button>
     </mat-menu>
 
-    <mat-menu #levelTwo="matMenu">
+    <mat-menu #levelTwo="matMenu" (close)="levelTwoCloseCallback($event)">
       <button mat-menu-item>Seven</button>
       <button mat-menu-item>Eight</button>
       <button mat-menu-item>Nine</button>
@@ -1192,12 +1209,15 @@ class NestedMenu {
   @ViewChild('rootTrigger') rootTrigger: MatMenuTrigger;
   @ViewChild('rootTriggerEl') rootTriggerEl: ElementRef;
   @ViewChild('alternateTrigger') alternateTrigger: MatMenuTrigger;
+  readonly rootCloseCallback = jasmine.createSpy('root menu closed callback');
 
   @ViewChild('levelOne') levelOneMenu: MatMenu;
   @ViewChild('levelOneTrigger') levelOneTrigger: MatMenuTrigger;
+  readonly levelOneCloseCallback = jasmine.createSpy('level one menu closed callback');
 
   @ViewChild('levelTwo') levelTwoMenu: MatMenu;
   @ViewChild('levelTwoTrigger') levelTwoTrigger: MatMenuTrigger;
+  readonly levelTwoCloseCallback = jasmine.createSpy('level one menu closed callback');
 
   @ViewChild('lazy') lazyMenu: MatMenu;
   @ViewChild('lazyTrigger') lazyTrigger: MatMenuTrigger;

From 2129b7a7f9567480ab6e5d347ae4aa9fa02c323d Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 29 Sep 2017 13:14:42 -0700
Subject: [PATCH 192/575] fix(datepicker): make sure _datepickerInput exists
 before accessing its (#7033)

* fix(datepicker): make sure _datepickerInput exists before accessing its
disabled property.

* add test
---
 src/lib/datepicker/datepicker.spec.ts | 4 ++++
 src/lib/datepicker/datepicker.ts      | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 3f87fc50749d..c9d0ff8768ee 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -304,6 +304,10 @@ describe('MatDatepicker', () => {
         fixture.detectChanges();
       }));
 
+      it('should not throw when accessing disabled property', () => {
+        expect(() => testComponent.datepicker.disabled).not.toThrow();
+      });
+
       it('should throw when opened with no registered inputs', async(() => {
         expect(() => testComponent.datepicker.open()).toThrow();
       }));
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index cc25a957df13..cbd4c0da8cf7 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -147,7 +147,8 @@ export class MatDatepicker<D> implements OnDestroy {
   /** Whether the datepicker pop-up should be disabled. */
   @Input()
   get disabled() {
-    return this._disabled === undefined ? this._datepickerInput.disabled : this._disabled;
+    return this._disabled === undefined && this._datepickerInput ?
+        this._datepickerInput.disabled : this._disabled;
   }
   set disabled(value: any) {
     const newValue = coerceBooleanProperty(value);

From 947d3e84d1c032a4f11a5c83a36e34b6bd5f45b1 Mon Sep 17 00:00:00 2001
From: Marcelo Luz <marcelopluz@gmail.com>
Date: Fri, 29 Sep 2017 16:15:02 -0400
Subject: [PATCH 193/575] fix(select) aria-labelledby (#7022)

aria-labelledby must not be in the DOM if it is empty
this causes accessability bugs.
---
 src/lib/select/select.spec.ts | 9 +++++++++
 src/lib/select/select.ts      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 8a8bb96260df..93fafbcc1d1f 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -1802,6 +1802,15 @@ describe('MatSelect', () => {
         expect(select.getAttribute('aria-labelledby')).toBe('myLabelId');
       });
 
+      it('should not have aria-labelledby in the DOM if it`s not specified', async(() => {
+
+        fixture.detectChanges();
+
+        fixture.whenStable().then(() => {
+          expect(select.hasAttribute('aria-labelledby')).toBeFalsy();
+        });
+      }));
+
       it('should set the tabindex of the select to 0 by default', () => {
         expect(select.getAttribute('tabindex')).toEqual('0');
       });
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8a5f3d46259d..1a5038a9b5f7 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -371,7 +371,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   @Input('aria-label') ariaLabel: string = '';
 
   /** Input that can be used to specify the `aria-labelledby` attribute. */
-  @Input('aria-labelledby') ariaLabelledby: string = '';
+  @Input('aria-labelledby') ariaLabelledby: string;
 
   /** Unique id of the element. */
   @Input()

From dcf107472bccd5b1dc1ddfc0c29a6185f5634b3d Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 29 Sep 2017 13:15:16 -0700
Subject: [PATCH 194/575] Handle overflow in .mat-expansion-panel-body. (#7012)

---
 src/lib/expansion/expansion-panel.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/expansion/expansion-panel.scss b/src/lib/expansion/expansion-panel.scss
index 24215855ddeb..a0e8b91db776 100644
--- a/src/lib/expansion/expansion-panel.scss
+++ b/src/lib/expansion/expansion-panel.scss
@@ -15,7 +15,8 @@
 }
 
 .mat-expansion-panel-body {
-  padding: 0 24px 16px;
+  margin: 0 24px 16px;
+  overflow: auto;
 }
 
 .mat-expansion-panel-spacing {

From 5da9e64b36e3498c0a2e2e35a69a55c2b932ffe6 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:15:28 +0200
Subject: [PATCH 195/575] fix(common-module): check if computed styles are
 available (#7003)

* fix(common-module): check if computed styles are available

Due to a Firefox Bug (https://bugzilla.mozilla.org/show_bug.cgi?id=548397) the `getComputedStyle` call in the `MdCommonModule` will return `null` and cause a runtime exception because normally the computed styles are never `null` for the test element.

Since this it's very uncommon that a developer places a Angular Material application inside of a hidden iframe, a simple null check should be enough to get the application running.

Fixes #7000

* Add comment about Firefox case
---
 src/lib/core/common-behaviors/common-module.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib/core/common-behaviors/common-module.ts b/src/lib/core/common-behaviors/common-module.ts
index 5262c8e6b6a9..e2b1c6323af3 100644
--- a/src/lib/core/common-behaviors/common-module.ts
+++ b/src/lib/core/common-behaviors/common-module.ts
@@ -60,7 +60,12 @@ export class MatCommonModule {
       testElement.classList.add('mat-theme-loaded-marker');
       this._document.body.appendChild(testElement);
 
-      if (getComputedStyle(testElement).display !== 'none') {
+      const computedStyle = getComputedStyle(testElement);
+
+      // In some situations, the computed style of the test element can be null. For example in
+      // Firefox, the computed style is null if an application is running inside of a hidden iframe.
+      // See: https://bugzilla.mozilla.org/show_bug.cgi?id=548397
+      if (computedStyle && computedStyle.display !== 'none') {
         console.warn(
           'Could not find Angular Material core theme. Most Material ' +
           'components may not work as expected. For more info refer ' +

From e52beebbf3939f40471af6ef732821277271ee2c Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:15:51 +0200
Subject: [PATCH 196/575] feat(selection-model): de/select multiple values at
 the same time (#7001)

* feat(selection-model): de/select multiple values at the same time

Adds support for passing multiple values to the SelectionModel at the same time. This feature is described in the JSDoc already, but just wasn't implemented yet.

This functionality gives us more control about the `onChange` event, which will otherwise fire every time if for example multiple values need to be selected.

* Address comments
---
 src/cdk/collections/selection.spec.ts | 24 +++++++++++++++++++++--
 src/cdk/collections/selection.ts      | 28 +++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/cdk/collections/selection.spec.ts b/src/cdk/collections/selection.spec.ts
index 146758053499..024192f97713 100644
--- a/src/cdk/collections/selection.spec.ts
+++ b/src/cdk/collections/selection.spec.ts
@@ -1,4 +1,4 @@
-import {SelectionModel} from './selection';
+import {getMultipleValuesInSingleSelectionError, SelectionModel} from './selection';
 
 
 describe('SelectionModel', () => {
@@ -22,6 +22,10 @@ describe('SelectionModel', () => {
       expect(model.isSelected(2)).toBe(true);
     });
 
+    it('should throw an error if multiple values are passed to model', () => {
+      expect(() => model.select(1, 2)).toThrow(getMultipleValuesInSingleSelectionError());
+    });
+
     it('should only preselect one value', () => {
       model = new SelectionModel(false, [1, 2]);
 
@@ -36,13 +40,29 @@ describe('SelectionModel', () => {
 
     beforeEach(() => model = new SelectionModel(true));
 
-    it('should be able to select multiple options at the same time', () => {
+    it('should be able to select multiple options', () => {
+      const onChangeSpy = jasmine.createSpy('onChange spy');
+
+      model.onChange!.subscribe(onChangeSpy);
       model.select(1);
       model.select(2);
 
       expect(model.selected.length).toBe(2);
       expect(model.isSelected(1)).toBe(true);
       expect(model.isSelected(2)).toBe(true);
+      expect(onChangeSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it('should be able to select multiple options at the same time', () => {
+      const onChangeSpy = jasmine.createSpy('onChange spy');
+
+      model.onChange!.subscribe(onChangeSpy);
+      model.select(1, 2);
+
+      expect(model.selected.length).toBe(2);
+      expect(model.isSelected(1)).toBe(true);
+      expect(model.isSelected(2)).toBe(true);
+      expect(onChangeSpy).toHaveBeenCalledTimes(1);
     });
 
     it('should be able to preselect multiple options', () => {
diff --git a/src/cdk/collections/selection.ts b/src/cdk/collections/selection.ts
index c249544d4a33..eb789ca95b44 100644
--- a/src/cdk/collections/selection.ts
+++ b/src/cdk/collections/selection.ts
@@ -56,16 +56,18 @@ export class SelectionModel<T> {
   /**
    * Selects a value or an array of values.
    */
-  select(value: T): void {
-    this._markSelected(value);
+  select(...values: T[]): void {
+    this._verifyValueAssignment(values);
+    values.forEach(value => this._markSelected(value));
     this._emitChangeEvent();
   }
 
   /**
    * Deselects a value or an array of values.
    */
-  deselect(value: T): void {
-    this._unmarkSelected(value);
+  deselect(...values: T[]): void {
+    this._verifyValueAssignment(values);
+    values.forEach(value => this._unmarkSelected(value));
     this._emitChangeEvent();
   }
 
@@ -162,6 +164,16 @@ export class SelectionModel<T> {
       this._selection.forEach(value => this._unmarkSelected(value));
     }
   }
+
+  /**
+   * Verifies the value assignment and throws an error if the specified value array is
+   * including multiple values while the selection model is not supporting multiple values.
+   */
+  private _verifyValueAssignment(values: T[]) {
+    if (values.length > 1 && !this._isMulti) {
+      throw getMultipleValuesInSingleSelectionError();
+    }
+  }
 }
 
 /**
@@ -171,3 +183,11 @@ export class SelectionModel<T> {
 export class SelectionChange<T> {
   constructor(public added?: T[], public removed?: T[]) { }
 }
+
+/**
+ * Returns an error that reports that multiple values are passed into a selection model
+ * with a single value.
+ */
+export function getMultipleValuesInSingleSelectionError() {
+  return Error('Cannot pass multiple values into SelectionModel with single-value mode.');
+}

From 6f487100fd217a95c5fcd156f8e95f5a51a908c4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:16:02 +0200
Subject: [PATCH 197/575] fix(stepper): avoid blurry content on IE (#6992)

Avoids IE potentially blurring the content inside of a horizontal stepper.

Relates to #6954.
---
 src/lib/stepper/stepper.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 120e6dad7923..2cf8a8feecd5 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -99,10 +99,9 @@ export class MatStepper extends _MatStepper {
   animations: [
     trigger('stepTransition', [
       state('previous', style({transform: 'translate3d(-100%, 0, 0)', visibility: 'hidden'})),
-      state('current', style({transform: 'translate3d(0%, 0, 0)', visibility: 'visible'})),
+      state('current', style({transform: 'none', visibility: 'visible'})),
       state('next', style({transform: 'translate3d(100%, 0, 0)', visibility: 'hidden'})),
-      transition('* => *',
-          animate('500ms cubic-bezier(0.35, 0, 0.25, 1)'))
+      transition('* => *', animate('500ms cubic-bezier(0.35, 0, 0.25, 1)'))
     ])
   ],
   providers: [{provide: MatStepper, useExisting: MatHorizontalStepper}],

From b1ceeecd88aa8e53edd8d78adfa5390391899179 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 29 Sep 2017 13:16:12 -0700
Subject: [PATCH 198/575] Update button toggle group disabled (#6991)

---
 src/lib/button-toggle/button-toggle.spec.ts | 11 +++++++++++
 src/lib/button-toggle/button-toggle.ts      | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/lib/button-toggle/button-toggle.spec.ts b/src/lib/button-toggle/button-toggle.spec.ts
index fa793edd8a39..6d67caa7e7df 100644
--- a/src/lib/button-toggle/button-toggle.spec.ts
+++ b/src/lib/button-toggle/button-toggle.spec.ts
@@ -245,6 +245,17 @@ describe('MatButtonToggle without forms', () => {
 
       buttonToggleNativeElements[0].click();
       expect(buttonToggleInstances[0].checked).toBe(false);
+      expect(buttonToggleInstances[0].disabled).toBe(true);
+
+      testComponent.isGroupDisabled = false;
+      fixture.detectChanges();
+
+      expect(buttonToggleInstances[0].disabled).toBe(false);
+
+      buttonToggleLabelElements[0].click();
+      fixture.detectChanges();
+
+      expect(buttonToggleInstances[0].checked).toBe(true);
     });
 
     it('should update the group value when one of the toggles changes', () => {
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index 7bc8fa72da90..29f80c924468 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -224,6 +224,13 @@ export class MatButtonToggleGroup extends _MatButtonToggleGroupMixinBase
    */
   setDisabledState(isDisabled: boolean): void {
     this.disabled = isDisabled;
+    this._markButtonTogglesForCheck();
+  }
+
+  private _markButtonTogglesForCheck() {
+    if (this._buttonToggles) {
+      this._buttonToggles.forEach((toggle) => toggle._markForCheck());
+    }
   }
 }
 
@@ -464,4 +471,15 @@ export class MatButtonToggle implements OnInit, OnDestroy {
   ngOnDestroy(): void {
     this._removeUniqueSelectionListener();
   }
+
+  /**
+   * Marks the button toggle as needing checking for change detection.
+   * This method is exposed because the parent button toggle group will directly
+   * update bound properties of the radio button.
+   */
+  _markForCheck() {
+    // When group value changes, the button will not be notified. Use `markForCheck` to explicit
+    // update button toggle's status
+    this._changeDetectorRef.markForCheck();
+  }
 }

From 7a354a0958dd31379c49c17850c76816a88673ff Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:16:27 +0200
Subject: [PATCH 199/575] fix(tabs): blurry content in IE (#6954)

Fixes the content of tabs being blurred on IE due to a `transform`.

Fixes #6944.
---
 src/lib/tabs/tab-body.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index 0d738582d7a1..8999b60a83f8 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -69,11 +69,9 @@ export type MatTabBodyOriginState = 'left' | 'right';
   },
   animations: [
     trigger('translateTab', [
-      state('void', style({transform: 'translate3d(0%, 0, 0)'})),
+      // Note: transitions to `none` instead of 0, because some browsers might blur the content.
+      state('center, void, left-origin-center, right-origin-center', style({transform: 'none'})),
       state('left', style({transform: 'translate3d(-100%, 0, 0)'})),
-      state('left-origin-center', style({transform: 'translate3d(0%, 0, 0)'})),
-      state('right-origin-center', style({transform: 'translate3d(0%, 0, 0)'})),
-      state('center', style({transform: 'translate3d(0%, 0, 0)'})),
       state('right', style({transform: 'translate3d(100%, 0, 0)'})),
       transition('* => left, * => right, left => center, right => center',
           animate('500ms cubic-bezier(0.35, 0, 0.25, 1)')),

From f8ed44251811493de4d5693f4c1dce33b33a138a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:17:03 +0200
Subject: [PATCH 200/575] fix(common): don't log doctype warning when rendering
 server-side (#6833)

Prevents the doctype warning from being logged when rendering server-side in development mode. Previously, while we did have a `document`, it was not the same as the client-side `document` and thus didn't have a `doctype`. We didn't notice this earlier, because we run the server-side rendering check in production mode where the sanity checks are disabled.

Relates to #6292.
---
 src/lib/core/common-behaviors/common-module.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/lib/core/common-behaviors/common-module.ts b/src/lib/core/common-behaviors/common-module.ts
index e2b1c6323af3..30fdbfd92c2d 100644
--- a/src/lib/core/common-behaviors/common-module.ts
+++ b/src/lib/core/common-behaviors/common-module.ts
@@ -7,7 +7,6 @@
  */
 
 import {NgModule, InjectionToken, Optional, Inject, isDevMode} from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
 import {BidiModule} from '@angular/cdk/bidi';
 import {CompatibilityModule} from '../compatibility/compatibility';
 
@@ -33,11 +32,11 @@ export class MatCommonModule {
   /** Whether we've done the global sanity checks (e.g. a theme is loaded, there is a doctype). */
   private _hasDoneGlobalChecks = false;
 
-  constructor(
-    @Optional() @Inject(DOCUMENT) private _document: any,
-    @Optional() @Inject(MATERIAL_SANITY_CHECKS) _sanityChecksEnabled: boolean) {
+  /** Reference to the global `document` object. */
+  private _document = typeof document === 'object' && document ? document : null;
 
-    if (_sanityChecksEnabled && !this._hasDoneGlobalChecks && _document && isDevMode()) {
+  constructor(@Optional() @Inject(MATERIAL_SANITY_CHECKS) sanityChecksEnabled: boolean) {
+    if (sanityChecksEnabled && !this._hasDoneGlobalChecks && isDevMode()) {
       this._checkDoctype();
       this._checkTheme();
       this._hasDoneGlobalChecks = true;
@@ -45,7 +44,7 @@ export class MatCommonModule {
   }
 
   private _checkDoctype(): void {
-    if (!this._document.doctype) {
+    if (this._document && !this._document.doctype) {
       console.warn(
         'Current document does not have a doctype. This may cause ' +
         'some Angular Material components not to behave as expected.'
@@ -54,7 +53,7 @@ export class MatCommonModule {
   }
 
   private _checkTheme(): void {
-    if (typeof getComputedStyle === 'function') {
+    if (this._document && typeof getComputedStyle === 'function') {
       const testElement = this._document.createElement('div');
 
       testElement.classList.add('mat-theme-loaded-marker');

From 0270cf5e478fc64a9fa916b9ebf21b57663bb7c1 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:17:23 +0200
Subject: [PATCH 201/575] fix(checkbox): support native tabindex attribute
 (#6793)

Currently the checkbox only allows changing the tabIndex using the tabIndex binding. Using the native tabindex attribute doesn't have any affect. With this change the native tabindex property will be respected.

References #6465
---
 src/lib/checkbox/checkbox.spec.ts | 21 +++++++++++++++++++++
 src/lib/checkbox/checkbox.ts      | 17 ++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
index d71a3daeb225..7be933c085cb 100644
--- a/src/lib/checkbox/checkbox.spec.ts
+++ b/src/lib/checkbox/checkbox.spec.ts
@@ -33,6 +33,7 @@ describe('MatCheckbox', () => {
         CheckboxWithChangeEvent,
         CheckboxWithFormControl,
         CheckboxWithoutLabel,
+        CheckboxWithTabindexAttr,
       ],
       providers: [
         {provide: ViewportRuler, useClass: FakeViewportRuler}
@@ -677,6 +678,20 @@ describe('MatCheckbox', () => {
 
   });
 
+  describe('with native tabindex attribute', () => {
+
+    it('should properly detect native tabindex attribute', async(() => {
+      fixture = TestBed.createComponent(CheckboxWithTabindexAttr);
+      fixture.detectChanges();
+
+      const checkbox = fixture.debugElement
+        .query(By.directive(MatCheckbox)).componentInstance as MatCheckbox;
+
+      expect(checkbox.tabIndex)
+        .toBe(5, 'Expected tabIndex property to have been set based on the native attribute');
+    }));
+  });
+
   describe('with multiple checkboxes', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(MultipleCheckboxes);
@@ -1009,3 +1024,9 @@ class CheckboxWithFormControl {
 class CheckboxWithoutLabel {
   label: string;
 }
+
+/** Test component with the native tabindex attribute. */
+@Component({
+  template: `<mat-checkbox tabindex="5"></mat-checkbox>`
+})
+class CheckboxWithTabindexAttr {}
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index c17cc728bc0d..8fdf69618351 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -9,6 +9,7 @@
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
   AfterViewInit,
+  Attribute,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -27,10 +28,12 @@ import {
   CanColor,
   CanDisable,
   CanDisableRipple,
+  HasTabIndex,
   MatRipple,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
+  mixinTabIndex,
   RippleRef,
 } from '@angular/material/core';
 import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
@@ -79,7 +82,7 @@ export class MatCheckboxBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
 export const _MatCheckboxMixinBase =
-  mixinColor(mixinDisableRipple(mixinDisabled(MatCheckboxBase)), 'accent');
+  mixinTabIndex(mixinColor(mixinDisableRipple(mixinDisabled(MatCheckboxBase)), 'accent'));
 
 
 /**
@@ -104,13 +107,13 @@ export const _MatCheckboxMixinBase =
     '[class.mat-checkbox-label-before]': 'labelPosition == "before"',
   },
   providers: [MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR],
-  inputs: ['disabled', 'disableRipple', 'color'],
+  inputs: ['disabled', 'disableRipple', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAccessor,
-    AfterViewInit, OnDestroy, CanColor, CanDisable, CanDisableRipple {
+    AfterViewInit, OnDestroy, CanColor, CanDisable, HasTabIndex, CanDisableRipple {
 
   /**
    * Attached to the aria-label attribute of the host element. In most cases, arial-labelledby will
@@ -156,9 +159,6 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   /** Whether the label should appear after or before the checkbox. Defaults to 'after' */
   @Input() labelPosition: 'before' | 'after' = 'after';
 
-  /** Tabindex value that is passed to the underlying input element. */
-  @Input() tabIndex: number = 0;
-
   /** Name value will be applied to the input element if present */
   @Input() name: string | null = null;
 
@@ -199,8 +199,11 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   constructor(renderer: Renderer2,
               elementRef: ElementRef,
               private _changeDetectorRef: ChangeDetectorRef,
-              private _focusMonitor: FocusMonitor) {
+              private _focusMonitor: FocusMonitor,
+              @Attribute('tabindex') tabIndex: string) {
     super(renderer, elementRef);
+
+    this.tabIndex = parseInt(tabIndex) || 0;
   }
 
   ngAfterViewInit() {

From 7a9657040d9a75378ae5cb3f70e7c0c23c762b7f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:17:44 +0200
Subject: [PATCH 202/575] fix(menu): nested menu error when items are rendered
 in a repeater (#6766)

Fixes an error that was being thrown when the menu items that trigger a sub-menu are rendered in a repeater.

Fixes #6765.
---
 src/lib/menu/menu-directive.ts | 20 ++++++++++++----
 src/lib/menu/menu-trigger.ts   |  6 ++---
 src/lib/menu/menu.spec.ts      | 43 +++++++++++++++++++++++++++++++++-
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 81243ac07b97..aa14055003b7 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -10,7 +10,7 @@ import {AnimationEvent} from '@angular/animations';
 import {FocusKeyManager} from '@angular/cdk/a11y';
 import {Direction} from '@angular/cdk/bidi';
 import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
-import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
+import {RxChain, startWith, switchMap, first} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -27,10 +27,12 @@ import {
   TemplateRef,
   ViewChild,
   ViewEncapsulation,
+  NgZone,
 } from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
+import {Subject} from 'rxjs/Subject';
 import {fadeInItems, transformMenu} from './menu-animations';
 import {throwMatMenuInvalidPositionX, throwMatMenuInvalidPositionY} from './menu-errors';
 import {MatMenuItem} from './menu-item';
@@ -80,7 +82,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
   private _tabSubscription = Subscription.EMPTY;
 
   /** Config object to be passed into the menu's ngClass */
-  _classList: any = {};
+  _classList: {[key: string]: boolean} = {};
 
   /** Current state of the panel animation. */
   _panelAnimationState: 'void' | 'enter-start' | 'enter' = 'void';
@@ -145,6 +147,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
 
   constructor(
     private _elementRef: ElementRef,
+    private _ngZone: NgZone,
     @Inject(MAT_MENU_DEFAULT_OPTIONS) private _defaultOptions: MatMenuDefaultOptions) { }
 
   ngAfterContentInit() {
@@ -160,9 +163,16 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
 
   /** Stream that emits whenever the hovered menu item changes. */
   hover(): Observable<MatMenuItem> {
-    return RxChain.from(this.items.changes)
-      .call(startWith, this.items)
-      .call(switchMap, (items: MatMenuItem[]) => merge(...items.map(item => item.hover)))
+    if (this.items) {
+      return RxChain.from(this.items.changes)
+        .call(startWith, this.items)
+        .call(switchMap, (items: MatMenuItem[]) => merge(...items.map(item => item.hover)))
+        .result();
+    }
+
+    return RxChain.from(this._ngZone.onStable.asObservable())
+      .call(first)
+      .call(switchMap, () => this.hover())
       .result();
   }
 
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 81808968e894..a37c541f3e1e 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -22,7 +22,7 @@ import {
 import {TemplatePortal} from '@angular/cdk/portal';
 import {filter, RxChain} from '@angular/cdk/rxjs';
 import {
-  AfterViewInit,
+  AfterContentInit,
   Directive,
   ElementRef,
   EventEmitter,
@@ -81,7 +81,7 @@ export const MENU_PANEL_TOP_PADDING = 8;
   },
   exportAs: 'matMenuTrigger'
 })
-export class MatMenuTrigger implements AfterViewInit, OnDestroy {
+export class MatMenuTrigger implements AfterContentInit, OnDestroy {
   private _portal: TemplatePortal<any>;
   private _overlayRef: OverlayRef | null = null;
   private _menuOpen: boolean = false;
@@ -125,7 +125,7 @@ export class MatMenuTrigger implements AfterViewInit, OnDestroy {
     }
   }
 
-  ngAfterViewInit() {
+  ngAfterContentInit() {
     this._checkMenu();
 
     this.menu.close.subscribe(reason => {
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 0370cd13d8fb..83b8cb8db4e7 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -48,7 +48,8 @@ describe('MatMenu', () => {
         CustomMenuPanel,
         CustomMenu,
         NestedMenu,
-        NestedMenuCustomElevation
+        NestedMenuCustomElevation,
+        NestedMenuRepeater
       ],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
@@ -1046,6 +1047,21 @@ describe('MatMenu', () => {
       expect(event.preventDefault).toHaveBeenCalled();
     });
 
+    it('should handle the items being rendered in a repeater', fakeAsync(() => {
+      const repeaterFixture = TestBed.createComponent(NestedMenuRepeater);
+      overlay = overlayContainerElement;
+
+      expect(() => repeaterFixture.detectChanges()).not.toThrow();
+
+      repeaterFixture.componentInstance.rootTriggerEl.nativeElement.click();
+      repeaterFixture.detectChanges();
+      expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(1, 'Expected one open menu');
+
+      dispatchMouseEvent(overlay.querySelector('.level-one-trigger')!, 'mouseenter');
+      repeaterFixture.detectChanges();
+      expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(2, 'Expected two open menus');
+    }));
+
   });
 
 });
@@ -1243,3 +1259,28 @@ class NestedMenuCustomElevation {
   @ViewChild('rootTrigger') rootTrigger: MatMenuTrigger;
   @ViewChild('levelOneTrigger') levelOneTrigger: MatMenuTrigger;
 }
+
+
+@Component({
+  template: `
+    <button [matMenuTriggerFor]="root" #rootTriggerEl>Toggle menu</button>
+    <mat-menu #root="matMenu">
+      <button
+        mat-menu-item
+        class="level-one-trigger"
+        *ngFor="let item of items"
+        [matMenuTriggerFor]="levelOne">{{item}}</button>
+    </mat-menu>
+
+    <mat-menu #levelOne="matMenu">
+      <button mat-menu-item>Four</button>
+      <button mat-menu-item>Five</button>
+    </mat-menu>
+  `
+})
+class NestedMenuRepeater {
+  @ViewChild('rootTriggerEl') rootTriggerEl: ElementRef;
+  @ViewChild('levelOneTrigger') levelOneTrigger: MatMenuTrigger;
+
+  items = ['one', 'two', 'three'];
+}

From d5f96c87278ee2e4b500d7001cac0fb4c9a1b982 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Fri, 29 Sep 2017 23:18:08 +0300
Subject: [PATCH 203/575] Vertically align elements in mdSubheader (#6685)

---
 src/lib/list/list.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
index bda2a254af52..314c70fb556b 100644
--- a/src/lib/list/list.scss
+++ b/src/lib/list/list.scss
@@ -112,9 +112,10 @@ $mat-dense-list-icon-size: 20px;
 }
 
 .mat-subheader {
-  display: block;
+  display: flex;
   box-sizing: border-box;
   padding: $mat-list-side-padding;
+  align-items: center;
 
   // This needs slightly more specificity, because it
   // can be overwritten by the typography styles.

From c8ddd396a71bd39a79af369a7608d599ec585c09 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:19:21 +0200
Subject: [PATCH 204/575] fix(tooltip): ensure tooltip stays within viewport
 (#6659)

* Adds a fallback position to ensure that tooltips can't go outside the viewport.
* Refactors the `transform-origin` logic to depend on the overlay position, instead of the tooltip position.

Fixes #5428.
---
 src/lib/tooltip/tooltip.spec.ts |  87 +++++++++++++---
 src/lib/tooltip/tooltip.ts      | 172 ++++++++++++++++++++------------
 2 files changed, 180 insertions(+), 79 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 26e8f67bf331..95a5cb074ced 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -342,71 +342,81 @@ describe('MatTooltip', () => {
 
     it('should consistently position before and after overlay origin in ltr and rtl dir', () => {
       tooltipDirective.position = 'left';
-      const leftOrigin = tooltipDirective._getOrigin();
+      const leftOrigin = tooltipDirective._getOrigin().main;
       tooltipDirective.position = 'right';
-      const rightOrigin = tooltipDirective._getOrigin();
+      const rightOrigin = tooltipDirective._getOrigin().main;
 
       // Test expectations in LTR
       tooltipDirective.position = 'before';
-      expect(tooltipDirective._getOrigin()).toEqual(leftOrigin);
+      expect(tooltipDirective._getOrigin().main).toEqual(leftOrigin);
       tooltipDirective.position = 'after';
-      expect(tooltipDirective._getOrigin()).toEqual(rightOrigin);
+      expect(tooltipDirective._getOrigin().main).toEqual(rightOrigin);
 
       // Test expectations in LTR
       dir.value = 'rtl';
       tooltipDirective.position = 'before';
-      expect(tooltipDirective._getOrigin()).toEqual(rightOrigin);
+      expect(tooltipDirective._getOrigin().main).toEqual(rightOrigin);
       tooltipDirective.position = 'after';
-      expect(tooltipDirective._getOrigin()).toEqual(leftOrigin);
+      expect(tooltipDirective._getOrigin().main).toEqual(leftOrigin);
     });
 
     it('should consistently position before and after overlay position in ltr and rtl dir', () => {
       tooltipDirective.position = 'left';
-      const leftOverlayPosition = tooltipDirective._getOverlayPosition();
+      const leftOverlayPosition = tooltipDirective._getOverlayPosition().main;
       tooltipDirective.position = 'right';
-      const rightOverlayPosition = tooltipDirective._getOverlayPosition();
+      const rightOverlayPosition = tooltipDirective._getOverlayPosition().main;
 
       // Test expectations in LTR
       tooltipDirective.position = 'before';
-      expect(tooltipDirective._getOverlayPosition()).toEqual(leftOverlayPosition);
+      expect(tooltipDirective._getOverlayPosition().main).toEqual(leftOverlayPosition);
       tooltipDirective.position = 'after';
-      expect(tooltipDirective._getOverlayPosition()).toEqual(rightOverlayPosition);
+      expect(tooltipDirective._getOverlayPosition().main).toEqual(rightOverlayPosition);
 
       // Test expectations in LTR
       dir.value = 'rtl';
       tooltipDirective.position = 'before';
-      expect(tooltipDirective._getOverlayPosition()).toEqual(rightOverlayPosition);
+      expect(tooltipDirective._getOverlayPosition().main).toEqual(rightOverlayPosition);
       tooltipDirective.position = 'after';
-      expect(tooltipDirective._getOverlayPosition()).toEqual(leftOverlayPosition);
+      expect(tooltipDirective._getOverlayPosition().main).toEqual(leftOverlayPosition);
     });
 
     it('should have consistent left transform origin in any dir', () => {
       tooltipDirective.position = 'right';
       tooltipDirective.show();
+      fixture.detectChanges();
       expect(tooltipDirective._tooltipInstance!._transformOrigin).toBe('left');
 
       tooltipDirective.position = 'after';
       tooltipDirective.show();
+      fixture.detectChanges();
       expect(tooltipDirective._tooltipInstance!._transformOrigin).toBe('left');
 
       dir.value = 'rtl';
       tooltipDirective.position = 'before';
       tooltipDirective.show();
+      fixture.detectChanges();
       expect(tooltipDirective._tooltipInstance!._transformOrigin).toBe('left');
     });
 
     it('should have consistent right transform origin in any dir', () => {
+      // Move the button away from the edge of the screen so
+      // we don't get into the fallback positions.
+      fixture.componentInstance.button.nativeElement.style.margin = '200px';
+
       tooltipDirective.position = 'left';
       tooltipDirective.show();
+      fixture.detectChanges();
       expect(tooltipDirective._tooltipInstance!._transformOrigin).toBe('right');
 
       tooltipDirective.position = 'before';
       tooltipDirective.show();
+      fixture.detectChanges();
       expect(tooltipDirective._tooltipInstance!._transformOrigin).toBe('right');
 
       dir.value = 'rtl';
       tooltipDirective.position = 'after';
       tooltipDirective.show();
+      fixture.detectChanges();
       expect(tooltipDirective._tooltipInstance!._transformOrigin).toBe('right');
     });
 
@@ -463,10 +473,8 @@ describe('MatTooltip', () => {
 
       document.body.click();
       fixture.detectChanges();
-
       tick(500);
 
-      expect(tooltipDirective._isTooltipVisible()).toBe(true);
       expect(overlayContainerElement.textContent).toContain(initialTooltipMessage);
     }));
 
@@ -479,6 +487,53 @@ describe('MatTooltip', () => {
 
   });
 
+  describe('fallback positions', () => {
+    let fixture: ComponentFixture<BasicTooltipDemo>;
+    let tooltip: MatTooltip;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(BasicTooltipDemo);
+      fixture.detectChanges();
+      tooltip = fixture.debugElement.query(By.css('button')).injector.get<MatTooltip>(MatTooltip);
+    });
+
+    it('should set a fallback origin position by inverting the main origin position', () => {
+      tooltip.position = 'left';
+      expect(tooltip._getOrigin().main.originX).toBe('start');
+      expect(tooltip._getOrigin().fallback.originX).toBe('end');
+
+      tooltip.position = 'right';
+      expect(tooltip._getOrigin().main.originX).toBe('end');
+      expect(tooltip._getOrigin().fallback.originX).toBe('start');
+
+      tooltip.position = 'above';
+      expect(tooltip._getOrigin().main.originY).toBe('top');
+      expect(tooltip._getOrigin().fallback.originY).toBe('bottom');
+
+      tooltip.position = 'below';
+      expect(tooltip._getOrigin().main.originY).toBe('bottom');
+      expect(tooltip._getOrigin().fallback.originY).toBe('top');
+    });
+
+    it('should set a fallback overlay position by inverting the main overlay position', () => {
+      tooltip.position = 'left';
+      expect(tooltip._getOverlayPosition().main.overlayX).toBe('end');
+      expect(tooltip._getOverlayPosition().fallback.overlayX).toBe('start');
+
+      tooltip.position = 'right';
+      expect(tooltip._getOverlayPosition().main.overlayX).toBe('start');
+      expect(tooltip._getOverlayPosition().fallback.overlayX).toBe('end');
+
+      tooltip.position = 'above';
+      expect(tooltip._getOverlayPosition().main.overlayY).toBe('bottom');
+      expect(tooltip._getOverlayPosition().fallback.overlayY).toBe('top');
+
+      tooltip.position = 'below';
+      expect(tooltip._getOverlayPosition().main.overlayY).toBe('top');
+      expect(tooltip._getOverlayPosition().fallback.overlayY).toBe('bottom');
+    });
+  });
+
   describe('scrollable usage', () => {
     let fixture: ComponentFixture<ScrollableTooltipDemo>;
     let buttonDebugElement: DebugElement;
@@ -581,7 +636,8 @@ describe('MatTooltip', () => {
 @Component({
   selector: 'app',
   template: `
-    <button *ngIf="showButton"
+    <button #button
+            *ngIf="showButton"
             [matTooltip]="message"
             [matTooltipPosition]="position"
             [matTooltipClass]="{'custom-one': showTooltipClass, 'custom-two': showTooltipClass }">
@@ -594,6 +650,7 @@ class BasicTooltipDemo {
   showButton: boolean = true;
   showTooltipClass = false;
   @ViewChild(MatTooltip) tooltip: MatTooltip;
+  @ViewChild('button') button: ElementRef;
 }
 
 @Component({
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 4c54b6b9cce5..2fb85517b7be 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -19,6 +19,9 @@ import {
   OverlayConfig,
   RepositionScrollStrategy,
   ScrollStrategy,
+  ConnectionPositionPair,
+  HorizontalConnectionPos,
+  VerticalConnectionPos,
 } from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {ComponentPortal} from '@angular/cdk/portal';
@@ -260,17 +263,25 @@ export class MatTooltip implements OnDestroy {
   /** Create the overlay config and position strategy */
   private _createOverlay(): OverlayRef {
     const origin = this._getOrigin();
-    const position = this._getOverlayPosition();
+    const overlay = this._getOverlayPosition();
 
     // Create connected position strategy that listens for scroll events to reposition.
-    // After position changes occur and the overlay is clipped by a parent scrollable then
-    // close the tooltip.
-    const strategy = this._overlay.position().connectedTo(this._elementRef, origin, position);
+    const strategy = this._overlay
+      .position()
+      .connectedTo(this._elementRef, origin.main, overlay.main)
+      .withFallbackPosition(origin.fallback, overlay.fallback);
+
     strategy.withScrollableContainers(this._scrollDispatcher.getScrollContainers(this._elementRef));
     strategy.onPositionChange.subscribe(change => {
-      if (change.scrollableViewProperties.isOverlayClipped &&
-          this._tooltipInstance && this._tooltipInstance.isVisible()) {
-        this.hide(0);
+      if (this._tooltipInstance) {
+        if (change.scrollableViewProperties.isOverlayClipped && this._tooltipInstance.isVisible()) {
+          // After position changes occur and the overlay is clipped by
+          // a parent scrollable then close the tooltip.
+          this.hide(0);
+        } else {
+          // Otherwise recalculate the origin based on the new position.
+          this._tooltipInstance._setTransformOrigin(change.connectionPair);
+        }
       }
     });
 
@@ -296,52 +307,63 @@ export class MatTooltip implements OnDestroy {
     this._tooltipInstance = null;
   }
 
-  /** Returns the origin position based on the user's position preference */
-  _getOrigin(): OriginConnectionPosition {
-    if (this.position == 'above' || this.position == 'below') {
-      return {originX: 'center', originY: this.position == 'above' ? 'top' : 'bottom'};
-    }
-
+  /**
+   * Returns the origin position and a fallback position based on the user's position preference.
+   * The fallback position is the inverse of the origin (e.g. 'below' -> 'above').
+   */
+  _getOrigin(): {main: OriginConnectionPosition, fallback: OriginConnectionPosition} {
     const isDirectionLtr = !this._dir || this._dir.value == 'ltr';
-    if (this.position == 'left' ||
-        this.position == 'before' && isDirectionLtr ||
-        this.position == 'after' && !isDirectionLtr) {
-      return {originX: 'start', originY: 'center'};
-    }
+    let position: OriginConnectionPosition;
 
-    if (this.position == 'right' ||
-        this.position == 'after' && isDirectionLtr ||
-        this.position == 'before' && !isDirectionLtr) {
-      return {originX: 'end', originY: 'center'};
+    if (this.position == 'above' || this.position == 'below') {
+      position = {originX: 'center', originY: this.position == 'above' ? 'top' : 'bottom'};
+    } else if (this.position == 'left' ||
+               this.position == 'before' && isDirectionLtr ||
+               this.position == 'after' && !isDirectionLtr) {
+      position = {originX: 'start', originY: 'center'};
+    } else if (this.position == 'right' ||
+               this.position == 'after' && isDirectionLtr ||
+               this.position == 'before' && !isDirectionLtr) {
+      position = {originX: 'end', originY: 'center'};
+    } else {
+      throw getMatTooltipInvalidPositionError(this.position);
     }
 
-    throw getMatTooltipInvalidPositionError(this.position);
-  }
-
-  /** Returns the overlay position based on the user's preference */
-  _getOverlayPosition(): OverlayConnectionPosition {
-    if (this.position == 'above') {
-      return {overlayX: 'center', overlayY: 'bottom'};
-    }
+    const {x, y} = this._invertPosition(position.originX, position.originY);
 
-    if (this.position == 'below') {
-      return {overlayX: 'center', overlayY: 'top'};
-    }
+    return {
+      main: position,
+      fallback: {originX: x, originY: y}
+    };
+  }
 
+  /** Returns the overlay position and a fallback position based on the user's preference */
+  _getOverlayPosition(): {main: OverlayConnectionPosition, fallback: OverlayConnectionPosition} {
     const isLtr = !this._dir || this._dir.value == 'ltr';
-    if (this.position == 'left' ||
-        this.position == 'before' && isLtr ||
-        this.position == 'after' && !isLtr) {
-      return {overlayX: 'end', overlayY: 'center'};
-    }
+    let position: OverlayConnectionPosition;
 
-    if (this.position == 'right' ||
-        this.position == 'after' && isLtr ||
-        this.position == 'before' && !isLtr) {
-      return {overlayX: 'start', overlayY: 'center'};
+    if (this.position == 'above') {
+      position = {overlayX: 'center', overlayY: 'bottom'};
+    } else if (this.position == 'below') {
+      position = {overlayX: 'center', overlayY: 'top'};
+    } else if (this.position == 'left' ||
+               this.position == 'before' && isLtr ||
+               this.position == 'after' && !isLtr) {
+      position = {overlayX: 'end', overlayY: 'center'};
+    } else if (this.position == 'right' ||
+               this.position == 'after' && isLtr ||
+               this.position == 'before' && !isLtr) {
+      position = {overlayX: 'start', overlayY: 'center'};
+    } else {
+      throw getMatTooltipInvalidPositionError(this.position);
     }
 
-    throw getMatTooltipInvalidPositionError(this.position);
+    const {x, y} = this._invertPosition(position.overlayX, position.overlayY);
+
+    return {
+      main: position,
+      fallback: {overlayX: x, overlayY: y}
+    };
   }
 
   /** Updates the tooltip message and repositions the overlay according to the new message length */
@@ -367,6 +389,25 @@ export class MatTooltip implements OnDestroy {
       this._tooltipInstance._markForCheck();
     }
   }
+
+  /** Inverts an overlay position. */
+  private _invertPosition(x: HorizontalConnectionPos, y: VerticalConnectionPos) {
+    if (this.position === 'above' || this.position === 'below') {
+      if (y === 'top') {
+        y = 'bottom';
+      } else if (y === 'bottom') {
+        y = 'top';
+      }
+    } else {
+      if (x === 'end') {
+        x = 'start';
+      } else if (x === 'start') {
+        x = 'end';
+      }
+    }
+
+    return {x, y};
+  }
 }
 
 export type TooltipVisibility = 'initial' | 'visible' | 'hidden';
@@ -419,13 +460,15 @@ export class TooltipComponent {
   private _closeOnInteraction: boolean = false;
 
   /** The transform origin used in the animation for showing and hiding the tooltip */
-  _transformOrigin: string = 'bottom';
+  _transformOrigin: 'top' | 'bottom' | 'left' | 'right' = 'bottom';
+
+  /** Current position of the tooltip. */
+  private _position: TooltipPosition;
 
   /** Subject for notifying that the tooltip has been hidden from the view */
   private _onHide: Subject<any> = new Subject();
 
-  constructor(@Optional() private _dir: Directionality,
-              private _changeDetectorRef: ChangeDetectorRef) {}
+  constructor(private _changeDetectorRef: ChangeDetectorRef) {}
 
   /**
    * Shows the tooltip with an animation originating from the provided origin
@@ -438,7 +481,9 @@ export class TooltipComponent {
       clearTimeout(this._hideTimeoutId);
     }
 
-    this._setTransformOrigin(position);
+    // Body interactions should cancel the tooltip if there is a delay in showing.
+    this._closeOnInteraction = true;
+    this._position = position;
     this._showTimeoutId = setTimeout(() => {
       this._visibility = 'visible';
 
@@ -467,31 +512,30 @@ export class TooltipComponent {
     }, delay);
   }
 
-  /**
-   * Returns an observable that notifies when the tooltip has been hidden from view
-   */
+  /** Returns an observable that notifies when the tooltip has been hidden from view. */
   afterHidden(): Observable<void> {
     return this._onHide.asObservable();
   }
 
-  /**
-   * Whether the tooltip is being displayed
-   */
+  /** Whether the tooltip is being displayed. */
   isVisible(): boolean {
     return this._visibility === 'visible';
   }
 
-  /** Sets the tooltip transform origin according to the tooltip position */
-  _setTransformOrigin(value: TooltipPosition) {
-    const isLtr = !this._dir || this._dir.value == 'ltr';
-    switch (value) {
-      case 'before': this._transformOrigin = isLtr ? 'right' : 'left'; break;
-      case 'after':  this._transformOrigin = isLtr ? 'left' : 'right'; break;
-      case 'left':   this._transformOrigin = 'right'; break;
-      case 'right':  this._transformOrigin = 'left'; break;
-      case 'above':  this._transformOrigin = 'bottom'; break;
-      case 'below':  this._transformOrigin = 'top'; break;
-      default: throw getMatTooltipInvalidPositionError(value);
+  /** Sets the tooltip transform origin according to the position of the tooltip overlay. */
+  _setTransformOrigin(overlayPosition: ConnectionPositionPair) {
+    const axis = (this._position === 'above' || this._position === 'below') ? 'Y' : 'X';
+    const position = overlayPosition[`overlay${axis}`] as HorizontalConnectionPos |
+                                                          VerticalConnectionPos;
+
+    if (position === 'top' || position === 'bottom') {
+      this._transformOrigin = position;
+    } else if (position === 'start') {
+      this._transformOrigin = 'left';
+    } else if (position === 'end') {
+      this._transformOrigin = 'right';
+    } else {
+      throw getMatTooltipInvalidPositionError(this._position);
     }
   }
 

From d60e3cba50079e31b5eabcd8d53535900dd9c3cc Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 29 Sep 2017 22:23:05 +0200
Subject: [PATCH 205/575] chore: add selection list to prerender check;
 autocomplete test stability improvements (#7371)

* Adds the selection list component to the kitchen sink.
* Piggy-backing off of the smaller fix, this is something I've meant to do for a while, but it's so minor that it doesn't make sense to open a separate PR. Currently there are a few unit tests that will cause Karma to hang until it times out, if they fail. This seems to be because Karma fails to stringify the `activeOption`. These changes switch the tests to cast the expected result to a boolean first.
---
 src/lib/autocomplete/autocomplete.spec.ts     | 47 ++++++++++---------
 .../kitchen-sink/kitchen-sink.html            |  8 ++++
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index ed23ad7f38e9..48d96e26a83a 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -677,85 +677,86 @@ describe('MatAutocomplete', () => {
 
     it('should set the active item to the first option when DOWN key is pressed', fakeAsync(() => {
       tick();
+      const componentInstance = fixture.componentInstance;
       const optionEls =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.trigger.panelOpen)
+      expect(componentInstance.trigger.panelOpen)
           .toBe(true, 'Expected first down press to open the pane.');
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.trigger.activeOption)
-          .toBe(fixture.componentInstance.options.first, 'Expected first option to be active.');
+      expect(componentInstance.trigger.activeOption === componentInstance.options.first)
+          .toBe(true, 'Expected first option to be active.');
       expect(optionEls[0].classList).toContain('mat-active');
       expect(optionEls[1].classList).not.toContain('mat-active');
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.trigger.activeOption)
-          .toBe(fixture.componentInstance.options.toArray()[1],
-              'Expected second option to be active.');
+      expect(componentInstance.trigger.activeOption === componentInstance.options.toArray()[1])
+          .toBe(true, 'Expected second option to be active.');
       expect(optionEls[0].classList).not.toContain('mat-active');
       expect(optionEls[1].classList).toContain('mat-active');
     }));
 
     it('should set the active item to the last option when UP key is pressed', fakeAsync(() => {
       tick();
+      const componentInstance = fixture.componentInstance;
       const optionEls =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.trigger.panelOpen)
+      expect(componentInstance.trigger.panelOpen)
           .toBe(true, 'Expected first up press to open the pane.');
 
-      fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.trigger.activeOption)
-          .toBe(fixture.componentInstance.options.last, 'Expected last option to be active.');
+      expect(componentInstance.trigger.activeOption === componentInstance.options.last)
+          .toBe(true, 'Expected last option to be active.');
       expect(optionEls[10].classList).toContain('mat-active');
       expect(optionEls[0].classList).not.toContain('mat-active');
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
-      expect(fixture.componentInstance.trigger.activeOption)
-          .toBe(fixture.componentInstance.options.first,
-              'Expected first option to be active.');
+      expect(componentInstance.trigger.activeOption === componentInstance.options.first)
+          .toBe(true, 'Expected first option to be active.');
       expect(optionEls[0].classList).toContain('mat-active');
     }));
 
     it('should set the active item properly after filtering', fakeAsync(() => {
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      const componentInstance = fixture.componentInstance;
+
+      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
       typeInElement('o', input);
       fixture.detectChanges();
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
 
       const optionEls =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      expect(fixture.componentInstance.trigger.activeOption)
-          .toBe(fixture.componentInstance.options.first,
-              'Expected first option to be active.');
+      expect(componentInstance.trigger.activeOption === componentInstance.options.first)
+          .toBe(true, 'Expected first option to be active.');
       expect(optionEls[0].classList).toContain('mat-active');
       expect(optionEls[1].classList).not.toContain('mat-active');
     }));
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 6d0d3a6b77f0..1ba7f870ae95 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -273,3 +273,11 @@ <h2>Material Table</h2>
   <mat-header-row *cdkHeaderRowDef="tableColumns"></mat-header-row>
   <mat-row *cdkRowDef="let row; columns: tableColumns;"></mat-row>
 </mat-table>
+
+<h2>Selection list</h2>
+<mat-selection-list>
+  <h3 mat-subheader>Groceries</h3>
+  <mat-list-option value="apples">Apples</mat-list-option>
+  <mat-list-option value="bananas">Bananas</mat-list-option>
+  <mat-list-option value="oranges">Oranges</mat-list-option>
+</mat-selection-list>

From 85ce16d863b75fa9100af1be6aa29437b63370e0 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:23:14 +0200
Subject: [PATCH 206/575] build(devapp): no longer copy source files to dist
 (#7338)

* Currently the TypeScript source files are being copied to the package output. This is only necessary for the AOT task and therefore shouldn't happen if someone tries to run the devapp.
---
 tools/gulp/tasks/aot.ts         | 12 +++++++++---
 tools/gulp/tasks/development.ts |  6 +++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/gulp/tasks/aot.ts b/tools/gulp/tasks/aot.ts
index 379986f49336..6c78972722f9 100644
--- a/tools/gulp/tasks/aot.ts
+++ b/tools/gulp/tasks/aot.ts
@@ -4,11 +4,14 @@ import {execNodeTask} from '../util/task_helpers';
 import {join} from 'path';
 import {buildConfig, sequenceTask} from 'material2-build-tools';
 
-const {outputDir} = buildConfig;
+const {outputDir, packagesDir} = buildConfig;
 
 /** Path to the directory where all releases are living. */
 const releasesDir = join(outputDir, 'releases');
 
+/** Path to the demo-app source directory. */
+const demoAppSource = join(packagesDir, 'demo-app');
+
 /** Path to the demo-app output directory. */
 const demoAppOut = join(outputDir, 'packages', 'demo-app');
 
@@ -17,9 +20,8 @@ const tsconfigFile = join(demoAppOut, 'tsconfig-aot.json');
 
 /** Builds the demo-app and material. To be able to run NGC, apply the metadata workaround. */
 task('aot:deps', sequenceTask(
-  'build:devapp',
   ['material:build-release', 'cdk:build-release', 'material-moment-adapter:build-release'],
-  'aot:copy-release'
+  [':build:devapp:assets', ':build:devapp:scss', 'aot:copy-devapp', 'aot:copy-release'],
 ));
 
 // As a workaround for https://github.com/angular/angular/issues/12249, we need to
@@ -31,6 +33,10 @@ task('aot:copy-release', () => {
       join(releasesDir, 'material-moment-adapter'), join(demoAppOut, 'material-moment-adapter'));
 });
 
+// // As a workaround for https://github.com/angular/angular/issues/12249, we need to
+// copy the demo-app sources to distribution and run the NGC inside of the dist folder.
+task('aot:copy-devapp', () => copySync(demoAppSource, demoAppOut));
+
 /** Build the demo-app and a release to confirm that the library is AOT-compatible. */
 task('aot:build', sequenceTask('clean', 'aot:deps', 'aot:compiler-cli'));
 
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index 1774098b4095..8380e70edbc4 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -25,6 +25,9 @@ const appVendors = [
 /** Glob that matches all required vendors for the demo-app. */
 const vendorGlob = `+(${appVendors.join('|')})/**/*.+(html|css|js|map)`;
 
+/** Glob that matches all assets that need to be copied to the output. */
+const assetsGlob = join(appDir, `**/*.+(html|css)`);
+
 task(':watch:devapp', () => {
   watchFiles(join(appDir, '**/*.ts'), [':build:devapp:ts']);
   watchFiles(join(appDir, '**/*.scss'), [':build:devapp:scss']);
@@ -44,7 +47,8 @@ const tsconfigPath = join(appDir, 'tsconfig-build.json');
 
 task(':build:devapp:ts', tsBuildTask(tsconfigPath));
 task(':build:devapp:scss', buildScssTask(outDir, appDir));
-task(':build:devapp:assets', copyTask(appDir, outDir));
+task(':build:devapp:assets', copyTask(assetsGlob, outDir));
+
 task(':serve:devapp', serverTask(outDir, true));
 
 // The themes for the demo-app are built by using the SCSS mixins from Material.

From d858ad93ec8b54651107cfc4c23f32331b8d538b Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:23:22 +0200
Subject: [PATCH 207/575] chore: better color usage for chip demo (#7254)

* Improves the example for the chips that shows how the color can be set for chips.
* Fixes a typo in the chips readme

References #7243
---
 src/lib/chips/chips.md                                      | 2 +-
 .../chips-stacked/chips-stacked-example.html                | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 180e4a326bcd..7af77d1a7263 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -35,7 +35,7 @@ between the two components. This directive adds chip-specific behaviors to the i
 within `<mat-form-field>` for adding and removing chips. The `<input>` with `MatChipInput` can
 be placed inside or outside the chip-list element.
 
-An exmaple of chip input placed inside the chip-list element.
+An example of chip input placed inside the chip-list element.
 <!-- example(chips-input) -->
 
 An example of chip input placed outside the chip-list element.
diff --git a/src/material-examples/chips-stacked/chips-stacked-example.html b/src/material-examples/chips-stacked/chips-stacked-example.html
index aa429ab3a8a6..e4c7613dec87 100644
--- a/src/material-examples/chips-stacked/chips-stacked-example.html
+++ b/src/material-examples/chips-stacked/chips-stacked-example.html
@@ -1,7 +1,5 @@
 <mat-chip-list class="mat-chip-list-stacked">
-  <mat-chip *ngFor="let chipColor of availableColors"
-      selected="true"
-      color="{{chipColor.color}}">
-    {{chipColor.name}}
+  <mat-chip *ngFor="let chip of availableColors" selected="true" [color]="chip.color">
+    {{chip.name}}
   </mat-chip>
 </mat-chip-list>

From 606178be0a7cf300e11795574b9f01acb1e9a6d5 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 29 Sep 2017 22:23:52 +0200
Subject: [PATCH 208/575] build(): retries for travis deploying (#7146)

* Now re-runs the given deploy mode a second time if failed the first time. This ensure that deployment works fine most of the time and should also avoid conflicts between different Travis CI jobs that are deplyoing at the same time.
---
 package-lock.json                      | 8986 +++++++++++-------------
 package.json                           |    2 +-
 scripts/ci/sources/tunnel.sh           |    2 +-
 scripts/ci/travis-deploy.sh            |   14 +-
 scripts/{ci/sources => }/retry-call.sh |    0
 5 files changed, 3923 insertions(+), 5081 deletions(-)
 rename scripts/{ci/sources => }/retry-call.sh (100%)
 mode change 100755 => 100644

diff --git a/package-lock.json b/package-lock.json
index 064d1fcfb498..f4f34eff02eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,85 +5,85 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.3.tgz",
-      "integrity": "sha1-OWxKW/sihH+eRYJFuplfnBMMDPM=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.4.tgz",
+      "integrity": "sha1-ovk1NgQ0er4V35gpIFiEL1Lwi8I=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/common": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.3.tgz",
-      "integrity": "sha1-+SrGiwK+xfDm02A6hDKU3JbJYHQ=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.4.tgz",
+      "integrity": "sha1-rgqBiqoMaj8JAee4C9lOHCLrk2U=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.3.tgz",
-      "integrity": "sha1-jwEWPa19s0CEl9mdOHVUtrGFrWY=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz",
+      "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz",
-      "integrity": "sha1-GDr4HxQRhrjWYLBkKVktQLdUCko=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.4.tgz",
+      "integrity": "sha1-BjCApJfZF1OWglBQIixxfaGE9s8=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.4.3",
+        "@angular/tsc-wrapped": "4.4.4",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       }
     },
     "@angular/core": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.3.tgz",
-      "integrity": "sha1-5x0rB76qy6tIq39R1OIobqXXDhU=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz",
+      "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/forms": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.3.tgz",
-      "integrity": "sha1-JbQburWL8dqHJBHIUXwQ18U3PY4=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.4.tgz",
+      "integrity": "sha1-TbN5BQm2sQ8duKfBt/Uhh89kz9Q=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.3.tgz",
-      "integrity": "sha1-tVftJBRKrMRLE2zUd+hNL1eAiQM=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.4.tgz",
+      "integrity": "sha1-Zn+vYWu2JBaOr65u6S5euiOp0fI=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.3.tgz",
-      "integrity": "sha1-I/mkW9Pcf0TZeHf7+OYDLez8ncs=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.4.tgz",
+      "integrity": "sha1-o4mOLnup2E/6DUcUTGlxF5x1ruY=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz",
-      "integrity": "sha1-5B3dglJDJ3UxDqtZQM3Y3wYY8IQ=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.4.tgz",
+      "integrity": "sha1-w8nrhUpShVagcFQSeTLlJ/qTLhQ=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-server": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.3.tgz",
-      "integrity": "sha1-5l3OneVNbKZknMmJTFx6Mke6r0w=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.4.tgz",
+      "integrity": "sha1-c+5B+hzshij8wDF0cnsnywAxsio=",
       "dev": true,
       "requires": {
         "parse5": "3.0.2",
@@ -92,18 +92,18 @@
       }
     },
     "@angular/router": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.3.tgz",
-      "integrity": "sha1-JsyUd1o4YJRq6vHC6PYPTUTpCZE=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.4.tgz",
+      "integrity": "sha1-e+ORCW6EPLPgT58F0dZaiN+bx88=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz",
-      "integrity": "sha1-LT84IQodTbA/yG3PHglYErhc0Rk=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.4.tgz",
+      "integrity": "sha1-mEGCHlVha4JsoWAlD+heFfx0/8M=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
@@ -117,31 +117,31 @@
           "requires": {
             "minimist": "1.2.0",
             "mkdirp": "0.5.1",
-            "source-map": "0.5.6",
-            "source-map-support": "0.4.15"
+            "source-map": "0.5.7",
+            "source-map-support": "0.4.18"
           }
         }
       }
     },
     "@google-cloud/common": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.4.tgz",
-      "integrity": "sha1-dbt/YJMc/J2U2gtdQIlQ0Lvw6Xk=",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
+      "integrity": "sha1-uQWZ8pzpV7NmreqNfAw/NZPZgco=",
       "dev": true,
       "requires": {
         "array-uniq": "1.0.3",
         "arrify": "1.0.1",
         "concat-stream": "1.6.0",
         "create-error-class": "3.0.2",
-        "duplexify": "3.5.0",
+        "duplexify": "3.5.1",
         "ent": "2.2.0",
         "extend": "3.0.1",
-        "google-auto-auth": "0.7.1",
+        "google-auto-auth": "0.7.2",
         "is": "3.2.1",
         "log-driver": "1.2.5",
         "methmeth": "1.1.0",
         "modelo": "4.2.0",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "retry-request": "2.0.5",
         "split-array-stream": "1.0.3",
         "stream-events": "1.0.2",
@@ -149,411 +149,26 @@
         "through2": "2.0.3"
       }
     },
-    "@google-cloud/functions-emulator": {
-      "version": "1.0.0-alpha.21",
-      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.21.tgz",
-      "integrity": "sha512-ZLCd89mo4hV4U6O1Fdcy2h9AgaY+GGAEZck3jNcFAKP70pR3+NIMPGsA5YSS4lTrS7zJBe0zaHJs1Z59S90oPA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@google-cloud/storage": "1.1.1",
-        "adm-zip": "0.4.7",
-        "ajv": "5.1.6",
-        "body-parser": "1.17.2",
-        "cli-table2": "0.2.0",
-        "colors": "1.1.2",
-        "configstore": "3.1.0",
-        "express": "4.15.3",
-        "google-proto-files": "0.12.0",
-        "googleapis": "19.0.0",
-        "got": "7.0.0",
-        "grpc": "1.3.8",
-        "http-proxy": "1.16.2",
-        "lodash": "4.17.4",
-        "prompt": "1.0.0",
-        "rimraf": "2.6.1",
-        "semver": "5.3.0",
-        "serializerr": "1.0.3",
-        "supertest": "3.0.0",
-        "tmp": "0.0.31",
-        "uuid": "3.0.1",
-        "winston": "2.3.1",
-        "yargs": "8.0.2"
-      },
-      "dependencies": {
-        "@google-cloud/storage": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.1.1.tgz",
-          "integrity": "sha1-ZZC1zm53lVbJzHBDvWRJ1rwHgd4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@google-cloud/common": "0.13.4",
-            "arrify": "1.0.1",
-            "async": "2.5.0",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.0",
-            "extend": "3.0.1",
-            "gcs-resumable-upload": "0.7.7",
-            "hash-stream-validation": "0.2.1",
-            "is": "3.2.1",
-            "mime-types": "2.1.15",
-            "once": "1.4.0",
-            "pumpify": "1.3.5",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
-          }
-        },
-        "ajv": {
-          "version": "5.1.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.1.6.tgz",
-          "integrity": "sha1-Sy8aGd7Ok9V6whYDfj6XkcfdFWQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true,
-          "optional": 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,
-          "optional": true
-        },
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true,
-          "optional": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wrap-ansi": "2.1.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
-              }
-            }
-          }
-        },
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true,
-          "optional": true
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "gcp-metadata": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.1.0.tgz",
-          "integrity": "sha1-q+IfHqMk3Qs0o/BsqBdj+x7uN9k=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extend": "3.0.1",
-            "retry-request": "1.3.2"
-          }
-        },
-        "gcs-resumable-upload": {
-          "version": "0.7.7",
-          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.7.7.tgz",
-          "integrity": "sha1-2clyWvlwu8hsvwr+8kBtwizpGGQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "buffer-equal": "1.0.0",
-            "configstore": "3.1.0",
-            "google-auto-auth": "0.6.1",
-            "pumpify": "1.3.5",
-            "request": "2.81.0",
-            "stream-events": "1.0.2",
-            "through2": "2.0.3"
-          }
-        },
-        "google-auto-auth": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.6.1.tgz",
-          "integrity": "sha1-wF2CDpRUc57PKKiJLuqz0WJPLLM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "async": "2.5.0",
-            "gcp-metadata": "0.1.0",
-            "google-auth-library": "0.10.0",
-            "object-assign": "3.0.0",
-            "request": "2.81.0"
-          }
-        },
-        "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,
-          "optional": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "commander": "2.11.0",
-            "is-my-json-valid": "2.16.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz",
-          "integrity": "sha1-FZGN7VEFIrge565aMJ1U9jn8OaQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "execa": "0.5.1",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "pify": "2.3.0"
-          }
-        },
-        "qs": {
-          "version": "6.3.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-          "dev": true,
-          "optional": true
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
-          }
-        },
-        "retry-request": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-1.3.2.tgz",
-          "integrity": "sha1-Wa0k5x+K4/MS1fe0vPRnpeWle9Y=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "request": "2.76.0",
-            "through2": "2.0.3"
-          },
-          "dependencies": {
-            "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,
-              "optional": true
-            },
-            "request": {
-              "version": "2.76.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.76.0.tgz",
-              "integrity": "sha1-vkRQWv73A2CgQ2lVEGvjlF2VVg4=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "aws-sign2": "0.6.0",
-                "aws4": "1.6.0",
-                "caseless": "0.11.0",
-                "combined-stream": "1.0.5",
-                "extend": "3.0.1",
-                "forever-agent": "0.6.1",
-                "form-data": "2.1.4",
-                "har-validator": "2.0.6",
-                "hawk": "3.1.3",
-                "http-signature": "1.1.1",
-                "is-typedarray": "1.0.0",
-                "isstream": "0.1.2",
-                "json-stringify-safe": "5.0.1",
-                "mime-types": "2.1.15",
-                "node-uuid": "1.4.8",
-                "oauth-sign": "0.8.2",
-                "qs": "6.3.2",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.2",
-                "tunnel-agent": "0.4.3"
-              }
-            }
-          }
-        },
-        "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,
-          "optional": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          },
-          "dependencies": {
-            "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,
-              "optional": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-regex": "3.0.0"
-              }
-            }
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true,
-          "optional": true
-        },
-        "tmp": {
-          "version": "0.0.31",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-          "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true,
-          "optional": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
-          "dev": true,
-          "optional": true
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.0.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.0",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
-          }
-        }
-      }
-    },
     "@google-cloud/storage": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.0.tgz",
-      "integrity": "sha1-dO6TaJbaXkU8NBzygEQ0LBqazrc=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
+      "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
       "dev": true,
       "requires": {
-        "@google-cloud/common": "0.13.4",
+        "@google-cloud/common": "0.13.5",
         "arrify": "1.0.1",
         "async": "2.5.0",
         "concat-stream": "1.6.0",
         "create-error-class": "3.0.2",
-        "duplexify": "3.5.0",
+        "duplexify": "3.5.1",
         "extend": "3.0.1",
-        "gcs-resumable-upload": "0.8.0",
+        "gcs-resumable-upload": "0.8.2",
         "hash-stream-validation": "0.2.1",
         "is": "3.2.1",
-        "mime-types": "2.1.15",
+        "mime-types": "2.1.17",
         "once": "1.4.0",
         "pumpify": "1.3.5",
+        "safe-buffer": "5.1.1",
         "stream-events": "1.0.2",
         "string-format-obj": "1.1.0",
         "through2": "2.0.3"
@@ -571,17 +186,17 @@
       "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.34"
+        "@types/node": "7.0.43"
       }
     },
     "@types/glob": {
-      "version": "5.0.30",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.30.tgz",
-      "integrity": "sha1-ECZAnFYlqGiQdGAoCNCCsoZ7ilE=",
+      "version": "5.0.32",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.32.tgz",
+      "integrity": "sha512-DMcj5b67Alb/e4KhpzyvphC5nVDHn1oCOGZao3oBddZVMH5vgI/cvdp+O/kcxZGZaPqs0ZLAsK4YrjbtZHO05g==",
       "dev": true,
       "requires": {
-        "@types/minimatch": "2.0.29",
-        "@types/node": "7.0.34"
+        "@types/minimatch": "3.0.1",
+        "@types/node": "7.0.43"
       }
     },
     "@types/gulp": {
@@ -590,15 +205,15 @@
       "integrity": "sha1-g8WcaBzCM9Hsf4LSaVVVZvoTMVY=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.34",
+        "@types/node": "7.0.43",
         "@types/orchestrator": "0.3.0",
-        "@types/vinyl": "2.0.0"
+        "@types/vinyl": "2.0.1"
       }
     },
     "@types/hammerjs": {
-      "version": "2.0.34",
-      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.34.tgz",
-      "integrity": "sha1-nLrE9BywOUNhQXheG+ULOrEKBKk=",
+      "version": "2.0.35",
+      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.35.tgz",
+      "integrity": "sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==",
       "dev": true
     },
     "@types/jasmine": {
@@ -613,13 +228,13 @@
       "integrity": "sha1-njnQT2/k82+nR3VmytH6+AsqZx8=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.34"
+        "@types/node": "7.0.43"
       }
     },
     "@types/minimatch": {
-      "version": "2.0.29",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-2.0.29.tgz",
-      "integrity": "sha1-UALhT3Xi1x5WQoHfBDHIwbSio2o=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz",
+      "integrity": "sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
       "dev": true
     },
     "@types/minimist": {
@@ -629,9 +244,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "7.0.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.34.tgz",
-      "integrity": "sha512-99ujivDq9tqw3b88xrWqUcHfY3XT+moVhAlMqlN+OdavTxfCRW2X1bRBFcloILRJiIoir+gG3I65jzrpNgF/3g==",
+      "version": "7.0.43",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
+      "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==",
       "dev": true
     },
     "@types/orchestrator": {
@@ -640,14 +255,14 @@
       "integrity": "sha1-v4ShaZyTMNT+ic2BJj6PwJ+zKXg=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.34",
-        "@types/q": "0.0.35"
+        "@types/node": "7.0.43",
+        "@types/q": "0.0.37"
       }
     },
     "@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==",
+      "version": "0.0.37",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
+      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
       "dev": true
     },
     "@types/run-sequence": {
@@ -657,7 +272,7 @@
       "dev": true,
       "requires": {
         "@types/gulp": "3.8.32",
-        "@types/node": "7.0.34"
+        "@types/node": "7.0.43"
       }
     },
     "@types/selenium-webdriver": {
@@ -667,12 +282,12 @@
       "dev": true
     },
     "@types/vinyl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.0.tgz",
-      "integrity": "sha1-/SE79/QTbd4h/hiVUAsSwYb4wmg=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz",
+      "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.34"
+        "@types/node": "7.0.43"
       }
     },
     "JSONStream": {
@@ -686,24 +301,24 @@
       }
     },
     "abab": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
-      "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
       "dev": true
     },
     "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
     "accepts": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.15",
+        "mime-types": "2.1.17",
         "negotiator": "0.6.1"
       }
     },
@@ -759,15 +374,23 @@
       }
     },
     "ajv": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
       "dev": true,
       "requires": {
         "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "json-schema-traverse": "0.3.1",
         "json-stable-stringify": "1.0.1"
       }
     },
+    "ajv-keywords": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+      "dev": true
+    },
     "align-text": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
@@ -819,13 +442,13 @@
       "dev": true
     },
     "anymatch": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
-      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
-        "arrify": "1.0.1",
-        "micromatch": "2.3.11"
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
       }
     },
     "app-module-path": {
@@ -835,9 +458,9 @@
       "dev": true
     },
     "aproba": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
       "dev": true
     },
     "archiver": {
@@ -957,13 +580,6 @@
         "sprintf-js": "1.0.3"
       }
     },
-    "arguejs": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
-      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
-      "dev": true,
-      "optional": true
-    },
     "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -1078,17 +694,6 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
       "dev": true
     },
-    "ascli": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "colour": "0.7.1",
-        "optjs": "3.2.2"
-      }
-    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -1096,9 +701,9 @@
       "dev": true
     },
     "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=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
     "ast-module-types": {
@@ -1141,7 +746,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000699",
+        "caniuse-db": "1.0.30000740",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.17",
@@ -1149,9 +754,9 @@
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true
     },
     "aws4": {
@@ -1161,18 +766,18 @@
       "dev": true
     },
     "axe-core": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.3.1.tgz",
-      "integrity": "sha512-7tp/4CaH1pJNANRj6ULjxND2FBK34stXC4+0WMGu1OOLVPTBj4rLreEb8dBVLh4J5c4BNzU+X3OSmDwRhDxyfg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
+      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
       "dev": true
     },
     "axe-webdriverjs": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/axe-webdriverjs/-/axe-webdriverjs-1.1.3.tgz",
-      "integrity": "sha1-lIqXLk0OJSa0HGCptEBkkyu24G8=",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/axe-webdriverjs/-/axe-webdriverjs-1.1.5.tgz",
+      "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
       "dev": true,
       "requires": {
-        "axe-core": "2.3.1"
+        "axe-core": "2.4.2"
       }
     },
     "babel-code-frame": {
@@ -1186,10 +791,20 @@
         "js-tokens": "3.0.2"
       }
     },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
+      }
+    },
     "babylon": {
-      "version": "6.17.4",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz",
-      "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
     "backo2": {
@@ -1229,10 +844,13 @@
       "dev": true
     },
     "basic-auth": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
-      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
+      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
     },
     "basic-auth-connect": {
       "version": "1.0.0",
@@ -1282,9 +900,9 @@
       }
     },
     "binary-extensions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
-      "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
       "dev": true
     },
     "bl": {
@@ -1333,24 +951,32 @@
       "dev": true,
       "requires": {
         "bytes": "2.4.0",
-        "content-type": "1.0.2",
+        "content-type": "1.0.4",
         "debug": "2.6.7",
-        "depd": "1.1.0",
-        "http-errors": "1.6.1",
+        "depd": "1.1.1",
+        "http-errors": "1.6.2",
         "iconv-lite": "0.4.15",
         "on-finished": "2.3.0",
         "qs": "6.4.0",
         "raw-body": "2.2.0",
         "type-is": "1.6.15"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        }
       }
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "boxen": {
@@ -1368,14 +994,6 @@
         "repeating": "2.0.1",
         "string-width": "1.0.2",
         "widest-line": "1.0.0"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "brace-expansion": {
@@ -1422,8 +1040,8 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000699",
-        "electron-to-chromium": "1.3.15"
+        "caniuse-db": "1.0.30000740",
+        "electron-to-chromium": "1.3.24"
       }
     },
     "browserstack": {
@@ -1471,7 +1089,7 @@
       "requires": {
         "cross-spawn-async": "1.0.1",
         "err-code": "0.1.2",
-        "q": "1.5.0"
+        "q": "1.4.1"
       }
     },
     "buffers": {
@@ -1495,16 +1113,6 @@
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
-    "bytebuffer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
-      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "long": "3.2.0"
-      }
-    },
     "bytes": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
@@ -1523,7 +1131,7 @@
       "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "upper-case": "1.1.3"
       }
     },
@@ -1544,9 +1152,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000699",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000699.tgz",
-      "integrity": "sha1-WvSRqxx3dWGjK0P+JT1qcHHM+Xk=",
+      "version": "1.0.30000740",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000740.tgz",
+      "integrity": "sha1-A/yqoXbj7QdYlfctRsGhIUm76sk=",
       "dev": true
     },
     "canonical-path": {
@@ -1568,9 +1176,9 @@
       "dev": true
     },
     "catharsis": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.8.tgz",
-      "integrity": "sha1-aTR59DqsVJ2Aa9c+kkzQ2USVGgY=",
+      "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"
@@ -1606,6 +1214,14 @@
         "has-ansi": "2.0.0",
         "strip-ansi": "3.0.1",
         "supports-color": "2.0.0"
+      },
+      "dependencies": {
+        "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": {
@@ -1622,7 +1238,7 @@
         "is-upper-case": "1.1.2",
         "lower-case": "1.1.4",
         "lower-case-first": "1.0.2",
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "param-case": "2.1.1",
         "pascal-case": "2.0.1",
         "path-case": "2.1.1",
@@ -1646,7 +1262,7 @@
       "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
       "dev": true,
       "requires": {
-        "anymatch": "1.3.0",
+        "anymatch": "1.3.2",
         "async-each": "1.0.1",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
@@ -1656,10 +1272,16 @@
         "readdirp": "2.1.0"
       }
     },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+      "dev": true
+    },
     "circular-json": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
-      "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
       "dev": true
     },
     "cjson": {
@@ -1672,12 +1294,12 @@
       }
     },
     "clean-css": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.6.tgz",
-      "integrity": "sha1-Wke+tSaZTLT3vzYYilXtO0VSjws=",
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
+      "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "cli-boxes": {
@@ -1710,63 +1332,27 @@
         "colors": "1.0.3"
       }
     },
-    "cli-table2": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz",
-      "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "colors": "1.1.2",
-        "lodash": "3.10.1",
-        "string-width": "1.0.2"
-      },
-      "dependencies": {
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true,
-          "optional": true
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "cli-width": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
-      "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
     "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "center-align": "0.1.3",
-        "right-align": "0.1.3",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true
-        }
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
       }
     },
     "clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
       "dev": true
     },
     "clone-buffer": {
@@ -1786,9 +1372,9 @@
       }
     },
     "clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
       "dev": true
     },
     "cloneable-readable": {
@@ -1820,7 +1406,7 @@
       "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
       "dev": true,
       "requires": {
-        "color-name": "1.1.2"
+        "color-name": "1.1.3"
       }
     },
     "color-diff": {
@@ -1830,9 +1416,9 @@
       "dev": true
     },
     "color-name": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz",
-      "integrity": "sha1-XIq3K2S9IhXWF66VWeuxSEdc+Y0=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "colorguard": {
@@ -1853,12 +1439,6 @@
         "yargs": "1.3.3"
       },
       "dependencies": {
-        "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
-        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -1894,13 +1474,6 @@
       "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
       "dev": true
     },
-    "colour": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
-      "dev": true,
-      "optional": true
-    },
     "combine-lists": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
@@ -1958,7 +1531,7 @@
       "integrity": "sha1-fAp5onu4C2xplERfgpWCWdPQIVM=",
       "dev": true,
       "requires": {
-        "semver": "5.3.0"
+        "semver": "5.4.1"
       }
     },
     "component-bind": {
@@ -1968,9 +1541,9 @@
       "dev": true
     },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
       "dev": true
     },
     "component-inherit": {
@@ -2018,39 +1591,39 @@
       }
     },
     "compressible": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz",
-      "integrity": "sha1-/tocf3YXkScyspv4zyYlKiC57s0=",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz",
+      "integrity": "sha1-FnGKdd4oPtjmBAQWJaIGRYZ5fYo=",
       "dev": true,
       "requires": {
-        "mime-db": "1.27.0"
+        "mime-db": "1.30.0"
       }
     },
     "compression": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz",
-      "integrity": "sha1-AwyfGY8WQ6BX13anOOki2kNzAS0=",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
+      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.3",
-        "bytes": "2.5.0",
-        "compressible": "2.0.10",
-        "debug": "2.6.8",
+        "accepts": "1.3.4",
+        "bytes": "3.0.0",
+        "compressible": "2.0.11",
+        "debug": "2.6.9",
         "on-headers": "1.0.1",
         "safe-buffer": "5.1.1",
-        "vary": "1.1.1"
+        "vary": "1.1.2"
       },
       "dependencies": {
         "bytes": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz",
-          "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
           "dev": true
         },
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -2076,29 +1649,46 @@
       }
     },
     "configstore": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz",
-      "integrity": "sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
       "dev": true,
       "requires": {
-        "dot-prop": "4.1.1",
+        "dot-prop": "4.2.0",
         "graceful-fs": "4.1.11",
         "make-dir": "1.0.0",
         "unique-string": "1.0.0",
-        "write-file-atomic": "2.1.0",
+        "write-file-atomic": "2.3.0",
         "xdg-basedir": "3.0.0"
       }
     },
     "connect": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz",
-      "integrity": "sha1-aU6NIGgb/kkCgsiriGvpjwn0L+c=",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
+      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
       "dev": true,
       "requires": {
-        "debug": "2.6.7",
-        "finalhandler": "1.0.3",
-        "parseurl": "1.3.1",
-        "utils-merge": "1.0.0"
+        "debug": "2.6.9",
+        "finalhandler": "1.0.6",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "dev": true
+        }
       }
     },
     "connect-livereload": {
@@ -2108,18 +1698,18 @@
       "dev": true
     },
     "connect-query": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-0.2.0.tgz",
-      "integrity": "sha1-Iw3knmlQmjFzi/96WzP4eF7O+jo=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-1.0.0.tgz",
+      "integrity": "sha1-3kT1dyCdokBNH8BGktGkEY5YIRk=",
       "dev": true,
       "requires": {
-        "qs": "1.1.0"
+        "qs": "6.4.0"
       },
       "dependencies": {
         "qs": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-1.1.0.tgz",
-          "integrity": "sha1-KEXNnfRistsoqQNw4ULUksWkXd4=",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
           "dev": true
         }
       }
@@ -2179,17 +1769,10 @@
         "upper-case": "1.1.3"
       }
     },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true,
-      "optional": true
-    },
     "content-type": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
-      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
     "content-type-parser": {
@@ -2198,40 +1781,183 @@
       "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
       "dev": true
     },
+    "conventional-changelog": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.5.tgz",
+      "integrity": "sha512-DUM0iXhgE11uRCoEQnFuYQA5zJcxfvKn940ZFyXziFl0y05yBCoy5ci2fcQYFWQ+OyyxgE2H02EdgYpuz9XG4w==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "1.5.0",
+        "conventional-changelog-atom": "0.1.1",
+        "conventional-changelog-codemirror": "0.2.0",
+        "conventional-changelog-core": "1.9.1",
+        "conventional-changelog-ember": "0.2.7",
+        "conventional-changelog-eslint": "0.2.0",
+        "conventional-changelog-express": "0.2.0",
+        "conventional-changelog-jquery": "0.1.0",
+        "conventional-changelog-jscs": "0.1.0",
+        "conventional-changelog-jshint": "0.2.0"
+      }
+    },
+    "conventional-changelog-angular": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz",
+      "integrity": "sha512-Gt0qSf5wdFmLabgdSlqjguDAmPyYTXtUl4WH5W3SlpElHhnU/UiCY3M7xcIkZxrNQfVA1UxUBgu65eBbaJnZVA==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "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=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
+      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "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=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
+      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz",
+      "integrity": "sha512-Fo0bSeO+NsO6GtuQXts0xQeRpLrxaABTPU8NK4Zij9sJB3zFkU4BObSefJS4F4+EkKujaKCWtfS6Uih+9NpXrQ==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-writer": "2.0.1",
+        "conventional-commits-parser": "2.0.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.1",
+        "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.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "conventional-changelog-ember": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz",
+      "integrity": "sha512-Xj1v9uVcKM8N798hMr7e6yiw8IFyvI6Ik+TdjdmG54uGupqvEEWW37xAbPPbdKvgoitbyZkqUTancj055actEg==",
+      "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=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
+      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "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=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
+      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "q": "1.4.1"
       }
     },
     "conventional-changelog-jquery": {
@@ -2240,7 +1966,7 @@
       "integrity": "sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "q": "1.4.1"
       }
     },
     "conventional-changelog-jscs": {
@@ -2249,23 +1975,23 @@
       "integrity": "sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=",
       "dev": true,
       "requires": {
-        "q": "1.5.0"
+        "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=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
+      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
-        "q": "1.5.0"
+        "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=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
+      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2275,9 +2001,30 @@
         "json-stringify-safe": "5.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
-        "semver": "5.3.0",
-        "split": "1.0.0",
+        "semver": "5.4.1",
+        "split": "1.0.1",
         "through2": "2.0.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "split": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+          "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+          "dev": true,
+          "requires": {
+            "through": "2.3.8"
+          }
+        }
       }
     },
     "conventional-commits-filter": {
@@ -2291,16 +2038,16 @@
       }
     },
     "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=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
+      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
         "JSONStream": "1.3.1",
         "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
-        "split2": "2.1.1",
+        "split2": "2.2.0",
         "through2": "2.0.3",
         "trim-off-newlines": "1.0.1"
       }
@@ -2335,27 +2082,20 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "dev": true
     },
-    "cookiejar": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
-      "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=",
-      "dev": true,
-      "optional": true
-    },
     "copy-props": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-1.6.0.tgz",
       "integrity": "sha1-8DJLvumXcRAeezraES8xPDk9uO0=",
       "dev": true,
       "requires": {
-        "each-props": "1.3.0",
-        "is-plain-object": "2.0.3"
+        "each-props": "1.3.1",
+        "is-plain-object": "2.0.4"
       }
     },
     "core-js": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -2364,26 +2104,18 @@
       "dev": true
     },
     "cosmiconfig": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.1.3.tgz",
-      "integrity": "sha1-lSdx6w3dwcs/ovb75RpSLpOz7go=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
-        "js-yaml": "3.9.0",
+        "js-yaml": "3.10.0",
         "minimist": "1.2.0",
         "object-assign": "4.1.1",
         "os-homedir": "1.0.2",
         "parse-json": "2.2.0",
         "require-from-string": "1.2.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "crc": {
@@ -2444,7 +2176,7 @@
       "dev": true,
       "requires": {
         "lru-cache": "4.1.1",
-        "which": "1.2.14"
+        "which": "1.3.0"
       }
     },
     "cross-spawn-async": {
@@ -2454,7 +2186,7 @@
       "dev": true,
       "requires": {
         "lru-cache": "2.7.3",
-        "which": "1.2.14"
+        "which": "1.3.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -2466,12 +2198,23 @@
       }
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "dev": true,
       "requires": {
-        "boom": "2.10.1"
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
       }
     },
     "crypto-random-string": {
@@ -2717,7 +2460,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.24"
+        "es5-ext": "0.10.30"
       }
     },
     "dargs": {
@@ -2736,25 +2479,13 @@
       "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
-        }
       }
     },
     "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"
-      }
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+      "dev": true
     },
     "debug": {
       "version": "2.6.7",
@@ -2771,23 +2502,6 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-response": "1.0.0"
-      }
-    },
-    "deep-equal": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
-      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
-      "dev": true,
-      "optional": true
-    },
     "deep-extend": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
@@ -2807,6 +2521,14 @@
       "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
+        }
       }
     },
     "del": {
@@ -2822,14 +2544,6 @@
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
         "rimraf": "2.6.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "delayed-stream": {
@@ -2845,9 +2559,9 @@
       "dev": true
     },
     "depd": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
-      "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
       "dev": true
     },
     "dependency-graph": {
@@ -2864,8 +2578,8 @@
       "requires": {
         "commander": "2.6.0",
         "debug": "2.2.0",
-        "filing-cabinet": "1.8.0",
-        "precinct": "3.6.0"
+        "filing-cabinet": "1.9.0",
+        "precinct": "3.8.0"
       },
       "dependencies": {
         "commander": {
@@ -2919,9 +2633,9 @@
       "dev": true,
       "requires": {
         "ast-module-types": "2.3.2",
-        "escodegen": "1.8.1",
+        "escodegen": "1.9.0",
         "get-amd-module-type": "2.0.5",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       }
     },
     "detective-cjs": {
@@ -2931,16 +2645,16 @@
       "dev": true,
       "requires": {
         "ast-module-types": "2.3.2",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       }
     },
     "detective-es6": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-1.1.6.tgz",
-      "integrity": "sha1-XZFAVm7v8SxU/mqzk2ZQ1DvOsKY=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-1.2.0.tgz",
+      "integrity": "sha1-a5s71Uf9jyH4lQL2JuRe0qMnb9w=",
       "dev": true,
       "requires": {
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       }
     },
     "detective-less": {
@@ -2951,7 +2665,7 @@
       "requires": {
         "debug": "2.2.0",
         "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       },
       "dependencies": {
         "debug": {
@@ -2979,7 +2693,7 @@
       "requires": {
         "debug": "2.2.0",
         "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       },
       "dependencies": {
         "debug": {
@@ -3007,7 +2721,7 @@
       "requires": {
         "debug": "2.2.0",
         "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       },
       "dependencies": {
         "debug": {
@@ -3033,6 +2747,43 @@
       "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
       "dev": true
     },
+    "detective-typescript": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-1.0.1.tgz",
+      "integrity": "sha512-4DZpsap+dVzQblcL/ffVXtaXtA7byrP14XQnvyAvwo8+z7/C0OrwLNQhyiC6cLZlzy2T8QuPc+mDsYsa4lAxHw==",
+      "dev": true,
+      "requires": {
+        "node-source-walk": "3.2.0",
+        "typescript": "2.0.10",
+        "typescript-eslint-parser": "1.0.2"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.8.4",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.4.tgz",
+          "integrity": "sha1-CXMGuNq66VFZIlzymz6lWRIFMYA=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.26.0"
+          }
+        },
+        "node-source-walk": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.2.0.tgz",
+          "integrity": "sha1-PGBcxTq97ktFq2XpR9+x23yQ8OM=",
+          "dev": true,
+          "requires": {
+            "babylon": "6.8.4"
+          }
+        },
+        "typescript": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz",
+          "integrity": "sha1-zN1O2G/VVQpAcQGggUAS4bP6w90=",
+          "dev": true
+        }
+      }
+    },
     "dgeni": {
       "version": "0.4.9",
       "resolved": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.9.tgz",
@@ -3055,12 +2806,6 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
-        },
-        "q": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-          "dev": true
         }
       }
     },
@@ -3071,7 +2816,7 @@
       "dev": true,
       "requires": {
         "canonical-path": "0.0.2",
-        "catharsis": "0.8.8",
+        "catharsis": "0.8.9",
         "change-case": "3.0.0",
         "dgeni": "0.4.9",
         "espree": "2.2.5",
@@ -3085,7 +2830,7 @@
         "mkdirp-promise": "5.0.1",
         "node-html-encoder": "0.0.2",
         "nunjucks": "2.5.2",
-        "semver": "5.3.0",
+        "semver": "5.4.1",
         "shelljs": "0.7.8",
         "spdx-license-list": "2.1.0",
         "stringmap": "0.2.2",
@@ -3105,9 +2850,9 @@
       "dev": true
     },
     "diff": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz",
-      "integrity": "sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
+      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
       "dev": true
     },
     "doiuse": {
@@ -3117,7 +2862,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000699",
+        "caniuse-db": "1.0.30000740",
         "css-rule-stream": "1.1.0",
         "duplexer2": "0.0.2",
         "jsonfilter": "1.1.2",
@@ -3127,7 +2872,7 @@
         "postcss": "5.2.17",
         "source-map": "0.4.4",
         "through2": "0.6.5",
-        "yargs": "3.10.0"
+        "yargs": "3.32.0"
       },
       "dependencies": {
         "duplexer2": {
@@ -3259,13 +3004,13 @@
       "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1"
+        "no-case": "2.3.2"
       }
     },
     "dot-prop": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
-      "integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
         "is-obj": "1.0.1"
@@ -3286,41 +3031,26 @@
         "readable-stream": "2.3.3"
       }
     },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true,
-      "optional": true
-    },
     "duplexify": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz",
-      "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.0.0",
+        "end-of-stream": "1.4.0",
         "inherits": "2.0.3",
         "readable-stream": "2.3.3",
         "stream-shift": "1.0.0"
       }
     },
     "each-props": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.0.tgz",
-      "integrity": "sha1-ftgDHJJ2iK7bSoluuRSFtEh7kOo=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.1.tgz",
+      "integrity": "sha1-/BOPUeOid0KG1IWOAtbn3kYt4Vg=",
       "dev": true,
       "requires": {
-        "is-plain-object": "2.0.3",
-        "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "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
-        }
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
       }
     },
     "ecc-jsbn": {
@@ -3350,9 +3080,9 @@
       "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=",
+      "version": "1.3.24",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz",
+      "integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=",
       "dev": true
     },
     "encodeurl": {
@@ -3362,23 +3092,12 @@
       "dev": true
     },
     "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=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
       "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"
-          }
-        }
+        "once": "1.4.0"
       }
     },
     "engine.io": {
@@ -3395,6 +3114,16 @@
         "ws": "1.1.2"
       },
       "dependencies": {
+        "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.17",
+            "negotiator": "0.6.1"
+          }
+        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
@@ -3432,6 +3161,12 @@
         "yeast": "0.1.2"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
@@ -3472,15 +3207,7 @@
         "graceful-fs": "4.1.11",
         "memory-fs": "0.4.1",
         "object-assign": "4.1.1",
-        "tapable": "0.2.6"
-      },
-      "dependencies": {
-        "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
-        }
+        "tapable": "0.2.8"
       }
     },
     "ent": {
@@ -3525,14 +3252,14 @@
       "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.3",
+        "accepts": "1.3.4",
         "escape-html": "1.0.3"
       }
     },
     "es5-ext": {
-      "version": "0.10.24",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz",
-      "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ=",
+      "version": "0.10.30",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz",
+      "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=",
       "dev": true,
       "requires": {
         "es6-iterator": "2.0.1",
@@ -3546,14 +3273,14 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.24",
+        "es5-ext": "0.10.30",
         "es6-symbol": "3.1.1"
       }
     },
     "es6-promise": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
-      "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
       "dev": true
     },
     "es6-set": {
@@ -3563,7 +3290,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.24",
+        "es5-ext": "0.10.30",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1",
         "event-emitter": "0.3.5"
@@ -3576,7 +3303,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.24"
+        "es5-ext": "0.10.30"
       }
     },
     "escape-html": {
@@ -3592,39 +3319,23 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
+      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
       "dev": true,
       "requires": {
-        "esprima": "2.7.3",
-        "estraverse": "1.9.3",
+        "esprima": "3.1.3",
+        "estraverse": "4.2.0",
         "esutils": "2.0.2",
         "optionator": "0.8.2",
-        "source-map": "0.2.0"
+        "source-map": "0.5.7"
       },
       "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=",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
           "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"
-          }
         }
       }
     },
@@ -3646,12 +3357,6 @@
       "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-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
@@ -3659,7 +3364,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.24"
+        "es5-ext": "0.10.30"
       }
     },
     "event-stream": {
@@ -3675,17 +3380,6 @@
         "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": {
@@ -3694,42 +3388,6 @@
       "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
       "dev": true
     },
-    "execa": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz",
-      "integrity": "sha1-3j+4XLjW6RyFvLzrFkWBeFy1ezY=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "cross-spawn": "4.0.2",
-        "get-stream": "2.3.1",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
-          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "object-assign": "4.1.1",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "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,
-          "optional": true
-        }
-      }
-    },
     "execall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
@@ -3834,43 +3492,6 @@
         "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,
-      "optional": 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"
-      }
-    },
     "express-session": {
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz",
@@ -3883,7 +3504,7 @@
         "debug": "2.2.0",
         "depd": "1.0.1",
         "on-headers": "1.0.1",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "uid-safe": "2.0.0",
         "utils-merge": "1.0.0"
       },
@@ -3942,9 +3563,9 @@
       }
     },
     "extsprintf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
     "eyes": {
@@ -3963,6 +3584,12 @@
         "time-stamp": "1.1.0"
       }
     },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+      "dev": true
+    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -3984,7 +3611,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": "0.6.5"
+        "websocket-driver": "0.7.0"
       }
     },
     "figures": {
@@ -3995,14 +3622,6 @@
       "requires": {
         "escape-string-regexp": "1.0.5",
         "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "file-entry-cache": {
@@ -4011,16 +3630,8 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "1.2.2",
+        "flat-cache": "1.3.0",
         "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "file-exists": {
@@ -4042,61 +3653,24 @@
       "dev": true
     },
     "filing-cabinet": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-1.8.0.tgz",
-      "integrity": "sha1-fQ6MObBuFlMs7hTK3eQbH6AnYmU=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-1.9.0.tgz",
+      "integrity": "sha1-BDyvGSXjVbA6jVCW9AhNP0AwCLY=",
       "dev": true,
       "requires": {
         "app-module-path": "1.1.0",
-        "commander": "2.8.1",
-        "debug": "2.2.0",
+        "commander": "2.11.0",
+        "debug": "2.6.7",
         "enhanced-resolve": "3.0.3",
-        "is-relative-path": "1.0.1",
+        "is-relative-path": "1.0.2",
         "module-definition": "2.2.4",
         "module-lookup-amd": "4.0.4",
-        "object-assign": "4.0.1",
-        "resolve": "1.1.7",
+        "object-assign": "4.1.1",
+        "resolve": "1.4.0",
         "resolve-dependency-path": "1.0.2",
-        "sass-lookup": "1.0.2",
-        "stylus-lookup": "1.0.1"
-      },
-      "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"
-          }
-        },
-        "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
-        },
-        "object-assign": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz",
-          "integrity": "sha1-mVBEVsNZi1ytT8WcJuipuxB/4L0=",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
+        "sass-lookup": "1.1.0",
+        "stylus-lookup": "1.0.1",
+        "typescript": "2.4.2"
       }
     },
     "fill-range": {
@@ -4119,18 +3693,29 @@
       "dev": true
     },
     "finalhandler": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
-      "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
       "dev": true,
       "requires": {
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "on-finished": "2.3.0",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "statuses": "1.3.1",
         "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "find": {
@@ -4154,16 +3739,6 @@
       "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"
-      }
-    },
     "findup-sync": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
@@ -4183,9 +3758,9 @@
       "dev": true,
       "requires": {
         "expand-tilde": "2.0.2",
-        "is-plain-object": "2.0.3",
+        "is-plain-object": "2.0.4",
         "object.defaults": "1.1.0",
-        "object.pick": "1.2.0",
+        "object.pick": "1.3.0",
         "parse-filepath": "1.0.1"
       },
       "dependencies": {
@@ -4201,14 +3776,14 @@
       }
     },
     "firebase": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.1.3.tgz",
-      "integrity": "sha1-5dcyc2bIVNwSRhYzuov+6i9cc1g=",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.4.0.tgz",
+      "integrity": "sha1-z/o0lkw4riQVfskw2+FHgW/Y4/Q=",
       "dev": true,
       "requires": {
         "dom-storage": "2.0.2",
         "faye-websocket": "0.9.3",
-        "jsonwebtoken": "7.4.1",
+        "jsonwebtoken": "7.4.3",
         "promise-polyfill": "6.0.2",
         "xmlhttprequest": "1.8.0"
       },
@@ -4238,7 +3813,7 @@
           "dev": true,
           "requires": {
             "base64url": "2.0.0",
-            "safe-buffer": "5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "faye-websocket": {
@@ -4247,7 +3822,7 @@
           "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.6.5"
+            "websocket-driver": "0.7.0"
           }
         },
         "hoek": {
@@ -4256,6 +3831,12 @@
           "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
           "dev": true
         },
+        "http-parser-js": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.6.tgz",
+          "integrity": "sha1-GVJz9YcExFLWcQdr4gEyndNB3FU=",
+          "dev": true
+        },
         "isemail": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
@@ -4275,9 +3856,9 @@
           }
         },
         "jsonwebtoken": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
-          "integrity": "sha1-fKMk9SFfi+A5zTWmxFu4y3SkSPs=",
+          "version": "7.4.3",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
+          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
           "dev": true,
           "requires": {
             "joi": "6.10.1",
@@ -4296,7 +3877,7 @@
             "base64url": "2.0.0",
             "buffer-equal-constant-time": "1.0.1",
             "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "jws": {
@@ -4307,7 +3888,7 @@
           "requires": {
             "base64url": "2.0.0",
             "jwa": "1.1.5",
-            "safe-buffer": "5.1.0"
+            "safe-buffer": "5.1.1"
           }
         },
         "lodash.once": {
@@ -4335,9 +3916,9 @@
           "dev": true
         },
         "safe-buffer": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
-          "integrity": "sha512-aSLEDudu6OoRr/2rU609gRmnYboRLxgDG1z9o2Q0os7236FwvcqIOO8r8U5JUEwivZOhDaKlFO4SbPTJYyBEyQ==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
           "dev": true
         },
         "topo": {
@@ -4350,18 +3931,19 @@
           }
         },
         "websocket-driver": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
           "dev": true,
           "requires": {
-            "websocket-extensions": "0.1.1"
+            "http-parser-js": "0.4.6",
+            "websocket-extensions": "0.1.2"
           }
         },
         "websocket-extensions": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
           "dev": true
         },
         "xmlhttprequest": {
@@ -4379,2544 +3961,2056 @@
       }
     },
     "firebase-admin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.0.0.tgz",
-      "integrity": "sha1-+trlbJm+T7VseBAH1nGdFT/o/Xs=",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.3.0.tgz",
+      "integrity": "sha1-FPTyAdc1jLWq9x6rUasEXw08cwY=",
       "dev": true,
       "requires": {
-        "@types/jsonwebtoken": "7.2.0",
+        "@google-cloud/storage": "1.3.0",
+        "@types/jsonwebtoken": "7.2.3",
         "faye-websocket": "0.9.3",
         "jsonwebtoken": "7.1.9",
         "node-forge": "0.7.1"
       },
       "dependencies": {
+        "@google-cloud/common": {
+          "version": "0.13.5",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
+          "integrity": "sha1-uQWZ8pzpV7NmreqNfAw/NZPZgco=",
+          "dev": true,
+          "requires": {
+            "array-uniq": "1.0.3",
+            "arrify": "1.0.1",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "ent": "2.2.0",
+            "extend": "3.0.1",
+            "google-auto-auth": "0.7.2",
+            "is": "3.2.1",
+            "log-driver": "1.2.5",
+            "methmeth": "1.1.0",
+            "modelo": "4.2.0",
+            "request": "2.82.0",
+            "retry-request": "2.0.5",
+            "split-array-stream": "1.0.3",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
+        "@google-cloud/storage": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.0.tgz",
+          "integrity": "sha512-kZ2Q7vTyeCQP/V3Ru0DwolSsXVFaZhrX5LeCdi+jh3IDF/GiYrgLVXL7fO8IPTqS4ZfzMdPcrSxycr0rF/CM3Q==",
+          "dev": true,
+          "requires": {
+            "@google-cloud/common": "0.13.5",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "safe-buffer": "5.1.1",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
         "@types/jsonwebtoken": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.0.tgz",
-          "integrity": "sha1-D+0yyFAdqArJg50tQDplyD13b/0=",
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
+          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
           "dev": true,
           "requires": {
-            "@types/node": "7.0.18"
+            "@types/node": "8.0.31"
           }
         },
         "@types/node": {
-          "version": "7.0.18",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz",
-          "integrity": "sha1-zWfyfT3Az7dG8L3V4IbExdVb4XM=",
+          "version": "8.0.31",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.31.tgz",
+          "integrity": "sha512-R+LdMJHJQwRd/Ca0Nr5KnwbSWHxTD3DWz4ivqoPeNH+YPcuirMWK+Ti9Mx32jOecmPhHOCd+6CefU5e1eVq2Ew==",
           "dev": true
         },
-        "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+        "ajv": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "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
         },
-        "buffer-equal-constant-time": {
+        "arrify": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
           "dev": true
         },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-          "dev": true,
-          "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.0.1"
-          }
+        "asn1": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+          "dev": true
         },
-        "faye-websocket": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "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": {
-            "websocket-driver": "0.6.5"
+            "lodash": "4.17.4"
           }
         },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
           "dev": true
         },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
           "dev": true
         },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
-          }
+        "aws4": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+          "dev": true
         },
-        "jsonwebtoken": {
-          "version": "7.1.9",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
-          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
-          "dev": true,
-          "requires": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "0.7.3",
-            "xtend": "4.0.1"
-          }
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+          "dev": true
         },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+        "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": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.0.1"
+            "tweetnacl": "0.14.5"
           }
         },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+        "boom": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
           "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.0.1"
+            "hoek": "4.2.0"
           }
         },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
+        "buffer-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
           "dev": true
         },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
           "dev": true
         },
-        "ms": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
+        "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
         },
-        "node-forge": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
+        "caseless": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
           "dev": true
         },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+        "co": {
+          "version": "4.6.0",
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
           "dev": true
         },
-        "topo": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+        "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": {
-            "hoek": "2.16.3"
+            "delayed-stream": "1.0.0"
           }
         },
-        "websocket-driver": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+        "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"
+          }
+        },
+        "configstore": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
           "dev": true,
           "requires": {
-            "websocket-extensions": "0.1.1"
+            "dot-prop": "4.2.0",
+            "graceful-fs": "4.1.11",
+            "make-dir": "1.0.0",
+            "unique-string": "1.0.0",
+            "write-file-atomic": "2.3.0",
+            "xdg-basedir": "3.0.0"
           }
         },
-        "websocket-extensions": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+        "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
         },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+        "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"
+          }
+        },
+        "cryptiles": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+          "dev": true,
+          "requires": {
+            "boom": "5.2.0"
+          },
+          "dependencies": {
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+              "dev": true,
+              "requires": {
+                "hoek": "4.2.0"
+              }
+            }
+          }
+        },
+        "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
-        }
-      }
-    },
-    "firebase-tools": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.9.1.tgz",
-      "integrity": "sha1-tivitFZBile/Goz4sBprj3j2wbA=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/functions-emulator": "1.0.0-alpha.21",
-        "JSONStream": "1.3.1",
-        "archiver": "0.16.0",
-        "chalk": "1.1.3",
-        "cjson": "0.3.3",
-        "cli-table": "0.3.1",
-        "commander": "2.11.0",
-        "configstore": "1.4.0",
-        "cross-spawn": "4.0.2",
-        "csv-streamify": "3.0.4",
-        "didyoumean": "1.2.1",
-        "es6-set": "0.1.5",
-        "exit-code": "1.0.2",
-        "filesize": "3.5.10",
-        "firebase": "2.4.2",
-        "fs-extra": "0.23.1",
-        "fstream-ignore": "1.0.5",
-        "inquirer": "0.12.0",
-        "jsonschema": "1.1.1",
-        "jsonwebtoken": "5.7.0",
-        "lodash": "4.17.4",
-        "open": "0.0.5",
-        "ora": "0.2.3",
-        "portfinder": "0.4.0",
-        "progress": "1.1.8",
-        "request": "2.81.0",
-        "rsvp": "3.6.1",
-        "semver": "5.3.0",
-        "superstatic": "4.1.0",
-        "tar": "2.2.1",
-        "tmp": "0.0.27",
-        "universal-analytics": "0.3.11",
-        "update-notifier": "0.5.0",
-        "user-home": "2.0.0",
-        "uuid": "3.1.0",
-        "winston": "1.1.2"
-      },
-      "dependencies": {
-        "async": {
+        },
+        "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"
+          }
+        },
+        "delayed-stream": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
           "dev": true
         },
-        "configstore": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
-          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+        "dot-prop": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "mkdirp": "0.5.1",
-            "object-assign": "4.1.1",
-            "os-tmpdir": "1.0.2",
-            "osenv": "0.1.4",
-            "uuid": "2.0.3",
-            "write-file-atomic": "1.3.4",
-            "xdg-basedir": "2.0.0"
-          },
-          "dependencies": {
-            "uuid": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-              "dev": true
-            }
+            "is-obj": "1.0.1"
           }
         },
-        "firebase": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
-          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+        "duplexify": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
           "dev": true,
           "requires": {
-            "faye-websocket": "0.9.3"
-          },
-          "dependencies": {
-            "faye-websocket": {
-              "version": "0.9.3",
-              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-              "dev": true,
-              "requires": {
-                "websocket-driver": "0.5.2"
-              },
-              "dependencies": {
-                "websocket-driver": {
-                  "version": "0.5.2",
-                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
-                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
-                  "dev": true,
-                  "requires": {
-                    "websocket-extensions": "0.1.1"
-                  },
-                  "dependencies": {
-                    "websocket-extensions": {
-                      "version": "0.1.1",
-                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            }
+            "end-of-stream": "1.4.0",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.3",
+            "stream-shift": "1.0.0"
           }
         },
-        "fs-extra": {
-          "version": "0.23.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
-          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
+        "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": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.1"
+            "jsbn": "0.1.1"
           }
         },
-        "jsonwebtoken": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-5.7.0.tgz",
-          "integrity": "sha1-HJD5qGzlt0j1+XnBK3BAK0r83bQ=",
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
           "dev": true,
           "requires": {
-            "jws": "3.1.4",
-            "ms": "0.7.3",
-            "xtend": "4.0.1"
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
           }
         },
-        "ms": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
+        "end-of-stream": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+          "dev": true,
+          "requires": {
+            "once": "1.4.0"
+          }
+        },
+        "ent": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
           "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=",
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
           "dev": true
         },
-        "pkginfo": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+        "extsprintf": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
           "dev": true
         },
-        "winston": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
-          "dev": true,
-          "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
-          }
+        "fast-deep-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+          "dev": true
         },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+        "faye-websocket": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
+            "websocket-driver": "0.7.0"
           }
         },
-        "xdg-basedir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+        "forever-agent": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
           "dev": true,
           "requires": {
-            "os-homedir": "1.0.2"
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
           }
-        }
-      }
-    },
-    "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
-    },
-    "flat-arguments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "1.1.1",
-        "as-array": "1.0.0",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isobject": "3.0.2"
-      },
-      "dependencies": {
-        "as-array": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
+        },
+        "gcp-metadata": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
           "dev": true,
           "requires": {
-            "lodash.isarguments": "2.4.1",
-            "lodash.isobject": "2.4.1",
-            "lodash.values": "2.4.1"
+            "extend": "3.0.1",
+            "retry-request": "3.0.0"
           },
           "dependencies": {
-            "lodash.isarguments": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
-              "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=",
+            "retry-request": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
+              "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
               "dev": true,
               "requires": {
-                "lodash._objecttypes": "2.4.1"
+                "request": "2.82.0",
+                "through2": "2.0.3"
               }
             }
           }
         },
-        "lodash.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
-          "dev": true
-        }
-      }
-    },
-    "flat-cache": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.1",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "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"
-      }
-    },
-    "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.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"
-      }
-    },
-    "formidable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
-      "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
-      "dev": true,
-      "optional": true
-    },
-    "forwarded": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
-      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=",
-      "dev": true,
-      "optional": 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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.0"
-      },
-      "dependencies": {
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+        "gcs-resumable-upload": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "buffer-equal": "1.0.0",
+            "configstore": "3.1.1",
+            "google-auto-auth": "0.7.2",
+            "pumpify": "1.3.5",
+            "request": "2.82.0",
+            "stream-events": "1.0.2",
+            "through2": "2.0.3"
           }
-        }
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "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"
-      }
-    },
-    "fstream-ignore": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-      "dev": true,
-      "requires": {
-        "fstream": "1.0.11",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4"
-      }
-    },
-    "gather-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
-      "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"
-      },
-      "dependencies": {
-        "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
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "gcp-metadata": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.2.0.tgz",
-      "integrity": "sha1-Ytr8pl86YxvIzi7Dt3Zh9fk4ego=",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.1",
-        "retry-request": "2.0.5"
-      }
-    },
-    "gcs-resumable-upload": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.0.tgz",
-      "integrity": "sha1-023swVIzRGCC249J4hAndE80+CQ=",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "1.0.0",
-        "configstore": "3.1.0",
-        "google-auto-auth": "0.6.1",
-        "pumpify": "1.3.5",
-        "request": "2.81.0",
-        "stream-events": "1.0.2",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true
         },
-        "gcp-metadata": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.1.0.tgz",
-          "integrity": "sha1-q+IfHqMk3Qs0o/BsqBdj+x7uN9k=",
+        "getpass": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
           "dev": true,
           "requires": {
-            "extend": "3.0.1",
-            "retry-request": "1.3.2"
+            "assert-plus": "1.0.0"
+          }
+        },
+        "google-auth-library": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+          "dev": true,
+          "requires": {
+            "gtoken": "1.2.2",
+            "jws": "3.1.4",
+            "lodash.noop": "3.0.1",
+            "request": "2.82.0"
           }
         },
         "google-auto-auth": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.6.1.tgz",
-          "integrity": "sha1-wF2CDpRUc57PKKiJLuqz0WJPLLM=",
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
           "dev": true,
           "requires": {
             "async": "2.5.0",
-            "gcp-metadata": "0.1.0",
+            "gcp-metadata": "0.3.1",
             "google-auth-library": "0.10.0",
-            "object-assign": "3.0.0",
-            "request": "2.81.0"
+            "request": "2.82.0"
           }
         },
-        "har-validator": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+        "google-p12-pem": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
           "dev": true,
           "requires": {
-            "chalk": "1.1.3",
-            "commander": "2.11.0",
-            "is-my-json-valid": "2.16.0",
-            "pinkie-promise": "2.0.1"
+            "node-forge": "0.7.1"
           }
         },
-        "node-uuid": {
-          "version": "1.4.8",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
           "dev": true
         },
-        "qs": {
-          "version": "6.3.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
+        "gtoken": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
+          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
+          "dev": true,
+          "requires": {
+            "google-p12-pem": "0.1.2",
+            "jws": "3.1.4",
+            "mime": "1.4.1",
+            "request": "2.82.0"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
           "dev": true
         },
-        "retry-request": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-1.3.2.tgz",
-          "integrity": "sha1-Wa0k5x+K4/MS1fe0vPRnpeWle9Y=",
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.2.3",
+            "har-schema": "2.0.0"
+          }
+        },
+        "hash-stream-validation": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
           "dev": true,
           "requires": {
-            "request": "2.76.0",
             "through2": "2.0.3"
-          },
-          "dependencies": {
-            "request": {
-              "version": "2.76.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.76.0.tgz",
-              "integrity": "sha1-vkRQWv73A2CgQ2lVEGvjlF2VVg4=",
-              "dev": true,
-              "requires": {
-                "aws-sign2": "0.6.0",
-                "aws4": "1.6.0",
-                "caseless": "0.11.0",
-                "combined-stream": "1.0.5",
-                "extend": "3.0.1",
-                "forever-agent": "0.6.1",
-                "form-data": "2.1.4",
-                "har-validator": "2.0.6",
-                "hawk": "3.1.3",
-                "http-signature": "1.1.1",
-                "is-typedarray": "1.0.0",
-                "isstream": "0.1.2",
-                "json-stringify-safe": "5.0.1",
-                "mime-types": "2.1.15",
-                "node-uuid": "1.4.8",
-                "oauth-sign": "0.8.2",
-                "qs": "6.3.2",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.2",
-                "tunnel-agent": "0.4.3"
-              }
-            }
           }
         },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+        "hawk": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+          "dev": true,
+          "requires": {
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.0",
+            "sntp": "2.0.2"
+          }
+        },
+        "hoek": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
           "dev": true
-        }
-      }
-    },
-    "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-amd-module-type": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz",
-      "integrity": "sha1-5nHsWpatX79To6IqKJ6SOMdy3bA=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "node-source-walk": "3.2.1"
-      }
-    },
-    "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.3"
-      }
-    },
-    "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,
-      "optional": 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=",
+        },
+        "http-parser-js": {
+          "version": "0.4.8",
+          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz",
+          "integrity": "sha512-jmHp99g6/fLx0pRNJqzsQgjsclCHAY7NhIeA3/U+bsGNvgbvUCQFQY9m5AYpqpAxY/2VcikfbKpjQozSTiz0jA==",
           "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.3"
-      }
-    },
-    "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"
-      }
-    },
-    "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-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.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-      "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-slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
-      "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U=",
-      "dev": true
-    },
-    "glob-slasher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
-      "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
-      "dev": true,
-      "requires": {
-        "glob-slash": "1.0.0",
-        "lodash.isobject": "2.4.1",
-        "toxic": "1.0.0"
-      }
-    },
-    "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=",
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "2.0.10",
-            "once": "1.4.0"
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
           }
         },
+        "imurmurhash": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "is": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
+          "dev": true
+        },
+        "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-stream-ended": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
+          "dev": true
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+          "dev": true
+        },
         "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
+          "dev": true
+        },
+        "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
+        },
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.8"
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "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=",
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+          "dev": true,
+          "optional": 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-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "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": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "jsonify": "0.0.0"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "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
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "jsonify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+          "dev": true
+        },
+        "jsonwebtoken": {
+          "version": "7.1.9",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
+          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "0.7.3",
             "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"
-      }
-    },
-    "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"
-      }
-    },
-    "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.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "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
-        }
-      }
-    },
-    "globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "globs": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.3.tgz",
-      "integrity": "sha1-ZwA3ElKHy2VJqtlqRM+mhP18VQI=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2"
-      }
-    },
-    "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"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "3.1.21",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
           "dev": true,
           "requires": {
-            "graceful-fs": "1.2.3",
-            "inherits": "1.0.2",
-            "minimatch": "0.2.14"
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
           }
         },
-        "graceful-fs": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
           "dev": true
         },
-        "inherits": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
+        "lodash.noop": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
           "dev": true
         },
-        "lodash": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
           "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=",
+        "log-driver": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
           "dev": true
         },
-        "minimatch": {
-          "version": "0.2.14",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+        "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": {
-            "lru-cache": "2.7.3",
-            "sigmund": "1.0.1"
+            "pify": "2.3.0"
           }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "gm": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/gm/-/gm-1.21.1.tgz",
-      "integrity": "sha1-ftXtBds20wwZQ/OcO8HIObjyNh0=",
-      "dev": true,
-      "requires": {
-        "array-parallel": "0.1.3",
-        "array-series": "0.1.5",
-        "debug": "2.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+        },
+        "methmeth": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "mime-db": "1.30.0"
           }
         },
+        "modelo": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
+          "dev": true
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+          "dev": true
+        },
         "ms": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
+          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
+          "dev": true
+        },
+        "node-forge": {
           "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
           "dev": true
-        }
-      }
-    },
-    "gonzales-pe": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
-      "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
-      "dev": true,
-      "requires": {
-        "minimist": "1.1.3"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
-          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+        },
+        "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
-        }
-      }
-    },
-    "google-auth-library": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-      "dev": true,
-      "requires": {
-        "gtoken": "1.2.2",
-        "jws": "3.1.4",
-        "lodash.noop": "3.0.1",
-        "request": "2.81.0"
-      }
-    },
-    "google-auto-auth": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.1.tgz",
-      "integrity": "sha1-yCYERJEt2M7szYOHYdVvRik3vQI=",
-      "dev": true,
-      "requires": {
-        "async": "2.5.0",
-        "gcp-metadata": "0.2.0",
-        "google-auth-library": "0.10.0",
-        "request": "2.81.0"
-      }
-    },
-    "google-closure-compiler": {
-      "version": "20170409.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20170409.0.0.tgz",
-      "integrity": "sha1-3Bvimp9+74YRNkUzsnG5+sdXyXA=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "vinyl": "2.1.0",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      }
-    },
-    "google-p12-pem": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.7.1"
+        },
+        "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"
+          }
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "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
+        },
+        "pump": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "1.4.0",
+            "once": "1.4.0"
+          }
+        },
+        "pumpify": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+          "dev": true,
+          "requires": {
+            "duplexify": "3.5.1",
+            "inherits": "2.0.3",
+            "pump": "1.0.2"
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "request": {
+          "version": "2.82.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.82.0.tgz",
+          "integrity": "sha512-/QWqfmyTfQ4OYs6EhB1h2wQsX9ZxbuNePCvCm0Mdz/mxw73mjdg0D4QdIl0TQBFs35CZmMXLjk0iCGK395CUDg==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.1",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.1",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "retry-request": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
+          "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
+          "dev": true,
+          "requires": {
+            "request": "2.82.0",
+            "through2": "2.0.3"
+          }
+        },
+        "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
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+          "dev": true
+        },
+        "sntp": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "split-array-stream": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+          "dev": true,
+          "requires": {
+            "async": "2.5.0",
+            "is-stream-ended": "0.1.3"
+          }
+        },
+        "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"
+          }
+        },
+        "stream-events": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+          "dev": true,
+          "requires": {
+            "stubs": "3.0.0"
+          }
+        },
+        "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
+        },
+        "string-format-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+          "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"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+          "dev": true
+        },
+        "stubs": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            }
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "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"
+          }
+        },
+        "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
+        },
+        "typedarray": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+          "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"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        },
+        "verror": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "1.3.0"
+          }
+        },
+        "websocket-driver": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+          "dev": true,
+          "requires": {
+            "http-parser-js": "0.4.8",
+            "websocket-extensions": "0.1.2"
+          }
+        },
+        "websocket-extensions": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+          "dev": true
+        },
+        "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.3.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "signal-exit": "3.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
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
+    "firebase-tools": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.12.0.tgz",
+      "integrity": "sha1-uIquvtjTE+tZ3qiRcbZoeaRlKJg=",
+      "dev": true,
+      "requires": {
+        "JSONStream": "1.3.1",
+        "archiver": "0.16.0",
+        "chalk": "1.1.3",
+        "cjson": "0.3.3",
+        "cli-table": "0.3.1",
+        "commander": "2.11.0",
+        "configstore": "1.4.0",
+        "cross-spawn": "4.0.2",
+        "csv-streamify": "3.0.4",
+        "didyoumean": "1.2.1",
+        "es6-set": "0.1.5",
+        "exit-code": "1.0.2",
+        "filesize": "3.5.10",
+        "firebase": "2.4.2",
+        "fs-extra": "0.23.1",
+        "fstream-ignore": "1.0.5",
+        "glob": "7.1.2",
+        "google-auto-auth": "0.7.2",
+        "inquirer": "0.12.0",
+        "jsonschema": "1.2.0",
+        "jsonwebtoken": "7.4.3",
+        "lodash": "4.17.4",
+        "open": "0.0.5",
+        "ora": "0.2.3",
+        "portfinder": "0.4.0",
+        "progress": "2.0.0",
+        "request": "2.83.0",
+        "rsvp": "3.6.2",
+        "semver": "5.4.1",
+        "superstatic": "5.0.1",
+        "tar": "3.2.1",
+        "tmp": "0.0.27",
+        "universal-analytics": "0.3.11",
+        "update-notifier": "0.5.0",
+        "user-home": "2.0.0",
+        "uuid": "3.1.0",
+        "winston": "1.1.2"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "configstore": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
+          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "os-tmpdir": "1.0.2",
+            "osenv": "0.1.4",
+            "uuid": "2.0.3",
+            "write-file-atomic": "1.3.4",
+            "xdg-basedir": "2.0.0"
+          },
+          "dependencies": {
+            "uuid": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+              "dev": true
+            }
+          }
+        },
+        "firebase": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
+          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+          "dev": true,
+          "requires": {
+            "faye-websocket": "0.9.3"
+          },
+          "dependencies": {
+            "faye-websocket": {
+              "version": "0.9.3",
+              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+              "dev": true,
+              "requires": {
+                "websocket-driver": "0.5.2"
+              },
+              "dependencies": {
+                "websocket-driver": {
+                  "version": "0.5.2",
+                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
+                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
+                  "dev": true,
+                  "requires": {
+                    "websocket-extensions": "0.1.1"
+                  },
+                  "dependencies": {
+                    "websocket-extensions": {
+                      "version": "0.1.1",
+                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+                      "dev": true
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "fs-extra": {
+          "version": "0.23.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
+          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+          "dev": true
+        },
+        "winston": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
+          "dev": true,
+          "requires": {
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
+          }
+        },
+        "write-file-atomic": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
+          }
+        },
+        "xdg-basedir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+          "dev": true,
+          "requires": {
+            "os-homedir": "1.0.2"
+          }
+        }
+      }
+    },
+    "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
+    },
+    "flat-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
+      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "1.1.1",
+        "as-array": "1.0.0",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isobject": "3.0.2"
+      },
+      "dependencies": {
+        "as-array": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
+          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
+          "dev": true,
+          "requires": {
+            "lodash.isarguments": "2.4.1",
+            "lodash.isobject": "2.4.1",
+            "lodash.values": "2.4.1"
+          },
+          "dependencies": {
+            "lodash.isarguments": {
+              "version": "2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
+              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
+              "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.isobject": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+          "dev": true
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "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"
+      }
+    },
+    "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.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "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"
+      }
+    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
+      }
+    },
+    "gather-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
+      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
+      "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.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      }
+    },
+    "gaze": {
+      "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"
+      }
+    },
+    "gcp-metadata": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "retry-request": "3.0.0"
+      },
+      "dependencies": {
+        "retry-request": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
+          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
+          "dev": true,
+          "requires": {
+            "request": "2.83.0",
+            "through2": "2.0.3"
+          }
+        }
+      }
+    },
+    "gcs-resumable-upload": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "1.0.0",
+        "configstore": "3.1.1",
+        "google-auto-auth": "0.7.2",
+        "pumpify": "1.3.5",
+        "request": "2.83.0",
+        "stream-events": "1.0.2",
+        "through2": "2.0.3"
+      }
+    },
+    "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-amd-module-type": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz",
+      "integrity": "sha1-5nHsWpatX79To6IqKJ6SOMdy3bA=",
+      "dev": true,
+      "requires": {
+        "ast-module-types": "2.3.2",
+        "node-source-walk": "3.3.0"
+      }
+    },
+    "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.1",
+        "through2": "2.0.3"
+      }
+    },
+    "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
+    },
+    "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"
+      }
+    },
+    "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.2.0",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz",
+      "integrity": "sha512-fFyxtzTHCTQKwB4clA2AInVrlflBbVbbJD4NWwmxKXHUgsU/K9kmHNlkPLqFiuy9xu9q3lNopghR4VXeQwZbTQ==",
+      "dev": true,
+      "requires": {
+        "meow": "3.7.0",
+        "semver": "5.4.1"
       }
     },
-    "google-proto-files": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.12.0.tgz",
-      "integrity": "sha1-pJB1wfzCvYpIAYaDHCl2Bbl3Sys=",
+    "gitconfiglocal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
       "dev": true,
-      "optional": true
+      "requires": {
+        "ini": "1.3.4"
+      }
     },
-    "googleapis": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-19.0.0.tgz",
-      "integrity": "sha1-hwDrFClHd+DBlhUgUf1jZwYd3oU=",
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "async": "2.3.0",
-        "google-auth-library": "0.10.0",
-        "string-template": "1.0.0"
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "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-slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
+      "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U=",
+      "dev": true
+    },
+    "glob-slasher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
+      "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
+      "dev": true,
+      "requires": {
+        "glob-slash": "1.0.0",
+        "lodash.isobject": "2.4.1",
+        "toxic": "1.0.0"
+      }
+    },
+    "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": {
-        "async": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
-          "integrity": "sha1-EBPRBRBH3TIP4k5JTVxm7K9hR9k=",
+        "glob": {
+          "version": "4.5.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "lodash": "4.17.4"
+            "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"
+      }
+    },
+    "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.3.0"
+      }
+    },
+    "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.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
+    "globs": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.3.tgz",
+      "integrity": "sha1-ZwA3ElKHy2VJqtlqRM+mhP18VQI=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "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"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
           }
         }
       }
     },
-    "got": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-7.0.0.tgz",
-      "integrity": "sha1-gtQ59nY82xyIIbejquJ4TIjDuNM=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-response": "3.3.0",
-        "duplexer3": "0.1.4",
-        "get-stream": "3.0.0",
-        "is-plain-obj": "1.1.0",
-        "is-retry-allowed": "1.1.0",
-        "is-stream": "1.1.0",
-        "isurl": "1.0.0",
-        "lowercase-keys": "1.0.0",
-        "p-cancelable": "0.2.0",
-        "p-timeout": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "timed-out": "4.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
-    },
-    "graphviz": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
-      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
+    "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": {
-        "temp": "0.4.0"
+        "sparkles": "1.0.0"
       }
     },
-    "grpc": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.3.8.tgz",
-      "integrity": "sha1-N9ETwaxAKtFO3KfTjc+QYkwueeQ=",
+    "gm": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/gm/-/gm-1.21.1.tgz",
+      "integrity": "sha1-ftXtBds20wwZQ/OcO8HIObjyNh0=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "arguejs": "0.2.3",
-        "lodash": "4.17.4",
-        "nan": "2.6.2",
-        "node-pre-gyp": "0.6.36",
-        "protobufjs": "5.0.2"
+        "array-parallel": "0.1.3",
+        "array-series": "0.1.5",
+        "debug": "2.2.0"
       },
       "dependencies": {
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
           "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"
-          },
-          "dependencies": {
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-              "dev": true,
-              "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=",
-                  "dev": true
-                }
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1.1.0",
-                "osenv": "0.1.4"
-              },
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.1.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-                  "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-                  "dev": true,
-                  "optional": true
-                },
-                "osenv": {
-                  "version": "0.1.4",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-                  "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "os-homedir": "1.0.2",
-                    "os-tmpdir": "1.0.2"
-                  },
-                  "dependencies": {
-                    "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,
-                      "optional": true
-                    },
-                    "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,
-                      "optional": true
-                    }
-                  }
-                }
-              }
-            },
-            "npmlog": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-              "integrity": "sha1-3Fm+6F9k8A7UJO+yrweD3yXRwLU=",
-              "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"
-              },
-              "dependencies": {
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "delegates": "1.0.0",
-                    "readable-stream": "2.2.10"
-                  },
-                  "dependencies": {
-                    "delegates": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-                      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "readable-stream": {
-                      "version": "2.2.10",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
-                      "integrity": "sha1-7/5yu3yITA3TNeI3nVJhltnQEe4=",
-                      "dev": true,
-                      "optional": 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.0",
-                        "string_decoder": "1.0.1",
-                        "util-deprecate": "1.0.2"
-                      },
-                      "dependencies": {
-                        "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,
-                          "optional": true
-                        },
-                        "inherits": {
-                          "version": "2.0.3",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                          "dev": true,
-                          "optional": true
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                          "dev": true,
-                          "optional": 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,
-                          "optional": true
-                        },
-                        "safe-buffer": {
-                          "version": "5.1.0",
-                          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
-                          "integrity": "sha1-/kyEYDl/nqqqWOc75GJzQIpF4iM=",
-                          "dev": true
-                        },
-                        "string_decoder": {
-                          "version": "1.0.1",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-                          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "safe-buffer": "5.1.0"
-                          }
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                          "dev": true,
-                          "optional": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "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
-                },
-                "gauge": {
-                  "version": "2.7.4",
-                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-                  "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-                  "dev": true,
-                  "optional": 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"
-                  },
-                  "dependencies": {
-                    "aproba": {
-                      "version": "1.1.2",
-                      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-                      "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "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,
-                      "optional": 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,
-                      "optional": 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,
-                      "optional": 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"
-                      },
-                      "dependencies": {
-                        "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
-                        },
-                        "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"
-                          },
-                          "dependencies": {
-                            "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
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "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"
-                      },
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.1.1",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                          "dev": true
-                        }
-                      }
-                    },
-                    "wide-align": {
-                      "version": "1.1.2",
-                      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-                      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "string-width": "1.0.2"
-                      }
-                    }
-                  }
-                },
-                "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,
-                  "optional": true
-                }
-              }
-            },
-            "rc": {
-              "version": "1.2.1",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-              "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-              "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": {
-                "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,
-                  "optional": true
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-                  "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-                  "dev": true,
-                  "optional": true
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                  "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                  "dev": true,
-                  "optional": true
-                },
-                "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,
-                  "optional": true
-                }
-              }
-            },
-            "request": {
-              "version": "2.81.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-              "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.1.0",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.2",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.0.1"
-              },
-              "dependencies": {
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-                  "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-                  "dev": true,
-                  "optional": true
-                },
-                "aws4": {
-                  "version": "1.6.0",
-                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-                  "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-                  "dev": true,
-                  "optional": true
-                },
-                "caseless": {
-                  "version": "0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-                  "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-                  "dev": true,
-                  "optional": true
-                },
-                "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"
-                  },
-                  "dependencies": {
-                    "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
-                    }
-                  }
-                },
-                "extend": {
-                  "version": "3.0.1",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-                  "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-                  "dev": true,
-                  "optional": 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,
-                  "optional": 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,
-                  "optional": true,
-                  "requires": {
-                    "asynckit": "0.4.0",
-                    "combined-stream": "1.0.5",
-                    "mime-types": "2.1.15"
-                  },
-                  "dependencies": {
-                    "asynckit": {
-                      "version": "0.4.0",
-                      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-                      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "ajv": "4.11.8",
-                    "har-schema": "1.0.5"
-                  },
-                  "dependencies": {
-                    "ajv": {
-                      "version": "4.11.8",
-                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-                      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "co": "4.6.0",
-                        "json-stable-stringify": "1.0.1"
-                      },
-                      "dependencies": {
-                        "co": {
-                          "version": "4.6.0",
-                          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-                          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-                          "dev": true,
-                          "optional": 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,
-                          "optional": true,
-                          "requires": {
-                            "jsonify": "0.0.0"
-                          },
-                          "dependencies": {
-                            "jsonify": {
-                              "version": "0.0.0",
-                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-                              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-                              "dev": true,
-                              "optional": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "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,
-                      "optional": true
-                    }
-                  }
-                },
-                "hawk": {
-                  "version": "3.1.3",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-                  "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "boom": "2.10.1",
-                    "cryptiles": "2.0.5",
-                    "hoek": "2.16.3",
-                    "sntp": "1.0.9"
-                  },
-                  "dependencies": {
-                    "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"
-                      }
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-                      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "boom": "2.10.1"
-                      }
-                    },
-                    "hoek": {
-                      "version": "2.16.3",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-                      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-                      "dev": true
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-                      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "hoek": "2.16.3"
-                      }
-                    }
-                  }
-                },
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "assert-plus": "0.2.0",
-                    "jsprim": "1.4.0",
-                    "sshpk": "1.13.0"
-                  },
-                  "dependencies": {
-                    "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,
-                      "optional": true
-                    },
-                    "jsprim": {
-                      "version": "1.4.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-                      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-                      "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",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                          "dev": true,
-                          "optional": true
-                        },
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-                          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-                          "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,
-                          "optional": 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,
-                          "optional": true,
-                          "requires": {
-                            "extsprintf": "1.0.2"
-                          }
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.13.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
-                      "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
-                      "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": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-                          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-                          "dev": true,
-                          "optional": true
-                        },
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                          "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"
-                          }
-                        },
-                        "dashdash": {
-                          "version": "1.14.1",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-                          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "assert-plus": "1.0.0"
-                          }
-                        },
-                        "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"
-                          }
-                        },
-                        "getpass": {
-                          "version": "0.1.7",
-                          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-                          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "assert-plus": "1.0.0"
-                          }
-                        },
-                        "jodid25519": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-                          "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "jsbn": "0.1.1"
-                          }
-                        },
-                        "jsbn": {
-                          "version": "0.1.1",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-                          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-                          "dev": true,
-                          "optional": 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
-                        }
-                      }
-                    }
-                  }
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-                  "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-                  "dev": true,
-                  "optional": true
-                },
-                "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,
-                  "optional": true
-                },
-                "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,
-                  "optional": 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"
-                  },
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.27.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-                      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-                      "dev": true
-                    }
-                  }
-                },
-                "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,
-                  "optional": 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,
-                  "optional": 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,
-                  "optional": true
-                },
-                "safe-buffer": {
-                  "version": "5.1.0",
-                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
-                  "integrity": "sha1-/kyEYDl/nqqqWOc75GJzQIpF4iM=",
-                  "dev": true
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-                  "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-                  "dev": true,
-                  "optional": true
-                },
-                "tough-cookie": {
-                  "version": "2.3.2",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-                  "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "punycode": "1.4.1"
-                  },
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.4.1",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "tunnel-agent": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-                  "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "safe-buffer": "5.1.0"
-                  }
-                },
-                "uuid": {
-                  "version": "3.0.1",
-                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-                  "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
-                  "dev": true,
-                  "optional": true
-                }
-              }
-            },
-            "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.1.2"
-              },
-              "dependencies": {
-                "glob": {
-                  "version": "7.1.2",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-                  "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-                  "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"
-                  },
-                  "dependencies": {
-                    "fs.realpath": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                      "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"
-                      },
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                          "dev": true
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true
-                    },
-                    "minimatch": {
-                      "version": "3.0.4",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-                      "dev": true,
-                      "requires": {
-                        "brace-expansion": "1.1.7"
-                      },
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.7",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-                          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-                          "dev": true,
-                          "requires": {
-                            "balanced-match": "0.4.2",
-                            "concat-map": "0.0.1"
-                          },
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.4.2",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-                              "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-                              "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
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "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"
-                      },
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                          "dev": true
-                        }
-                      }
-                    },
-                    "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
-                    }
-                  }
-                }
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-              "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-              "dev": true,
-              "optional": 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"
-              },
-              "dependencies": {
-                "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"
-                  }
-                },
-                "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"
-                  },
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                      "dev": true
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.3",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                  "dev": true
-                }
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-              "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.10",
-                "rimraf": "2.6.1",
-                "tar": "2.2.1",
-                "uid-number": "0.0.6"
-              },
-              "dependencies": {
-                "debug": {
-                  "version": "2.6.8",
-                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-                  "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "ms": "2.0.0"
-                  },
-                  "dependencies": {
-                    "ms": {
-                      "version": "2.0.0",
-                      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                      "dev": true,
-                      "optional": 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"
-                  },
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                      "dev": true
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true
-                    }
-                  }
-                },
-                "fstream-ignore": {
-                  "version": "1.0.5",
-                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-                  "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "fstream": "1.0.11",
-                    "inherits": "2.0.3",
-                    "minimatch": "3.0.4"
-                  },
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "minimatch": {
-                      "version": "3.0.4",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "brace-expansion": "1.1.7"
-                      },
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.7",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-                          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "balanced-match": "0.4.2",
-                            "concat-map": "0.0.1"
-                          },
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.4.2",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-                              "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-                              "dev": true,
-                              "optional": 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,
-                              "optional": true
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-                  "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "wrappy": "1.0.2"
-                  },
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.2.10",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
-                  "integrity": "sha1-7/5yu3yITA3TNeI3nVJhltnQEe4=",
-                  "dev": true,
-                  "optional": 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.0",
-                    "string_decoder": "1.0.1",
-                    "util-deprecate": "1.0.2"
-                  },
-                  "dependencies": {
-                    "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,
-                      "optional": true
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "isarray": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                      "dev": true,
-                      "optional": 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,
-                      "optional": true
-                    },
-                    "safe-buffer": {
-                      "version": "5.1.0",
-                      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz",
-                      "integrity": "sha1-/kyEYDl/nqqqWOc75GJzQIpF4iM=",
-                      "dev": true
-                    },
-                    "string_decoder": {
-                      "version": "1.0.1",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-                      "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "safe-buffer": "5.1.0"
-                      }
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-                  "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-                  "dev": true,
-                  "optional": true
-                }
-              }
-            }
+            "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
+        }
+      }
+    },
+    "gonzales-pe": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
+      "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.1.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+          "dev": true
         }
       }
     },
+    "google-auth-library": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+      "dev": true,
+      "requires": {
+        "gtoken": "1.2.2",
+        "jws": "3.1.4",
+        "lodash.noop": "3.0.1",
+        "request": "2.83.0"
+      }
+    },
+    "google-auto-auth": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "gcp-metadata": "0.3.1",
+        "google-auth-library": "0.10.0",
+        "request": "2.83.0"
+      }
+    },
+    "google-closure-compiler": {
+      "version": "20170409.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20170409.0.0.tgz",
+      "integrity": "sha1-3Bvimp9+74YRNkUzsnG5+sdXyXA=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "vinyl": "2.1.0",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      }
+    },
+    "google-p12-pem": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.1"
+      }
+    },
+    "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
+    },
+    "graphviz": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
+      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
+      "dev": true,
+      "requires": {
+        "temp": "0.4.0"
+      }
+    },
     "gtoken": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
@@ -6925,8 +6019,8 @@
       "requires": {
         "google-p12-pem": "0.1.2",
         "jws": "3.1.4",
-        "mime": "1.3.6",
-        "request": "2.81.0"
+        "mime": "1.4.1",
+        "request": "2.83.0"
       }
     },
     "gulp": {
@@ -6939,7 +6033,7 @@
         "chalk": "1.1.3",
         "deprecated": "0.0.1",
         "gulp-util": "3.0.8",
-        "interpret": "1.0.3",
+        "interpret": "1.0.4",
         "liftoff": "2.3.0",
         "minimist": "1.2.0",
         "orchestrator": "0.3.8",
@@ -6994,6 +6088,22 @@
             "supports-color": "0.2.0"
           }
         },
+        "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
+        },
+        "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"
+          }
+        },
         "gulp-util": {
           "version": "2.2.20",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
@@ -7157,21 +6267,21 @@
       }
     },
     "gulp-clean-css": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.6.0.tgz",
-      "integrity": "sha1-Q08rgMVapFJUzaMCB+GhFm8NHlI=",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.9.0.tgz",
+      "integrity": "sha512-CsqaSO2ZTMQI/WwbWloZWBudhsRMKgxBthzxt4bbcbWrjOY4pRFziyK9IH6YbTpaWAPKEwWpopPkpiAEoDofxw==",
       "dev": true,
       "requires": {
-        "clean-css": "4.1.6",
+        "clean-css": "4.1.9",
         "gulp-util": "3.0.8",
         "through2": "2.0.3",
         "vinyl-sourcemaps-apply": "0.2.1"
       }
     },
     "gulp-cli": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-1.3.0.tgz",
-      "integrity": "sha1-pr+7i+NTQb4pCuRc0+QBBxIW7dQ=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-1.4.0.tgz",
+      "integrity": "sha1-b1u+LNC9tISdEs+eEkalhh+LT4g=",
       "dev": true,
       "requires": {
         "archy": "1.0.0",
@@ -7179,7 +6289,7 @@
         "copy-props": "1.6.0",
         "fancy-log": "1.3.0",
         "gulplog": "1.0.0",
-        "interpret": "1.0.3",
+        "interpret": "1.0.4",
         "liftoff": "2.3.0",
         "lodash.isfunction": "3.0.8",
         "lodash.isplainobject": "4.0.6",
@@ -7187,45 +6297,11 @@
         "matchdep": "1.0.1",
         "mute-stdout": "1.0.0",
         "pretty-hrtime": "1.0.3",
-        "semver-greatest-satisfied-range": "1.0.0",
+        "semver-greatest-satisfied-range": "1.1.0",
         "tildify": "1.2.0",
         "v8flags": "2.1.1",
         "wreck": "6.3.0",
         "yargs": "3.32.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        }
       }
     },
     "gulp-connect": {
@@ -7247,7 +6323,7 @@
           "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=",
           "dev": true,
           "requires": {
-            "mime-types": "2.1.15",
+            "mime-types": "2.1.17",
             "negotiator": "0.5.3"
           }
         },
@@ -7264,7 +6340,7 @@
           "dev": true,
           "requires": {
             "bytes": "2.1.0",
-            "content-type": "1.0.2",
+            "content-type": "1.0.4",
             "debug": "2.2.0",
             "depd": "1.0.1",
             "http-errors": "1.3.1",
@@ -7289,7 +6365,7 @@
           "requires": {
             "accepts": "1.2.13",
             "bytes": "2.1.0",
-            "compressible": "2.0.10",
+            "compressible": "2.0.11",
             "debug": "2.2.0",
             "on-headers": "1.0.1",
             "vary": "1.0.1"
@@ -7306,7 +6382,7 @@
             "bytes": "2.1.0",
             "compression": "1.5.2",
             "connect-timeout": "1.6.2",
-            "content-type": "1.0.2",
+            "content-type": "1.0.4",
             "cookie": "0.1.3",
             "cookie-parser": "1.3.5",
             "cookie-signature": "1.0.6",
@@ -7318,11 +6394,11 @@
             "finalhandler": "0.4.0",
             "fresh": "0.3.0",
             "http-errors": "1.3.1",
-            "method-override": "2.3.9",
+            "method-override": "2.3.10",
             "morgan": "1.6.1",
             "multiparty": "3.3.2",
             "on-headers": "1.0.1",
-            "parseurl": "1.3.1",
+            "parseurl": "1.3.2",
             "pause": "0.1.0",
             "qs": "4.0.0",
             "response-time": "2.3.2",
@@ -7464,283 +6540,92 @@
             "iconv-lite": {
               "version": "0.4.13",
               "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
-              "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
-              "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
-            }
-          }
-        },
-        "vary": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
-          "integrity": "sha1-meSYFWaihhGN+yuBc1ffeZM3bRA=",
-          "dev": true
-        }
-      }
-    },
-    "gulp-conventional-changelog": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.4.tgz",
-      "integrity": "sha512-r400pFwUNhuginHAlbaZT4f0LrPtyzdpXzb5vkEwHQIub+SJD0lMFhJFFgqSZa0580skZJcb86ZvDA4W08/cGA==",
-      "dev": true,
-      "requires": {
-        "add-stream": "1.0.0",
-        "concat-stream": "1.6.0",
-        "conventional-changelog": "1.1.4",
-        "gulp-util": "3.0.8",
-        "object-assign": "4.1.1",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "conventional-changelog": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz",
-          "integrity": "sha1-EIvHUMKjF+IA4vm0E8qqH4x++js=",
-          "dev": true,
-          "requires": {
-            "conventional-changelog-angular": "1.4.0",
-            "conventional-changelog-atom": "0.1.0",
-            "conventional-changelog-codemirror": "0.1.0",
-            "conventional-changelog-core": "1.9.0",
-            "conventional-changelog-ember": "0.2.6",
-            "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.4.0",
-          "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz",
-          "integrity": "sha512-ukKX22lJl9ewogze1hKbBuff/dGMG2uyGpOhhw0ehhlv6GtdeCxj51YfGOZ5qC89WwsHT7SDXFzBKidwH3pwmQ==",
-          "dev": true,
-          "requires": {
-            "compare-func": "1.3.2",
-            "github-url-from-git": "1.5.0",
-            "q": "1.5.0",
-            "read-pkg-up": "2.0.0"
-          }
-        },
-        "conventional-changelog-core": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz",
-          "integrity": "sha1-3l37wJGEdlZQjUo4njXJobxJ5/Q=",
-          "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.5.0",
-            "read-pkg": "1.1.0",
-            "read-pkg-up": "1.0.1",
-            "through2": "2.0.3"
-          },
-          "dependencies": {
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            }
-          }
-        },
-        "conventional-changelog-ember": {
-          "version": "0.2.6",
-          "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz",
-          "integrity": "sha1-i3NVQZ9RJ0k8TFYkc6svx5LxwrY=",
-          "dev": true,
-          "requires": {
-            "q": "1.5.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "parse-json": "2.2.0",
-            "pify": "2.3.0",
-            "strip-bom": "3.0.0"
-          }
-        },
-        "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
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "requires": {
-            "pify": "2.3.0"
+              "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
+              "dev": true
+            }
           }
         },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+        "send": {
+          "version": "0.13.2",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz",
+          "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=",
           "dev": true,
           "requires": {
-            "load-json-file": "2.0.0",
-            "normalize-package-data": "2.4.0",
-            "path-type": "2.0.0"
+            "debug": "2.2.0",
+            "depd": "1.1.1",
+            "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.1",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+              "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+              "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
+            }
           }
         },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+        "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": {
-            "find-up": "2.1.0",
-            "read-pkg": "2.0.0"
+            "escape-html": "1.0.3",
+            "parseurl": "1.3.2",
+            "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
+            }
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+        "vary": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
+          "integrity": "sha1-meSYFWaihhGN+yuBc1ffeZM3bRA=",
           "dev": true
         }
       }
     },
+    "gulp-conventional-changelog": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.5.tgz",
+      "integrity": "sha512-BDY1JuryLGVpp1E8djSxVpv/shNmlkFgCDx3qhfFM5PRpkMFSunDrtQ7l3CokttreExC+X/EvxHKXL3GqWTs/Q==",
+      "dev": true,
+      "requires": {
+        "add-stream": "1.0.0",
+        "concat-stream": "1.6.0",
+        "conventional-changelog": "1.1.5",
+        "gulp-util": "3.0.8",
+        "object-assign": "4.1.1",
+        "through2": "2.0.3"
+      }
+    },
     "gulp-dom": {
       "version": "0.9.17",
       "resolved": "https://registry.npmjs.org/gulp-dom/-/gulp-dom-0.9.17.tgz",
@@ -7752,6 +6637,28 @@
         "through2": "2.0.1"
       },
       "dependencies": {
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "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
+        },
+        "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"
+          }
+        },
         "gulp-util": {
           "version": "3.0.7",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
@@ -7778,43 +6685,11 @@
             "vinyl": "0.5.3"
           }
         },
-        "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.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
         },
         "readable-stream": {
           "version": "2.0.6",
@@ -7830,6 +6705,12 @@
             "util-deprecate": "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
+        },
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -7888,18 +6769,10 @@
       "requires": {
         "bufferstreams": "1.1.1",
         "gulp-util": "3.0.8",
-        "html-minifier": "3.5.2",
+        "html-minifier": "3.5.5",
         "object-assign": "4.1.1",
         "readable-stream": "2.3.3",
         "tryit": "1.0.3"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "gulp-if": {
@@ -7972,7 +6845,7 @@
         "array-uniq": "1.0.3",
         "beeper": "1.1.1",
         "chalk": "1.1.3",
-        "dateformat": "2.0.0",
+        "dateformat": "2.2.0",
         "fancy-log": "1.3.0",
         "gulplog": "1.0.0",
         "has-gulplog": "0.1.0",
@@ -7988,49 +6861,29 @@
         "vinyl": "0.5.3"
       },
       "dependencies": {
-        "dateformat": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz",
-          "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=",
+        "clone": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
           "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"
-          }
+        "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
         },
-        "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"
-          }
+        "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
         },
-        "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"
-          }
+        "replace-ext": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+          "dev": true
         },
         "vinyl": {
           "version": "0.5.3",
@@ -8090,19 +6943,19 @@
       }
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
+        "ajv": "5.2.3",
+        "har-schema": "2.0.0"
       }
     },
     "has-ansi": {
@@ -8152,23 +7005,6 @@
         "sparkles": "1.0.0"
       }
     },
-    "has-symbol-support-x": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.0.tgz",
-      "integrity": "sha512-F1NtLDtW9NyUrS3faUcI1yVFHCTXyzPb1jfrZBQi5NHxFPlXxZnFLFGzfA2DsdmgCxv2MZ0+bfcgC4EZTmk4SQ==",
-      "dev": true,
-      "optional": true
-    },
-    "has-to-string-tag-x": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.0.tgz",
-      "integrity": "sha512-R3OdOP9j6AH5hS1yXeu9wAS+iKSZQx/CC6aMdN6WiaqPlBoA2S+47MtoMsZgKr2m0eAJ+73WWGX0RaFFE5XWKA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-symbol-support-x": "1.4.0"
-      }
-    },
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -8185,15 +7021,15 @@
       }
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
       "dev": true,
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.0.2"
       }
     },
     "he": {
@@ -8208,7 +7044,7 @@
       "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "upper-case": "1.1.3"
       }
     },
@@ -8219,9 +7055,9 @@
       "dev": true
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
       "dev": true
     },
     "home-dir": {
@@ -8255,38 +7091,29 @@
       }
     },
     "html-minifier": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.2.tgz",
-      "integrity": "sha1-1zvD/0SJQkCIGM5gm/P7DqfvTrc=",
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.5.tgz",
+      "integrity": "sha512-g+1+NBycQI0fGnggd52JM8TRUweG7+9W2wrtjGitMAqc4G7maweAHvVAAjz9veHseIH3tYKE2lk2USGSoewIrQ==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
-        "clean-css": "4.1.6",
-        "commander": "2.9.0",
+        "clean-css": "4.1.9",
+        "commander": "2.11.0",
         "he": "1.1.1",
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.0.24"
+        "uglify-js": "3.1.2"
       },
       "dependencies": {
-        "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==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.2.tgz",
+          "integrity": "sha512-kKJ8zg7Ivw3DG9Ytgp4+iiSHq3HaHjEQMvyT2x2Bs8kSUwVemj6bPGFp6YWL81f5NAIOLVUKPxBSvqLRGXMpdw==",
           "dev": true,
           "requires": {
-            "commander": "2.9.0",
-            "source-map": "0.5.6"
+            "commander": "2.11.0",
+            "source-map": "0.5.7"
           }
         }
       }
@@ -8312,17 +7139,23 @@
       }
     },
     "http-errors": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
-      "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
       "dev": true,
       "requires": {
-        "depd": "1.1.0",
+        "depd": "1.1.1",
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
         "statuses": "1.3.1"
       }
     },
+    "http-parser-js": {
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz",
+      "integrity": "sha512-jmHp99g6/fLx0pRNJqzsQgjsclCHAY7NhIeA3/U+bsGNvgbvUCQFQY9m5AYpqpAxY/2VcikfbKpjQozSTiz0jA==",
+      "dev": true
+    },
     "http-proxy": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
@@ -8340,13 +7173,13 @@
       "dev": true
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "0.2.0",
-        "jsprim": "1.4.0",
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
         "sshpk": "1.13.1"
       }
     },
@@ -8361,13 +7194,6 @@
         "extend": "3.0.1"
       }
     },
-    "i": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz",
-      "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=",
-      "dev": true,
-      "optional": true
-    },
     "iconv-lite": {
       "version": "0.4.15",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
@@ -8375,9 +7201,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
-      "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
+      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
       "dev": true
     },
     "image-diff": {
@@ -8423,6 +7249,12 @@
         }
       }
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -8494,7 +7326,7 @@
         "ansi-regex": "2.1.1",
         "chalk": "1.1.3",
         "cli-cursor": "1.0.2",
-        "cli-width": "2.1.0",
+        "cli-width": "2.2.0",
         "figures": "1.7.0",
         "lodash": "4.17.4",
         "readline2": "1.0.1",
@@ -8506,9 +7338,9 @@
       }
     },
     "interpret": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
+      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
       "dev": true
     },
     "invert-kv": {
@@ -8517,13 +7349,6 @@
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
       "dev": true
     },
-    "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,
-      "optional": true
-    },
     "irregular-plurals": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz",
@@ -8558,7 +7383,7 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.8.0"
+        "binary-extensions": "1.10.0"
       }
     },
     "is-buffer": {
@@ -8652,9 +7477,9 @@
       "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=",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
+      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
       "dev": true,
       "requires": {
         "generate-function": "2.0.0",
@@ -8684,13 +7509,6 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
-    "is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-      "dev": true,
-      "optional": true
-    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -8715,17 +7533,10 @@
         "path-is-inside": "1.0.2"
       }
     },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "optional": true
-    },
     "is-plain-object": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz",
-      "integrity": "sha1-wVvz5LZrYtcu+vKSWEhmPsvGGbY=",
+      "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"
@@ -8779,9 +7590,9 @@
       }
     },
     "is-relative-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.1.tgz",
-      "integrity": "sha1-rHJ5Oi1gwEnlBnbgSiSo2PJj3CY=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz",
+      "integrity": "sha1-CRtGoNZ8HtD+hfH4z93gBrslHUY=",
       "dev": true
     },
     "is-retry-allowed": {
@@ -8820,7 +7631,7 @@
       "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
       "dev": true,
       "requires": {
-        "text-extensions": "1.5.0"
+        "text-extensions": "1.6.0"
       }
     },
     "is-typedarray": {
@@ -8916,13 +7727,13 @@
         "esprima": "2.7.3",
         "glob": "5.0.15",
         "handlebars": "4.0.10",
-        "js-yaml": "3.9.0",
+        "js-yaml": "3.10.0",
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
         "once": "1.4.0",
         "resolve": "1.1.7",
         "supports-color": "3.2.3",
-        "which": "1.2.14",
+        "which": "1.3.0",
         "wordwrap": "1.0.0"
       },
       "dependencies": {
@@ -8938,12 +7749,31 @@
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
           "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"
+          }
+        },
         "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
+        },
         "glob": {
           "version": "5.0.15",
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
@@ -8963,13 +7793,14 @@
           "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=",
+        "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": {
-            "has-flag": "1.0.0"
+            "amdefine": "1.0.1"
           }
         },
         "wordwrap": {
@@ -8980,32 +7811,21 @@
         }
       }
     },
-    "isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "has-to-string-tag-x": "1.4.0",
-        "is-object": "1.0.1"
-      }
-    },
     "jasmine": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.6.0.tgz",
-      "integrity": "sha1-ayLnCIPo5YnUVjRhU7TSBt2+IX8=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
       "dev": true,
       "requires": {
         "exit": "0.1.2",
         "glob": "7.1.2",
-        "jasmine-core": "2.6.4"
+        "jasmine-core": "2.8.0"
       }
     },
     "jasmine-core": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
-      "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+      "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
       "dev": true
     },
     "jasminewd2": {
@@ -9030,6 +7850,14 @@
         "isemail": "1.2.0",
         "moment": "2.18.1",
         "topo": "1.1.0"
+      },
+      "dependencies": {
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        }
       }
     },
     "join-path": {
@@ -9044,9 +7872,9 @@
       }
     },
     "js-base64": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
+      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
       "dev": true
     },
     "js-tokens": {
@@ -9056,9 +7884,9 @@
       "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==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
       "dev": true,
       "requires": {
         "argparse": "1.0.9",
@@ -9086,22 +7914,22 @@
       "integrity": "sha1-/eKcEJwyoRMeC2xlkU5kGY+Xw3A=",
       "dev": true,
       "requires": {
-        "abab": "1.0.3",
+        "abab": "1.0.4",
         "acorn": "2.7.0",
         "acorn-globals": "1.0.9",
         "array-equal": "1.0.0",
         "content-type-parser": "1.0.1",
         "cssom": "0.3.2",
         "cssstyle": "0.2.37",
-        "escodegen": "1.8.1",
+        "escodegen": "1.9.0",
         "html-encoding-sniffer": "1.0.1",
         "iconv-lite": "0.4.15",
-        "nwmatcher": "1.4.1",
+        "nwmatcher": "1.4.2",
         "parse5": "1.5.1",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "sax": "1.2.4",
         "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "webidl-conversions": "3.0.1",
         "whatwg-encoding": "1.0.1",
         "whatwg-url": "3.1.0",
@@ -9135,8 +7963,7 @@
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -9261,15 +8088,15 @@
       "dev": true
     },
     "jsonschema": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz",
-      "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.0.tgz",
+      "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "dev": true
     },
     "jsonwebtoken": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
-      "integrity": "sha1-fKMk9SFfi+A5zTWmxFu4y3SkSPs=",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
+      "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
       "dev": true,
       "requires": {
         "joi": "6.10.1",
@@ -9280,21 +8107,54 @@
       }
     },
     "jsprim": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
       "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
-        "extsprintf": "1.0.2",
+        "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
-        "verror": "1.3.6"
+        "verror": "1.10.0"
+      }
+    },
+    "jszip": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz",
+      "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==",
+      "dev": true,
+      "requires": {
+        "core-js": "2.3.0",
+        "es6-promise": "3.0.2",
+        "lie": "3.1.1",
+        "pako": "1.0.6",
+        "readable-stream": "2.0.6"
       },
       "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+        "core-js": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
+          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=",
+          "dev": true
+        },
+        "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
         }
       }
@@ -9323,9 +8183,9 @@
       }
     },
     "karma": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz",
-      "integrity": "sha1-b3oaQGRG+i4YfslTmGmPTO5HYmk=",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
+      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
         "bluebird": "3.5.0",
@@ -9333,8 +8193,8 @@
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
-        "connect": "3.6.2",
-        "core-js": "2.4.1",
+        "connect": "3.6.5",
+        "core-js": "2.5.1",
         "di": "0.0.1",
         "dom-serialize": "2.2.1",
         "expand-braces": "0.1.2",
@@ -9344,7 +8204,7 @@
         "isbinaryfile": "3.0.2",
         "lodash": "3.10.1",
         "log4js": "0.6.38",
-        "mime": "1.3.6",
+        "mime": "1.4.1",
         "minimatch": "3.0.4",
         "optimist": "0.6.1",
         "qjobs": "1.1.5",
@@ -9352,9 +8212,9 @@
         "rimraf": "2.6.1",
         "safe-buffer": "5.1.1",
         "socket.io": "1.7.3",
-        "source-map": "0.5.6",
+        "source-map": "0.5.7",
         "tmp": "0.0.31",
-        "useragent": "2.2.0"
+        "useragent": "2.2.1"
       },
       "dependencies": {
         "colors": {
@@ -9389,6 +8249,14 @@
         "browserstack": "1.5.0",
         "browserstacktunnel-wrapper": "2.0.1",
         "q": "1.5.0"
+      },
+      "dependencies": {
+        "q": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+          "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+          "dev": true
+        }
       }
     },
     "karma-chrome-launcher": {
@@ -9398,7 +8266,7 @@
       "dev": true,
       "requires": {
         "fs-access": "1.0.1",
-        "which": "1.2.14"
+        "which": "1.3.0"
       }
     },
     "karma-coverage": {
@@ -9411,9 +8279,19 @@
         "istanbul": "0.4.5",
         "lodash": "3.10.1",
         "minimatch": "3.0.4",
-        "source-map": "0.5.6"
+        "source-map": "0.5.7"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "lodash": {
           "version": "3.10.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
@@ -9443,7 +8321,15 @@
         "q": "1.5.0",
         "sauce-connect-launcher": "1.2.2",
         "saucelabs": "1.4.0",
-        "wd": "1.4.0"
+        "wd": "1.4.1"
+      },
+      "dependencies": {
+        "q": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+          "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+          "dev": true
+        }
       }
     },
     "karma-sourcemap-loader": {
@@ -9609,6 +8495,15 @@
         "type-check": "0.3.2"
       }
     },
+    "lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "dev": true,
+      "requires": {
+        "immediate": "3.0.6"
+      }
+    },
     "liftoff": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
@@ -9623,7 +8518,7 @@
         "lodash.isstring": "4.0.1",
         "lodash.mapvalues": "4.6.0",
         "rechoir": "0.6.2",
-        "resolve": "1.3.3"
+        "resolve": "1.4.0"
       }
     },
     "livereload-js": {
@@ -9632,37 +8527,6 @@
       "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"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
     "lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -9893,22 +8757,58 @@
       "dev": true
     },
     "lodash.template": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+      "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.templatesettings": "4.1.0"
+        "lodash.escape": "3.2.0",
+        "lodash.keys": "3.1.2",
+        "lodash.restparam": "3.6.1",
+        "lodash.templatesettings": "3.1.1"
+      },
+      "dependencies": {
+        "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.templatesettings": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+      "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"
+      }
+    },
+    "lodash.tostring": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.4.tgz",
+      "integrity": "sha1-Vgwn0fjq3eA8LM4Zj+9cAx2CmPs=",
+      "dev": true
+    },
+    "lodash.unescape": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.0.tgz",
+      "integrity": "sha1-Nt6/xJK4FHhHHvl0zTeD4gLrbO8=",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "3.0.0"
+        "lodash.tostring": "4.1.4"
       }
     },
     "lodash.values": {
@@ -9977,13 +8877,6 @@
         }
       }
     },
-    "long": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-      "dev": true,
-      "optional": true
-    },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -10043,7 +8936,7 @@
         "debug": "2.6.7",
         "dependency-tree": "5.8.0",
         "graphviz": "0.0.8",
-        "mz": "2.6.0",
+        "mz": "2.7.0",
         "ora": "1.1.0",
         "pluralize": "3.1.0",
         "pretty-ms": "2.1.0",
@@ -10061,9 +8954,9 @@
           }
         },
         "cli-spinners": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz",
-          "integrity": "sha1-75h+09SDkaw9q5GAtAanQhgNbmo=",
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.1.tgz",
+          "integrity": "sha1-JnUyHBAPGVsCh3rEmemRH6NLl4M=",
           "dev": true
         },
         "onetime": {
@@ -10083,7 +8976,7 @@
           "requires": {
             "chalk": "1.1.3",
             "cli-cursor": "2.1.0",
-            "cli-spinners": "1.0.0",
+            "cli-spinners": "1.0.1",
             "log-symbols": "1.0.2"
           }
         },
@@ -10243,16 +9136,6 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-fn": "1.1.0"
-      }
-    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -10281,21 +9164,81 @@
         "trim-newlines": "1.0.0"
       },
       "dependencies": {
-        "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
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
         }
       }
     },
-    "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,
-      "optional": true
-    },
     "merge-stream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
@@ -10312,21 +9255,21 @@
       "dev": true
     },
     "method-override": {
-      "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz",
-      "integrity": "sha1-vRUfLONM8Bp2ykAKuVwBKxAtj3E=",
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz",
+      "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=",
       "dev": true,
       "requires": {
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "methods": "1.1.2",
-        "parseurl": "1.3.1",
-        "vary": "1.1.1"
+        "parseurl": "1.3.2",
+        "vary": "1.1.2"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -10358,28 +9301,28 @@
         "normalize-path": "2.1.1",
         "object.omit": "2.0.1",
         "parse-glob": "3.0.4",
-        "regex-cache": "0.4.3"
+        "regex-cache": "0.4.4"
       }
     },
     "mime": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-      "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
       "dev": true
     },
     "mime-db": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
       "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=",
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "dev": true,
       "requires": {
-        "mime-db": "1.27.0"
+        "mime-db": "1.30.0"
       }
     },
     "mimic-fn": {
@@ -10388,13 +9331,6 @@
       "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
       "dev": true
     },
-    "mimic-response": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz",
-      "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=",
-      "dev": true,
-      "optional": true
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -10409,6 +9345,32 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
+    "minipass": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz",
+      "integrity": "sha512-u1aUllxPJUI07cOqzR7reGmQxmCqlH88uIIsf6XZFEWgw7gXKpJdR+5R9Y3KEDmWYkdIz9wXZs3C0jOPxejk/Q==",
+      "dev": true,
+      "requires": {
+        "yallist": "3.0.2"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+          "dev": true
+        }
+      }
+    },
+    "minizlib": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz",
+      "integrity": "sha1-1cGr93vhVGGZUuJTM27Mq5sqMvU=",
+      "dev": true,
+      "requires": {
+        "minipass": "2.2.1"
+      }
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -10452,7 +9414,7 @@
       "dev": true,
       "requires": {
         "ast-module-types": "2.3.2",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
       }
     },
     "module-lookup-amd": {
@@ -10493,22 +9455,22 @@
       "dev": true
     },
     "morgan": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz",
-      "integrity": "sha1-eErHc05KRTqcbm6GgKkyknXItoc=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
+      "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
       "dev": true,
       "requires": {
-        "basic-auth": "1.1.0",
-        "debug": "2.6.8",
-        "depd": "1.1.0",
+        "basic-auth": "2.0.0",
+        "debug": "2.6.9",
+        "depd": "1.1.1",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -10620,36 +9582,21 @@
       "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=",
       "dev": true
     },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true,
-      "optional": true
-    },
     "mz": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz",
-      "integrity": "sha1-yLhSHZWN8KTydoAl22nHGe5O8c4=",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
       "dev": true,
       "requires": {
         "any-promise": "1.3.0",
         "object-assign": "4.1.1",
         "thenify-all": "1.6.0"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "nan": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
       "dev": true
     },
     "nash": {
@@ -10693,13 +9640,6 @@
         "xml-char-classes": "1.0.0"
       }
     },
-    "ncp": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz",
-      "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
-      "dev": true,
-      "optional": true
-    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -10716,9 +9656,9 @@
       }
     },
     "no-case": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
-      "integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
       "dev": true,
       "requires": {
         "lower-case": "1.1.4"
@@ -10744,11 +9684,30 @@
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "rimraf": "2.6.1",
         "semver": "5.3.0",
         "tar": "2.2.1",
-        "which": "1.2.14"
+        "which": "1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "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"
+          }
+        }
       }
     },
     "node-html-encoder": {
@@ -10781,10 +9740,10 @@
         "lodash.mergewith": "4.6.0",
         "meow": "3.7.0",
         "mkdirp": "0.5.1",
-        "nan": "2.6.2",
+        "nan": "2.7.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "sass-graph": "2.2.4",
         "stdout-stream": "1.4.0"
       },
@@ -10796,7 +9755,7 @@
           "dev": true,
           "requires": {
             "lru-cache": "4.1.1",
-            "which": "1.2.14"
+            "which": "1.3.0"
           }
         },
         "gaze": {
@@ -10822,12 +9781,12 @@
       }
     },
     "node-source-walk": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.2.1.tgz",
-      "integrity": "sha1-Ersbmj+xhz94XEp1R7YDT5U/Zp8=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.3.0.tgz",
+      "integrity": "sha1-rRjjW/2z0Lb34OSv8eePhGo7iHM=",
       "dev": true,
       "requires": {
-        "babylon": "6.17.4"
+        "babylon": "6.18.0"
       }
     },
     "node-status-codes": {
@@ -10842,7 +9801,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.0"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
@@ -10853,7 +9812,7 @@
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
-        "semver": "5.3.0",
+        "semver": "5.4.1",
         "validate-npm-package-license": "3.0.1"
       }
     },
@@ -10863,7 +9822,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.0.2"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -10878,16 +9837,6 @@
       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "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,
-      "optional": true,
-      "requires": {
-        "path-key": "2.0.1"
-      }
-    },
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
@@ -10920,53 +9869,19 @@
     },
     "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": {
-        "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"
-          }
-        },
-        "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"
-          }
-        }
+      "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"
       }
     },
     "nwmatcher": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
-      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.2.tgz",
+      "integrity": "sha512-QMkCGQFYp5p+zwU3INntLmz1HMfSx9dMVJMYKmE1yuSf/22Wjo6VPFa405mCLUuQn9lbQvH2DZN9lt10ZNvtAg==",
       "dev": true
     },
     "oauth-sign": {
@@ -10976,9 +9891,9 @@
       "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=",
+      "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": {
@@ -11033,12 +9948,20 @@
       }
     },
     "object.pick": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz",
-      "integrity": "sha1-tTkr7peC2m2ft9avr1OXefEjTCs=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "2.1.0"
+        "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
+        }
       }
     },
     "objectdiff": {
@@ -11135,13 +10058,6 @@
       "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
       "dev": true
     },
-    "optjs": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
-      "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
-      "dev": true,
-      "optional": true
-    },
     "ora": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
@@ -11152,14 +10068,6 @@
         "cli-cursor": "1.0.2",
         "cli-spinners": "0.1.2",
         "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "orchestrator": {
@@ -11236,44 +10144,6 @@
       "integrity": "sha1-8phS5w/X4l82DgE6jsRMgq7bVwg=",
       "dev": true
     },
-    "p-cancelable": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.2.0.tgz",
-      "integrity": "sha1-MVL08wvnYGtg6/6LuTs/32kIXkY=",
-      "dev": true,
-      "optional": true
-    },
-    "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-limit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
-      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
-      "dev": true
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "1.1.0"
-      }
-    },
-    "p-timeout": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.0.tgz",
-      "integrity": "sha1-mCD5lDTFgXhotPNICe5SkWYNW2w=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "p-finally": "1.0.0"
-      }
-    },
     "package-json": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
@@ -11283,7 +10153,7 @@
         "got": "5.7.1",
         "registry-auth-token": "3.3.1",
         "registry-url": "3.1.0",
-        "semver": "5.3.0"
+        "semver": "5.4.1"
       },
       "dependencies": {
         "got": {
@@ -11309,12 +10179,6 @@
             "url-parse-lax": "1.0.0"
           }
         },
-        "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
-        },
         "timed-out": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
@@ -11323,13 +10187,19 @@
         }
       }
     },
+    "pako": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "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"
+        "no-case": "2.3.2"
       }
     },
     "parse-filepath": {
@@ -11344,9 +10214,9 @@
       }
     },
     "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=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
       "dev": true
     },
     "parse-glob": {
@@ -11427,9 +10297,9 @@
       }
     },
     "parseurl": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
-      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
       "dev": true
     },
     "pascal-case": {
@@ -11448,16 +10318,7 @@
       "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1"
-      }
-    },
-    "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"
+        "no-case": "2.3.2"
       }
     },
     "path-is-absolute": {
@@ -11472,13 +10333,6 @@
       "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,
-      "optional": true
-    },
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
@@ -11506,17 +10360,6 @@
       "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",
@@ -11533,9 +10376,9 @@
       }
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
     "pify": {
@@ -11569,13 +10412,6 @@
         "synesthesia": "1.0.1"
       }
     },
-    "pkginfo": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz",
-      "integrity": "sha1-NJ27f/04CB/K3AhT32h/DHdEzWU=",
-      "dev": true,
-      "optional": true
-    },
     "plur": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz",
@@ -11613,20 +10449,9 @@
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
-        "js-base64": "2.1.9",
-        "source-map": "0.5.6",
+        "js-base64": "2.3.2",
+        "source-map": "0.5.7",
         "supports-color": "3.2.3"
-      },
-      "dependencies": {
-        "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-less": {
@@ -11689,22 +10514,34 @@
       "dev": true
     },
     "precinct": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/precinct/-/precinct-3.6.0.tgz",
-      "integrity": "sha1-fY+Ffmc3UzMy9CnndgwOKKsQY/Y=",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/precinct/-/precinct-3.8.0.tgz",
+      "integrity": "sha1-JZqUkKhUd6HyaYn73y+ybETyR1o=",
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "debug": "2.6.7",
+        "debug": "3.1.0",
         "detective-amd": "2.4.0",
         "detective-cjs": "2.0.0",
-        "detective-es6": "1.1.6",
+        "detective-es6": "1.2.0",
         "detective-less": "1.0.0",
         "detective-sass": "2.0.0",
         "detective-scss": "1.0.0",
         "detective-stylus": "1.0.0",
+        "detective-typescript": "1.0.1",
         "module-definition": "2.2.4",
-        "node-source-walk": "3.2.1"
+        "node-source-walk": "3.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "prelude-ls": {
@@ -11755,9 +10592,9 @@
       "dev": true
     },
     "progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
       "dev": true
     },
     "promise": {
@@ -11769,116 +10606,33 @@
         "asap": "2.0.6"
       }
     },
-    "prompt": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz",
-      "integrity": "sha1-jlcSPDlquYiJf7Mn/Trtw+c15P4=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "colors": "1.1.2",
-        "pkginfo": "0.4.0",
-        "read": "1.0.7",
-        "revalidator": "0.1.8",
-        "utile": "0.3.0",
-        "winston": "2.1.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
-          "dev": true,
-          "optional": true
-        },
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true,
-          "optional": true
-        },
-        "winston": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz",
-          "integrity": "sha1-PJNJ0ZYgf9G9/51LxD73JRDjoS4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
-          },
-          "dependencies": {
-            "colors": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-              "dev": true,
-              "optional": true
-            },
-            "pkginfo": {
-              "version": "0.3.1",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-              "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        }
-      }
-    },
-    "protobufjs": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
-      "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "ascli": "1.0.1",
-        "bytebuffer": "5.0.1",
-        "glob": "7.1.2",
-        "yargs": "3.10.0"
-      }
-    },
-    "protochain": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/protochain/-/protochain-1.0.5.tgz",
-      "integrity": "sha1-mRxAfpneJkqt+PgVBLXn+ve/omA=",
-      "dev": true,
-      "optional": 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.80",
+        "@types/node": "6.0.88",
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "2.53.42",
         "blocking-proxy": "0.0.5",
         "chalk": "1.1.3",
         "glob": "7.1.2",
-        "jasmine": "2.6.0",
+        "jasmine": "2.8.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",
+        "source-map-support": "0.4.18",
         "webdriver-js-extender": "1.0.0",
         "webdriver-manager": "12.0.6"
       },
       "dependencies": {
         "@types/node": {
-          "version": "6.0.80",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.80.tgz",
-          "integrity": "sha512-FJedmtuVj9Jb2AbI3cKYlAczj+3Lv3I8g2wjricLSRBCW0Oj7kzG4D6gUmgDc2Ptm0A1lat2AuheqK5kdYfswg==",
+          "version": "6.0.88",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz",
+          "integrity": "sha512-bYDPZTX0/s1aihdjLuAgogUAT5M+TpoWChEMea2p0yOcfn5bu3k6cJb9cp6nw268XeSNIGGr+4+/8V5K6BGzLQ==",
           "dev": true
         },
         "@types/q": {
@@ -11887,12 +10641,6 @@
           "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
           "dev": true
         },
-        "q": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-          "dev": true
-        },
         "saucelabs": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
@@ -11911,7 +10659,7 @@
             "adm-zip": "0.4.7",
             "rimraf": "2.6.1",
             "tmp": "0.0.30",
-            "xml2js": "0.4.17"
+            "xml2js": "0.4.19"
           }
         },
         "tmp": {
@@ -11936,25 +10684,14 @@
             "ini": "1.3.4",
             "minimist": "1.2.0",
             "q": "1.4.1",
-            "request": "2.81.0",
+            "request": "2.83.0",
             "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "xml2js": "0.4.17"
+            "semver": "5.4.1",
+            "xml2js": "0.4.19"
           }
         }
       }
     },
-    "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,
-      "optional": true,
-      "requires": {
-        "forwarded": "0.1.0",
-        "ipaddr.js": "1.3.0"
-      }
-    },
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
@@ -12013,17 +10750,6 @@
       "requires": {
         "end-of-stream": "1.4.0",
         "once": "1.4.0"
-      },
-      "dependencies": {
-        "end-of-stream": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        }
       }
     },
     "pumpify": {
@@ -12032,7 +10758,7 @@
       "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
       "dev": true,
       "requires": {
-        "duplexify": "3.5.0",
+        "duplexify": "3.5.1",
         "inherits": "2.0.3",
         "pump": "1.0.2"
       }
@@ -12044,9 +10770,9 @@
       "dev": true
     },
     "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
+      "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
       "dev": true
     },
     "qjobs": {
@@ -12056,9 +10782,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
       "dev": true
     },
     "random-bytes": {
@@ -12137,16 +10863,6 @@
         "strip-json-comments": "2.0.1"
       }
     },
-    "read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mute-stream": "0.0.7"
-      }
-    },
     "read-all-stream": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
@@ -12166,27 +10882,6 @@
         "gather-stream": "1.0.0"
       }
     },
-    "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",
@@ -12239,7 +10934,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "1.3.3"
+        "resolve": "1.4.0"
       }
     },
     "redent": {
@@ -12258,14 +10953,19 @@
       "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=",
       "dev": true
     },
+    "regenerator-runtime": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+      "dev": true
+    },
     "regex-cache": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3",
-        "is-primitive": "2.0.0"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "registry-auth-token": {
@@ -12294,9 +10994,9 @@
       "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=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
       "dev": true
     },
     "repeat-element": {
@@ -12321,37 +11021,37 @@
       }
     },
     "replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
       "dev": true
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
       "dev": true,
       "requires": {
-        "aws-sign2": "0.6.0",
+        "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
         "caseless": "0.12.0",
         "combined-stream": "1.0.5",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.15",
+        "mime-types": "2.1.17",
         "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.4.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
       }
@@ -12442,9 +11142,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
-      "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
+      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
       "dev": true,
       "requires": {
         "path-parse": "1.0.5"
@@ -12487,7 +11187,7 @@
       "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=",
       "dev": true,
       "requires": {
-        "depd": "1.1.0",
+        "depd": "1.1.1",
         "on-headers": "1.0.1"
       }
     },
@@ -12507,17 +11207,10 @@
       "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
       "dev": true,
       "requires": {
-        "request": "2.81.0",
+        "request": "2.83.0",
         "through2": "2.0.3"
       }
     },
-    "revalidator": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
-      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
-      "dev": true,
-      "optional": true
-    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -12548,7 +11241,7 @@
       "integrity": "sha1-4NBUl4d6OYwQTYFtJzOnGKepTio=",
       "dev": true,
       "requires": {
-        "source-map-support": "0.4.15"
+        "source-map-support": "0.4.18"
       }
     },
     "rollup-plugin-alias": {
@@ -12569,22 +11262,22 @@
         "browser-resolve": "1.11.2",
         "builtin-modules": "1.1.1",
         "is-module": "1.0.0",
-        "resolve": "1.3.3"
+        "resolve": "1.4.0"
       }
     },
     "router": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/router/-/router-1.3.1.tgz",
-      "integrity": "sha1-5Z72T6/CIZShlphoNNiHBY12r0c=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/router/-/router-1.3.2.tgz",
+      "integrity": "sha1-v6oWiIpSg9XuQNmZ2nqfoVKWpgw=",
       "dev": true,
       "requires": {
         "array-flatten": "2.1.1",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "methods": "1.1.2",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "setprototypeof": "1.0.3",
-        "utils-merge": "1.0.0"
+        "setprototypeof": "1.1.0",
+        "utils-merge": "1.0.1"
       },
       "dependencies": {
         "array-flatten": {
@@ -12594,20 +11287,32 @@
           "dev": true
         },
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "dev": true
         }
       }
     },
     "rsvp": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.1.tgz",
-      "integrity": "sha1-NPSnrChZ97rMj0l4nFYE8eJq5wI=",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
       "dev": true
     },
     "run-async": {
@@ -12636,9 +11341,9 @@
       "dev": true
     },
     "rxjs": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.2.tgz",
-      "integrity": "sha1-KjI2/L8D31e64G/Wly/ZnlwI/Pc=",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
+      "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==",
       "requires": {
         "symbol-observable": "1.0.4"
       }
@@ -12659,6 +11364,14 @@
         "graceful-fs": "4.1.11",
         "mkdirp": "0.5.1",
         "rimraf": "2.6.1"
+      },
+      "dependencies": {
+        "es6-promise": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
+          "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
+          "dev": true
+        }
       }
     },
     "sass-graph": {
@@ -12679,15 +11392,77 @@
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wrap-ansi": "2.1.0"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "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"
+          }
+        },
+        "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"
           }
         },
         "which-module": {
@@ -12729,13 +11504,13 @@
       }
     },
     "sass-lookup": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/sass-lookup/-/sass-lookup-1.0.2.tgz",
-      "integrity": "sha1-wVxPcmHcKtsRs9WRLe1rCKFLIcg=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/sass-lookup/-/sass-lookup-1.1.0.tgz",
+      "integrity": "sha1-2kSiG+6llV8U7/24G97idRttFeI=",
       "dev": true,
       "requires": {
         "commander": "2.8.1",
-        "is-relative-path": "1.0.1"
+        "is-relative-path": "1.0.2"
       },
       "dependencies": {
         "commander": {
@@ -12778,15 +11553,15 @@
       "dev": true
     },
     "scss-bundle": {
-      "version": "2.0.1-beta.7",
-      "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-2.0.1-beta.7.tgz",
-      "integrity": "sha1-PquvktNm4kUFDWLbWDkKHbwl6tQ=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-2.1.0.tgz",
+      "integrity": "sha512-8TJaz8f5FMyyH2Se0mxfQY6CKaFb8gxyIE0qPHxk4Dfx7x8IhnvIIXyZwh0O5XK+uD0L4/gQkkRVT5zW+GcJcw==",
       "dev": true,
       "requires": {
         "archy": "1.0.0",
         "globs": "0.1.3",
         "mkdirp": "0.5.1",
-        "mz": "2.6.0",
+        "mz": "2.7.0",
         "node-sass": "4.5.3",
         "pretty-bytes": "4.0.2",
         "promise": "7.3.1",
@@ -12799,15 +11574,77 @@
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+        "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": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wrap-ansi": "2.1.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
           }
         },
         "which-module": {
@@ -12854,7 +11691,7 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "2.1.9",
+        "js-base64": "2.3.2",
         "source-map": "0.4.4"
       },
       "dependencies": {
@@ -12870,15 +11707,15 @@
       }
     },
     "selenium-webdriver": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.4.0.tgz",
-      "integrity": "sha1-FR90RSlNpqZsScwwB0eioX5TxSo=",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.5.0.tgz",
+      "integrity": "sha512-1bCZYRfDy7vsu1dkLrclTLvWPxSo6rOIkxZXvB2wnzeWkEoiTKpw612EUGA3jRZxPzAzI9OlxuULJV8ge1vVXQ==",
       "dev": true,
       "requires": {
-        "adm-zip": "0.4.7",
+        "jszip": "3.1.4",
         "rimraf": "2.6.1",
         "tmp": "0.0.30",
-        "xml2js": "0.4.17"
+        "xml2js": "0.4.19"
       },
       "dependencies": {
         "tmp": {
@@ -12893,9 +11730,9 @@
       }
     },
     "semver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
       "dev": true
     },
     "semver-diff": {
@@ -12904,60 +11741,16 @@
       "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
       "dev": true,
       "requires": {
-        "semver": "5.3.0"
+        "semver": "5.4.1"
       }
     },
     "semver-greatest-satisfied-range": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.0.0.tgz",
-      "integrity": "sha1-T7RB4qjSbEC1mDJ1VzGN4nKlWKA=",
-      "dev": true,
-      "requires": {
-        "semver": "4.3.6",
-        "semver-regex": "1.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        }
-      }
-    },
-    "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=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
       "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": {
-        "mime": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-          "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
-          "dev": true
-        }
+        "sver-compat": "1.5.0"
       }
     },
     "sentence-case": {
@@ -12966,7 +11759,7 @@
       "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "upper-case-first": "1.1.2"
       }
     },
@@ -12976,16 +11769,6 @@
       "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
       "dev": true
     },
-    "serializerr": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/serializerr/-/serializerr-1.0.3.tgz",
-      "integrity": "sha1-EtTFqhw/+49tHcXzlaqUVVacP5E=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "protochain": "1.0.5"
-      }
-    },
     "serve-favicon": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz",
@@ -12995,7 +11778,7 @@
         "etag": "1.7.0",
         "fresh": "0.3.0",
         "ms": "0.7.2",
-        "parseurl": "1.3.1"
+        "parseurl": "1.3.2"
       },
       "dependencies": {
         "etag": {
@@ -13029,8 +11812,8 @@
         "debug": "2.2.0",
         "escape-html": "1.0.3",
         "http-errors": "1.3.1",
-        "mime-types": "2.1.15",
-        "parseurl": "1.3.1"
+        "mime-types": "2.1.17",
+        "parseurl": "1.3.2"
       },
       "dependencies": {
         "accepts": {
@@ -13039,7 +11822,7 @@
           "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=",
           "dev": true,
           "requires": {
-            "mime-types": "2.1.15",
+            "mime-types": "2.1.17",
             "negotiator": "0.5.3"
           }
         },
@@ -13076,19 +11859,6 @@
         }
       }
     },
-    "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,
-      "optional": true,
-      "requires": {
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.1",
-        "send": "0.15.3"
-      }
-    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -13120,7 +11890,7 @@
       "dev": true,
       "requires": {
         "glob": "7.1.2",
-        "interpret": "1.0.3",
+        "interpret": "1.0.4",
         "rechoir": "0.6.2"
       }
     },
@@ -13143,10 +11913,21 @@
       "dev": true
     },
     "slice-ansi": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0"
+      },
+      "dependencies": {
+        "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
+        }
+      }
     },
     "slice-stream": {
       "version": "1.0.0",
@@ -13195,16 +11976,16 @@
       "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1"
+        "no-case": "2.3.2"
       }
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "socket.io": {
@@ -13291,6 +12072,12 @@
         "to-array": "0.1.4"
       },
       "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
         "debug": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
@@ -13320,12 +12107,6 @@
         "json3": "3.3.2"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-          "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
-          "dev": true
-        },
         "debug": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
@@ -13362,16 +12143,16 @@
       }
     },
     "source-map": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "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=",
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "requires": {
-        "source-map": "0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "sourcemap-codec": {
@@ -13417,15 +12198,15 @@
       "dev": true
     },
     "specificity": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.1.tgz",
-      "integrity": "sha1-8bBoQkzjF64HR42V3jwhz4Xo1Wc=",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
+      "integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
       "dev": true
     },
     "split": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.0.tgz",
-      "integrity": "sha1-xDlc5oOrzSVLwo/h2rtuXCfc/64=",
+      "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"
@@ -13442,9 +12223,9 @@
       }
     },
     "split2": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz",
-      "integrity": "sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
       "dev": true,
       "requires": {
         "through2": "2.0.3"
@@ -13470,14 +12251,6 @@
         "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": {
@@ -13581,13 +12354,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string-template": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz",
-      "integrity": "sha1-np8iM9wA8hhxjsN5oopWc+zKi5Y=",
-      "dev": true,
-      "optional": true
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -13636,20 +12402,10 @@
       }
     },
     "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-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true,
-      "optional": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
     },
     "strip-indent": {
       "version": "1.0.1",
@@ -13728,9 +12484,9 @@
       "requires": {
         "autoprefixer": "6.7.7",
         "balanced-match": "0.4.2",
-        "chalk": "2.0.1",
+        "chalk": "2.1.0",
         "colorguard": "1.2.0",
-        "cosmiconfig": "2.1.3",
+        "cosmiconfig": "2.2.2",
         "debug": "2.6.7",
         "doiuse": "2.6.0",
         "execall": "1.0.0",
@@ -13739,7 +12495,7 @@
         "globby": "6.1.0",
         "globjoin": "0.1.4",
         "html-tags": "2.0.0",
-        "ignore": "3.3.3",
+        "ignore": "3.3.5",
         "imurmurhash": "0.1.4",
         "known-css-properties": "0.2.0",
         "lodash": "4.17.4",
@@ -13758,13 +12514,13 @@
         "postcss-selector-parser": "2.2.3",
         "postcss-value-parser": "3.3.0",
         "resolve-from": "3.0.0",
-        "specificity": "0.3.1",
-        "string-width": "2.1.0",
+        "specificity": "0.3.2",
+        "string-width": "2.1.1",
         "style-search": "0.1.0",
         "stylehacks": "2.3.2",
         "sugarss": "0.2.0",
         "svg-tags": "1.0.0",
-        "table": "4.0.1"
+        "table": "4.0.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13774,9 +12530,9 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
-          "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
             "color-convert": "1.9.0"
@@ -13789,14 +12545,14 @@
           "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==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.1.0",
+            "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.0"
+            "supports-color": "4.4.0"
           }
         },
         "get-stdin": {
@@ -13830,16 +12586,10 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "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
-        },
         "string-width": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz",
-          "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=",
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -13856,9 +12606,9 @@
           }
         },
         "supports-color": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz",
-          "integrity": "sha512-Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -13874,7 +12624,7 @@
       "requires": {
         "commander": "2.8.1",
         "debug": "2.2.0",
-        "is-relative-path": "1.0.1"
+        "is-relative-path": "1.0.2"
       },
       "dependencies": {
         "commander": {
@@ -13912,29 +12662,10 @@
         "postcss": "5.2.17"
       }
     },
-    "superagent": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz",
-      "integrity": "sha1-M2GjlxVnUEw1EGOr6q4PqiPb8/g=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "cookiejar": "2.1.1",
-        "debug": "2.6.7",
-        "extend": "3.0.1",
-        "form-data": "2.1.4",
-        "formidable": "1.1.1",
-        "methods": "1.1.2",
-        "mime": "1.3.6",
-        "qs": "6.4.0",
-        "readable-stream": "2.3.3"
-      }
-    },
     "superstatic": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/superstatic/-/superstatic-4.1.0.tgz",
-      "integrity": "sha1-5/l3rHAZOtgOFU/RNqVLTUURCwE=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/superstatic/-/superstatic-5.0.1.tgz",
+      "integrity": "sha1-8Kg5Qq2Ok8XFOpg0HEo94inf+U4=",
       "dev": true,
       "requires": {
         "as-array": "2.0.0",
@@ -13943,9 +12674,9 @@
         "chalk": "1.1.3",
         "char-spinner": "1.0.1",
         "compare-semver": "1.1.0",
-        "compression": "1.7.0",
-        "connect": "3.6.2",
-        "connect-query": "0.2.0",
+        "compression": "1.7.1",
+        "connect": "3.6.5",
+        "connect-query": "1.0.0",
         "destroy": "1.0.4",
         "fast-url-parser": "1.1.3",
         "fs-extra": "0.30.0",
@@ -13955,15 +12686,15 @@
         "is-url": "1.2.2",
         "join-path": "1.1.1",
         "lodash": "4.17.4",
-        "mime-types": "2.1.15",
+        "mime-types": "2.1.17",
         "minimatch": "3.0.4",
-        "morgan": "1.8.2",
+        "morgan": "1.9.0",
         "nash": "2.0.4",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1",
         "path-to-regexp": "1.7.0",
-        "router": "1.3.1",
-        "rsvp": "3.6.1",
+        "router": "1.3.2",
+        "rsvp": "3.6.2",
         "string-length": "1.0.1",
         "try-require": "1.2.1",
         "update-notifier": "1.0.3"
@@ -14020,12 +12751,6 @@
           "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "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
-        },
         "path-to-regexp": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
@@ -14079,22 +12804,24 @@
         }
       }
     },
-    "supertest": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz",
-      "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=",
+    "supports-color": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "methods": "1.1.2",
-        "superagent": "3.5.2"
+        "has-flag": "1.0.0"
       }
     },
-    "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
+    "sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1"
+      }
     },
     "svg-tags": {
       "version": "1.0.0",
@@ -14141,31 +12868,51 @@
       }
     },
     "table": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz",
-      "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "chalk": "1.1.3",
+        "ajv": "5.2.3",
+        "ajv-keywords": "2.1.0",
+        "chalk": "2.1.0",
         "lodash": "4.17.4",
-        "slice-ansi": "0.0.4",
-        "string-width": "2.1.0"
+        "slice-ansi": "1.0.0",
+        "string-width": "2.1.1"
       },
       "dependencies": {
-        "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
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.4.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "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",
@@ -14173,9 +12920,9 @@
           "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=",
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -14190,24 +12937,43 @@
           "requires": {
             "ansi-regex": "3.0.0"
           }
+        },
+        "supports-color": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
         }
       }
     },
     "tapable": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz",
-      "integrity": "sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-3.2.1.tgz",
+      "integrity": "sha512-ZSzds1E0IqutvMU8HxjMaU8eB7urw2fGwTq88ukDOVuUIh0656l7/P7LiVPxhO5kS4flcRJQk8USG+cghQbTUQ==",
       "dev": true,
       "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.11",
-        "inherits": "2.0.3"
+        "chownr": "1.0.1",
+        "minipass": "2.2.1",
+        "minizlib": "1.0.3",
+        "mkdirp": "0.5.1",
+        "yallist": "3.0.2"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+          "dev": true
+        }
       }
     },
     "tar-stream": {
@@ -14217,7 +12983,7 @@
       "dev": true,
       "requires": {
         "bl": "1.2.1",
-        "end-of-stream": "1.0.0",
+        "end-of-stream": "1.4.0",
         "readable-stream": "2.3.3",
         "xtend": "4.0.1"
       }
@@ -14234,16 +13000,16 @@
       "integrity": "sha1-Bk5Im0tb9gumpre8fy9cJ07Pgmk=",
       "dev": true,
       "requires": {
-        "duplexify": "3.5.0",
+        "duplexify": "3.5.1",
         "fork-stream": "0.0.4",
         "merge-stream": "1.0.1",
         "through2": "2.0.3"
       }
     },
     "text-extensions": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz",
-      "integrity": "sha1-0cstFLXQvEW/3Kigikc/aMfrDLw=",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.6.0.tgz",
+      "integrity": "sha512-U2M04F2rbuYYCNioiTD14cImLTae4ys1rC57tllzKg3dt5DPR2JXs5yFdC017yOBrW6wM6s5gtAlFJ7yye04rA==",
       "dev": true
     },
     "text-table": {
@@ -14301,13 +13067,6 @@
       "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,
-      "optional": true
-    },
     "tiny-lr": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.2.1.tgz",
@@ -14318,7 +13077,7 @@
         "debug": "2.2.0",
         "faye-websocket": "0.10.0",
         "livereload-js": "2.2.2",
-        "parseurl": "1.3.1",
+        "parseurl": "1.3.2",
         "qs": "5.1.0"
       },
       "dependencies": {
@@ -14329,9 +13088,9 @@
           "dev": true,
           "requires": {
             "bytes": "2.2.0",
-            "content-type": "1.0.2",
+            "content-type": "1.0.4",
             "debug": "2.2.0",
-            "depd": "1.1.0",
+            "depd": "1.1.1",
             "http-errors": "1.3.1",
             "iconv-lite": "0.4.13",
             "on-finished": "2.3.0",
@@ -14418,7 +13177,7 @@
       "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=",
       "dev": true,
       "requires": {
-        "no-case": "2.3.1",
+        "no-case": "2.3.2",
         "upper-case": "1.1.3"
       }
     },
@@ -14444,12 +13203,20 @@
       "dev": true,
       "requires": {
         "hoek": "2.16.3"
+      },
+      "dependencies": {
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        }
       }
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "dev": true,
       "requires": {
         "punycode": "1.4.1"
@@ -14515,41 +13282,41 @@
       "dev": true
     },
     "ts-node": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.2.0.tgz",
-      "integrity": "sha1-mBTwwBQXhJAM8S/vEZetS39NI9E=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.3.0.tgz",
+      "integrity": "sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k=",
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
-        "chalk": "2.0.1",
-        "diff": "3.3.0",
+        "chalk": "2.1.0",
+        "diff": "3.3.1",
         "make-error": "1.3.0",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "source-map-support": "0.4.15",
+        "source-map-support": "0.4.18",
         "tsconfig": "6.0.0",
-        "v8flags": "2.1.1",
+        "v8flags": "3.0.1",
         "yn": "2.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
-          "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
             "color-convert": "1.9.0"
           }
         },
         "chalk": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
-          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.1.0",
+            "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.2.0"
+            "supports-color": "4.4.0"
           }
         },
         "has-flag": {
@@ -14559,13 +13326,22 @@
           "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==",
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
           }
+        },
+        "v8flags": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.1.tgz",
+          "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=",
+          "dev": true,
+          "requires": {
+            "homedir-polyfill": "1.0.1"
+          }
         }
       }
     },
@@ -14577,25 +13353,26 @@
       "requires": {
         "strip-bom": "3.0.0",
         "strip-json-comments": "2.0.1"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        }
       }
     },
     "tsconfig-paths": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-2.2.0.tgz",
-      "integrity": "sha1-x2rOfyxFTNMcpvcsM4dtuuAgAOg=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-2.3.0.tgz",
+      "integrity": "sha512-YRahNqogNr4Oh0qVZ7SICry+4KCeGgeDc6YuIfLYblXIQE/XWtnL1QahX681YtwisjUpePEbxfrBKTGRCNsKNw==",
       "dev": true,
       "requires": {
         "tsconfig": "5.0.3"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "tsconfig": {
           "version": "5.0.3",
           "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz",
@@ -14611,14 +13388,14 @@
       }
     },
     "tsickle": {
-      "version": "0.23.5",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.5.tgz",
-      "integrity": "sha1-kYgnFwwMe4kYPWxhc8NWQZG6xqo=",
+      "version": "0.23.6",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.6.tgz",
+      "integrity": "sha1-/O5Xpct/kqjDqeV47gooZCfc+s0=",
       "requires": {
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
-        "source-map": "0.5.6",
-        "source-map-support": "0.4.15"
+        "source-map": "0.5.7",
+        "source-map-support": "0.4.18"
       }
     },
     "tslib": {
@@ -14635,13 +13412,13 @@
         "babel-code-frame": "6.26.0",
         "colors": "1.1.2",
         "commander": "2.11.0",
-        "diff": "3.3.0",
+        "diff": "3.3.1",
         "glob": "7.1.2",
         "minimatch": "3.0.4",
-        "resolve": "1.3.3",
-        "semver": "5.3.0",
+        "resolve": "1.4.0",
+        "semver": "5.4.1",
         "tslib": "1.7.1",
-        "tsutils": "2.8.2"
+        "tsutils": "2.10.0"
       },
       "dependencies": {
         "colors": {
@@ -14649,15 +13426,6 @@
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
           "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
           "dev": true
-        },
-        "tsutils": {
-          "version": "2.8.2",
-          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.2.tgz",
-          "integrity": "sha1-LBSGukMSYIRbCsb5Aq/Z1wio6mo=",
-          "dev": true,
-          "requires": {
-            "tslib": "1.7.1"
-          }
         }
       }
     },
@@ -14668,9 +13436,9 @@
       "dev": true
     },
     "tsutils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.6.0.tgz",
-      "integrity": "sha1-5emceaiszTl3zhjYP98dI1psLrs=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.10.0.tgz",
+      "integrity": "sha1-rpRRHfJlbrBuRCQFb7pcOIiHBAw=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
@@ -14708,7 +13476,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.15"
+        "mime-types": "2.1.17"
       }
     },
     "typedarray": {
@@ -14723,15 +13491,68 @@
       "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
       "dev": true
     },
+    "typescript-eslint-parser": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/typescript-eslint-parser/-/typescript-eslint-parser-1.0.2.tgz",
+      "integrity": "sha1-/Sq6zy7j2Tgqs+RJyHYra+rk0Nc=",
+      "dev": true,
+      "requires": {
+        "lodash.unescape": "4.0.0",
+        "object-assign": "4.1.1"
+      }
+    },
     "uglify-js": {
       "version": "2.8.29",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
       "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.6",
+        "source-map": "0.5.7",
         "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"
+          }
+        },
+        "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
+        },
+        "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-to-browserify": {
@@ -14816,7 +13637,7 @@
       "requires": {
         "async": "0.2.10",
         "node-uuid": "1.4.8",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "underscore": "1.6.0"
       },
       "dependencies": {
@@ -14835,9 +13656,9 @@
       }
     },
     "universalify": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.0.tgz",
-      "integrity": "sha1-nrHEZR3rzGcMyU8adXYjMruWd3g=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
       "dev": true
     },
     "unpipe": {
@@ -14950,7 +13771,7 @@
           "integrity": "sha1-5dDtSvVfw+701WAHdp2YGSvLLso=",
           "dev": true,
           "requires": {
-            "duplexify": "3.5.0",
+            "duplexify": "3.5.1",
             "infinity-agent": "2.0.3",
             "is-redirect": "1.0.0",
             "is-stream": "1.1.0",
@@ -14979,12 +13800,6 @@
             "package-json": "1.2.0"
           }
         },
-        "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
-        },
         "package-json": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz",
@@ -15078,9 +13893,9 @@
       }
     },
     "useragent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.0.tgz",
-      "integrity": "sha1-74X0GQPP0F4rqMEa5hJJx6a79mM=",
+      "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",
@@ -15101,30 +13916,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "utile": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz",
-      "integrity": "sha1-E1LDQOuCDk2N26A5pPv6oy7U7zo=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "async": "0.9.2",
-        "deep-equal": "0.2.2",
-        "i": "0.3.5",
-        "mkdirp": "0.5.1",
-        "ncp": "1.0.1",
-        "rimraf": "2.6.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "utils-merge": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
@@ -15183,18 +13974,20 @@
       "dev": true
     },
     "vary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
-      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
     "verror": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "extsprintf": "1.0.2"
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
       }
     },
     "vhost": {
@@ -15213,28 +14006,8 @@
         "clone-buffer": "1.0.0",
         "clone-stats": "1.0.0",
         "cloneable-readable": "1.0.0",
-        "remove-trailing-separator": "1.0.2",
+        "remove-trailing-separator": "1.1.0",
         "replace-ext": "1.0.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
-          "dev": true
-        },
-        "clone-stats": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-          "dev": true
-        }
       }
     },
     "vinyl-fs": {
@@ -15259,6 +14032,12 @@
           "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
           "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
+        },
         "graceful-fs": {
           "version": "3.0.11",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
@@ -15330,7 +14109,7 @@
       "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.6"
+        "source-map": "0.5.7"
       }
     },
     "vlq": {
@@ -15352,9 +14131,9 @@
       "dev": true
     },
     "wd": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/wd/-/wd-1.4.0.tgz",
-      "integrity": "sha512-VHii2f+jck5fgEcTQYCR3z99B99tPz0HlLCGsNowI2qsI21xMnKwd9O3SnJQnEBq0Erx9FPFfiZno+OYtXDXyw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/wd/-/wd-1.4.1.tgz",
+      "integrity": "sha512-C0wWd2X4SWWcyx5qxaixiZE4Vb07sl0yDfWHPeml8lDHSbmI9erE9BmTHIqOGoDxGgJ3/hkFmODQ7ZLKiF8+8Q==",
       "dev": true,
       "requires": {
         "archiver": "1.3.0",
@@ -15384,6 +14163,12 @@
             "zip-stream": "1.2.0"
           }
         },
+        "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.0.1",
           "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz",
@@ -15393,6 +14178,21 @@
             "lodash": "4.16.2"
           }
         },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "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"
+          }
+        },
         "caseless": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
@@ -15412,9 +14212,9 @@
           }
         },
         "crc": {
-          "version": "3.4.4",
-          "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
-          "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+          "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
           "dev": true
         },
         "crc32-stream": {
@@ -15423,10 +14223,30 @@
           "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
           "dev": true,
           "requires": {
-            "crc": "3.4.4",
+            "crc": "3.5.0",
             "readable-stream": "2.3.3"
           }
         },
+        "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"
+          }
+        },
+        "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.17"
+          }
+        },
         "har-validator": {
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
@@ -15435,22 +14255,45 @@
           "requires": {
             "chalk": "1.1.3",
             "commander": "2.11.0",
-            "is-my-json-valid": "2.16.0",
+            "is-my-json-valid": "2.16.1",
             "pinkie-promise": "2.0.1"
           }
         },
+        "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"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "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.1",
+            "sshpk": "1.13.1"
+          }
+        },
         "lodash": {
           "version": "4.16.2",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz",
           "integrity": "sha1-PmJtuCcEimmSgaihJSJjJs/A5lI=",
           "dev": true
         },
-        "q": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-          "dev": true
-        },
         "qs": {
           "version": "6.3.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
@@ -15476,15 +14319,24 @@
             "is-typedarray": "1.0.0",
             "isstream": "0.1.2",
             "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
+            "mime-types": "2.1.17",
             "oauth-sign": "0.8.2",
             "qs": "6.3.2",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
+            "tough-cookie": "2.3.3",
             "tunnel-agent": "0.4.3",
             "uuid": "3.1.0"
           }
         },
+        "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"
+          }
+        },
         "tar-stream": {
           "version": "1.5.4",
           "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
@@ -15492,7 +14344,7 @@
           "dev": true,
           "requires": {
             "bl": "1.2.1",
-            "end-of-stream": "1.0.0",
+            "end-of-stream": "1.4.0",
             "readable-stream": "2.3.3",
             "xtend": "4.0.1"
           }
@@ -15518,9 +14370,9 @@
       }
     },
     "web-animations-js": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.2.5.tgz",
-      "integrity": "sha1-JsobNME0czKggT+LK/5pZk76gKo=",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz",
+      "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA=",
       "dev": true
     },
     "webdriver-js-extender": {
@@ -15571,7 +14423,7 @@
           "dev": true,
           "requires": {
             "sax": "0.6.1",
-            "xmlbuilder": "4.2.1"
+            "xmlbuilder": "9.0.4"
           }
         }
       }
@@ -15583,18 +14435,19 @@
       "dev": true
     },
     "websocket-driver": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "websocket-extensions": "0.1.1"
+        "http-parser-js": "0.4.8",
+        "websocket-extensions": "0.1.2"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
       "dev": true
     },
     "whatwg-encoding": {
@@ -15630,21 +14483,14 @@
       "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
     },
     "which": {
-      "version": "1.2.14",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
-      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "dev": true,
       "requires": {
         "isexe": "2.0.0"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true,
-      "optional": true
-    },
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
@@ -15664,9 +14510,9 @@
       }
     },
     "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
       "dev": true
     },
     "winston": {
@@ -15721,6 +14567,23 @@
       "requires": {
         "boom": "2.10.1",
         "hoek": "2.16.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        }
       }
     },
     "write": {
@@ -15733,14 +14596,14 @@
       }
     },
     "write-file-atomic": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz",
-      "integrity": "sha1-F2n0tVHu3OQZ8FBd6uLiZ2NULTc=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
       "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "imurmurhash": "0.1.4",
-        "slide": "1.1.6"
+        "signal-exit": "3.0.2"
       }
     },
     "write-file-stdout": {
@@ -15790,23 +14653,20 @@
       "dev": true
     },
     "xml2js": {
-      "version": "0.4.17",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
-      "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
       "dev": true,
       "requires": {
         "sax": "1.2.4",
-        "xmlbuilder": "4.2.1"
+        "xmlbuilder": "9.0.4"
       }
     },
     "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"
-      }
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
+      "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
+      "dev": true
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.3",
@@ -15833,42 +14693,18 @@
       "dev": true
     },
     "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+      "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
       "dev": true,
       "requires": {
-        "camelcase": "1.2.1",
-        "cliui": "2.1.0",
+        "camelcase": "2.1.1",
+        "cliui": "3.2.0",
         "decamelize": "1.2.0",
-        "window-size": "0.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "camelcase": "4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true,
-          "optional": true
-        }
+        "os-locale": "1.4.0",
+        "string-width": "1.0.2",
+        "window-size": "0.1.4",
+        "y18n": "3.2.1"
       }
     },
     "yeast": {
@@ -15927,9 +14763,9 @@
       }
     },
     "zone.js": {
-      "version": "0.8.12",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.12.tgz",
-      "integrity": "sha1-hv9QU8mK7CkaC/S7rFAdaUoFz7s="
+      "version": "0.8.18",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
+      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q=="
     }
   }
 }
diff --git a/package.json b/package.json
index d8e8e9be7164..ffed3f477b53 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "dgeni-packages": "^0.19.1",
     "firebase": "^4.0.0",
     "firebase-admin": "^5.0.0",
-    "firebase-tools": "^3.9.0",
+    "firebase-tools": "^3.11.0",
     "fs-extra": "^3.0.1",
     "glob": "^7.1.2",
     "google-closure-compiler": "20170409.0.0",
diff --git a/scripts/ci/sources/tunnel.sh b/scripts/ci/sources/tunnel.sh
index adaaa9c18b2c..5256422d5073 100644
--- a/scripts/ci/sources/tunnel.sh
+++ b/scripts/ci/sources/tunnel.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Load the retry-call utility function.
-source ./scripts/ci/sources/retry-call.sh
+source ./scripts/retry-call.sh
 
 # Variable the specifies how often the wait script should be invoked if it fails.
 WAIT_RETRIES=2
diff --git a/scripts/ci/travis-deploy.sh b/scripts/ci/travis-deploy.sh
index 1dad3036eb1f..1feb6871fbad 100755
--- a/scripts/ci/travis-deploy.sh
+++ b/scripts/ci/travis-deploy.sh
@@ -9,6 +9,9 @@ set -e
 # Go to the project root directory
 cd $(dirname $0)/../..
 
+# Load the retry-call utility function.
+source scripts/retry-call.sh
+
 # If the current Travis job is triggered by a pull request skip the deployment.
 # This check is necessary because Travis still tries to run the deploy build-stage for
 # pull requests.
@@ -17,22 +20,25 @@ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
   exit 0;
 fi
 
+# Variable the specifies how often the deploy script should be invoked if it fails.
+DEPLOY_RETRIES=1
+
 echo ""
 echo "Starting the deployment script. Running mode: ${DEPLOY_MODE}"
 echo ""
 
 if [[ "${DEPLOY_MODE}" == "build-artifacts" ]]; then
-  ./scripts/deploy/publish-build-artifacts.sh
+  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-build-artifacts.sh
 fi
 
 if [[ "${DEPLOY_MODE}" == "docs-content" ]]; then
-  ./scripts/deploy/publish-docs-content.sh
+  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-docs-content.sh
 fi
 
 if [[ "${DEPLOY_MODE}" == "screenshot-tool" ]]; then
-  ./scripts/deploy/deploy-screenshot-tool.sh
+  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-screenshot-tool.sh
 fi
 
 if [[ "${DEPLOY_MODE}" == "dashboard" ]]; then
-  ./scripts/deploy/deploy-dashboard.sh
+  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-dashboard.sh
 fi
diff --git a/scripts/ci/sources/retry-call.sh b/scripts/retry-call.sh
old mode 100755
new mode 100644
similarity index 100%
rename from scripts/ci/sources/retry-call.sh
rename to scripts/retry-call.sh

From f43bf238046191aa4429ac4a60f47a36c8da3955 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 29 Sep 2017 13:24:07 -0700
Subject: [PATCH 209/575] Move snackbar component styling to inline. (#6990)

---
 src/material-examples/card-fancy/card-fancy-example.css        | 2 +-
 src/material-examples/card-fancy/card-fancy-example.html       | 2 +-
 .../snack-bar-component/snack-bar-component-example-snack.css  | 3 ---
 .../snack-bar-component/snack-bar-component-example.ts         | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/material-examples/snack-bar-component/snack-bar-component-example-snack.css

diff --git a/src/material-examples/card-fancy/card-fancy-example.css b/src/material-examples/card-fancy/card-fancy-example.css
index 6a2f0a6255cf..5792e475772c 100644
--- a/src/material-examples/card-fancy/card-fancy-example.css
+++ b/src/material-examples/card-fancy/card-fancy-example.css
@@ -3,6 +3,6 @@
 }
 
 .example-header-image {
-  background-image: url('../../../assets/img/examples/shiba1.jpg');
+  background-image: url('http://material.angular.io/assets/img/examples/shiba1.jpg');
   background-size: cover;
 }
diff --git a/src/material-examples/card-fancy/card-fancy-example.html b/src/material-examples/card-fancy/card-fancy-example.html
index c80c1bbc495c..ba053f17f81e 100644
--- a/src/material-examples/card-fancy/card-fancy-example.html
+++ b/src/material-examples/card-fancy/card-fancy-example.html
@@ -4,7 +4,7 @@
     <mat-card-title>Shiba Inu</mat-card-title>
     <mat-card-subtitle>Dog Breed</mat-card-subtitle>
   </mat-card-header>
-  <img mat-card-image src="assets/img/examples/shiba2.jpg" alt="Photo of a Shiba Inu">
+  <img mat-card-image src="http://material.angular.io/assets/img/examples/shiba2.jpg" alt="Photo of a Shiba Inu">
   <mat-card-content>
     <p>
       The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan.
diff --git a/src/material-examples/snack-bar-component/snack-bar-component-example-snack.css b/src/material-examples/snack-bar-component/snack-bar-component-example-snack.css
deleted file mode 100644
index fa7dc6749acf..000000000000
--- a/src/material-examples/snack-bar-component/snack-bar-component-example-snack.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.example-pizza-party {
-  color: hotpink;
-}
diff --git a/src/material-examples/snack-bar-component/snack-bar-component-example.ts b/src/material-examples/snack-bar-component/snack-bar-component-example.ts
index 7c685c53985a..cf3fafdfdab0 100644
--- a/src/material-examples/snack-bar-component/snack-bar-component-example.ts
+++ b/src/material-examples/snack-bar-component/snack-bar-component-example.ts
@@ -22,6 +22,6 @@ export class SnackBarComponentExample {
 @Component({
   selector: 'snack-bar-component-example-snack',
   templateUrl: 'snack-bar-component-example-snack.html',
-  styleUrls: ['snack-bar-component-example-snack.css'],
+  styles: [`.example-pizza-party { color: hotpink; }`],
 })
 export class PizzaPartyComponent {}

From 811e50451bb6304a07a3600ae304e5350e41c0e0 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 29 Sep 2017 13:24:14 -0700
Subject: [PATCH 210/575] Create screen type service to determine screen type:
 Web, Tablet, Handset (#6772)

---
 src/cdk/coercion/array.spec.ts                |  35 ++++
 src/cdk/coercion/array.ts                     |  12 ++
 src/cdk/coercion/public_api.ts                |   1 +
 src/cdk/layout/breakpoints-observer.md        |  26 +++
 src/cdk/layout/breakpoints-observer.spec.ts   | 149 ++++++++++++++++++
 src/cdk/layout/breakpoints-observer.ts        |  97 ++++++++++++
 src/cdk/layout/breakpoints.ts                 |  25 +++
 src/cdk/layout/index.ts                       |   8 +
 src/cdk/layout/media-matcher.md               |  17 ++
 src/cdk/layout/media-matcher.spec.ts          |  47 ++++++
 src/cdk/layout/media-matcher.ts               |  77 +++++++++
 src/cdk/layout/public_api.ts                  |  21 +++
 src/cdk/layout/tsconfig-build.json            |  13 ++
 src/demo-app/demo-app-module.ts               |   1 -
 src/demo-app/demo-app/demo-app.ts             |   1 +
 src/demo-app/demo-app/demo-module.ts          |   4 +
 src/demo-app/demo-app/routes.ts               |   4 +
 src/demo-app/index.html                       |   2 +-
 .../screen-type/screen-type-demo.html         |  29 ++++
 .../screen-type/screen-type-demo.scss         |  24 +++
 src/demo-app/screen-type/screen-type-demo.ts  |  27 ++++
 src/demo-app/system-config.ts                 |   1 +
 tools/package-tools/rollup-globals.ts         |   3 +
 23 files changed, 622 insertions(+), 2 deletions(-)
 create mode 100644 src/cdk/coercion/array.spec.ts
 create mode 100644 src/cdk/coercion/array.ts
 create mode 100644 src/cdk/layout/breakpoints-observer.md
 create mode 100644 src/cdk/layout/breakpoints-observer.spec.ts
 create mode 100644 src/cdk/layout/breakpoints-observer.ts
 create mode 100644 src/cdk/layout/breakpoints.ts
 create mode 100644 src/cdk/layout/index.ts
 create mode 100644 src/cdk/layout/media-matcher.md
 create mode 100644 src/cdk/layout/media-matcher.spec.ts
 create mode 100644 src/cdk/layout/media-matcher.ts
 create mode 100644 src/cdk/layout/public_api.ts
 create mode 100644 src/cdk/layout/tsconfig-build.json
 create mode 100644 src/demo-app/screen-type/screen-type-demo.html
 create mode 100644 src/demo-app/screen-type/screen-type-demo.scss
 create mode 100644 src/demo-app/screen-type/screen-type-demo.ts

diff --git a/src/cdk/coercion/array.spec.ts b/src/cdk/coercion/array.spec.ts
new file mode 100644
index 000000000000..acc24cdd7b9d
--- /dev/null
+++ b/src/cdk/coercion/array.spec.ts
@@ -0,0 +1,35 @@
+import {coerceArray} from './array';
+
+describe('coerceArray', () => {
+
+  it('should wrap a string in an array', () => {
+    let stringVal = 'just a string';
+    expect(coerceArray(stringVal)).toEqual([stringVal]);
+  });
+
+  it('should wrap a number in an array', () => {
+    let numberVal = 42;
+    expect(coerceArray(numberVal)).toEqual([numberVal]);
+  });
+
+  it('should wrap an object in an array', () => {
+    let objectVal = { something: 'clever' };
+    expect(coerceArray(objectVal)).toEqual([objectVal]);
+  });
+
+  it('should wrap a null vall in an array', () => {
+    let nullVal = null;
+    expect(coerceArray(nullVal)).toEqual([nullVal]);
+  });
+
+  it('should wrap an undefined value in an array', () => {
+    let undefinedVal = undefined;
+    expect(coerceArray(undefinedVal)).toEqual([undefinedVal]);
+  });
+
+  it('should not wrap an array in an array', () => {
+    let arrayVal = [1, 2, 3];
+    expect(coerceArray(arrayVal)).toBe(arrayVal);
+  });
+
+});
diff --git a/src/cdk/coercion/array.ts b/src/cdk/coercion/array.ts
new file mode 100644
index 000000000000..c8a6766390b5
--- /dev/null
+++ b/src/cdk/coercion/array.ts
@@ -0,0 +1,12 @@
+/**
+ * @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
+ */
+
+/** Wraps the provided value in an array, unless the provided value is an array. */
+export function coerceArray<T>(value: T | T[]): T[] {
+  return Array.isArray(value) ? value : [value];
+}
diff --git a/src/cdk/coercion/public_api.ts b/src/cdk/coercion/public_api.ts
index 53767a7ac274..4aa4d40d308e 100644
--- a/src/cdk/coercion/public_api.ts
+++ b/src/cdk/coercion/public_api.ts
@@ -8,3 +8,4 @@
 
 export * from './boolean-property';
 export * from './number-property';
+export * from './array';
diff --git a/src/cdk/layout/breakpoints-observer.md b/src/cdk/layout/breakpoints-observer.md
new file mode 100644
index 000000000000..c5dfc710b58b
--- /dev/null
+++ b/src/cdk/layout/breakpoints-observer.md
@@ -0,0 +1,26 @@
+### BreakpointsModule
+
+When including the CDK's `LayoutModule`, components can inject `BreakpointsObserver` to request
+the matching state of a CSS Media Query.
+
+A set of breakpoints is provided based on the Material Design
+[breakpoint system](https://material.io/guidelines/layout/responsive-ui.html#responsive-ui-breakpoints).
+
+#### Example
+```ts
+@Component({ ... })
+export class MyWidget {
+  isHandset: Observable<BreakpointState>;
+
+  constructor(bm: BreakpointObserver) {
+    bm.observe(Handset).subscribe((state: BreakpointState) => {
+      if (state.matches) {
+        this.makeEverythingFitOnSmallScreen();
+      } else {
+        this.expandEverythingToFillTheScreen();
+      }
+    });
+  }
+}
+```
+
diff --git a/src/cdk/layout/breakpoints-observer.spec.ts b/src/cdk/layout/breakpoints-observer.spec.ts
new file mode 100644
index 000000000000..6272b9d00d79
--- /dev/null
+++ b/src/cdk/layout/breakpoints-observer.spec.ts
@@ -0,0 +1,149 @@
+/**
+ * @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 {LayoutModule, BreakpointObserver, BreakpointState} from './index';
+import {MediaMatcher} from './media-matcher';
+import {async, TestBed, inject} from '@angular/core/testing';
+import {Injectable} from '@angular/core';
+
+describe('BreakpointObserver', () => {
+  let breakpointManager: BreakpointObserver;
+  let mediaMatcher: FakeMediaMatcher;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [LayoutModule],
+      providers: [{provide: MediaMatcher, useClass: FakeMediaMatcher}]
+    });
+  }));
+
+  beforeEach(inject(
+    [BreakpointObserver, MediaMatcher],
+    (bm: BreakpointObserver, mm: FakeMediaMatcher) => {
+      breakpointManager = bm;
+      mediaMatcher = mm;
+    }));
+
+  afterEach(() => {
+    mediaMatcher.clear();
+  });
+
+  it('retrieves the whether a query is currently matched', () => {
+    let query = 'everything starts as true in the FakeMediaMatcher';
+    expect(breakpointManager.isMatched(query)).toBeTruthy();
+  });
+
+  it('reuses the same MediaQueryList for matching queries', () => {
+    expect(mediaMatcher.queryCount).toBe(0);
+    breakpointManager.observe('query1');
+    expect(mediaMatcher.queryCount).toBe(1);
+    breakpointManager.observe('query1');
+    expect(mediaMatcher.queryCount).toBe(1);
+    breakpointManager.observe('query2');
+    expect(mediaMatcher.queryCount).toBe(2);
+    breakpointManager.observe('query1');
+    expect(mediaMatcher.queryCount).toBe(2);
+  });
+
+  it('accepts an array of queries', () => {
+    let queries = ['1 query', '2 query', 'red query', 'blue query'];
+    breakpointManager.observe(queries);
+    expect(mediaMatcher.queryCount).toBe(queries.length);
+  });
+
+  it('completes all events when the breakpoint manager is destroyed', () => {
+    let firstTest = jasmine.createSpy('test1');
+    breakpointManager.observe('test1').subscribe(undefined, undefined, firstTest);
+    let secondTest = jasmine.createSpy('test2');
+    breakpointManager.observe('test2').subscribe(undefined, undefined, secondTest);
+
+    expect(firstTest).not.toHaveBeenCalled();
+    expect(secondTest).not.toHaveBeenCalled();
+
+    breakpointManager.ngOnDestroy();
+
+    expect(firstTest).toHaveBeenCalled();
+    expect(secondTest).toHaveBeenCalled();
+  });
+
+  it('emits an event on the observable when values change', () => {
+    let query = '(width: 999px)';
+    let queryMatchState: boolean = false;
+    breakpointManager.observe(query).subscribe((state: BreakpointState) => {
+      queryMatchState = state.matches;
+    });
+
+    async(() => {
+      expect(queryMatchState).toBeTruthy();
+      mediaMatcher.setMatchesQuery(query, false);
+      expect(queryMatchState).toBeFalsy();
+    });
+  });
+
+  it('emits a true matches state when the query is matched', () => {
+    let query = '(width: 999px)';
+    mediaMatcher.setMatchesQuery(query, true);
+    expect(breakpointManager.isMatched(query)).toBeTruthy();
+  });
+
+  it('emits a false matches state when the query is not matched', () => {
+    let query = '(width: 999px)';
+    mediaMatcher.setMatchesQuery(query, false);
+    expect(breakpointManager.isMatched(query)).toBeTruthy();
+  });
+});
+
+export class FakeMediaQueryList implements MediaQueryList {
+  /** The callback for change events. */
+  addListenerCallback?: (mql: MediaQueryList) => void;
+
+  constructor(public matches, public media) {}
+
+  /** Toggles the matches state and "emits" a change event. */
+  setMatches(matches: boolean) {
+    this.matches = matches;
+    this.addListenerCallback!(this);
+  }
+
+  /** Registers the callback method for change events. */
+  addListener(callback: (mql: MediaQueryList) => void) {
+    this.addListenerCallback = callback;
+  }
+
+  /** Noop, but required for implementing MediaQueryList. */
+  removeListener() {}
+}
+
+@Injectable()
+export class FakeMediaMatcher {
+  /** A map of match media queries. */
+  private queries: Map<string, FakeMediaQueryList> = new Map();
+
+  /** The number of distinct queries created in the media matcher during a test. */
+  get queryCount(): number {
+    return this.queries.size;
+  }
+
+  /** Fakes the match media response to be controlled in tests. */
+  matchMedia(query: string): FakeMediaQueryList {
+    let mql = new FakeMediaQueryList(true, query);
+    this.queries.set(query, mql);
+    return mql;
+  }
+
+  /** Clears all queries from the map of queries. */
+  clear() {
+    this.queries.clear();
+  }
+
+  /** Toggles the matching state of the provided query. */
+  setMatchesQuery(query: string, matches: boolean) {
+    if (this.queries.has(query)) {
+      this.queries.get(query)!.setMatches(matches);
+    }
+  }
+}
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
new file mode 100644
index 000000000000..3a7c481c4f6f
--- /dev/null
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -0,0 +1,97 @@
+/**
+ * @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 {Injectable, NgZone, OnDestroy} from '@angular/core';
+import {MediaMatcher} from './media-matcher';
+import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
+import {RxChain, map, startWith, takeUntil} from '@angular/cdk/rxjs';
+import {coerceArray} from '@angular/cdk/coercion';
+import {combineLatest} from 'rxjs/observable/combineLatest';
+import {fromEventPattern} from 'rxjs/observable/fromEventPattern';
+
+/** The current state of a layout breakpoint. */
+export interface BreakpointState {
+  matches: boolean;
+}
+
+interface Query {
+  observable: Observable<BreakpointState>;
+  mql: MediaQueryList;
+}
+
+/**
+ * Utility for checking the matching state of @media queries.
+ */
+@Injectable()
+export class BreakpointObserver implements OnDestroy {
+  /**  A map of all media queries currently being listened for. */
+  private _queries: Map<string, Query> = new Map();
+  /** A subject for all other observables to takeUntil based on. */
+  private _destroySubject: Subject<{}> = new Subject();
+
+  constructor(private mediaMatcher: MediaMatcher, private zone: NgZone) {}
+
+  /** Completes the active subject, signalling to all other observables to complete. */
+  ngOnDestroy() {
+    this._destroySubject.next();
+    this._destroySubject.complete();
+  }
+
+  /** Whether the query currently is matched. */
+  isMatched(value: string | string[]): boolean {
+    let queries = coerceArray(value);
+    return queries.some(mediaQuery => this._registerQuery(mediaQuery).mql.matches);
+  }
+
+  /**
+   * Gets an observable of results for the given queries that will emit new results for any changes
+   * in matching of the given queries.
+   */
+  observe(value: string | string[]): Observable<BreakpointState> {
+    let queries = coerceArray(value);
+    let observables = queries.map(query => this._registerQuery(query).observable);
+
+    return combineLatest(observables, (a: BreakpointState, b: BreakpointState) => {
+      return {
+        matches: !!((a && a.matches) || (b && b.matches)),
+      };
+    });
+  }
+
+  /** Registers a specific query to be listened for. */
+  private _registerQuery(query: string): Query {
+    // Only set up a new MediaQueryList if it is not already being listened for.
+    if (this._queries.has(query)) {
+      return this._queries.get(query)!;
+    }
+
+    let mql: MediaQueryList = this.mediaMatcher.matchMedia(query);
+    // Create callback for match changes and add it is as a listener.
+    let queryObservable = RxChain.from(fromEventPattern(
+      // Listener callback methods are wrapped to be placed back in ngZone. Callbacks must be placed
+      // back into the zone because matchMedia is only included in Zone.js by loading the
+      // webapis-media-query.js file alongside the zone.js file.  Additionally, some browsers do not
+      // have MediaQueryList inherit from EventTarget, which causes inconsistencies in how Zone.js
+      // patches it.
+      (listener: MediaQueryListListener) => {
+        mql.addListener((e: MediaQueryList) => this.zone.run(() => listener(e)));
+      },
+      (listener: MediaQueryListListener) => {
+        mql.removeListener((e: MediaQueryList) => this.zone.run(() => listener(e)));
+      }))
+      .call(takeUntil, this._destroySubject)
+      .call(startWith, mql)
+      .call(map, (nextMql: MediaQueryList) => ({matches: nextMql.matches}))
+      .result();
+
+    // Add the MediaQueryList to the set of queries.
+    let output = {observable: queryObservable, mql: mql};
+    this._queries.set(query, output);
+    return output;
+  }
+}
diff --git a/src/cdk/layout/breakpoints.ts b/src/cdk/layout/breakpoints.ts
new file mode 100644
index 000000000000..278ab780ec6a
--- /dev/null
+++ b/src/cdk/layout/breakpoints.ts
@@ -0,0 +1,25 @@
+/**
+ * @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
+ */
+// PascalCase is being used as Breakpoints is used like an enum.
+// tslint:disable-next-line:variable-name
+export const Breakpoints = {
+  Handset: '(max-width: 599px) and (orientation: portrait), ' +
+           '(max-width: 959px) and (orientation: landscape)',
+  Tablet: '(min-width: 600px) and (max-width: 839px) and (orientation: portrait), ' +
+          '(min-width: 960px) and (max-width: 1279px) and (orientation: landscape)',
+  Web: '(min-width: 840px) and (orientation: portrait), ' +
+       '(min-width: 1280px) and (orientation: landscape)',
+
+  HandsetPortrait: '(max-width: 599px) and (orientation: portrait)',
+  TabletPortrait: '(min-width: 600px) and (max-width: 839px) and (orientation: portrait)',
+  WebPortrait: '(min-width: 840px) and (orientation: portrait)',
+
+  HandsetLandscape: '(max-width: 959px) and (orientation: landscape)',
+  TabletLandscape: '(min-width: 960px) and (max-width: 1279px) and (orientation: landscape)',
+  WebLandscape: '(min-width: 1280px) and (orientation: landscape)',
+};
diff --git a/src/cdk/layout/index.ts b/src/cdk/layout/index.ts
new file mode 100644
index 000000000000..5a6b2bc7c6de
--- /dev/null
+++ b/src/cdk/layout/index.ts
@@ -0,0 +1,8 @@
+/**
+ * @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
+ */
+export * from './public_api';
diff --git a/src/cdk/layout/media-matcher.md b/src/cdk/layout/media-matcher.md
new file mode 100644
index 000000000000..259ad241a7c7
--- /dev/null
+++ b/src/cdk/layout/media-matcher.md
@@ -0,0 +1,17 @@
+### MediaMatcher
+ 
+When including the CDK's `LayoutModule`, components can inject `MediaMatcher` to access the 
+matchMedia method, if available on the platform.
+
+#### Example
+```ts
+@Component({ ... }) 
+export class MyWidget {  
+  constructor(mm: MediaMatcher) {
+    mm.matchMedia('(orientation: landscape)').matches ? 
+      this.setPortraitMode() :
+      this.setPortraitMode();
+  }
+}  
+```
+
diff --git a/src/cdk/layout/media-matcher.spec.ts b/src/cdk/layout/media-matcher.spec.ts
new file mode 100644
index 000000000000..10f0bf5c45e9
--- /dev/null
+++ b/src/cdk/layout/media-matcher.spec.ts
@@ -0,0 +1,47 @@
+/**
+ * @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 {LayoutModule, BreakpointObserver} from './index';
+import {MediaMatcher} from './media-matcher';
+import {async, TestBed, inject} from '@angular/core/testing';
+import {Platform} from '@angular/cdk/platform';
+
+describe('MediaMatcher', () => {
+  let breakpointManager: BreakpointObserver;
+  let mediaMatcher: MediaMatcher;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [LayoutModule]
+    });
+  }));
+
+  beforeEach(inject(
+    [BreakpointObserver, MediaMatcher],
+    (bm: BreakpointObserver, mm: MediaMatcher) => {
+      breakpointManager = bm;
+      mediaMatcher = mm;
+    }));
+
+  it('correctly returns a MediaQueryList to check for matches', () => {
+    expect(mediaMatcher.matchMedia('(min-width: 1px)').matches).toBeTruthy();
+    expect(mediaMatcher.matchMedia('(max-width: 1px)').matches).toBeFalsy();
+  });
+
+  it('adds css rules for provided queries when the platform is webkit, otherwise adds nothing.',
+    inject([Platform], (platform: Platform) => {
+      let randomWidth = Math.random();
+      expect(document.head.textContent).not.toContain(randomWidth);
+      mediaMatcher.matchMedia(`(width: ${randomWidth})`);
+
+      if (platform.WEBKIT) {
+        expect(document.head.textContent).toContain(randomWidth);
+      } else {
+        expect(document.head.textContent).not.toContain(randomWidth);
+      }
+  }));
+});
diff --git a/src/cdk/layout/media-matcher.ts b/src/cdk/layout/media-matcher.ts
new file mode 100644
index 000000000000..b5a2db900d19
--- /dev/null
+++ b/src/cdk/layout/media-matcher.ts
@@ -0,0 +1,77 @@
+/**
+ * @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 {Injectable} from '@angular/core';
+import {Platform} from '@angular/cdk/platform';
+
+/**
+ * Global registry for all dynamically-created, injected style tags.
+ */
+const styleElementForWebkitCompatibility: Map<string, HTMLStyleElement> = new Map();
+
+/**
+ * A utility for calling matchMedia queries.
+ */
+@Injectable()
+export class MediaMatcher {
+  /** The internal matchMedia method to return back a MediaQueryList like object. */
+  private _matchMedia: (query: string) => MediaQueryList;
+
+  constructor(private platform: Platform) {
+    this._matchMedia = this.platform.isBrowser ?
+      // matchMedia is bound to the window scope intentionally as it is an illegal invocation to
+      // call it from a different scope.
+      window.matchMedia.bind(window) :
+      noopMatchMedia;
+  }
+
+  /**
+   * Confirms the layout engine will trigger for the selector query provided and returns the
+   * MediaQueryList for the query provided.
+   */
+  matchMedia(query: string): MediaQueryList {
+    if (this.platform.WEBKIT) {
+      createEmptyStyleRule(query);
+    }
+    return this._matchMedia(query);
+  }
+}
+
+/**
+ * For Webkit engines that only trigger the MediaQueryListListener when there is at least one CSS
+ * selector for the respective media query.
+ */
+function createEmptyStyleRule(query: string) {
+  if (!styleElementForWebkitCompatibility.has(query)) {
+    try {
+      const style = document.createElement('style');
+
+      style.setAttribute('type', 'text/css');
+      if (!style.sheet) {
+        const cssText = `@media ${query} {.fx-query-test{ }}`;
+        style.appendChild(document.createTextNode(cssText));
+      }
+
+      document.getElementsByTagName('head')[0].appendChild(style);
+
+      // Store in private global registry
+      styleElementForWebkitCompatibility.set(query, style);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+
+/** No-op matchMedia replacement for non-browser platforms.  */
+function noopMatchMedia(query: string): MediaQueryList {
+  return {
+    matches: query === 'all' || query === '',
+    media: query,
+    addListener: () => {},
+    removeListener: () => {}
+  };
+}
diff --git a/src/cdk/layout/public_api.ts b/src/cdk/layout/public_api.ts
new file mode 100644
index 000000000000..43468c08fb3b
--- /dev/null
+++ b/src/cdk/layout/public_api.ts
@@ -0,0 +1,21 @@
+/**
+ * @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 {NgModule} from '@angular/core';
+import {PlatformModule} from '@angular/cdk/platform';
+import {BreakpointObserver} from './breakpoints-observer';
+import {MediaMatcher} from './media-matcher';
+
+@NgModule({
+  providers: [BreakpointObserver, MediaMatcher],
+  imports: [PlatformModule],
+})
+export class LayoutModule {}
+
+export {BreakpointObserver, BreakpointState} from './breakpoints-observer';
+export {Breakpoints} from './breakpoints';
+export {MediaMatcher} from './media-matcher';
diff --git a/src/cdk/layout/tsconfig-build.json b/src/cdk/layout/tsconfig-build.json
new file mode 100644
index 000000000000..56654d9971ff
--- /dev/null
+++ b/src/cdk/layout/tsconfig-build.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public_api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/layout",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/demo-app/demo-app-module.ts b/src/demo-app/demo-app-module.ts
index b0d3e33cf61b..185fc2cad874 100644
--- a/src/demo-app/demo-app-module.ts
+++ b/src/demo-app/demo-app-module.ts
@@ -32,4 +32,3 @@ export class DemoAppModule {
     this._appRef.bootstrap(EntryApp);
   }
 }
-
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 7409cbccef3e..f95c0a7a731f 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -67,6 +67,7 @@ export class DemoApp {
     {name: 'Progress Spinner', route: '/progress-spinner'},
     {name: 'Radio', route: '/radio'},
     {name: 'Ripple', route: '/ripple'},
+    {name: 'Screen Type', route: '/screen-type'},
     {name: 'Select', route: '/select'},
     {name: 'Sidenav', route: '/sidenav'},
     {name: 'Slide Toggle', route: '/slide-toggle'},
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index b73d8c9dd38b..ed2841168317 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -38,6 +38,8 @@ import {SnackBarDemo} from '../snack-bar/snack-bar-demo';
 import {StepperDemo} from '../stepper/stepper-demo';
 import {PeopleDatabase} from '../table/people-database';
 import {TableDemo} from '../table/table-demo';
+import {ScreenTypeDemo} from '../screen-type/screen-type-demo';
+import {LayoutModule} from '@angular/cdk/layout';
 import {TableHeaderDemo} from '../table/table-header-demo';
 import {FoggyTabContent, RainyTabContent, SunnyTabContent, TabsDemo} from '../tabs/tabs-demo';
 import {ToolbarDemo} from '../toolbar/toolbar-demo';
@@ -53,6 +55,7 @@ import {DEMO_APP_ROUTES} from './routes';
     ReactiveFormsModule,
     RouterModule.forChild(DEMO_APP_ROUTES),
     DemoMaterialModule,
+    LayoutModule,
   ],
   declarations: [
     AutocompleteDemo,
@@ -91,6 +94,7 @@ import {DEMO_APP_ROUTES} from './routes';
     RippleDemo,
     RotiniPanel,
     ScienceJoke,
+    ScreenTypeDemo,
     SelectDemo,
     SidenavDemo,
     SliderDemo,
diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts
index cebe53bdb29e..db33beea133b 100644
--- a/src/demo-app/demo-app/routes.ts
+++ b/src/demo-app/demo-app/routes.ts
@@ -27,6 +27,7 @@ import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
 import {ProgressSpinnerDemo} from '../progress-spinner/progress-spinner-demo';
 import {RadioDemo} from '../radio/radio-demo';
 import {RippleDemo} from '../ripple/ripple-demo';
+import {ScreenTypeDemo} from '../screen-type/screen-type-demo';
 import {SelectDemo} from '../select/select-demo';
 import {SidenavDemo} from '../sidenav/sidenav-demo';
 import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo';
@@ -81,6 +82,9 @@ export const DEMO_APP_ROUTES: Routes = [
     {path: 'toolbar', component: ToolbarDemo},
     {path: 'tooltip', component: TooltipDemo},
     {path: 'typography', component: TypographyDemo},
+    {path: 'expansion', component: ExpansionDemo},
+    {path: 'stepper', component: StepperDemo},
+    {path: 'screen-type', component: ScreenTypeDemo},
   ]}
 ];
 
diff --git a/src/demo-app/index.html b/src/demo-app/index.html
index b8669924fdb5..de018522783e 100644
--- a/src/demo-app/index.html
+++ b/src/demo-app/index.html
@@ -22,7 +22,7 @@
   <script src="node_modules/systemjs/dist/system.src.js"></script>
   <script src="node_modules/zone.js/dist/zone.js"></script>
   <script src="node_modules/hammerjs/hammer.min.js"></script>
-
+  
   <script>
     System.import('system-config.js').then(function () {
       System.import('main');
diff --git a/src/demo-app/screen-type/screen-type-demo.html b/src/demo-app/screen-type/screen-type-demo.html
new file mode 100644
index 000000000000..6632da3f6f91
--- /dev/null
+++ b/src/demo-app/screen-type/screen-type-demo.html
@@ -0,0 +1,29 @@
+<h2>Screen Type</h2>
+
+<md-grid-list cols="6" rowHeight="1:2">
+  <md-grid-tile [class.active]="(isHandset | async)?.matches"
+                colspan="2">
+    <md-icon>smartphone</md-icon>
+    <p>Handset</p>
+  </md-grid-tile>
+  <md-grid-tile [class.active]="(isTablet | async)?.matches"
+                colspan="2">
+    <md-icon>tablet_android</md-icon>
+    <p>Tablet</p>
+  </md-grid-tile>
+  <md-grid-tile [class.active]="(isWeb | async)?.matches"
+                colspan="2">
+    <md-icon>laptop</md-icon>
+    <p>Web</p>
+  </md-grid-tile>
+  <md-grid-tile [class.active]="(isPortrait | async)?.matches"
+                colspan="3">
+    <md-icon>stay_current_portrait</md-icon>
+    <p>Portrait</p>
+  </md-grid-tile>
+  <md-grid-tile [class.active]="(isLandscape | async)?.matches"
+                colspan="3">
+    <md-icon>stay_current_landscape</md-icon>
+    <p>Landscape</p>
+  </md-grid-tile>
+</md-grid-list>
diff --git a/src/demo-app/screen-type/screen-type-demo.scss b/src/demo-app/screen-type/screen-type-demo.scss
new file mode 100644
index 000000000000..cf80ca7910a9
--- /dev/null
+++ b/src/demo-app/screen-type/screen-type-demo.scss
@@ -0,0 +1,24 @@
+.mat-grid-list {
+  max-width: 700px;
+  margin: 0 auto;
+  min-width: 400px;
+}
+
+.mat-grid-tile {
+  outline: 1px solid lightgray;
+
+  .mat-figure {
+    flex-direction: column;
+  }
+  
+  &.active {
+    background: rgba(0, 0, 0, 0.12);
+  }
+}
+
+h2 {
+  max-width: 700px;
+  min-width: 400px;
+  text-align: center;
+  margin: 15px auto;
+}
diff --git a/src/demo-app/screen-type/screen-type-demo.ts b/src/demo-app/screen-type/screen-type-demo.ts
new file mode 100644
index 000000000000..f46cffdaa335
--- /dev/null
+++ b/src/demo-app/screen-type/screen-type-demo.ts
@@ -0,0 +1,27 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+import {BreakpointObserver, BreakpointState, Breakpoints} from '@angular/cdk/layout';
+import {Observable} from 'rxjs/Observable';
+
+@Component({
+  moduleId: module.id,
+  selector: 'screen-type',
+  templateUrl: 'screen-type-demo.html',
+  styleUrls: ['screen-type-demo.css'],
+  encapsulation: ViewEncapsulation.None,
+})
+export class ScreenTypeDemo {
+  isHandset: Observable<BreakpointState>;
+  isTablet: Observable<BreakpointState>;
+  isWeb: Observable<BreakpointState>;
+  isPortrait: Observable<BreakpointState>;
+  isLandscape: Observable<BreakpointState>;
+
+  constructor(private mqm: BreakpointObserver) {
+    this.isHandset = this.mqm.observe([Breakpoints.HandsetLandscape,
+                                       Breakpoints.HandsetPortrait]);
+    this.isTablet = this.mqm.observe(Breakpoints.Tablet);
+    this.isWeb = this.mqm.observe([Breakpoints.WebLandscape, Breakpoints.WebPortrait]);
+    this.isPortrait = this.mqm.observe('(orientation: portrait)');
+    this.isLandscape = this.mqm.observe('(orientation: landscape)');
+  }
+}
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 1e2a4aabb251..27c898b7d535 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -35,6 +35,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
     '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
+    '@angular/cdk/layout': 'dist/bundles/cdk-layout.umd.js',
     '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index e274f8d80498..4ca18643b250 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -56,10 +56,12 @@ export const rollupGlobals = {
   'rxjs/Subject': 'Rx',
   'rxjs/Subscription': 'Rx',
   'rxjs/Observer': 'Rx',
+  'rxjs/Subscriber': 'Rx',
   'rxjs/Scheduler': 'Rx',
   'rxjs/observable/combineLatest': 'Rx.Observable',
   'rxjs/observable/forkJoin': 'Rx.Observable',
   'rxjs/observable/fromEvent': 'Rx.Observable',
+  'rxjs/observable/fromEventPattern': 'Rx.Observable',
   'rxjs/observable/merge': 'Rx.Observable',
   'rxjs/observable/of': 'Rx.Observable',
   'rxjs/observable/throw': 'Rx.Observable',
@@ -83,6 +85,7 @@ export const rollupGlobals = {
   'rxjs/add/observable/fromEvent': 'Rx.Observable',
   'rxjs/add/observable/of': 'Rx.Observable',
   'rxjs/add/observable/interval': 'Rx.Observable',
+  'rxjs/add/observable/combineLatest': 'Rx.Observable',
   'rxjs/add/operator/startWith': 'Rx.Observable.prototype',
   'rxjs/add/operator/map': 'Rx.Observable.prototype',
   'rxjs/add/operator/debounceTime': 'Rx.Observable.prototype',

From f5e916d667ebd0508bb15f25b81367b7bd95a09c Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 29 Sep 2017 15:57:47 -0700
Subject: [PATCH 211/575] fix(sort): fix incorrect conditional grouping (#7427)

---
 src/lib/sort/sort-header.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index 87f497d40c23..eda8f464a566 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -146,6 +146,6 @@ export class MatSortHeader implements MatSortable {
   /** Whether this MatSortHeader is currently sorted in either ascending or descending order. */
   _isSorted() {
     return this._sort.active == this.id &&
-        this._sort.direction === 'asc' || this._sort.direction === 'desc';
+        (this._sort.direction === 'asc' || this._sort.direction === 'desc');
   }
 }

From 8b715e00bf8927d4918d0e1db301bf73f6eb8a5e Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 29 Sep 2017 16:12:13 -0700
Subject: [PATCH 212/575] chore: fix demo app build (#7428)

---
 src/demo-app/system-config.ts       |  2 +-
 src/e2e-app/system-config.ts        |  1 +
 src/lib/chips/chip-list.spec.ts     |  2 +-
 src/lib/list/selection-list.spec.ts | 10 +++++-----
 src/lib/stepper/stepper.spec.ts     |  8 ++++----
 test/karma-test-shim.js             |  1 +
 tools/dgeni/index.js                |  1 +
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 27c898b7d535..f10e687d711e 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -35,7 +35,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
     '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
-    '@angular/cdk/layout': 'dist/bundles/cdk-layout.umd.js',
+    '@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
     '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 25d051d19fa5..e59642791d16 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -32,6 +32,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
     '@angular/cdk/collections': 'dist/bundles/cdk-collections.umd.js',
     '@angular/cdk/keycodes': 'dist/bundles/cdk-keycodes.umd.js',
+    '@angular/cdk/layout': 'dist/bundles/cdk-layout.umd.js',
     '@angular/cdk/observers': 'dist/bundles/cdk-observers.umd.js',
     '@angular/cdk/overlay': 'dist/bundles/cdk-overlay.umd.js',
     '@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index ba9ca9c80a43..fd8ba8bda5c2 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -1059,5 +1059,5 @@ class SelectedChipList {
     { value: 1, viewValue: 'Pizza', selected: false },
     { value: 2, viewValue: 'Pasta', selected: true },
   ];
-  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 3fa335190d87..fe492891afa0 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -229,13 +229,13 @@ describe('MatSelectionList', () => {
   });
 
   describe('with list option selected', () => {
-    let fixture: ComponentFixture<SelectionListWithListOptions>;
+    let fixture: ComponentFixture<SelectionListWithSelecedOption>;
     let listItemEl: DebugElement;
     let selectionList: DebugElement;
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [SelectionListWithSelecedOption],
       });
 
@@ -244,13 +244,13 @@ describe('MatSelectionList', () => {
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithSelecedOption);
-      listItemEl = fixture.debugElement.query(By.directive(MdListOption));
-      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      listItemEl = fixture.debugElement.query(By.directive(MatListOption));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
     }));
 
     it('should set its initial selected state in the selectedOptions', () => {
-      let optionEl = listItemEl.injector.get(MdListOption);
+      let optionEl = listItemEl.injector.get(MatListOption);
       let selectedOptions = selectionList.componentInstance.selectedOptions;
       expect(selectedOptions.isSelected(optionEl)).toBeTruthy();
     });
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 76904b22a16a..8f07d66f4ef6 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -7,7 +7,7 @@ import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatStepperModule} from './index';
-import {MatHorizontalStepper, MatStepper, MatVerticalStepper} from './stepper';
+import {MatHorizontalStepper, MatStep, MatStepper, MatVerticalStepper} from './stepper';
 import {MatStepperNext, MatStepperPrevious} from './stepper-button';
 
 const VALID_REGEX = /valid/;
@@ -306,7 +306,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
-  expect(stepperComponent.selected instanceof MdStep).toBe(true);
+  expect(stepperComponent.selected instanceof MatStep).toBe(true);
 
   // select the second step
   let stepHeaderEl = stepHeaders[1].nativeElement;
@@ -314,7 +314,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(1);
-  expect(stepperComponent.selected instanceof MdStep).toBe(true);
+  expect(stepperComponent.selected instanceof MatStep).toBe(true);
 
   // select the third step
   stepHeaderEl = stepHeaders[2].nativeElement;
@@ -322,7 +322,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(2);
-  expect(stepperComponent.selected instanceof MdStep).toBe(true);
+  expect(stepperComponent.selected instanceof MatStep).toBe(true);
 }
 
 /** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 685ad98cefd7..2712689e5335 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -55,6 +55,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
     '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
+    '@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
     '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
diff --git a/tools/dgeni/index.js b/tools/dgeni/index.js
index a5b6d765a510..340a55cd6b2b 100644
--- a/tools/dgeni/index.js
+++ b/tools/dgeni/index.js
@@ -88,6 +88,7 @@ let apiDocsPackage = new DgeniPackage('material2-api-docs', dgeniPackageDeps)
     'cdk/coercion/index.ts',
     'cdk/collections/index.ts',
     'cdk/keycodes/index.ts',
+    'cdk/layout/index.ts',
     'cdk/overlay/index.ts',
     'cdk/platform/index.ts',
     'cdk/portal/index.ts',

From b121e32cc7d55735194dc475a4a770167d56f60b Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 29 Sep 2017 16:44:45 -0700
Subject: [PATCH 213/575] fix(tooltip): minification issue (#7430)

---
 src/lib/tooltip/tooltip.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 2fb85517b7be..22b585fb78e2 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -525,8 +525,7 @@ export class TooltipComponent {
   /** Sets the tooltip transform origin according to the position of the tooltip overlay. */
   _setTransformOrigin(overlayPosition: ConnectionPositionPair) {
     const axis = (this._position === 'above' || this._position === 'below') ? 'Y' : 'X';
-    const position = overlayPosition[`overlay${axis}`] as HorizontalConnectionPos |
-                                                          VerticalConnectionPos;
+    const position = axis == 'X' ? overlayPosition.overlayX : overlayPosition.overlayY;
 
     if (position === 'top' || position === 'bottom') {
       this._transformOrigin = position;

From 3c6f7a276e58cc52ffa3f1b43d1828db49be9ce4 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 29 Sep 2017 16:59:19 -0700
Subject: [PATCH 214/575] chore: fix CI issues (#7432)

---
 src/lib/autocomplete/autocomplete.spec.ts |  2 --
 src/lib/list/selection-list.spec.ts       | 10 +++++-----
 src/lib/menu/menu-directive.ts            |  1 -
 src/lib/select/select.spec.ts             |  6 +++---
 src/lib/sidenav/drawer.ts                 |  1 -
 src/lib/slide-toggle/slide-toggle.spec.ts |  2 +-
 src/lib/stepper/step-header.ts            |  1 -
 src/lib/tooltip/tooltip.spec.ts           | 10 ++++++----
 8 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 48d96e26a83a..aa8aafa97043 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -976,8 +976,6 @@ describe('MatAutocomplete', () => {
     }));
 
     it('should close the panel when tabbing away from a trigger without results', async(() => {
-      const trigger = fixture.componentInstance.trigger;
-
       fixture.componentInstance.states = [];
       fixture.componentInstance.filteredStates = [];
       fixture.detectChanges();
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index fe492891afa0..5c78bfda2438 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -229,21 +229,21 @@ describe('MatSelectionList', () => {
   });
 
   describe('with list option selected', () => {
-    let fixture: ComponentFixture<SelectionListWithSelecedOption>;
+    let fixture: ComponentFixture<SelectionListWithSelectedOption>;
     let listItemEl: DebugElement;
     let selectionList: DebugElement;
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [MatListModule],
-        declarations: [SelectionListWithSelecedOption],
+        declarations: [SelectionListWithSelectedOption],
       });
 
       TestBed.compileComponents();
     }));
 
     beforeEach(async(() => {
-      fixture = TestBed.createComponent(SelectionListWithSelecedOption);
+      fixture = TestBed.createComponent(SelectionListWithSelectedOption);
       listItemEl = fixture.debugElement.query(By.directive(MatListOption));
       selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
@@ -496,9 +496,9 @@ class SelectionListWithDisabledOption {
 
 @Component({template: `
   <mat-selection-list>
-    <md-list-option [selected]="true">Item</md-list-option>
+    <mat-list-option [selected]="true">Item</mat-list-option>
   </mat-selection-list>`})
-class SelectionListWithSelecedOption {
+class SelectionListWithSelectedOption {
 }
 
 @Component({template: `
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index aa14055003b7..d599e4ac58e4 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -32,7 +32,6 @@ import {
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
-import {Subject} from 'rxjs/Subject';
 import {fadeInItems, transformMenu} from './menu-animations';
 import {throwMatMenuInvalidPositionX, throwMatMenuInvalidPositionY} from './menu-errors';
 import {MatMenuItem} from './menu-item';
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 93fafbcc1d1f..56769e54ef4b 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -879,10 +879,10 @@ describe('MatSelect', () => {
       fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
       fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('md-option') as HTMLElement).click();
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
 
-      const select = fixture.debugElement.nativeElement.querySelector('md-select');
+      const select = fixture.debugElement.nativeElement.querySelector('mat-select');
 
       expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
     });
@@ -2347,7 +2347,7 @@ describe('MatSelect', () => {
     });
 
     it('should only emit one event when pressing the arrow keys on a closed select', () => {
-      const select = fixture.debugElement.query(By.css('md-select')).nativeElement;
+      const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
       dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
       expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index b17f9e03d162..175485fdb0b4 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -37,7 +37,6 @@ import {first} from 'rxjs/operator/first';
 import {startWith} from 'rxjs/operator/startWith';
 import {takeUntil} from 'rxjs/operator/takeUntil';
 import {Subject} from 'rxjs/Subject';
-import {Subscription} from 'rxjs/Subscription';
 
 
 /** Throws an exception when two MatDrawer are matching the same position. */
diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index c4234540c725..3c360b656ec4 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -894,7 +894,7 @@ class SlideToggleWithoutLabel {
 }
 
 @Component({
-  template: `<md-slide-toggle [(ngModel)]="checked" (change)="onChange()"></md-slide-toggle>`
+  template: `<mat-slide-toggle [(ngModel)]="checked" (change)="onChange()"></mat-slide-toggle>`
 })
 class SlideToggleWithModelAndChangeEvent {
   checked: boolean;
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index ccba9d7da358..90fdadcefb8d 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -9,7 +9,6 @@
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 import {Component, Input, ViewEncapsulation, ElementRef, OnDestroy, Renderer2} from '@angular/core';
-import {MATERIAL_COMPATIBILITY_MODE} from '@angular/material/core';
 import {MatStepLabel} from './step-label';
 
 
diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 95a5cb074ced..1e27a1432590 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -171,19 +171,21 @@ describe('MatTooltip', () => {
       expect(tooltipDirective._isTooltipVisible()).toBe(false);
     }));
 
-    it('should not show if hide is called before delay finishes', fakeAsync(() => {
+    it('should not show if hide is called before delay finishes', async(() => {
       expect(tooltipDirective._tooltipInstance).toBeUndefined();
 
       const tooltipDelay = 1000;
+
       tooltipDirective.show(tooltipDelay);
       expect(tooltipDirective._isTooltipVisible()).toBe(false);
 
       fixture.detectChanges();
       expect(overlayContainerElement.textContent).toContain('');
-
       tooltipDirective.hide();
-      tick(tooltipDelay);
-      expect(tooltipDirective._isTooltipVisible()).toBe(false);
+
+      fixture.whenStable().then(() => {
+        expect(tooltipDirective._isTooltipVisible()).toBe(false);
+      });
     }));
 
     it('should not show tooltip if message is not present or empty', () => {

From 01622b1c005c1ebbf720247cea1ef0ea0907137d Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Sat, 30 Sep 2017 08:09:10 -0700
Subject: [PATCH 215/575] fix(input): apply readonly attribute when readonly
 (#7439)

* fix(input): apply readonly attribute when readonly

Fixes issue where the readonly attribute was no longer applied because it was made to be an `@Input`

* Update input.ts
---
 src/lib/input/input.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index c1681a97c2bf..1e04098fa997 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -59,6 +59,7 @@ let nextUniqueId = 0;
     '[placeholder]': 'placeholder',
     '[disabled]': 'disabled',
     '[required]': 'required',
+    '[readonly]': 'readonly',
     '[attr.aria-describedby]': '_ariaDescribedby || null',
     '[attr.aria-invalid]': 'errorState',
     '(blur)': '_focusChanged(false)',

From 6b41a51793c5a79f4742ccbf5339715a31a8abec Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 2 Oct 2017 10:59:45 -0700
Subject: [PATCH 216/575] chore: update plunker link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8621baa8075..a392708130d2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This is the home for the Angular team's Material Design components built for and
 [Documentation, demos, and guides][aio] |
 [Google group](https://groups.google.com/forum/#!forum/angular-material2) |
 [Contributing](https://github.com/angular/material2/blob/master/CONTRIBUTING.md) |
-[Plunker Template](http://plnkr.co/edit/o077B6uEiiIgkC0S06dd?p=preview) |
+[Plunker Template](http://plnkr.co/edit/LSgU9X5sYVhx4bc3LBWm?p=preview) |
 [StackBlitz Template](https://stackblitz.com/edit/angular-material2-issue?file=app%2Fapp.component.ts)
 
 ### Getting started

From bd5d9dce0eb1fe37b388ddaae877232ad25be9a2 Mon Sep 17 00:00:00 2001
From: Mitt <mittcoats@gmail.com>
Date: Mon, 2 Oct 2017 16:10:25 -0400
Subject: [PATCH 217/575] docs(themes): fix typos to improve readability
 (#7425)

---
 guides/theming-your-components.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guides/theming-your-components.md b/guides/theming-your-components.md
index 420a03790250..e1ac8a08751b 100644
--- a/guides/theming-your-components.md
+++ b/guides/theming-your-components.md
@@ -4,11 +4,11 @@ In order to style your own components with Angular Material's tooling, the compo
 ### Using `@mixin` to automatically apply a theme
 
 #### Why using `@mixin`
-The advantage of using a `@mixin` function is that when you change your theme, every file that uses it will be updated automatically.
-Calling it with a different theme argument allow multiple themes within the app or component.
+The advantage of using a `@mixin` function is that when you change your theme, every file that uses it will be automatically updated.
+Calling the `@mixin` with a different theme argument allows multiple themes within the app or component.
 
 #### How to use `@mixin`
-We can better theming our custom components adding a `@mixin` function to its theme file and then calling this function to apply a theme.
+We can better theme our custom components by adding a `@mixin` function to its theme file, and then call this function to apply a theme.
 
 All you need is to create a `@mixin` function in the custom-component-theme.scss
 

From 6ab275cbd0cb21b21b2cf80a8d8803047775fabb Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Mon, 2 Oct 2017 19:02:51 -0400
Subject: [PATCH 218/575] docs(layout): fix media matcher code snippet (#7475)

---
 src/cdk/layout/media-matcher.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cdk/layout/media-matcher.md b/src/cdk/layout/media-matcher.md
index 259ad241a7c7..6e071b5bd226 100644
--- a/src/cdk/layout/media-matcher.md
+++ b/src/cdk/layout/media-matcher.md
@@ -9,7 +9,7 @@ matchMedia method, if available on the platform.
 export class MyWidget {  
   constructor(mm: MediaMatcher) {
     mm.matchMedia('(orientation: landscape)').matches ? 
-      this.setPortraitMode() :
+      this.setLandscapeMode() :
       this.setPortraitMode();
   }
 }  

From f3b0b54ee6ba84826ad79e25cc0336290c5e97d4 Mon Sep 17 00:00:00 2001
From: Kara <kara@users.noreply.github.com>
Date: Mon, 2 Oct 2017 17:13:20 -0700
Subject: [PATCH 219/575] build(): fix source maps (#7403)

---
 .../a11y/{public_api.ts => a11y-module.ts}    | 10 -----
 src/cdk/a11y/index.ts                         |  2 +-
 src/cdk/a11y/public-api.ts                    | 18 ++++++++
 src/cdk/a11y/tsconfig-build.json              |  2 +-
 src/cdk/a11y/tsconfig-es5.json                | 13 ++++++
 .../bidi/{public_api.ts => bidi-module.ts}    |  8 ----
 src/cdk/bidi/index.ts                         |  2 +-
 src/cdk/bidi/public-api.ts                    | 18 ++++++++
 src/cdk/bidi/tsconfig-build.json              |  2 +-
 src/cdk/bidi/tsconfig-es5.json                | 13 ++++++
 src/cdk/coercion/index.ts                     |  2 +-
 .../coercion/{public_api.ts => public-api.ts} |  0
 src/cdk/coercion/tsconfig-build.json          |  2 +-
 src/cdk/coercion/tsconfig-es5.json            | 13 ++++++
 src/cdk/collections/index.ts                  |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/cdk/collections/tsconfig-build.json       |  2 +-
 src/cdk/collections/tsconfig-es5.json         | 13 ++++++
 src/cdk/index.ts                              |  2 +-
 src/cdk/keycodes/index.ts                     |  2 +-
 .../keycodes/{public_api.ts => public-api.ts} |  0
 src/cdk/keycodes/tsconfig-build.json          |  2 +-
 src/cdk/keycodes/tsconfig-es5.json            | 13 ++++++
 src/cdk/layout/index.ts                       |  2 +-
 .../layout/{public_api.ts => public-api.ts}   |  0
 src/cdk/layout/tsconfig-build.json            |  2 +-
 src/cdk/layout/tsconfig-es5.json              | 13 ++++++
 src/cdk/observers/index.ts                    |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/cdk/observers/tsconfig-build.json         |  2 +-
 src/cdk/observers/tsconfig-es5.json           | 13 ++++++
 src/cdk/overlay/index.ts                      |  2 +-
 .../{public_api.ts => overlay-module.ts}      | 21 +---------
 src/cdk/overlay/public-api.ts                 | 26 ++++++++++++
 src/cdk/overlay/tsconfig-build.json           |  2 +-
 src/cdk/overlay/tsconfig-es5.json             | 13 ++++++
 src/cdk/platform/index.ts                     |  2 +-
 .../{public_api.ts => platform-module.ts}     |  4 --
 src/cdk/platform/public-api.ts                | 11 +++++
 src/cdk/platform/tsconfig-build.json          |  2 +-
 src/cdk/platform/tsconfig-es5.json            | 13 ++++++
 src/cdk/portal/index.ts                       |  2 +-
 .../portal/{public_api.ts => public-api.ts}   |  0
 src/cdk/portal/tsconfig-build.json            |  2 +-
 src/cdk/portal/tsconfig-es5.json              | 13 ++++++
 src/cdk/{public_api.ts => public-api.ts}      |  0
 src/cdk/rxjs/index.ts                         |  2 +-
 src/cdk/rxjs/{public_api.ts => public-api.ts} |  0
 src/cdk/rxjs/tsconfig-build.json              |  2 +-
 src/cdk/rxjs/tsconfig-es5.json                | 13 ++++++
 src/cdk/scrolling/index.ts                    |  2 +-
 src/cdk/scrolling/public-api.ts               | 12 ++++++
 src/cdk/scrolling/scroll-dispatcher.spec.ts   |  2 +-
 .../{public_api.ts => scrolling-module.ts}    |  4 --
 src/cdk/scrolling/tsconfig-build.json         |  2 +-
 src/cdk/scrolling/tsconfig-es5.json           | 13 ++++++
 src/cdk/scrolling/viewport-ruler.spec.ts      |  2 +-
 src/cdk/stepper/index.ts                      |  2 +-
 src/cdk/stepper/public-api.ts                 | 12 ++++++
 .../{public_api.ts => stepper-module.ts}      |  4 --
 src/cdk/stepper/tsconfig-build.json           |  2 +-
 src/cdk/stepper/tsconfig-es5.json             | 14 +++++++
 src/cdk/table/index.ts                        |  2 +-
 src/cdk/table/public-api.ts                   | 15 +++++++
 .../table/{public_api.ts => table-module.ts}  |  7 ----
 src/cdk/table/tsconfig-build.json             |  2 +-
 src/cdk/table/tsconfig-es5.json               | 14 +++++++
 src/cdk/testing/index.ts                      |  2 +-
 .../testing/{public_api.ts => public-api.ts}  |  0
 src/cdk/tsconfig-build.json                   |  7 ++--
 src/cdk/tsconfig-es5.json                     | 38 +++++++++++++++++
 src/demo-app/system-config.ts                 |  2 +-
 src/demo-app/tsconfig-build.json              |  2 +-
 src/demo-app/tsconfig.json                    |  2 +-
 src/e2e-app/tsconfig.json                     |  4 +-
 src/lib/autocomplete/index.ts                 |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/autocomplete/tsconfig-build.json      |  2 +-
 src/lib/autocomplete/tsconfig-es5.json        | 14 +++++++
 src/lib/button-toggle/index.ts                |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/button-toggle/tsconfig-build.json     |  2 +-
 src/lib/button-toggle/tsconfig-es5.json       | 14 +++++++
 src/lib/button/index.ts                       |  2 +-
 .../button/{public_api.ts => public-api.ts}   |  0
 src/lib/button/tsconfig-build.json            |  2 +-
 src/lib/button/tsconfig-es5.json              | 14 +++++++
 src/lib/card/index.ts                         |  2 +-
 src/lib/card/{public_api.ts => public-api.ts} |  0
 src/lib/card/tsconfig-build.json              |  2 +-
 src/lib/card/tsconfig-es5.json                | 14 +++++++
 src/lib/checkbox/index.ts                     |  2 +-
 .../checkbox/{public_api.ts => public-api.ts} |  0
 src/lib/checkbox/tsconfig-build.json          |  2 +-
 src/lib/checkbox/tsconfig-es5.json            | 14 +++++++
 src/lib/chips/index.ts                        |  2 +-
 .../chips/{public_api.ts => public-api.ts}    |  0
 src/lib/chips/tsconfig-build.json             |  2 +-
 src/lib/chips/tsconfig-es5.json               | 14 +++++++
 src/lib/core/index.ts                         |  2 +-
 src/lib/core/{public_api.ts => public-api.ts} |  0
 src/lib/core/tsconfig-build.json              |  2 +-
 src/lib/core/tsconfig-es5.json                | 14 +++++++
 src/lib/datepicker/index.ts                   |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/datepicker/tsconfig-build.json        |  2 +-
 src/lib/datepicker/tsconfig-es5.json          | 14 +++++++
 src/lib/dialog/index.ts                       |  2 +-
 .../dialog/{public_api.ts => public-api.ts}   |  0
 src/lib/dialog/tsconfig-build.json            |  2 +-
 src/lib/dialog/tsconfig-es5.json              | 14 +++++++
 src/lib/expansion/index.ts                    |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/expansion/tsconfig-build.json         |  2 +-
 src/lib/expansion/tsconfig-es5.json           | 14 +++++++
 src/lib/form-field/index.ts                   |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/form-field/tsconfig-build.json        |  2 +-
 src/lib/form-field/tsconfig-es5.json          | 14 +++++++
 src/lib/grid-list/index.ts                    |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/grid-list/tsconfig-build.json         |  2 +-
 src/lib/grid-list/tsconfig-es5.json           | 14 +++++++
 src/lib/icon/index.ts                         |  2 +-
 src/lib/icon/{public_api.ts => public-api.ts} |  0
 src/lib/icon/tsconfig-build.json              |  2 +-
 src/lib/icon/tsconfig-es5.json                | 14 +++++++
 src/lib/input/index.ts                        |  2 +-
 .../input/{public_api.ts => public-api.ts}    |  0
 src/lib/input/tsconfig-build.json             |  2 +-
 src/lib/input/tsconfig-es5.json               | 14 +++++++
 src/lib/list/index.ts                         |  2 +-
 src/lib/list/{public_api.ts => public-api.ts} |  0
 src/lib/list/tsconfig-build.json              |  2 +-
 src/lib/list/tsconfig-es5.json                | 14 +++++++
 src/lib/menu/index.ts                         |  2 +-
 src/lib/menu/{public_api.ts => public-api.ts} |  0
 src/lib/menu/tsconfig-build.json              |  2 +-
 src/lib/menu/tsconfig-es5.json                | 14 +++++++
 src/lib/paginator/index.ts                    |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/paginator/tsconfig-build.json         |  2 +-
 src/lib/paginator/tsconfig-es5.json           | 14 +++++++
 src/lib/progress-bar/index.ts                 |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/progress-bar/tsconfig-build.json      |  2 +-
 src/lib/progress-bar/tsconfig-es5.json        | 14 +++++++
 src/lib/progress-spinner/index.ts             |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/progress-spinner/tsconfig-build.json  |  2 +-
 src/lib/progress-spinner/tsconfig-es5.json    | 14 +++++++
 src/lib/{public_api.ts => public-api.ts}      |  0
 src/lib/radio/index.ts                        |  2 +-
 .../radio/{public_api.ts => public-api.ts}    |  0
 src/lib/radio/tsconfig-build.json             |  2 +-
 src/lib/radio/tsconfig-es5.json               | 14 +++++++
 src/lib/select/index.ts                       |  2 +-
 .../select/{public_api.ts => public-api.ts}   |  0
 src/lib/select/tsconfig-build.json            |  2 +-
 src/lib/select/tsconfig-es5.json              | 14 +++++++
 src/lib/sidenav/index.ts                      |  2 +-
 .../sidenav/{public_api.ts => public-api.ts}  |  0
 src/lib/sidenav/tsconfig-build.json           |  2 +-
 src/lib/sidenav/tsconfig-es5.json             | 14 +++++++
 src/lib/slide-toggle/index.ts                 |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/slide-toggle/tsconfig-build.json      |  2 +-
 src/lib/slide-toggle/tsconfig-es5.json        | 14 +++++++
 src/lib/slider/index.ts                       |  2 +-
 .../slider/{public_api.ts => public-api.ts}   |  0
 src/lib/slider/tsconfig-build.json            |  2 +-
 src/lib/slider/tsconfig-es5.json              | 14 +++++++
 src/lib/snack-bar/index.ts                    |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/lib/snack-bar/tsconfig-build.json         |  2 +-
 src/lib/snack-bar/tsconfig-es5.json           | 14 +++++++
 src/lib/sort/index.ts                         |  2 +-
 src/lib/sort/{public_api.ts => public-api.ts} |  0
 src/lib/sort/tsconfig-build.json              |  2 +-
 src/lib/sort/tsconfig-es5.json                | 14 +++++++
 src/lib/stepper/index.ts                      |  2 +-
 .../stepper/{public_api.ts => public-api.ts}  |  0
 src/lib/stepper/tsconfig-build.json           |  2 +-
 src/lib/stepper/tsconfig-es5.json             | 14 +++++++
 src/lib/table/index.ts                        |  2 +-
 .../table/{public_api.ts => public-api.ts}    |  0
 src/lib/table/tsconfig-build.json             |  2 +-
 src/lib/table/tsconfig-es5.json               | 14 +++++++
 src/lib/tabs/index.ts                         |  2 +-
 src/lib/tabs/{public_api.ts => public-api.ts} |  0
 src/lib/tabs/tsconfig-build.json              |  2 +-
 src/lib/tabs/tsconfig-es5.json                | 14 +++++++
 src/lib/toolbar/index.ts                      |  2 +-
 .../toolbar/{public_api.ts => public-api.ts}  |  0
 src/lib/toolbar/tsconfig-build.json           |  2 +-
 src/lib/toolbar/tsconfig-es5.json             | 14 +++++++
 src/lib/tooltip/index.ts                      |  2 +-
 .../tooltip/{public_api.ts => public-api.ts}  |  0
 src/lib/tooltip/tsconfig-build.json           |  2 +-
 src/lib/tooltip/tsconfig-es5.json             | 14 +++++++
 src/lib/tsconfig-build.json                   |  9 ++--
 src/lib/tsconfig-es5.json                     | 39 ++++++++++++++++++
 src/lib/tsconfig-tests.json                   |  2 +-
 src/material-examples/index.ts                |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 src/material-examples/tsconfig-build.json     |  8 ++--
 src/material-examples/tsconfig-es5.json       | 38 +++++++++++++++++
 src/material-examples/tsconfig.json           |  2 +-
 src/material-moment-adapter/index.ts          |  2 +-
 .../{public_api.ts => public-api.ts}          |  0
 .../tsconfig-build.json                       | 11 +++--
 src/material-moment-adapter/tsconfig-es5.json | 41 +++++++++++++++++++
 src/material-moment-adapter/tsconfig.json     |  2 +-
 test/karma-test-shim.js                       |  2 +-
 tools/package-tools/build-bundles.ts          | 32 +++++++--------
 tools/package-tools/build-notes.md            | 20 +++++++++
 tools/package-tools/build-package.ts          | 22 ++++++++--
 tools/package-tools/compile-entry-point.ts    | 21 ++++++----
 tools/package-tools/gulp/build-tasks-gulp.ts  | 13 +++++-
 219 files changed, 1085 insertions(+), 212 deletions(-)
 rename src/cdk/a11y/{public_api.ts => a11y-module.ts} (77%)
 create mode 100644 src/cdk/a11y/public-api.ts
 create mode 100644 src/cdk/a11y/tsconfig-es5.json
 rename src/cdk/bidi/{public_api.ts => bidi-module.ts} (76%)
 create mode 100644 src/cdk/bidi/public-api.ts
 create mode 100644 src/cdk/bidi/tsconfig-es5.json
 rename src/cdk/coercion/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/coercion/tsconfig-es5.json
 rename src/cdk/collections/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/collections/tsconfig-es5.json
 rename src/cdk/keycodes/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/keycodes/tsconfig-es5.json
 rename src/cdk/layout/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/layout/tsconfig-es5.json
 rename src/cdk/observers/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/observers/tsconfig-es5.json
 rename src/cdk/overlay/{public_api.ts => overlay-module.ts} (59%)
 create mode 100644 src/cdk/overlay/public-api.ts
 create mode 100644 src/cdk/overlay/tsconfig-es5.json
 rename src/cdk/platform/{public_api.ts => platform-module.ts} (85%)
 create mode 100644 src/cdk/platform/public-api.ts
 create mode 100644 src/cdk/platform/tsconfig-es5.json
 rename src/cdk/portal/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/portal/tsconfig-es5.json
 rename src/cdk/{public_api.ts => public-api.ts} (100%)
 rename src/cdk/rxjs/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/rxjs/tsconfig-es5.json
 create mode 100644 src/cdk/scrolling/public-api.ts
 rename src/cdk/scrolling/{public_api.ts => scrolling-module.ts} (85%)
 create mode 100644 src/cdk/scrolling/tsconfig-es5.json
 create mode 100644 src/cdk/stepper/public-api.ts
 rename src/cdk/stepper/{public_api.ts => stepper-module.ts} (89%)
 create mode 100644 src/cdk/stepper/tsconfig-es5.json
 create mode 100644 src/cdk/table/public-api.ts
 rename src/cdk/table/{public_api.ts => table-module.ts} (81%)
 create mode 100644 src/cdk/table/tsconfig-es5.json
 rename src/cdk/testing/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/cdk/tsconfig-es5.json
 rename src/lib/autocomplete/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/autocomplete/tsconfig-es5.json
 rename src/lib/button-toggle/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/button-toggle/tsconfig-es5.json
 rename src/lib/button/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/button/tsconfig-es5.json
 rename src/lib/card/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/card/tsconfig-es5.json
 rename src/lib/checkbox/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/checkbox/tsconfig-es5.json
 rename src/lib/chips/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/chips/tsconfig-es5.json
 rename src/lib/core/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/core/tsconfig-es5.json
 rename src/lib/datepicker/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/datepicker/tsconfig-es5.json
 rename src/lib/dialog/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/dialog/tsconfig-es5.json
 rename src/lib/expansion/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/expansion/tsconfig-es5.json
 rename src/lib/form-field/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/form-field/tsconfig-es5.json
 rename src/lib/grid-list/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/grid-list/tsconfig-es5.json
 rename src/lib/icon/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/icon/tsconfig-es5.json
 rename src/lib/input/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/input/tsconfig-es5.json
 rename src/lib/list/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/list/tsconfig-es5.json
 rename src/lib/menu/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/menu/tsconfig-es5.json
 rename src/lib/paginator/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/paginator/tsconfig-es5.json
 rename src/lib/progress-bar/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/progress-bar/tsconfig-es5.json
 rename src/lib/progress-spinner/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/progress-spinner/tsconfig-es5.json
 rename src/lib/{public_api.ts => public-api.ts} (100%)
 rename src/lib/radio/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/radio/tsconfig-es5.json
 rename src/lib/select/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/select/tsconfig-es5.json
 rename src/lib/sidenav/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/sidenav/tsconfig-es5.json
 rename src/lib/slide-toggle/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/slide-toggle/tsconfig-es5.json
 rename src/lib/slider/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/slider/tsconfig-es5.json
 rename src/lib/snack-bar/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/snack-bar/tsconfig-es5.json
 rename src/lib/sort/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/sort/tsconfig-es5.json
 rename src/lib/stepper/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/stepper/tsconfig-es5.json
 rename src/lib/table/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/table/tsconfig-es5.json
 rename src/lib/tabs/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/tabs/tsconfig-es5.json
 rename src/lib/toolbar/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/toolbar/tsconfig-es5.json
 rename src/lib/tooltip/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/lib/tooltip/tsconfig-es5.json
 create mode 100644 src/lib/tsconfig-es5.json
 rename src/material-examples/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/material-examples/tsconfig-es5.json
 rename src/material-moment-adapter/{public_api.ts => public-api.ts} (100%)
 create mode 100644 src/material-moment-adapter/tsconfig-es5.json
 create mode 100644 tools/package-tools/build-notes.md

diff --git a/src/cdk/a11y/public_api.ts b/src/cdk/a11y/a11y-module.ts
similarity index 77%
rename from src/cdk/a11y/public_api.ts
rename to src/cdk/a11y/a11y-module.ts
index ddd32c71097d..3535993dab87 100644
--- a/src/cdk/a11y/public_api.ts
+++ b/src/cdk/a11y/a11y-module.ts
@@ -29,13 +29,3 @@ import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor';
   ]
 })
 export class A11yModule {}
-
-export * from './activedescendant-key-manager';
-export * from './aria-describer';
-export * from './fake-mousedown';
-export * from './focus-key-manager';
-export * from './focus-trap';
-export * from './interactivity-checker';
-export * from './list-key-manager';
-export * from './live-announcer';
-export * from './focus-monitor';
diff --git a/src/cdk/a11y/index.ts b/src/cdk/a11y/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/a11y/index.ts
+++ b/src/cdk/a11y/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/a11y/public-api.ts b/src/cdk/a11y/public-api.ts
new file mode 100644
index 000000000000..2a84193417e9
--- /dev/null
+++ b/src/cdk/a11y/public-api.ts
@@ -0,0 +1,18 @@
+/**
+ * @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
+ */
+
+export * from './activedescendant-key-manager';
+export * from './aria-describer';
+export * from './fake-mousedown';
+export * from './focus-key-manager';
+export * from './focus-trap';
+export * from './interactivity-checker';
+export * from './list-key-manager';
+export * from './live-announcer';
+export * from './focus-monitor';
+export * from './a11y-module';
diff --git a/src/cdk/a11y/tsconfig-build.json b/src/cdk/a11y/tsconfig-build.json
index ed655bf2a095..3abe5d1758bb 100644
--- a/src/cdk/a11y/tsconfig-build.json
+++ b/src/cdk/a11y/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/a11y/tsconfig-es5.json b/src/cdk/a11y/tsconfig-es5.json
new file mode 100644
index 000000000000..9f859ef5e0e5
--- /dev/null
+++ b/src/cdk/a11y/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/a11y",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/bidi/public_api.ts b/src/cdk/bidi/bidi-module.ts
similarity index 76%
rename from src/cdk/bidi/public_api.ts
rename to src/cdk/bidi/bidi-module.ts
index d42a66e628a8..a411fcf673fe 100644
--- a/src/cdk/bidi/public_api.ts
+++ b/src/cdk/bidi/bidi-module.ts
@@ -11,14 +11,6 @@ import {DOCUMENT} from '@angular/platform-browser';
 import {Dir} from './dir';
 import {DIR_DOCUMENT, Directionality} from './directionality';
 
-export {
-  Directionality,
-  DIRECTIONALITY_PROVIDER_FACTORY,
-  DIRECTIONALITY_PROVIDER,
-  DIR_DOCUMENT,
-  Direction,
-} from './directionality';
-export {Dir} from './dir';
 
 @NgModule({
   exports: [Dir],
diff --git a/src/cdk/bidi/index.ts b/src/cdk/bidi/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/bidi/index.ts
+++ b/src/cdk/bidi/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/bidi/public-api.ts b/src/cdk/bidi/public-api.ts
new file mode 100644
index 000000000000..8f594855d6db
--- /dev/null
+++ b/src/cdk/bidi/public-api.ts
@@ -0,0 +1,18 @@
+/**
+ * @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
+ */
+
+export {
+  Directionality,
+  DIRECTIONALITY_PROVIDER_FACTORY,
+  DIRECTIONALITY_PROVIDER,
+  DIR_DOCUMENT,
+  Direction,
+} from './directionality';
+export {Dir} from './dir';
+export * from './bidi-module';
+
diff --git a/src/cdk/bidi/tsconfig-build.json b/src/cdk/bidi/tsconfig-build.json
index e21cf03bc8ad..660f94acd255 100644
--- a/src/cdk/bidi/tsconfig-build.json
+++ b/src/cdk/bidi/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/bidi/tsconfig-es5.json b/src/cdk/bidi/tsconfig-es5.json
new file mode 100644
index 000000000000..1d5216f97ef5
--- /dev/null
+++ b/src/cdk/bidi/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/bidi",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/coercion/index.ts b/src/cdk/coercion/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/coercion/index.ts
+++ b/src/cdk/coercion/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/coercion/public_api.ts b/src/cdk/coercion/public-api.ts
similarity index 100%
rename from src/cdk/coercion/public_api.ts
rename to src/cdk/coercion/public-api.ts
diff --git a/src/cdk/coercion/tsconfig-build.json b/src/cdk/coercion/tsconfig-build.json
index 6c423b857928..5c72df273dbd 100644
--- a/src/cdk/coercion/tsconfig-build.json
+++ b/src/cdk/coercion/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/coercion/tsconfig-es5.json b/src/cdk/coercion/tsconfig-es5.json
new file mode 100644
index 000000000000..43c178eabddb
--- /dev/null
+++ b/src/cdk/coercion/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/coercion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/collections/index.ts b/src/cdk/collections/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/collections/index.ts
+++ b/src/cdk/collections/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/collections/public_api.ts b/src/cdk/collections/public-api.ts
similarity index 100%
rename from src/cdk/collections/public_api.ts
rename to src/cdk/collections/public-api.ts
diff --git a/src/cdk/collections/tsconfig-build.json b/src/cdk/collections/tsconfig-build.json
index 7f637f1343af..0a7c5dd6bb32 100644
--- a/src/cdk/collections/tsconfig-build.json
+++ b/src/cdk/collections/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/collections/tsconfig-es5.json b/src/cdk/collections/tsconfig-es5.json
new file mode 100644
index 000000000000..09d592aacabc
--- /dev/null
+++ b/src/cdk/collections/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/collections",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/index.ts b/src/cdk/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/index.ts
+++ b/src/cdk/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/keycodes/index.ts b/src/cdk/keycodes/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/keycodes/index.ts
+++ b/src/cdk/keycodes/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/keycodes/public_api.ts b/src/cdk/keycodes/public-api.ts
similarity index 100%
rename from src/cdk/keycodes/public_api.ts
rename to src/cdk/keycodes/public-api.ts
diff --git a/src/cdk/keycodes/tsconfig-build.json b/src/cdk/keycodes/tsconfig-build.json
index 14ba0c50bf55..487789fef280 100644
--- a/src/cdk/keycodes/tsconfig-build.json
+++ b/src/cdk/keycodes/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/keycodes/tsconfig-es5.json b/src/cdk/keycodes/tsconfig-es5.json
new file mode 100644
index 000000000000..f923de0e6448
--- /dev/null
+++ b/src/cdk/keycodes/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/keycodes",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/layout/index.ts b/src/cdk/layout/index.ts
index 5a6b2bc7c6de..289a64186096 100644
--- a/src/cdk/layout/index.ts
+++ b/src/cdk/layout/index.ts
@@ -5,4 +5,4 @@
  * 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
  */
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/layout/public_api.ts b/src/cdk/layout/public-api.ts
similarity index 100%
rename from src/cdk/layout/public_api.ts
rename to src/cdk/layout/public-api.ts
diff --git a/src/cdk/layout/tsconfig-build.json b/src/cdk/layout/tsconfig-build.json
index 56654d9971ff..83c719f82566 100644
--- a/src/cdk/layout/tsconfig-build.json
+++ b/src/cdk/layout/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/layout/tsconfig-es5.json b/src/cdk/layout/tsconfig-es5.json
new file mode 100644
index 000000000000..646c9c20d1b7
--- /dev/null
+++ b/src/cdk/layout/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/layout",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/observers/index.ts b/src/cdk/observers/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/observers/index.ts
+++ b/src/cdk/observers/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/observers/public_api.ts b/src/cdk/observers/public-api.ts
similarity index 100%
rename from src/cdk/observers/public_api.ts
rename to src/cdk/observers/public-api.ts
diff --git a/src/cdk/observers/tsconfig-build.json b/src/cdk/observers/tsconfig-build.json
index ba4de8f00ad6..4f4d795d4f4e 100644
--- a/src/cdk/observers/tsconfig-build.json
+++ b/src/cdk/observers/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/observers/tsconfig-es5.json b/src/cdk/observers/tsconfig-es5.json
new file mode 100644
index 000000000000..3006179c63d4
--- /dev/null
+++ b/src/cdk/observers/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/observers",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/overlay/index.ts b/src/cdk/overlay/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/overlay/index.ts
+++ b/src/cdk/overlay/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/overlay/public_api.ts b/src/cdk/overlay/overlay-module.ts
similarity index 59%
rename from src/cdk/overlay/public_api.ts
rename to src/cdk/overlay/overlay-module.ts
index ec4c15d534bf..fc8f814e10d2 100644
--- a/src/cdk/overlay/public_api.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -5,6 +5,7 @@
  * 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 {NgModule, Provider} from '@angular/core';
 import {PortalModule} from '@angular/cdk/portal';
 import {Overlay} from './overlay';
@@ -18,7 +19,6 @@ import {OverlayPositionBuilder} from './position/overlay-position-builder';
 import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
 import {ScrollStrategyOptions} from './scroll/scroll-strategy-options';
 
-
 export const OVERLAY_PROVIDERS: Provider[] = [
   Overlay,
   OverlayPositionBuilder,
@@ -34,22 +34,3 @@ export const OVERLAY_PROVIDERS: Provider[] = [
   providers: [OVERLAY_PROVIDERS, ScrollStrategyOptions],
 })
 export class OverlayModule {}
-
-
-export * from './overlay-config';
-export {Overlay} from './overlay';
-export {OverlayContainer} from './overlay-container';
-export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
-export {OverlayRef} from './overlay-ref';
-export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
-export {ViewportRuler} from '@angular/cdk/scrolling';
-export {ComponentType} from '@angular/cdk/portal';
-
-export * from './position/connected-position';
-export * from './scroll/index';
-
-// Export pre-defined position strategies and interface to build custom ones.
-export {PositionStrategy} from './position/position-strategy';
-export {GlobalPositionStrategy} from './position/global-position-strategy';
-export {ConnectedPositionStrategy} from './position/connected-position-strategy';
-export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
diff --git a/src/cdk/overlay/public-api.ts b/src/cdk/overlay/public-api.ts
new file mode 100644
index 000000000000..c00527e42bfa
--- /dev/null
+++ b/src/cdk/overlay/public-api.ts
@@ -0,0 +1,26 @@
+/**
+ * @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
+ */
+
+export * from './overlay-config';
+export {Overlay} from './overlay';
+export {OverlayContainer} from './overlay-container';
+export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
+export {OverlayRef} from './overlay-ref';
+export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
+export {ViewportRuler} from '@angular/cdk/scrolling';
+export {ComponentType} from '@angular/cdk/portal';
+
+export * from './position/connected-position';
+export * from './scroll/index';
+export * from './overlay-module';
+
+// Export pre-defined position strategies and interface to build custom ones.
+export {PositionStrategy} from './position/position-strategy';
+export {GlobalPositionStrategy} from './position/global-position-strategy';
+export {ConnectedPositionStrategy} from './position/connected-position-strategy';
+export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
diff --git a/src/cdk/overlay/tsconfig-build.json b/src/cdk/overlay/tsconfig-build.json
index 8b6df58dda2a..254e6404a551 100644
--- a/src/cdk/overlay/tsconfig-build.json
+++ b/src/cdk/overlay/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/overlay/tsconfig-es5.json b/src/cdk/overlay/tsconfig-es5.json
new file mode 100644
index 000000000000..3ea6fd8f9d03
--- /dev/null
+++ b/src/cdk/overlay/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/overlay",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/platform/index.ts b/src/cdk/platform/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/platform/index.ts
+++ b/src/cdk/platform/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/platform/public_api.ts b/src/cdk/platform/platform-module.ts
similarity index 85%
rename from src/cdk/platform/public_api.ts
rename to src/cdk/platform/platform-module.ts
index ea7a9a4b4cf4..f22d00f6c0d8 100644
--- a/src/cdk/platform/public_api.ts
+++ b/src/cdk/platform/platform-module.ts
@@ -14,7 +14,3 @@ import {Platform} from './platform';
   providers: [Platform]
 })
 export class PlatformModule {}
-
-
-export * from './platform';
-export * from './features';
diff --git a/src/cdk/platform/public-api.ts b/src/cdk/platform/public-api.ts
new file mode 100644
index 000000000000..8d7a3bb4b669
--- /dev/null
+++ b/src/cdk/platform/public-api.ts
@@ -0,0 +1,11 @@
+/**
+ * @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
+ */
+
+export * from './platform';
+export * from './features';
+export * from './platform-module';
diff --git a/src/cdk/platform/tsconfig-build.json b/src/cdk/platform/tsconfig-build.json
index b5b3db511172..2da6b605cd5a 100644
--- a/src/cdk/platform/tsconfig-build.json
+++ b/src/cdk/platform/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/platform/tsconfig-es5.json b/src/cdk/platform/tsconfig-es5.json
new file mode 100644
index 000000000000..d51201683c7e
--- /dev/null
+++ b/src/cdk/platform/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/platform",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/portal/index.ts b/src/cdk/portal/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/portal/index.ts
+++ b/src/cdk/portal/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/portal/public_api.ts b/src/cdk/portal/public-api.ts
similarity index 100%
rename from src/cdk/portal/public_api.ts
rename to src/cdk/portal/public-api.ts
diff --git a/src/cdk/portal/tsconfig-build.json b/src/cdk/portal/tsconfig-build.json
index c22ae5810fa8..fd3241f76e01 100644
--- a/src/cdk/portal/tsconfig-build.json
+++ b/src/cdk/portal/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/portal/tsconfig-es5.json b/src/cdk/portal/tsconfig-es5.json
new file mode 100644
index 000000000000..021b7e9a7a21
--- /dev/null
+++ b/src/cdk/portal/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/portal",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/public_api.ts b/src/cdk/public-api.ts
similarity index 100%
rename from src/cdk/public_api.ts
rename to src/cdk/public-api.ts
diff --git a/src/cdk/rxjs/index.ts b/src/cdk/rxjs/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/rxjs/index.ts
+++ b/src/cdk/rxjs/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/rxjs/public_api.ts b/src/cdk/rxjs/public-api.ts
similarity index 100%
rename from src/cdk/rxjs/public_api.ts
rename to src/cdk/rxjs/public-api.ts
diff --git a/src/cdk/rxjs/tsconfig-build.json b/src/cdk/rxjs/tsconfig-build.json
index 6ee37efb86c8..a03294444966 100644
--- a/src/cdk/rxjs/tsconfig-build.json
+++ b/src/cdk/rxjs/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/rxjs/tsconfig-es5.json b/src/cdk/rxjs/tsconfig-es5.json
new file mode 100644
index 000000000000..8c164ebef3de
--- /dev/null
+++ b/src/cdk/rxjs/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/rxjs",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/scrolling/index.ts b/src/cdk/scrolling/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/scrolling/index.ts
+++ b/src/cdk/scrolling/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/scrolling/public-api.ts b/src/cdk/scrolling/public-api.ts
new file mode 100644
index 000000000000..7a069a29a314
--- /dev/null
+++ b/src/cdk/scrolling/public-api.ts
@@ -0,0 +1,12 @@
+/**
+ * @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
+ */
+
+export * from './scroll-dispatcher';
+export * from './scrollable';
+export * from './viewport-ruler';
+export * from './scrolling-module';
diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index d08dc5f8cf4c..68c94a5e3bef 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -1,6 +1,6 @@
 import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
 import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
-import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public_api';
+import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public-api';
 import {dispatchFakeEvent} from '@angular/cdk/testing';
 
 describe('Scroll Dispatcher', () => {
diff --git a/src/cdk/scrolling/public_api.ts b/src/cdk/scrolling/scrolling-module.ts
similarity index 85%
rename from src/cdk/scrolling/public_api.ts
rename to src/cdk/scrolling/scrolling-module.ts
index 96b6f3a842bf..1f0a669e39a3 100644
--- a/src/cdk/scrolling/public_api.ts
+++ b/src/cdk/scrolling/scrolling-module.ts
@@ -18,7 +18,3 @@ import {PlatformModule} from '@angular/cdk/platform';
   providers: [SCROLL_DISPATCHER_PROVIDER],
 })
 export class ScrollDispatchModule {}
-
-export * from './scroll-dispatcher';
-export * from './scrollable';
-export * from './viewport-ruler';
diff --git a/src/cdk/scrolling/tsconfig-build.json b/src/cdk/scrolling/tsconfig-build.json
index 20b5757fb12c..c15183d45540 100644
--- a/src/cdk/scrolling/tsconfig-build.json
+++ b/src/cdk/scrolling/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/scrolling/tsconfig-es5.json b/src/cdk/scrolling/tsconfig-es5.json
new file mode 100644
index 000000000000..01eed669f762
--- /dev/null
+++ b/src/cdk/scrolling/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/scrolling",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/scrolling/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts
index 349b00efb186..f5afd837e752 100644
--- a/src/cdk/scrolling/viewport-ruler.spec.ts
+++ b/src/cdk/scrolling/viewport-ruler.spec.ts
@@ -1,5 +1,5 @@
 import {TestBed, inject} from '@angular/core/testing';
-import {ScrollDispatchModule} from './public_api';
+import {ScrollDispatchModule} from './public-api';
 import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
 
 
diff --git a/src/cdk/stepper/index.ts b/src/cdk/stepper/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/stepper/index.ts
+++ b/src/cdk/stepper/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/stepper/public-api.ts b/src/cdk/stepper/public-api.ts
new file mode 100644
index 000000000000..b5c762587815
--- /dev/null
+++ b/src/cdk/stepper/public-api.ts
@@ -0,0 +1,12 @@
+/**
+ * @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
+ */
+
+export * from './stepper';
+export * from './step-label';
+export * from './stepper-button';
+export * from './stepper-module';
diff --git a/src/cdk/stepper/public_api.ts b/src/cdk/stepper/stepper-module.ts
similarity index 89%
rename from src/cdk/stepper/public_api.ts
rename to src/cdk/stepper/stepper-module.ts
index 2ef3326db218..e52cb742a796 100644
--- a/src/cdk/stepper/public_api.ts
+++ b/src/cdk/stepper/stepper-module.ts
@@ -19,7 +19,3 @@ import {BidiModule} from '@angular/cdk/bidi';
   declarations: [CdkStep, CdkStepper, CdkStepLabel, CdkStepperNext, CdkStepperPrevious]
 })
 export class CdkStepperModule {}
-
-export * from './stepper';
-export * from './step-label';
-export * from './stepper-button';
diff --git a/src/cdk/stepper/tsconfig-build.json b/src/cdk/stepper/tsconfig-build.json
index 2f9f6e461859..8088edebe7be 100644
--- a/src/cdk/stepper/tsconfig-build.json
+++ b/src/cdk/stepper/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/cdk/stepper/tsconfig-es5.json b/src/cdk/stepper/tsconfig-es5.json
new file mode 100644
index 000000000000..3eabe48b6384
--- /dev/null
+++ b/src/cdk/stepper/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/stepper",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/table/index.ts b/src/cdk/table/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/table/index.ts
+++ b/src/cdk/table/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/table/public-api.ts b/src/cdk/table/public-api.ts
new file mode 100644
index 000000000000..8f01d6e237f6
--- /dev/null
+++ b/src/cdk/table/public-api.ts
@@ -0,0 +1,15 @@
+/**
+ * @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
+ */
+
+export * from './table';
+export * from './cell';
+export * from './row';
+export * from './table-module';
+
+/** Re-export DataSource for a more intuitive experience for users of just the table. */
+export {DataSource} from '@angular/cdk/collections';
diff --git a/src/cdk/table/public_api.ts b/src/cdk/table/table-module.ts
similarity index 81%
rename from src/cdk/table/public_api.ts
rename to src/cdk/table/table-module.ts
index 24a36e8ddd94..5ad1975e5578 100644
--- a/src/cdk/table/public_api.ts
+++ b/src/cdk/table/table-module.ts
@@ -12,13 +12,6 @@ import {HeaderRowPlaceholder, RowPlaceholder, CdkTable} from './table';
 import {CdkCellOutlet, CdkHeaderRow, CdkHeaderRowDef, CdkRow, CdkRowDef} from './row';
 import {CdkColumnDef, CdkHeaderCellDef, CdkHeaderCell, CdkCell, CdkCellDef} from './cell';
 
-export * from './table';
-export * from './cell';
-export * from './row';
-
-/** Re-export DataSource for a more intuitive experience for users of just the table. */
-export {DataSource} from '@angular/cdk/collections';
-
 const EXPORTED_DECLARATIONS = [
   CdkTable,
   CdkRowDef,
diff --git a/src/cdk/table/tsconfig-build.json b/src/cdk/table/tsconfig-build.json
index cacbba393c91..fa5055dc7a07 100644
--- a/src/cdk/table/tsconfig-build.json
+++ b/src/cdk/table/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/cdk/table/tsconfig-es5.json b/src/cdk/table/tsconfig-es5.json
new file mode 100644
index 000000000000..c431202d220a
--- /dev/null
+++ b/src/cdk/table/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/table",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/testing/index.ts b/src/cdk/testing/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/testing/index.ts
+++ b/src/cdk/testing/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/testing/public_api.ts b/src/cdk/testing/public-api.ts
similarity index 100%
rename from src/cdk/testing/public_api.ts
rename to src/cdk/testing/public-api.ts
diff --git a/src/cdk/tsconfig-build.json b/src/cdk/tsconfig-build.json
index 2ce5c0ace94e..cbae6367a2b8 100644
--- a/src/cdk/tsconfig-build.json
+++ b/src/cdk/tsconfig-build.json
@@ -1,5 +1,4 @@
-// TypeScript config file that is used to compile the cdk package. Target environment needs to be
-// ES2015 since the build process will create FESM bundles using rollup.
+// TypeScript config file that is used to compile the cdk's ES2015 package.
 {
   "compilerOptions": {
     "baseUrl": ".",
@@ -21,11 +20,11 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/cdk/tsconfig-es5.json b/src/cdk/tsconfig-es5.json
new file mode 100644
index 000000000000..e85105f31cfd
--- /dev/null
+++ b/src/cdk/tsconfig-es5.json
@@ -0,0 +1,38 @@
+// TypeScript config file that is used to compile the cdk's ES5 package.
+// TODO: Remove this file in favor of overrides when we update to ngc 5.x
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/cdk/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "paths": {
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts",
+    "typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index f10e687d711e..47c7ff114954 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -28,7 +28,7 @@ System.config({
       'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
 
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
-    '@angular/material': 'dist/packages/material/public_api.js',
+    '@angular/material': 'dist/packages/material/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
diff --git a/src/demo-app/tsconfig-build.json b/src/demo-app/tsconfig-build.json
index c3169ecece30..8ad4d20b6c8e 100644
--- a/src/demo-app/tsconfig-build.json
+++ b/src/demo-app/tsconfig-build.json
@@ -22,7 +22,7 @@
     ],
     "baseUrl": ".",
     "paths": {
-      "@angular/material": ["../../dist/packages/material/public_api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*"],
       "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"]
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index 3e4fa9c6417d..f7f702c1c807 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -7,7 +7,7 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
index ab108ba3a8f0..aef9e39b38e8 100644
--- a/src/e2e-app/tsconfig.json
+++ b/src/e2e-app/tsconfig.json
@@ -7,8 +7,8 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"],
-      "@angular/material-examples": ["../material-examples/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"],
+      "@angular/material-examples": ["../material-examples/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/lib/autocomplete/index.ts b/src/lib/autocomplete/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/autocomplete/index.ts
+++ b/src/lib/autocomplete/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/autocomplete/public_api.ts b/src/lib/autocomplete/public-api.ts
similarity index 100%
rename from src/lib/autocomplete/public_api.ts
rename to src/lib/autocomplete/public-api.ts
diff --git a/src/lib/autocomplete/tsconfig-build.json b/src/lib/autocomplete/tsconfig-build.json
index 363a0a4837d6..75a5aaeb002c 100644
--- a/src/lib/autocomplete/tsconfig-build.json
+++ b/src/lib/autocomplete/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/autocomplete/tsconfig-es5.json b/src/lib/autocomplete/tsconfig-es5.json
new file mode 100644
index 000000000000..270cd7838bee
--- /dev/null
+++ b/src/lib/autocomplete/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/autocomplete",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/button-toggle/index.ts b/src/lib/button-toggle/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/button-toggle/index.ts
+++ b/src/lib/button-toggle/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/button-toggle/public_api.ts b/src/lib/button-toggle/public-api.ts
similarity index 100%
rename from src/lib/button-toggle/public_api.ts
rename to src/lib/button-toggle/public-api.ts
diff --git a/src/lib/button-toggle/tsconfig-build.json b/src/lib/button-toggle/tsconfig-build.json
index fadd13eed97c..412d014f6615 100644
--- a/src/lib/button-toggle/tsconfig-build.json
+++ b/src/lib/button-toggle/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/button-toggle/tsconfig-es5.json b/src/lib/button-toggle/tsconfig-es5.json
new file mode 100644
index 000000000000..af9532f0a445
--- /dev/null
+++ b/src/lib/button-toggle/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/button-toggle",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/button/index.ts b/src/lib/button/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/button/index.ts
+++ b/src/lib/button/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/button/public_api.ts b/src/lib/button/public-api.ts
similarity index 100%
rename from src/lib/button/public_api.ts
rename to src/lib/button/public-api.ts
diff --git a/src/lib/button/tsconfig-build.json b/src/lib/button/tsconfig-build.json
index aa81fe018b36..f058d3781f4b 100644
--- a/src/lib/button/tsconfig-build.json
+++ b/src/lib/button/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/button/tsconfig-es5.json b/src/lib/button/tsconfig-es5.json
new file mode 100644
index 000000000000..e9d81168005e
--- /dev/null
+++ b/src/lib/button/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/button",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/card/index.ts b/src/lib/card/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/card/index.ts
+++ b/src/lib/card/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/card/public_api.ts b/src/lib/card/public-api.ts
similarity index 100%
rename from src/lib/card/public_api.ts
rename to src/lib/card/public-api.ts
diff --git a/src/lib/card/tsconfig-build.json b/src/lib/card/tsconfig-build.json
index c53fd82c5200..0c9534bb05bd 100644
--- a/src/lib/card/tsconfig-build.json
+++ b/src/lib/card/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/card/tsconfig-es5.json b/src/lib/card/tsconfig-es5.json
new file mode 100644
index 000000000000..2a4cd40559bc
--- /dev/null
+++ b/src/lib/card/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/card",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/checkbox/index.ts b/src/lib/checkbox/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/checkbox/index.ts
+++ b/src/lib/checkbox/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/checkbox/public_api.ts b/src/lib/checkbox/public-api.ts
similarity index 100%
rename from src/lib/checkbox/public_api.ts
rename to src/lib/checkbox/public-api.ts
diff --git a/src/lib/checkbox/tsconfig-build.json b/src/lib/checkbox/tsconfig-build.json
index 41f11c4177b9..8cb32cbf27fc 100644
--- a/src/lib/checkbox/tsconfig-build.json
+++ b/src/lib/checkbox/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/checkbox/tsconfig-es5.json b/src/lib/checkbox/tsconfig-es5.json
new file mode 100644
index 000000000000..4b2b11e78453
--- /dev/null
+++ b/src/lib/checkbox/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/checkbox",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/chips/index.ts b/src/lib/chips/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/chips/index.ts
+++ b/src/lib/chips/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/chips/public_api.ts b/src/lib/chips/public-api.ts
similarity index 100%
rename from src/lib/chips/public_api.ts
rename to src/lib/chips/public-api.ts
diff --git a/src/lib/chips/tsconfig-build.json b/src/lib/chips/tsconfig-build.json
index 1db61d5c0404..79f6f27b4146 100644
--- a/src/lib/chips/tsconfig-build.json
+++ b/src/lib/chips/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/chips/tsconfig-es5.json b/src/lib/chips/tsconfig-es5.json
new file mode 100644
index 000000000000..fa2928e33c28
--- /dev/null
+++ b/src/lib/chips/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/chips",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/core/index.ts b/src/lib/core/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/core/index.ts
+++ b/src/lib/core/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public-api.ts
similarity index 100%
rename from src/lib/core/public_api.ts
rename to src/lib/core/public-api.ts
diff --git a/src/lib/core/tsconfig-build.json b/src/lib/core/tsconfig-build.json
index e053dfc9fea7..c12f2c686a4a 100644
--- a/src/lib/core/tsconfig-build.json
+++ b/src/lib/core/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/core/tsconfig-es5.json b/src/lib/core/tsconfig-es5.json
new file mode 100644
index 000000000000..b6cc1b088696
--- /dev/null
+++ b/src/lib/core/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/core",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/datepicker/index.ts b/src/lib/datepicker/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/datepicker/index.ts
+++ b/src/lib/datepicker/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public-api.ts
similarity index 100%
rename from src/lib/datepicker/public_api.ts
rename to src/lib/datepicker/public-api.ts
diff --git a/src/lib/datepicker/tsconfig-build.json b/src/lib/datepicker/tsconfig-build.json
index 97ca0946f88a..34c3535eda7b 100644
--- a/src/lib/datepicker/tsconfig-build.json
+++ b/src/lib/datepicker/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/datepicker/tsconfig-es5.json b/src/lib/datepicker/tsconfig-es5.json
new file mode 100644
index 000000000000..fdb09e47a9dc
--- /dev/null
+++ b/src/lib/datepicker/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/datepicker",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/dialog/index.ts b/src/lib/dialog/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/dialog/index.ts
+++ b/src/lib/dialog/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/dialog/public_api.ts b/src/lib/dialog/public-api.ts
similarity index 100%
rename from src/lib/dialog/public_api.ts
rename to src/lib/dialog/public-api.ts
diff --git a/src/lib/dialog/tsconfig-build.json b/src/lib/dialog/tsconfig-build.json
index 09c13c1babf8..d0007d9b5d5d 100644
--- a/src/lib/dialog/tsconfig-build.json
+++ b/src/lib/dialog/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/dialog/tsconfig-es5.json b/src/lib/dialog/tsconfig-es5.json
new file mode 100644
index 000000000000..29106ba3e285
--- /dev/null
+++ b/src/lib/dialog/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/dialog",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/expansion/index.ts b/src/lib/expansion/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/expansion/index.ts
+++ b/src/lib/expansion/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/expansion/public_api.ts b/src/lib/expansion/public-api.ts
similarity index 100%
rename from src/lib/expansion/public_api.ts
rename to src/lib/expansion/public-api.ts
diff --git a/src/lib/expansion/tsconfig-build.json b/src/lib/expansion/tsconfig-build.json
index e8334a21f70b..15bd3530d644 100644
--- a/src/lib/expansion/tsconfig-build.json
+++ b/src/lib/expansion/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/expansion/tsconfig-es5.json b/src/lib/expansion/tsconfig-es5.json
new file mode 100644
index 000000000000..44013006f711
--- /dev/null
+++ b/src/lib/expansion/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/expansion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/form-field/index.ts b/src/lib/form-field/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/form-field/index.ts
+++ b/src/lib/form-field/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/form-field/public_api.ts b/src/lib/form-field/public-api.ts
similarity index 100%
rename from src/lib/form-field/public_api.ts
rename to src/lib/form-field/public-api.ts
diff --git a/src/lib/form-field/tsconfig-build.json b/src/lib/form-field/tsconfig-build.json
index b140fb2b357e..a32c30086890 100644
--- a/src/lib/form-field/tsconfig-build.json
+++ b/src/lib/form-field/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/form-field/tsconfig-es5.json b/src/lib/form-field/tsconfig-es5.json
new file mode 100644
index 000000000000..d60777a3bc17
--- /dev/null
+++ b/src/lib/form-field/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/form-field",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/grid-list/index.ts b/src/lib/grid-list/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/grid-list/index.ts
+++ b/src/lib/grid-list/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/grid-list/public_api.ts b/src/lib/grid-list/public-api.ts
similarity index 100%
rename from src/lib/grid-list/public_api.ts
rename to src/lib/grid-list/public-api.ts
diff --git a/src/lib/grid-list/tsconfig-build.json b/src/lib/grid-list/tsconfig-build.json
index 16701dc99e35..40192c7b4fe0 100644
--- a/src/lib/grid-list/tsconfig-build.json
+++ b/src/lib/grid-list/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/grid-list/tsconfig-es5.json b/src/lib/grid-list/tsconfig-es5.json
new file mode 100644
index 000000000000..fa301bb0536b
--- /dev/null
+++ b/src/lib/grid-list/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/grid-list",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/icon/index.ts b/src/lib/icon/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/icon/index.ts
+++ b/src/lib/icon/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/icon/public_api.ts b/src/lib/icon/public-api.ts
similarity index 100%
rename from src/lib/icon/public_api.ts
rename to src/lib/icon/public-api.ts
diff --git a/src/lib/icon/tsconfig-build.json b/src/lib/icon/tsconfig-build.json
index 34954d67357d..2863f1622ca4 100644
--- a/src/lib/icon/tsconfig-build.json
+++ b/src/lib/icon/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/icon/tsconfig-es5.json b/src/lib/icon/tsconfig-es5.json
new file mode 100644
index 000000000000..e198911c3ff1
--- /dev/null
+++ b/src/lib/icon/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/icon",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/input/index.ts b/src/lib/input/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/input/index.ts
+++ b/src/lib/input/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/input/public_api.ts b/src/lib/input/public-api.ts
similarity index 100%
rename from src/lib/input/public_api.ts
rename to src/lib/input/public-api.ts
diff --git a/src/lib/input/tsconfig-build.json b/src/lib/input/tsconfig-build.json
index 22083bcdbe92..45b212d8d299 100644
--- a/src/lib/input/tsconfig-build.json
+++ b/src/lib/input/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/input/tsconfig-es5.json b/src/lib/input/tsconfig-es5.json
new file mode 100644
index 000000000000..d525ac0e2db6
--- /dev/null
+++ b/src/lib/input/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/input",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/list/index.ts b/src/lib/list/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/list/index.ts
+++ b/src/lib/list/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/list/public_api.ts b/src/lib/list/public-api.ts
similarity index 100%
rename from src/lib/list/public_api.ts
rename to src/lib/list/public-api.ts
diff --git a/src/lib/list/tsconfig-build.json b/src/lib/list/tsconfig-build.json
index 21cbaa9d9aa3..77ea7c3f1e63 100644
--- a/src/lib/list/tsconfig-build.json
+++ b/src/lib/list/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/list/tsconfig-es5.json b/src/lib/list/tsconfig-es5.json
new file mode 100644
index 000000000000..70ed29f73566
--- /dev/null
+++ b/src/lib/list/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/list",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/menu/index.ts b/src/lib/menu/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/menu/index.ts
+++ b/src/lib/menu/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/menu/public_api.ts b/src/lib/menu/public-api.ts
similarity index 100%
rename from src/lib/menu/public_api.ts
rename to src/lib/menu/public-api.ts
diff --git a/src/lib/menu/tsconfig-build.json b/src/lib/menu/tsconfig-build.json
index c92044ad4fbb..9c56861b719f 100644
--- a/src/lib/menu/tsconfig-build.json
+++ b/src/lib/menu/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/menu/tsconfig-es5.json b/src/lib/menu/tsconfig-es5.json
new file mode 100644
index 000000000000..0ab607ca20b8
--- /dev/null
+++ b/src/lib/menu/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/menu",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/paginator/index.ts b/src/lib/paginator/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/paginator/index.ts
+++ b/src/lib/paginator/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/paginator/public_api.ts b/src/lib/paginator/public-api.ts
similarity index 100%
rename from src/lib/paginator/public_api.ts
rename to src/lib/paginator/public-api.ts
diff --git a/src/lib/paginator/tsconfig-build.json b/src/lib/paginator/tsconfig-build.json
index dc0ef8a23eca..020fbcdeb1b0 100644
--- a/src/lib/paginator/tsconfig-build.json
+++ b/src/lib/paginator/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/paginator/tsconfig-es5.json b/src/lib/paginator/tsconfig-es5.json
new file mode 100644
index 000000000000..c44fbd84a895
--- /dev/null
+++ b/src/lib/paginator/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/paginator",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/progress-bar/index.ts b/src/lib/progress-bar/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/progress-bar/index.ts
+++ b/src/lib/progress-bar/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/progress-bar/public_api.ts b/src/lib/progress-bar/public-api.ts
similarity index 100%
rename from src/lib/progress-bar/public_api.ts
rename to src/lib/progress-bar/public-api.ts
diff --git a/src/lib/progress-bar/tsconfig-build.json b/src/lib/progress-bar/tsconfig-build.json
index ec367b48b5b2..e18e92a26d6e 100644
--- a/src/lib/progress-bar/tsconfig-build.json
+++ b/src/lib/progress-bar/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/progress-bar/tsconfig-es5.json b/src/lib/progress-bar/tsconfig-es5.json
new file mode 100644
index 000000000000..de3a5147f84a
--- /dev/null
+++ b/src/lib/progress-bar/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/progress-bar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/progress-spinner/index.ts b/src/lib/progress-spinner/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/progress-spinner/index.ts
+++ b/src/lib/progress-spinner/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/progress-spinner/public_api.ts b/src/lib/progress-spinner/public-api.ts
similarity index 100%
rename from src/lib/progress-spinner/public_api.ts
rename to src/lib/progress-spinner/public-api.ts
diff --git a/src/lib/progress-spinner/tsconfig-build.json b/src/lib/progress-spinner/tsconfig-build.json
index dc6e5bd5dbf4..fd88072e0bde 100644
--- a/src/lib/progress-spinner/tsconfig-build.json
+++ b/src/lib/progress-spinner/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/progress-spinner/tsconfig-es5.json b/src/lib/progress-spinner/tsconfig-es5.json
new file mode 100644
index 000000000000..3c36425605e9
--- /dev/null
+++ b/src/lib/progress-spinner/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/progress-spinner",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/public_api.ts b/src/lib/public-api.ts
similarity index 100%
rename from src/lib/public_api.ts
rename to src/lib/public-api.ts
diff --git a/src/lib/radio/index.ts b/src/lib/radio/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/radio/index.ts
+++ b/src/lib/radio/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/radio/public_api.ts b/src/lib/radio/public-api.ts
similarity index 100%
rename from src/lib/radio/public_api.ts
rename to src/lib/radio/public-api.ts
diff --git a/src/lib/radio/tsconfig-build.json b/src/lib/radio/tsconfig-build.json
index 463d0fc3554b..17ffa21a38b0 100644
--- a/src/lib/radio/tsconfig-build.json
+++ b/src/lib/radio/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/radio/tsconfig-es5.json b/src/lib/radio/tsconfig-es5.json
new file mode 100644
index 000000000000..ad255b05988b
--- /dev/null
+++ b/src/lib/radio/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/radio",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/select/index.ts b/src/lib/select/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/select/index.ts
+++ b/src/lib/select/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/select/public_api.ts b/src/lib/select/public-api.ts
similarity index 100%
rename from src/lib/select/public_api.ts
rename to src/lib/select/public-api.ts
diff --git a/src/lib/select/tsconfig-build.json b/src/lib/select/tsconfig-build.json
index e763b501c047..332d57b04508 100644
--- a/src/lib/select/tsconfig-build.json
+++ b/src/lib/select/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/select/tsconfig-es5.json b/src/lib/select/tsconfig-es5.json
new file mode 100644
index 000000000000..d62b57196fca
--- /dev/null
+++ b/src/lib/select/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/select",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/sidenav/index.ts b/src/lib/sidenav/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/sidenav/index.ts
+++ b/src/lib/sidenav/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/sidenav/public_api.ts b/src/lib/sidenav/public-api.ts
similarity index 100%
rename from src/lib/sidenav/public_api.ts
rename to src/lib/sidenav/public-api.ts
diff --git a/src/lib/sidenav/tsconfig-build.json b/src/lib/sidenav/tsconfig-build.json
index 68f4c0a51b27..6ab34fe3e7f9 100644
--- a/src/lib/sidenav/tsconfig-build.json
+++ b/src/lib/sidenav/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/sidenav/tsconfig-es5.json b/src/lib/sidenav/tsconfig-es5.json
new file mode 100644
index 000000000000..3dd15b1fb496
--- /dev/null
+++ b/src/lib/sidenav/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/sidenav",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/slide-toggle/index.ts b/src/lib/slide-toggle/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/slide-toggle/index.ts
+++ b/src/lib/slide-toggle/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/slide-toggle/public_api.ts b/src/lib/slide-toggle/public-api.ts
similarity index 100%
rename from src/lib/slide-toggle/public_api.ts
rename to src/lib/slide-toggle/public-api.ts
diff --git a/src/lib/slide-toggle/tsconfig-build.json b/src/lib/slide-toggle/tsconfig-build.json
index ec866d061861..f3ce8d212c49 100644
--- a/src/lib/slide-toggle/tsconfig-build.json
+++ b/src/lib/slide-toggle/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/slide-toggle/tsconfig-es5.json b/src/lib/slide-toggle/tsconfig-es5.json
new file mode 100644
index 000000000000..b97898736129
--- /dev/null
+++ b/src/lib/slide-toggle/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/slide-toggle",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/slider/index.ts b/src/lib/slider/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/slider/index.ts
+++ b/src/lib/slider/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/slider/public_api.ts b/src/lib/slider/public-api.ts
similarity index 100%
rename from src/lib/slider/public_api.ts
rename to src/lib/slider/public-api.ts
diff --git a/src/lib/slider/tsconfig-build.json b/src/lib/slider/tsconfig-build.json
index dc10c8d1a735..058c51a4f809 100644
--- a/src/lib/slider/tsconfig-build.json
+++ b/src/lib/slider/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/slider/tsconfig-es5.json b/src/lib/slider/tsconfig-es5.json
new file mode 100644
index 000000000000..99221098dfce
--- /dev/null
+++ b/src/lib/slider/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/slider",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/snack-bar/index.ts b/src/lib/snack-bar/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/snack-bar/index.ts
+++ b/src/lib/snack-bar/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/snack-bar/public_api.ts b/src/lib/snack-bar/public-api.ts
similarity index 100%
rename from src/lib/snack-bar/public_api.ts
rename to src/lib/snack-bar/public-api.ts
diff --git a/src/lib/snack-bar/tsconfig-build.json b/src/lib/snack-bar/tsconfig-build.json
index d359903ccc29..fa1a0c61f270 100644
--- a/src/lib/snack-bar/tsconfig-build.json
+++ b/src/lib/snack-bar/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/snack-bar/tsconfig-es5.json b/src/lib/snack-bar/tsconfig-es5.json
new file mode 100644
index 000000000000..37a896c2f10f
--- /dev/null
+++ b/src/lib/snack-bar/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/snack-bar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/sort/index.ts b/src/lib/sort/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/sort/index.ts
+++ b/src/lib/sort/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/sort/public_api.ts b/src/lib/sort/public-api.ts
similarity index 100%
rename from src/lib/sort/public_api.ts
rename to src/lib/sort/public-api.ts
diff --git a/src/lib/sort/tsconfig-build.json b/src/lib/sort/tsconfig-build.json
index ec944587d015..5945b3b11575 100644
--- a/src/lib/sort/tsconfig-build.json
+++ b/src/lib/sort/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/sort/tsconfig-es5.json b/src/lib/sort/tsconfig-es5.json
new file mode 100644
index 000000000000..bb823828f668
--- /dev/null
+++ b/src/lib/sort/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/sort",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/stepper/index.ts b/src/lib/stepper/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/stepper/index.ts
+++ b/src/lib/stepper/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/stepper/public_api.ts b/src/lib/stepper/public-api.ts
similarity index 100%
rename from src/lib/stepper/public_api.ts
rename to src/lib/stepper/public-api.ts
diff --git a/src/lib/stepper/tsconfig-build.json b/src/lib/stepper/tsconfig-build.json
index 09793c4ded61..0a6ef5312c18 100644
--- a/src/lib/stepper/tsconfig-build.json
+++ b/src/lib/stepper/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/stepper/tsconfig-es5.json b/src/lib/stepper/tsconfig-es5.json
new file mode 100644
index 000000000000..8d84f1139b9d
--- /dev/null
+++ b/src/lib/stepper/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/stepper",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/table/index.ts b/src/lib/table/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/table/index.ts
+++ b/src/lib/table/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/table/public_api.ts b/src/lib/table/public-api.ts
similarity index 100%
rename from src/lib/table/public_api.ts
rename to src/lib/table/public-api.ts
diff --git a/src/lib/table/tsconfig-build.json b/src/lib/table/tsconfig-build.json
index 1f0b7ce0ec35..6db2b02dc726 100644
--- a/src/lib/table/tsconfig-build.json
+++ b/src/lib/table/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/table/tsconfig-es5.json b/src/lib/table/tsconfig-es5.json
new file mode 100644
index 000000000000..fe82cc879d3a
--- /dev/null
+++ b/src/lib/table/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/table",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tabs/index.ts b/src/lib/tabs/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/tabs/index.ts
+++ b/src/lib/tabs/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/tabs/public_api.ts b/src/lib/tabs/public-api.ts
similarity index 100%
rename from src/lib/tabs/public_api.ts
rename to src/lib/tabs/public-api.ts
diff --git a/src/lib/tabs/tsconfig-build.json b/src/lib/tabs/tsconfig-build.json
index b86c725d3b37..5588862906c6 100644
--- a/src/lib/tabs/tsconfig-build.json
+++ b/src/lib/tabs/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/tabs/tsconfig-es5.json b/src/lib/tabs/tsconfig-es5.json
new file mode 100644
index 000000000000..67cceed8ef8a
--- /dev/null
+++ b/src/lib/tabs/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/tabs",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/toolbar/index.ts b/src/lib/toolbar/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/toolbar/index.ts
+++ b/src/lib/toolbar/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/toolbar/public_api.ts b/src/lib/toolbar/public-api.ts
similarity index 100%
rename from src/lib/toolbar/public_api.ts
rename to src/lib/toolbar/public-api.ts
diff --git a/src/lib/toolbar/tsconfig-build.json b/src/lib/toolbar/tsconfig-build.json
index 5cb7948f310d..878a5dbd9beb 100644
--- a/src/lib/toolbar/tsconfig-build.json
+++ b/src/lib/toolbar/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/toolbar/tsconfig-es5.json b/src/lib/toolbar/tsconfig-es5.json
new file mode 100644
index 000000000000..a759c38fcec4
--- /dev/null
+++ b/src/lib/toolbar/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/toolbar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tooltip/index.ts b/src/lib/tooltip/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/tooltip/index.ts
+++ b/src/lib/tooltip/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/tooltip/public_api.ts b/src/lib/tooltip/public-api.ts
similarity index 100%
rename from src/lib/tooltip/public_api.ts
rename to src/lib/tooltip/public-api.ts
diff --git a/src/lib/tooltip/tsconfig-build.json b/src/lib/tooltip/tsconfig-build.json
index 1a9490324e1f..2f969769c8c3 100644
--- a/src/lib/tooltip/tsconfig-build.json
+++ b/src/lib/tooltip/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/tooltip/tsconfig-es5.json b/src/lib/tooltip/tsconfig-es5.json
new file mode 100644
index 000000000000..8f5505fabaa2
--- /dev/null
+++ b/src/lib/tooltip/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/tooltip",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tsconfig-build.json b/src/lib/tsconfig-build.json
index 8da26353210e..c161db414d67 100644
--- a/src/lib/tsconfig-build.json
+++ b/src/lib/tsconfig-build.json
@@ -1,5 +1,4 @@
-// TypeScript config file that is used to compile the library. Target environment needs to be
-// ES2015 since the build process will create FESM bundles using rollup.
+// TypeScript config file that is used to compile the library into ES2015.
 {
   "compilerOptions": {
     "declaration": true,
@@ -21,12 +20,12 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"],
-      "@angular/material/*": ["../../dist/packages/material/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/tsconfig-es5.json b/src/lib/tsconfig-es5.json
new file mode 100644
index 000000000000..20e6026d3e17
--- /dev/null
+++ b/src/lib/tsconfig-es5.json
@@ -0,0 +1,39 @@
+// TypeScript config file that is used to compile the library into ES5.
+// TODO: Remove this file in favor of overrides when we update to ngc 5.x
+{
+  "compilerOptions": {
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts",
+    "typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tsconfig-tests.json b/src/lib/tsconfig-tests.json
index 6a405806a69d..a3e422e45be2 100644
--- a/src/lib/tsconfig-tests.json
+++ b/src/lib/tsconfig-tests.json
@@ -10,7 +10,7 @@
     "types": ["jasmine"],
     "paths": {
       "@angular/material/*": ["./*"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "include": [
diff --git a/src/material-examples/index.ts b/src/material-examples/index.ts
index 4aaf8f92eda0..7e1a213e3ea5 100644
--- a/src/material-examples/index.ts
+++ b/src/material-examples/index.ts
@@ -1 +1 @@
-export * from './public_api';
+export * from './public-api';
diff --git a/src/material-examples/public_api.ts b/src/material-examples/public-api.ts
similarity index 100%
rename from src/material-examples/public_api.ts
rename to src/material-examples/public-api.ts
diff --git a/src/material-examples/tsconfig-build.json b/src/material-examples/tsconfig-build.json
index 4d04613664e0..a800246ead3e 100644
--- a/src/material-examples/tsconfig-build.json
+++ b/src/material-examples/tsconfig-build.json
@@ -20,13 +20,13 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public_api"],
-      "@angular/material": ["../../dist/packages/material/public_api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/material-examples/tsconfig-es5.json b/src/material-examples/tsconfig-es5.json
new file mode 100644
index 000000000000..0f6a544d8044
--- /dev/null
+++ b/src/material-examples/tsconfig-es5.json
@@ -0,0 +1,38 @@
+// TypeScript config file that is used to compile the examples. Target environment needs to be
+// ES2015 since the build process will create FESM bundles using rollup.
+{
+  "compilerOptions": {
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material-examples/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "baseUrl": ".",
+    "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material-examples",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/material-examples/tsconfig.json b/src/material-examples/tsconfig.json
index 3e4fa9c6417d..f7f702c1c807 100644
--- a/src/material-examples/tsconfig.json
+++ b/src/material-examples/tsconfig.json
@@ -7,7 +7,7 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/material-moment-adapter/index.ts b/src/material-moment-adapter/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/material-moment-adapter/index.ts
+++ b/src/material-moment-adapter/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/material-moment-adapter/public_api.ts b/src/material-moment-adapter/public-api.ts
similarity index 100%
rename from src/material-moment-adapter/public_api.ts
rename to src/material-moment-adapter/public-api.ts
diff --git a/src/material-moment-adapter/tsconfig-build.json b/src/material-moment-adapter/tsconfig-build.json
index 8aeaea2f87d6..d1cc7b1e9d54 100644
--- a/src/material-moment-adapter/tsconfig-build.json
+++ b/src/material-moment-adapter/tsconfig-build.json
@@ -1,5 +1,4 @@
-// TypeScript config file that is used to compile the moment-adapter package. Target environment
-// needs to be ES2015 since the build process will create FESM bundles using rollup.
+// TypeScript config file that is used to compile the moment-adapter package into ES2015.
 {
   "compilerOptions": {
     // Needed for Moment.js since it doesn't have a default export.
@@ -23,13 +22,13 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public_api"],
-      "@angular/material": ["../../dist/packages/material/public_api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/material-moment-adapter/tsconfig-es5.json b/src/material-moment-adapter/tsconfig-es5.json
new file mode 100644
index 000000000000..2e98923ce36b
--- /dev/null
+++ b/src/material-moment-adapter/tsconfig-es5.json
@@ -0,0 +1,41 @@
+// TypeScript config file that is used to compile the moment-adapter package into ES5.
+// TODO: Remove this file in favor of overrides when we update to ngc 5.x
+{
+  "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
+    "baseUrl": ".",
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material-moment-adapter/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material-moment-adapter",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/material-moment-adapter/tsconfig.json b/src/material-moment-adapter/tsconfig.json
index 3e4fa9c6417d..f7f702c1c807 100644
--- a/src/material-moment-adapter/tsconfig.json
+++ b/src/material-moment-adapter/tsconfig.json
@@ -7,7 +7,7 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 2712689e5335..ed4d8b4cddff 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -48,7 +48,7 @@ System.config({
 
     // Path mappings for local packages that can be imported inside of tests.
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
-    '@angular/material': 'dist/packages/material/public_api.js',
+    '@angular/material': 'dist/packages/material/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index 8fd0ea387f5e..ae06de1ddc19 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -1,8 +1,5 @@
 import {join, dirname} from 'path';
-import {ScriptTarget, ModuleKind, NewLineKind} from 'typescript';
 import {uglifyJsFile} from './minify-sources';
-import {remapSourcemap} from './sourcemap-remap';
-import {transpileFile} from './typescript-transpile';
 import {buildConfig} from './build-config';
 import {BuildPackage} from './build-package';
 import {rollupRemoveLicensesPlugin} from './rollup-remove-licenses';
@@ -36,6 +33,7 @@ export class PackageBundler {
 
     return this.bundleEntryPoint({
       entryFile: this.buildPackage.entryFilePath,
+      esm5EntryFile: join(this.buildPackage.esm5OutputDir, 'index.js'),
       moduleName: `ng.${this.buildPackage.name}`,
       esm2015Dest: join(bundlesDir, `${packageName}.js`),
       esm5Dest: join(bundlesDir, `${packageName}.es5.js`),
@@ -48,9 +46,11 @@ export class PackageBundler {
   private async bundleSecondaryEntryPoint(entryPoint: string) {
     const packageName = this.buildPackage.name;
     const entryFile = join(this.buildPackage.outputDir, entryPoint, 'index.js');
+    const esm5EntryFile = join(this.buildPackage.esm5OutputDir, entryPoint, 'index.js');
 
     return this.bundleEntryPoint({
       entryFile,
+      esm5EntryFile,
       moduleName: `ng.${packageName}.${entryPoint}`,
       esm2015Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.js`),
       esm5Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.es5.js`),
@@ -66,6 +66,7 @@ export class PackageBundler {
    */
   private async bundleEntryPoint(config: BundlesConfig) {
     // Build FESM-2015 bundle file.
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
     await this.createRollupBundle({
       moduleName: config.moduleName,
       entry: config.entryFile,
@@ -73,20 +74,17 @@ export class PackageBundler {
       format: 'es',
     });
 
-    await remapSourcemap(config.esm2015Dest);
-
-    // Downlevel ES2015 bundle to ES5.
-    transpileFile(config.esm2015Dest, config.esm5Dest, {
-      importHelpers: true,
-      target: ScriptTarget.ES5,
-      module: ModuleKind.ES2015,
-      allowJs: true,
-      newLine: NewLineKind.LineFeed
+    // Build FESM-5 bundle file.
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
+    await this.createRollupBundle({
+      moduleName: config.moduleName,
+      entry: config.esm5EntryFile,
+      dest: config.esm5Dest,
+      format: 'es',
     });
 
-    await remapSourcemap(config.esm5Dest);
-
     // Create UMD bundle of ES5 output.
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
     await this.createRollupBundle({
       moduleName: config.moduleName,
       entry: config.esm5Dest,
@@ -94,12 +92,9 @@ export class PackageBundler {
       format: 'umd'
     });
 
-    await remapSourcemap(config.umdDest);
-
     // Create a minified UMD bundle using UglifyJS
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
     uglifyJsFile(config.umdDest, config.umdMinDest);
-
-    await remapSourcemap(config.umdMinDest);
   }
 
   /** Creates a rollup bundle of a specified JavaScript file.*/
@@ -182,6 +177,7 @@ export class PackageBundler {
 /** Configuration for creating library bundles. */
 interface BundlesConfig {
   entryFile: string;
+  esm5EntryFile: string;
   moduleName: string;
   esm2015Dest: string;
   esm5Dest: string;
diff --git a/tools/package-tools/build-notes.md b/tools/package-tools/build-notes.md
new file mode 100644
index 000000000000..f3a397436469
--- /dev/null
+++ b/tools/package-tools/build-notes.md
@@ -0,0 +1,20 @@
+In order to ensure our source maps trace back properly (and code 
+size analysis tools can use these maps), we have made some changes 
+to our build process. These changes will align with angular/angular's 
+build process while we wait to update to Angular 5.x.
+
+* Instead of downleveling to ES2015, creating a Rollup bundle, then 
+transpiling that bundle down to ES5, we now downlevel to both ES2015 
+and ES5, then create separate Rollup bundles for each. Note: We have to 
+use NGC for both ES2015 and ES5 downleveling (rather than using TSC for 
+the second pass and copying over flat files) because TSC generates 
+decorator code that build-optimizer is not designed to support. For now, 
+decorators must be passed through NGC.
+
+* We are removing sorcery until we can upgrade tsickle and ngc to latest. 
+Our versions of these break when mapping all the way back to TS. 
+(temporary)
+
+* We have to add separate tsconfigs for transpiling to ES5 because our 
+version of ngc doesn't allow overrides. When we update to compiler-cli 
+5.x, we should be able to remove these files. (temporary)
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index ba6b32276089..6c357ad8e3ed 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -7,9 +7,12 @@ import {compileEntryPoint, renamePrivateReExportsToBeUnique} from './compile-ent
 
 const {packagesDir, outputDir} = buildConfig;
 
-/** Name of the tsconfig file that is responsible for building a package. */
+/** Name of the tsconfig file that is responsible for building an ES2015 package. */
 const buildTsconfigName = 'tsconfig-build.json';
 
+/** Name of the tsconfig file that is responsible for building an ES5 package. */
+const es5TsconfigName = 'tsconfig-es5.json';
+
 /** Name of the tsconfig file that is responsible for building the tests. */
 const testsTsconfigName = 'tsconfig-tests.json';
 
@@ -17,9 +20,12 @@ export class BuildPackage {
   /** Path to the package sources. */
   sourceDir: string;
 
-  /** Path to the package output. */
+  /** Path to the ES2015 package output. */
   outputDir: string;
 
+  /** Path to the ES5 package output. */
+  esm5OutputDir: string;
+
   /** Whether this package will re-export its secondary-entry points at the root module. */
   exportsSecondaryEntryPointsAtRoot = false;
 
@@ -55,6 +61,7 @@ export class BuildPackage {
   constructor(public readonly name: string, public readonly dependencies: BuildPackage[] = []) {
     this.sourceDir = join(packagesDir, name);
     this.outputDir = join(outputDir, 'packages', name);
+    this.esm5OutputDir = join(outputDir, 'packages', name, 'esm5');
 
     this.tsconfigBuild = join(this.sourceDir, buildTsconfigName);
     this.tsconfigTests = join(this.sourceDir, testsTsconfigName);
@@ -70,11 +77,11 @@ export class BuildPackage {
     // Depth 1: a11y, scrolling
     // Depth 2: overlay
     for (const entryPointGroup of this.secondaryEntryPointsByDepth) {
-      await Promise.all(entryPointGroup.map(p => compileEntryPoint(this, buildTsconfigName, p)));
+      await Promise.all(entryPointGroup.map(p => this._compileBothTargets(p)));
     }
 
     // Compile the primary entry-point.
-    await compileEntryPoint(this, buildTsconfigName);
+    await this._compileBothTargets();
   }
 
   /** Compiles the TypeScript test source files for the package. */
@@ -87,6 +94,13 @@ export class BuildPackage {
     await this.bundler.createBundles();
   }
 
+  /** Compiles TS into both ES2015 and ES5, then updates exports. */
+  private async _compileBothTargets(p = '') {
+    return compileEntryPoint(this, buildTsconfigName, p)
+        .then(() => compileEntryPoint(this, es5TsconfigName, p))
+        .then(() => renamePrivateReExportsToBeUnique(this, p));
+  }
+
   /** Compiles the TypeScript sources of a primary or secondary entry point. */
   private async _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
     const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts
index 40dd9b2d46b0..db7176adbc5e 100644
--- a/tools/package-tools/compile-entry-point.ts
+++ b/tools/package-tools/compile-entry-point.ts
@@ -24,8 +24,7 @@ export async function compileEntryPoint(buildPackage: BuildPackage, tsconfigName
 
     childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
   })
-    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)))
-    .then(() => renamePrivateReExportsToBeUnique(buildPackage, secondaryEntryPoint));
+    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)));
 }
 
 /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
@@ -39,10 +38,18 @@ export function renamePrivateReExportsToBeUnique(buildPackage: BuildPackage,
   if (buildPackage.exportsSecondaryEntryPointsAtRoot && secondaryEntryPoint) {
     const entryPointId = nextId++;
     const outputPath = join(buildPackage.outputDir, secondaryEntryPoint);
-    glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
-      let fileContent = readFileSync(filePath, 'utf-8');
-      fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
-      writeFileSync(filePath, fileContent, 'utf-8');
-    });
+    const esm5OutputPath = join(buildPackage.esm5OutputDir, secondaryEntryPoint);
+
+    addIdToGlob(outputPath, entryPointId);
+    addIdToGlob(esm5OutputPath, entryPointId);
   }
 }
+
+/** Updates exports in designated folder with identifier specified. */
+function addIdToGlob(outputPath: string, entryPointId: number): void {
+  glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
+    let fileContent = readFileSync(filePath, 'utf-8');
+    fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
+    writeFileSync(filePath, fileContent, 'utf-8');
+  });
+}
diff --git a/tools/package-tools/gulp/build-tasks-gulp.ts b/tools/package-tools/gulp/build-tasks-gulp.ts
index 39731bfed111..675306ee73f6 100644
--- a/tools/package-tools/gulp/build-tasks-gulp.ts
+++ b/tools/package-tools/gulp/build-tasks-gulp.ts
@@ -82,6 +82,7 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
    */
   task(`${taskName}:assets`, [
     `${taskName}:assets:scss`,
+    `${taskName}:assets:es5-scss`,
     `${taskName}:assets:copy-styles`,
     `${taskName}:assets:html`
   ]);
@@ -90,11 +91,19 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
     buildPackage.outputDir, buildPackage.sourceDir, true)
   );
 
+  task(`${taskName}:assets:es5-scss`, buildScssTask(
+      buildPackage.esm5OutputDir, buildPackage.sourceDir, true)
+  );
+
   task(`${taskName}:assets:copy-styles`, () => {
-    return src(stylesGlob).pipe(dest(buildPackage.outputDir));
+    return src(stylesGlob)
+        .pipe(dest(buildPackage.outputDir))
+        .pipe(dest(buildPackage.esm5OutputDir));
   });
   task(`${taskName}:assets:html`, () => {
-    return src(htmlGlob).pipe(htmlmin(htmlMinifierOptions)).pipe(dest(buildPackage.outputDir));
+    return src(htmlGlob).pipe(htmlmin(htmlMinifierOptions))
+        .pipe(dest(buildPackage.outputDir))
+        .pipe(dest(buildPackage.esm5OutputDir));
   });
 
   task(`${taskName}:assets:inline`, () => inlineResourcesForDirectory(buildPackage.outputDir));

From b5ada203015ed9eb7f64bdb0cdd898b194faa191 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 3 Oct 2017 02:14:12 +0200
Subject: [PATCH 220/575] refactor(select): use aria-activedescendant to manage
 focus (#6856)

Relates to #3211.
Fixes #6690.
---
 src/lib/select/select.html    |   7 +-
 src/lib/select/select.spec.ts | 550 +++++++++++++++++++++++-----------
 src/lib/select/select.ts      | 145 +++++----
 3 files changed, 477 insertions(+), 225 deletions(-)

diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index 7782c2192349..545f7acd6234 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -34,16 +34,19 @@
   (detach)="close()">
 
   <div
+    #panel
     class="mat-select-panel {{ _getPanelTheme() }}"
     [ngClass]="panelClass"
     [@transformPanel]="multiple ? 'showing-multiple' : 'showing'"
     (@transformPanel.done)="_onPanelDone()"
-    (keydown)="_handlePanelKeydown($event)"
     [style.transformOrigin]="_transformOrigin"
     [class.mat-select-panel-done-animating]="_panelDoneAnimating"
     [style.font-size.px]="_triggerFontSize">
 
-    <div class="mat-select-content" [@fadeInContent]="'showing'" (@fadeInContent.done)="_onFadeInDone()">
+    <div
+      class="mat-select-content"
+      [@fadeInContent]="'showing'"
+      (@fadeInContent.done)="_onFadeInDone()">
       <ng-content></ng-content>
     </div>
   </div>
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 56769e54ef4b..68010bf7bbc8 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -43,6 +43,12 @@ import {
   getMatSelectNonFunctionValueError
 } from './select-errors';
 
+/** Duration of the select opening animation. */
+const SELECT_OPEN_ANIMATION = 200;
+
+/** Duration of the select closing animation and the timeout interval for the backdrop. */
+const SELECT_CLOSE_ANIMATION = 500;
+
 
 describe('MatSelect', () => {
   let overlayContainerElement: HTMLElement;
@@ -153,48 +159,48 @@ describe('MatSelect', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
-
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
     });
 
-    it('should open the panel when trigger is clicked', () => {
+    it('should open the panel when trigger is clicked', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       expect(fixture.componentInstance.select.panelOpen).toBe(true);
       expect(overlayContainerElement.textContent).toContain('Steak');
       expect(overlayContainerElement.textContent).toContain('Pizza');
       expect(overlayContainerElement.textContent).toContain('Tacos');
-    });
+    }));
 
-    it('should close the panel when an item is clicked', async(() => {
+    it('should close the panel when an item is clicked', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        expect(overlayContainerElement.textContent).toEqual('');
-        expect(fixture.componentInstance.select.panelOpen).toBe(false);
-      });
+      expect(overlayContainerElement.textContent).toEqual('');
+      expect(fixture.componentInstance.select.panelOpen).toBe(false);
     }));
 
-    it('should close the panel when a click occurs outside the panel', async(() => {
+    it('should close the panel when a click occurs outside the panel', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const backdrop =
           overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
 
       backdrop.click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        expect(overlayContainerElement.textContent).toEqual('');
-        expect(fixture.componentInstance.select.panelOpen).toBe(false);
-      });
+      expect(overlayContainerElement.textContent).toEqual('');
+      expect(fixture.componentInstance.select.panelOpen).toBe(false);
     }));
 
     it('should set the width of the overlay based on the trigger', async(() => {
@@ -252,47 +258,50 @@ describe('MatSelect', () => {
       });
     }));
 
-    it('should close the panel when tabbing out', async(() => {
+    it('should close the panel when tabbing out', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
       expect(fixture.componentInstance.select.panelOpen).toBe(true);
 
-      const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
-      dispatchKeyboardEvent(panel, 'keydown', TAB);
+      dispatchKeyboardEvent(trigger, 'keydown', TAB);
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        expect(fixture.componentInstance.select.panelOpen).toBe(false);
-      });
+      expect(fixture.componentInstance.select.panelOpen).toBe(false);
     }));
 
-    it('should focus the first option when pressing HOME', () => {
+    it('should focus the first option when pressing HOME', fakeAsync(() => {
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
-      const event = dispatchKeyboardEvent(panel, 'keydown', HOME);
+      const event = dispatchKeyboardEvent(trigger, 'keydown', HOME);
+      fixture.detectChanges();
+      tick();
 
       expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(0);
       expect(event.defaultPrevented).toBe(true);
-    });
+    }));
 
-    it('should focus the last option when pressing END', () => {
+    it('should focus the last option when pressing END', fakeAsync(() => {
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
-      const event = dispatchKeyboardEvent(panel, 'keydown', END);
+      const event = dispatchKeyboardEvent(trigger, 'keydown', END);
+      fixture.detectChanges();
+      tick();
 
       expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(7);
       expect(event.defaultPrevented).toBe(true);
-    });
+    }));
 
     it('should be able to set extra classes on the panel', () => {
       trigger.click();
@@ -346,7 +355,6 @@ describe('MatSelect', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
-
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     });
@@ -356,25 +364,27 @@ describe('MatSelect', () => {
           .toBe(false, 'placeholder should not be floating');
     });
 
-    it('should focus the first option if no option is selected', async(() => {
+    it('should focus the first option if no option is selected', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(0);
-      });
+      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(0);
     }));
 
-    it('should select an option when it is clicked', () => {
+    it('should select an option when it is clicked', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       let option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
@@ -382,20 +392,23 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.options.first.selected).toBe(true);
       expect(fixture.componentInstance.select.selected)
         .toBe(fixture.componentInstance.options.first);
-    });
+    }));
 
-    it('should deselect other options when one is selected', () => {
+    it('should deselect other options when one is selected', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       let options =
         overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       options =
         overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
@@ -405,29 +418,31 @@ describe('MatSelect', () => {
       const optionInstances = fixture.componentInstance.options.toArray();
       expect(optionInstances[1].selected).toBe(false);
       expect(optionInstances[2].selected).toBe(false);
-    });
+    }));
 
-    it('should deselect other options when one is programmatically selected', () => {
+    it('should deselect other options when one is programmatically selected', fakeAsync(() => {
       let control = fixture.componentInstance.control;
       let foods = fixture.componentInstance.foods;
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       let options =
         overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       control.setValue(foods[1].value);
       fixture.detectChanges();
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       expect(options[0].classList)
         .not.toContain('mat-selected', 'Expected first option to no longer be selected');
@@ -440,7 +455,7 @@ describe('MatSelect', () => {
         .toBe(false, 'Expected first option to no longer be selected');
       expect(optionInstances[1].selected)
         .toBe(true, 'Expected second option to be selected');
-    });
+    }));
 
     it('should remove selection if option has been removed', async(() => {
       let select = fixture.componentInstance.select;
@@ -448,68 +463,73 @@ describe('MatSelect', () => {
       trigger.click();
       fixture.detectChanges();
 
-      let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
+      fixture.whenStable().then(() => {
+        let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
 
-      firstOption.click();
-      fixture.detectChanges();
+        firstOption.click();
+        fixture.detectChanges();
 
-      expect(select.selected).toBe(select.options.first, 'Expected first option to be selected.');
+        expect(select.selected).toBe(select.options.first, 'Expected first option to be selected.');
 
-      fixture.componentInstance.foods = [];
-      fixture.detectChanges();
+        fixture.componentInstance.foods = [];
+        fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        expect(select.selected)
-          .toBeUndefined('Expected selection to be removed when option no longer exists.');
+        fixture.whenStable().then(() => {
+          expect(select.selected)
+            .toBeUndefined('Expected selection to be removed when option no longer exists.');
+        });
       });
     }));
 
-    it('should display the selected option in the trigger', () => {
+    it('should display the selected option in the trigger', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       const value = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
 
       expect(formField.classList.contains('mat-form-field-should-float'))
           .toBe(true, 'placeholder should be floating');
       expect(value.textContent).toContain('Steak');
-    });
+    }));
 
-    it('should focus the selected option if an option is selected', async(() => {
+    it('should focus the selected option if an option is selected', fakeAsync(() => {
       // must wait for initial writeValue promise to finish
-      fixture.whenStable().then(() => {
-        fixture.componentInstance.control.setValue('pizza-1');
-        fixture.detectChanges();
+      tick();
 
-        trigger.click();
-        fixture.detectChanges();
+      fixture.componentInstance.control.setValue('pizza-1');
+      fixture.detectChanges();
 
-        // must wait for animation to finish
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
-          expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(1);
-        });
-      });
+      trigger.click();
+      fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
+
+      // must wait for animation to finish
+      fixture.detectChanges();
+      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(1);
     }));
 
-    it('should select an option that was added after initialization', () => {
+    it('should select an option that was added after initialization', fakeAsync(() => {
       fixture.componentInstance.foods.push({viewValue: 'Potatoes', value: 'potatoes-8'});
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const options =
         overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[8].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(trigger.textContent).toContain('Potatoes');
       expect(fixture.componentInstance.select.selected)
         .toBe(fixture.componentInstance.options.last);
-    });
+    }));
 
     it('should not select disabled options', () => {
       trigger.click();
@@ -556,7 +576,7 @@ describe('MatSelect', () => {
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
     });
 
-    it('should take an initial view value with reactive forms', () => {
+    it('should take an initial view value with reactive forms', fakeAsync(() => {
       fixture.componentInstance.control = new FormControl('pizza-1');
       fixture.detectChanges();
 
@@ -567,15 +587,16 @@ describe('MatSelect', () => {
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const options =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList)
           .toContain('mat-selected',
               `Expected option with the control's initial value to be selected.`);
-    });
+    }));
 
-    it('should set the view value from the form', () => {
+    it('should set the view value from the form', fakeAsync(() => {
       let value = fixture.debugElement.query(By.css('.mat-select-value'));
       expect(value.nativeElement.textContent.trim()).toBe('');
 
@@ -588,29 +609,32 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList).toContain('mat-selected',
-          `Expected option with the control's new value to be selected.`);
-    });
+        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      expect(options[1].classList)
+        .toContain('mat-selected', `Expected option with the control's new value to be selected.`);
+    }));
 
-    it('should update the form value when the view changes', () => {
+    it('should update the form value when the view changes', fakeAsync(() => {
       expect(fixture.componentInstance.control.value)
         .toEqual(null, `Expected the control's value to be empty initially.`);
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.control.value)
         .toEqual('steak-0', `Expected control's value to be set to the new option.`);
-    });
+    }));
 
-    it('should clear the selection when a nonexistent option value is selected', () => {
+    it('should clear the selection when a nonexistent option value is selected', fakeAsync(() => {
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
@@ -625,15 +649,16 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const options =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList)
           .not.toContain('mat-selected', `Expected option with the old value not to be selected.`);
-    });
+    }));
 
 
-    it('should clear the selection when the control is reset', () => {
+    it('should clear the selection when the control is reset', fakeAsync(() => {
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
@@ -648,20 +673,23 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const options =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList)
           .not.toContain('mat-selected', `Expected option with the old value not to be selected.`);
-    });
+    }));
 
-    it('should set the control to touched when the select is touched', () => {
+    it('should set the control to touched when the select is touched', fakeAsync(() => {
       expect(fixture.componentInstance.control.touched)
         .toEqual(false, `Expected the control to start off as untouched.`);
 
       trigger.click();
       dispatchFakeEvent(trigger, 'blur');
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
+
       expect(fixture.componentInstance.control.touched)
         .toEqual(false, `Expected the control to stay untouched when menu opened.`);
 
@@ -670,9 +698,11 @@ describe('MatSelect', () => {
       backdrop.click();
       dispatchFakeEvent(trigger, 'blur');
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
+
       expect(fixture.componentInstance.control.touched)
         .toEqual(true, `Expected the control to be touched as soon as focus left the select.`);
-    });
+    }));
 
     it('should not set touched when a disabled select is touched', () => {
       expect(fixture.componentInstance.control.touched)
@@ -685,20 +715,22 @@ describe('MatSelect', () => {
         .toBe(false, 'Expected the control to stay untouched.');
     });
 
-    it('should set the control to dirty when the select\'s value changes in the DOM', () => {
+    it('should set the control to dirty when the select value changes in the DOM', fakeAsync(() => {
       expect(fixture.componentInstance.control.dirty)
         .toEqual(false, `Expected control to start out pristine.`);
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.control.dirty)
         .toEqual(true, `Expected control to be dirty after value was changed by user.`);
-    });
+    }));
 
     it('should not set the control to dirty when the value changes programmatically', () => {
       expect(fixture.componentInstance.control.dirty)
@@ -724,7 +756,7 @@ describe('MatSelect', () => {
           .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
     });
 
-    it('should be able to programmatically select a falsy option', () => {
+    it('should be able to programmatically select a falsy option', fakeAsync(() => {
       fixture.destroy();
 
       const falsyFixture = TestBed.createComponent(FalsyValueSelect);
@@ -733,17 +765,18 @@ describe('MatSelect', () => {
       falsyFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
       falsyFixture.componentInstance.control.setValue(0);
       falsyFixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       expect(falsyFixture.componentInstance.options.first.selected)
         .toBe(true, 'Expected first option to be selected');
       expect(overlayContainerElement.querySelectorAll('mat-option')[0].classList)
         .toContain('mat-selected', 'Expected first option to be selected');
-    });
+    }));
 
   });
 
   describe('selection without Angular forms', () => {
-    it('should set the value when options are clicked', () => {
+    it('should set the value when options are clicked', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
       fixture.detectChanges();
@@ -753,9 +786,11 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.selectedFood).toBe('steak-0');
       expect(fixture.componentInstance.select.value).toBe('steak-0');
@@ -763,14 +798,16 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       (overlayContainerElement.querySelectorAll('mat-option')[2] as HTMLElement).click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.selectedFood).toBe('sandwich-2');
       expect(fixture.componentInstance.select.value).toBe('sandwich-2');
       expect(trigger.textContent).toContain('Sandwich');
-    });
+    }));
 
     it('should mark options as selected when the value is set', () => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
@@ -791,7 +828,7 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.select.value).toBe('sandwich-2');
     });
 
-    it('should reset the placeholder when a null value is set', () => {
+    it('should reset the placeholder when a null value is set', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
       fixture.detectChanges();
@@ -801,9 +838,11 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
       (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.selectedFood).toBe('steak-0');
       expect(fixture.componentInstance.select.value).toBe('steak-0');
@@ -814,7 +853,7 @@ describe('MatSelect', () => {
 
       expect(fixture.componentInstance.select.value).toBeNull();
       expect(trigger.textContent).not.toContain('Steak');
-    });
+    }));
 
     it('should reflect the preselected value', async(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutFormsPreselected);
@@ -872,20 +911,22 @@ describe('MatSelect', () => {
       expect(trigger.textContent).toContain('Steak, Pizza, Sandwich');
     });
 
-    it('should restore focus to the host element', () => {
+    it('should restore focus to the host element', async(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
       fixture.detectChanges();
       fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
       fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
-      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
+        fixture.detectChanges();
 
-      const select = fixture.debugElement.nativeElement.querySelector('mat-select');
+        const select = fixture.debugElement.nativeElement.querySelector('mat-select');
 
-      expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
-    });
+        expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
+      });
+    }));
 
   });
 
@@ -991,23 +1032,25 @@ describe('MatSelect', () => {
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     }));
 
-    it('should float the placeholder when the panel is open and unselected', () => {
+    it('should float the placeholder when the panel is open and unselected', fakeAsync(() => {
       expect(formField.classList.contains('mat-form-field-should-float'))
           .toBe(false, 'Expected placeholder to initially have a normal position.');
 
-      trigger.click();
+      fixture.componentInstance.select.open();
+      tick();
       fixture.detectChanges();
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(true, 'Expected placeholder to animate up to floating position.');
+      tick(SELECT_OPEN_ANIMATION);
 
-      const backdrop =
-        overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
-      backdrop.click();
+      expect(formField.classList).toContain('mat-form-field-should-float',
+          'Expected placeholder to animate up to floating position.');
+
+      fixture.componentInstance.select.close();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(false, 'Expected placeholder to animate back down to normal position.');
-    });
+      expect(formField.classList).not.toContain('mat-form-field-should-float',
+          'Expected placeholder to animate back down to normal position.');
+    }));
 
     it('should add a class to the panel when the menu is done animating', fakeAsync(() => {
       trigger.click();
@@ -1432,26 +1475,26 @@ describe('MatSelect', () => {
             `Expected select panel to be inside the viewport in rtl.`);
       }));
 
-      it('should keep the position within the viewport on repeat openings', async(() => {
+      it('should keep the position within the viewport on repeat openings', fakeAsync(() => {
         formField.style.left = '-100px';
         trigger.click();
         fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
 
         let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
-
         expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
 
         fixture.componentInstance.select.close();
         fixture.detectChanges();
+        tick(SELECT_CLOSE_ANIMATION);
 
-        fixture.whenStable().then(() => {
-          trigger.click();
-          fixture.detectChanges();
-          panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+        trigger.click();
+        fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
+        panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-          expect(panelLeft).toBeGreaterThan(0,
-              `Expected select panel continue being inside the viewport.`);
-        });
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel continue being inside the viewport.`);
       }));
     });
 
@@ -1886,20 +1929,24 @@ describe('MatSelect', () => {
         expect(select.getAttribute('tabindex')).toEqual('0');
       });
 
-      it('should be able to select options via the arrow keys on a closed select', () => {
+      it('should be able to select options via the arrow keys on a closed select', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
         const options = fixture.componentInstance.options.toArray();
 
         expect(formControl.value).toBeFalsy('Expected no initial value.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
 
         expect(options[0].selected).toBe(true, 'Expected first option to be selected.');
         expect(formControl.value).toBe(options[0].value,
           'Expected value from first option to have been set on the model.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
+
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
 
         // Note that the third option is skipped, because it is disabled.
         expect(options[3].selected).toBe(true, 'Expected fourth option to be selected.');
@@ -1907,11 +1954,12 @@ describe('MatSelect', () => {
           'Expected value from fourth option to have been set on the model.');
 
         dispatchKeyboardEvent(select, 'keydown', UP_ARROW);
+        tick();
 
         expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
         expect(formControl.value).toBe(options[1].value,
           'Expected value from second option to have been set on the model.');
-      });
+      }));
 
       it('should open the panel when pressing the arrow keys on a closed multiple select', () => {
         fixture.destroy();
@@ -1933,29 +1981,33 @@ describe('MatSelect', () => {
         expect(event.defaultPrevented).toBe(true, 'Expected default to be prevented.');
       });
 
-      it('should do nothing if the key manager did not change the active item', () => {
+      it('should do nothing if the key manager did not change the active item', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
 
         expect(formControl.value).toBeNull('Expected form control value to be empty.');
         expect(formControl.pristine).toBe(true, 'Expected form control to be clean.');
 
         dispatchKeyboardEvent(select, 'keydown', 16); // Press a random key.
+        tick();
 
         expect(formControl.value).toBeNull('Expected form control value to stay empty.');
         expect(formControl.pristine).toBe(true, 'Expected form control to stay clean.');
-      });
+      }));
 
-      it('should continue from the selected option when the value is set programmatically', () => {
-        const formControl = fixture.componentInstance.control;
+      it('should continue from the selected option when the value is set programmatically',
+        fakeAsync(() => {
+          const formControl = fixture.componentInstance.control;
 
-        formControl.setValue('eggs-5');
-        fixture.detectChanges();
+          formControl.setValue('eggs-5');
+          fixture.detectChanges();
+          tick();
 
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+          tick();
 
-        expect(formControl.value).toBe('pasta-6');
-        expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
-      });
+          expect(formControl.value).toBe('pasta-6');
+          expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
+        }));
 
       it('should not shift focus when the selected options are updated programmatically ' +
         'in a multi select', () => {
@@ -1981,29 +2033,33 @@ describe('MatSelect', () => {
               .toBe(options[3], 'Expected fourth option to remain focused.');
         });
 
-      it('should not cycle through the options if the control is disabled', () => {
+      it('should not cycle through the options if the control is disabled', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
 
         formControl.setValue('eggs-5');
         formControl.disable();
+
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
 
         expect(formControl.value).toBe('eggs-5', 'Expected value to remain unchaged.');
-      });
+      }));
 
-      it('should not wrap selection around after reaching the end of the options', () => {
+      it('should not wrap selection around after reaching the end of the options', fakeAsync(() => {
         const lastOption = fixture.componentInstance.options.last;
 
         fixture.componentInstance.options.forEach(() => {
           dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+          tick();
         });
 
         expect(lastOption.selected).toBe(true, 'Expected last option to be selected.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
 
         expect(lastOption.selected).toBe(true, 'Expected last option to stay selected.');
-      });
+      }));
 
       it('should not open a multiple select when tabbing through', () => {
         fixture.destroy();
@@ -2023,21 +2079,21 @@ describe('MatSelect', () => {
       });
 
       it('should prevent the default action when pressing space', () => {
-        let event = dispatchKeyboardEvent(select, 'keydown', SPACE);
-
+        const event = dispatchKeyboardEvent(select, 'keydown', SPACE);
         expect(event.defaultPrevented).toBe(true);
       });
 
-      it('should consider the selection as a result of a user action when closed', () => {
+      it('should consider the selection a result of a user action when closed', fakeAsync(() => {
         const option = fixture.componentInstance.options.first;
         const spy = jasmine.createSpy('option selection spy');
         const subscription = map.call(option.onSelectionChange, e => e.isUserInput).subscribe(spy);
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
         expect(spy).toHaveBeenCalledWith(true);
 
         subscription.unsubscribe();
-      });
+      }));
 
       it('should be able to focus the select trigger', () => {
         document.body.focus(); // ensure that focus isn't on the trigger already
@@ -2071,6 +2127,60 @@ describe('MatSelect', () => {
         expect(select.getAttribute('aria-multiselectable')).toBe('false');
       });
 
+      it('should set aria-activedescendant only while the panel is open', fakeAsync(() => {
+        fixture.componentInstance.control.setValue('chips-4');
+        fixture.detectChanges();
+
+        const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+
+        expect(host.hasAttribute('aria-activedescendant'))
+            .toBe(false, 'Expected no aria-activedescendant on init.');
+
+        fixture.componentInstance.select.open();
+        tick();
+        fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
+
+        const options = overlayContainerElement.querySelectorAll('mat-option');
+
+        expect(host.getAttribute('aria-activedescendant'))
+          .toBe(options[4].id, 'Expected aria-activedescendant to match the active option.');
+
+        fixture.componentInstance.select.close();
+        fixture.detectChanges();
+        tick(SELECT_CLOSE_ANIMATION);
+
+        expect(host.hasAttribute('aria-activedescendant'))
+          .toBe(false, 'Expected no aria-activedescendant when closed.');
+      }));
+
+      it('should set aria-activedescendant based on the focused option', fakeAsync(() => {
+        const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+
+        fixture.componentInstance.select.open();
+        tick();
+        fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
+
+        const options = overlayContainerElement.querySelectorAll('mat-option');
+
+        expect(host.getAttribute('aria-activedescendant')).toBe(options[0].id);
+
+        [1, 2, 3].forEach(() => {
+          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+          tick();
+          fixture.detectChanges();
+        });
+
+        expect(host.getAttribute('aria-activedescendant')).toBe(options[4].id);
+
+        dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
+        tick();
+        fixture.detectChanges();
+
+        expect(host.getAttribute('aria-activedescendant')).toBe(options[3].id);
+      }));
+
     });
 
     describe('for options', () => {
@@ -2171,19 +2281,20 @@ describe('MatSelect', () => {
       let triggers: DebugElement[];
       let options: NodeListOf<HTMLElement>;
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         fixture = TestBed.createComponent(ManySelects);
         fixture.detectChanges();
         triggers = fixture.debugElement.queryAll(By.css('.mat-select-trigger'));
 
         triggers[0].nativeElement.click();
         fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
 
         options =
             overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      });
+      }));
 
-      it('should set aria-owns properly', async(() => {
+      it('should set aria-owns properly', fakeAsync(() => {
         const selects = fixture.debugElement.queryAll(By.css('mat-select'));
 
         expect(selects[0].nativeElement.getAttribute('aria-owns'))
@@ -2195,22 +2306,22 @@ describe('MatSelect', () => {
             overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
         backdrop.click();
         fixture.detectChanges();
+        tick(SELECT_CLOSE_ANIMATION);
 
-        fixture.whenStable().then(() => {
-          triggers[1].nativeElement.click();
+        triggers[1].nativeElement.click();
+        fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
 
-          fixture.detectChanges();
-          options =
-              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-          expect(selects[1].nativeElement.getAttribute('aria-owns'))
-              .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
-          expect(selects[1].nativeElement.getAttribute('aria-owns'))
-              .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
-        });
+        options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(selects[1].nativeElement.getAttribute('aria-owns'))
+            .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
+        expect(selects[1].nativeElement.getAttribute('aria-owns'))
+            .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
 
       }));
 
-      it('should set the option id properly', async(() => {
+      it('should set the option id properly', fakeAsync(() => {
         let firstOptionID = options[0].id;
 
         expect(options[0].id)
@@ -2221,19 +2332,18 @@ describe('MatSelect', () => {
             overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
         backdrop.click();
         fixture.detectChanges();
+        tick(SELECT_CLOSE_ANIMATION);
 
-        fixture.whenStable().then(() => {
-          triggers[1].nativeElement.click();
-
-          fixture.detectChanges();
-          options =
-              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-          expect(options[0].id)
-              .toContain('mat-option', `Expected option ID to have the correct prefix.`);
-          expect(options[0].id).not.toEqual(firstOptionID, `Expected option IDs to be unique.`);
-          expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
-        });
+        triggers[1].nativeElement.click();
+        fixture.detectChanges();
+        tick(SELECT_OPEN_ANIMATION);
 
+        options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[0].id)
+            .toContain('mat-option', `Expected option ID to have the correct prefix.`);
+        expect(options[0].id).not.toEqual(firstOptionID, `Expected option IDs to be unique.`);
+        expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
       }));
     });
   });
@@ -2346,12 +2456,14 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
     });
 
-    it('should only emit one event when pressing the arrow keys on a closed select', () => {
-      const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-      dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+    it('should only emit one event when pressing the arrow keys on a closed select',
+      fakeAsync(() => {
+        const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+        tick();
 
-      expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
-    });
+        expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
+      }));
 
   });
 
@@ -2702,51 +2814,54 @@ describe('MatSelect', () => {
 
       fixture.whenStable().then(() => {
         options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-
         options[0].click();
         fixture.detectChanges();
       });
     }));
 
-    it('should reset when an option with an undefined value is selected', () => {
+    it('should reset when an option with an undefined value is selected', fakeAsync(() => {
       options[4].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.control.value).toBeUndefined();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
       expect(formField.classList).not.toContain('mat-form-field-should-float');
       expect(trigger.textContent).not.toContain('Undefined');
-    });
+    }));
 
-    it('should reset when an option with a null value is selected', () => {
+    it('should reset when an option with a null value is selected', fakeAsync(() => {
       options[5].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.control.value).toBeNull();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
       expect(formField.classList).not.toContain('mat-form-field-should-float');
       expect(trigger.textContent).not.toContain('Null');
-    });
+    }));
 
-    it('should reset when a blank option is selected', () => {
+    it('should reset when a blank option is selected', fakeAsync(() => {
       options[6].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.control.value).toBeUndefined();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
       expect(formField.classList).not.toContain('mat-form-field-should-float');
       expect(trigger.textContent).not.toContain('None');
-    });
+    }));
 
-    it('should not reset when any other falsy option is selected', () => {
+    it('should not reset when any other falsy option is selected', fakeAsync(() => {
       options[3].click();
       fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
 
       expect(fixture.componentInstance.control.value).toBe(false);
       expect(fixture.componentInstance.select.selected).toBeTruthy();
       expect(formField.classList).toContain('mat-form-field-should-float');
       expect(trigger.textContent).toContain('Falsy');
-    });
+    }));
 
     it('should not consider the reset values as selected when resetting the form control', () => {
       expect(formField.classList).toContain('mat-form-field-should-float');
@@ -2901,6 +3016,97 @@ describe('MatSelect', () => {
       });
     });
   });
+
+  describe('keyboard scrolling', () => {
+    let fixture: ComponentFixture<BasicSelect>;
+    let host: HTMLElement;
+    let panel: HTMLElement;
+
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(BasicSelect);
+
+      fixture.componentInstance.foods = [];
+
+      for (let i = 0; i < 30; i++) {
+        fixture.componentInstance.foods.push({value: `value-${i}`, viewValue: `Option ${i}`});
+      }
+
+      fixture.detectChanges();
+      fixture.componentInstance.select.open();
+      fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
+
+      host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
+    }));
+
+    it('should not scroll to options that are completely in the view', fakeAsync(() => {
+      const initialScrollPosition = panel.scrollTop;
+
+      [1, 2, 3].forEach(() => {
+        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        tick();
+        fixture.detectChanges();
+      });
+
+      expect(panel.scrollTop).toBe(initialScrollPosition, 'Expected scroll position not to change');
+    }));
+
+    it('should scroll down to the active option', fakeAsync(() => {
+      for (let i = 0; i < 15; i++) {
+        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        tick();
+        fixture.detectChanges();
+      }
+
+      // <option index * height> - <panel height> = 16 * 48 - 256 = 512
+      expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
+    }));
+
+    it('should scroll up to the active option', fakeAsync(() => {
+      // Scroll to the bottom.
+      for (let i = 0; i < fixture.componentInstance.foods.length; i++) {
+        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        tick();
+        fixture.detectChanges();
+      }
+
+      for (let i = 0; i < 20; i++) {
+        dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
+        tick();
+        fixture.detectChanges();
+      }
+
+      // <option index * height> = 9 * 48 = 432
+      expect(panel.scrollTop).toBe(432, 'Expected scroll to be at the 9th option.');
+    }));
+
+    it('should skip option group labels', fakeAsync(() => {
+      fixture.destroy();
+      tick(SELECT_CLOSE_ANIMATION);
+
+      const groupFixture = TestBed.createComponent(SelectWithGroups);
+
+      groupFixture.detectChanges();
+      groupFixture.componentInstance.select.open();
+      groupFixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
+
+      host = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
+
+      for (let i = 0; i < 5; i++) {
+        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        tick();
+        groupFixture.detectChanges();
+      }
+
+      // Note that we press down 5 times, but it will skip
+      // 3 options because the second group is disabled.
+      // <(option index + group labels) * height> - <panel height> = (9 + 3) * 48 - 256 = 320
+      expect(panel.scrollTop).toBe(320, 'Expected scroll to be at the 9th option.');
+    }));
+  });
 });
 
 @Component({
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 1a5038a9b5f7..e26c16ab4a8b 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {FocusKeyManager} from '@angular/cdk/a11y';
+import {ActiveDescendantKeyManager} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
@@ -164,11 +164,12 @@ export class MatSelectTrigger {}
     '[attr.aria-owns]': '_optionIds',
     '[attr.aria-multiselectable]': 'multiple',
     '[attr.aria-describedby]': '_ariaDescribedby || null',
+    '[attr.aria-activedescendant]': '_getAriaActiveDescendant()',
     '[class.mat-select-disabled]': 'disabled',
     '[class.mat-select-invalid]': 'errorState',
     '[class.mat-select-required]': 'required',
     'class': 'mat-select',
-    '(keydown)': '_handleClosedKeydown($event)',
+    '(keydown)': '_handleKeydown($event)',
     '(focus)': '_onFocus()',
     '(blur)': '_onBlur()',
   },
@@ -224,7 +225,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   _selectionModel: SelectionModel<MatOption>;
 
   /** Manages keyboard events for options in the panel. */
-  _keyManager: FocusKeyManager<MatOption>;
+  _keyManager: ActiveDescendantKeyManager<MatOption>;
 
   /** View -> model callback called when value changes */
   _onChange: (value: any) => void = () => {};
@@ -287,6 +288,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   /** Trigger that opens the select. */
   @ViewChild('trigger') trigger: ElementRef;
 
+  /** Panel containing the select options. */
+  @ViewChild('panel') panel: ElementRef;
+
   /** Overlay pane containing the options. */
   @ViewChild(ConnectedOverlayDirective) overlayDir: ConnectedOverlayDirective;
 
@@ -466,6 +470,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._triggerFontSize = parseInt(getComputedStyle(this.trigger.nativeElement)['font-size']);
 
     this._calculateOverlayPosition();
+    this._highlightCorrectOption();
     this._panelOpen = true;
     this._changeDetectorRef.markForCheck();
 
@@ -568,26 +573,43 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return this._dir ? this._dir.value === 'rtl' : false;
   }
 
-  /** Handles the keyboard interactions of a closed select. */
-  _handleClosedKeydown(event: KeyboardEvent): void {
+  /** Handles all keydown events on the select. */
+  _handleKeydown(event: KeyboardEvent): void {
     if (!this.disabled) {
-      if (event.keyCode === ENTER || event.keyCode === SPACE) {
-        event.preventDefault(); // prevents the page from scrolling down when pressing space
-        this.open();
-      } else if (event.keyCode === UP_ARROW || event.keyCode === DOWN_ARROW) {
-        this._handleArrowKey(event);
-      }
+      this.panelOpen ? this._handleOpenKeydown(event) : this._handleClosedKeydown(event);
     }
   }
 
-  /** Handles keypresses inside the panel. */
-  _handlePanelKeydown(event: KeyboardEvent): void {
-    if (event.keyCode === HOME || event.keyCode === END) {
+  /** Handles keyboard events while the select is closed. */
+  private _handleClosedKeydown(event: KeyboardEvent): void {
+    if (event.keyCode === ENTER || event.keyCode === SPACE) {
+      event.preventDefault(); // prevents the page from scrolling down when pressing space
+      this.open();
+    } else if (event.keyCode === UP_ARROW || event.keyCode === DOWN_ARROW) {
+      this._handleClosedArrowKey(event);
+    }
+  }
+
+  /** Handles keyboard events when the selected is open. */
+  private _handleOpenKeydown(event: KeyboardEvent): void {
+    const keyCode = event.keyCode;
+
+    if (keyCode === HOME || keyCode === END) {
       event.preventDefault();
-      event.keyCode === HOME ? this._keyManager.setFirstItemActive() :
-                               this._keyManager.setLastItemActive();
+      keyCode === HOME ? this._keyManager.setFirstItemActive() :
+                         this._keyManager.setLastItemActive();
+    } else if ((keyCode === ENTER || keyCode === SPACE) && this._keyManager.activeItem) {
+      event.preventDefault();
+      this._keyManager.activeItem._selectViaInteraction();
     } else {
       this._keyManager.onKeydown(event);
+
+      // TODO(crisbeto): get rid of the Promise.resolve when #6441 gets in.
+      Promise.resolve().then(() => {
+        if (this.panelOpen) {
+          this._scrollActiveOptionIntoView();
+        }
+      });
     }
   }
 
@@ -597,7 +619,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   _onPanelDone(): void {
     if (this.panelOpen) {
-      this._focusCorrectOption();
+      this._scrollTop = 0;
       this.onOpen.emit();
     } else {
       this.onClose.emit();
@@ -613,6 +635,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   _onFadeInDone(): void {
     this._panelDoneAnimating = this.panelOpen;
+    this.panel.nativeElement.focus();
     this._changeDetectorRef.markForCheck();
   }
 
@@ -640,8 +663,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * Callback that is invoked when the overlay panel has been attached.
    */
   _onAttached(): void {
+    this._changeDetectorRef.detectChanges();
     this._calculateOverlayOffsetX();
-    this._setScrollTop();
+    this.panel.nativeElement.scrollTop = this._scrollTop;
   }
 
   /** Returns the theme to be used on the panel. */
@@ -664,17 +688,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return !!(isInvalid && (isTouched || isSubmitted));
   }
 
-  /**
-   * Sets the scroll position of the scroll container. This must be called after
-   * the overlay pane is attached or the scroll container element will not yet be
-   * present in the DOM.
-   */
-  private _setScrollTop(): void {
-    const scrollContainer =
-        this.overlayDir.overlayRef.overlayElement.querySelector('.mat-select-panel');
-    scrollContainer!.scrollTop = this._scrollTop;
-  }
-
   private _initializeSelection(): void {
     // Defer setting the value in order to avoid the "Expression
     // has changed after it was checked" errors from Angular.
@@ -756,7 +769,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** Sets up a key manager to listen to keyboard events on the overlay panel. */
   private _initKeyManager() {
-    this._keyManager = new FocusKeyManager<MatOption>(this.options).withTypeAhead();
+    this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withTypeAhead();
     this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close());
   }
 
@@ -871,10 +884,10 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   }
 
   /**
-   * Focuses the selected item. If no option is selected, it will focus
+   * Highlights the selected item. If no option is selected, it will highlight
    * the first item instead.
    */
-  private _focusCorrectOption(): void {
+  private _highlightCorrectOption(): void {
     if (this._selectionModel.isEmpty()) {
       this._keyManager.setFirstItemActive();
     } else {
@@ -882,6 +895,23 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     }
   }
 
+  /** Scrolls the active option into view. */
+  private _scrollActiveOptionIntoView(): void {
+    const itemHeight = this._getItemHeight();
+    const activeOptionIndex = this._keyManager.activeItemIndex || 0;
+    const labelCount = MatOption.countGroupLabelsBeforeOption(activeOptionIndex,
+        this.options, this.optionGroups);
+    const scrollOffset = (activeOptionIndex + labelCount) * itemHeight;
+    const panelTop = this.panel.nativeElement.scrollTop;
+
+    if (scrollOffset < panelTop) {
+      this.panel.nativeElement.scrollTop = scrollOffset;
+    } else if (scrollOffset + itemHeight > panelTop + SELECT_PANEL_MAX_HEIGHT) {
+      this.panel.nativeElement.scrollTop =
+          Math.max(0, scrollOffset - SELECT_PANEL_MAX_HEIGHT + itemHeight);
+    }
+  }
+
   /** Focuses the select element. */
   focus(): void {
     this._elementRef.nativeElement.focus();
@@ -896,8 +926,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** Calculates the scroll position and x- and y-offsets of the overlay panel. */
   private _calculateOverlayPosition(): void {
-    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
-
+    const itemHeight = this._getItemHeight();
     const items = this._getItemCount();
     const panelHeight = Math.min(items * itemHeight, SELECT_PANEL_MAX_HEIGHT);
     const scrollContainerHeight = items * itemHeight;
@@ -930,7 +959,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   _calculateOverlayScroll(selectedIndex: number, scrollBuffer: number,
                           maxScroll: number): number {
-    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const itemHeight = this._getItemHeight();
     const optionOffsetFromScrollTop = itemHeight * selectedIndex;
     const halfOptionHeight = itemHeight / 2;
 
@@ -939,7 +968,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     // the center of the overlay panel. Half the option height must be re-added to the
     // scrollTop so the option is centered based on its middle, not its top edge.
     const optimalScrollPosition = optionOffsetFromScrollTop - scrollBuffer + halfOptionHeight;
-    return clampValue(0, optimalScrollPosition, maxScroll);
+    return Math.min(Math.max(0, optimalScrollPosition), maxScroll);
   }
 
   /** Returns the aria-label of the select component. */
@@ -949,6 +978,15 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return this.ariaLabelledby ? null : this.ariaLabel || this.placeholder;
   }
 
+  /** Determines the `aria-activedescendant` to be set on the host. */
+  _getAriaActiveDescendant(): string | null {
+    if (this.panelOpen && this._keyManager && this._keyManager.activeItem) {
+      return this._keyManager.activeItem.id;
+    }
+
+    return null;
+  }
+
   /**
    * Sets the x-offset of the overlay panel in relation to the trigger's top start corner.
    * This must be adjusted to align the selected option text over the trigger text when
@@ -1002,7 +1040,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   private _calculateOverlayOffsetY(selectedIndex: number, scrollBuffer: number,
                                   maxScroll: number): number {
-    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const itemHeight = this._getItemHeight();
     const optionHeightAdjustment = (itemHeight - this._triggerRect.height) / 2;
     const maxOptionsDisplayed = Math.floor(SELECT_PANEL_MAX_HEIGHT / itemHeight);
     let optionOffsetFromPanelTop: number;
@@ -1043,7 +1081,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * sets the offset back to 0 to allow the fallback position to take over.
    */
   private _checkOverlayWithinViewport(maxScroll: number): void {
-    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const itemHeight = this._getItemHeight();
     const viewportRect = this._viewportRuler.getViewportRect();
 
     const topSpaceAvailable = this._triggerRect.top - SELECT_PANEL_VIEWPORT_PADDING;
@@ -1110,14 +1148,14 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** Sets the transform origin point based on the selected option. */
   private _getOriginBasedOnOption(): string {
-    const itemHeight = this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+    const itemHeight = this._getItemHeight();
     const optionHeightAdjustment = (itemHeight - this._triggerRect.height) / 2;
     const originY = Math.abs(this._offsetY) - optionHeightAdjustment + itemHeight / 2;
     return `50% ${originY}px 0px`;
   }
 
   /** Handles the user pressing the arrow keys on a closed select.  */
-  private _handleArrowKey(event: KeyboardEvent): void {
+  private _handleClosedArrowKey(event: KeyboardEvent): void {
     if (this._multiple) {
       event.preventDefault();
       this.open();
@@ -1130,12 +1168,15 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
       // however the key manager only supports up/down at the moment.
       this._keyManager.onKeydown(event);
 
-      const currentActiveItem = this._keyManager.activeItem as MatOption;
+      // TODO(crisbeto): get rid of the Promise.resolve when #6441 gets in.
+      Promise.resolve().then(() => {
+        const currentActiveItem = this._keyManager.activeItem;
 
-      if (currentActiveItem !== prevActiveItem) {
-        this._clearSelection();
-        this._setSelectionByValue(currentActiveItem.value, true);
-      }
+        if (currentActiveItem && currentActiveItem !== prevActiveItem) {
+          this._clearSelection();
+          this._setSelectionByValue(currentActiveItem.value, true);
+        }
+      });
     }
   }
 
@@ -1144,8 +1185,15 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return this.options.length + this.optionGroups.length;
   }
 
+  /** Calculates the height of the select's options. */
+  private _getItemHeight(): number {
+    return this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
+  }
+
   // Implemented as part of MatFormFieldControl.
-  setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
+  setDescribedByIds(ids: string[]) {
+    this._ariaDescribedby = ids.join(' ');
+  }
 
   // Implemented as part of MatFormFieldControl.
   onContainerClick() {
@@ -1156,8 +1204,3 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   // Implemented as part of MatFormFieldControl.
   get shouldPlaceholderFloat() { return this._panelOpen || !this.empty; }
 }
-
-/** Clamps a value n between min and max values. */
-function clampValue(min: number, n: number, max: number): number {
-  return Math.min(Math.max(min, n), max);
-}

From f4673a59af06bbe8dce1e8d0fe5d05440b3beb1a Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Mon, 2 Oct 2017 20:14:50 -0400
Subject: [PATCH 221/575] fix(autocomplete): emit closing action for escape
 keydown event (#6250)

---
 src/lib/autocomplete/autocomplete-trigger.ts |  8 ++-
 src/lib/autocomplete/autocomplete.spec.ts    | 65 ++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index f1622d6c93fc..101d9f375711 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -38,6 +38,7 @@ import {MatOption, MatOptionSelectionChange} from '@angular/material/core';
 import {MatFormField} from '@angular/material/form-field';
 import {DOCUMENT} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
@@ -125,6 +126,9 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   /** The subscription for closing actions (some are bound to document). */
   private _closingActionsSubscription: Subscription;
 
+  /** Stream of escape keyboard events. */
+  private _escapeEventStream = new Subject<void>();
+
   /** View -> model callback called when value changes */
   _onChange: (value: any) => void = () => {};
 
@@ -145,6 +149,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
 
   ngOnDestroy() {
     this._destroyPanel();
+    this._escapeEventStream.complete();
   }
 
   /* Whether or not the autocomplete panel is open. */
@@ -186,6 +191,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     return merge(
       this.optionSelections,
       this.autocomplete._keyManager.tabOut,
+      this._escapeEventStream,
       this._outsideClickStream
     );
   }
@@ -262,7 +268,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
 
     if (keyCode === ESCAPE && this.panelOpen) {
       this._resetActiveItem();
-      this.closePanel();
+      this._escapeEventStream.next();
       event.stopPropagation();
     } else if (this.activeOption && keyCode === ENTER && this.panelOpen) {
       this.activeOption._selectViaInteraction();
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index aa8aafa97043..0f086b4fd1af 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1403,6 +1403,71 @@ describe('MatAutocomplete', () => {
     }));
   });
 
+  describe('panel closing', () => {
+    let fixture: ComponentFixture<SimpleAutocomplete>;
+    let input: HTMLInputElement;
+    let trigger: MatAutocompleteTrigger;
+    let closingActionSpy: jasmine.Spy;
+    let closingActionsSub: Subscription;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SimpleAutocomplete);
+      fixture.detectChanges();
+
+      input = fixture.debugElement.query(By.css('input')).nativeElement;
+
+      fixture.componentInstance.trigger.openPanel();
+      fixture.detectChanges();
+
+      trigger = fixture.componentInstance.trigger;
+      closingActionSpy = jasmine.createSpy('closing action listener');
+      closingActionsSub = trigger.panelClosingActions.subscribe(closingActionSpy);
+    });
+
+    afterEach(() => {
+      closingActionsSub.unsubscribe();
+    });
+
+    it('should emit panel close event when clicking away', async(() => {
+      fixture.whenStable().then(() => {
+        expect(closingActionSpy).not.toHaveBeenCalled();
+        dispatchFakeEvent(document, 'click');
+        expect(closingActionSpy).toHaveBeenCalled();
+      });
+    }));
+
+    it('should emit panel close event when tabbing out', async(() => {
+      const tabEvent = createKeyboardEvent('keydown', TAB);
+      input.focus();
+
+      fixture.whenStable().then(() => {
+        expect(closingActionSpy).not.toHaveBeenCalled();
+        trigger._handleKeydown(tabEvent);
+        expect(closingActionSpy).toHaveBeenCalled();
+      });
+    }));
+
+    it('should emit panel close event when selecting an option', async(() => {
+      fixture.whenStable().then(() => {
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+
+        expect(closingActionSpy).not.toHaveBeenCalled();
+        option.click();
+        expect(closingActionSpy).toHaveBeenCalled();
+      });
+    }));
+
+    it('should close the panel when pressing escape', async(() => {
+      const escapeEvent = createKeyboardEvent('keydown', ESCAPE);
+
+      fixture.whenStable().then(() => {
+        expect(closingActionSpy).not.toHaveBeenCalled();
+        trigger._handleKeydown(escapeEvent);
+        expect(closingActionSpy).toHaveBeenCalled();
+      });
+    }));
+  });
+
   describe('without matInput', () => {
     let fixture: ComponentFixture<AutocompleteWithNativeInput>;
 

From b6c0d2004c49f3a4a30d6f93fbcb8ff47cd8020e Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 2 Oct 2017 19:29:37 -0500
Subject: [PATCH 222/575] docs(api): fixes broken api docs post mat upgrade
 (#7457)

---
 src/lib/sidenav/drawer.ts                 | 4 ----
 tools/dgeni/processors/categorizer.js     | 3 ++-
 tools/dgeni/templates/class.template.html | 9 ++++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 175485fdb0b4..7962a7d7fc42 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -90,11 +90,7 @@ export class MatDrawerContent implements AfterContentInit {
 
 
 /**
- * <mat-drawer> component.
- *
  * This component corresponds to a drawer that can be opened on the drawer container.
- *
- * Please refer to README.md for examples on how to use it.
  */
 @Component({
   moduleId: module.id,
diff --git a/tools/dgeni/processors/categorizer.js b/tools/dgeni/processors/categorizer.js
index b10a947fa900..5253cd174b3c 100644
--- a/tools/dgeni/processors/categorizer.js
+++ b/tools/dgeni/processors/categorizer.js
@@ -220,10 +220,11 @@ function getDirectiveOutputAlias(doc) {
 function getDirectiveSelectors(classDoc) {
   const directiveSelectors = getMetadataProperty(classDoc, 'selector');
 
+
   if (directiveSelectors) {
     // Filter blacklisted selectors and remove line-breaks in resolved selectors.
     return directiveSelectors.replace(/[\r\n]/g, '').split(/\s*,\s*/)
-      .filter(s => s !== '' && !s.includes('mat') && !SELECTOR_BLACKLIST.has(s));
+      .filter(s => s !== '' && !s.includes('md') && !SELECTOR_BLACKLIST.has(s));
   }
 }
 
diff --git a/tools/dgeni/templates/class.template.html b/tools/dgeni/templates/class.template.html
index c09640614db1..791ffa9f0924 100644
--- a/tools/dgeni/templates/class.template.html
+++ b/tools/dgeni/templates/class.template.html
@@ -1,15 +1,18 @@
 <h4 class="docs-api-h4 docs-api-class-name">
   <code>{$ class.name $}</code>
 </h4>
-<p class="docs-api-class-description">{$ class.description | marked | safe $}</p>
+
+{%- if class.description -%}
+<p class="docs-api-class-description">{$ class.description | safe $}</p>
+{%- endif -%}
 
 {%- if class.directiveSelectors -%}
-<div class="docs-api-directive-selectors">
+<p class="docs-api-directive-selectors">
   <span class="docs-api-class-selector-label">Selector:</span>
   {% for selector in class.directiveSelectors %}
     <span class="docs-api-class-selector-name">{$ selector $}</span>
   {% endfor %}
-</div>
+</p>
 {%- endif -%}
 
 {%- if class.directiveExportAs -%}

From aa7b9b5bba353524ceba25185ef556d02b0d56f2 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 2 Oct 2017 17:31:43 -0700
Subject: [PATCH 223/575] chore: remove duplicate @Input's leftover from mat-
 transition (#7484)

---
 src/lib/chips/chip-input.ts | 11 -----------
 src/lib/sort/sort-header.ts |  4 ----
 2 files changed, 15 deletions(-)

diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index b014dd52b756..19e1ada6bc77 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -63,17 +63,6 @@ export class MatChipInput {
   @Output('matChipInputTokenEnd')
   chipEnd = new EventEmitter<MatChipInputEvent>();
 
-  @Input('matChipInputFor')
-  set matChipList(value: MatChipList) { this.chipList = value; }
-
-  @Input('matChipInputAddOnBlur')
-  get matAddOnBlur() { return this._addOnBlur; }
-  set matAddOnBlur(value) { this.addOnBlur = value; }
-
-  @Input('matChipInputSeparatorKeyCodes')
-  get matSeparatorKeyCodes() { return this.separatorKeyCodes; }
-  set matSeparatorKeyCodes(v: number[]) { this.separatorKeyCodes = v; }
-
   @Input() placeholder: string = '';
 
   get empty(): boolean {
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index eda8f464a566..ea8ee5082462 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -113,10 +113,6 @@ export class MatSortHeader implements MatSortable {
   set disableClear(v) { this._disableClear = coerceBooleanProperty(v); }
   private _disableClear: boolean;
 
-  @Input('mat-sort-header')
-  get _id() { return this.id; }
-  set _id(v: string) { this.id = v; }
-
   constructor(public _intl: MatSortHeaderIntl,
               changeDetectorRef: ChangeDetectorRef,
               @Optional() public _sort: MatSort,

From ac70420c2969d32d0e7bf2269351f5a20e785daf Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 2 Oct 2017 17:32:43 -0700
Subject: [PATCH 224/575] demo(expansion): add expansion panel accessibility
 demo page (#6703)

---
 src/demo-app/a11y/a11y-module.ts              |  3 +-
 src/demo-app/a11y/a11y.ts                     |  1 +
 .../a11y/expansion/expansion-a11y.html        | 53 +++++++++++++++++++
 .../a11y/expansion/expansion-a11y.scss        |  6 +++
 src/demo-app/a11y/expansion/expansion-a11y.ts | 10 ++++
 src/demo-app/a11y/routes.ts                   |  2 +
 6 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 src/demo-app/a11y/expansion/expansion-a11y.html
 create mode 100644 src/demo-app/a11y/expansion/expansion-a11y.scss
 create mode 100644 src/demo-app/a11y/expansion/expansion-a11y.ts

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index 81c854a3ec09..a19d73441da0 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -19,7 +19,7 @@ import {
   DialogNeptuneIFrameDialog,
   DialogWelcomeExampleDialog
 } from './dialog/dialog-a11y';
-
+import {ExpansionPanelAccessibilityDemo} from './expansion/expansion-a11y';
 import {GridListAccessibilityDemo} from './grid-list/grid-list-a11y';
 import {RadioAccessibilityDemo} from './radio/radio-a11y';
 import {ToolbarAccessibilityDemo} from './toolbar/toolbar-a11y';
@@ -76,6 +76,7 @@ export class AccessibilityRoutingModule {}
     DialogNeptuneExampleDialog,
     DialogNeptuneIFrameDialog,
     DialogWelcomeExampleDialog,
+    ExpansionPanelAccessibilityDemo,
     GridListAccessibilityDemo,
     IconAccessibilityDemo,
     InputAccessibilityDemo,
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 63f6c7c63414..d6dd7063b52f 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -32,6 +32,7 @@ export class AccessibilityDemo {
     {name: 'Chips', route: 'chips'},
     {name: 'Datepicker', route: 'datepicker'},
     {name: 'Dialog', route: 'dialog'},
+    {name: 'Expansion panel', route: 'expansion'},
     {name: 'Grid list', route: 'grid-list'},
     {name: 'Icon', route: 'icon'},
     {name: 'Input', route: 'input'},
diff --git a/src/demo-app/a11y/expansion/expansion-a11y.html b/src/demo-app/a11y/expansion/expansion-a11y.html
new file mode 100644
index 000000000000..3d50dec3273e
--- /dev/null
+++ b/src/demo-app/a11y/expansion/expansion-a11y.html
@@ -0,0 +1,53 @@
+<section class="demo-expansion">
+  <h2>Siberian Husky</h2>
+  <p>Single expansion panel</p>
+  <mat-expansion-panel class="mat-expansion-demo-width" #myPanel>
+    <mat-expansion-panel-header>
+      <mat-panel-description>
+        Dog breed
+      </mat-panel-description>
+      <mat-panel-title>Siberian Husky</mat-panel-title>
+    </mat-expansion-panel-header>
+    The Siberian Husky is a medium size working dog breed that originated
+    in north-eastern Siberia, Russia. The breed belongs to the Spitz genetic family.
+    <mat-action-row>
+      <button mat-button (click)="myPanel.expanded = false">Cancel</button>
+      <a mat-button href="https://en.wikipedia.org/wiki/Siberian_Husky" target="_blank">Wikipedia</a>
+    </mat-action-row>
+  </mat-expansion-panel>
+</section>
+
+<section class="demo-expansion">
+  <h2>Dog breeds</h2>
+  <p>Multiple expansion panel</p>
+  <mat-accordion class="mat-expansion-demo-width">
+    <mat-expansion-panel #panel1 >
+      <mat-expansion-panel-header>Golden Retriever</mat-expansion-panel-header>
+      <p>
+        The Golden Retriever is a large-sized breed of dog bred as gun dogs to retrieve shot
+        waterfowl such as ducks and upland game birds during hunting and shooting parties, and
+        were named 'retriever' because of their ability to retrieve shot game undamaged.
+        Golden Retrievers have an instinctive love of water, and are easy to train to basic
+        or advanced obedience standards.
+      </p>
+    </mat-expansion-panel>
+    <mat-expansion-panel #panel2 [disabled]="true">
+      <mat-expansion-panel-header>Beagle</mat-expansion-panel-header>
+      <p>
+        The Beagle is a breed of small hound, similar in appearance to the much larger foxhound.
+        The beagle is a scent hound, developed primarily for hunting hare.
+      </p>
+    </mat-expansion-panel>
+    <mat-expansion-panel #panel3 >
+      <mat-expansion-panel-header>Dachshund</mat-expansion-panel-header>
+      <p>
+        The dachshund is a short-legged, long-bodied, hound-type dog breed. The standard size
+        dachshund was developed to scent, chase, and flush out badgers and other burrow-dwelling
+        animals, while the miniature ...
+      </p>
+      <mat-action-row>
+        <button mat-button (click)="panel3.expanded = false">Close</button>
+      </mat-action-row>
+    </mat-expansion-panel>
+  </mat-accordion>
+</section>
diff --git a/src/demo-app/a11y/expansion/expansion-a11y.scss b/src/demo-app/a11y/expansion/expansion-a11y.scss
new file mode 100644
index 000000000000..d150f2dddcd5
--- /dev/null
+++ b/src/demo-app/a11y/expansion/expansion-a11y.scss
@@ -0,0 +1,6 @@
+.demo-expansion {
+  button, a {
+    margin: 8px;
+    text-transform: uppercase;
+  }
+}
diff --git a/src/demo-app/a11y/expansion/expansion-a11y.ts b/src/demo-app/a11y/expansion/expansion-a11y.ts
new file mode 100644
index 000000000000..19d2f9b1e0a8
--- /dev/null
+++ b/src/demo-app/a11y/expansion/expansion-a11y.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+@Component({
+  moduleId: module.id,
+  selector: 'expansion-a11y',
+  templateUrl: 'expansion-a11y.html',
+  styleUrls: ['expansion-a11y.css']
+})
+export class ExpansionPanelAccessibilityDemo {
+}
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index a9d82c0e668c..6f4af2c023e0 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -6,6 +6,7 @@ import {CardAccessibilityDemo} from './card/card-a11y';
 import {CheckboxAccessibilityDemo} from './checkbox/checkbox-a11y';
 import {ChipsAccessibilityDemo} from './chips/chips-a11y';
 import {DialogAccessibilityDemo} from './dialog/dialog-a11y';
+import {ExpansionPanelAccessibilityDemo} from './expansion/expansion-a11y';
 import {GridListAccessibilityDemo} from './grid-list/grid-list-a11y';
 import {RadioAccessibilityDemo} from './radio/radio-a11y';
 import {AccessibilityHome} from './a11y';
@@ -34,6 +35,7 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'chips', component: ChipsAccessibilityDemo},
   {path: 'datepicker', component: DatepickerAccessibilityDemo},
   {path: 'dialog', component: DialogAccessibilityDemo},
+  {path: 'expansion', component: ExpansionPanelAccessibilityDemo},
   {path: 'grid-list', component: GridListAccessibilityDemo},
   {path: 'icon', component: IconAccessibilityDemo},
   {path: 'input', component: InputAccessibilityDemo},

From 6e3bbcb6ef90a37145204bc8775626679f655b91 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 3 Oct 2017 20:48:53 +0200
Subject: [PATCH 225/575] fix(stepper): unable to internationalize labels
 (#7122)

---
 src/lib/stepper/public-api.ts     |  2 +-
 src/lib/stepper/step-header.html  |  2 +-
 src/lib/stepper/step-header.ts    | 20 ++++++++++++++++--
 src/lib/stepper/stepper-intl.ts   | 24 ++++++++++++++++++++++
 src/lib/stepper/stepper-module.ts |  2 ++
 src/lib/stepper/stepper.md        | 34 ++++++++++++++++++++++---------
 src/lib/stepper/stepper.spec.ts   | 20 ++++++++++++++++--
 7 files changed, 88 insertions(+), 16 deletions(-)
 create mode 100644 src/lib/stepper/stepper-intl.ts

diff --git a/src/lib/stepper/public-api.ts b/src/lib/stepper/public-api.ts
index 3fa16f569ac9..302085124235 100644
--- a/src/lib/stepper/public-api.ts
+++ b/src/lib/stepper/public-api.ts
@@ -11,4 +11,4 @@ export * from './step-label';
 export * from './stepper';
 export * from './stepper-button';
 export * from './step-header';
-
+export * from './stepper-intl';
diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index 580a382e4b22..e0115b4a0f50 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -15,6 +15,6 @@
   <!-- It there is no label template, fall back to the text label. -->
   <div class="mat-step-text-label" *ngIf="_stringLabel()">{{label}}</div>
 
-  <div class="mat-step-optional" *ngIf="optional">Optional</div>
+  <div class="mat-step-optional" *ngIf="optional">{{_intl.optionalLabel}}</div>
 </div>
 
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 90fdadcefb8d..42f11b755ee1 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -8,8 +8,18 @@
 
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
-import {Component, Input, ViewEncapsulation, ElementRef, OnDestroy, Renderer2} from '@angular/core';
+import {
+  Component,
+  Input,
+  ViewEncapsulation,
+  ChangeDetectorRef,
+  OnDestroy,
+  ElementRef,
+  Renderer2,
+} from '@angular/core';
 import {MatStepLabel} from './step-label';
+import {MatStepperIntl} from './stepper-intl';
+import {Subscription} from 'rxjs/Subscription';
 
 
 @Component({
@@ -25,6 +35,8 @@ import {MatStepLabel} from './step-label';
   preserveWhitespaces: false,
 })
 export class MatStepHeader implements OnDestroy {
+  private _intlSubscription: Subscription;
+
   /** Icon for the given step. */
   @Input() icon: string;
 
@@ -64,13 +76,17 @@ export class MatStepHeader implements OnDestroy {
   private _optional: boolean;
 
   constructor(
+    public _intl: MatStepperIntl,
     private _focusMonitor: FocusMonitor,
     private _element: ElementRef,
-    renderer: Renderer2) {
+    renderer: Renderer2,
+    changeDetectorRef: ChangeDetectorRef) {
     _focusMonitor.monitor(_element.nativeElement, renderer, true);
+    this._intlSubscription = _intl.changes.subscribe(() => changeDetectorRef.markForCheck());
   }
 
   ngOnDestroy() {
+    this._intlSubscription.unsubscribe();
     this._focusMonitor.stopMonitoring(this._element.nativeElement);
   }
 
diff --git a/src/lib/stepper/stepper-intl.ts b/src/lib/stepper/stepper-intl.ts
new file mode 100644
index 000000000000..2975cdb8006a
--- /dev/null
+++ b/src/lib/stepper/stepper-intl.ts
@@ -0,0 +1,24 @@
+/**
+ * @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 {Injectable} from '@angular/core';
+import {Subject} from 'rxjs/Subject';
+
+
+/** Stepper data that is required for internationalization. */
+@Injectable()
+export class MatStepperIntl {
+  /**
+   * Stream that emits whenever the labels here are changed. Use this to notify
+   * components if the labels have changed after initialization.
+   */
+  changes: Subject<void> = new Subject<void>();
+
+  /** Label that is rendered below optional steps. */
+  optionalLabel = 'Optional';
+}
diff --git a/src/lib/stepper/stepper-module.ts b/src/lib/stepper/stepper-module.ts
index 02f8b4f65867..970e93b45099 100644
--- a/src/lib/stepper/stepper-module.ts
+++ b/src/lib/stepper/stepper-module.ts
@@ -18,6 +18,7 @@ import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
 import {MatHorizontalStepper, MatStep, MatStepper, MatVerticalStepper} from './stepper';
 import {MatStepperNext, MatStepperPrevious} from './stepper-button';
+import {MatStepperIntl} from './stepper-intl';
 
 
 @NgModule({
@@ -44,5 +45,6 @@ import {MatStepperNext, MatStepperPrevious} from './stepper-button';
   ],
   declarations: [MatHorizontalStepper, MatVerticalStepper, MatStep, MatStepLabel, MatStepper,
     MatStepperNext, MatStepperPrevious, MatStepHeader],
+  providers: [MatStepperIntl],
 })
 export class MatStepperModule {}
diff --git a/src/lib/stepper/stepper.md b/src/lib/stepper/stepper.md
index e41d89b68c39..808a25b769c8 100644
--- a/src/lib/stepper/stepper.md
+++ b/src/lib/stepper/stepper.md
@@ -7,8 +7,8 @@ that drives a stepped workflow. Material stepper extends the CDK stepper and has
 styling.
 
 ### Stepper variants
-There are two stepper components: `mat-horizontal-stepper` and `mat-vertical-stepper`. They 
-can be used the same way. The only difference is the orientation of stepper. 
+There are two stepper components: `mat-horizontal-stepper` and `mat-vertical-stepper`. They
+can be used the same way. The only difference is the orientation of stepper.
 `mat-horizontal-stepper` selector can be used to create a horizontal stepper, and
 `mat-vertical-stepper` can be used to create a vertical stepper. `mat-step` components need to be
 placed inside either one of the two stepper components.
@@ -26,7 +26,7 @@ If a step's label is only text, then the `label` attribute can be used.
 </mat-vertical-stepper>
 ```
 
-For more complex labels, add a template with the `matStepLabel` directive inside the 
+For more complex labels, add a template with the `matStepLabel` directive inside the
 `mat-step`.
 ```html
 <mat-vertical-stepper>
@@ -49,14 +49,14 @@ There are two button directives to support navigation between different steps:
       <button mat-button matStepperNext>Next</button>
     </div>
   </mat-step>
-</mat-horizontal-stepper>  
+</mat-horizontal-stepper>
 ```
 
 ### Linear stepper
 The `linear` attribute can be set on `mat-horizontal-stepper` and `mat-vertical-stepper` to create
 a linear stepper that requires the user to complete previous steps before proceeding
 to following steps. For each `mat-step`, the `stepControl` attribute can be set to the top level
-`AbstractControl` that is used to check the validity of the step. 
+`AbstractControl` that is used to check the validity of the step.
 
 There are two possible approaches. One is using a single form for stepper, and the other is
 using a different form for each step.
@@ -64,7 +64,7 @@ using a different form for each step.
 #### Using a single form
 When using a single form for the stepper, `matStepperPrevious` and `matStepperNext` have to be
 set to `type="button"` in order to prevent submission of the form before all steps
-are completed. 
+are completed.
 
 ```html
 <form [formGroup]="formGroup">
@@ -83,7 +83,7 @@ are completed.
       </div>
     </mat-step>
     ...
-  </mat-horizontal-stepper> 
+  </mat-horizontal-stepper>
 </form>
 ```
 
@@ -106,11 +106,11 @@ are completed.
 
 #### Optional step
 If completion of a step in linear stepper is not required, then the `optional` attribute can be set
-on `mat-step`. 
+on `mat-step`.
 
 #### Editable step
 By default, steps are editable, which means users can return to previously completed steps and
-edit their responses. `editable="true"` can be set on `mat-step` to change the default. 
+edit their responses. `editable="true"` can be set on `mat-step` to change the default.
 
 #### Completed step
 By default, the `completed` attribute of a step returns `true` if the step is valid (in case of
@@ -124,6 +124,20 @@ this default `completed` behavior by setting the `completed` attribute as needed
 - <kbd>TAB</kbd>: Focuses the next tabbable element
 - <kbd>TAB</kbd>+<kbd>SHIFT</kbd>: Focuses the previous tabbable element
 
+### Localizing labels
+Labels used by the stepper are provided through `MatStepperIntl`. Localization of these messages
+can be done by providing a subclass with translated values in your application root module.
+
+```ts
+@NgModule({
+  imports: [MatStepperModule],
+  providers: [
+    {provide: MatStepperIntl, useClass: MyIntl},
+  ],
+})
+export class MyApp {}
+```
+
 ### Accessibility
 The stepper is treated as a tabbed view for accessibility purposes, so it is given
 `role="tablist"` by default. The header of step that can be clicked to select the step
@@ -131,4 +145,4 @@ is given `role="tab"`, and the content that can be expanded upon selection is gi
 `role="tabpanel"`. `aria-selected` attribute of step header and `aria-expanded` attribute of
 step content is automatically set based on step selection change.
 
-The stepper and each step should be given a meaningful label via `aria-label` or `aria-labelledby`.
\ No newline at end of file
+The stepper and each step should be given a meaningful label via `aria-label` or `aria-labelledby`.
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 8f07d66f4ef6..7413e001946f 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -2,13 +2,14 @@ import {Directionality} from '@angular/cdk/bidi';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatStepperModule} from './index';
 import {MatHorizontalStepper, MatStep, MatStepper, MatVerticalStepper} from './stepper';
 import {MatStepperNext, MatStepperPrevious} from './stepper-button';
+import {MatStepperIntl} from './stepper-intl';
 
 const VALID_REGEX = /valid/;
 
@@ -95,6 +96,21 @@ describe('MatHorizontalStepper', () => {
     it('should set done icon if step is not editable and is completed', () => {
       assertCorrectStepIcon(fixture, false, 'done');
     });
+
+    it('should re-render when the i18n labels change',
+      inject([MatStepperIntl], (intl: MatStepperIntl) => {
+        const header = fixture.debugElement.queryAll(By.css('mat-step-header'))[2].nativeElement;
+        const optionalLabel = header.querySelector('.mat-step-optional');
+
+        expect(optionalLabel).toBeTruthy();
+        expect(optionalLabel.textContent).toBe('Optional');
+
+        intl.optionalLabel = 'Valgfri';
+        intl.changes.next();
+        fixture.detectChanges();
+
+        expect(optionalLabel.textContent).toBe('Valgfri');
+      }));
   });
 
   describe('RTL', () => {
@@ -686,7 +702,7 @@ function assertCorrectStepIcon(fixture: ComponentFixture<any>,
           <button mat-button matStepperNext>Next</button>
         </div>
       </mat-step>
-      <mat-step [label]="inputLabel">
+      <mat-step [label]="inputLabel" optional>
         Content 3
         <div>
           <button mat-button matStepperPrevious>Back</button>

From 36da4c3991e0fd3b15a70d2a75a01c080927be9b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 3 Oct 2017 20:50:46 +0200
Subject: [PATCH 226/575] refactor(autocomplete): make keyboard and visibility
 calls synchronous (#6441)

---
 src/cdk/a11y/activedescendant-key-manager.ts |  16 +-
 src/cdk/a11y/list-key-manager.spec.ts        |  27 +-
 src/cdk/rxjs/rx-operators.ts                 |   7 +
 src/lib/autocomplete/autocomplete-trigger.ts |  23 +-
 src/lib/autocomplete/autocomplete.spec.ts    | 452 ++++++++-----------
 src/lib/autocomplete/autocomplete.ts         |  14 +-
 tools/package-tools/rollup-globals.ts        |   1 +
 7 files changed, 227 insertions(+), 313 deletions(-)

diff --git a/src/cdk/a11y/activedescendant-key-manager.ts b/src/cdk/a11y/activedescendant-key-manager.ts
index 40f0d40144c9..0c3781936bce 100644
--- a/src/cdk/a11y/activedescendant-key-manager.ts
+++ b/src/cdk/a11y/activedescendant-key-manager.ts
@@ -26,15 +26,13 @@ export class ActiveDescendantKeyManager<T> extends ListKeyManager<Highlightable
    * styles from the previously active item.
    */
   setActiveItem(index: number): void {
-    Promise.resolve().then(() => {
-      if (this.activeItem) {
-        this.activeItem.setInactiveStyles();
-      }
-      super.setActiveItem(index);
-      if (this.activeItem) {
-        this.activeItem.setActiveStyles();
-      }
-    });
+    if (this.activeItem) {
+      this.activeItem.setInactiveStyles();
+    }
+    super.setActiveItem(index);
+    if (this.activeItem) {
+      this.activeItem.setActiveStyles();
+    }
   }
 
 }
diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index ac0e83a45e91..a25a3720e278 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -550,13 +550,12 @@ describe('Key managers', () => {
   describe('ActiveDescendantKeyManager', () => {
     let keyManager: ActiveDescendantKeyManager<FakeHighlightable>;
 
-    beforeEach(fakeAsync(() => {
+    beforeEach(() => {
       itemList.items = [new FakeHighlightable(), new FakeHighlightable(), new FakeHighlightable()];
       keyManager = new ActiveDescendantKeyManager<FakeHighlightable>(itemList);
 
       // first item is already focused
       keyManager.setFirstItemActive();
-      tick();
 
       spyOn(itemList.items[0], 'setActiveStyles');
       spyOn(itemList.items[1], 'setActiveStyles');
@@ -565,44 +564,38 @@ describe('Key managers', () => {
       spyOn(itemList.items[0], 'setInactiveStyles');
       spyOn(itemList.items[1], 'setInactiveStyles');
       spyOn(itemList.items[2], 'setInactiveStyles');
-    }));
+    });
 
-    it('should set subsequent items as active with the DOWN arrow', fakeAsync(() => {
+    it('should set subsequent items as active with the DOWN arrow', () => {
       keyManager.onKeydown(fakeKeyEvents.downArrow);
-      tick();
 
       expect(itemList.items[1].setActiveStyles).toHaveBeenCalled();
       expect(itemList.items[2].setActiveStyles).not.toHaveBeenCalled();
 
       keyManager.onKeydown(fakeKeyEvents.downArrow);
-      tick();
 
       expect(itemList.items[2].setActiveStyles).toHaveBeenCalled();
-    }));
+    });
 
-    it('should set previous items as active with the UP arrow', fakeAsync(() => {
+    it('should set previous items as active with the UP arrow', () => {
       keyManager.setLastItemActive();
-      tick();
-
       keyManager.onKeydown(fakeKeyEvents.upArrow);
-      tick();
+
       expect(itemList.items[1].setActiveStyles).toHaveBeenCalled();
       expect(itemList.items[0].setActiveStyles).not.toHaveBeenCalled();
 
       keyManager.onKeydown(fakeKeyEvents.upArrow);
-      tick();
+
       expect(itemList.items[0].setActiveStyles).toHaveBeenCalled();
-    }));
+    });
 
-    it('should set inactive styles on previously active items', fakeAsync(() => {
+    it('should set inactive styles on previously active items', () => {
       keyManager.onKeydown(fakeKeyEvents.downArrow);
-      tick();
       expect(itemList.items[0].setInactiveStyles).toHaveBeenCalled();
 
       keyManager.onKeydown(fakeKeyEvents.upArrow);
-      tick();
       expect(itemList.items[1].setInactiveStyles).toHaveBeenCalled();
-    }));
+    });
 
   });
 
diff --git a/src/cdk/rxjs/rx-operators.ts b/src/cdk/rxjs/rx-operators.ts
index ba0c07f96e03..5c9ed9c33bb3 100644
--- a/src/cdk/rxjs/rx-operators.ts
+++ b/src/cdk/rxjs/rx-operators.ts
@@ -22,6 +22,7 @@ import {startWith as startWithOperator} from 'rxjs/operator/startWith';
 import {debounceTime as debounceTimeOperator} from 'rxjs/operator/debounceTime';
 import {auditTime as auditTimeOperator} from 'rxjs/operator/auditTime';
 import {takeUntil as takeUntilOperator} from 'rxjs/operator/takeUntil';
+import {delay as delayOperator} from 'rxjs/operator/delay';
 
 /**
  * Represents a strongly-typed chain of RxJS operators.
@@ -71,6 +72,9 @@ export interface StrictRxChain<T> {
 
   call(operator: takeUntilOperatorType<T>, notifier: Observable<any>): StrictRxChain<T>;
 
+  call(operator: delayOperatorType<T>, delay: number | Date, scheduler?: IScheduler):
+        StrictRxChain<T>;
+
   subscribe(fn: (t: T) => void): Subscription;
 
   result(): Observable<T>;
@@ -89,6 +93,7 @@ export class StartWithBrand { private _; }
 export class DebounceTimeBrand { private _; }
 export class AuditTimeBrand { private _; }
 export class TakeUntilBrand { private _; }
+export class DelayBrand { private _; }
 /* tslint:enable:no-unused-variable */
 
 
@@ -104,6 +109,7 @@ export type startWithOperatorType<T> = typeof startWithOperator & StartWithBrand
 export type debounceTimeOperatorType<T> = typeof debounceTimeOperator & DebounceTimeBrand;
 export type auditTimeOperatorType<T> = typeof auditTimeOperator & AuditTimeBrand;
 export type takeUntilOperatorType<T> = typeof takeUntilOperator & TakeUntilBrand;
+export type delayOperatorType<T> = typeof delayOperator & DelayBrand;
 
 // We add `Function` to the type intersection to make this nomically different from
 // `finallyOperatorType` while still being structurally the same. Without this, TypeScript tries to
@@ -123,3 +129,4 @@ export const debounceTime =
     debounceTimeOperator as typeof debounceTimeOperator & DebounceTimeBrand & Function;
 export const auditTime = auditTimeOperator as typeof auditTimeOperator & AuditTimeBrand & Function;
 export const takeUntil = takeUntilOperator as typeof takeUntilOperator & TakeUntilBrand & Function;
+export const delay = delayOperator as typeof delayOperator & DelayBrand & Function;
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 101d9f375711..afc41b06b4a0 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
-import {filter, first, map, RxChain, switchMap} from '@angular/cdk/rxjs';
+import {filter, first, RxChain, switchMap, doOperator, delay} from '@angular/cdk/rxjs';
 import {
   ChangeDetectorRef,
   Directive,
@@ -284,11 +284,9 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
         this.openPanel();
       }
 
-      Promise.resolve().then(() => {
-        if (isArrowKey || this.autocomplete._keyManager.activeItem !== prevActiveItem) {
-          this._scrollToOption();
-        }
-      });
+      if (isArrowKey || this.autocomplete._keyManager.activeItem !== prevActiveItem) {
+        this._scrollToOption();
+      }
     }
   }
 
@@ -356,9 +354,8 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
       this.autocomplete._setScrollTop(optionOffset);
     } else if (optionOffset + AUTOCOMPLETE_OPTION_HEIGHT > panelTop + AUTOCOMPLETE_PANEL_HEIGHT) {
       // Scroll down to reveal selected option scrolled below the panel bottom
-      const newScrollTop =
-          Math.max(0, optionOffset - AUTOCOMPLETE_PANEL_HEIGHT + AUTOCOMPLETE_OPTION_HEIGHT);
-      this.autocomplete._setScrollTop(newScrollTop);
+      const newScrollTop = optionOffset - AUTOCOMPLETE_PANEL_HEIGHT + AUTOCOMPLETE_OPTION_HEIGHT;
+      this.autocomplete._setScrollTop(Math.max(0, newScrollTop));
     }
   }
 
@@ -368,8 +365,12 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    */
   private _subscribeToClosingActions(): Subscription {
     const firstStable = first.call(this._zone.onStable.asObservable());
-    const optionChanges = map.call(this.autocomplete.options.changes, () =>
-      this._positionStrategy.recalculateLastPosition());
+    const optionChanges = RxChain.from(this.autocomplete.options.changes)
+      .call(doOperator, () => this._positionStrategy.recalculateLastPosition())
+      // Defer emitting to the stream until the next tick, because changing
+      // bindings in here will cause "changed after checked" errors.
+      .call(delay, 0)
+      .result();
 
     // When the zone is stable initially, and when the option list changes...
     return RxChain.from(merge(firstStable, optionChanges))
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 0f086b4fd1af..80929c5c383b 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -106,22 +106,20 @@ describe('MatAutocomplete', () => {
       input = fixture.debugElement.query(By.css('input')).nativeElement;
     });
 
-    it('should open the panel when the input is focused', async(() => {
+    it('should open the panel when the input is focused', () => {
       expect(fixture.componentInstance.trigger.panelOpen)
           .toBe(false, `Expected panel state to start out closed.`);
 
       dispatchFakeEvent(input, 'focusin');
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
+      fixture.detectChanges();
 
-        expect(fixture.componentInstance.trigger.panelOpen)
-            .toBe(true, `Expected panel state to read open when input is focused.`);
-        expect(overlayContainerElement.textContent)
-            .toContain('Alabama', `Expected panel to display when input is focused.`);
-        expect(overlayContainerElement.textContent)
-            .toContain('California', `Expected panel to display when input is focused.`);
-      });
-    }));
+      expect(fixture.componentInstance.trigger.panelOpen)
+          .toBe(true, `Expected panel state to read open when input is focused.`);
+      expect(overlayContainerElement.textContent)
+          .toContain('Alabama', `Expected panel to display when input is focused.`);
+      expect(overlayContainerElement.textContent)
+          .toContain('California', `Expected panel to display when input is focused.`);
+    });
 
     it('should not open the panel on focus if the input is readonly', async(() => {
       const trigger = fixture.componentInstance.trigger;
@@ -137,22 +135,20 @@ describe('MatAutocomplete', () => {
       });
     }));
 
-    it('should open the panel programmatically', async(() => {
+    it('should open the panel programmatically', () => {
       expect(fixture.componentInstance.trigger.panelOpen)
           .toBe(false, `Expected panel state to start out closed.`);
 
       fixture.componentInstance.trigger.openPanel();
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
+      fixture.detectChanges();
 
-        expect(fixture.componentInstance.trigger.panelOpen)
-            .toBe(true, `Expected panel state to read open when opened programmatically.`);
-        expect(overlayContainerElement.textContent)
-            .toContain('Alabama', `Expected panel to display when opened programmatically.`);
-        expect(overlayContainerElement.textContent)
-            .toContain('California', `Expected panel to display when opened programmatically.`);
-      });
-    }));
+      expect(fixture.componentInstance.trigger.panelOpen)
+          .toBe(true, `Expected panel state to read open when opened programmatically.`);
+      expect(overlayContainerElement.textContent)
+          .toContain('Alabama', `Expected panel to display when opened programmatically.`);
+      expect(overlayContainerElement.textContent)
+          .toContain('California', `Expected panel to display when opened programmatically.`);
+    });
 
     it('should show the panel when the first open is after the initial zone stabilization',
       async(() => {
@@ -169,7 +165,7 @@ describe('MatAutocomplete', () => {
         });
       }));
 
-    it('should close the panel when the user clicks away', async(() => {
+    it('should close the panel when the user clicks away', () => {
       dispatchFakeEvent(input, 'focusin');
       fixture.detectChanges();
 
@@ -181,7 +177,7 @@ describe('MatAutocomplete', () => {
         expect(overlayContainerElement.textContent)
             .toEqual('', `Expected clicking outside the panel to close the panel.`);
       });
-    }));
+    });
 
     it('should close the panel when the user taps away on a touch device', async(() => {
       dispatchFakeEvent(input, 'focus');
@@ -245,22 +241,18 @@ describe('MatAutocomplete', () => {
       });
     }));
 
-    it('should close the panel programmatically', async(() => {
+    it('should close the panel programmatically', () => {
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        fixture.componentInstance.trigger.closePanel();
-        fixture.detectChanges();
+      fixture.componentInstance.trigger.closePanel();
+      fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          expect(fixture.componentInstance.trigger.panelOpen)
-              .toBe(false, `Expected closing programmatically to set the panel state to closed.`);
-          expect(overlayContainerElement.textContent)
-              .toEqual('', `Expected closing programmatically to close the panel.`);
-        });
-      });
-    }));
+      expect(fixture.componentInstance.trigger.panelOpen)
+          .toBe(false, `Expected closing programmatically to set the panel state to closed.`);
+      expect(overlayContainerElement.textContent)
+          .toEqual('', `Expected closing programmatically to close the panel.`);
+    });
 
     it('should not throw when attempting to close the panel of a destroyed autocomplete', () => {
       const trigger = fixture.componentInstance.trigger;
@@ -272,28 +264,23 @@ describe('MatAutocomplete', () => {
       expect(() => trigger.closePanel()).not.toThrow();
     });
 
-    it('should hide the panel when the options list is empty', async(() => {
+    it('should hide the panel when the options list is empty', fakeAsync(() => {
       dispatchFakeEvent(input, 'focusin');
+      fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
-
-        const panel =
-            overlayContainerElement.querySelector('.mat-autocomplete-panel') as HTMLElement;
-        expect(panel.classList)
-            .toContain('mat-autocomplete-visible', `Expected panel to start out visible.`);
+      const panel = overlayContainerElement.querySelector('.mat-autocomplete-panel') as HTMLElement;
 
-        // Filter down the option list such that no options match the value
-        typeInElement('af', input);
-        fixture.detectChanges();
+      expect(panel.classList)
+          .toContain('mat-autocomplete-visible', `Expected panel to start out visible.`);
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
+      // Filter down the option list such that no options match the value
+      typeInElement('af', input);
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
 
-          expect(panel.classList)
-              .toContain('mat-autocomplete-hidden', `Expected panel to hide itself when empty.`);
-        });
-      });
+      expect(panel.classList)
+          .toContain('mat-autocomplete-hidden', `Expected panel to hide itself when empty.`);
     }));
 
     it('should keep the label floating until the panel closes', async(() => {
@@ -532,31 +519,29 @@ describe('MatAutocomplete', () => {
         });
     }));
 
-    it('should fill the text field correctly if value is set to obj programmatically', async(() => {
-      fixture.whenStable().then(() => {
+    it('should fill the text field correctly if value is set to obj programmatically',
+      fakeAsync(() => {
         fixture.componentInstance.stateCtrl.setValue({code: 'AL', name: 'Alabama'});
         fixture.detectChanges();
+        tick();
+        fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
-          expect(input.value)
-              .toContain('Alabama', `Expected input to fill with matching option's viewValue.`);
-        });
-      });
-    }));
+        expect(input.value)
+            .toContain('Alabama', `Expected input to fill with matching option's viewValue.`);
+      }));
 
-    it('should clear the text field if value is reset programmatically', async(() => {
+    it('should clear the text field if value is reset programmatically', fakeAsync(() => {
       typeInElement('Alabama', input);
       fixture.detectChanges();
+      tick();
 
-      fixture.whenStable().then(() => {
-        fixture.componentInstance.stateCtrl.reset();
+      fixture.componentInstance.stateCtrl.reset();
+      tick();
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
-          expect(input.value).toEqual('', `Expected input value to be empty after reset.`);
-        });
-      });
+      fixture.detectChanges();
+      tick();
+
+      expect(input.value).toEqual('', `Expected input value to be empty after reset.`);
     }));
 
     it('should disable input in view when disabled programmatically', () => {
@@ -577,7 +562,6 @@ describe('MatAutocomplete', () => {
           .toBe(true, `Expected input underline to display disabled styles.`);
     });
 
-
     it('should mark the autocomplete control as dirty as user types', () => {
       expect(fixture.componentInstance.stateCtrl.dirty)
           .toBe(false, `Expected control to start out pristine.`);
@@ -653,18 +637,15 @@ describe('MatAutocomplete', () => {
       fixture.detectChanges();
     });
 
-    it('should not focus the option when DOWN key is pressed', async(() => {
-      fixture.whenStable().then(() => {
-        spyOn(fixture.componentInstance.options.first, 'focus');
+    it('should not focus the option when DOWN key is pressed', () => {
+      spyOn(fixture.componentInstance.options.first, 'focus');
 
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-        expect(fixture.componentInstance.options.first.focus).not.toHaveBeenCalled();
-      });
-    }));
+      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      expect(fixture.componentInstance.options.first.focus).not.toHaveBeenCalled();
+    });
 
-    it('should not close the panel when DOWN key is pressed', async(() => {
-      fixture.whenStable().then(() => {
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+    it('should not close the panel when DOWN key is pressed', () => {
+      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
 
       expect(fixture.componentInstance.trigger.panelOpen)
           .toBe(true, `Expected panel state to stay open when DOWN key is pressed.`);
@@ -672,24 +653,17 @@ describe('MatAutocomplete', () => {
           .toContain('Alabama', `Expected panel to keep displaying when DOWN key is pressed.`);
       expect(overlayContainerElement.textContent)
           .toContain('California', `Expected panel to keep displaying when DOWN key is pressed.`);
-      });
-    }));
+    });
 
-    it('should set the active item to the first option when DOWN key is pressed', fakeAsync(() => {
-      tick();
+    it('should set the active item to the first option when DOWN key is pressed', () => {
       const componentInstance = fixture.componentInstance;
       const optionEls =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
-      fixture.detectChanges();
-
       expect(componentInstance.trigger.panelOpen)
           .toBe(true, 'Expected first down press to open the pane.');
 
       componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
       fixture.detectChanges();
 
       expect(componentInstance.trigger.activeOption === componentInstance.options.first)
@@ -698,30 +672,23 @@ describe('MatAutocomplete', () => {
       expect(optionEls[1].classList).not.toContain('mat-active');
 
       componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
       fixture.detectChanges();
 
       expect(componentInstance.trigger.activeOption === componentInstance.options.toArray()[1])
           .toBe(true, 'Expected second option to be active.');
       expect(optionEls[0].classList).not.toContain('mat-active');
       expect(optionEls[1].classList).toContain('mat-active');
-    }));
+    });
 
-    it('should set the active item to the last option when UP key is pressed', fakeAsync(() => {
-      tick();
+    it('should set the active item to the last option when UP key is pressed', () => {
       const componentInstance = fixture.componentInstance;
       const optionEls =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
-      tick();
-      fixture.detectChanges();
-
       expect(componentInstance.trigger.panelOpen)
           .toBe(true, 'Expected first up press to open the pane.');
 
       componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
-      tick();
       fixture.detectChanges();
 
       expect(componentInstance.trigger.activeOption === componentInstance.options.last)
@@ -730,13 +697,12 @@ describe('MatAutocomplete', () => {
       expect(optionEls[0].classList).not.toContain('mat-active');
 
       componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
       fixture.detectChanges();
 
       expect(componentInstance.trigger.activeOption === componentInstance.options.first)
           .toBe(true, 'Expected first option to be active.');
       expect(optionEls[0].classList).toContain('mat-active');
-    }));
+    });
 
     it('should set the active item properly after filtering', fakeAsync(() => {
       const componentInstance = fixture.componentInstance;
@@ -744,12 +710,15 @@ describe('MatAutocomplete', () => {
       componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
       tick();
       fixture.detectChanges();
+    }));
+
+    it('should set the active item properly after filtering', () => {
+      const componentInstance = fixture.componentInstance;
 
       typeInElement('o', input);
       fixture.detectChanges();
 
       componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
       fixture.detectChanges();
 
       const optionEls =
@@ -759,7 +728,7 @@ describe('MatAutocomplete', () => {
           .toBe(true, 'Expected first option to be active.');
       expect(optionEls[0].classList).toContain('mat-active');
       expect(optionEls[1].classList).not.toContain('mat-active');
-    }));
+    });
 
     it('should fill the text field when an option is selected with ENTER', async(() => {
       fixture.whenStable().then(() => {
@@ -789,39 +758,30 @@ describe('MatAutocomplete', () => {
       });
     }));
 
-    it('should not prevent the default enter action for a closed panel after a user interaction',
-      fakeAsync(() => {
-        tick();
-        fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
-        tick();
-        fixture.detectChanges();
-
-        fixture.componentInstance.trigger.closePanel();
-        fixture.detectChanges();
-        fixture.componentInstance.trigger._handleKeydown(ENTER_EVENT);
+    it('should not prevent the default enter action for a closed panel after a user action', () => {
+      fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
+      fixture.detectChanges();
 
-        expect(ENTER_EVENT.defaultPrevented).toBe(false, 'Default action should not be prevented.');
-      }));
+      fixture.componentInstance.trigger.closePanel();
+      fixture.detectChanges();
+      fixture.componentInstance.trigger._handleKeydown(ENTER_EVENT);
 
-    it('should fill the text field, not select an option, when SPACE is entered', async(() => {
-      fixture.whenStable().then(() => {
-        typeInElement('New', input);
-        fixture.detectChanges();
+      expect(ENTER_EVENT.defaultPrevented).toBe(false, 'Default action should not be prevented.');
+    });
 
-        const SPACE_EVENT = createKeyboardEvent('keydown', SPACE);
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+    it('should fill the text field, not select an option, when SPACE is entered', () => {
+      typeInElement('New', input);
+      fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
+      const SPACE_EVENT = createKeyboardEvent('keydown', SPACE);
+      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      fixture.detectChanges();
 
-          fixture.componentInstance.trigger._handleKeydown(SPACE_EVENT);
-          fixture.detectChanges();
+      fixture.componentInstance.trigger._handleKeydown(SPACE_EVENT);
+      fixture.detectChanges();
 
-          expect(input.value)
-              .not.toContain('New York', `Expected option not to be selected on SPACE.`);
-        });
-      });
-    }));
+      expect(input.value).not.toContain('New York', `Expected option not to be selected on SPACE.`);
+    });
 
     it('should mark the control dirty when selecting an option from the keyboard', async(() => {
       fixture.whenStable().then(() => {
@@ -862,99 +822,76 @@ describe('MatAutocomplete', () => {
         });
     }));
 
-    it('should scroll to active options below the fold', fakeAsync(() => {
-      tick();
+    it('should scroll to active options below the fold', () => {
+      const trigger = fixture.componentInstance.trigger;
       const scrollContainer =
           document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
+      trigger._handleKeydown(DOWN_ARROW_EVENT);
       fixture.detectChanges();
       expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to scroll.`);
 
       // These down arrows will set the 6th option active, below the fold.
-      [1, 2, 3, 4, 5, 6].forEach(() => {
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-        tick();
-      });
+      [1, 2, 3, 4, 5].forEach(() => trigger._handleKeydown(DOWN_ARROW_EVENT));
 
       // Expect option bottom minus the panel height (288 - 256 = 32)
       expect(scrollContainer.scrollTop)
           .toEqual(32, `Expected panel to reveal the sixth option.`);
-    }));
+    });
 
-    it('should scroll to active options on UP arrow', async(() => {
-      fixture.whenStable().then(() => {
-        const scrollContainer =
-            document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
+    it('should scroll to active options on UP arrow', () => {
+      const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
 
-        fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
-        fixture.detectChanges();
+      fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
+      fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          // Expect option bottom minus the panel height (528 - 256 = 272)
-          expect(scrollContainer.scrollTop).toEqual(272, `Expected panel to reveal last option.`);
-        });
-      });
-    }));
+      // Expect option bottom minus the panel height (528 - 256 = 272)
+      expect(scrollContainer.scrollTop).toEqual(272, `Expected panel to reveal last option.`);
+    });
 
-    it('should not scroll to active options that are fully in the panel', fakeAsync(() => {
-      tick();
-      const scrollContainer =
-          document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
+    it('should not scroll to active options that are fully in the panel', () => {
+      const trigger = fixture.componentInstance.trigger;
+      const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
+      trigger._handleKeydown(DOWN_ARROW_EVENT);
       fixture.detectChanges();
+
       expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to scroll.`);
 
       // These down arrows will set the 6th option active, below the fold.
-      [1, 2, 3, 4, 5, 6].forEach(() => {
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-        tick();
-      });
+      [1, 2, 3, 4, 5].forEach(() => trigger._handleKeydown(DOWN_ARROW_EVENT));
 
       // Expect option bottom minus the panel height (288 - 256 = 32)
       expect(scrollContainer.scrollTop)
           .toEqual(32, `Expected panel to reveal the sixth option.`);
 
       // These up arrows will set the 2nd option active
-      [4, 3, 2, 1].forEach(() => {
-        fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
-        tick();
-      });
+      [4, 3, 2, 1].forEach(() => trigger._handleKeydown(UP_ARROW_EVENT));
 
       // Expect no scrolling to have occurred. Still showing bottom of 6th option.
       expect(scrollContainer.scrollTop)
           .toEqual(32, `Expected panel not to scroll up since sixth option still fully visible.`);
-    }));
+    });
 
-    it('should scroll to active options that are above the panel', fakeAsync(() => {
-      tick();
-      const scrollContainer =
-          document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
+    it('should scroll to active options that are above the panel', () => {
+      const trigger = fixture.componentInstance.trigger;
+      const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-autocomplete-panel')!;
 
-      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
+      trigger._handleKeydown(DOWN_ARROW_EVENT);
       fixture.detectChanges();
+
       expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to scroll.`);
 
       // These down arrows will set the 7th option active, below the fold.
-      [1, 2, 3, 4, 5, 6, 7].forEach(() => {
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-        tick();
-      });
+      [1, 2, 3, 4, 5, 6].forEach(() => trigger._handleKeydown(DOWN_ARROW_EVENT));
 
-      // These up arrows will set the 2nd option as active
-      [5, 4, 3, 2, 1].forEach(() => {
-        fixture.componentInstance.trigger._handleKeydown(UP_ARROW_EVENT);
-        tick();
-      });
+      // These up arrows will set the 2nd option active
+      [5, 4, 3, 2, 1].forEach(() => trigger._handleKeydown(UP_ARROW_EVENT));
 
       // Expect to show the top of the 2nd option at the top of the panel
       expect(scrollContainer.scrollTop)
           .toEqual(48, `Expected panel to scroll up when option is above panel.`);
-    }));
+    });
 
     it('should close the panel when pressing escape', async(() => {
       const trigger = fixture.componentInstance.trigger;
@@ -964,10 +901,13 @@ describe('MatAutocomplete', () => {
       input.focus();
 
       fixture.whenStable().then(() => {
+        fixture.detectChanges();
+
         expect(document.activeElement).toBe(input, 'Expected input to be focused.');
         expect(trigger.panelOpen).toBe(true, 'Expected panel to be open.');
 
         trigger._handleKeydown(escapeEvent);
+        fixture.detectChanges();
 
         expect(document.activeElement).toBe(input, 'Expected input to continue to be focused.');
         expect(trigger.panelOpen).toBe(false, 'Expected panel to be closed.');
@@ -1153,75 +1093,62 @@ describe('MatAutocomplete', () => {
           .toEqual('list', 'Expected aria-autocomplete attribute to equal list.');
     });
 
-    it('should set aria-activedescendant based on the active option', async(() => {
+    it('should set aria-activedescendant based on the active option', fakeAsync(() => {
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
-      fixture.whenStable().then(() => {
-        expect(input.hasAttribute('aria-activedescendant'))
-            .toBe(false, 'Expected aria-activedescendant to be absent if no active item.');
 
-        const DOWN_ARROW_EVENT = createKeyboardEvent('keydown', DOWN_ARROW);
-        fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      expect(input.hasAttribute('aria-activedescendant'))
+          .toBe(false, 'Expected aria-activedescendant to be absent if no active item.');
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
-          expect(input.getAttribute('aria-activedescendant'))
-              .toEqual(fixture.componentInstance.options.first.id,
-                  'Expected aria-activedescendant to match the active item after 1 down arrow.');
+      const DOWN_ARROW_EVENT = createKeyboardEvent('keydown', DOWN_ARROW);
 
-          fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-          fixture.whenStable().then(() => {
-            fixture.detectChanges();
+      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      tick();
+      fixture.detectChanges();
 
-            expect(input.getAttribute('aria-activedescendant'))
-                .toEqual(fixture.componentInstance.options.toArray()[1].id,
-                    'Expected aria-activedescendant to match the active item after 2 down arrows.');
-          });
-        });
+      expect(input.getAttribute('aria-activedescendant'))
+          .toEqual(fixture.componentInstance.options.first.id,
+              'Expected aria-activedescendant to match the active item after 1 down arrow.');
 
-      });
+      fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
+      tick();
+      fixture.detectChanges();
+
+      expect(input.getAttribute('aria-activedescendant'))
+          .toEqual(fixture.componentInstance.options.toArray()[1].id,
+              'Expected aria-activedescendant to match the active item after 2 down arrows.');
     }));
 
-    it('should set aria-expanded based on whether the panel is open', async(() => {
+    it('should set aria-expanded based on whether the panel is open', () => {
       expect(input.getAttribute('aria-expanded'))
           .toBe('false', 'Expected aria-expanded to be false while panel is closed.');
 
       fixture.componentInstance.trigger.openPanel();
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
+      fixture.detectChanges();
 
-        expect(input.getAttribute('aria-expanded'))
-            .toBe('true', 'Expected aria-expanded to be true while panel is open.');
+      expect(input.getAttribute('aria-expanded'))
+          .toBe('true', 'Expected aria-expanded to be true while panel is open.');
 
-        fixture.componentInstance.trigger.closePanel();
-        fixture.detectChanges();
+      fixture.componentInstance.trigger.closePanel();
+      fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          expect(input.getAttribute('aria-expanded'))
-              .toBe('false', 'Expected aria-expanded to be false when panel closes again.');
-        });
-      });
-    }));
+      expect(input.getAttribute('aria-expanded'))
+          .toBe('false', 'Expected aria-expanded to be false when panel closes again.');
+    });
 
-    it('should set aria-expanded properly when the panel is hidden', async(() => {
-        fixture.componentInstance.trigger.openPanel();
+    it('should set aria-expanded properly when the panel is hidden', fakeAsync(() => {
+      fixture.componentInstance.trigger.openPanel();
+      fixture.detectChanges();
+      expect(input.getAttribute('aria-expanded'))
+          .toBe('true', 'Expected aria-expanded to be true while panel is open.');
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
-          expect(input.getAttribute('aria-expanded'))
-              .toBe('true', 'Expected aria-expanded to be true while panel is open.');
-
-          typeInElement('zz', input);
-          fixture.whenStable().then(() => {
-            fixture.detectChanges();
-
-            fixture.whenStable().then(() => {
-              fixture.detectChanges();
-              expect(input.getAttribute('aria-expanded'))
-                  .toBe('false', 'Expected aria-expanded to be false when panel hides itself.');
-            });
-          });
-        });
+      typeInElement('zz', input);
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+
+      expect(input.getAttribute('aria-expanded'))
+          .toBe('false', 'Expected aria-expanded to be false when panel hides itself.');
     }));
 
     it('should set aria-owns based on the attached autocomplete', () => {
@@ -1232,7 +1159,6 @@ describe('MatAutocomplete', () => {
 
       expect(input.getAttribute('aria-owns'))
           .toEqual(panel.getAttribute('id'), 'Expected aria-owns to match attached autocomplete.');
-
     });
 
     it('should restore focus to the input when clicking to select a value', async(() => {
@@ -1503,61 +1429,47 @@ describe('MatAutocomplete', () => {
       }).not.toThrowError();
     });
 
-    it('should display an empty input when the value is undefined with ngModel', async(() => {
+    it('should display an empty input when the value is undefined with ngModel', () => {
       const fixture = TestBed.createComponent(AutocompleteWithNgModel);
-
       fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        const input = fixture.debugElement.query(By.css('input')).nativeElement;
-
-        expect(input.value).toBe('');
-      });
-    }));
+      expect(fixture.debugElement.query(By.css('input')).nativeElement.value).toBe('');
+    });
 
-    it('should display the number when the selected option is the number zero', async(() => {
+    it('should display the number when the selected option is the number zero', fakeAsync(() => {
       const fixture = TestBed.createComponent(AutocompleteWithNumbers);
 
       fixture.componentInstance.selectedNumber = 0;
       fixture.detectChanges();
+      tick();
 
-      fixture.whenStable().then(() => {
-        const input = fixture.debugElement.query(By.css('input')).nativeElement;
-
-        expect(input.value).toBe('0');
-      });
+      expect(fixture.debugElement.query(By.css('input')).nativeElement.value).toBe('0');
     }));
 
-    it('should work when input is wrapped in ngIf', async(() => {
+    it('should work when input is wrapped in ngIf', () => {
       const fixture = TestBed.createComponent(NgIfAutocomplete);
       fixture.detectChanges();
 
-      const input = fixture.debugElement.query(By.css('input')).nativeElement;
-      dispatchFakeEvent(input, 'focusin');
-
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
+      dispatchFakeEvent(fixture.debugElement.query(By.css('input')).nativeElement, 'focusin');
+      fixture.detectChanges();
 
-        expect(fixture.componentInstance.trigger.panelOpen)
-            .toBe(true, `Expected panel state to read open when input is focused.`);
-        expect(overlayContainerElement.textContent)
-            .toContain('One', `Expected panel to display when input is focused.`);
-        expect(overlayContainerElement.textContent)
-            .toContain('Two', `Expected panel to display when input is focused.`);
-      });
-    }));
+      expect(fixture.componentInstance.trigger.panelOpen)
+          .toBe(true, `Expected panel state to read open when input is focused.`);
+      expect(overlayContainerElement.textContent)
+          .toContain('One', `Expected panel to display when input is focused.`);
+      expect(overlayContainerElement.textContent)
+          .toContain('Two', `Expected panel to display when input is focused.`);
+    });
 
-    it('should filter properly with ngIf after setting the active item', fakeAsync(() => {
+    it('should filter properly with ngIf after setting the active item', () => {
       const fixture = TestBed.createComponent(NgIfAutocomplete);
       fixture.detectChanges();
 
       fixture.componentInstance.trigger.openPanel();
-      tick();
       fixture.detectChanges();
 
       const DOWN_ARROW_EVENT = createKeyboardEvent('keydown', DOWN_ARROW);
       fixture.componentInstance.trigger._handleKeydown(DOWN_ARROW_EVENT);
-      tick();
       fixture.detectChanges();
 
       const input = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -1565,16 +1477,16 @@ describe('MatAutocomplete', () => {
       fixture.detectChanges();
 
       expect(fixture.componentInstance.matOptions.length).toBe(2);
-    }));
+    });
 
-    it('should throw if the user attempts to open the panel too early', async(() => {
+    it('should throw if the user attempts to open the panel too early', () => {
       const fixture = TestBed.createComponent(AutocompleteWithoutPanel);
       fixture.detectChanges();
 
       expect(() => {
         fixture.componentInstance.trigger.openPanel();
       }).toThrow(getMatAutocompleteMissingPanelError());
-    }));
+    });
 
     it('should not throw on init, even if the panel is not defined', fakeAsync(() => {
       expect(() => {
@@ -1677,7 +1589,9 @@ describe('MatAutocomplete', () => {
       fixture.detectChanges();
       dispatchFakeEvent(fixture.debugElement.query(By.css('input')).nativeElement, 'focusin');
       tick(1000);
+
       fixture.detectChanges();
+      tick();
 
       Promise.resolve().then(() => {
         let panel = overlayContainerElement.querySelector('.mat-autocomplete-panel') as HTMLElement;
@@ -1721,6 +1635,8 @@ describe('MatAutocomplete', () => {
 
     fixture.componentInstance.states.push('Puerto Rico');
     fixture.detectChanges();
+    tick();
+    fixture.detectChanges();
 
     let options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
     let spy = fixture.componentInstance.optionSelected;
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index f1df42923710..e7238dcb5687 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -123,14 +123,12 @@ export class MatAutocomplete implements AfterContentInit {
   }
 
   /** Panel should hide itself when the option list is empty. */
-  _setVisibility(): void {
-    Promise.resolve().then(() => {
-      this.showPanel = !!this.options.length;
-      this._classList['mat-autocomplete-visible'] = this.showPanel;
-      this._classList['mat-autocomplete-hidden'] = !this.showPanel;
-      this._changeDetectorRef.markForCheck();
-    });
-  }
+  _setVisibility() {
+    this.showPanel = !!this.options.length;
+    this._classList['mat-autocomplete-visible'] = this.showPanel;
+    this._classList['mat-autocomplete-hidden'] = !this.showPanel;
+    this._changeDetectorRef.markForCheck();
+}
 
   /** Emits the `select` event. */
   _emitSelectEvent(option: MatOption): void {
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 4ca18643b250..b1273dc0bc2b 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -80,6 +80,7 @@ export const rollupGlobals = {
   'rxjs/operator/switchMap': 'Rx.Observable.prototype',
   'rxjs/operator/takeUntil': 'Rx.Observable.prototype',
   'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+  'rxjs/operator/delay': 'Rx.Observable.prototype',
 
   'rxjs/add/observable/merge': 'Rx.Observable',
   'rxjs/add/observable/fromEvent': 'Rx.Observable',

From 0875b858d0fc374286ffa374572fed766454074d Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Tue, 3 Oct 2017 11:53:07 -0700
Subject: [PATCH 227/575] feat(table): add row when predicate (#6795)

---
 src/cdk/table/row.ts                          |  15 +-
 src/cdk/table/table-errors.ts                 |  16 ++
 src/cdk/table/table.spec.ts                   | 171 +++++++++++++++++-
 src/cdk/table/table.ts                        |  77 +++++---
 .../table/person-detail-data-source.ts        |  33 ++++
 src/demo-app/table/table-demo.html            |  40 ++++
 src/demo-app/table/table-demo.scss            |  15 +-
 src/demo-app/table/table-demo.ts              |  16 ++
 src/lib/table/row.ts                          |  12 +-
 src/lib/table/table.spec.ts                   |  70 +++++--
 10 files changed, 415 insertions(+), 50 deletions(-)
 create mode 100644 src/demo-app/table/person-detail-data-source.ts

diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index e0c8b7bc3046..dda4cea31eb8 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -75,13 +75,22 @@ export class CdkHeaderRowDef extends BaseRowDef {
 
 /**
  * Data row definition for the CDK table.
- * Captures the header row's template and other row properties such as the columns to display.
+ * Captures the header row's template and other row properties such as the columns to display and
+ * a when predicate that describes when this row should be used.
  */
 @Directive({
   selector: '[cdkRowDef]',
-  inputs: ['columns: cdkRowDefColumns'],
+  inputs: ['columns: cdkRowDefColumns', 'when: cdkRowDefWhen'],
 })
-export class CdkRowDef extends BaseRowDef {
+export class CdkRowDef<T> extends BaseRowDef {
+  /**
+   * Function that should return true if this row template should be used for the provided row data
+   * and index. If left undefined, this row will be considered the default row template to use when
+   * no other when functions return true for the data.
+   * For every row, there must be at least one when function that passes or an undefined to default.
+   */
+  when: (rowData: T, index: number) => boolean;
+
   // TODO(andrewseguin): Add an input for providing a switch function to determine
   //   if this template should be used.
   constructor(template: TemplateRef<any>, _differs: IterableDiffers) {
diff --git a/src/cdk/table/table-errors.ts b/src/cdk/table/table-errors.ts
index 8a667cf926e0..d2b19ef8e075 100644
--- a/src/cdk/table/table-errors.ts
+++ b/src/cdk/table/table-errors.ts
@@ -22,3 +22,19 @@ export function getTableUnknownColumnError(id: string) {
 export function getTableDuplicateColumnNameError(name: string) {
   return Error(`cdk-table: Duplicate column definition name provided: "${name}".`);
 }
+
+/**
+ * Returns an error to be thrown when there are multiple rows that are missing a when function.
+ * @docs-private
+ */
+export function getTableMultipleDefaultRowDefsError() {
+  return Error(`cdk-table: There can only be one default row without a when predicate function.`);
+}
+
+/**
+ * Returns an error to be thrown when there are no matching row defs for a particular set of data.
+ * @docs-private
+ */
+export function getTableMissingMatchingRowDefError() {
+  return Error(`cdk-table: Could not find a matching row definition for the provided row data.`);
+}
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index 548b1c794367..72d26ac3d670 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -7,7 +7,12 @@ import {Observable} from 'rxjs/Observable';
 import {combineLatest} from 'rxjs/observable/combineLatest';
 import {CdkTableModule} from './index';
 import {map} from 'rxjs/operator/map';
-import {getTableDuplicateColumnNameError, getTableUnknownColumnError} from './table-errors';
+import {
+  getTableDuplicateColumnNameError,
+  getTableMissingMatchingRowDefError,
+  getTableMultipleDefaultRowDefsError,
+  getTableUnknownColumnError
+} from './table-errors';
 
 describe('CdkTable', () => {
   let fixture: ComponentFixture<SimpleCdkTableApp>;
@@ -31,6 +36,9 @@ describe('CdkTable', () => {
         MissingColumnDefCdkTableApp,
         CrazyColumnNameCdkTableApp,
         UndefinedColumnsCdkTableApp,
+        WhenRowCdkTableApp,
+        WhenRowWithoutDefaultCdkTableApp,
+        WhenRowMultipleDefaultsCdkTableApp
       ],
     }).compileComponents();
   }));
@@ -202,6 +210,34 @@ describe('CdkTable', () => {
     });
   });
 
+  describe('using when predicate', () => {
+    it('should be able to display different row templates based on the row data', () => {
+      let whenFixture = TestBed.createComponent(WhenRowCdkTableApp);
+      whenFixture.detectChanges();
+
+      let data = whenFixture.componentInstance.dataSource.data;
+      expectTableToMatchContent(whenFixture.nativeElement.querySelector('cdk-table'), [
+        ['Column A', 'Column B', 'Column C'],
+        [data[0].a, data[0].b, data[0].c],
+        ['index_1_special_row'],
+        ['c3_special_row'],
+        [data[3].a, data[3].b, data[3].c],
+      ]);
+    });
+
+    it('should error if there is row data that does not have a matching row template', () => {
+      let whenFixture = TestBed.createComponent(WhenRowWithoutDefaultCdkTableApp);
+      expect(() => whenFixture.detectChanges())
+          .toThrowError(getTableMissingMatchingRowDefError().message);
+    });
+
+    it('should error if there are multiple rows that do not have a when function', () => {
+      let whenFixture = TestBed.createComponent(WhenRowMultipleDefaultsCdkTableApp);
+      expect(() => whenFixture.detectChanges())
+          .toThrowError(getTableMultipleDefaultRowDefsError().message);
+    });
+  });
+
   it('should use differ to add/remove/move rows', () => {
     // Each row receives an attribute 'initialIndex' the element's original place
     getRows(tableElement).forEach((row: Element, index: number) => {
@@ -615,6 +651,139 @@ class SimpleCdkTableApp {
   @ViewChild(CdkTable) table: CdkTable<TestData>;
 }
 
+@Component({
+  template: `
+    <cdk-table [dataSource]="dataSource">
+      <ng-container cdkColumnDef="column_a">
+        <cdk-header-cell *cdkHeaderCellDef> Column A</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.a}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="column_b">
+        <cdk-header-cell *cdkHeaderCellDef> Column B</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.b}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="column_c">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.c}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="index1Column">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> index_1_special_row </cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="c3Column">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> c3_special_row </cdk-cell>
+      </ng-container>
+
+      <cdk-header-row *cdkHeaderRowDef="columnsToRender"></cdk-header-row>
+      <cdk-row *cdkRowDef="let row; columns: columnsToRender"></cdk-row>
+      <cdk-row *cdkRowDef="let row; columns: ['index1Column']; when: isIndex1"></cdk-row>
+      <cdk-row *cdkRowDef="let row; columns: ['c3Column']; when: hasC3"></cdk-row>
+    </cdk-table>
+  `
+})
+class WhenRowCdkTableApp {
+  dataSource: FakeDataSource = new FakeDataSource();
+  columnsToRender = ['column_a', 'column_b', 'column_c'];
+  isIndex1 = (_rowData: TestData, index: number) => index == 1;
+  hasC3 = (rowData: TestData) => rowData.c == 'c_3';
+
+  constructor() { this.dataSource.addData(); }
+
+  @ViewChild(CdkTable) table: CdkTable<TestData>;
+}
+
+@Component({
+  template: `
+    <cdk-table [dataSource]="dataSource">
+      <ng-container cdkColumnDef="column_a">
+        <cdk-header-cell *cdkHeaderCellDef> Column A</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.a}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="column_b">
+        <cdk-header-cell *cdkHeaderCellDef> Column B</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.b}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="column_c">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.c}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="index1Column">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> index_1_special_row </cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="c3Column">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> c3_special_row </cdk-cell>
+      </ng-container>
+
+      <cdk-header-row *cdkHeaderRowDef="columnsToRender"></cdk-header-row>
+      <cdk-row *cdkRowDef="let row; columns: ['index1Column']; when: isIndex1"></cdk-row>
+      <cdk-row *cdkRowDef="let row; columns: ['c3Column']; when: hasC3"></cdk-row>
+    </cdk-table>
+  `
+})
+class WhenRowWithoutDefaultCdkTableApp {
+  dataSource: FakeDataSource = new FakeDataSource();
+  columnsToRender = ['column_a', 'column_b', 'column_c'];
+  isIndex1 = (_rowData: TestData, index: number) => index == 1;
+  hasC3 = (rowData: TestData) => rowData.c == 'c_3';
+
+  @ViewChild(CdkTable) table: CdkTable<TestData>;
+}
+
+@Component({
+  template: `
+    <cdk-table [dataSource]="dataSource">
+      <ng-container cdkColumnDef="column_a">
+        <cdk-header-cell *cdkHeaderCellDef> Column A</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.a}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="column_b">
+        <cdk-header-cell *cdkHeaderCellDef> Column B</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.b}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="column_c">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.c}}</cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="index1Column">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> index_1_special_row </cdk-cell>
+      </ng-container>
+
+      <ng-container cdkColumnDef="c3Column">
+        <cdk-header-cell *cdkHeaderCellDef> Column C</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> c3_special_row </cdk-cell>
+      </ng-container>
+
+      <cdk-header-row *cdkHeaderRowDef="columnsToRender"></cdk-header-row>
+      <cdk-row *cdkRowDef="let row; columns: columnsToRender"></cdk-row>
+      <cdk-row *cdkRowDef="let row; columns: ['index1Column']"></cdk-row>
+      <cdk-row *cdkRowDef="let row; columns: ['c3Column']; when: hasC3"></cdk-row>
+    </cdk-table>
+  `
+})
+class WhenRowMultipleDefaultsCdkTableApp {
+  dataSource: FakeDataSource = new FakeDataSource();
+  columnsToRender = ['column_a', 'column_b', 'column_c'];
+  isIndex1 = (_rowData: TestData, index: number) => index == 1;
+  hasC3 = (rowData: TestData) => rowData.c == 'c_3';
+
+  @ViewChild(CdkTable) table: CdkTable<TestData>;
+}
+
 @Component({
   template: `
     <cdk-table [dataSource]="dataSource">
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index a76b8afed00d..e93d64901c53 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -36,7 +36,11 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Subscription} from 'rxjs/Subscription';
 import {Subject} from 'rxjs/Subject';
 import {CdkCellDef, CdkColumnDef, CdkHeaderCellDef} from './cell';
-import {getTableDuplicateColumnNameError, getTableUnknownColumnError} from './table-errors';
+import {
+  getTableDuplicateColumnNameError, getTableMissingMatchingRowDefError,
+  getTableMultipleDefaultRowDefsError,
+  getTableUnknownColumnError
+} from './table-errors';
 
 /**
  * Provides a handle for the table to grab the view container's ng-container to insert data rows.
@@ -90,11 +94,14 @@ export class CdkTable<T> implements CollectionViewer {
   private _renderChangeSubscription: Subscription | null;
 
   /** Map of all the user's defined columns (header and data cell template) identified by name. */
-  private _columnDefinitionsByName = new Map<string,  CdkColumnDef>();
+  private _columnDefsByName = new Map<string,  CdkColumnDef>();
 
   /** Differ used to find the changes in the data provided by the data source. */
   private _dataDiffer: IterableDiffer<T>;
 
+  /** Stores the row definition that does not have a when predicate. */
+  private _defaultRowDef: CdkRowDef<T> | null;
+
   /**
    * Tracking function that will be used to check the differences in data changes. Used similarly
    * to `ngFor` `trackBy` function. Optimize row operations by identifying a row based on its data
@@ -143,13 +150,13 @@ export class CdkTable<T> implements CollectionViewer {
    * The column definitions provided by the user that contain what the header and cells should
    * render for each column.
    */
-  @ContentChildren(CdkColumnDef) _columnDefinitions: QueryList<CdkColumnDef>;
+  @ContentChildren(CdkColumnDef) _columnDefs: QueryList<CdkColumnDef>;
 
-  /** Template used as the header container. */
-  @ContentChild(CdkHeaderRowDef) _headerDefinition: CdkHeaderRowDef;
+  /** Template definition used as the header container. */
+  @ContentChild(CdkHeaderRowDef) _headerDef: CdkHeaderRowDef;
 
-  /** Set of templates that used as the data row containers. */
-  @ContentChildren(CdkRowDef) _rowDefinitions: QueryList<CdkRowDef>;
+  /** Set of template definitions that used as the data row containers. */
+  @ContentChildren(CdkRowDef) _rowDefs: QueryList<CdkRowDef<T>>;
 
   constructor(private readonly _differs: IterableDiffers,
               private readonly _changeDetectorRef: ChangeDetectorRef,
@@ -167,13 +174,18 @@ export class CdkTable<T> implements CollectionViewer {
   }
 
   ngAfterContentInit() {
-    this._cacheColumnDefinitionsByName();
-    this._columnDefinitions.changes.subscribe(() => this._cacheColumnDefinitionsByName());
+    this._cacheColumnDefsByName();
+    this._columnDefs.changes.subscribe(() => this._cacheColumnDefsByName());
     this._renderHeaderRow();
   }
 
   ngAfterContentChecked() {
     this._renderUpdatedColumns();
+
+    const defaultRowDefs = this._rowDefs.filter(def => !def.when);
+    if (defaultRowDefs.length > 1) { throw getTableMultipleDefaultRowDefsError(); }
+    this._defaultRowDef = defaultRowDefs[0];
+
     if (this.dataSource && !this._renderChangeSubscription) {
       this._observeRenderChanges();
     }
@@ -190,15 +202,14 @@ export class CdkTable<T> implements CollectionViewer {
     }
   }
 
-
   /** Update the map containing the content's column definitions. */
-  private _cacheColumnDefinitionsByName() {
-    this._columnDefinitionsByName.clear();
-    this._columnDefinitions.forEach(columnDef => {
-      if (this._columnDefinitionsByName.has(columnDef.name)) {
+  private _cacheColumnDefsByName() {
+    this._columnDefsByName.clear();
+    this._columnDefs.forEach(columnDef => {
+      if (this._columnDefsByName.has(columnDef.name)) {
         throw getTableDuplicateColumnNameError(columnDef.name);
       }
-      this._columnDefinitionsByName.set(columnDef.name, columnDef);
+      this._columnDefsByName.set(columnDef.name, columnDef);
     });
   }
 
@@ -208,8 +219,8 @@ export class CdkTable<T> implements CollectionViewer {
    */
   private _renderUpdatedColumns() {
     // Re-render the rows when the row definition columns change.
-    this._rowDefinitions.forEach(rowDefinition => {
-      if (!!rowDefinition.getColumnsDiff()) {
+    this._rowDefs.forEach(def => {
+      if (!!def.getColumnsDiff()) {
         // Reset the data to an empty array so that renderRowChanges will re-render all new rows.
         this._dataDiffer.diff([]);
 
@@ -219,7 +230,7 @@ export class CdkTable<T> implements CollectionViewer {
     });
 
     // Re-render the header row if there is a difference in its columns.
-    if (this._headerDefinition.getColumnsDiff()) {
+    if (this._headerDef.getColumnsDiff()) {
       this._headerRowPlaceholder.viewContainer.clear();
       this._renderHeaderRow();
     }
@@ -264,14 +275,14 @@ export class CdkTable<T> implements CollectionViewer {
    * Create the embedded view for the header template and place it in the header row view container.
    */
   private _renderHeaderRow() {
-    const cells = this._getHeaderCellTemplatesForRow(this._headerDefinition);
+    const cells = this._getHeaderCellTemplatesForRow(this._headerDef);
     if (!cells.length) { return; }
 
     // TODO(andrewseguin): add some code to enforce that exactly
     //   one CdkCellOutlet was instantiated as a result
     //   of `createEmbeddedView`.
     this._headerRowPlaceholder.viewContainer
-        .createEmbeddedView(this._headerDefinition.template, {cells});
+        .createEmbeddedView(this._headerDef.template, {cells});
 
     cells.forEach(cell => {
       CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
@@ -301,15 +312,27 @@ export class CdkTable<T> implements CollectionViewer {
     this._updateRowContext();
   }
 
+  /**
+   * Finds the matching row definition that should be used for this row data. If there is only
+   * one row definition, it is returned. Otherwise, find the row definition that has a when
+   * predicate that returns true with the data. If none return true, return the default row
+   * definition.
+   */
+  _getRowDef(data: T, i: number): CdkRowDef<T> {
+    if (this._rowDefs.length == 1) { return this._rowDefs.first; }
+
+    let rowDef = this._rowDefs.find(def => def.when && def.when(data, i)) || this._defaultRowDef;
+    if (!rowDef) { throw getTableMissingMatchingRowDefError(); }
+
+    return rowDef;
+  }
+
   /**
    * Create the embedded view for the data row template and place it in the correct index location
    * within the data row view container.
    */
   private _insertRow(rowData: T, index: number) {
-    // TODO(andrewseguin): Add when predicates to the row definitions
-    //   to find the right template to used based on
-    //   the data rather than choosing the first row definition.
-    const row = this._rowDefinitions.first;
+    const row = this._getRowDef(rowData, index);
 
     // Row context that will be provided to both the created embedded row view and its cells.
     const context: CdkCellOutletRowContext<T> = {$implicit: rowData};
@@ -353,7 +376,7 @@ export class CdkTable<T> implements CollectionViewer {
   private _getHeaderCellTemplatesForRow(headerDef: CdkHeaderRowDef): CdkHeaderCellDef[] {
     if (!headerDef.columns) { return []; }
     return headerDef.columns.map(columnId => {
-      const column = this._columnDefinitionsByName.get(columnId);
+      const column = this._columnDefsByName.get(columnId);
 
       if (!column) {
         throw getTableUnknownColumnError(columnId);
@@ -367,10 +390,10 @@ export class CdkTable<T> implements CollectionViewer {
    * Returns the cell template definitions to insert in the provided row
    * as defined by its list of columns to display.
    */
-  private _getCellTemplatesForRow(rowDef: CdkRowDef): CdkCellDef[] {
+  private _getCellTemplatesForRow(rowDef: CdkRowDef<T>): CdkCellDef[] {
     if (!rowDef.columns) { return []; }
     return rowDef.columns.map(columnId => {
-      const column = this._columnDefinitionsByName.get(columnId);
+      const column = this._columnDefsByName.get(columnId);
 
       if (!column) {
         throw getTableUnknownColumnError(columnId);
diff --git a/src/demo-app/table/person-detail-data-source.ts b/src/demo-app/table/person-detail-data-source.ts
new file mode 100644
index 000000000000..864b49f69849
--- /dev/null
+++ b/src/demo-app/table/person-detail-data-source.ts
@@ -0,0 +1,33 @@
+import {DataSource} from '@angular/cdk/collections';
+import {Observable} from 'rxjs/Observable';
+import {UserData} from './people-database';
+import 'rxjs/add/observable/merge';
+import 'rxjs/add/operator/map';
+import {PersonDataSource} from './person-data-source';
+
+export interface DetailRow {
+  detailRow: boolean;
+  data: UserData;
+}
+
+export class PersonDetailDataSource extends DataSource<any> {
+  constructor(private _personDataSource: PersonDataSource) {
+    super();
+  }
+
+  connect(): Observable<(UserData|DetailRow)[]> {
+    return this._personDataSource.connect().map(data => {
+      const rows: (UserData|DetailRow)[] = [];
+
+      // Interweave a detail data object for each row data object that will be used for displaying
+      // row details. Contains the row data.
+      data.forEach(person => rows.push(person, {detailRow: true, data: person}));
+
+      return rows;
+    });
+  }
+
+  disconnect() {
+    // No-op
+  }
+}
diff --git a/src/demo-app/table/table-demo.html b/src/demo-app/table/table-demo.html
index 1741dc26d2be..a7f4c5b66efd 100644
--- a/src/demo-app/table/table-demo.html
+++ b/src/demo-app/table/table-demo.html
@@ -167,6 +167,46 @@ <h3>MatTable Example</h3>
 
   <mat-paginator #paginator
                 [length]="_peopleDatabase.data.length"
+                [pageSize]="10"
                 [pageSizeOptions]="[5, 10, 25, 100]">
   </mat-paginator>
 </div>
+
+<mat-card class="demo-table-card">
+  <h3> MatTable Using 'When' Rows for Interactive Details</h3>
+
+  <mat-table [dataSource]="dataSourceWithDetails">
+    <!-- Column Definition: ID -->
+    <ng-container matColumnDef="userId">
+      <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
+    </ng-container>
+
+    <!-- Column Definition: Name -->
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
+    </ng-container>
+
+    <!-- Detail Column -->
+    <ng-container matColumnDef="details">
+      <mat-cell *matCellDef="let row">
+        <ng-container *ngIf="wasExpanded.has(row.data)">
+          {{row.data.name.split(' ')[0]}}'s favorite color is {{row.data.color}} and has a progress
+          of {{row.data.progress}}%.
+        </ng-container>
+      </mat-cell>
+    </ng-container>
+
+    <mat-header-row *matHeaderRowDef="['userId', 'userName']"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: ['userId', 'userName'];"
+            matRipple
+            class="user-row"
+            [style.borderBottomColor]="expandedPerson == row ? 'transparent' : ''"
+            (click)="expandedPerson = row; wasExpanded.add(row)"></mat-row>
+    <mat-row *matRowDef="let row; columns: ['details']; when: isDetailRow"
+            [@detailExpand]="row.data == expandedPerson ? 'expanded' : 'collapsed'"
+            style="overflow: hidden">
+    </mat-row>
+  </mat-table>
+</mat-card>
\ No newline at end of file
diff --git a/src/demo-app/table/table-demo.scss b/src/demo-app/table/table-demo.scss
index e968dc3b8e98..db3bf40507be 100644
--- a/src/demo-app/table/table-demo.scss
+++ b/src/demo-app/table/table-demo.scss
@@ -24,7 +24,7 @@
 
 .demo-table-card {
   margin: 24px 0;
-  max-height: 200px;
+  max-height: 450px;
   overflow: auto;
 
   h3 {
@@ -34,6 +34,18 @@
   }
 }
 
+.user-row {
+  cursor: pointer;
+  position: relative; // For mdRipple
+
+  &:hover {
+    background: #f5f5f5;
+  }
+  &:active {
+    background: #eaeaea;
+  }
+}
+
 /** Styles so that the CDK Table columns have width and font size. */
 .cdk-table {
   font-size: 12px;
@@ -75,7 +87,6 @@
 /* Column max widths */
 .cdk-column-userId {
   max-width: 32px;
-  text-align: right;
   justify-content: flex-end;
 }
 
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index 79067958ae25..d2d123df4cfd 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -2,6 +2,8 @@ import {Component, ViewChild} from '@angular/core';
 import {PeopleDatabase, UserData} from './people-database';
 import {PersonDataSource} from './person-data-source';
 import {MatPaginator, MatSort} from '@angular/material';
+import {DetailRow, PersonDetailDataSource} from './person-detail-data-source';
+import {animate, state, style, transition, trigger} from '@angular/animations';
 
 export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
 
@@ -14,21 +16,34 @@ const properties = ['id', 'name', 'progress', 'color'];
   selector: 'table-demo',
   templateUrl: 'table-demo.html',
   styleUrls: ['table-demo.css'],
+  animations: [
+    trigger('detailExpand', [
+      state('collapsed', style({height: '0px', minHeight: '0', visibility: 'hidden'})),
+      state('expanded', style({height: '*', visibility: 'visible'})),
+      transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
+    ]),
+  ],
 })
 export class TableDemo {
   dataSource: PersonDataSource | null;
+  dataSourceWithDetails: PersonDetailDataSource | null;
   displayedColumns: UserProperties[] = [];
   trackByStrategy: TrackByStrategy = 'reference';
   changeReferences = false;
   highlights = new Set<string>();
+  wasExpanded = new Set<UserData>();
 
   dynamicColumnDefs: any[] = [];
   dynamicColumnIds: string[] = [];
 
+  expandedPerson: UserData;
+
   @ViewChild(MatPaginator) _paginator: MatPaginator;
 
   @ViewChild(MatSort) sort: MatSort;
 
+  isDetailRow = (row: DetailRow|UserData) => row.hasOwnProperty('detailRow');
+
   constructor(public _peopleDatabase: PeopleDatabase) { }
 
   ngOnInit() {
@@ -55,6 +70,7 @@ export class TableDemo {
     this.displayedColumns = ['userId', 'userName', 'progress', 'color'];
     this.dataSource = new PersonDataSource(this._peopleDatabase,
         this._paginator, this.sort);
+    this.dataSourceWithDetails = new PersonDetailDataSource(this.dataSource);
     this._peopleDatabase.initialize();
   }
 
diff --git a/src/lib/table/row.ts b/src/lib/table/row.ts
index 6fb1b2bbd7ed..121a2bc045a1 100644
--- a/src/lib/table/row.ts
+++ b/src/lib/table/row.ts
@@ -8,11 +8,11 @@
 
 import {ChangeDetectionStrategy, Component, Directive, ViewEncapsulation} from '@angular/core';
 import {
+  CDK_ROW_TEMPLATE,
   CdkHeaderRow,
+  CdkHeaderRowDef,
   CdkRow,
-  CDK_ROW_TEMPLATE,
   CdkRowDef,
-  CdkHeaderRowDef,
 } from '@angular/cdk/table';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
@@ -34,14 +34,16 @@ export class MatHeaderRowDef extends _MatHeaderRowDef { }
 
 /**
  * Data row definition for the mat-table.
- * Captures the header row's template and other row properties such as the columns to display.
+ * Captures the header row's template and other row properties such as the columns to display and
+ * a when predicate that describes when this row should be used.
  */
 @Directive({
   selector: '[matRowDef]',
   providers: [{provide: CdkRowDef, useExisting: MatRowDef}],
-  inputs: ['columns: matRowDefColumns'],
+  inputs: ['columns: matRowDefColumns', 'when: matRowDefWhen'],
 })
-export class MatRowDef extends _MatCdkRowDef { }
+export class MatRowDef<T> extends _MatCdkRowDef<T> {
+}
 
 /** Header template container that contains the cell outlet. Adds the right class and role. */
 @Component({
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index 64b8ff5f1c65..5333c2bb0e4b 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -1,4 +1,4 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {async, TestBed} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
@@ -7,22 +7,17 @@ import {MatTableModule} from './index';
 import {MatTable} from './table';
 
 describe('MatTable', () => {
-  let fixture: ComponentFixture<SimpleMatTableApp>;
-
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MatTableModule],
-      declarations: [SimpleMatTableApp],
+      declarations: [MatTableApp, MatTableWithWhenRowApp],
     }).compileComponents();
   }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SimpleMatTableApp);
-    fixture.detectChanges();
+  it('should be able to create a table with the right content and without when row', () => {
+    let fixture = TestBed.createComponent(MatTableApp);
     fixture.detectChanges();
-  });
 
-  it('should create a table with the right content', () => {
     const tableElement = fixture.nativeElement.querySelector('.mat-table');
     const headerRow = tableElement.querySelectorAll('.mat-header-cell');
     expectTextContent(headerRow[0], 'Column A');
@@ -30,12 +25,32 @@ describe('MatTable', () => {
     expectTextContent(headerRow[2], 'Column C');
 
     const rows = tableElement.querySelectorAll('.mat-row');
-    for (let i = 0; i < rows.length; i++) {
+
+    // First three rows use columns ['column_a', 'column_b', 'column_c']
+    for (let i = 0; i < 3; i++) {
       const cells = rows[i].querySelectorAll('.mat-cell');
       expectTextContent(cells[0], `a_${i + 1}`);
       expectTextContent(cells[1], `b_${i + 1}`);
       expectTextContent(cells[2], `c_${i + 1}`);
     }
+
+    // Fourth row uses a special when predicate to show a different colummn
+    expect(rows[3].textContent.trim()).toBe('fourth_row');
+  });
+
+  it('should create a table with special when row', () => {
+    let fixture = TestBed.createComponent(MatTableWithWhenRowApp);
+    fixture.detectChanges();
+
+    const tableElement = fixture.nativeElement.querySelector('.mat-table');
+    const headerRow = tableElement.querySelectorAll('.mat-header-cell');
+    expectTextContent(headerRow[0], 'Column A');
+
+    const rows = tableElement.querySelectorAll('.mat-row');
+    expect(rows[0].textContent.trim()).toBe('a_1');
+    expect(rows[1].textContent.trim()).toBe('a_2');
+    expect(rows[2].textContent.trim()).toBe('a_3');
+    expect(rows[3].textContent.trim()).toBe('fourth_row');
   });
 });
 
@@ -60,7 +75,7 @@ class FakeDataSource extends DataSource<TestData> {
 
   constructor() {
     super();
-    for (let i = 0; i < 3; i++) { this.addData(); }
+    for (let i = 0; i < 4; i++) { this.addData(); }
   }
 
   connect(): Observable<TestData[]> {
@@ -101,15 +116,46 @@ class FakeDataSource extends DataSource<TestData> {
         <mat-cell *matCellDef="let row"> {{row.c}}</mat-cell>
       </ng-container>
 
+      <ng-container matColumnDef="special_column">
+        <mat-cell *matCellDef="let row"> fourth_row </mat-cell>
+      </ng-container>
+
       <mat-header-row *matHeaderRowDef="columnsToRender"></mat-header-row>
       <mat-row *matRowDef="let row; columns: columnsToRender"></mat-row>
+      <mat-row *matRowDef="let row; columns: ['special_column']; when: isFourthRow"></mat-row>
     </mat-table>
   `
 })
-class SimpleMatTableApp {
+class MatTableApp {
   dataSource: FakeDataSource | null = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
+  isFourthRow = (_rowData: TestData, i: number) => i == 3;
 
   @ViewChild(MatTable) table: MatTable<TestData>;
 }
 
+
+@Component({
+  template: `
+    <mat-table [dataSource]="dataSource">
+      <ng-container matColumnDef="column_a">
+        <mat-header-cell *matHeaderCellDef> Column A</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.a}}</mat-cell>
+      </ng-container>
+
+      <ng-container matColumnDef="special_column">
+        <mat-cell *matCellDef="let row"> fourth_row </mat-cell>
+      </ng-container>
+
+      <mat-header-row *matHeaderRowDef="['column_a']"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: ['column_a']"></mat-row>
+      <mat-row *matRowDef="let row; columns: ['special_column']; when: isFourthRow"></mat-row>
+    </mat-table>
+  `
+})
+class MatTableWithWhenRowApp {
+  dataSource: FakeDataSource | null = new FakeDataSource();
+  isFourthRow = (_rowData: TestData, i: number) => i == 3;
+
+  @ViewChild(MatTable) table: MatTable<TestData>;
+}

From 80310a5cf77f76c495218682111bbcba51d413bb Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 3 Oct 2017 20:53:29 +0200
Subject: [PATCH 228/575] fix(drawer): backdrop not transitioning on close
 (#6651)

---
 src/lib/sidenav/drawer-transitions.scss | 16 ----------------
 src/lib/sidenav/drawer.scss             | 16 ++++++++++++++++
 src/lib/sidenav/drawer.spec.ts          |  1 +
 src/lib/sidenav/drawer.ts               |  5 +----
 src/lib/sidenav/sidenav.ts              |  5 +----
 5 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 src/lib/sidenav/drawer-transitions.scss

diff --git a/src/lib/sidenav/drawer-transitions.scss b/src/lib/sidenav/drawer-transitions.scss
deleted file mode 100644
index 7be6e763b610..000000000000
--- a/src/lib/sidenav/drawer-transitions.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-// Separate transitions to be able to disable them in unit tests by omitting this file.
-@import '../core/style/variables';
-
-.mat-drawer-transition {
-  .mat-drawer-content {
-    transition: {
-      duration: $swift-ease-out-duration;
-      timing-function: $swift-ease-out-timing-function;
-      property: margin-left, margin-right;
-    }
-  }
-
-  .mat-drawer-backdrop.mat-drawer-shown {
-    transition: background-color $swift-ease-out-duration $swift-ease-out-timing-function;
-  }
-}
diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index b21b71284195..c9a944b2ea16 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -65,6 +65,14 @@ $mat-drawer-over-drawer-z-index: 4;
     visibility: visible;
   }
 
+  .mat-drawer-transition & {
+    transition: {
+      duration: $swift-ease-out-duration;
+      timing-function: $swift-ease-out-timing-function;
+      property: background-color, visibility;
+    }
+  }
+
   @include cdk-high-contrast {
     opacity: 0.5;
   }
@@ -76,6 +84,14 @@ $mat-drawer-over-drawer-z-index: 4;
   display: block;
   height: 100%;
   overflow: auto;
+
+  .mat-drawer-transition & {
+    transition: {
+      duration: $swift-ease-out-duration;
+      timing-function: $swift-ease-out-timing-function;
+      property: transform, margin-left, margin-right;
+    }
+  }
 }
 
 .mat-drawer {
diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index d5e03ec8fa4e..ce39efa443dc 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -36,6 +36,7 @@ describe('MatDrawer', () => {
       let drawer = fixture.debugElement.query(By.directive(MatDrawer));
       let drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
 
+      drawerBackdropElement.nativeElement.style.transition = 'none';
       fixture.debugElement.query(By.css('.open')).nativeElement.click();
       fixture.detectChanges();
 
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 7962a7d7fc42..490bc5184c9e 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -355,10 +355,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   moduleId: module.id,
   selector: 'mat-drawer-container',
   templateUrl: 'drawer-container.html',
-  styleUrls: [
-    'drawer.css',
-    'drawer-transitions.css',
-  ],
+  styleUrls: ['drawer.css'],
   host: {
     'class': 'mat-drawer-container',
   },
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index 3a7e6bdacf18..c65be66a04b8 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -109,10 +109,7 @@ export class MatSidenav extends MatDrawer {
   moduleId: module.id,
   selector: 'mat-sidenav-container',
   templateUrl: 'sidenav-container.html',
-  styleUrls: [
-    'drawer.css',
-    'drawer-transitions.css',
-  ],
+  styleUrls: ['drawer.css'],
   host: {
     'class': 'mat-drawer-container mat-sidenav-container',
   },

From 199056cf07ad44db6d9d84c4c15b496938d30b6e Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 3 Oct 2017 20:54:45 +0200
Subject: [PATCH 229/575] chore: add stepper to prerender check (#7225)

---
 .../kitchen-sink/kitchen-sink.html            | 27 +++++++++++++++++++
 .../kitchen-sink/kitchen-sink.ts              |  2 ++
 src/universal-app/tsconfig.json               | 14 ++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 src/universal-app/tsconfig.json

diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 1ba7f870ae95..9e8b398b2bd9 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -281,3 +281,30 @@ <h3 mat-subheader>Groceries</h3>
   <mat-list-option value="bananas">Bananas</mat-list-option>
   <mat-list-option value="oranges">Oranges</mat-list-option>
 </mat-selection-list>
+
+<h2>Vertical Stepper</h2>
+
+<mat-vertical-stepper>
+  <mat-step label="Step 1">Content 1</mat-step>
+  <mat-step label="Step 1">Content 2</mat-step>
+</mat-vertical-stepper>
+
+<h2>Vertical Stepper (with label template)</h2>
+
+<mat-vertical-stepper>
+  <mat-step>
+    <ng-template matStepLabel>NgTemplate Label #1</ng-template>
+    Content 1
+  </mat-step>
+  <mat-step>
+    <ng-template matStepLabel>NgTemplate Label #2</ng-template>
+    Content 2
+  </mat-step>
+</mat-vertical-stepper>
+
+<h2>Horizontal Stepper</h2>
+
+<mat-horizontal-stepper>
+  <mat-step label="Step 1">Content 1</mat-step>
+  <mat-step label="Step 2">Content 2</mat-step>
+</mat-horizontal-stepper>
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index 5fdda06149bb..d74d43915bab 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -32,6 +32,7 @@ import {
   MatTabsModule,
   MatToolbarModule,
   MatTooltipModule,
+  MatStepperModule,
 } from '@angular/material';
 import {
   CdkTableModule,
@@ -97,6 +98,7 @@ export class KitchenSink {
     MatExpansionModule,
     MatSortModule,
     MatTableModule,
+    MatStepperModule,
 
     // CDK Modules
     CdkTableModule
diff --git a/src/universal-app/tsconfig.json b/src/universal-app/tsconfig.json
new file mode 100644
index 000000000000..9e03ecf0a6c0
--- /dev/null
+++ b/src/universal-app/tsconfig.json
@@ -0,0 +1,14 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/material/*": ["../lib/*"],
+      "@angular/material": ["../lib/public_api"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}

From 8d057721c589c5845672a1ec019f1b43a9fe2d4f Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Tue, 3 Oct 2017 15:49:45 -0700
Subject: [PATCH 230/575] chore: move UniqueSelectionDispatcher to cdk (#6928)

BREAKING CHANGE: UniqueSelectionDispatcher, UniqueSelectionDispatcherListener and UNIQUE_SELECTION_DISPATCHER_PROVIDER are no longer
available from @angular/material and instead must be imported from @angular/cdk/collections
---
 src/cdk/collections/public-api.ts                            | 5 +++++
 .../collections}/unique-selection-dispatcher.spec.ts         | 0
 .../collections}/unique-selection-dispatcher.ts              | 2 +-
 src/lib/button-toggle/button-toggle-module.ts                | 3 ++-
 src/lib/button-toggle/button-toggle.ts                       | 2 +-
 src/lib/core/public-api.ts                                   | 1 -
 src/lib/expansion/accordion-item.ts                          | 2 +-
 src/lib/expansion/expansion-module.ts                        | 2 +-
 src/lib/expansion/expansion-panel.ts                         | 3 ++-
 src/lib/radio/radio-module.ts                                | 2 +-
 src/lib/radio/radio.ts                                       | 2 +-
 11 files changed, 15 insertions(+), 9 deletions(-)
 rename src/{lib/core/coordination => cdk/collections}/unique-selection-dispatcher.spec.ts (100%)
 rename src/{lib/core/coordination => cdk/collections}/unique-selection-dispatcher.ts (99%)

diff --git a/src/cdk/collections/public-api.ts b/src/cdk/collections/public-api.ts
index ed7251e3c14c..f5eb48e42b7d 100644
--- a/src/cdk/collections/public-api.ts
+++ b/src/cdk/collections/public-api.ts
@@ -9,3 +9,8 @@
 export * from './collection-viewer';
 export * from './data-source';
 export * from './selection';
+export {
+  UniqueSelectionDispatcher,
+  UniqueSelectionDispatcherListener,
+  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
+} from './unique-selection-dispatcher';
diff --git a/src/lib/core/coordination/unique-selection-dispatcher.spec.ts b/src/cdk/collections/unique-selection-dispatcher.spec.ts
similarity index 100%
rename from src/lib/core/coordination/unique-selection-dispatcher.spec.ts
rename to src/cdk/collections/unique-selection-dispatcher.spec.ts
diff --git a/src/lib/core/coordination/unique-selection-dispatcher.ts b/src/cdk/collections/unique-selection-dispatcher.ts
similarity index 99%
rename from src/lib/core/coordination/unique-selection-dispatcher.ts
rename to src/cdk/collections/unique-selection-dispatcher.ts
index 248696b73a9f..76c390951080 100644
--- a/src/lib/core/coordination/unique-selection-dispatcher.ts
+++ b/src/cdk/collections/unique-selection-dispatcher.ts
@@ -39,7 +39,7 @@ export class UniqueSelectionDispatcher {
   /**
    * Listen for future changes to item selection.
    * @return Function used to deregister listener
-   **/
+   */
   listen(listener: UniqueSelectionDispatcherListener): () => void {
     this._listeners.push(listener);
     return () => {
diff --git a/src/lib/button-toggle/button-toggle-module.ts b/src/lib/button-toggle/button-toggle-module.ts
index f3e6271430ce..851b98fe2838 100644
--- a/src/lib/button-toggle/button-toggle-module.ts
+++ b/src/lib/button-toggle/button-toggle-module.ts
@@ -8,7 +8,8 @@
 
 import {NgModule} from '@angular/core';
 import {MatButtonToggleGroup, MatButtonToggleGroupMultiple, MatButtonToggle} from './button-toggle';
-import {UNIQUE_SELECTION_DISPATCHER_PROVIDER, MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '@angular/material/core';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
 import {A11yModule} from '@angular/cdk/a11y';
 
 
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index 29f80c924468..e2d11e804139 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -27,9 +27,9 @@ import {
 } from '@angular/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {UniqueSelectionDispatcher} from '@angular/material/core';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {FocusMonitor} from '@angular/cdk/a11y';
+import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 
 /** Acceptable types for a button toggle. */
 export type ToggleType = 'checkbox' | 'radio';
diff --git a/src/lib/core/public-api.ts b/src/lib/core/public-api.ts
index c059cace3f96..2723a2d05c5f 100644
--- a/src/lib/core/public-api.ts
+++ b/src/lib/core/public-api.ts
@@ -9,7 +9,6 @@
 export * from './animation/animation';
 export * from './common-behaviors/index';
 export * from './compatibility/compatibility';
-export * from './coordination/unique-selection-dispatcher';
 export * from './datetime/index';
 export * from './error/error-options';
 export * from './gestures/gesture-annotations';
diff --git a/src/lib/expansion/accordion-item.ts b/src/lib/expansion/accordion-item.ts
index a1a83054aa29..137cc9f20d36 100644
--- a/src/lib/expansion/accordion-item.ts
+++ b/src/lib/expansion/accordion-item.ts
@@ -15,7 +15,7 @@ import {
   Optional,
   ChangeDetectorRef,
 } from '@angular/core';
-import {UniqueSelectionDispatcher} from '@angular/material/core';
+import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {CdkAccordion} from './accordion';
 
 /** Used to generate unique ID for each expansion panel. */
diff --git a/src/lib/expansion/expansion-module.ts b/src/lib/expansion/expansion-module.ts
index 156b774476ac..7858f7d679a6 100644
--- a/src/lib/expansion/expansion-module.ts
+++ b/src/lib/expansion/expansion-module.ts
@@ -8,7 +8,7 @@
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/material/core';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
 import {A11yModule} from '@angular/cdk/a11y';
 import {CdkAccordion, MatAccordion} from './accordion';
 import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel';
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index cf4a209f4c9d..2e424a642068 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -21,7 +21,8 @@ import {
   SimpleChanges,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanDisable, mixinDisabled, UniqueSelectionDispatcher} from '@angular/material/core';
+import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
+import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 import {MatAccordion} from './accordion';
 import {AccordionItem} from './accordion-item';
diff --git a/src/lib/radio/radio-module.ts b/src/lib/radio/radio-module.ts
index 59238a1682f1..31a2aea986b7 100644
--- a/src/lib/radio/radio-module.ts
+++ b/src/lib/radio/radio-module.ts
@@ -12,9 +12,9 @@ import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
 import {
   MatRippleModule,
   MatCommonModule,
-  UNIQUE_SELECTION_DISPATCHER_PROVIDER,
 } from '@angular/material/core';
 import {MatRadioGroup, MatRadioButton} from './radio';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
 import {A11yModule} from '@angular/cdk/a11y';
 
 @NgModule({
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 530c77f85a0b..2196ee4308ca 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -37,9 +37,9 @@ import {
   mixinDisabled,
   mixinDisableRipple,
   RippleRef,
-  UniqueSelectionDispatcher,
 } from '@angular/material/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for radio components.

From 38268d36522397130c763d238b9c05c5bb548eb8 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Tue, 3 Oct 2017 17:50:14 -0500
Subject: [PATCH 231/575] fix(tabs): update tab output names  (#7134)

---
 src/lib/tabs/tab-body.ts       |  8 ++++----
 src/lib/tabs/tab-group.html    |  4 ++--
 src/lib/tabs/tab-group.spec.ts |  4 ++--
 src/lib/tabs/tab-group.ts      | 11 +++++++++--
 src/lib/tabs/tabs.md           |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index 8999b60a83f8..7b3d06828a31 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -91,10 +91,10 @@ export class MatTabBody implements OnInit, AfterViewChecked {
   @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
 
   /** Event emitted when the tab begins to animate towards the center as the active tab. */
-  @Output() onCentering: EventEmitter<number> = new EventEmitter<number>();
+  @Output() _onCentering: EventEmitter<number> = new EventEmitter<number>();
 
   /** Event emitted when the tab completes its animation towards the center. */
-  @Output() onCentered: EventEmitter<void> = new EventEmitter<void>(true);
+  @Output() _onCentered: EventEmitter<void> = new EventEmitter<void>(true);
 
   /** The tab body content to display. */
   @Input('content') _content: TemplatePortal<any>;
@@ -151,7 +151,7 @@ export class MatTabBody implements OnInit, AfterViewChecked {
 
   _onTranslateTabStarted(e: AnimationEvent) {
     if (this._isCenterPosition(e.toState)) {
-      this.onCentering.emit(this._elementRef.nativeElement.clientHeight);
+      this._onCentering.emit(this._elementRef.nativeElement.clientHeight);
     }
   }
 
@@ -163,7 +163,7 @@ export class MatTabBody implements OnInit, AfterViewChecked {
 
     // If the transition to the center is complete, emit an event.
     if (this._isCenterPosition(e.toState) && this._isCenterPosition(this._position)) {
-      this.onCentered.emit();
+      this._onCentered.emit();
     }
   }
 
diff --git a/src/lib/tabs/tab-group.html b/src/lib/tabs/tab-group.html
index baef20dfb1b8..da2d053b913d 100644
--- a/src/lib/tabs/tab-group.html
+++ b/src/lib/tabs/tab-group.html
@@ -33,7 +33,7 @@
                [content]="tab.content"
                [position]="tab.position"
                [origin]="tab.origin"
-               (onCentered)="_removeTabBodyWrapperHeight()"
-               (onCentering)="_setTabBodyWrapperHeight($event)">
+               (_onCentered)="_removeTabBodyWrapperHeight()"
+               (_onCentering)="_setTabBodyWrapperHeight($event)">
   </mat-tab-body>
 </div>
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index f6c4668c0fb5..cf1f72a54711 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -412,7 +412,7 @@ describe('nested MatTabGroup with enabled animations', () => {
         [headerPosition]="headerPosition"
         [disableRipple]="disableRipple"
         (focusChange)="handleFocus($event)"
-        (selectChange)="handleSelection($event)">
+        (selectedTabChange)="handleSelection($event)">
       <mat-tab>
         <ng-template mat-tab-label>Tab One</ng-template>
         Tab one content
@@ -448,7 +448,7 @@ class SimpleTabsTestApp {
     <mat-tab-group class="tab-group"
         [(selectedIndex)]="selectedIndex"
         (focusChange)="handleFocus($event)"
-        (selectChange)="handleSelection($event)">
+        (selectedTabChange)="handleSelection($event)">
       <mat-tab *ngFor="let tab of tabs">
         <ng-template mat-tab-label>{{tab.label}}</ng-template>
         {{tab.content}}
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 0d232cc2b3ed..d2726c5c4aa3 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -141,9 +141,15 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
   @Output() focusChange: EventEmitter<MatTabChangeEvent> = new EventEmitter<MatTabChangeEvent>();
 
   /** Event emitted when the tab selection has changed. */
-  @Output() selectChange: EventEmitter<MatTabChangeEvent> =
+  @Output() selectedTabChange: EventEmitter<MatTabChangeEvent> =
       new EventEmitter<MatTabChangeEvent>(true);
 
+  /**
+   * Event emitted when the tab selection has changed.
+   * @deprecated Use `selectedTabChange` instead.
+   */
+  @Output() selectChange: EventEmitter<MatTabChangeEvent> = this.selectedTabChange;
+
   private _groupId: number;
 
   constructor(_renderer: Renderer2,
@@ -170,7 +176,8 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
     // If there is a change in selected index, emit a change event. Should not trigger if
     // the selected index has not yet been initialized.
     if (this._selectedIndex != indexToSelect && this._selectedIndex != null) {
-      this.selectChange.emit(this._createChangeEvent(indexToSelect));
+      const tabChangeEvent = this._createChangeEvent(indexToSelect);
+      this.selectedTabChange.emit(tabChangeEvent);
       // Emitting this value after change detection has run
       // since the checked content may contain this variable'
       Promise.resolve().then(() => this.selectedIndexChange.emit(indexToSelect));
diff --git a/src/lib/tabs/tabs.md b/src/lib/tabs/tabs.md
index 2a6f7465c007..4ff541e86bfa 100644
--- a/src/lib/tabs/tabs.md
+++ b/src/lib/tabs/tabs.md
@@ -10,7 +10,7 @@ tab labels in the header.
 
 ### Events
 
-The `selectChange` output event is emitted when the active tab changes.
+The `selectedTabChange` output event is emitted when the active tab changes.
 
 The `focusChange` output event is emitted when the user puts focus on any of the tab labels in
 the header, usually through keyboard navigation.

From 2b3d795b00821a13e05164d04df370e9d4ec53ec Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 00:50:39 +0200
Subject: [PATCH 232/575] fix(paginator): page size selector not working
 (#7263)

---
 src/lib/paginator/paginator.html | 12 +++++++-----
 src/lib/paginator/paginator.scss |  7 +------
 src/lib/select/select-module.ts  |  3 ++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/lib/paginator/paginator.html b/src/lib/paginator/paginator.html
index 06297e5fb288..c8b207b4c426 100644
--- a/src/lib/paginator/paginator.html
+++ b/src/lib/paginator/paginator.html
@@ -3,11 +3,13 @@
     {{_intl.itemsPerPageLabel}}
   </div>
 
-  <mat-form-field *ngIf="_displayedPageSizeOptions.length > 1">
-    <mat-select class="mat-paginator-page-size-select"
-               [value]="pageSize"
-               [aria-label]="_intl.itemsPerPageLabel"
-               (change)="_changePageSize($event.value)">
+  <mat-form-field
+    *ngIf="_displayedPageSizeOptions.length > 1"
+    class="mat-paginator-page-size-select">
+    <mat-select
+      [value]="pageSize"
+      [aria-label]="_intl.itemsPerPageLabel"
+      (change)="_changePageSize($event.value)">
       <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
         {{pageSizeOption}}
       </mat-option>
diff --git a/src/lib/paginator/paginator.scss b/src/lib/paginator/paginator.scss
index 46fb48aaa944..4562996aa8ea 100644
--- a/src/lib/paginator/paginator.scss
+++ b/src/lib/paginator/paginator.scss
@@ -32,13 +32,8 @@ $mat-paginator-button-increment-icon-margin: 16px;
 }
 
 .mat-paginator-page-size-select {
-  // Since the select won't have a placeholder we can remove the space that is reserved for it.
-  padding-top: 0;
   margin: $mat-paginator-selector-margin;
-
-  .mat-select-trigger {
-    min-width: $mat-paginator-selector-trigger-min-width;
-  }
+  width: $mat-paginator-selector-trigger-min-width;
 }
 
 .mat-paginator-range-label {
diff --git a/src/lib/select/select-module.ts b/src/lib/select/select-module.ts
index 99b154bfc2e0..596cfefcb4bf 100644
--- a/src/lib/select/select-module.ts
+++ b/src/lib/select/select-module.ts
@@ -11,6 +11,7 @@ import {CommonModule} from '@angular/common';
 import {MatSelect, MatSelectTrigger, MAT_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
 import {MatCommonModule, MatOptionModule} from '@angular/material/core';
 import {OverlayModule} from '@angular/cdk/overlay';
+import {MatFormFieldModule} from '@angular/material/form-field';
 
 
 @NgModule({
@@ -20,7 +21,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
     MatOptionModule,
     MatCommonModule,
   ],
-  exports: [MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
+  exports: [MatFormFieldModule, MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
   declarations: [MatSelect, MatSelectTrigger],
   providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER]
 })

From ed338a3d8a0072e2ac096ef993a0ac8ef887dc58 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Tue, 3 Oct 2017 17:51:09 -0500
Subject: [PATCH 233/575] chore(api): update outputs (#7135)

---
 src/lib/datepicker/calendar.html           | 2 +-
 src/lib/datepicker/calendar.ts             | 4 ++--
 src/lib/datepicker/datepicker-content.html | 2 +-
 src/lib/datepicker/month-view.ts           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/datepicker/calendar.html b/src/lib/datepicker/calendar.html
index 0af5479a9709..3b16ffa92658 100644
--- a/src/lib/datepicker/calendar.html
+++ b/src/lib/datepicker/calendar.html
@@ -28,7 +28,7 @@
       [selected]="selected"
       [dateFilter]="_dateFilterForViews"
       (selectedChange)="_dateSelected($event)"
-      (userSelection)="_userSelected()">
+      (_userSelection)="_userSelected()">
   </mat-month-view>
 
   <mat-year-view
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index e73d36795b73..94681fafa1e8 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -98,7 +98,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   @Output() selectedChange = new EventEmitter<D>();
 
   /** Emits when any date is selected. */
-  @Output() userSelection = new EventEmitter<void>();
+  @Output() _userSelection = new EventEmitter<void>();
 
   /** Reference to the current month view component. */
   @ViewChild(MatMonthView) monthView: MatMonthView<D>;
@@ -197,7 +197,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   }
 
   _userSelected(): void {
-    this.userSelection.emit();
+    this._userSelection.emit();
   }
 
   /** Handles month selection in the year view. */
diff --git a/src/lib/datepicker/datepicker-content.html b/src/lib/datepicker/datepicker-content.html
index fea716d55f61..ec6461ce7484 100644
--- a/src/lib/datepicker/datepicker-content.html
+++ b/src/lib/datepicker/datepicker-content.html
@@ -7,5 +7,5 @@
     [dateFilter]="datepicker._dateFilter"
     [selected]="datepicker._selected"
     (selectedChange)="datepicker._select($event)"
-    (userSelection)="datepicker.close()">
+    (_userSelection)="datepicker.close()">
 </mat-calendar>
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index f7a4c2fc4ac8..f112f67125b4 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -70,7 +70,7 @@ export class MatMonthView<D> implements AfterContentInit {
   @Output() selectedChange = new EventEmitter<D | null>();
 
   /** Emits when any date is selected. */
-  @Output() userSelection = new EventEmitter<void>();
+  @Output() _userSelection = new EventEmitter<void>();
 
   /** The label for this month (e.g. "January 2017"). */
   _monthLabel: string;
@@ -130,7 +130,7 @@ export class MatMonthView<D> implements AfterContentInit {
       this.selectedChange.emit(selectedDate);
     }
 
-    this.userSelection.emit();
+    this._userSelection.emit();
   }
 
   /** Initializes this month view. */

From 38bec5c074e025cb8b14aa9bc759e7e2c5a71098 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 3 Oct 2017 15:51:30 -0700
Subject: [PATCH 234/575] chore: update angular to 4.4.4 and switch (#7431)

---
 package.json                              | 24 +++++++++++------------
 src/lib/select/select.html                |  2 +-
 src/material-moment-adapter/tsconfig.json |  2 ++
 tools/dashboard/package.json              | 22 ++++++++++-----------
 tools/screenshot-test/package.json        | 20 +++++++++----------
 tsconfig.json                             |  2 --
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index ffed3f477b53..818589fc3896 100644
--- a/package.json
+++ b/package.json
@@ -25,13 +25,13 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": "~4.4.3",
-    "@angular/common": "~4.4.3",
-    "@angular/compiler": "~4.4.3",
-    "@angular/core": "~4.4.3",
-    "@angular/forms": "~4.4.3",
-    "@angular/http": "~4.4.3",
-    "@angular/platform-browser": "~4.4.3",
+    "@angular/animations": "~4.4.4",
+    "@angular/common": "~4.4.4",
+    "@angular/compiler": "~4.4.4",
+    "@angular/core": "~4.4.4",
+    "@angular/forms": "~4.4.4",
+    "@angular/http": "~4.4.4",
+    "@angular/platform-browser": "~4.4.4",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
     "systemjs": "0.19.43",
@@ -40,11 +40,11 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.4.3",
-    "@angular/platform-browser-dynamic": "~4.4.3",
-    "@angular/platform-server": "~4.4.3",
-    "@angular/router": "~4.4.3",
-    "@angular/tsc-wrapped": "~4.4.3",
+    "@angular/compiler-cli": "~4.4.4",
+    "@angular/platform-browser-dynamic": "~4.4.4",
+    "@angular/platform-server": "~4.4.4",
+    "@angular/router": "~4.4.4",
+    "@angular/tsc-wrapped": "~4.4.4",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^3.0.1",
diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index 545f7acd6234..eb42a39aa6d9 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -9,7 +9,7 @@
       TODO(mmalerba): &nbsp; is currently broken in components with preserveWhitespace: false, so we
       evaluate it as a JS string binding instead. Change back to &nbsp; once it works again.
     -->
-    <ng-container *ngIf="empty">{{'\u00A0'}}</ng-container>
+    <ng-container *ngIf="empty">&nbsp;</ng-container>
     <span class="mat-select-value-text" *ngIf="!empty" [ngSwitch]="!!customTrigger">
       <span *ngSwitchDefault>{{ triggerValue }}</span>
       <ng-content select="mat-select-trigger" *ngSwitchCase="true"></ng-content>
diff --git a/src/material-moment-adapter/tsconfig.json b/src/material-moment-adapter/tsconfig.json
index f7f702c1c807..a2e08e4cabd9 100644
--- a/src/material-moment-adapter/tsconfig.json
+++ b/src/material-moment-adapter/tsconfig.json
@@ -2,6 +2,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "rootDir": "..",
     "baseUrl": ".",
     "paths": {
diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index 008835a36a6e..cd3866c3c137 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -10,17 +10,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.4.3",
+    "@angular/animations": "^4.4.4",
     "@angular/cdk": "github:angular/cdk-builds",
-    "@angular/common": "^4.4.3",
-    "@angular/compiler": "^4.4.3",
-    "@angular/core": "^4.4.3",
-    "@angular/forms": "^4.4.3",
-    "@angular/http": "^4.4.3",
+    "@angular/common": "^4.4.4",
+    "@angular/compiler": "^4.4.4",
+    "@angular/core": "^4.4.4",
+    "@angular/forms": "^4.4.4",
+    "@angular/http": "^4.4.4",
     "@angular/material": "github:angular/material2-builds",
-    "@angular/platform-browser": "^4.4.3",
-    "@angular/platform-browser-dynamic": "^4.4.3",
-    "@angular/router": "^4.4.3",
+    "@angular/platform-browser": "^4.4.4",
+    "@angular/platform-browser-dynamic": "^4.4.4",
+    "@angular/router": "^4.4.4",
     "@swimlane/ngx-charts": "^6.0.0",
     "angularfire2": "^4.0.0-rc.1",
     "core-js": "^2.4.1",
@@ -31,8 +31,8 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.2.0",
-    "@angular/compiler-cli": "^4.4.3",
-    "@angular/language-service": "^4.4.3",
+    "@angular/compiler-cli": "^4.4.4",
+    "@angular/language-service": "^4.4.4",
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "ts-node": "~3.0.4",
diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index 056395a1c5d0..a73f30f0f514 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -11,16 +11,16 @@
   "dependencies": {
     "@angular/animations": "^4.0.2",
     "@angular/cdk": "angular/cdk-builds",
-    "@angular/common": "^4.4.3",
-    "@angular/compiler": "^4.4.3",
-    "@angular/compiler-cli": "^4.4.3",
-    "@angular/core": "^4.4.3",
-    "@angular/forms": "^4.4.3",
-    "@angular/http": "^4.4.3",
+    "@angular/common": "^4.4.4",
+    "@angular/compiler": "^4.4.4",
+    "@angular/compiler-cli": "^4.4.4",
+    "@angular/core": "^4.4.4",
+    "@angular/forms": "^4.4.4",
+    "@angular/http": "^4.4.4",
     "@angular/material": "angular/material2-builds",
-    "@angular/platform-browser": "^4.4.3",
-    "@angular/platform-browser-dynamic": "^4.4.3",
-    "@angular/router": "^4.4.3",
+    "@angular/platform-browser": "^4.4.4",
+    "@angular/platform-browser-dynamic": "^4.4.4",
+    "@angular/router": "^4.4.4",
     "core-js": "^2.4.1",
     "firebase": "^3.7.6",
     "rxjs": "^5.0.1",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.0.0",
-    "@angular/compiler-cli": "^4.4.3",
+    "@angular/compiler-cli": "^4.4.4",
     "@types/node": "^6.0.42",
     "ts-node": "1.2.1",
     "typescript": "~2.2.1"
diff --git a/tsconfig.json b/tsconfig.json
index 8bf992e61bb6..aad8f82e9301 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,8 +3,6 @@
 {
   "compilerOptions": {
     "outDir": "./dist/packages/all",
-    // Needed for Moment.js since it doesn't have a default export.
-    "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",

From c6824d5b88c56031681435bf6099d4931ebbfbbe Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 3 Oct 2017 15:51:51 -0700
Subject: [PATCH 235/575] fix(input): make autosize work inside tabs & stepper
 (#7341)

---
 src/demo-app/stepper/stepper-demo.html | 10 +++++
 src/demo-app/tabs/tabs-demo.html       | 11 +++++
 src/e2e-app/tabs/tabs-e2e.html         |  4 +-
 src/lib/input/autosize.spec.ts         | 57 +++++++++++++++++++++++++-
 src/lib/input/autosize.ts              | 19 +++++++--
 5 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/src/demo-app/stepper/stepper-demo.html b/src/demo-app/stepper/stepper-demo.html
index 61d8cd9cde99..4db3278b2977 100644
--- a/src/demo-app/stepper/stepper-demo.html
+++ b/src/demo-app/stepper/stepper-demo.html
@@ -195,3 +195,13 @@ <h3>Horizontal Stepper Demo with Templated Label</h3>
     </div>
   </mat-step>
 </mat-horizontal-stepper>
+
+<h3>Stepper with autosize textarea</h3>
+<mat-horizontal-stepper>
+  <mat-step label="Step 1">
+    <mat-form-field>
+      <textarea matInput placeholder="Autosize textarea" matTextareaAutosize>This is an autosize textarea, it should adjust to the size of its content.</textarea>
+    </mat-form-field>
+  </mat-step>
+</mat-horizontal-stepper>
+
diff --git a/src/demo-app/tabs/tabs-demo.html b/src/demo-app/tabs/tabs-demo.html
index 759a92e70a9c..8b85ef763f3d 100644
--- a/src/demo-app/tabs/tabs-demo.html
+++ b/src/demo-app/tabs/tabs-demo.html
@@ -277,3 +277,14 @@ <h1>Tabs with background color</h1>
     </div>
   </mat-tab>
 </mat-tab-group>
+
+<h1>Tabs with autosize textarea</h1>
+<mat-tab-group class="demo-tab-group">
+  <mat-tab label="Tab 1">
+    <div class="tab-content">
+      <mat-form-field>
+        <textarea matInput placeholder="Autosize textarea" matTextareaAutosize>This is an autosize textarea, it should adjust to the size of its content.</textarea>
+      </mat-form-field>
+    </div>
+  </mat-tab>
+</mat-tab-group>
diff --git a/src/e2e-app/tabs/tabs-e2e.html b/src/e2e-app/tabs/tabs-e2e.html
index 1b21b9f58ca7..ffd4723907a1 100644
--- a/src/e2e-app/tabs/tabs-e2e.html
+++ b/src/e2e-app/tabs/tabs-e2e.html
@@ -2,7 +2,9 @@
   <mat-tab-group>
     <mat-tab>
       <ng-template mat-tab-label>One</ng-template>
-      First tab's content
+      <mat-form-field>
+        <textarea matInput placeholder="Autosize textarea" matTextareaAutosize>This is an autosize textarea, it should adjust to the size of its content.</textarea>
+      </mat-form-field>
     </mat-tab>
     <mat-tab>
       <ng-template mat-tab-label>Two</ng-template>
diff --git a/src/lib/input/autosize.spec.ts b/src/lib/input/autosize.spec.ts
index 9a4c9eda740e..b984be03340f 100644
--- a/src/lib/input/autosize.spec.ts
+++ b/src/lib/input/autosize.spec.ts
@@ -4,6 +4,9 @@ import {ComponentFixture, TestBed, async, fakeAsync, flushMicrotasks} from '@ang
 import {By} from '@angular/platform-browser';
 import {MatInputModule} from './index';
 import {MatTextareaAutosize} from './autosize';
+import {MatStepperModule} from '@angular/material/stepper';
+import {MatTabsModule} from '@angular/material/tabs';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
 
 describe('MatTextareaAutosize', () => {
@@ -13,8 +16,16 @@ describe('MatTextareaAutosize', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MatInputModule, FormsModule],
+      imports: [
+        FormsModule,
+        MatInputModule,
+        MatStepperModule,
+        MatTabsModule,
+        NoopAnimationsModule,
+      ],
       declarations: [
+        AutosizeTextareaInAStep,
+        AutosizeTextareaInATab,
         AutosizeTextAreaWithContent,
         AutosizeTextAreaWithValue,
         AutosizeTextareaWithNgModel
@@ -202,6 +213,20 @@ describe('MatTextareaAutosize', () => {
     expect(textarea.clientHeight)
         .toBeGreaterThan(previousHeight, 'Expected the textarea height to have increased.');
   }));
+
+  it('should work in a tab', () => {
+    const fixtureWithForms = TestBed.createComponent(AutosizeTextareaInATab);
+    fixtureWithForms.detectChanges();
+    textarea = fixtureWithForms.nativeElement.querySelector('textarea');
+    expect(textarea.getBoundingClientRect().height).toBeGreaterThan(1);
+  });
+
+  it('should work in a step', () => {
+    const fixtureWithForms = TestBed.createComponent(AutosizeTextareaInAStep);
+    fixtureWithForms.detectChanges();
+    textarea = fixtureWithForms.nativeElement.querySelector('textarea');
+    expect(textarea.getBoundingClientRect().height).toBeGreaterThan(1);
+  });
 });
 
 
@@ -243,3 +268,33 @@ class AutosizeTextAreaWithValue {
 class AutosizeTextareaWithNgModel {
   model = '';
 }
+
+@Component({
+  template: `
+    <mat-tab-group>
+      <mat-tab label="Tab 1">
+        <mat-form-field>
+          <textarea matInput matTextareaAutosize>
+            Blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah
+          </textarea>
+        </mat-form-field>
+      </mat-tab>
+    </mat-tab-group>
+  `
+})
+class AutosizeTextareaInATab {}
+
+@Component({
+  template: `
+    <mat-horizontal-stepper>
+      <mat-step label="Step 1">
+        <mat-form-field>
+          <textarea matInput matTextareaAautosize>
+            Blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah
+          </textarea>
+        </mat-form-field>
+      </mat-step>
+    </mat-horizontal-stepper>
+  `
+})
+class AutosizeTextareaInAStep {}
diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts
index 3b6df9739838..51b0554f16c2 100644
--- a/src/lib/input/autosize.ts
+++ b/src/lib/input/autosize.ts
@@ -71,7 +71,6 @@ export class MatTextareaAutosize implements AfterViewInit, DoCheck {
 
   ngAfterViewInit() {
     if (this._platform.isBrowser) {
-      this._cacheTextareaLineHeight();
       this.resizeToFitContent();
     }
   }
@@ -83,13 +82,17 @@ export class MatTextareaAutosize implements AfterViewInit, DoCheck {
   }
 
   /**
-   * Cache the height of a single-row textarea.
+   * Cache the height of a single-row textarea if it has not already been cached.
    *
    * We need to know how large a single "row" of a textarea is in order to apply minRows and
    * maxRows. For the initial version, we will assume that the height of a single line in the
    * textarea does not ever change.
    */
   private _cacheTextareaLineHeight(): void {
+    if (this._cachedLineHeight) {
+      return;
+    }
+
     let textarea = this._elementRef.nativeElement as HTMLTextAreaElement;
 
     // Use a clone element because we have to override some styles.
@@ -124,11 +127,21 @@ export class MatTextareaAutosize implements AfterViewInit, DoCheck {
   }
 
   ngDoCheck() {
-    this.resizeToFitContent();
+    if (this._platform.isBrowser) {
+      this.resizeToFitContent();
+    }
   }
 
   /** Resize the textarea to fit its content. */
   resizeToFitContent() {
+    this._cacheTextareaLineHeight();
+
+    // If we haven't determined the line-height yet, we know we're still hidden and there's no point
+    // in checking the height of the textarea.
+    if (!this._cachedLineHeight) {
+      return;
+    }
+
     const textarea = this._elementRef.nativeElement as HTMLTextAreaElement;
     const value = textarea.value;
 

From 0ff8d5d5b24ece67dde8522f877872134f8502f2 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 3 Oct 2017 15:52:33 -0700
Subject: [PATCH 236/575] feat(dialog): add datepicker dialog and popup classes
 for easy styling (#7013)

---
 src/lib/datepicker/datepicker.spec.ts | 9 +++++----
 src/lib/datepicker/datepicker.ts      | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index c9d0ff8768ee..dfcf2df0a509 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -82,24 +82,25 @@ describe('MatDatepicker', () => {
       }));
 
       it('open non-touch should open popup', () => {
-        expect(document.querySelector('.cdk-overlay-pane')).toBeNull();
+        expect(document.querySelector('.cdk-overlay-pane.mat-datepicker-popup')).toBeNull();
 
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('.cdk-overlay-pane')).not.toBeNull();
+        expect(document.querySelector('.cdk-overlay-pane.mat-datepicker-popup')).not.toBeNull();
       });
 
       it('open touch should open dialog', () => {
         testComponent.touch = true;
         fixture.detectChanges();
 
-        expect(document.querySelector('mat-dialog-container')).toBeNull();
+        expect(document.querySelector('.mat-datepicker-dialog mat-dialog-container')).toBeNull();
 
         testComponent.datepicker.open();
         fixture.detectChanges();
 
-        expect(document.querySelector('mat-dialog-container')).not.toBeNull();
+        expect(document.querySelector('.mat-datepicker-dialog mat-dialog-container'))
+            .not.toBeNull();
       });
 
       it('open in disabled mode should not open the calendar', () => {
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index cbd4c0da8cf7..3b5f783fbb86 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -302,6 +302,7 @@ export class MatDatepicker<D> implements OnDestroy {
     this._dialogRef = this._dialog.open(MatDatepickerContent, {
       direction: this._dir ? this._dir.value : 'ltr',
       viewContainerRef: this._viewContainerRef,
+      panelClass: 'mat-datepicker-dialog',
     });
     this._dialogRef.afterClosed().subscribe(() => this.close());
     this._dialogRef.componentInstance.datepicker = this;
@@ -338,7 +339,8 @@ export class MatDatepicker<D> implements OnDestroy {
       hasBackdrop: true,
       backdropClass: 'mat-overlay-transparent-backdrop',
       direction: this._dir ? this._dir.value : 'ltr',
-      scrollStrategy: this._scrollStrategy()
+      scrollStrategy: this._scrollStrategy(),
+      panelClass: 'mat-datepicker-popup',
     });
 
     this._popupRef = this._overlay.create(overlayConfig);

From c1f6ea19cb317d30af79dc431d39ed8b962e146d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 4 Oct 2017 00:57:35 +0200
Subject: [PATCH 237/575] fix(theming): incorrect green-500 contrast color
 (#7492)

Fixes #7490
---
 src/lib/core/theming/_palette.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/core/theming/_palette.scss b/src/lib/core/theming/_palette.scss
index fe51aa24d9ee..7cb73bccaba2 100644
--- a/src/lib/core/theming/_palette.scss
+++ b/src/lib/core/theming/_palette.scss
@@ -331,7 +331,7 @@ $mat-green: (
     200: $black-87-opacity,
     300: $black-87-opacity,
     400: $black-87-opacity,
-    500: white,
+    500: $black-87-opacity,
     600: white,
     700: white,
     800: $white-87-opacity,

From 0584cdf0fb0c0bb92cf1e5569b5b8943e0ddcf60 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 4 Oct 2017 01:07:22 +0200
Subject: [PATCH 238/575] fix(overlay): detach method returns undefined (#7449)

Fixes #7408
---
 src/cdk/overlay/overlay-ref.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 915104dfb3f0..8bac983a41f0 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -85,9 +85,9 @@ export class OverlayRef implements PortalHost {
 
   /**
    * Detaches an overlay from a portal.
-   * @returns Resolves when the overlay has been detached.
+   * @returns The portal detachment result.
    */
-  detach(): Promise<any> {
+  detach(): any {
     this.detachBackdrop();
 
     // When the overlay is detached, the pane element should disable pointer events.
@@ -99,7 +99,7 @@ export class OverlayRef implements PortalHost {
       this._config.scrollStrategy.disable();
     }
 
-    let detachmentResult = this._portalHost.detach();
+    const detachmentResult  = this._portalHost.detach();
 
     // Only emit after everything is detached.
     this._detachments.next();

From f40a7cc8ec2eb8a91adc2c07280678fd907ed402 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 01:07:47 +0200
Subject: [PATCH 239/575] fix(selection-list): model not updated when option is
 selected programmatically (#7334)

Fixes #7318.
---
 src/demo-app/list/list-demo.html    |  7 +--
 src/lib/list/selection-list.spec.ts | 70 +++++++++++++++++------------
 src/lib/list/selection-list.ts      | 14 ++++--
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/src/demo-app/list/list-demo.html b/src/demo-app/list/list-demo.html
index 347d5c24732b..491a3dbf90b3 100644
--- a/src/demo-app/list/list-demo.html
+++ b/src/demo-app/list/list-demo.html
@@ -108,9 +108,10 @@ <h2>Selection list</h2>
     <mat-selection-list #groceries>
       <h3 mat-subheader>Groceries</h3>
 
-      <mat-list-option *ngFor="let item of items" [value]="item">
-        {{item}}
-      </mat-list-option>
+      <mat-list-option value="bananas">Bananas</mat-list-option>
+      <mat-list-option selected value="oranges">Oranges</mat-list-option>
+      <mat-list-option value="apples">Apples</mat-list-option>
+      <mat-list-option value="strawberries">Strawberries</mat-list-option>
     </mat-selection-list>
 
     <p>Selected: {{groceries.selectedOptions.selected.length}}</p>
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 5c78bfda2438..388c93a3499c 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -10,7 +10,7 @@ import {MatListModule, MatListOption, MatSelectionList} from './index';
 describe('MatSelectionList', () => {
   describe('with list option', () => {
     let fixture: ComponentFixture<SelectionListWithListOptions>;
-    let listOption: DebugElement[];
+    let listOptions: DebugElement[];
     let listItemEl: DebugElement;
     let selectionList: DebugElement;
 
@@ -33,14 +33,14 @@ describe('MatSelectionList', () => {
       fixture = TestBed.createComponent(SelectionListWithListOptions);
       fixture.detectChanges();
 
-      listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
+      listOptions = fixture.debugElement.queryAll(By.directive(MatListOption));
       listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
       selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
     }));
 
     it('should add and remove focus class on focus/blur', () => {
       // Use the second list item, because the first one is always disabled.
-      const listItem = listOption[1].nativeElement;
+      const listItem = listOptions[1].nativeElement;
 
       expect(listItem.classList).not.toContain('mat-list-item-focus');
 
@@ -57,35 +57,35 @@ describe('MatSelectionList', () => {
       const optionValues = ['inbox', 'starred', 'sent-mail', 'drafts'];
 
       optionValues.forEach((optionValue, index) => {
-        expect(listOption[index].componentInstance.value).toBe(optionValue);
+        expect(listOptions[index].componentInstance.value).toBe(optionValue);
       });
     });
 
     it('should be able to dispatch one selected item', () => {
-      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
+      let testListItem = listOptions[2].injector.get<MatListOption>(MatListOption);
       let selectList =
           selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
-      expect(listOption[2].nativeElement.getAttribute('aria-selected')).toBe('false');
+      expect(listOptions[2].nativeElement.getAttribute('aria-selected')).toBe('false');
 
       testListItem.toggle();
       fixture.detectChanges();
 
-      expect(listOption[2].nativeElement.getAttribute('aria-selected')).toBe('true');
-      expect(listOption[2].nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(listOptions[2].nativeElement.getAttribute('aria-selected')).toBe('true');
+      expect(listOptions[2].nativeElement.getAttribute('aria-disabled')).toBe('false');
       expect(selectList.selected.length).toBe(1);
     });
 
     it('should be able to dispatch multiple selected items', () => {
-      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
-      let testListItem2 = listOption[1].injector.get<MatListOption>(MatListOption);
+      let testListItem = listOptions[2].injector.get<MatListOption>(MatListOption);
+      let testListItem2 = listOptions[1].injector.get<MatListOption>(MatListOption);
       let selectList =
           selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
-      expect(listOption[2].nativeElement.getAttribute('aria-selected')).toBe('false');
-      expect(listOption[1].nativeElement.getAttribute('aria-selected')).toBe('false');
+      expect(listOptions[2].nativeElement.getAttribute('aria-selected')).toBe('false');
+      expect(listOptions[1].nativeElement.getAttribute('aria-selected')).toBe('false');
 
       testListItem.toggle();
       fixture.detectChanges();
@@ -94,14 +94,14 @@ describe('MatSelectionList', () => {
       fixture.detectChanges();
 
       expect(selectList.selected.length).toBe(2);
-      expect(listOption[2].nativeElement.getAttribute('aria-selected')).toBe('true');
-      expect(listOption[1].nativeElement.getAttribute('aria-selected')).toBe('true');
-      expect(listOption[1].nativeElement.getAttribute('aria-disabled')).toBe('false');
-      expect(listOption[2].nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(listOptions[2].nativeElement.getAttribute('aria-selected')).toBe('true');
+      expect(listOptions[1].nativeElement.getAttribute('aria-selected')).toBe('true');
+      expect(listOptions[1].nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(listOptions[2].nativeElement.getAttribute('aria-disabled')).toBe('false');
     });
 
     it('should be able to deselect an option', () => {
-      let testListItem = listOption[2].injector.get<MatListOption>(MatListOption);
+      let testListItem = listOptions[2].injector.get<MatListOption>(MatListOption);
       let selectList =
           selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
@@ -119,12 +119,12 @@ describe('MatSelectionList', () => {
     });
 
     it('should not allow selection of disabled items', () => {
-      let testListItem = listOption[0].injector.get<MatListOption>(MatListOption);
+      let testListItem = listOptions[0].injector.get<MatListOption>(MatListOption);
       let selectList =
           selectionList.injector.get<MatSelectionList>(MatSelectionList).selectedOptions;
 
       expect(selectList.selected.length).toBe(0);
-      expect(listOption[0].nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(listOptions[0].nativeElement.getAttribute('aria-disabled')).toBe('true');
 
       testListItem._handleClick();
       fixture.detectChanges();
@@ -133,18 +133,18 @@ describe('MatSelectionList', () => {
     });
 
     it('should be able to un-disable disabled items', () => {
-      let testListItem = listOption[0].injector.get<MatListOption>(MatListOption);
+      let testListItem = listOptions[0].injector.get<MatListOption>(MatListOption);
 
-      expect(listOption[0].nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(listOptions[0].nativeElement.getAttribute('aria-disabled')).toBe('true');
 
       testListItem.disabled = false;
       fixture.detectChanges();
 
-      expect(listOption[0].nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(listOptions[0].nativeElement.getAttribute('aria-disabled')).toBe('false');
     });
 
     it('should be able to use keyboard select with SPACE', () => {
-      let testListItem = listOption[1].nativeElement as HTMLElement;
+      let testListItem = listOptions[1].nativeElement as HTMLElement;
       let SPACE_EVENT: KeyboardEvent =
         createKeyboardEvent('keydown', SPACE, testListItem);
       let selectList =
@@ -162,7 +162,7 @@ describe('MatSelectionList', () => {
     it('should restore focus if active option is destroyed', () => {
       const manager = selectionList.componentInstance._keyManager;
 
-      listOption[3].componentInstance._handleFocus();
+      listOptions[3].componentInstance._handleFocus();
 
       expect(manager.activeItemIndex).toBe(3);
 
@@ -173,12 +173,12 @@ describe('MatSelectionList', () => {
     });
 
     it('should focus previous item when press UP ARROW', () => {
-      let testListItem = listOption[2].nativeElement as HTMLElement;
+      let testListItem = listOptions[2].nativeElement as HTMLElement;
       let UP_EVENT: KeyboardEvent =
         createKeyboardEvent('keydown', UP_ARROW, testListItem);
       let manager = selectionList.componentInstance._keyManager;
 
-      dispatchFakeEvent(listOption[2].nativeElement, 'focus');
+      dispatchFakeEvent(listOptions[2].nativeElement, 'focus');
       expect(manager.activeItemIndex).toEqual(2);
 
       selectionList.componentInstance._keydown(UP_EVENT);
@@ -189,12 +189,12 @@ describe('MatSelectionList', () => {
     });
 
     it('should focus next item when press DOWN ARROW', () => {
-      let testListItem = listOption[2].nativeElement as HTMLElement;
+      let testListItem = listOptions[2].nativeElement as HTMLElement;
       let DOWN_EVENT: KeyboardEvent =
         createKeyboardEvent('keydown', DOWN_ARROW, testListItem);
       let manager = selectionList.componentInstance._keyManager;
 
-      dispatchFakeEvent(listOption[2].nativeElement, 'focus');
+      dispatchFakeEvent(listOptions[2].nativeElement, 'focus');
       expect(manager.activeItemIndex).toEqual(2);
 
       selectionList.componentInstance._keydown(DOWN_EVENT);
@@ -226,6 +226,20 @@ describe('MatSelectionList', () => {
 
       expect(list.options.toArray().every(option => option.selected)).toBe(false);
     });
+
+    it('should update the list value when an item is selected programmatically', () => {
+      const list: MatSelectionList = selectionList.componentInstance;
+
+      expect(list.selectedOptions.isEmpty()).toBe(true);
+
+      listOptions[0].componentInstance.selected = true;
+      listOptions[2].componentInstance.selected = true;
+      fixture.detectChanges();
+
+      expect(list.selectedOptions.isEmpty()).toBe(false);
+      expect(list.selectedOptions.isSelected(listOptions[0].componentInstance)).toBe(true);
+      expect(list.selectedOptions.isSelected(listOptions[2].componentInstance)).toBe(true);
+    });
   });
 
   describe('with list option selected', () => {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 80fe6de4eab8..a8357d787e52 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -103,7 +103,17 @@ export class MatListOption extends _MatListOptionMixinBase
   /** Whether the option is selected. */
   @Input()
   get selected() { return this._selected; }
-  set selected(value: boolean) { this._selected = coerceBooleanProperty(value); }
+  set selected(value: boolean) {
+    const isSelected = coerceBooleanProperty(value);
+
+    if (isSelected !== this._selected) {
+      const selectionModel = this.selectionList.selectedOptions;
+
+      this._selected = isSelected;
+      isSelected ? selectionModel.select(this) : selectionModel.deselect(this);
+      this._changeDetector.markForCheck();
+    }
+  }
 
   /** Emitted when the option is selected. */
   @Output() selectChange = new EventEmitter<MatSelectionListOptionEvent>();
@@ -140,8 +150,6 @@ export class MatListOption extends _MatListOptionMixinBase
   /** Toggles the selection state of the option. */
   toggle(): void {
     this.selected = !this.selected;
-    this.selectionList.selectedOptions.toggle(this);
-    this._changeDetector.markForCheck();
   }
 
   /** Allows for programmatic focusing of the option. */

From 7714a5c8ac58dffcfda0a2d4dc7d1e5e8aef4bea Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 01:08:17 +0200
Subject: [PATCH 240/575] fix(ripple): use element coordinates instead of page
 coordinates (#7446)

Fixes #7436.
---
 src/lib/core/ripple/index.ts            |  3 +-
 src/lib/core/ripple/ripple-renderer.ts  | 44 +++++++++++--------------
 src/lib/core/ripple/ripple.spec.ts      |  3 +-
 src/lib/core/ripple/ripple.ts           |  8 ++---
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts |  4 +--
 5 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts
index 046815308345..15e9347f7820 100644
--- a/src/lib/core/ripple/index.ts
+++ b/src/lib/core/ripple/index.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
+import {ScrollDispatchModule} from '@angular/cdk/scrolling';
 import {PlatformModule} from '@angular/cdk/platform';
 import {MatCommonModule} from '../common-behaviors/common-module';
 import {MatRipple} from './ripple';
@@ -20,6 +20,5 @@ export {RippleConfig, RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '.
   imports: [MatCommonModule, PlatformModule, ScrollDispatchModule],
   exports: [MatRipple, MatCommonModule],
   declarations: [MatRipple],
-  providers: [VIEWPORT_RULER_PROVIDER],
 })
 export class MatRippleModule {}
diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
index 1ab8013123ee..76bbe3333435 100644
--- a/src/lib/core/ripple/ripple-renderer.ts
+++ b/src/lib/core/ripple/ripple-renderer.ts
@@ -8,7 +8,6 @@
 
 import {ElementRef, NgZone} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler} from '@angular/cdk/scrolling';
 import {RippleRef, RippleState} from './ripple-ref';
 
 
@@ -56,11 +55,7 @@ export class RippleRenderer {
   /** Whether mouse ripples should be created or not. */
   rippleDisabled: boolean = false;
 
-  constructor(
-      elementRef: ElementRef,
-      private _ngZone: NgZone,
-      private _ruler: ViewportRuler,
-      platform: Platform) {
+  constructor(elementRef: ElementRef, private _ngZone: NgZone, platform: Platform) {
     // Only do anything if we're on the browser.
     if (platform.isBrowser) {
       this._containerElement = elementRef.nativeElement;
@@ -79,27 +74,26 @@ export class RippleRenderer {
     }
   }
 
-  /** Fades in a ripple at the given coordinates. */
-  fadeInRipple(pageX: number, pageY: number, config: RippleConfig = {}): RippleRef {
-    let containerRect = this._containerElement.getBoundingClientRect();
+  /**
+   * Fades in a ripple at the given coordinates.
+   * @param x Coordinate within the element, along the X axis at which to start the ripple.
+   * @param Y Coordinate within the element, along the Y axis at which to start the ripple.
+   * @param config Extra ripple options.
+   */
+  fadeInRipple(x: number, y: number, config: RippleConfig = {}): RippleRef {
+    const containerRect = this._containerElement.getBoundingClientRect();
 
     if (config.centered) {
-      pageX = containerRect.left + containerRect.width / 2;
-      pageY = containerRect.top + containerRect.height / 2;
-    } else {
-      // Subtract scroll values from the coordinates because calculations below
-      // are always relative to the viewport rectangle.
-      let scrollPosition = this._ruler.getViewportScrollPosition();
-      pageX -= scrollPosition.left;
-      pageY -= scrollPosition.top;
+      x = containerRect.left + containerRect.width / 2;
+      y = containerRect.top + containerRect.height / 2;
     }
 
-    let radius = config.radius || distanceToFurthestCorner(pageX, pageY, containerRect);
-    let duration = RIPPLE_FADE_IN_DURATION * (1 / (config.speedFactor || 1));
-    let offsetX = pageX - containerRect.left;
-    let offsetY = pageY - containerRect.top;
+    const radius = config.radius || distanceToFurthestCorner(x, y, containerRect);
+    const duration = RIPPLE_FADE_IN_DURATION * (1 / (config.speedFactor || 1));
+    const offsetX = x - containerRect.left;
+    const offsetY = y - containerRect.top;
 
-    let ripple = document.createElement('div');
+    const ripple = document.createElement('div');
     ripple.classList.add('mat-ripple-element');
 
     ripple.style.left = `${offsetX - radius}px`;
@@ -189,7 +183,7 @@ export class RippleRenderer {
   private onMousedown(event: MouseEvent) {
     if (!this.rippleDisabled) {
       this._isPointerDown = true;
-      this.fadeInRipple(event.pageX, event.pageY, this.rippleConfig);
+      this.fadeInRipple(event.clientX, event.clientY, this.rippleConfig);
     }
   }
 
@@ -215,9 +209,9 @@ export class RippleRenderer {
   /** Function being called whenever the trigger is being touched. */
   private onTouchstart(event: TouchEvent) {
     if (!this.rippleDisabled) {
-      const {pageX, pageY} = event.touches[0];
+      const {clientX, clientY} = event.touches[0];
       this._isPointerDown = true;
-      this.fadeInRipple(pageX, pageY, this.rippleConfig);
+      this.fadeInRipple(clientX, clientY, this.rippleConfig);
     }
   }
 
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index d12613b5fe66..b8e9c55cd62b 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -1,7 +1,7 @@
 import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler} from '@angular/cdk/scrolling';
+import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
@@ -24,6 +24,7 @@ describe('MatRipple', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [MatRippleModule],
+      providers: [VIEWPORT_RULER_PROVIDER],
       declarations: [
         BasicRippleContainer,
         RippleContainerWithInputBindings,
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index 76e3bcec6b2e..cd7e7c77eb07 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -18,7 +18,6 @@ import {
   InjectionToken,
   Optional,
 } from '@angular/core';
-import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Platform} from '@angular/cdk/platform';
 import {RippleConfig, RippleRenderer} from './ripple-renderer';
 import {RippleRef} from './ripple-ref';
@@ -91,11 +90,10 @@ export class MatRipple implements OnChanges, OnDestroy {
   constructor(
     elementRef: ElementRef,
     ngZone: NgZone,
-    ruler: ViewportRuler,
     platform: Platform,
     @Optional() @Inject(MAT_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions
   ) {
-    this._rippleRenderer = new RippleRenderer(elementRef, ngZone, ruler, platform);
+    this._rippleRenderer = new RippleRenderer(elementRef, ngZone, platform);
     this._globalOptions = globalOptions ? globalOptions : {};
 
     this._updateRippleRenderer();
@@ -115,8 +113,8 @@ export class MatRipple implements OnChanges, OnDestroy {
   }
 
   /** Launches a manual ripple at the specified position. */
-  launch(pageX: number, pageY: number, config = this.rippleConfig): RippleRef {
-    return this._rippleRenderer.fadeInRipple(pageX, pageY, config);
+  launch(x: number, y: number, config = this.rippleConfig): RippleRef {
+    return this._rippleRenderer.fadeInRipple(x, y, config);
   }
 
   /** Fades out all currently showing ripple elements. */
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 8ab3170ce8cd..34336e2fa8e4 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -10,7 +10,6 @@ import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Platform} from '@angular/cdk/platform';
 import {auditTime, takeUntil} from '@angular/cdk/rxjs';
-import {ViewportRuler} from '@angular/cdk/scrolling';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -225,14 +224,13 @@ export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDi
   constructor(private _tabNavBar: MatTabNav,
               private _elementRef: ElementRef,
               ngZone: NgZone,
-              ruler: ViewportRuler,
               platform: Platform,
               @Optional() @Inject(MAT_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions) {
     super();
 
     // Manually create a ripple instance that uses the tab link element as trigger element.
     // Notice that the lifecycle hooks for the ripple config won't be called anymore.
-    this._tabLinkRipple = new MatRipple(_elementRef, ngZone, ruler, platform, globalOptions);
+    this._tabLinkRipple = new MatRipple(_elementRef, ngZone, platform, globalOptions);
   }
 
   ngOnDestroy() {

From 846cc134ad1c88f21a4245e33e48a70ff9e6650e Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 01:09:17 +0200
Subject: [PATCH 241/575] fix(list-key-manager): align matching logic with
 native listbox (#7212)

---
 src/cdk/a11y/list-key-manager.spec.ts | 56 +++++++++++++++++++++++++++
 src/cdk/a11y/list-key-manager.ts      |  9 +++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index a25a3720e278..f6ecd96105e1 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -491,6 +491,62 @@ describe('Key managers', () => {
         expect(keyManager.activeItem).toBeFalsy();
       }));
 
+      it('should start looking for matches after the active item', fakeAsync(() => {
+        itemList.items = [
+          new FakeFocusable('Bilbo'),
+          new FakeFocusable('Frodo'),
+          new FakeFocusable('Pippin'),
+          new FakeFocusable('Boromir'),
+          new FakeFocusable('Aragorn')
+        ];
+
+        keyManager.setActiveItem(1);
+        keyManager.onKeydown(createKeyboardEvent('keydown', 66, undefined, 'b'));
+        tick(debounceInterval);
+
+        expect(keyManager.activeItem).toBe(itemList.items[3]);
+      }));
+
+      it('should wrap back around if there were no matches after the active item', fakeAsync(() => {
+        itemList.items = [
+          new FakeFocusable('Bilbo'),
+          new FakeFocusable('Frodo'),
+          new FakeFocusable('Pippin'),
+          new FakeFocusable('Boromir'),
+          new FakeFocusable('Aragorn')
+        ];
+
+        keyManager.setActiveItem(3);
+        keyManager.onKeydown(createKeyboardEvent('keydown', 66, undefined, 'b'));
+        tick(debounceInterval);
+
+        expect(keyManager.activeItem).toBe(itemList.items[0]);
+      }));
+
+      it('should wrap back around if the last item is active', fakeAsync(() => {
+        keyManager.setActiveItem(2);
+        keyManager.onKeydown(createKeyboardEvent('keydown', 79, undefined, 'o'));
+        tick(debounceInterval);
+
+        expect(keyManager.activeItem).toBe(itemList.items[0]);
+      }));
+
+      it('should be able to select the first item', fakeAsync(() => {
+        keyManager.setActiveItem(-1);
+        keyManager.onKeydown(createKeyboardEvent('keydown', 79, undefined, 'o'));
+        tick(debounceInterval);
+
+        expect(keyManager.activeItem).toBe(itemList.items[0]);
+      }));
+
+      it('should not do anything if there is no match', fakeAsync(() => {
+        keyManager.setActiveItem(1);
+        keyManager.onKeydown(createKeyboardEvent('keydown', 87, undefined, 'w'));
+        tick(debounceInterval);
+
+        expect(keyManager.activeItem).toBe(itemList.items[1]);
+      }));
+
     });
 
   });
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index c3a3def7175e..6268194925eb 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -73,11 +73,14 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
       .subscribe(inputString => {
         const items = this._items.toArray();
 
-        for (let i = 0; i < items.length; i++) {
-          let item = items[i];
+        // Start at 1 because we want to start searching at the item immediately
+        // following the current active item.
+        for (let i = 1; i < items.length + 1; i++) {
+          const index = (this._activeItemIndex + i) % items.length;
+          const item = items[index];
 
           if (!item.disabled && item.getLabel!().toUpperCase().trim().indexOf(inputString) === 0) {
-            this.setActiveItem(i);
+            this.setActiveItem(index);
             break;
           }
         }

From b5310daabbc4f65dae3f31dd9995bfe71b829635 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 01:09:40 +0200
Subject: [PATCH 242/575] chore(drawer): mark drawer container as scrollable
 (#7455)

---
 src/lib/sidenav/drawer-container.html  | 2 +-
 src/lib/sidenav/sidenav-container.html | 2 +-
 src/lib/sidenav/sidenav-module.ts      | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib/sidenav/drawer-container.html b/src/lib/sidenav/drawer-container.html
index 94c6cafa8034..c674a0cfe98a 100644
--- a/src/lib/sidenav/drawer-container.html
+++ b/src/lib/sidenav/drawer-container.html
@@ -5,6 +5,6 @@
 
 <ng-content select="mat-drawer-content">
 </ng-content>
-<mat-drawer-content *ngIf="!_content">
+<mat-drawer-content *ngIf="!_content" cdkScrollable>
   <ng-content></ng-content>
 </mat-drawer-content>
diff --git a/src/lib/sidenav/sidenav-container.html b/src/lib/sidenav/sidenav-container.html
index 64aca5a79217..a54bd1485414 100644
--- a/src/lib/sidenav/sidenav-container.html
+++ b/src/lib/sidenav/sidenav-container.html
@@ -5,6 +5,6 @@
 
 <ng-content select="mat-sidenav-content">
 </ng-content>
-<mat-sidenav-content *ngIf="!_content">
+<mat-sidenav-content *ngIf="!_content" cdkScrollable>
   <ng-content></ng-content>
 </mat-sidenav-content>
diff --git a/src/lib/sidenav/sidenav-module.ts b/src/lib/sidenav/sidenav-module.ts
index 8d9ac0b7df05..8d69d9eef7ff 100644
--- a/src/lib/sidenav/sidenav-module.ts
+++ b/src/lib/sidenav/sidenav-module.ts
@@ -11,12 +11,19 @@ import {OverlayModule} from '@angular/cdk/overlay';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {MatCommonModule} from '@angular/material/core';
+import {ScrollDispatchModule} from '@angular/cdk/scrolling';
 import {MatDrawer, MatDrawerContainer, MatDrawerContent} from './drawer';
 import {MatSidenav, MatSidenavContainer, MatSidenavContent} from './sidenav';
 
 
 @NgModule({
-  imports: [CommonModule, MatCommonModule, A11yModule, OverlayModule],
+  imports: [
+    CommonModule,
+    MatCommonModule,
+    A11yModule,
+    OverlayModule,
+    ScrollDispatchModule,
+  ],
   exports: [
     MatCommonModule,
     MatDrawer,

From a77468876d8e5cbde8614c24cb160838f9e0d38b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 23:52:05 +0200
Subject: [PATCH 243/575] feat(select): add support for custom error state
 matcher (#7443)

Fixes #7419.
---
 src/demo-app/input/input-demo.ts    | 21 ++++++----
 src/lib/core/error/error-options.ts | 36 +++++++---------
 src/lib/input/input-module.ts       |  2 +
 src/lib/input/input.md              | 27 ++++++------
 src/lib/input/input.spec.ts         | 33 ++++-----------
 src/lib/input/input.ts              | 21 +++-------
 src/lib/select/select-module.ts     |  4 +-
 src/lib/select/select.spec.ts       | 65 ++++++++++++++++++++++++++++-
 src/lib/select/select.ts            | 13 +++---
 src/lib/stepper/stepper-module.ts   |  4 +-
 src/lib/stepper/stepper.ts          | 31 ++++----------
 11 files changed, 143 insertions(+), 114 deletions(-)

diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts
index a76d2165ed09..2f28f2b6f922 100644
--- a/src/demo-app/input/input-demo.ts
+++ b/src/demo-app/input/input-demo.ts
@@ -1,5 +1,6 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
-import {FormControl, Validators} from '@angular/forms';
+import {Component, ChangeDetectionStrategy} from '@angular/core';
+import {FormControl, NgControl, Validators} from '@angular/forms';
+import {ErrorStateMatcher} from '@angular/material';
 
 
 let max = 5;
@@ -52,10 +53,16 @@ export class InputDemo {
     }
   }
 
-  customErrorStateMatcher(c: FormControl): boolean {
-    const hasInteraction = c.dirty || c.touched;
-    const isInvalid = c.invalid;
+  customErrorStateMatcher: ErrorStateMatcher = {
+    isErrorState: (control: NgControl | null) => {
+      if (control) {
+        const hasInteraction = control.dirty || control.touched;
+        const isInvalid = control.invalid;
 
-    return !!(hasInteraction && isInvalid);
-  }
+        return !!(hasInteraction && isInvalid);
+      }
+
+      return false;
+    }
+  };
 }
diff --git a/src/lib/core/error/error-options.ts b/src/lib/core/error/error-options.ts
index fc0945955f0d..261906995c22 100644
--- a/src/lib/core/error/error-options.ts
+++ b/src/lib/core/error/error-options.ts
@@ -6,29 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {InjectionToken} from '@angular/core';
-import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
+import {Injectable} from '@angular/core';
+import {FormGroupDirective, NgForm, NgControl} from '@angular/forms';
 
-/** Injection token that can be used to specify the global error options. */
-export const MAT_ERROR_GLOBAL_OPTIONS =
-    new InjectionToken<ErrorOptions>('mat-error-global-options');
-
-export type ErrorStateMatcher =
-    (control: FormControl, form: FormGroupDirective | NgForm) => boolean;
-
-export interface ErrorOptions {
-  errorStateMatcher?: ErrorStateMatcher;
-}
-
-/** Returns whether control is invalid and is either touched or is a part of a submitted form. */
-export function defaultErrorStateMatcher(control: FormControl, form: FormGroupDirective | NgForm) {
-  const isSubmitted = form && form.submitted;
-  return !!(control.invalid && (control.touched || isSubmitted));
+/** Error state matcher that matches when a control is invalid and dirty. */
+@Injectable()
+export class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher {
+  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    return !!(control && control.invalid && (control.dirty || (form && form.submitted)));
+  }
 }
 
-/** Returns whether control is invalid and is either dirty or is a part of a submitted form. */
-export function showOnDirtyErrorStateMatcher(control: FormControl,
-    form: FormGroupDirective | NgForm) {
-  const isSubmitted = form && form.submitted;
-  return !!(control.invalid && (control.dirty || isSubmitted));
+/** Provider that defines how form controls behave with regards to displaying error messages. */
+@Injectable()
+export class ErrorStateMatcher {
+  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    return !!(control && control.invalid && (control.touched || (form && form.submitted)));
+  }
 }
diff --git a/src/lib/input/input-module.ts b/src/lib/input/input-module.ts
index 57efdfb87d9e..3271ab7f0fc2 100644
--- a/src/lib/input/input-module.ts
+++ b/src/lib/input/input-module.ts
@@ -12,6 +12,7 @@ import {NgModule} from '@angular/core';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {MatTextareaAutosize} from './autosize';
 import {MatInput} from './input';
+import {ErrorStateMatcher} from '@angular/material/core';
 
 
 @NgModule({
@@ -31,5 +32,6 @@ import {MatInput} from './input';
     MatInput,
     MatTextareaAutosize,
   ],
+  providers: [ErrorStateMatcher],
 })
 export class MatInputModule {}
diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index c2cd28a0bc6c..c86da66c654f 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -111,12 +111,12 @@ warn color.
 
 ### Custom Error Matcher
 
-By default, error messages are shown when the control is invalid and either the user has interacted with
-(touched) the element or the parent form has been submitted. If you wish to override this
+By default, error messages are shown when the control is invalid and either the user has interacted
+with (touched) the element or the parent form has been submitted. If you wish to override this
 behavior (e.g. to show the error as soon as the invalid control is dirty or when a parent form group
 is invalid), you can use the `errorStateMatcher` property of the `matInput`. To use this property,
-create a function in your component class that returns a boolean. A result of `true` will display
-the error messages.
+create an `ErrorStateMatcher` object in your component class that has a `isErrorState` function which
+returns a boolean. A result of `true` will display the error messages.
 
 ```html
 <mat-form-field>
@@ -126,25 +126,26 @@ the error messages.
 ```
 
 ```ts
-function myErrorStateMatcher(control: FormControl, form: FormGroupDirective | NgForm): boolean {
-  // Error when invalid control is dirty, touched, or submitted
-  const isSubmitted = form && form.submitted;
-  return !!(control.invalid && (control.dirty || control.touched || isSubmitted));
+class MyErrorStateMatcher implements ErrorStateMatcher {
+  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    // Error when invalid control is dirty, touched, or submitted
+    const isSubmitted = form && form.submitted;
+    return !!(control && control.invalid && (control.dirty || control.touched || isSubmitted)));
+  }
 }
 ```
 
-A global error state matcher can be specified by setting the `MAT_ERROR_GLOBAL_OPTIONS` provider. This applies
-to all inputs. For convenience, `showOnDirtyErrorStateMatcher` is available in order to globally set
-input errors to show when the input is dirty and invalid.
+A global error state matcher can be specified by setting the `ErrorStateMatcher` provider. This
+applies to all inputs. For convenience, `ShowOnDirtyErrorStateMatcher` is available in order to
+globally cause input errors to show when the input is dirty and invalid.
 
 ```ts
 @NgModule({
   providers: [
-    {provide: MAT_ERROR_GLOBAL_OPTIONS, useValue: {errorStateMatcher: showOnDirtyErrorStateMatcher}}
+    {provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher}
   ]
 })
 ```
-
 Here are the available global options:
 
 | Name              | Type     | Description |
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index b3ba3a3ded67..5f161743e271 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -12,9 +12,9 @@ import {
   Validators,
 } from '@angular/forms';
 import {
-  MAT_ERROR_GLOBAL_OPTIONS,
   MAT_PLACEHOLDER_GLOBAL_OPTIONS,
-  showOnDirtyErrorStateMatcher,
+  ShowOnDirtyErrorStateMatcher,
+  ErrorStateMatcher,
 } from '@angular/material/core';
 import {
   getMatFormFieldDuplicatedHintError,
@@ -926,12 +926,6 @@ describe('MatInput with forms', () => {
     });
 
     it('should display an error message when global error matcher returns true', () => {
-
-      // Global error state matcher that will always cause errors to show
-      function globalErrorStateMatcher() {
-        return true;
-      }
-
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
         imports: [
@@ -944,11 +938,7 @@ describe('MatInput with forms', () => {
         declarations: [
           MatInputWithFormErrorMessages
         ],
-        providers: [
-          {
-            provide: MAT_ERROR_GLOBAL_OPTIONS,
-            useValue: { errorStateMatcher: globalErrorStateMatcher } }
-        ]
+        providers: [{provide: ErrorStateMatcher, useValue: {isErrorState: () => true}}]
       });
 
       let fixture = TestBed.createComponent(MatInputWithFormErrorMessages);
@@ -963,7 +953,7 @@ describe('MatInput with forms', () => {
       expect(containerEl.querySelectorAll('mat-error').length).toBe(1, 'Expected an error message');
     });
 
-    it('should display an error message when using showOnDirtyErrorStateMatcher', async(() => {
+    it('should display an error message when using ShowOnDirtyErrorStateMatcher', async(() => {
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
         imports: [
@@ -976,12 +966,7 @@ describe('MatInput with forms', () => {
         declarations: [
           MatInputWithFormErrorMessages
         ],
-        providers: [
-          {
-            provide: MAT_ERROR_GLOBAL_OPTIONS,
-            useValue: { errorStateMatcher: showOnDirtyErrorStateMatcher }
-          }
-        ]
+        providers: [{provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher}]
       });
 
       let fixture = TestBed.createComponent(MatInputWithFormErrorMessages);
@@ -1298,7 +1283,7 @@ class MatInputWithFormErrorMessages {
       <mat-form-field>
         <input matInput
             formControlName="name"
-            [errorStateMatcher]="customErrorStateMatcher.bind(this)">
+            [errorStateMatcher]="customErrorStateMatcher">
         <mat-hint>Please type something</mat-hint>
         <mat-error>This field is required</mat-error>
       </mat-form-field>
@@ -1312,9 +1297,9 @@ class MatInputWithCustomErrorStateMatcher {
 
   errorState = false;
 
-  customErrorStateMatcher(): boolean {
-    return this.errorState;
-  }
+  customErrorStateMatcher = {
+    isErrorState: () => this.errorState
+  };
 }
 
 @Component({
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 1e04098fa997..b998f29cc841 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -10,7 +10,6 @@ import {
   Directive,
   DoCheck,
   ElementRef,
-  Inject,
   Input,
   OnChanges,
   OnDestroy,
@@ -19,15 +18,10 @@ import {
   Self,
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {FormControl, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {FormGroupDirective, NgControl, NgForm} from '@angular/forms';
 import {Platform, getSupportedInputTypes} from '@angular/cdk/platform';
 import {getMatInputUnsupportedTypeError} from './input-errors';
-import {
-  defaultErrorStateMatcher,
-  ErrorOptions,
-  ErrorStateMatcher,
-  MAT_ERROR_GLOBAL_OPTIONS
-} from '@angular/material/core';
+import {ErrorStateMatcher} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 import {MatFormFieldControl} from '@angular/material/form-field';
 
@@ -75,7 +69,6 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   protected _required = false;
   protected _id: string;
   protected _uid = `mat-input-${nextUniqueId++}`;
-  protected _errorOptions: ErrorOptions;
   protected _previousNativeValue = this.value;
   private _readonly = false;
 
@@ -130,7 +123,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
     }
   }
 
-  /** A function used to control when error messages are shown. */
+  /** An object used to control when error messages are shown. */
   @Input() errorStateMatcher: ErrorStateMatcher;
 
   /** The input element's value. */
@@ -163,12 +156,10 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
               @Optional() @Self() public ngControl: NgControl,
               @Optional() protected _parentForm: NgForm,
               @Optional() protected _parentFormGroup: FormGroupDirective,
-              @Optional() @Inject(MAT_ERROR_GLOBAL_OPTIONS) errorOptions: ErrorOptions) {
+              private _defaultErrorStateMatcher: ErrorStateMatcher) {
 
     // Force setter to be called in case id was not specified.
     this.id = this.id;
-    this._errorOptions = errorOptions ? errorOptions : {};
-    this.errorStateMatcher = this._errorOptions.errorStateMatcher || defaultErrorStateMatcher;
 
     // On some versions of iOS the caret gets stuck in the wrong place when holding down the delete
     // key. In order to get around this we need to "jiggle" the caret loose. Since this bug only
@@ -231,9 +222,9 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   /** Re-evaluates the error state. This is only relevant with @angular/forms. */
   protected _updateErrorState() {
     const oldState = this.errorState;
-    const ngControl = this.ngControl;
     const parent = this._parentFormGroup || this._parentForm;
-    const newState = ngControl && this.errorStateMatcher(ngControl.control as FormControl, parent);
+    const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
+    const newState = matcher.isErrorState(this.ngControl, parent);
 
     if (newState !== oldState) {
       this.errorState = newState;
diff --git a/src/lib/select/select-module.ts b/src/lib/select/select-module.ts
index 596cfefcb4bf..057be7effae8 100644
--- a/src/lib/select/select-module.ts
+++ b/src/lib/select/select-module.ts
@@ -5,13 +5,13 @@
  * 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 {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {MatSelect, MatSelectTrigger, MAT_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
 import {MatCommonModule, MatOptionModule} from '@angular/material/core';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {MatFormFieldModule} from '@angular/material/form-field';
+import {ErrorStateMatcher} from '@angular/material/core';
 
 
 @NgModule({
@@ -23,6 +23,6 @@ import {MatFormFieldModule} from '@angular/material/form-field';
   ],
   exports: [MatFormFieldModule, MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
   declarations: [MatSelect, MatSelectTrigger],
-  providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER]
+  providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER, ErrorStateMatcher]
 })
 export class MatSelectModule {}
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 68010bf7bbc8..54cf03800823 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -28,7 +28,8 @@ import {
   extendObject,
   FloatPlaceholderType,
   MAT_PLACEHOLDER_GLOBAL_OPTIONS,
-  MatOption
+  MatOption,
+  ErrorStateMatcher,
 } from '@angular/material/core';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
@@ -97,6 +98,7 @@ describe('MatSelect', () => {
         FalsyValueSelect,
         SelectInsideFormGroup,
         NgModelCompareWithSelect,
+        CustomErrorBehaviorSelect,
       ],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
@@ -2946,6 +2948,47 @@ describe('MatSelect', () => {
       expect(select.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to true.');
     });
+
+    it('should be able to override the error matching behavior via an @Input', () => {
+      fixture.destroy();
+
+      const customErrorFixture = TestBed.createComponent(CustomErrorBehaviorSelect);
+      const component = customErrorFixture.componentInstance;
+      const matcher = jasmine.createSpy('error state matcher').and.returnValue(true);
+
+      customErrorFixture.detectChanges();
+
+      expect(component.control.invalid).toBe(false);
+      expect(component.select.errorState).toBe(false);
+
+      customErrorFixture.componentInstance.errorStateMatcher = { isErrorState: matcher };
+      customErrorFixture.detectChanges();
+
+      expect(component.select.errorState).toBe(true);
+      expect(matcher).toHaveBeenCalled();
+    });
+
+    it('should be able to override the error matching behavior via the injection token', () => {
+      const errorStateMatcher: ErrorStateMatcher = {
+        isErrorState: jasmine.createSpy('error state matcher').and.returnValue(true)
+      };
+
+      fixture.destroy();
+
+      TestBed.resetTestingModule().configureTestingModule({
+        imports: [MatSelectModule, ReactiveFormsModule, FormsModule, NoopAnimationsModule],
+        declarations: [SelectInsideFormGroup],
+        providers: [{ provide: ErrorStateMatcher, useValue: errorStateMatcher }],
+      });
+
+      const errorFixture = TestBed.createComponent(SelectInsideFormGroup);
+      const component = errorFixture.componentInstance;
+
+      errorFixture.detectChanges();
+
+      expect(component.select.errorState).toBe(true);
+      expect(errorStateMatcher.isErrorState).toHaveBeenCalled();
+    });
   });
 
   describe('compareWith behavior', () => {
@@ -3617,6 +3660,7 @@ class InvalidSelectInForm {
 })
 class SelectInsideFormGroup {
   @ViewChild(FormGroupDirective) formGroupDirective: FormGroupDirective;
+  @ViewChild(MatSelect) select: MatSelect;
   formControl = new FormControl('', Validators.required);
   formGroup = new FormGroup({
     food: this.formControl
@@ -3751,3 +3795,22 @@ class NgModelCompareWithSelect {
     this.selectedFood = extendObject({}, newValue);
   }
 }
+
+@Component({
+  template: `
+    <mat-select placeholder="Food" [formControl]="control" [errorStateMatcher]="errorStateMatcher">
+      <mat-option *ngFor="let food of foods" [value]="food.value">
+        {{ food.viewValue }}
+      </mat-option>
+    </mat-select>
+  `
+})
+class CustomErrorBehaviorSelect {
+  @ViewChild(MatSelect) select: MatSelect;
+  control = new FormControl();
+  foods: any[] = [
+    { value: 'steak-0', viewValue: 'Steak' },
+    { value: 'pizza-1', viewValue: 'Pizza' },
+  ];
+  errorStateMatcher: ErrorStateMatcher;
+}
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index e26c16ab4a8b..2985554540f2 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -54,6 +54,7 @@ import {
   MatOptionSelectionChange,
   mixinDisabled,
   mixinTabIndex,
+  ErrorStateMatcher,
 } from '@angular/material/core';
 import {MatFormField, MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
@@ -377,6 +378,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   /** Input that can be used to specify the `aria-labelledby` attribute. */
   @Input('aria-labelledby') ariaLabelledby: string;
 
+  /** An object used to control when error messages are shown. */
+  @Input() errorStateMatcher: ErrorStateMatcher;
+
   /** Unique id of the element. */
   @Input()
   get id() { return this._id; }
@@ -411,6 +415,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     private _viewportRuler: ViewportRuler,
     private _changeDetectorRef: ChangeDetectorRef,
     private _ngZone: NgZone,
+    private _defaultErrorStateMatcher: ErrorStateMatcher,
     renderer: Renderer2,
     elementRef: ElementRef,
     @Optional() private _dir: Directionality,
@@ -680,12 +685,10 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** Whether the select is in an error state. */
   get errorState(): boolean {
-    const isInvalid = this.ngControl && this.ngControl.invalid;
-    const isTouched = this.ngControl && this.ngControl.touched;
-    const isSubmitted = (this._parentFormGroup && this._parentFormGroup.submitted) ||
-        (this._parentForm && this._parentForm.submitted);
+    const parent = this._parentFormGroup || this._parentForm;
+    const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
 
-    return !!(isInvalid && (isTouched || isSubmitted));
+    return matcher.isErrorState(this.ngControl, parent);
   }
 
   private _initializeSelection(): void {
diff --git a/src/lib/stepper/stepper-module.ts b/src/lib/stepper/stepper-module.ts
index 970e93b45099..2d93ce64e1ba 100644
--- a/src/lib/stepper/stepper-module.ts
+++ b/src/lib/stepper/stepper-module.ts
@@ -12,7 +12,7 @@ import {CdkStepperModule} from '@angular/cdk/stepper';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {MatButtonModule} from '@angular/material/button';
-import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule, ErrorStateMatcher} from '@angular/material/core';
 import {MatIconModule} from '@angular/material/icon';
 import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
@@ -45,6 +45,6 @@ import {MatStepperIntl} from './stepper-intl';
   ],
   declarations: [MatHorizontalStepper, MatVerticalStepper, MatStep, MatStepLabel, MatStepper,
     MatStepperNext, MatStepperPrevious, MatStepHeader],
-  providers: [MatStepperIntl],
+  providers: [MatStepperIntl, ErrorStateMatcher],
 })
 export class MatStepperModule {}
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 2cf8a8feecd5..b7331142f7e7 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -16,19 +16,13 @@ import {
   ElementRef,
   forwardRef,
   Inject,
-  Optional,
   QueryList,
   SkipSelf,
   ViewChildren,
   ViewEncapsulation,
 } from '@angular/core';
-import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
-import {
-  defaultErrorStateMatcher,
-  ErrorOptions,
-  ErrorStateMatcher,
-  MAT_ERROR_GLOBAL_OPTIONS,
-} from '@angular/material/core';
+import {NgControl, FormGroupDirective, NgForm} from '@angular/forms';
+import {ErrorStateMatcher} from '@angular/material/core';
 import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
 
@@ -40,36 +34,27 @@ export const _MatStepper = CdkStepper;
   moduleId: module.id,
   selector: 'mat-step',
   templateUrl: 'step.html',
-  providers: [{provide: MAT_ERROR_GLOBAL_OPTIONS, useExisting: MatStep}],
+  providers: [{provide: ErrorStateMatcher, useExisting: MatStep}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MatStep extends _MatStep implements ErrorOptions {
+export class MatStep extends _MatStep implements ErrorStateMatcher {
   /** Content for step label given by <ng-template matStepLabel>. */
   @ContentChild(MatStepLabel) stepLabel: MatStepLabel;
 
-  /** Original ErrorStateMatcher that checks the validity of form control. */
-  private _originalErrorStateMatcher: ErrorStateMatcher;
-
   constructor(@Inject(forwardRef(() => MatStepper)) stepper: MatStepper,
-              @Optional() @SkipSelf() @Inject(MAT_ERROR_GLOBAL_OPTIONS)
-                  errorOptions: ErrorOptions) {
+              @SkipSelf() private _errorStateMatcher: ErrorStateMatcher) {
     super(stepper);
-    if (errorOptions && errorOptions.errorStateMatcher) {
-      this._originalErrorStateMatcher = errorOptions.errorStateMatcher;
-    } else {
-      this._originalErrorStateMatcher = defaultErrorStateMatcher;
-    }
   }
 
   /** Custom error state matcher that additionally checks for validity of interacted form. */
-  errorStateMatcher = (control: FormControl, form: FormGroupDirective | NgForm) => {
-    let originalErrorState = this._originalErrorStateMatcher(control, form);
+  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    const originalErrorState = this._errorStateMatcher.isErrorState(control, form);
 
     // Custom error state checks for the validity of form that is not submitted or touched
     // since user can trigger a form change by calling for another step without directly
     // interacting with the current form.
-    let customErrorState =  control.invalid && this.interacted;
+    const customErrorState = !!(control && control.invalid && this.interacted);
 
     return originalErrorState || customErrorState;
   }

From 388845cbab954ee7aba0ccc7ac2835577b904a4d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 4 Oct 2017 23:52:25 +0200
Subject: [PATCH 244/575] build: more type information for docs (#6947)

---
 package-lock.json                             | 3099 ++++++++++++++---
 package.json                                  |    4 +-
 src/cdk/a11y/focus-trap.ts                    |    2 +-
 src/cdk/a11y/list-key-manager.ts              |    2 +-
 src/cdk/observers/observe-content.ts          |    2 +-
 .../position/connected-position-strategy.ts   |    2 +-
 .../position/global-position-strategy.ts      |   16 +-
 src/cdk/scrolling/viewport-ruler.ts           |    4 +-
 src/lib/button-toggle/button-toggle.ts        |    6 +-
 src/lib/chips/chip-input.ts                   |    2 +-
 src/lib/chips/chip-list.ts                    |    2 +-
 src/lib/core/option/option.ts                 |    2 +-
 src/lib/core/ripple/ripple.ts                 |    2 +-
 src/lib/datepicker/datepicker-toggle.ts       |    2 +-
 src/lib/dialog/dialog-ref.ts                  |    2 +-
 src/lib/form-field/form-field.ts              |    2 +-
 src/lib/grid-list/grid-tile.ts                |    4 +-
 src/lib/icon/icon-registry.ts                 |    4 +-
 src/lib/menu/menu-directive.ts                |    2 +-
 src/lib/radio/radio.ts                        |    2 +-
 src/lib/select/select.ts                      |    2 +-
 src/lib/sidenav/drawer.ts                     |   12 +-
 src/lib/sidenav/sidenav.ts                    |    6 +-
 src/lib/slider/slider.ts                      |    6 +-
 src/lib/snack-bar/snack-bar.ts                |    3 +-
 src/lib/sort/sort-header.ts                   |    2 +-
 src/lib/sort/sort.ts                          |    2 +-
 tools/dgeni/common/decorators.ts              |  114 +
 tools/dgeni/common/dgeni-accessors-parse.ts   |   62 +
 .../common/normalize-method-parameters.ts     |   59 +
 tools/dgeni/common/sort-members.ts            |   39 +
 tools/dgeni/{index.js => index.ts}            |  119 +-
 tools/dgeni/processors/categorizer.js         |  255 --
 tools/dgeni/processors/categorizer.ts         |  135 +
 tools/dgeni/processors/component-grouper.js   |   64 -
 tools/dgeni/processors/component-grouper.ts   |   88 +
 tools/dgeni/processors/docs-private-filter.js |   55 -
 tools/dgeni/processors/docs-private-filter.ts |   63 +
 tools/dgeni/tsconfig.json                     |   20 +
 tools/gulp/tasks/aot.ts                       |    2 +-
 tools/gulp/tasks/docs.ts                      |    4 +-
 41 files changed, 3282 insertions(+), 993 deletions(-)
 create mode 100644 tools/dgeni/common/decorators.ts
 create mode 100644 tools/dgeni/common/dgeni-accessors-parse.ts
 create mode 100644 tools/dgeni/common/normalize-method-parameters.ts
 create mode 100644 tools/dgeni/common/sort-members.ts
 rename tools/dgeni/{index.js => index.ts} (62%)
 delete mode 100644 tools/dgeni/processors/categorizer.js
 create mode 100644 tools/dgeni/processors/categorizer.ts
 delete mode 100644 tools/dgeni/processors/component-grouper.js
 create mode 100644 tools/dgeni/processors/component-grouper.ts
 delete mode 100644 tools/dgeni/processors/docs-private-filter.js
 create mode 100644 tools/dgeni/processors/docs-private-filter.ts
 create mode 100644 tools/dgeni/tsconfig.json

diff --git a/package-lock.json b/package-lock.json
index f4f34eff02eb..9e82ccd9d348 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,85 +5,85 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.4.tgz",
-      "integrity": "sha1-ovk1NgQ0er4V35gpIFiEL1Lwi8I=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.3.tgz",
+      "integrity": "sha1-OWxKW/sihH+eRYJFuplfnBMMDPM=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/common": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.4.tgz",
-      "integrity": "sha1-rgqBiqoMaj8JAee4C9lOHCLrk2U=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.3.tgz",
+      "integrity": "sha1-+SrGiwK+xfDm02A6hDKU3JbJYHQ=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz",
-      "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.3.tgz",
+      "integrity": "sha1-jwEWPa19s0CEl9mdOHVUtrGFrWY=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.4.tgz",
-      "integrity": "sha1-BjCApJfZF1OWglBQIixxfaGE9s8=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz",
+      "integrity": "sha1-GDr4HxQRhrjWYLBkKVktQLdUCko=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.4.4",
+        "@angular/tsc-wrapped": "4.4.3",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       }
     },
     "@angular/core": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz",
-      "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.3.tgz",
+      "integrity": "sha1-5x0rB76qy6tIq39R1OIobqXXDhU=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/forms": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.4.tgz",
-      "integrity": "sha1-TbN5BQm2sQ8duKfBt/Uhh89kz9Q=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.3.tgz",
+      "integrity": "sha1-JbQburWL8dqHJBHIUXwQ18U3PY4=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.4.tgz",
-      "integrity": "sha1-Zn+vYWu2JBaOr65u6S5euiOp0fI=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.3.tgz",
+      "integrity": "sha1-tVftJBRKrMRLE2zUd+hNL1eAiQM=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.4.tgz",
-      "integrity": "sha1-o4mOLnup2E/6DUcUTGlxF5x1ruY=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.3.tgz",
+      "integrity": "sha1-I/mkW9Pcf0TZeHf7+OYDLez8ncs=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.4.tgz",
-      "integrity": "sha1-w8nrhUpShVagcFQSeTLlJ/qTLhQ=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz",
+      "integrity": "sha1-5B3dglJDJ3UxDqtZQM3Y3wYY8IQ=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-server": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.4.tgz",
-      "integrity": "sha1-c+5B+hzshij8wDF0cnsnywAxsio=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.3.tgz",
+      "integrity": "sha1-5l3OneVNbKZknMmJTFx6Mke6r0w=",
       "dev": true,
       "requires": {
         "parse5": "3.0.2",
@@ -92,18 +92,18 @@
       }
     },
     "@angular/router": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.4.tgz",
-      "integrity": "sha1-e+ORCW6EPLPgT58F0dZaiN+bx88=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.3.tgz",
+      "integrity": "sha1-JsyUd1o4YJRq6vHC6PYPTUTpCZE=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.4.tgz",
-      "integrity": "sha1-mEGCHlVha4JsoWAlD+heFfx0/8M=",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz",
+      "integrity": "sha1-LT84IQodTbA/yG3PHglYErhc0Rk=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
@@ -141,7 +141,7 @@
         "log-driver": "1.2.5",
         "methmeth": "1.1.0",
         "modelo": "4.2.0",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "retry-request": "2.0.5",
         "split-array-stream": "1.0.3",
         "stream-events": "1.0.2",
@@ -149,10 +149,136 @@
         "through2": "2.0.3"
       }
     },
+    "@google-cloud/functions-emulator": {
+      "version": "1.0.0-alpha.25",
+      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
+      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@google-cloud/storage": "1.2.1",
+        "adm-zip": "0.4.7",
+        "ajv": "5.2.2",
+        "body-parser": "1.17.2",
+        "cli-table2": "0.2.0",
+        "colors": "1.1.2",
+        "configstore": "3.1.1",
+        "express": "4.15.4",
+        "google-proto-files": "0.12.1",
+        "googleapis": "20.1.0",
+        "got": "7.1.0",
+        "grpc": "1.4.1",
+        "http-proxy": "1.16.2",
+        "lodash": "4.17.4",
+        "prompt": "1.0.0",
+        "rimraf": "2.6.1",
+        "semver": "5.4.1",
+        "serializerr": "1.0.3",
+        "tmp": "0.0.33",
+        "uuid": "3.1.0",
+        "winston": "2.3.1",
+        "yargs": "8.0.2"
+      },
+      "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,
+          "optional": 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,
+          "optional": true
+        },
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "optional": 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,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
+          }
+        }
+      }
+    },
     "@google-cloud/storage": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
-      "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+      "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
       "dev": true,
       "requires": {
         "@google-cloud/common": "0.13.5",
@@ -168,7 +294,6 @@
         "mime-types": "2.1.17",
         "once": "1.4.0",
         "pumpify": "1.3.5",
-        "safe-buffer": "5.1.1",
         "stream-events": "1.0.2",
         "string-format-obj": "1.1.0",
         "through2": "2.0.3"
@@ -300,6 +425,12 @@
         "through": "2.3.8"
       }
     },
+    "a-sync-waterfall": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
+      "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=",
+      "dev": true
+    },
     "abab": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
@@ -307,9 +438,9 @@
       "dev": true
     },
     "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
       "dev": true
     },
     "accepts": {
@@ -374,9 +505,9 @@
       }
     },
     "ajv": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+      "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
       "dev": true,
       "requires": {
         "co": "4.6.0",
@@ -386,9 +517,9 @@
       }
     },
     "ajv-keywords": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
-      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+      "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": {
@@ -580,6 +711,13 @@
         "sprintf-js": "1.0.3"
       }
     },
+    "arguejs": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
+      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
+      "dev": true,
+      "optional": true
+    },
     "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -694,6 +832,17 @@
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
       "dev": true
     },
+    "ascli": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "colour": "0.7.1",
+        "optjs": "3.2.2"
+      }
+    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -746,7 +895,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000740",
+        "caniuse-db": "1.0.30000733",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.17",
@@ -766,9 +915,9 @@
       "dev": true
     },
     "axe-core": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
-      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.1.tgz",
+      "integrity": "sha512-5Pmy37rmZxRqEfQxCs6HMbqKTZx7FI0hKb2vbMgjhHfyobu4jFUhXkL2miB/eujn5kNdgKepWSruq+MAS77yGA==",
       "dev": true
     },
     "axe-webdriverjs": {
@@ -777,7 +926,7 @@
       "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
       "dev": true,
       "requires": {
-        "axe-core": "2.4.2"
+        "axe-core": "2.4.1"
       }
     },
     "babel-code-frame": {
@@ -844,13 +993,10 @@
       "dev": true
     },
     "basic-auth": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
-      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
+      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
+      "dev": true
     },
     "basic-auth-connect": {
       "version": "1.0.0",
@@ -1040,8 +1186,8 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000740",
-        "electron-to-chromium": "1.3.24"
+        "caniuse-db": "1.0.30000733",
+        "electron-to-chromium": "1.3.21"
       }
     },
     "browserstack": {
@@ -1113,6 +1259,16 @@
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
+    "bytebuffer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "long": "3.2.0"
+      }
+    },
     "bytes": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
@@ -1152,9 +1308,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000740",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000740.tgz",
-      "integrity": "sha1-A/yqoXbj7QdYlfctRsGhIUm76sk=",
+      "version": "1.0.30000733",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000733.tgz",
+      "integrity": "sha1-OmJbxBx6n5nVnWRVKFfdGvDt2dQ=",
       "dev": true
     },
     "canonical-path": {
@@ -1332,6 +1488,34 @@
         "colors": "1.0.3"
       }
     },
+    "cli-table2": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz",
+      "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "colors": "1.1.2",
+        "lodash": "3.10.1",
+        "string-width": "1.0.2"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true,
+          "optional": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "cli-width": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -1474,6 +1658,13 @@
       "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
       "dev": true
     },
+    "colour": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
+      "dev": true,
+      "optional": true
+    },
     "combine-lists": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
@@ -1600,30 +1791,30 @@
       }
     },
     "compression": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
-      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz",
+      "integrity": "sha1-AwyfGY8WQ6BX13anOOki2kNzAS0=",
       "dev": true,
       "requires": {
         "accepts": "1.3.4",
-        "bytes": "3.0.0",
+        "bytes": "2.5.0",
         "compressible": "2.0.11",
-        "debug": "2.6.9",
+        "debug": "2.6.8",
         "on-headers": "1.0.1",
         "safe-buffer": "5.1.1",
-        "vary": "1.1.2"
+        "vary": "1.1.1"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz",
+          "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=",
           "dev": true
         },
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "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"
@@ -1663,21 +1854,21 @@
       }
     },
     "connect": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
-      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.4.tgz",
+      "integrity": "sha1-UuoZw4YHMYeEJpKXsCGO0HSgFoc=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.0.6",
+        "debug": "2.6.8",
+        "finalhandler": "1.0.5",
         "parseurl": "1.3.2",
         "utils-merge": "1.0.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "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"
@@ -1769,6 +1960,13 @@
         "upper-case": "1.1.3"
       }
     },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true,
+      "optional": true
+    },
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -2047,7 +2245,7 @@
         "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
-        "split2": "2.2.0",
+        "split2": "2.1.1",
         "through2": "2.0.3",
         "trim-off-newlines": "1.0.1"
       }
@@ -2502,6 +2700,23 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mimic-response": "1.0.0"
+      }
+    },
+    "deep-equal": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
+      "dev": true,
+      "optional": true
+    },
     "deep-extend": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
@@ -2810,9 +3025,9 @@
       }
     },
     "dgeni-packages": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.19.1.tgz",
-      "integrity": "sha1-e5ZUXQo1FRycKwolEz3ggQkMfKA=",
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.21.2.tgz",
+      "integrity": "sha1-sDEZQXZQe3x9HJc16hRmSXB2OGY=",
       "dev": true,
       "requires": {
         "canonical-path": "0.0.2",
@@ -2829,9 +3044,10 @@
         "mkdirp": "0.5.1",
         "mkdirp-promise": "5.0.1",
         "node-html-encoder": "0.0.2",
-        "nunjucks": "2.5.2",
+        "nunjucks": "3.0.1",
         "semver": "5.4.1",
         "shelljs": "0.7.8",
+        "source-map-support": "0.4.18",
         "spdx-license-list": "2.1.0",
         "stringmap": "0.2.2",
         "typescript": "2.4.2"
@@ -2862,7 +3078,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000740",
+        "caniuse-db": "1.0.30000733",
         "css-rule-stream": "1.1.0",
         "duplexer2": "0.0.2",
         "jsonfilter": "1.1.2",
@@ -3031,6 +3247,13 @@
         "readable-stream": "2.3.3"
       }
     },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true,
+      "optional": true
+    },
     "duplexify": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
@@ -3080,9 +3303,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.24",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz",
-      "integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=",
+      "version": "1.3.21",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz",
+      "integrity": "sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI=",
       "dev": true
     },
     "encodeurl": {
@@ -3357,6 +3580,12 @@
       "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "dev": true
     },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
     "event-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
@@ -3388,6 +3617,36 @@
       "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
       "dev": true
     },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "optional": 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"
+      },
+      "dependencies": {
+        "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,
+          "optional": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        }
+      }
+    },
     "execall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
@@ -3492,6 +3751,62 @@
         "os-homedir": "1.0.2"
       }
     },
+    "express": {
+      "version": "4.15.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
+      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "array-flatten": "1.1.1",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.8",
+        "depd": "1.1.1",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "finalhandler": "1.0.5",
+        "fresh": "0.5.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "1.1.5",
+        "qs": "6.5.0",
+        "range-parser": "1.2.0",
+        "send": "0.15.4",
+        "serve-static": "1.12.4",
+        "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.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "qs": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
+          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "express-session": {
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz",
@@ -3630,7 +3945,7 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "1.3.0",
+        "flat-cache": "1.2.2",
         "object-assign": "4.1.1"
       }
     },
@@ -3693,12 +4008,12 @@
       "dev": true
     },
     "finalhandler": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
-      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.5.tgz",
+      "integrity": "sha1-pwEwPSV6G8gv6lR6M+WuiVMXI98=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
+        "debug": "2.6.8",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "on-finished": "2.3.0",
@@ -3708,9 +4023,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "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"
@@ -3739,6 +4054,16 @@
       "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
       "dev": true
     },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "locate-path": "2.0.0"
+      }
+    },
     "findup-sync": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
@@ -3776,9 +4101,9 @@
       }
     },
     "firebase": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.4.0.tgz",
-      "integrity": "sha1-z/o0lkw4riQVfskw2+FHgW/Y4/Q=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.3.1.tgz",
+      "integrity": "sha1-DmEy7iKvMjs1DQO26xaAuxpvnuY=",
       "dev": true,
       "requires": {
         "dom-storage": "2.0.2",
@@ -3822,7 +4147,7 @@
           "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.7.0"
+            "websocket-driver": "0.6.5"
           }
         },
         "hoek": {
@@ -3834,8 +4159,7 @@
         "http-parser-js": {
           "version": "0.4.6",
           "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.6.tgz",
-          "integrity": "sha1-GVJz9YcExFLWcQdr4gEyndNB3FU=",
-          "dev": true
+          "integrity": "sha1-GVJz9YcExFLWcQdr4gEyndNB3FU="
         },
         "isemail": {
           "version": "1.2.0",
@@ -3931,19 +4255,18 @@
           }
         },
         "websocket-driver": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
           "dev": true,
           "requires": {
-            "http-parser-js": "0.4.6",
-            "websocket-extensions": "0.1.2"
+            "websocket-extensions": "0.1.1"
           }
         },
         "websocket-extensions": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
           "dev": true
         },
         "xmlhttprequest": {
@@ -3961,12 +4284,12 @@
       }
     },
     "firebase-admin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.3.0.tgz",
-      "integrity": "sha1-FPTyAdc1jLWq9x6rUasEXw08cwY=",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.2.1.tgz",
+      "integrity": "sha1-HHMt3cjBzo4C12xoLOosVQ7WWkc=",
       "dev": true,
       "requires": {
-        "@google-cloud/storage": "1.3.0",
+        "@google-cloud/storage": "1.2.1",
         "@types/jsonwebtoken": "7.2.3",
         "faye-websocket": "0.9.3",
         "jsonwebtoken": "7.1.9",
@@ -3974,9 +4297,9 @@
       },
       "dependencies": {
         "@google-cloud/common": {
-          "version": "0.13.5",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
-          "integrity": "sha1-uQWZ8pzpV7NmreqNfAw/NZPZgco=",
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.4.tgz",
+          "integrity": "sha1-dbt/YJMc/J2U2gtdQIlQ0Lvw6Xk=",
           "dev": true,
           "requires": {
             "array-uniq": "1.0.3",
@@ -3986,12 +4309,12 @@
             "duplexify": "3.5.1",
             "ent": "2.2.0",
             "extend": "3.0.1",
-            "google-auto-auth": "0.7.2",
+            "google-auto-auth": "0.7.1",
             "is": "3.2.1",
             "log-driver": "1.2.5",
             "methmeth": "1.1.0",
             "modelo": "4.2.0",
-            "request": "2.82.0",
+            "request": "2.81.0",
             "retry-request": "2.0.5",
             "split-array-stream": "1.0.3",
             "stream-events": "1.0.2",
@@ -4000,25 +4323,24 @@
           }
         },
         "@google-cloud/storage": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.0.tgz",
-          "integrity": "sha512-kZ2Q7vTyeCQP/V3Ru0DwolSsXVFaZhrX5LeCdi+jh3IDF/GiYrgLVXL7fO8IPTqS4ZfzMdPcrSxycr0rF/CM3Q==",
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
           "dev": true,
           "requires": {
-            "@google-cloud/common": "0.13.5",
+            "@google-cloud/common": "0.13.4",
             "arrify": "1.0.1",
             "async": "2.5.0",
             "concat-stream": "1.6.0",
             "create-error-class": "3.0.2",
             "duplexify": "3.5.1",
             "extend": "3.0.1",
-            "gcs-resumable-upload": "0.8.2",
+            "gcs-resumable-upload": "0.8.1",
             "hash-stream-validation": "0.2.1",
             "is": "3.2.1",
-            "mime-types": "2.1.17",
+            "mime-types": "2.1.16",
             "once": "1.4.0",
             "pumpify": "1.3.5",
-            "safe-buffer": "5.1.1",
             "stream-events": "1.0.2",
             "string-format-obj": "1.1.0",
             "through2": "2.0.3"
@@ -4030,24 +4352,22 @@
           "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
           "dev": true,
           "requires": {
-            "@types/node": "8.0.31"
+            "@types/node": "8.0.22"
           }
         },
         "@types/node": {
-          "version": "8.0.31",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.31.tgz",
-          "integrity": "sha512-R+LdMJHJQwRd/Ca0Nr5KnwbSWHxTD3DWz4ivqoPeNH+YPcuirMWK+Ti9Mx32jOecmPhHOCd+6CefU5e1eVq2Ew==",
+          "version": "8.0.22",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.22.tgz",
+          "integrity": "sha512-+YQ5JLlvLP24teVUdUDep83mAWIFoAnOMosrH/2+xDeU9YMUpmMJtYOqVtbivs37h2PL9svz0R3r/MfVuEvEIA==",
           "dev": true
         },
         "ajv": {
-          "version": "5.2.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+          "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",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
             "json-stable-stringify": "1.0.1"
           }
         },
@@ -4070,9 +4390,9 @@
           "dev": true
         },
         "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "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": {
@@ -4091,9 +4411,9 @@
           "dev": true
         },
         "aws-sign2": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
           "dev": true
         },
         "aws4": {
@@ -4119,12 +4439,12 @@
           }
         },
         "boom": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+          "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": "4.2.0"
+            "hoek": "2.16.3"
           }
         },
         "buffer-equal": {
@@ -4187,7 +4507,7 @@
             "graceful-fs": "4.1.11",
             "make-dir": "1.0.0",
             "unique-string": "1.0.0",
-            "write-file-atomic": "2.3.0",
+            "write-file-atomic": "2.1.0",
             "xdg-basedir": "3.0.0"
           }
         },
@@ -4207,21 +4527,21 @@
           }
         },
         "cryptiles": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
           "dev": true,
           "requires": {
-            "boom": "5.2.0"
+            "boom": "2.10.1"
           },
           "dependencies": {
             "boom": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+              "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": "4.2.0"
+                "hoek": "2.16.3"
               }
             }
           }
@@ -4239,6 +4559,14 @@
           "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
+            }
           }
         },
         "delayed-stream": {
@@ -4318,8 +4646,7 @@
         "fast-deep-equal": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-          "dev": true
+          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
         },
         "faye-websocket": {
           "version": "0.9.3",
@@ -4327,7 +4654,7 @@
           "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.7.0"
+            "websocket-driver": "0.6.5"
           }
         },
         "forever-agent": {
@@ -4337,49 +4664,49 @@
           "dev": true
         },
         "form-data": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+          "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.17"
+            "mime-types": "2.1.16"
           }
         },
         "gcp-metadata": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.2.0.tgz",
+          "integrity": "sha1-Ytr8pl86YxvIzi7Dt3Zh9fk4ego=",
           "dev": true,
           "requires": {
             "extend": "3.0.1",
-            "retry-request": "3.0.0"
+            "retry-request": "2.0.5"
           },
           "dependencies": {
             "retry-request": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
-              "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
+              "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
               "dev": true,
               "requires": {
-                "request": "2.82.0",
+                "request": "2.81.0",
                 "through2": "2.0.3"
               }
             }
           }
         },
         "gcs-resumable-upload": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.1.tgz",
+          "integrity": "sha512-Ps/yvSzdNL41oiRzSE8UgjcW8hdNQNyMqdsDSmCAn+fwWG8Sg5TR2CqSPchkMiYQQDqN7WWkheTEd0w1hfn/dw==",
           "dev": true,
           "requires": {
             "buffer-equal": "1.0.0",
             "configstore": "3.1.1",
-            "google-auto-auth": "0.7.2",
+            "google-auto-auth": "0.7.1",
             "pumpify": "1.3.5",
-            "request": "2.82.0",
+            "request": "2.81.0",
             "stream-events": "1.0.2",
             "through2": "2.0.3"
           }
@@ -4391,6 +4718,14 @@
           "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
+            }
           }
         },
         "google-auth-library": {
@@ -4402,19 +4737,19 @@
             "gtoken": "1.2.2",
             "jws": "3.1.4",
             "lodash.noop": "3.0.1",
-            "request": "2.82.0"
+            "request": "2.81.0"
           }
         },
         "google-auto-auth": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.1.tgz",
+          "integrity": "sha1-yCYERJEt2M7szYOHYdVvRik3vQI=",
           "dev": true,
           "requires": {
             "async": "2.5.0",
-            "gcp-metadata": "0.3.1",
+            "gcp-metadata": "0.2.0",
             "google-auth-library": "0.10.0",
-            "request": "2.82.0"
+            "request": "2.81.0"
           }
         },
         "google-p12-pem": {
@@ -4440,24 +4775,24 @@
           "requires": {
             "google-p12-pem": "0.1.2",
             "jws": "3.1.4",
-            "mime": "1.4.1",
-            "request": "2.82.0"
+            "mime": "1.3.6",
+            "request": "2.81.0"
           }
         },
         "har-schema": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "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": "5.0.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "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": "5.2.3",
-            "har-schema": "2.0.0"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
         "hash-stream-validation": {
@@ -4470,36 +4805,35 @@
           }
         },
         "hawk": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
           "dev": true,
           "requires": {
-            "boom": "4.3.1",
-            "cryptiles": "3.1.2",
-            "hoek": "4.2.0",
-            "sntp": "2.0.2"
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
           }
         },
         "hoek": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
           "dev": true
         },
         "http-parser-js": {
           "version": "0.4.8",
           "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz",
-          "integrity": "sha512-jmHp99g6/fLx0pRNJqzsQgjsclCHAY7NhIeA3/U+bsGNvgbvUCQFQY9m5AYpqpAxY/2VcikfbKpjQozSTiz0jA==",
-          "dev": true
+          "integrity": "sha512-jmHp99g6/fLx0pRNJqzsQgjsclCHAY7NhIeA3/U+bsGNvgbvUCQFQY9m5AYpqpAxY/2VcikfbKpjQozSTiz0jA=="
         },
         "http-signature": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+          "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": "1.0.0",
+            "assert-plus": "0.2.0",
             "jsprim": "1.4.1",
             "sshpk": "1.13.1"
           }
@@ -4568,14 +4902,6 @@
             "isemail": "1.2.0",
             "moment": "2.18.1",
             "topo": "1.1.0"
-          },
-          "dependencies": {
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            }
           }
         },
         "jsbn": {
@@ -4594,8 +4920,7 @@
         "json-schema-traverse": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-          "dev": true
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
         },
         "json-stable-stringify": {
           "version": "1.0.1",
@@ -4641,6 +4966,14 @@
             "extsprintf": "1.3.0",
             "json-schema": "0.2.3",
             "verror": "1.10.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
+            }
           }
         },
         "jwa": {
@@ -4706,24 +5039,24 @@
           "dev": true
         },
         "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "version": "1.3.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
+          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
           "dev": true
         },
         "mime-db": {
-          "version": "1.30.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "version": "1.29.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
+          "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=",
           "dev": true
         },
         "mime-types": {
-          "version": "2.1.17",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+          "version": "2.1.16",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+          "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
           "dev": true,
           "requires": {
-            "mime-db": "1.30.0"
+            "mime-db": "1.29.0"
           }
         },
         "modelo": {
@@ -4766,9 +5099,9 @@
           }
         },
         "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
           "dev": true
         },
         "pify": {
@@ -4811,9 +5144,9 @@
           "dev": true
         },
         "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
           "dev": true
         },
         "readable-stream": {
@@ -4832,31 +5165,31 @@
           }
         },
         "request": {
-          "version": "2.82.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.82.0.tgz",
-          "integrity": "sha512-/QWqfmyTfQ4OYs6EhB1h2wQsX9ZxbuNePCvCm0Mdz/mxw73mjdg0D4QdIl0TQBFs35CZmMXLjk0iCGK395CUDg==",
+          "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.7.0",
+            "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.3.1",
-            "har-validator": "5.0.3",
-            "hawk": "6.0.2",
-            "http-signature": "1.2.0",
+            "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.17",
+            "mime-types": "2.1.16",
             "oauth-sign": "0.8.2",
-            "performance-now": "2.1.0",
-            "qs": "6.5.1",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
             "safe-buffer": "5.1.1",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
+            "tough-cookie": "2.3.2",
             "tunnel-agent": "0.6.0",
             "uuid": "3.1.0"
           }
@@ -4867,7 +5200,7 @@
           "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
           "dev": true,
           "requires": {
-            "request": "2.82.0",
+            "request": "2.81.0",
             "through2": "2.0.3"
           }
         },
@@ -4880,16 +5213,15 @@
         "signal-exit": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-          "dev": true
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
         },
         "sntp": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
           "dev": true,
           "requires": {
-            "hoek": "4.2.0"
+            "hoek": "2.16.3"
           }
         },
         "split-array-stream": {
@@ -4916,6 +5248,14 @@
             "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
+            }
           }
         },
         "stream-events": {
@@ -4977,20 +5317,12 @@
           "dev": true,
           "requires": {
             "hoek": "2.16.3"
-          },
-          "dependencies": {
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            }
           }
         },
         "tough-cookie": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "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"
@@ -5048,22 +5380,29 @@
             "assert-plus": "1.0.0",
             "core-util-is": "1.0.2",
             "extsprintf": "1.3.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
+            }
           }
         },
         "websocket-driver": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
           "dev": true,
           "requires": {
-            "http-parser-js": "0.4.8",
-            "websocket-extensions": "0.1.2"
+            "websocket-extensions": "0.1.1"
           }
         },
         "websocket-extensions": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
           "dev": true
         },
         "wrappy": {
@@ -5073,14 +5412,14 @@
           "dev": true
         },
         "write-file-atomic": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+          "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",
-            "signal-exit": "3.0.2"
+            "slide": "1.1.6"
           }
         },
         "xdg-basedir": {
@@ -5103,6 +5442,7 @@
       "integrity": "sha1-uIquvtjTE+tZ3qiRcbZoeaRlKJg=",
       "dev": true,
       "requires": {
+        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
         "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
@@ -5129,7 +5469,7 @@
         "ora": "0.2.3",
         "portfinder": "0.4.0",
         "progress": "2.0.0",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "rsvp": "3.6.2",
         "semver": "5.4.1",
         "superstatic": "5.0.1",
@@ -5327,9 +5667,9 @@
       }
     },
     "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
+      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
       "dev": true,
       "requires": {
         "circular-json": "0.3.3",
@@ -5382,6 +5722,19 @@
         "mime-types": "2.1.17"
       }
     },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": 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",
@@ -5486,9 +5839,9 @@
       }
     },
     "gcp-metadata": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.0.tgz",
+      "integrity": "sha512-puqMtZV/eukdfsafq0tir21+/k9hPbN9FRhgeN7NwtvEJQaviJoZOOlh1+dBeWgsRSYwAqcEVh63grU7a6bJyw==",
       "dev": true,
       "requires": {
         "extend": "3.0.1",
@@ -5501,7 +5854,7 @@
           "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
           "dev": true,
           "requires": {
-            "request": "2.83.0",
+            "request": "2.82.0",
             "through2": "2.0.3"
           }
         }
@@ -5517,7 +5870,7 @@
         "configstore": "3.1.1",
         "google-auto-auth": "0.7.2",
         "pumpify": "1.3.5",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "stream-events": "1.0.2",
         "through2": "2.0.3"
       }
@@ -5572,6 +5925,12 @@
       "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",
@@ -5590,7 +5949,7 @@
         "dargs": "4.1.0",
         "lodash.template": "4.4.0",
         "meow": "3.7.0",
-        "split2": "2.2.0",
+        "split2": "2.1.1",
         "through2": "2.0.3"
       },
       "dependencies": {
@@ -5955,7 +6314,7 @@
         "gtoken": "1.2.2",
         "jws": "3.1.4",
         "lodash.noop": "3.0.1",
-        "request": "2.83.0"
+        "request": "2.82.0"
       }
     },
     "google-auto-auth": {
@@ -5965,9 +6324,9 @@
       "dev": true,
       "requires": {
         "async": "2.5.0",
-        "gcp-metadata": "0.3.1",
+        "gcp-metadata": "0.3.0",
         "google-auth-library": "0.10.0",
-        "request": "2.83.0"
+        "request": "2.82.0"
       }
     },
     "google-closure-compiler": {
@@ -5990,6 +6349,60 @@
         "node-forge": "0.7.1"
       }
     },
+    "google-proto-files": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.12.1.tgz",
+      "integrity": "sha512-d+BiTMpYP4/pN+Kgi0lWE+2/GaVN4jy8LCabjo2Wd16Ykm5oRO5bI40bo8u2U4rN/GpZkMyfxZAjWVPRjGe3nQ==",
+      "dev": true,
+      "optional": true
+    },
+    "googleapis": {
+      "version": "20.1.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-20.1.0.tgz",
+      "integrity": "sha512-UZYpUKPcwt28tZIvC+sT7yHtl56bMxnePNJBtZ3tG0OrQ1KegukirKRRuIxPavNCOcVC/ka5j/RRDhEIrYf5UA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "2.3.0",
+        "google-auth-library": "0.10.0",
+        "string-template": "1.0.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
+          "integrity": "sha1-EBPRBRBH3TIP4k5JTVxm7K9hR9k=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lodash": "4.17.4"
+          }
+        }
+      }
+    },
+    "got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-response": "3.3.0",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-plain-obj": "1.1.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "isurl": "1.0.0",
+        "lowercase-keys": "1.0.0",
+        "p-cancelable": "0.3.0",
+        "p-timeout": "1.2.0",
+        "safe-buffer": "5.1.1",
+        "timed-out": "4.0.1",
+        "url-parse-lax": "1.0.0",
+        "url-to-options": "1.0.1"
+      }
+    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -6011,6 +6424,1240 @@
         "temp": "0.4.0"
       }
     },
+    "grpc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.4.1.tgz",
+      "integrity": "sha1-PuSoNGphPygjkoyfj5kIG2No7Hw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "arguejs": "0.2.3",
+        "lodash": "4.17.4",
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.36",
+        "protobufjs": "5.0.2"
+      },
+      "dependencies": {
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.2",
+            "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"
+          },
+          "dependencies": {
+            "mkdirp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "dev": true,
+              "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=",
+                  "dev": true
+                }
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1.1.0",
+                "osenv": "0.1.4"
+              },
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.1.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+                  "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+                  "dev": true,
+                  "optional": true
+                },
+                "osenv": {
+                  "version": "0.1.4",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+                  "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "os-homedir": "1.0.2",
+                    "os-tmpdir": "1.0.2"
+                  },
+                  "dependencies": {
+                    "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,
+                      "optional": true
+                    },
+                    "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,
+                      "optional": true
+                    }
+                  }
+                }
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+              "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+              "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"
+              },
+              "dependencies": {
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "delegates": "1.0.0",
+                    "readable-stream": "2.3.2"
+                  },
+                  "dependencies": {
+                    "delegates": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+                      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "readable-stream": {
+                      "version": "2.3.2",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
+                      "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
+                      "dev": true,
+                      "optional": 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"
+                      },
+                      "dependencies": {
+                        "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,
+                          "optional": true
+                        },
+                        "inherits": {
+                          "version": "2.0.3",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                          "dev": true,
+                          "optional": true
+                        },
+                        "isarray": {
+                          "version": "1.0.0",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+                          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+                          "dev": true,
+                          "optional": 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,
+                          "optional": true
+                        },
+                        "safe-buffer": {
+                          "version": "5.1.1",
+                          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+                          "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+                          "dev": true
+                        },
+                        "string_decoder": {
+                          "version": "1.0.3",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+                          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+                          "dev": true,
+                          "optional": true,
+                          "requires": {
+                            "safe-buffer": "5.1.1"
+                          }
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+                          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+                          "dev": true,
+                          "optional": true
+                        }
+                      }
+                    }
+                  }
+                },
+                "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
+                },
+                "gauge": {
+                  "version": "2.7.4",
+                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+                  "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+                  "dev": true,
+                  "optional": 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"
+                  },
+                  "dependencies": {
+                    "aproba": {
+                      "version": "1.1.2",
+                      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+                      "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "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,
+                      "optional": 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,
+                      "optional": 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,
+                      "optional": 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"
+                      },
+                      "dependencies": {
+                        "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
+                        },
+                        "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"
+                          },
+                          "dependencies": {
+                            "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
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "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"
+                      },
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.1.1",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                          "dev": true
+                        }
+                      }
+                    },
+                    "wide-align": {
+                      "version": "1.1.2",
+                      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+                      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "string-width": "1.0.2"
+                      }
+                    }
+                  }
+                },
+                "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,
+                  "optional": true
+                }
+              }
+            },
+            "rc": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+              "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+              "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": {
+                "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,
+                  "optional": true
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+                  "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+                  "dev": true,
+                  "optional": true
+                },
+                "minimist": {
+                  "version": "1.2.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                  "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                  "dev": true,
+                  "optional": true
+                },
+                "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,
+                  "optional": true
+                }
+              }
+            },
+            "request": {
+              "version": "2.81.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+              "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.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.2",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              },
+              "dependencies": {
+                "aws-sign2": {
+                  "version": "0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+                  "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+                  "dev": true,
+                  "optional": true
+                },
+                "aws4": {
+                  "version": "1.6.0",
+                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+                  "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+                  "dev": true,
+                  "optional": true
+                },
+                "caseless": {
+                  "version": "0.12.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+                  "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+                  "dev": true,
+                  "optional": true
+                },
+                "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"
+                  },
+                  "dependencies": {
+                    "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
+                    }
+                  }
+                },
+                "extend": {
+                  "version": "3.0.1",
+                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+                  "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+                  "dev": true,
+                  "optional": 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,
+                  "optional": 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,
+                  "optional": true,
+                  "requires": {
+                    "asynckit": "0.4.0",
+                    "combined-stream": "1.0.5",
+                    "mime-types": "2.1.15"
+                  },
+                  "dependencies": {
+                    "asynckit": {
+                      "version": "0.4.0",
+                      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+                      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "ajv": "4.11.8",
+                    "har-schema": "1.0.5"
+                  },
+                  "dependencies": {
+                    "ajv": {
+                      "version": "4.11.8",
+                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+                      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "co": "4.6.0",
+                        "json-stable-stringify": "1.0.1"
+                      },
+                      "dependencies": {
+                        "co": {
+                          "version": "4.6.0",
+                          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+                          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+                          "dev": true,
+                          "optional": 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,
+                          "optional": true,
+                          "requires": {
+                            "jsonify": "0.0.0"
+                          },
+                          "dependencies": {
+                            "jsonify": {
+                              "version": "0.0.0",
+                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+                              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+                              "dev": true,
+                              "optional": true
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "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,
+                      "optional": true
+                    }
+                  }
+                },
+                "hawk": {
+                  "version": "3.1.3",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+                  "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "boom": "2.10.1",
+                    "cryptiles": "2.0.5",
+                    "hoek": "2.16.3",
+                    "sntp": "1.0.9"
+                  },
+                  "dependencies": {
+                    "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"
+                      }
+                    },
+                    "cryptiles": {
+                      "version": "2.0.5",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+                      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "boom": "2.10.1"
+                      }
+                    },
+                    "hoek": {
+                      "version": "2.16.3",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+                      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+                      "dev": true
+                    },
+                    "sntp": {
+                      "version": "1.0.9",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+                      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "hoek": "2.16.3"
+                      }
+                    }
+                  }
+                },
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "assert-plus": "0.2.0",
+                    "jsprim": "1.4.0",
+                    "sshpk": "1.13.1"
+                  },
+                  "dependencies": {
+                    "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,
+                      "optional": true
+                    },
+                    "jsprim": {
+                      "version": "1.4.0",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+                      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+                      "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",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                          "dev": true,
+                          "optional": true
+                        },
+                        "extsprintf": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+                          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+                          "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,
+                          "optional": 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,
+                          "optional": true,
+                          "requires": {
+                            "extsprintf": "1.0.2"
+                          }
+                        }
+                      }
+                    },
+                    "sshpk": {
+                      "version": "1.13.1",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+                      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+                      "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",
+                        "jsbn": "0.1.1",
+                        "tweetnacl": "0.14.5"
+                      },
+                      "dependencies": {
+                        "asn1": {
+                          "version": "0.2.3",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+                          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+                          "dev": true,
+                          "optional": true
+                        },
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                          "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"
+                          }
+                        },
+                        "dashdash": {
+                          "version": "1.14.1",
+                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+                          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+                          "dev": true,
+                          "optional": true,
+                          "requires": {
+                            "assert-plus": "1.0.0"
+                          }
+                        },
+                        "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"
+                          }
+                        },
+                        "getpass": {
+                          "version": "0.1.7",
+                          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+                          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+                          "dev": true,
+                          "optional": true,
+                          "requires": {
+                            "assert-plus": "1.0.0"
+                          }
+                        },
+                        "jsbn": {
+                          "version": "0.1.1",
+                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+                          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+                          "dev": true,
+                          "optional": 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
+                        }
+                      }
+                    }
+                  }
+                },
+                "is-typedarray": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+                  "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+                  "dev": true,
+                  "optional": true
+                },
+                "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,
+                  "optional": true
+                },
+                "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,
+                  "optional": 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"
+                  },
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.27.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+                      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+                      "dev": true
+                    }
+                  }
+                },
+                "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,
+                  "optional": 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,
+                  "optional": 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,
+                  "optional": true
+                },
+                "safe-buffer": {
+                  "version": "5.1.1",
+                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+                  "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+                  "dev": true
+                },
+                "stringstream": {
+                  "version": "0.0.5",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+                  "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+                  "dev": true,
+                  "optional": true
+                },
+                "tough-cookie": {
+                  "version": "2.3.2",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+                  "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "punycode": "1.4.1"
+                  },
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.4.1",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+                      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "tunnel-agent": {
+                  "version": "0.6.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+                  "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "safe-buffer": "5.1.1"
+                  }
+                },
+                "uuid": {
+                  "version": "3.1.0",
+                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+                  "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "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.1.2"
+              },
+              "dependencies": {
+                "glob": {
+                  "version": "7.1.2",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+                  "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+                  "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"
+                  },
+                  "dependencies": {
+                    "fs.realpath": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+                      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+                      "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"
+                      },
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                          "dev": true
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true
+                    },
+                    "minimatch": {
+                      "version": "3.0.4",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+                      "dev": true,
+                      "requires": {
+                        "brace-expansion": "1.1.8"
+                      },
+                      "dependencies": {
+                        "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"
+                          },
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "1.0.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+                              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+                              "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
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "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"
+                      },
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                          "dev": true
+                        }
+                      }
+                    },
+                    "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
+                    }
+                  }
+                }
+              }
+            },
+            "semver": {
+              "version": "5.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+              "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+              "dev": true,
+              "optional": 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"
+              },
+              "dependencies": {
+                "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"
+                  }
+                },
+                "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"
+                  },
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.11",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                      "dev": true
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.3",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                  "dev": true
+                }
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "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.3.2",
+                "rimraf": "2.6.1",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              },
+              "dependencies": {
+                "debug": {
+                  "version": "2.6.8",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+                  "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "ms": "2.0.0"
+                  },
+                  "dependencies": {
+                    "ms": {
+                      "version": "2.0.0",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                      "dev": true,
+                      "optional": 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"
+                  },
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.11",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                      "dev": true
+                    },
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true
+                    }
+                  }
+                },
+                "fstream-ignore": {
+                  "version": "1.0.5",
+                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+                  "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "fstream": "1.0.11",
+                    "inherits": "2.0.3",
+                    "minimatch": "3.0.4"
+                  },
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "minimatch": {
+                      "version": "3.0.4",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "brace-expansion": "1.1.8"
+                      },
+                      "dependencies": {
+                        "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,
+                          "optional": true,
+                          "requires": {
+                            "balanced-match": "1.0.0",
+                            "concat-map": "0.0.1"
+                          },
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "1.0.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+                              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+                              "dev": true,
+                              "optional": 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,
+                              "optional": true
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+                  "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "wrappy": "1.0.2"
+                  },
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.2",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.3.2",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
+                  "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
+                  "dev": true,
+                  "optional": 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"
+                  },
+                  "dependencies": {
+                    "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,
+                      "optional": true
+                    },
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "isarray": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+                      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+                      "dev": true,
+                      "optional": 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,
+                      "optional": true
+                    },
+                    "safe-buffer": {
+                      "version": "5.1.1",
+                      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+                      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+                      "dev": true
+                    },
+                    "string_decoder": {
+                      "version": "1.0.3",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+                      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "safe-buffer": "5.1.1"
+                      }
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+                      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.6",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+                  "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "gtoken": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
@@ -6019,8 +7666,8 @@
       "requires": {
         "google-p12-pem": "0.1.2",
         "jws": "3.1.4",
-        "mime": "1.4.1",
-        "request": "2.83.0"
+        "mime": "1.4.0",
+        "request": "2.82.0"
       }
     },
     "gulp": {
@@ -6394,7 +8041,7 @@
             "finalhandler": "0.4.0",
             "fresh": "0.3.0",
             "http-errors": "1.3.1",
-            "method-override": "2.3.10",
+            "method-override": "2.3.9",
             "morgan": "1.6.1",
             "multiparty": "3.3.2",
             "on-headers": "1.0.1",
@@ -6954,7 +8601,7 @@
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "5.2.3",
+        "ajv": "5.2.2",
         "har-schema": "2.0.0"
       }
     },
@@ -7005,6 +8652,23 @@
         "sparkles": "1.0.0"
       }
     },
+    "has-symbol-support-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
+      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==",
+      "dev": true,
+      "optional": true
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "has-symbol-support-x": "1.4.1"
+      }
+    },
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -7103,13 +8767,13 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.1.2"
+        "uglify-js": "3.1.1"
       },
       "dependencies": {
         "uglify-js": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.2.tgz",
-          "integrity": "sha512-kKJ8zg7Ivw3DG9Ytgp4+iiSHq3HaHjEQMvyT2x2Bs8kSUwVemj6bPGFp6YWL81f5NAIOLVUKPxBSvqLRGXMpdw==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz",
+          "integrity": "sha512-f7DpmEgt/RYAKzQzcfahn3JYZHobDwTZCa8oixC7pweVGEIizTX2kTYdNWcdk00xsMJqUhI8RDAa9HXHXGhNxA==",
           "dev": true,
           "requires": {
             "commander": "2.11.0",
@@ -7151,9 +8815,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz",
-      "integrity": "sha512-jmHp99g6/fLx0pRNJqzsQgjsclCHAY7NhIeA3/U+bsGNvgbvUCQFQY9m5AYpqpAxY/2VcikfbKpjQozSTiz0jA==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.7.tgz",
+      "integrity": "sha1-HOzJxM6EXAKIIk2IRIVMHvCMmtc=",
       "dev": true
     },
     "http-proxy": {
@@ -7194,6 +8858,13 @@
         "extend": "3.0.1"
       }
     },
+    "i": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz",
+      "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=",
+      "dev": true,
+      "optional": true
+    },
     "iconv-lite": {
       "version": "0.4.15",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
@@ -7349,6 +9020,13 @@
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
       "dev": true
     },
+    "ipaddr.js": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz",
+      "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=",
+      "dev": true,
+      "optional": true
+    },
     "irregular-plurals": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz",
@@ -7509,6 +9187,13 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true,
+      "optional": true
+    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -7533,6 +9218,13 @@
         "path-is-inside": "1.0.2"
       }
     },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "optional": true
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -7811,6 +9503,17 @@
         }
       }
     },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "has-to-string-tag-x": "1.4.1",
+        "is-object": "1.0.1"
+      }
+    },
     "jasmine": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
@@ -7924,12 +9627,12 @@
         "escodegen": "1.9.0",
         "html-encoding-sniffer": "1.0.1",
         "iconv-lite": "0.4.15",
-        "nwmatcher": "1.4.2",
+        "nwmatcher": "1.4.1",
         "parse5": "1.5.1",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "sax": "1.2.4",
         "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.3",
+        "tough-cookie": "2.3.2",
         "webidl-conversions": "3.0.1",
         "whatwg-encoding": "1.0.1",
         "whatwg-url": "3.1.0",
@@ -8193,7 +9896,7 @@
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
-        "connect": "3.6.5",
+        "connect": "3.6.4",
         "core-js": "2.5.1",
         "di": "0.0.1",
         "dom-serialize": "2.2.1",
@@ -8204,7 +9907,7 @@
         "isbinaryfile": "3.0.2",
         "lodash": "3.10.1",
         "log4js": "0.6.38",
-        "mime": "1.4.1",
+        "mime": "1.4.0",
         "minimatch": "3.0.4",
         "optimist": "0.6.1",
         "qjobs": "1.1.5",
@@ -8527,6 +10230,30 @@
       "integrity": "sha1-bIclfmSKtHW8JOoldFftzB+NC8I=",
       "dev": true
     },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "strip-bom": "3.0.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      }
+    },
     "lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -8877,6 +10604,13 @@
         }
       }
     },
+    "long": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
+      "dev": true,
+      "optional": true
+    },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -8954,9 +10688,9 @@
           }
         },
         "cli-spinners": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.1.tgz",
-          "integrity": "sha1-JnUyHBAPGVsCh3rEmemRH6NLl4M=",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz",
+          "integrity": "sha1-75h+09SDkaw9q5GAtAanQhgNbmo=",
           "dev": true
         },
         "onetime": {
@@ -8976,7 +10710,7 @@
           "requires": {
             "chalk": "1.1.3",
             "cli-cursor": "2.1.0",
-            "cli-spinners": "1.0.1",
+            "cli-spinners": "1.0.0",
             "log-symbols": "1.0.2"
           }
         },
@@ -9136,6 +10870,16 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -9239,6 +10983,13 @@
         }
       }
     },
+    "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,
+      "optional": true
+    },
     "merge-stream": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
@@ -9255,21 +11006,21 @@
       "dev": true
     },
     "method-override": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz",
-      "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=",
+      "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.9",
+        "debug": "2.6.8",
         "methods": "1.1.2",
         "parseurl": "1.3.2",
-        "vary": "1.1.2"
+        "vary": "1.1.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "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"
@@ -9305,9 +11056,9 @@
       }
     },
     "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz",
+      "integrity": "sha512-n9ChLv77+QQEapYz8lV+rIZAW3HhAPW2CXnzb1GN5uMkuczshwvkW7XPsbzU0ZQN3sP47Er2KVkp2p3KyqZKSQ==",
       "dev": true
     },
     "mime-db": {
@@ -9331,6 +11082,13 @@
       "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
       "dev": true
     },
+    "mimic-response": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz",
+      "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=",
+      "dev": true,
+      "optional": true
+    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -9455,22 +11213,22 @@
       "dev": true
     },
     "morgan": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
-      "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz",
+      "integrity": "sha1-eErHc05KRTqcbm6GgKkyknXItoc=",
       "dev": true,
       "requires": {
-        "basic-auth": "2.0.0",
-        "debug": "2.6.9",
+        "basic-auth": "1.1.0",
+        "debug": "2.6.8",
         "depd": "1.1.1",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "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"
@@ -9582,6 +11340,13 @@
       "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=",
       "dev": true
     },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true,
+      "optional": true
+    },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -9640,6 +11405,13 @@
         "xml-char-classes": "1.0.0"
       }
     },
+    "ncp": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz",
+      "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
+      "dev": true,
+      "optional": true
+    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -9684,7 +11456,7 @@
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "rimraf": "2.6.1",
         "semver": "5.3.0",
         "tar": "2.2.1",
@@ -9743,7 +11515,7 @@
         "nan": "2.7.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "sass-graph": "2.2.4",
         "stdout-stream": "1.4.0"
       },
@@ -9801,7 +11573,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.1"
+        "abbrev": "1.1.0"
       }
     },
     "normalize-package-data": {
@@ -9837,6 +11609,16 @@
       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "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,
+      "optional": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
@@ -9868,20 +11650,21 @@
       "dev": true
     },
     "nunjucks": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-2.5.2.tgz",
-      "integrity": "sha1-6n00bnhbikh0Zmw8yp4YxXf7oiw=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz",
+      "integrity": "sha1-TedKPlULr2+jNwMj89HHwqhr3E0=",
       "dev": true,
       "requires": {
+        "a-sync-waterfall": "1.0.0",
         "asap": "2.0.6",
         "chokidar": "1.7.0",
         "yargs": "3.32.0"
       }
     },
     "nwmatcher": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.2.tgz",
-      "integrity": "sha512-QMkCGQFYp5p+zwU3INntLmz1HMfSx9dMVJMYKmE1yuSf/22Wjo6VPFa405mCLUuQn9lbQvH2DZN9lt10ZNvtAg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
+      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
       "dev": true
     },
     "oauth-sign": {
@@ -10058,6 +11841,13 @@
       "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
       "dev": true
     },
+    "optjs": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
+      "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
+      "dev": true,
+      "optional": true
+    },
     "ora": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
@@ -10144,6 +11934,46 @@
       "integrity": "sha1-8phS5w/X4l82DgE6jsRMgq7bVwg=",
       "dev": true
     },
+    "p-cancelable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "dev": true,
+      "optional": true
+    },
+    "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-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
+      "dev": true,
+      "optional": true
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "p-limit": "1.1.0"
+      }
+    },
+    "p-timeout": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.0.tgz",
+      "integrity": "sha1-mCD5lDTFgXhotPNICe5SkWYNW2w=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "p-finally": "1.0.0"
+      }
+    },
     "package-json": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
@@ -10321,6 +12151,13 @@
         "no-case": "2.3.2"
       }
     },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "optional": true
+    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -10333,6 +12170,13 @@
       "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,
+      "optional": true
+    },
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
@@ -10360,6 +12204,16 @@
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
       "dev": true
     },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "pify": "2.3.0"
+      }
+    },
     "pause": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz",
@@ -10412,6 +12266,13 @@
         "synesthesia": "1.0.1"
       }
     },
+    "pkginfo": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
+      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=",
+      "dev": true,
+      "optional": true
+    },
     "plur": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz",
@@ -10520,7 +12381,7 @@
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "debug": "3.1.0",
+        "debug": "3.0.1",
         "detective-amd": "2.4.0",
         "detective-cjs": "2.0.0",
         "detective-es6": "1.2.0",
@@ -10534,9 +12395,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
+          "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -10574,37 +12435,120 @@
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
-    "pretty-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz",
-      "integrity": "sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw=",
+    "pretty-ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz",
+      "integrity": "sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2",
+        "parse-ms": "1.0.1",
+        "plur": "1.0.0"
+      }
+    },
+    "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
+    },
+    "progress": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "dev": true,
+      "requires": {
+        "asap": "2.0.6"
+      }
+    },
+    "prompt": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz",
+      "integrity": "sha1-jlcSPDlquYiJf7Mn/Trtw+c15P4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "colors": "1.1.2",
+        "pkginfo": "0.4.1",
+        "read": "1.0.7",
+        "revalidator": "0.1.8",
+        "utile": "0.3.0",
+        "winston": "2.1.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true,
+          "optional": true
+        },
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true,
+          "optional": true
+        },
+        "winston": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz",
+          "integrity": "sha1-PJNJ0ZYgf9G9/51LxD73JRDjoS4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
+          },
+          "dependencies": {
+            "colors": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+              "dev": true,
+              "optional": true
+            },
+            "pkginfo": {
+              "version": "0.3.1",
+              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+              "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        }
+      }
+    },
+    "protobufjs": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
+      "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "is-finite": "1.0.2",
-        "parse-ms": "1.0.1",
-        "plur": "1.0.0"
+        "ascli": "1.0.1",
+        "bytebuffer": "5.0.1",
+        "glob": "7.1.2",
+        "yargs": "3.32.0"
       }
     },
-    "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
-    },
-    "progress": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-      "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-      "dev": true
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+    "protochain": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/protochain/-/protochain-1.0.5.tgz",
+      "integrity": "sha1-mRxAfpneJkqt+PgVBLXn+ve/omA=",
       "dev": true,
-      "requires": {
-        "asap": "2.0.6"
-      }
+      "optional": true
     },
     "protractor": {
       "version": "5.1.2",
@@ -10684,7 +12628,7 @@
             "ini": "1.3.4",
             "minimist": "1.2.0",
             "q": "1.4.1",
-            "request": "2.83.0",
+            "request": "2.82.0",
             "rimraf": "2.6.1",
             "semver": "5.4.1",
             "xml2js": "0.4.19"
@@ -10692,6 +12636,17 @@
         }
       }
     },
+    "proxy-addr": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz",
+      "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "forwarded": "0.1.2",
+        "ipaddr.js": "1.4.0"
+      }
+    },
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
@@ -10863,6 +12818,16 @@
         "strip-json-comments": "2.0.1"
       }
     },
+    "read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mute-stream": "0.0.7"
+      }
+    },
     "read-all-stream": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
@@ -10882,6 +12847,29 @@
         "gather-stream": "1.0.0"
       }
     },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "load-json-file": "2.0.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "find-up": "2.1.0",
+        "read-pkg": "2.0.0"
+      }
+    },
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -11027,9 +13015,9 @@
       "dev": true
     },
     "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "version": "2.82.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.82.0.tgz",
+      "integrity": "sha512-/QWqfmyTfQ4OYs6EhB1h2wQsX9ZxbuNePCvCm0Mdz/mxw73mjdg0D4QdIl0TQBFs35CZmMXLjk0iCGK395CUDg==",
       "dev": true,
       "requires": {
         "aws-sign2": "0.7.0",
@@ -11051,7 +13039,7 @@
         "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
+        "tough-cookie": "2.3.2",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
       }
@@ -11207,10 +13195,17 @@
       "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
       "dev": true,
       "requires": {
-        "request": "2.83.0",
+        "request": "2.82.0",
         "through2": "2.0.3"
       }
     },
+    "revalidator": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
+      "dev": true,
+      "optional": true
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -11266,18 +13261,18 @@
       }
     },
     "router": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/router/-/router-1.3.2.tgz",
-      "integrity": "sha1-v6oWiIpSg9XuQNmZ2nqfoVKWpgw=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/router/-/router-1.3.1.tgz",
+      "integrity": "sha1-5Z72T6/CIZShlphoNNiHBY12r0c=",
       "dev": true,
       "requires": {
         "array-flatten": "2.1.1",
-        "debug": "2.6.9",
+        "debug": "2.6.8",
         "methods": "1.1.2",
         "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "setprototypeof": "1.1.0",
-        "utils-merge": "1.0.1"
+        "setprototypeof": "1.0.3",
+        "utils-merge": "1.0.0"
       },
       "dependencies": {
         "array-flatten": {
@@ -11287,25 +13282,13 @@
           "dev": true
         },
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "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"
           }
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "utils-merge": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-          "dev": true
         }
       }
     },
@@ -11753,6 +13736,44 @@
         "sver-compat": "1.5.0"
       }
     },
+    "send": {
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz",
+      "integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.8",
+        "depd": "1.1.1",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "fresh": "0.5.0",
+        "http-errors": "1.6.2",
+        "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.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "mime": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+          "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
+          "dev": true
+        }
+      }
+    },
     "sentence-case": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz",
@@ -11769,6 +13790,16 @@
       "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
       "dev": true
     },
+    "serializerr": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/serializerr/-/serializerr-1.0.3.tgz",
+      "integrity": "sha1-EtTFqhw/+49tHcXzlaqUVVacP5E=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "protochain": "1.0.5"
+      }
+    },
     "serve-favicon": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz",
@@ -11859,6 +13890,19 @@
         }
       }
     },
+    "serve-static": {
+      "version": "1.12.4",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz",
+      "integrity": "sha1-m2qpjutyU8Tu3Ewfb9vKYJkBqWE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
+        "send": "0.15.4"
+      }
+    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -11883,6 +13927,23 @@
       "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
       "dev": true
     },
+    "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,
+      "optional": 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,
+      "optional": true
+    },
     "shelljs": {
       "version": "0.7.8",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
@@ -11913,21 +13974,10 @@
       "dev": true
     },
     "slice-ansi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "2.0.0"
-      },
-      "dependencies": {
-        "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
-        }
-      }
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
+      "dev": true
     },
     "slice-stream": {
       "version": "1.0.0",
@@ -12198,9 +14248,9 @@
       "dev": true
     },
     "specificity": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
-      "integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.1.tgz",
+      "integrity": "sha1-8bBoQkzjF64HR42V3jwhz4Xo1Wc=",
       "dev": true
     },
     "split": {
@@ -12223,9 +14273,9 @@
       }
     },
     "split2": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
-      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "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"
@@ -12354,6 +14404,13 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "string-template": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz",
+      "integrity": "sha1-np8iM9wA8hhxjsN5oopWc+zKi5Y=",
+      "dev": true,
+      "optional": true
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -12407,6 +14464,13 @@
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "dev": true
     },
+    "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,
+      "optional": true
+    },
     "strip-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
@@ -12514,13 +14578,13 @@
         "postcss-selector-parser": "2.2.3",
         "postcss-value-parser": "3.3.0",
         "resolve-from": "3.0.0",
-        "specificity": "0.3.2",
+        "specificity": "0.3.1",
         "string-width": "2.1.1",
         "style-search": "0.1.0",
         "stylehacks": "2.3.2",
         "sugarss": "0.2.0",
         "svg-tags": "1.0.0",
-        "table": "4.0.2"
+        "table": "4.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12674,8 +14738,8 @@
         "chalk": "1.1.3",
         "char-spinner": "1.0.1",
         "compare-semver": "1.1.0",
-        "compression": "1.7.1",
-        "connect": "3.6.5",
+        "compression": "1.7.0",
+        "connect": "3.6.4",
         "connect-query": "1.0.0",
         "destroy": "1.0.4",
         "fast-url-parser": "1.1.3",
@@ -12688,12 +14752,12 @@
         "lodash": "4.17.4",
         "mime-types": "2.1.17",
         "minimatch": "3.0.4",
-        "morgan": "1.9.0",
+        "morgan": "1.8.2",
         "nash": "2.0.4",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1",
         "path-to-regexp": "1.7.0",
-        "router": "1.3.2",
+        "router": "1.3.1",
         "rsvp": "3.6.2",
         "string-length": "1.0.1",
         "try-require": "1.2.1",
@@ -12868,49 +14932,33 @@
       }
     },
     "table": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz",
+      "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=",
       "dev": true,
       "requires": {
-        "ajv": "5.2.3",
-        "ajv-keywords": "2.1.0",
-        "chalk": "2.1.0",
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "chalk": "1.1.3",
         "lodash": "4.17.4",
-        "slice-ansi": "1.0.0",
+        "slice-ansi": "0.0.4",
         "string-width": "2.1.1"
       },
       "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
-        },
-        "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+        "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": {
@@ -12937,15 +14985,6 @@
           "requires": {
             "ansi-regex": "3.0.0"
           }
-        },
-        "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "2.0.0"
-          }
         }
       }
     },
@@ -13067,6 +15106,13 @@
       "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,
+      "optional": true
+    },
     "tiny-lr": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.2.1.tgz",
@@ -13214,9 +15260,9 @@
       }
     },
     "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "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"
@@ -13295,7 +15341,7 @@
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18",
         "tsconfig": "6.0.0",
-        "v8flags": "3.0.1",
+        "v8flags": "3.0.0",
         "yn": "2.0.0"
       },
       "dependencies": {
@@ -13334,13 +15380,19 @@
             "has-flag": "2.0.0"
           }
         },
+        "user-home": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+          "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+          "dev": true
+        },
         "v8flags": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.1.tgz",
-          "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.0.tgz",
+          "integrity": "sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA==",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "1.0.1"
+            "user-home": "1.1.1"
           }
         }
       }
@@ -13418,7 +15470,7 @@
         "resolve": "1.4.0",
         "semver": "5.4.1",
         "tslib": "1.7.1",
-        "tsutils": "2.10.0"
+        "tsutils": "2.8.2"
       },
       "dependencies": {
         "colors": {
@@ -13436,9 +15488,9 @@
       "dev": true
     },
     "tsutils": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.10.0.tgz",
-      "integrity": "sha1-rpRRHfJlbrBuRCQFb7pcOIiHBAw=",
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.2.tgz",
+      "integrity": "sha1-LBSGukMSYIRbCsb5Aq/Z1wio6mo=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
@@ -13637,7 +15689,7 @@
       "requires": {
         "async": "0.2.10",
         "node-uuid": "1.4.8",
-        "request": "2.83.0",
+        "request": "2.82.0",
         "underscore": "1.6.0"
       },
       "dependencies": {
@@ -13883,6 +15935,13 @@
         "prepend-http": "1.0.4"
       }
     },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true,
+      "optional": true
+    },
     "user-home": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
@@ -13916,6 +15975,30 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "utile": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz",
+      "integrity": "sha1-E1LDQOuCDk2N26A5pPv6oy7U7zo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "0.9.2",
+        "deep-equal": "0.2.2",
+        "i": "0.3.5",
+        "mkdirp": "0.5.1",
+        "ncp": "1.0.1",
+        "rimraf": "2.6.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "utils-merge": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
@@ -13974,9 +16057,9 @@
       "dev": true
     },
     "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
+      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
       "dev": true
     },
     "verror": {
@@ -14212,9 +16295,9 @@
           }
         },
         "crc": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
-          "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
+          "version": "3.4.4",
+          "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
+          "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=",
           "dev": true
         },
         "crc32-stream": {
@@ -14223,7 +16306,7 @@
           "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
           "dev": true,
           "requires": {
-            "crc": "3.5.0",
+            "crc": "3.4.4",
             "readable-stream": "2.3.3"
           }
         },
@@ -14323,7 +16406,7 @@
             "oauth-sign": "0.8.2",
             "qs": "6.3.2",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
+            "tough-cookie": "2.3.2",
             "tunnel-agent": "0.4.3",
             "uuid": "3.1.0"
           }
@@ -14440,7 +16523,7 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": "0.4.8",
+        "http-parser-js": "0.4.7",
         "websocket-extensions": "0.1.2"
       }
     },
@@ -14491,6 +16574,13 @@
         "isexe": "2.0.0"
       }
     },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true,
+      "optional": true
+    },
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
@@ -14707,6 +16797,25 @@
         "y18n": "3.2.1"
       }
     },
+    "yargs-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "4.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
@@ -14763,9 +16872,9 @@
       }
     },
     "zone.js": {
-      "version": "0.8.18",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
-      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q=="
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.17.tgz",
+      "integrity": "sha1-TF5RhahX2o2nk9rzkZNxxaNrKgs="
     }
   }
 }
diff --git a/package.json b/package.json
index 818589fc3896..26cd4141c1ae 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,8 @@
     "axe-core": "^2.3.1",
     "axe-webdriverjs": "^1.1.1",
     "chalk": "^1.1.3",
-    "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.19.1",
+    "dgeni": "^0.4.9",
+    "dgeni-packages": "^0.21.1",
     "firebase": "^4.0.0",
     "firebase-admin": "^5.0.0",
     "firebase-tools": "^3.11.0",
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index d726b8309560..9adb9d3de00a 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -279,7 +279,7 @@ export class FocusTrapFactory {
       private _platform: Platform,
       private _ngZone: NgZone) { }
 
-  create(element: HTMLElement, deferAnchors = false): FocusTrap {
+  create(element: HTMLElement, deferAnchors: boolean = false): FocusTrap {
     return new FocusTrap(element, this._platform, this._checker, this._ngZone, deferAnchors);
   }
 }
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index 6268194925eb..81e56cadd07f 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -55,7 +55,7 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
    * Turns on typeahead mode which allows users to set the active item by typing.
    * @param debounceInterval Time to wait after the last keystroke before setting the active item.
    */
-  withTypeAhead(debounceInterval = 200): this {
+  withTypeAhead(debounceInterval: number = 200): this {
     if (this._items.length && this._items.some(item => typeof item.getLabel !== 'function')) {
       throw Error('ListKeyManager items in typeahead mode must implement the `getLabel` method.');
     }
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index c0b8dff10ecb..59dd95ce5aa9 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -27,7 +27,7 @@ import {RxChain, debounceTime} from '@angular/cdk/rxjs';
  */
 @Injectable()
 export class MatMutationObserverFactory {
-  create(callback): MutationObserver | null {
+  create(callback: MutationCallback): MutationObserver | null {
     return typeof MutationObserver === 'undefined' ? null : new MutationObserver(callback);
   }
 }
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 19dc0c761597..4384f0316687 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -81,7 +81,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   }
 
   /** Ordered list of preferred positions, from most to least desirable. */
-  get positions() {
+  get positions(): ConnectionPositionPair[] {
     return this._preferredPositions;
   }
 
diff --git a/src/cdk/overlay/position/global-position-strategy.ts b/src/cdk/overlay/position/global-position-strategy.ts
index 69bcf5338576..4844b1ade9aa 100644
--- a/src/cdk/overlay/position/global-position-strategy.ts
+++ b/src/cdk/overlay/position/global-position-strategy.ts
@@ -41,7 +41,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    * Sets the top position of the overlay. Clears any previously set vertical position.
    * @param value New top offset.
    */
-  top(value = ''): this {
+  top(value: string = ''): this {
     this._bottomOffset = '';
     this._topOffset = value;
     this._alignItems = 'flex-start';
@@ -52,7 +52,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    * Sets the left position of the overlay. Clears any previously set horizontal position.
    * @param value New left offset.
    */
-  left(value = ''): this {
+  left(value: string = ''): this {
     this._rightOffset = '';
     this._leftOffset = value;
     this._justifyContent = 'flex-start';
@@ -63,7 +63,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    * Sets the bottom position of the overlay. Clears any previously set vertical position.
    * @param value New bottom offset.
    */
-  bottom(value = ''): this {
+  bottom(value: string = ''): this {
     this._topOffset = '';
     this._bottomOffset = value;
     this._alignItems = 'flex-end';
@@ -74,7 +74,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    * Sets the right position of the overlay. Clears any previously set horizontal position.
    * @param value New right offset.
    */
-  right(value = ''): this {
+  right(value: string = ''): this {
     this._leftOffset = '';
     this._rightOffset = value;
     this._justifyContent = 'flex-end';
@@ -85,7 +85,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    * Sets the overlay width and clears any previously set width.
    * @param value New width for the overlay
    */
-  width(value = ''): this {
+  width(value: string = ''): this {
     this._width = value;
 
     // When the width is 100%, we should reset the `left` and the offset,
@@ -101,7 +101,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    * Sets the overlay height and clears any previously set height.
    * @param value New height for the overlay
    */
-  height(value = ''): this {
+  height(value: string = ''): this {
     this._height = value;
 
     // When the height is 100%, we should reset the `top` and the offset,
@@ -119,7 +119,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    *
    * @param offset Overlay offset from the horizontal center.
    */
-  centerHorizontally(offset = ''): this {
+  centerHorizontally(offset: string = ''): this {
     this.left(offset);
     this._justifyContent = 'center';
     return this;
@@ -131,7 +131,7 @@ export class GlobalPositionStrategy implements PositionStrategy {
    *
    * @param offset Overlay offset from the vertical center.
    */
-  centerVertically(offset = ''): this {
+  centerVertically(offset: string = ''): this {
     this.top(offset);
     this._alignItems = 'center';
     return this;
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index fbd55ad9e2d6..8d7087c70f25 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -26,7 +26,7 @@ export class ViewportRuler {
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
-  getViewportRect(documentRect = this._documentRect): ClientRect {
+  getViewportRect(documentRect: ClientRect | undefined = this._documentRect): ClientRect {
     // Cache the document bounding rect so that we don't recompute it for multiple calls.
     if (!documentRect) {
       this._cacheViewportGeometry();
@@ -61,7 +61,7 @@ export class ViewportRuler {
    * Gets the (top, left) scroll position of the viewport.
    * @param documentRect
    */
-  getViewportScrollPosition(documentRect = this._documentRect) {
+  getViewportScrollPosition(documentRect: ClientRect | undefined = this._documentRect) {
     // Cache the document bounding rect so that we don't recompute it for multiple calls.
     if (!documentRect) {
       this._cacheViewportGeometry();
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index e2d11e804139..b1cc3570151f 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -94,7 +94,7 @@ export class MatButtonToggleGroup extends _MatButtonToggleGroupMixinBase
   _controlValueAccessorChangeFn: (value: any) => void = () => {};
 
   /** onTouch function registered via registerOnTouch (ControlValueAccessor). */
-  onTouched: () => any = () => {};
+  _onTouched: () => any = () => {};
 
   /** Child button toggle buttons. */
   @ContentChildren(forwardRef(() => MatButtonToggle)) _buttonToggles: QueryList<MatButtonToggle>;
@@ -215,7 +215,7 @@ export class MatButtonToggleGroup extends _MatButtonToggleGroupMixinBase
    * @param fn On touch callback function.
    */
   registerOnTouched(fn: any) {
-    this.onTouched = fn;
+    this._onTouched = fn;
   }
 
   /**
@@ -436,7 +436,7 @@ export class MatButtonToggle implements OnInit, OnDestroy {
       let groupValueChanged = this.buttonToggleGroup.selected != this;
       this.checked = true;
       this.buttonToggleGroup.selected = this;
-      this.buttonToggleGroup.onTouched();
+      this.buttonToggleGroup._onTouched();
       if (groupValueChanged) {
         this.buttonToggleGroup._emitChangeEvent();
       }
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 19e1ada6bc77..8ad69e3a98e0 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -48,7 +48,7 @@ export class MatChipInput {
    */
   @Input('matChipInputAddOnBlur')
   get addOnBlur() { return this._addOnBlur; }
-  set addOnBlur(value) { this._addOnBlur = coerceBooleanProperty(value); }
+  set addOnBlur(value: boolean) { this._addOnBlur = coerceBooleanProperty(value); }
   _addOnBlur: boolean = false;
 
   /**
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 844315d01eb7..be82b408731b 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -229,7 +229,7 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   }
 
   /** Whether any chips or the matChipInput inside of this chip-list has focus. */
-  get focused() {
+  get focused(): boolean {
     return this.chips.some(chip => chip._hasFocus) ||
       (this._chipInput && this._chipInput.focused);
   }
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index b7061303225c..7303d46d2311 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -79,7 +79,7 @@ export class MatOption {
   }
 
   /** The unique ID of the option. */
-  get id() { return this._id; }
+  get id(): string { return this._id; }
 
   /** Whether or not the option is currently selected. */
   get selected(): boolean { return this._selected; }
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index cd7e7c77eb07..ab8ca67ecbda 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -113,7 +113,7 @@ export class MatRipple implements OnChanges, OnDestroy {
   }
 
   /** Launches a manual ripple at the specified position. */
-  launch(x: number, y: number, config = this.rippleConfig): RippleRef {
+  launch(x: number, y: number, config: RippleConfig = this.rippleConfig): RippleRef {
     return this._rippleRenderer.fadeInRipple(x, y, config);
   }
 
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index c9988235b132..ff84a574f3a2 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -43,7 +43,7 @@ export class MatDatepickerToggle<D> implements OnChanges, OnDestroy {
 
   /** Whether the toggle button is disabled. */
   @Input()
-  get disabled() {
+  get disabled(): boolean {
     return this._disabled === undefined ? this.datepicker.disabled : this._disabled;
   }
   set disabled(value) {
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 0c45a1060888..e647cbc4fd1c 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -144,7 +144,7 @@ export class MatDialogRef<T> {
    * @param width New width of the dialog.
    * @param height New height of the dialog.
    */
-  updateSize(width = 'auto', height = 'auto'): this {
+  updateSize(width: string = 'auto', height: string = 'auto'): this {
     this._getPositionStrategy().width(width).height(height);
     this._overlayRef.updatePosition();
     return this;
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 75c2991d6b5f..8b510e6dfd6a 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -99,7 +99,7 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
 
   /** @deprecated Use `color` instead. */
   @Input()
-  get dividerColor() { return this.color; }
+  get dividerColor(): 'primary' | 'accent' | 'warn' { return this.color; }
   set dividerColor(value) { this.color = value; }
 
   /** Whether the required marker should be hidden. */
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index 7f0e14f3780a..6cdfd59519ae 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -41,12 +41,12 @@ export class MatGridTile {
 
   /** Amount of rows that the grid tile takes up. */
   @Input()
-  get rowspan() { return this._rowspan; }
+  get rowspan(): number { return this._rowspan; }
   set rowspan(value) { this._rowspan = coerceToNumber(value); }
 
   /** Amount of columns that the grid tile takes up. */
   @Input()
-  get colspan() { return this._colspan; }
+  get colspan(): number { return this._colspan; }
   set colspan(value) { this._colspan = coerceToNumber(value); }
 
   /**
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index f0f2a06e70c1..550aacbdd2ce 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -148,7 +148,7 @@ export class MatIconRegistry {
    * @param alias Alias for the font.
    * @param className Class name override to be used instead of the alias.
    */
-  registerFontClassAlias(alias: string, className = alias): this {
+  registerFontClassAlias(alias: string, className: string = alias): this {
     this._fontCssClassesByAlias.set(alias, className);
     return this;
   }
@@ -215,7 +215,7 @@ export class MatIconRegistry {
    * @param name Name of the icon to be retrieved.
    * @param namespace Namespace in which to look for the icon.
    */
-  getNamedSvgIcon(name: string, namespace = ''): Observable<SVGElement> {
+  getNamedSvgIcon(name: string, namespace: string = ''): Observable<SVGElement> {
     // Return (copy of) cached icon if possible.
     const key = iconKey(namespace, name);
     const config = this._svgIconConfigs.get(key);
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index d599e4ac58e4..e66f232f0742 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -209,7 +209,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
    * It's necessary to set position-based classes to ensure the menu panel animation
    * folds out from the correct direction.
    */
-  setPositionClasses(posX = this.xPosition, posY = this.yPosition): void {
+  setPositionClasses(posX: MenuPositionX = this.xPosition, posY: MenuPositionY = this.yPosition) {
     this._classList['mat-menu-before'] = posX === 'before';
     this._classList['mat-menu-after'] = posX === 'after';
     this._classList['mat-menu-above'] = posY === 'above';
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 2196ee4308ca..2c2ad1307e38 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -155,7 +155,7 @@ export class MatRadioGroup extends _MatRadioGroupMixinBase
 
   /** Whether the labels should appear after or before the radio-buttons. Defaults to 'after' */
   @Input()
-  get labelPosition() {
+  get labelPosition(): 'before' | 'after' {
     return this._labelPosition;
   }
 
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 2985554540f2..d9e4d6d8394f 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -1205,5 +1205,5 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   }
 
   // Implemented as part of MatFormFieldControl.
-  get shouldPlaceholderFloat() { return this._panelOpen || !this.empty; }
+  get shouldPlaceholderFloat(): boolean { return this._panelOpen || !this.empty; }
 }
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 490bc5184c9e..563d64a61797 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -137,7 +137,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
 
   /** The side that the drawer is attached to. */
   @Input()
-  get position() { return this._position; }
+  get position(): 'start' | 'end' { return this._position; }
   set position(value) {
     // Make sure we have a valid value.
     value = value === 'end' ? 'end' : 'start';
@@ -151,12 +151,12 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
 
   /** @deprecated */
   @Input()
-  get align() { return this.position; }
+  get align(): 'start' | 'end' { return this.position; }
   set align(value) { this.position = value; }
 
   /** Mode of the drawer; one of 'over', 'push' or 'side'. */
   @Input()
-  get mode() { return this._mode; }
+  get mode(): 'over' | 'push' | 'side' { return this._mode; }
   set mode(value) {
     this._mode = value;
     this._modeChanged.next();
@@ -206,7 +206,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
    */
   _modeChanged = new Subject();
 
-  get _isFocusTrapEnabled() {
+  get _isFocusTrapEnabled(): boolean {
     // The focus trap is only enabled when the drawer is open in any mode other than side.
     return this.opened && this.mode !== 'side';
   }
@@ -369,10 +369,10 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   @ContentChild(MatDrawerContent) _content: MatDrawerContent;
 
   /** The drawer child with the `start` position. */
-  get start() { return this._start; }
+  get start(): MatDrawer | null { return this._start; }
 
   /** The drawer child with the `end` position. */
-  get end() { return this._end; }
+  get end(): MatDrawer | null { return this._end; }
 
   /** Event emitted when the drawer backdrop is clicked. */
   @Output() backdropClick = new EventEmitter<void>();
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index c65be66a04b8..411df9a4a9ae 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -81,7 +81,7 @@ export class MatSidenavContent extends MatDrawerContent {
 export class MatSidenav extends MatDrawer {
   /** Whether the sidenav is fixed in the viewport. */
   @Input()
-  get fixedInViewport() { return this._fixedInViewport; }
+  get fixedInViewport(): boolean { return this._fixedInViewport; }
   set fixedInViewport(value) { this._fixedInViewport = coerceBooleanProperty(value); }
   private _fixedInViewport = false;
 
@@ -90,7 +90,7 @@ export class MatSidenav extends MatDrawer {
    * mode.
    */
   @Input()
-  get fixedTopGap() { return this._fixedTopGap; }
+  get fixedTopGap(): number { return this._fixedTopGap; }
   set fixedTopGap(value) { this._fixedTopGap = coerceNumberProperty(value); }
   private _fixedTopGap = 0;
 
@@ -99,7 +99,7 @@ export class MatSidenav extends MatDrawer {
    * fixed mode.
    */
   @Input()
-  get fixedBottomGap() { return this._fixedBottomGap; }
+  get fixedBottomGap(): number { return this._fixedBottomGap; }
   set fixedBottomGap(value) { this._fixedBottomGap = coerceNumberProperty(value); }
   private _fixedBottomGap = 0;
 }
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index d9cf7dadac61..f865fa9bb9ce 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -172,7 +172,7 @@ export class MatSlider extends _MatSliderMixinBase
   /** The values at which the thumb will snap. */
   @Input()
   get step() { return this._step; }
-  set step(v) {
+  set step(v: number) {
     this._step = coerceNumberProperty(v, this._step);
 
     if (this._step % 1 !== 0) {
@@ -201,7 +201,7 @@ export class MatSlider extends _MatSliderMixinBase
    */
   @Input()
   get tickInterval() { return this._tickInterval; }
-  set tickInterval(value) {
+  set tickInterval(value: 'auto' | number) {
     if (value === 'auto') {
       this._tickInterval = 'auto';
     } else if (typeof value === 'number' || typeof value === 'string') {
@@ -267,7 +267,7 @@ export class MatSlider extends _MatSliderMixinBase
   onTouched: () => any = () => {};
 
   /** The percentage of the slider that coincides with the value. */
-  get percent() { return this._clamp(this._percent); }
+  get percent(): number { return this._clamp(this._percent); }
   private _percent: number = 0;
 
   /**
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 6fc6c9a147b9..2372fce93726 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -99,7 +99,8 @@ export class MatSnackBar {
    * @param action The label for the snackbar action.
    * @param config Additional configuration options for the snackbar.
    */
-  open(message: string, action = '', config?: MatSnackBarConfig): MatSnackBarRef<SimpleSnackBar> {
+  open(message: string, action: string = '', config?: MatSnackBarConfig):
+      MatSnackBarRef<SimpleSnackBar> {
     const _config = _applyConfigDefaults(config);
 
     // Since the user doesn't have access to the component, we can
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index ea8ee5082462..deffa25850c1 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -109,7 +109,7 @@ export class MatSortHeader implements MatSortable {
 
   /** Overrides the disable clear value of the containing MatSort for this MatSortable. */
   @Input()
-  get disableClear() { return this._disableClear; }
+  get disableClear(): boolean { return this._disableClear; }
   set disableClear(v) { this._disableClear = coerceBooleanProperty(v); }
   private _disableClear: boolean;
 
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index c9b1225f71b2..890141646610 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -60,7 +60,7 @@ export class MatSort {
    */
   @Input('matSortDisableClear')
   get disableClear() { return this._disableClear; }
-  set disableClear(v) { this._disableClear = coerceBooleanProperty(v); }
+  set disableClear(v: boolean) { this._disableClear = coerceBooleanProperty(v); }
   private _disableClear: boolean;
 
   /** Event emitted when the user changes either the active sort or sort direction. */
diff --git a/tools/dgeni/common/decorators.ts b/tools/dgeni/common/decorators.ts
new file mode 100644
index 000000000000..1ac08d1e3e28
--- /dev/null
+++ b/tools/dgeni/common/decorators.ts
@@ -0,0 +1,114 @@
+/**
+ * We want to avoid emitting selectors that are deprecated but don't have a way to mark
+ * them as such in the source code. Thus, we maintain a separate blacklist of selectors
+ * that should not be emitted in the documentation.
+ */
+import {ClassExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassExportDoc';
+import {PropertyMemberDoc} from 'dgeni-packages/typescript/api-doc-types/PropertyMemberDoc';
+import {MemberDoc} from 'dgeni-packages/typescript/api-doc-types/MemberDoc';
+
+const SELECTOR_BLACKLIST = new Set([
+  '[portal]',
+  '[portalHost]',
+  'textarea[mat-autosize]',
+  '[overlay-origin]',
+  '[connected-overlay]',
+]);
+
+export function isMethod(doc: MemberDoc) {
+  return doc.hasOwnProperty('parameters') && !doc.isGetAccessor && !doc.isSetAccessor;
+}
+
+export function isGenericTypeParameter(doc: MemberDoc) {
+  if (doc.containerDoc instanceof ClassExportDoc) {
+    return doc.containerDoc.typeParams && `<${doc.name}>` === doc.containerDoc.typeParams;
+  }
+  return false;
+}
+
+export function isProperty(doc: MemberDoc) {
+  if (doc instanceof PropertyMemberDoc ||
+      // The latest Dgeni version no longer treats getters or setters as properties.
+      // From a user perspective, these are still properties and should be handled the same
+      // way as normal properties.
+      (!isMethod(doc) && (doc.isGetAccessor || doc.isSetAccessor))) {
+    return !isGenericTypeParameter(doc);
+  }
+  return false;
+}
+
+export function isDirective(doc: ClassExportDoc) {
+  return hasClassDecorator(doc, 'Component') || hasClassDecorator(doc, 'Directive');
+}
+
+export function isService(doc: ClassExportDoc) {
+  return hasClassDecorator(doc, 'Injectable');
+}
+
+export function isNgModule(doc: ClassExportDoc) {
+  return hasClassDecorator(doc, 'NgModule');
+}
+
+export function isDirectiveOutput(doc: PropertyMemberDoc) {
+  return hasMemberDecorator(doc, 'Output');
+}
+
+export function isDirectiveInput(doc: PropertyMemberDoc) {
+  return hasMemberDecorator(doc, 'Input');
+}
+
+export function isDeprecatedDoc(doc: any) {
+  return (doc.tags && doc.tags.tags || []).some((tag: any) => tag.tagName === 'deprecated');
+}
+
+export function getDirectiveInputAlias(doc: PropertyMemberDoc) {
+  return isDirectiveInput(doc) ? doc.decorators!.find(d => d.name == 'Input')!.arguments![0] : '';
+}
+
+export function getDirectiveOutputAlias(doc: PropertyMemberDoc) {
+  return isDirectiveOutput(doc) ? doc.decorators!.find(d => d.name == 'Output')!.arguments![0] : '';
+}
+
+export function getDirectiveSelectors(classDoc: ClassExportDoc) {
+  const directiveSelectors = getMetadataProperty(classDoc, 'selector');
+
+  if (directiveSelectors) {
+    // Filter blacklisted selectors and remove line-breaks in resolved selectors.
+    return directiveSelectors.replace(/[\r\n]/g, '').split(/\s*,\s*/)
+      .filter(s => s !== '' && !s.includes('md') && !SELECTOR_BLACKLIST.has(s));
+  }
+}
+
+export function getMetadataProperty(doc: ClassExportDoc, property: string) {
+  const metadata = doc.decorators!
+    .find(d => d.name === 'Component' || d.name === 'Directive')!.arguments![0];
+
+  // Use a Regex to determine the given metadata property. This is necessary, because we can't
+  // parse the JSON due to environment variables inside of the JSON (e.g module.id)
+  const matches = new RegExp(`${property}s*:\\s*(?:"|'|\`)((?:.|\\n|\\r)+?)(?:"|'|\`)`)
+    .exec(metadata);
+
+  return matches && matches[1].trim();
+}
+
+export function hasMemberDecorator(doc: MemberDoc, decoratorName: string) {
+  return doc.docType == 'member' && hasDecorator(doc, decoratorName);
+}
+
+export function hasClassDecorator(doc: ClassExportDoc, decoratorName: string) {
+  return doc.docType == 'class' && hasDecorator(doc, decoratorName);
+}
+
+export function hasDecorator(doc: {decorators?: {name: string}[]}, decoratorName: string) {
+  return !!doc.decorators &&
+    doc.decorators.length > 0 &&
+    doc.decorators.some(d => d.name == decoratorName);
+}
+
+/**
+ * Decorates public exposed docs. Creates a property on the doc that indicates whether
+ * the item is deprecated or not.
+ **/
+export function decorateDeprecatedDoc(doc: {isDeprecated: boolean}) {
+  doc.isDeprecated = isDeprecatedDoc(doc);
+}
diff --git a/tools/dgeni/common/dgeni-accessors-parse.ts b/tools/dgeni/common/dgeni-accessors-parse.ts
new file mode 100644
index 000000000000..6cd4d8abd8fb
--- /dev/null
+++ b/tools/dgeni/common/dgeni-accessors-parse.ts
@@ -0,0 +1,62 @@
+import {getTypeText} from 'dgeni-packages/typescript/services/TsParser/getTypeText';
+import {getDecorators} from 'dgeni-packages/typescript/services/TsParser/getDecorators';
+import {
+  ClassDeclaration,
+  SyntaxKind,
+  GetAccessorDeclaration,
+  SetAccessorDeclaration,
+  Symbol,
+  displayPartsToString
+} from 'typescript';
+import {CategorizedPropertyMemberDoc} from '../processors/categorizer';
+
+/**
+ * Accessors are not being parsed properly within the latest Dgeni-packages version.
+ * This function re-analyzes the accessors and resolves the necessary API docs information.
+ * See: https://github.com/angular/dgeni-packages/issues/246
+ */
+export function dgeniAccessorsParse(propertyDoc: CategorizedPropertyMemberDoc) {
+  if ((propertyDoc.isGetAccessor || propertyDoc.isSetAccessor) && !propertyDoc.type) {
+    const classDeclaration = propertyDoc.containerDoc.symbol.valueDeclaration as ClassDeclaration;
+
+    // Walk through every TypeScript member node of the class declaration and filter for accessors
+    // with a name that match the current property member. For accessors there may be two
+    // declarations with the same name but with different type information.
+    classDeclaration.members
+      .filter((member: any) => member.kind === SyntaxKind.GetAccessor ||
+        member.kind === SyntaxKind.SetAccessor)
+      .filter((member: any) => member.name && member.name.text === propertyDoc.name)
+      .forEach((member: GetAccessorDeclaration|SetAccessorDeclaration) => {
+        if (member.type) {
+          // If there is a type specified for the current member, then this node is a getter
+          // declaration and its type describes the property.
+          propertyDoc.type = getTypeText(member.type, []);
+          propertyDoc.decorators = getDecorators(member);
+        } else if (member.parameters.length === 1 && member.parameters[0].type) {
+          const type = member.parameters[0].type;
+
+          // If there is a type specified for the first parameter of the property, then this
+          // can be considered a setter and the type of the parameter would describe the actual
+          // property. Transforming the type node to a string is done by the `getTypeText` function
+          // from Dgeni Packages.
+          if (type) {
+            propertyDoc.type = getTypeText(type, []);
+            propertyDoc.decorators = getDecorators(member);
+          }
+        }
+
+        // If the current property document doesn't have any description set and the current
+        // TypeScript has a symbol from the TypeChecker, we can try to find a documentation
+        // comment on that symbol.
+        if (!propertyDoc.description && (member as any).symbol) {
+          const memberSymbol = (member as any).symbol as Symbol;
+          propertyDoc.description = displayPartsToString(memberSymbol.getDocumentationComment());
+        }
+      });
+
+    if (!propertyDoc.type) {
+      console.warn(`Could not find type information for property "${propertyDoc.name}" in ` +
+        `${propertyDoc.fileInfo.relativePath}:${propertyDoc.startingLine}`);
+    }
+  }
+}
diff --git a/tools/dgeni/common/normalize-method-parameters.ts b/tools/dgeni/common/normalize-method-parameters.ts
new file mode 100644
index 000000000000..ba02507aeb2e
--- /dev/null
+++ b/tools/dgeni/common/normalize-method-parameters.ts
@@ -0,0 +1,59 @@
+import {MethodMemberDoc} from 'dgeni-packages/typescript/api-doc-types/MethodMemberDoc';
+
+export class NormalizedMethodMemberDoc extends MethodMemberDoc {
+  params?: MethodParameterInfo[];
+}
+
+export interface MethodParameterInfo {
+  name: string;
+  type: string;
+  isOptional: boolean;
+}
+
+/**
+ * The `parameters` property are the parameters extracted from TypeScript and are strings
+ * of the form "propertyName: propertyType" (literally what's written in the source).
+ *
+ * The `params` property is pulled from the `@param` JsDoc tag. We need to merge
+ * the information of these to get name + type + description.
+ *
+ * We will use the `params` property to store the final normalized form since it is already
+ * an object.
+ */
+export function normalizeMethodParameters(method: NormalizedMethodMemberDoc) {
+  if (method.parameters) {
+    method.parameters.forEach(parameter => {
+      let [parameterName, parameterType] = parameter.split(':');
+
+      // If the parameter is optional, the name here will contain a '?'. We store whether the
+      // parameter is optional and remove the '?' for comparison.
+      let isOptional = false;
+      if (parameterName.includes('?')) {
+        isOptional = true;
+        parameterName = parameterName.replace('?', '');
+      }
+
+      if (!method.params) {
+        method.params = [];
+      }
+
+      const hasExistingParameterInfo = method.params.some(p => p.name == parameterName);
+
+      if (!hasExistingParameterInfo) {
+        if (!parameterType) {
+          console.warn(`Missing parameter type information (${parameterName}) in ` +
+              `${method.fileInfo.relativePath}:${method.startingLine}`);
+          return;
+        }
+
+        const newParameterInfo = {
+          name: parameterName,
+          type: parameterType.trim(),
+          isOptional: isOptional
+        };
+
+        method.params.push(newParameterInfo);
+      }
+    });
+  }
+}
diff --git a/tools/dgeni/common/sort-members.ts b/tools/dgeni/common/sort-members.ts
new file mode 100644
index 000000000000..8e0a01d117e8
--- /dev/null
+++ b/tools/dgeni/common/sort-members.ts
@@ -0,0 +1,39 @@
+import {CategorizedMethodMemberDoc, CategorizedPropertyMemberDoc} from '../processors/categorizer';
+import {isDirectiveInput, isDirectiveOutput} from './decorators';
+
+/** Combined type for a categorized method member document. */
+type CategorizedMemberDoc = CategorizedMethodMemberDoc | CategorizedPropertyMemberDoc;
+
+/** Sorts members by deprecated status, member decorator, and name. */
+export function sortCategorizedMembers(docA: CategorizedMemberDoc, docB: CategorizedMemberDoc) {
+  // Sort deprecated docs to the end
+  if (!docA.isDeprecated && docB.isDeprecated) {
+    return -1;
+  }
+
+  if (docA.isDeprecated && !docB.isDeprecated) {
+    return 1;
+  }
+
+  // Sort in the order of: Inputs, Outputs, neither
+  if ((isDirectiveInput(docA) && !isDirectiveInput(docB)) ||
+    (isDirectiveOutput(docA) && !isDirectiveInput(docB) && !isDirectiveOutput(docB))) {
+    return -1;
+  }
+
+  if ((isDirectiveInput(docB) && !isDirectiveInput(docA)) ||
+    (isDirectiveOutput(docB) && !isDirectiveInput(docA) && !isDirectiveOutput(docA))) {
+    return 1;
+  }
+
+  // Break ties by sorting alphabetically on the name
+  if (docA.name < docB.name) {
+    return -1;
+  }
+
+  if (docA.name > docB.name) {
+    return 1;
+  }
+
+  return 0;
+}
diff --git a/tools/dgeni/index.js b/tools/dgeni/index.ts
similarity index 62%
rename from tools/dgeni/index.js
rename to tools/dgeni/index.ts
index 340a55cd6b2b..8688a1f10859 100644
--- a/tools/dgeni/index.js
+++ b/tools/dgeni/index.ts
@@ -1,14 +1,17 @@
-const path = require('path');
-const fs = require('fs');
-const Dgeni = require('dgeni');
-const DgeniPackage = Dgeni.Package;
-
-// dgeni packages
+import {Package} from 'dgeni';
+import {DocsPrivateFilter} from './processors/docs-private-filter';
+import {Categorizer} from './processors/categorizer';
+import {ComponentGrouper} from './processors/component-grouper';
+import {ReadTypeScriptModules} from 'dgeni-packages/typescript/processors/readTypeScriptModules';
+import {TsParser} from 'dgeni-packages/typescript/services/TsParser';
+import {sync as globSync} from 'glob';
+import * as path from 'path';
+
+// Dgeni packages
 const jsdocPackage = require('dgeni-packages/jsdoc');
 const nunjucksPackage = require('dgeni-packages/nunjucks');
 const typescriptPackage = require('dgeni-packages/typescript');
 
-
 // Project configuration.
 const projectRootDir = path.resolve(__dirname, '../..');
 const sourceDir = path.resolve(projectRootDir, 'src');
@@ -33,106 +36,79 @@ const dgeniPackageDeps = [
   typescriptPackage,
 ];
 
-let apiDocsPackage = new DgeniPackage('material2-api-docs', dgeniPackageDeps)
+/** List of CDK packages that need to be documented. */
+const cdkPackages = globSync(path.join(sourceDir, 'cdk', '*/'))
+  .filter(packagePath => !packagePath.endsWith('testing/'))
+  .map(packagePath => path.basename(packagePath));
+
+/** List of Material packages that need to be documented. */
+const materialPackages = globSync(path.join(sourceDir, 'lib', '*/'))
+  .map(packagePath => path.basename(packagePath));
+
+export const apiDocsPackage = new Package('material2-api-docs', dgeniPackageDeps);
+
 
 // Processor that filters out symbols that should not be shown in the docs.
-.processor(require('./processors/docs-private-filter'))
+apiDocsPackage.processor(new DocsPrivateFilter());
 
 // Processor that appends categorization flags to the docs, e.g. `isDirective`, `isNgModule`, etc.
-.processor(require('./processors/categorizer'))
+apiDocsPackage.processor(new Categorizer());
 
 // Processor to group components into top-level groups such as "Tabs", "Sidenav", etc.
-.processor(require('./processors/component-grouper'))
+apiDocsPackage.processor(new ComponentGrouper());
 
-.config(function(log) {
-  log.level = 'info';
-})
+// Configure the log level of the API docs dgeni package.
+apiDocsPackage.config((log: any) => log.level = 'info');
 
 // Configure the processor for reading files from the file system.
-.config(function(readFilesProcessor, writeFilesProcessor) {
+apiDocsPackage.config((readFilesProcessor: any, writeFilesProcessor: any) => {
   readFilesProcessor.basePath = sourceDir;
   readFilesProcessor.$enabled = false; // disable for now as we are using readTypeScriptModules
 
   writeFilesProcessor.outputFolder = outputDir;
-})
+});
 
 // Configure the output path for written files (i.e., file names).
-.config(function(computePathsProcessor) {
+apiDocsPackage.config((computePathsProcessor: any) => {
   computePathsProcessor.pathTemplates = [{
     docTypes: ['componentGroup'],
     pathTemplate: '${name}',
     outputPathTemplate: '${name}.html',
   }];
-})
+});
 
 // Configure custom JsDoc tags.
-.config(function(parseTagsProcessor) {
+apiDocsPackage.config((parseTagsProcessor: any) => {
   parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions.concat([
     {name: 'docs-private'}
   ]);
-})
+});
 
 // Configure the processor for understanding TypeScript.
-.config(function(readTypeScriptModules) {
-  console.log(sourceDir);
+apiDocsPackage.config((readTypeScriptModules: ReadTypeScriptModules, tsParser: TsParser) => {
   readTypeScriptModules.basePath = sourceDir;
   readTypeScriptModules.ignoreExportsMatching = [/^_/];
   readTypeScriptModules.hidePrivateMembers = true;
 
+  const typescriptPathMap: any = {};
+
+  cdkPackages.forEach(packageName => {
+    typescriptPathMap[`@angular/cdk/${packageName}`] = [`./cdk/${packageName}/index.ts`];
+  });
+
+  tsParser.options.baseUrl = sourceDir;
+  tsParser.options.paths = typescriptPathMap;
+
   // Entry points for docs generation. All publically exported symbols found through these
   // files will have docs generated.
   readTypeScriptModules.sourceFiles = [
-    // @angular/cdk
-    'cdk/a11y/index.ts',
-    'cdk/bidi/index.ts',
-    'cdk/coercion/index.ts',
-    'cdk/collections/index.ts',
-    'cdk/keycodes/index.ts',
-    'cdk/layout/index.ts',
-    'cdk/overlay/index.ts',
-    'cdk/platform/index.ts',
-    'cdk/portal/index.ts',
-    'cdk/rxjs/index.ts',
-    'cdk/scrolling/index.ts',
-    'cdk/table/index.ts',
-
-    // @angular/material
-    'lib/autocomplete/index.ts',
-    'lib/button/index.ts',
-    'lib/button-toggle/index.ts',
-    'lib/card/index.ts',
-    'lib/checkbox/index.ts',
-    'lib/chips/index.ts',
-    'lib/core/index.ts',
-    'lib/datepicker/index.ts',
-    'lib/dialog/index.ts',
-    'lib/expansion/index.ts',
-    'lib/grid-list/index.ts',
-    'lib/icon/index.ts',
-    'lib/input/index.ts',
-    'lib/list/index.ts',
-    'lib/menu/index.ts',
-    'lib/paginator/index.ts',
-    'lib/progress-bar/index.ts',
-    'lib/progress-spinner/index.ts',
-    'lib/radio/index.ts',
-    'lib/select/index.ts',
-    'lib/sidenav/index.ts',
-    'lib/slide-toggle/index.ts',
-    'lib/slider/index.ts',
-    'lib/snack-bar/index.ts',
-    'lib/sort/index.ts',
-    'lib/stepper/index.ts',
-    'lib/table/index.ts',
-    'lib/tabs/index.ts',
-    'lib/toolbar/index.ts',
-    'lib/tooltip/index.ts',
+    ...cdkPackages.map(packageName => `./cdk/${packageName}/index.ts`),
+    ...materialPackages.map(packageName => `./lib/${packageName}/index.ts`)
   ];
-})
-
+});
 
 // Configure processor for finding nunjucks templates.
-.config(function(templateFinder, templateEngine) {
+apiDocsPackage.config((templateFinder: any, templateEngine: any) => {
   // Where to find the templates for the doc rendering
   templateFinder.templateFolders = [templateDir];
 
@@ -160,6 +136,3 @@ let apiDocsPackage = new DgeniPackage('material2-api-docs', dgeniPackageDeps)
     variableEnd: '$}'
   };
 });
-
-
-module.exports = apiDocsPackage;
diff --git a/tools/dgeni/processors/categorizer.js b/tools/dgeni/processors/categorizer.js
deleted file mode 100644
index 5253cd174b3c..000000000000
--- a/tools/dgeni/processors/categorizer.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * We want to avoid emitting selectors that are deprecated but don't have a way to mark
- * them as such in the source code. Thus, we maintain a separate blacklist of selectors
- * that should not be emitted in the documentation.
- */
-const SELECTOR_BLACKLIST  = new Set([
-  '[portal]',
-  '[portalHost]',
-  'textarea[mat-autosize]',
-  '[overlay-origin]',
-  '[connected-overlay]',
-]);
-
-/**
- * Processor to add properties to docs objects.
- *
- * isMethod     | Whether the doc is for a method on a class.
- * isDirective  | Whether the doc is for a @Component or a @Directive
- * isService    | Whether the doc is for an @Injectable
- * isNgModule   | Whether the doc is for an NgModule
- */
-module.exports = function categorizer() {
-  return {
-    $runBefore: ['docs-processed'],
-    $process: function (docs) {
-      docs.filter(doc => doc.docType === 'class').forEach(doc => decorateClassDoc(doc));
-    }
-  };
-
-  /**
-   * Decorates all class docs inside of the dgeni pipeline.
-   * - Methods and properties of a class-doc will be extracted into separate variables.
-   * - Identifies directives, services or NgModules and marks them them in class-doc.
-   */
-  function decorateClassDoc(classDoc) {
-    // Resolve all methods and properties from the classDoc.
-    classDoc.methods = classDoc.members.filter(isMethod).filter(filterDuplicateMembers);
-    classDoc.properties = classDoc.members.filter(isProperty).filter(filterDuplicateMembers);
-
-    // Call decorate hooks that can modify the method and property docs.
-    classDoc.methods.forEach(doc => decorateMethodDoc(doc));
-    classDoc.properties.forEach(doc => decoratePropertyDoc(doc));
-
-    decoratePublicDoc(classDoc);
-
-    // Sort members
-    classDoc.methods.sort(sortMembers);
-    classDoc.properties.sort(sortMembers);
-
-    // Categorize the current visited classDoc into its Angular type.
-    if (isDirective(classDoc)) {
-      classDoc.isDirective = true;
-      classDoc.directiveExportAs = getMetadataProperty(classDoc, 'exportAs');
-      classDoc.directiveSelectors =  getDirectiveSelectors(classDoc);
-    } else if (isService(classDoc)) {
-      classDoc.isService = true;
-    } else if (isNgModule(classDoc)) {
-      classDoc.isNgModule = true;
-    }
-  }
-
-  /**
-   * Method that will be called for each method doc. The parameters for the method-docs
-   * will be normalized, so that they can be easily used inside of dgeni templates.
-   */
-  function decorateMethodDoc(methodDoc) {
-    normalizeMethodParameters(methodDoc);
-    decoratePublicDoc(methodDoc);
-
-    // Mark methods with a `void` return type so we can omit show the return type in the docs.
-    methodDoc.showReturns = methodDoc.returnType && methodDoc.returnType !== 'void';
-  }
-
-  /**
-   * Method that will be called for each property doc. Properties that are Angular inputs or
-   * outputs will be marked. Aliases for the inputs or outputs will be stored as well.
-   */
-  function decoratePropertyDoc(propertyDoc) {
-    decoratePublicDoc(propertyDoc);
-
-    propertyDoc.isDirectiveInput = isDirectiveInput(propertyDoc);
-    propertyDoc.directiveInputAlias = getDirectiveInputAlias(propertyDoc);
-
-    propertyDoc.isDirectiveOutput = isDirectiveOutput(propertyDoc);
-    propertyDoc.directiveOutputAlias = getDirectiveOutputAlias(propertyDoc);
-  }
-
-  /**
-   * Decorates public exposed docs. Creates a property on the doc that indicates whether
-   * the item is deprecated or not.
-   **/
-  function decoratePublicDoc(doc) {
-    doc.isDeprecated = isDeprecatedDoc(doc);
-  }
-};
-
-/** Filters any duplicate classDoc members from an array */
-function filterDuplicateMembers(item, _index, array) {
-  return array.filter((memberDoc, i) => memberDoc.name === item.name)[0] === item;
-}
-
-/** Sorts members by deprecated status, member decorator, and name. */
-function sortMembers(docA, docB) {
-  // Sort deprecated docs to the end
-  if (!docA.isDeprecated && docB.isDeprecated) {
-    return -1;
-  }
-
-  if (docA.isDeprecated && !docB.isDeprecated) {
-    return 1;
-  }
-
-  // Sort in the order of: Inputs, Outputs, neither
-  if ((isDirectiveInput(docA) && !isDirectiveInput(docB)) ||
-      (isDirectiveOutput(docA) && !isDirectiveInput(docB) && !isDirectiveOutput(docB))) {
-    return -1;
-  }
-
-  if ((isDirectiveInput(docB) && !isDirectiveInput(docA)) ||
-      (isDirectiveOutput(docB) && !isDirectiveInput(docA) && !isDirectiveOutput(docA))) {
-    return 1;
-  }
-
-  // Break ties by sorting alphabetically on the name
-  if (docA.name < docB.name) {
-    return -1;
-  }
-
-  if (docA.name > docB.name) {
-    return 1;
-  }
-
-  return 0;
-}
-
-/**
- * The `parameters` property are the parameters extracted from TypeScript and are strings
- * of the form "propertyName: propertyType" (literally what's written in the source).
- *
- * The `params` property is pulled from the `@param` JsDoc tag. We need to merge
- * the information of these to get name + type + description.
- *
- * We will use the `params` property to store the final normalized form since it is already
- * an object.
- */
-function normalizeMethodParameters(method) {
-  if (method.parameters) {
-    method.parameters.forEach(parameter => {
-      let [parameterName, parameterType] = parameter.split(':');
-
-      // If the parameter is optional, the name here will contain a '?'. We store whether the
-      // parameter is optional and remove the '?' for comparison.
-      let isOptional = false;
-      if (parameterName.includes('?')) {
-        isOptional = true;
-        parameterName = parameterName.replace('?', '');
-      }
-
-      if (!method.params) {
-        method.params = [];
-      }
-
-      let jsDocParam = method.params.find(p => p.name == parameterName);
-
-      if (!jsDocParam) {
-        jsDocParam = {name: parameterName};
-        method.params.push(jsDocParam);
-      }
-
-      jsDocParam.type = parameterType.trim();
-      jsDocParam.isOptional = isOptional;
-    });
-  }
-}
-
-function isMethod(doc) {
-  return doc.hasOwnProperty('parameters');
-}
-
-function isGenericTypeParameter(doc) {
-  return doc.classDoc.typeParams && `<${doc.name}>` === doc.classDoc.typeParams;
-}
-
-function isProperty(doc) {
-  return doc.docType === 'member' && !isMethod(doc) && !isGenericTypeParameter(doc);
-}
-
-function isDirective(doc) {
-  return hasClassDecorator(doc, 'Component') || hasClassDecorator(doc, 'Directive');
-}
-
-function isService(doc) {
-  return hasClassDecorator(doc, 'Injectable')
-}
-
-function isNgModule(doc) {
-  return hasClassDecorator(doc, 'NgModule');
-}
-
-function isDirectiveOutput(doc) {
-  return hasMemberDecorator(doc, 'Output');
-}
-
-function isDirectiveInput(doc) {
-  return hasMemberDecorator(doc, 'Input');
-}
-
-function isDeprecatedDoc(doc) {
-  return (doc.tags && doc.tags.tags || []).some(tag => tag.tagName === 'deprecated');
-}
-
-function getDirectiveInputAlias(doc) {
-  return isDirectiveInput(doc) ? doc.decorators.find(d => d.name == 'Input').arguments[0] : '';
-}
-
-function getDirectiveOutputAlias(doc) {
-  return isDirectiveOutput(doc) ? doc.decorators.find(d => d.name == 'Output').arguments[0] : '';
-}
-
-function getDirectiveSelectors(classDoc) {
-  const directiveSelectors = getMetadataProperty(classDoc, 'selector');
-
-
-  if (directiveSelectors) {
-    // Filter blacklisted selectors and remove line-breaks in resolved selectors.
-    return directiveSelectors.replace(/[\r\n]/g, '').split(/\s*,\s*/)
-      .filter(s => s !== '' && !s.includes('md') && !SELECTOR_BLACKLIST.has(s));
-  }
-}
-
-function getMetadataProperty(doc, property) {
-  const metadata = doc.decorators
-    .find(d => d.name === 'Component' || d.name === 'Directive').arguments[0];
-
-  // Use a Regex to determine the given metadata property. This is necessary, because we can't
-  // parse the JSON due to environment variables inside of the JSON (e.g module.id)
-  let matches = new RegExp(`${property}s*:\\s*(?:"|'|\`)((?:.|\\n|\\r)+?)(?:"|'|\`)`)
-    .exec(metadata);
-
-  return matches && matches[1].trim();
-}
-
-function hasMemberDecorator(doc, decoratorName) {
-  return doc.docType == 'member' && hasDecorator(doc, decoratorName);
-}
-
-function hasClassDecorator(doc, decoratorName) {
-  return doc.docType == 'class' && hasDecorator(doc, decoratorName);
-}
-
-function hasDecorator(doc, decoratorName) {
-  return doc.decorators &&
-      doc.decorators.length &&
-      doc.decorators.some(d => d.name == decoratorName);
-}
diff --git a/tools/dgeni/processors/categorizer.ts b/tools/dgeni/processors/categorizer.ts
new file mode 100644
index 000000000000..b2719d6521f3
--- /dev/null
+++ b/tools/dgeni/processors/categorizer.ts
@@ -0,0 +1,135 @@
+import {Processor, DocCollection} from 'dgeni';
+import {ClassExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassExportDoc';
+import {PropertyMemberDoc} from 'dgeni-packages/typescript/api-doc-types/PropertyMemberDoc';
+import {
+  NormalizedMethodMemberDoc,
+  normalizeMethodParameters
+} from '../common/normalize-method-parameters';
+import {
+  decorateDeprecatedDoc,
+  getDirectiveInputAlias,
+  getDirectiveOutputAlias,
+  getDirectiveSelectors,
+  getMetadataProperty,
+  isDirective,
+  isDirectiveInput,
+  isDirectiveOutput,
+  isMethod,
+  isNgModule,
+  isProperty,
+  isService
+} from '../common/decorators';
+import {MethodMemberDoc} from 'dgeni-packages/typescript/api-doc-types/MethodMemberDoc';
+import {dgeniAccessorsParse} from '../common/dgeni-accessors-parse';
+import {sortCategorizedMembers} from '../common/sort-members';
+
+export interface CategorizedClassDoc extends ClassExportDoc {
+  methods: CategorizedMethodMemberDoc[];
+  properties: CategorizedPropertyMemberDoc[];
+  isDirective: boolean;
+  isService: boolean;
+  isNgModule: boolean;
+  isDeprecated: boolean;
+  directiveExportAs?: string | null;
+  directiveSelectors?: string[];
+}
+
+export interface CategorizedPropertyMemberDoc extends PropertyMemberDoc {
+  description: string;
+  isDeprecated: boolean;
+  isDirectiveInput: boolean;
+  isDirectiveOutput: boolean;
+  directiveInputAlias: string;
+  directiveOutputAlias: string;
+}
+
+export interface CategorizedMethodMemberDoc extends NormalizedMethodMemberDoc {
+  showReturns: boolean;
+  isDeprecated: boolean;
+}
+
+/**
+ * Processor to add properties to docs objects.
+ *
+ * isMethod     | Whether the doc is for a method on a class.
+ * isDirective  | Whether the doc is for a @Component or a @Directive
+ * isService    | Whether the doc is for an @Injectable
+ * isNgModule   | Whether the doc is for an NgModule
+ */
+export class Categorizer implements Processor {
+  name = 'categorizer';
+  $runBefore = ['docs-processed'];
+
+  $process(docs: DocCollection) {
+    docs.filter(doc => doc.docType === 'class').forEach(doc => this.decorateClassDoc(doc));
+  }
+
+  /**
+   * Decorates all class docs inside of the dgeni pipeline.
+   * - Methods and properties of a class-doc will be extracted into separate variables.
+   * - Identifies directives, services or NgModules and marks them them in class-doc.
+   */
+  private decorateClassDoc(classDoc: CategorizedClassDoc) {
+    // Resolve all methods and properties from the classDoc.
+    classDoc.methods = classDoc.members
+      .filter(isMethod)
+      .filter(filterDuplicateMembers) as CategorizedMethodMemberDoc[];
+
+    classDoc.properties = classDoc.members
+      .filter(isProperty)
+      .filter(filterDuplicateMembers) as CategorizedPropertyMemberDoc[];
+
+    // Call decorate hooks that can modify the method and property docs.
+    classDoc.methods.forEach(doc => this.decorateMethodDoc(doc));
+    classDoc.properties.forEach(doc => this.decoratePropertyDoc(doc));
+
+    decorateDeprecatedDoc(classDoc);
+
+    // Sort members
+    classDoc.methods.sort(sortCategorizedMembers);
+    classDoc.properties.sort(sortCategorizedMembers);
+
+    // Categorize the current visited classDoc into its Angular type.
+    if (isDirective(classDoc)) {
+      classDoc.isDirective = true;
+      classDoc.directiveExportAs = getMetadataProperty(classDoc, 'exportAs');
+      classDoc.directiveSelectors =  getDirectiveSelectors(classDoc);
+    } else if (isService(classDoc)) {
+      classDoc.isService = true;
+    } else if (isNgModule(classDoc)) {
+      classDoc.isNgModule = true;
+    }
+  }
+
+  /**
+   * Method that will be called for each method doc. The parameters for the method-docs
+   * will be normalized, so that they can be easily used inside of dgeni templates.
+   */
+  private decorateMethodDoc(methodDoc: CategorizedMethodMemberDoc) {
+    normalizeMethodParameters(methodDoc);
+    decorateDeprecatedDoc(methodDoc);
+
+    // Mark methods with a `void` return type so we can omit show the return type in the docs.
+    methodDoc.showReturns = methodDoc.type ? methodDoc.type !== 'void' : false;
+  }
+
+  /**
+   * Method that will be called for each property doc. Properties that are Angular inputs or
+   * outputs will be marked. Aliases for the inputs or outputs will be stored as well.
+   */
+  private decoratePropertyDoc(propertyDoc: CategorizedPropertyMemberDoc) {
+    decorateDeprecatedDoc(propertyDoc);
+    dgeniAccessorsParse(propertyDoc);
+
+    propertyDoc.isDirectiveInput = isDirectiveInput(propertyDoc);
+    propertyDoc.directiveInputAlias = getDirectiveInputAlias(propertyDoc);
+
+    propertyDoc.isDirectiveOutput = isDirectiveOutput(propertyDoc);
+    propertyDoc.directiveOutputAlias = getDirectiveOutputAlias(propertyDoc);
+  }
+}
+
+/** Filters any duplicate classDoc members from an array */
+function filterDuplicateMembers(item: MethodMemberDoc, _index: number, array: MethodMemberDoc[]) {
+  return array.filter((memberDoc) => memberDoc.name === item.name)[0] === item;
+}
diff --git a/tools/dgeni/processors/component-grouper.js b/tools/dgeni/processors/component-grouper.js
deleted file mode 100644
index 756811117cc1..000000000000
--- a/tools/dgeni/processors/component-grouper.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const path = require('path');
-
-/**
- * Processor to group docs into top-level "Components" WRT material design, e.g., "Button", "Tabs",
- * where each group may conists of several directives and services.
- */
-
-
-/** Component group data structure. */
-class ComponentGroup {
-  constructor(name) {
-    this.name = name;
-    this.id = `component-group-${name}`;
-    this.aliases = [];
-    this.docType = 'componentGroup';
-    this.directives = [];
-    this.services = [];
-    this.additionalClasses = [];
-    this.ngModule = null;
-  }
-}
-
-module.exports = function componentGrouper() {
-  return {
-    $runBefore: ['docs-processed'],
-    $process: function(docs) {
-      // Map of group name to group instance.
-      let groups = new Map();
-
-      docs.forEach(doc => {
-        // Full path to the file for this doc.
-        let basePath = doc.fileInfo.basePath;
-        let filePath = doc.fileInfo.filePath;
-
-        // All of the component documentation is under either `src/lib` or `src/cdk`.
-        // We group the docs up by the directory immediately under that root.
-        let groupName = path.relative(basePath, filePath).split(path.sep)[1];
-
-        // Get the group for this doc, or, if one does not exist, create it.
-        let group;
-        if (groups.has(groupName)) {
-          group = groups.get(groupName);
-        } else {
-          group = new ComponentGroup(groupName);
-          groups.set(groupName, group);
-        }
-
-        // Put this doc into the appropriate list in this group.
-        if (doc.isDirective) {
-          group.directives.push(doc);
-        } else if (doc.isService) {
-          group.services.push(doc);
-        } else if (doc.isNgModule) {
-          group.ngModule = doc;
-        } else if (doc.docType == 'class') {
-          group.additionalClasses.push(doc);
-        }
-      });
-
-      return Array.from(groups.values());
-    }
-  };
-};
-
diff --git a/tools/dgeni/processors/component-grouper.ts b/tools/dgeni/processors/component-grouper.ts
new file mode 100644
index 000000000000..2564ee3e9485
--- /dev/null
+++ b/tools/dgeni/processors/component-grouper.ts
@@ -0,0 +1,88 @@
+import {CategorizedClassDoc} from './categorizer';
+import {DocCollection, Processor} from 'dgeni';
+import * as path from 'path';
+
+/** Component group data structure. */
+export class ComponentGroup {
+
+  /** Name of the component group. */
+  name: string;
+
+  /** Unique id for the component group. */
+  id: string;
+
+  /** Known aliases for the component group. */
+  aliases: string[];
+
+  /** Unique document type for Dgeni. */
+  docType: string;
+
+  /** List of categorized class docs that are defining a directive. */
+  directives: CategorizedClassDoc[];
+
+  /** List of categorized class docs that are defining a service. */
+  services: CategorizedClassDoc[];
+
+  /** Additional classes that belong to the component group. */
+  additionalClasses: CategorizedClassDoc[];
+
+  /** NgModule that defines the current component group. */
+  ngModule: CategorizedClassDoc | null;
+
+  constructor(name: string) {
+    this.name = name;
+    this.id = `component-group-${name}`;
+    this.aliases = [];
+    this.docType = 'componentGroup';
+    this.directives = [];
+    this.services = [];
+    this.additionalClasses = [];
+    this.ngModule = null;
+  }
+}
+
+/**
+ * Processor to group docs into top-level "Components" WRT material design, e.g., "Button", "Tabs",
+ * where each group may conists of several directives and services.
+ */
+export class ComponentGrouper implements Processor {
+  name = 'component-grouper';
+  $runBefore = ['docs-processed'];
+
+  $process(docs: DocCollection) {
+    // Map of group name to group instance.
+    const groups = new Map();
+
+    docs.forEach(doc => {
+      // Full path to the file for this doc.
+      const basePath = doc.fileInfo.basePath;
+      const filePath = doc.fileInfo.filePath;
+
+      // All of the component documentation is under either `src/lib` or `src/cdk`.
+      // We group the docs up by the directory immediately under that root.
+      const groupName = path.relative(basePath, filePath).split(path.sep)[1];
+
+      // Get the group for this doc, or, if one does not exist, create it.
+      let group;
+      if (groups.has(groupName)) {
+        group = groups.get(groupName);
+      } else {
+        group = new ComponentGroup(groupName);
+        groups.set(groupName, group);
+      }
+
+      // Put this doc into the appropriate list in this group.
+      if (doc.isDirective) {
+        group.directives.push(doc);
+      } else if (doc.isService) {
+        group.services.push(doc);
+      } else if (doc.isNgModule) {
+        group.ngModule = doc;
+      } else if (doc.docType == 'class') {
+        group.additionalClasses.push(doc);
+      }
+    });
+
+    return Array.from(groups.values());
+  }
+}
diff --git a/tools/dgeni/processors/docs-private-filter.js b/tools/dgeni/processors/docs-private-filter.js
deleted file mode 100644
index de6458f2afbd..000000000000
--- a/tools/dgeni/processors/docs-private-filter.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Processor to filter out symbols that should not be shown in the Material docs.
- */
-
-const INTERNAL_METHODS = [
-  // Lifecycle methods
-  'ngOnInit',
-  'ngOnChanges',
-  'ngDoCheck',
-  'ngAfterContentInit',
-  'ngAfterContentChecked',
-  'ngAfterViewInit',
-  'ngAfterViewChecked',
-  'ngOnDestroy',
-
-  // ControlValueAccessor methods
-  'writeValue',
-  'registerOnChange',
-  'registerOnTouched',
-  'setDisabledState',
-
-  // Don't ever need to document constructors
-  'constructor',
-
-  // tabIndex exists on all elements, no need to document it
-  'tabIndex',
-];
-
-module.exports = function docsPrivateFilter() {
-  return {
-    $runBefore: ['categorizer'],
-    $process: docs => docs.filter(doc => isPublicDoc(doc))
-  };
-};
-
-function isPublicDoc(doc) {
-  if (hasDocsPrivateTag(doc)) {
-    return false;
-  } else if (doc.docType === 'member') {
-    return !isInternalMember(doc);
-  } else if (doc.docType === 'class') {
-    doc.members = doc.members.filter(memberDoc => isPublicDoc(memberDoc));
-  }
-
-  return true;
-}
-
-function isInternalMember(memberDoc) {
-  return INTERNAL_METHODS.includes(memberDoc.name)
-}
-
-function hasDocsPrivateTag(doc) {
-  let tags = doc.tags && doc.tags.tags;
-  return tags ? tags.find(d => d.tagName == 'docs-private') : false;
-}
diff --git a/tools/dgeni/processors/docs-private-filter.ts b/tools/dgeni/processors/docs-private-filter.ts
new file mode 100644
index 000000000000..69159b587342
--- /dev/null
+++ b/tools/dgeni/processors/docs-private-filter.ts
@@ -0,0 +1,63 @@
+import {DocCollection, Processor} from 'dgeni';
+import {ApiDoc} from 'dgeni-packages/typescript/api-doc-types/ApiDoc';
+import {ClassExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassExportDoc';
+import {MemberDoc} from 'dgeni-packages/typescript/api-doc-types/MemberDoc';
+
+const INTERNAL_METHODS = [
+  // Lifecycle methods
+  'ngOnInit',
+  'ngOnChanges',
+  'ngDoCheck',
+  'ngAfterContentInit',
+  'ngAfterContentChecked',
+  'ngAfterViewInit',
+  'ngAfterViewChecked',
+  'ngOnDestroy',
+
+  // ControlValueAccessor methods
+  'writeValue',
+  'registerOnChange',
+  'registerOnTouched',
+  'setDisabledState',
+
+  // Don't ever need to document constructors
+  'constructor',
+
+  // tabIndex exists on all elements, no need to document it
+  'tabIndex',
+];
+
+/**
+ * Processor to filter out symbols that should not be shown in the Material docs.
+ */
+export class DocsPrivateFilter implements Processor {
+  name = 'docs-private-filter';
+  $runBefore = ['categorizer'];
+
+  $process(docs: DocCollection) {
+    return docs.filter(doc => this.isPublicDoc(doc));
+  }
+
+  /** Marks the given API doc with a property that describes its public state. */
+  private isPublicDoc(doc: ApiDoc) {
+    if (this.hasDocsPrivateTag(doc) || doc.name.startsWith('_')) {
+      return false;
+    } else if (doc instanceof MemberDoc) {
+      return !this.isInternalMember(doc);
+    } else if (doc instanceof ClassExportDoc) {
+      doc.members = doc.members.filter(memberDoc => this.isPublicDoc(memberDoc));
+    }
+    return true;
+  }
+
+  /** Whether the given method member is listed as an internal member. */
+  private isInternalMember(memberDoc: MemberDoc) {
+    return INTERNAL_METHODS.includes(memberDoc.name);
+  }
+
+  /** Whether the given doc has a @docs-private tag set. */
+  private hasDocsPrivateTag(doc: any) {
+    const tags = doc.tags && doc.tags.tags;
+    return tags ? tags.find((d: any) => d.tagName == 'docs-private') : false;
+  }
+}
diff --git a/tools/dgeni/tsconfig.json b/tools/dgeni/tsconfig.json
new file mode 100644
index 000000000000..011fbba8d86c
--- /dev/null
+++ b/tools/dgeni/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "lib": ["es2015", "dom", "es2016.array.include"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/tools/dgeni",
+    "strictNullChecks": true,
+    "noEmitOnError": true,
+    "noImplicitAny": true,
+    "target": "es5",
+    "types": [
+      "node"
+    ]
+  },
+  "files": [
+    "index.ts"
+  ]
+}
diff --git a/tools/gulp/tasks/aot.ts b/tools/gulp/tasks/aot.ts
index 6c78972722f9..aa2bc75c2fba 100644
--- a/tools/gulp/tasks/aot.ts
+++ b/tools/gulp/tasks/aot.ts
@@ -33,7 +33,7 @@ task('aot:copy-release', () => {
       join(releasesDir, 'material-moment-adapter'), join(demoAppOut, 'material-moment-adapter'));
 });
 
-// // As a workaround for https://github.com/angular/angular/issues/12249, we need to
+// As a workaround for https://github.com/angular/angular/issues/12249, we need to
 // copy the demo-app sources to distribution and run the NGC inside of the dist folder.
 task('aot:copy-devapp', () => copySync(demoAppSource, demoAppOut));
 
diff --git a/tools/gulp/tasks/docs.ts b/tools/gulp/tasks/docs.ts
index 8a8ac44a2b10..c87425db2401 100644
--- a/tools/gulp/tasks/docs.ts
+++ b/tools/gulp/tasks/docs.ts
@@ -2,6 +2,7 @@ import {task, src, dest} from 'gulp';
 import {Dgeni} from 'dgeni';
 import * as path from 'path';
 import {buildConfig} from 'material2-build-tools';
+import {apiDocsPackage} from '../../dgeni/index';
 
 // There are no type definitions available for these imports.
 const markdown = require('gulp-markdown');
@@ -123,8 +124,7 @@ task('highlight-examples', () => {
 
 /** Generates API docs from the source JsDoc using dgeni. */
 task('api-docs', () => {
-  const docsPackage = require(path.resolve(__dirname, '../../dgeni'));
-  const docs = new Dgeni([docsPackage]);
+  const docs = new Dgeni([apiDocsPackage]);
   return docs.generate();
 });
 

From 31e97756dd61036c41693cb902af2b7ce1f6ac94 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 4 Oct 2017 23:52:52 +0200
Subject: [PATCH 245/575] fix(): add exportAs to missing components (#7392)

Fixes #7361
---
 src/cdk/observers/observe-content.ts         | 3 ++-
 src/cdk/portal/portal-directives.ts          | 1 +
 src/cdk/stepper/stepper.ts                   | 2 ++
 src/cdk/table/table.ts                       | 1 +
 src/lib/button-toggle/button-toggle.ts       | 1 +
 src/lib/button/button.ts                     | 2 ++
 src/lib/card/card.ts                         | 2 ++
 src/lib/checkbox/checkbox.ts                 | 1 +
 src/lib/chips/chip-input.ts                  | 1 +
 src/lib/core/option/optgroup.ts              | 1 +
 src/lib/core/option/option.ts                | 1 +
 src/lib/datepicker/datepicker.ts             | 1 +
 src/lib/dialog/dialog-content-directives.ts  | 2 ++
 src/lib/expansion/accordion.ts               | 2 ++
 src/lib/expansion/expansion-panel.ts         | 1 +
 src/lib/form-field/form-field.ts             | 1 +
 src/lib/grid-list/grid-list.ts               | 1 +
 src/lib/grid-list/grid-tile.ts               | 1 +
 src/lib/icon/icon.ts                         | 1 +
 src/lib/input/input.ts                       | 1 +
 src/lib/list/list.ts                         | 2 ++
 src/lib/list/selection-list.ts               | 2 ++
 src/lib/menu/menu-item.ts                    | 2 +-
 src/lib/paginator/paginator.ts               | 1 +
 src/lib/progress-bar/progress-bar.ts         | 1 +
 src/lib/progress-spinner/progress-spinner.ts | 1 +
 src/lib/radio/radio.ts                       | 2 ++
 src/lib/select/select.ts                     | 2 +-
 src/lib/sidenav/drawer.ts                    | 2 ++
 src/lib/sidenav/sidenav.ts                   | 2 ++
 src/lib/slider/slider.ts                     | 1 +
 src/lib/stepper/stepper.ts                   | 3 +++
 src/lib/table/row.ts                         | 2 ++
 src/lib/table/table.ts                       | 1 +
 src/lib/tabs/tab-group.ts                    | 1 +
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts      | 2 ++
 src/lib/toolbar/toolbar.ts                   | 2 ++
 src/lib/tooltip/tooltip.ts                   | 2 +-
 38 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index 59dd95ce5aa9..947a1fd2ad24 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -37,7 +37,8 @@ export class MatMutationObserverFactory {
  * its associated element has changed.
  */
 @Directive({
-  selector: '[cdkObserveContent]'
+  selector: '[cdkObserveContent]',
+  exportAs: 'cdkObserveContent',
 })
 export class ObserveContent implements AfterContentInit, OnDestroy {
   private _observer: MutationObserver | null;
diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts
index a0a30560dfba..99fa35bff939 100644
--- a/src/cdk/portal/portal-directives.ts
+++ b/src/cdk/portal/portal-directives.ts
@@ -49,6 +49,7 @@ export class TemplatePortalDirective extends TemplatePortal<any> {
  */
 @Directive({
   selector: '[cdkPortalHost], [portalHost]',
+  exportAs: 'cdkPortalHost',
   inputs: ['portal: cdkPortalHost']
 })
 export class PortalHostDirective extends BasePortalHost implements OnDestroy {
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index d4637008ec1b..8183508376ab 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -59,6 +59,7 @@ export class StepperSelectionEvent {
 @Component({
   moduleId: module.id,
   selector: 'cdk-step',
+  exportAs: 'cdkStep',
   templateUrl: 'step.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
@@ -119,6 +120,7 @@ export class CdkStep {
 
 @Directive({
   selector: '[cdkStepper]',
+  exportAs: 'cdkStepper',
 })
 export class CdkStepper {
   /** The list of step components that the stepper is holding. */
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index e93d64901c53..28ce82d00735 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -75,6 +75,7 @@ export const CDK_TABLE_TEMPLATE = `
 @Component({
   moduleId: module.id,
   selector: 'cdk-table',
+  exportAs: 'cdkTable',
   template: CDK_TABLE_TEMPLATE,
   host: {
     'class': 'cdk-table',
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index b1cc3570151f..d05009344211 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -270,6 +270,7 @@ export class MatButtonToggleGroupMultiple extends _MatButtonToggleGroupMixinBase
   styleUrls: ['button-toggle.css'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  exportAs: 'matButtonToggle',
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {
     '[class.mat-button-toggle-standalone]': '!buttonToggleGroup && !buttonToggleGroupMultiple',
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 3d498f4189c1..13c0fbb4ad5a 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -116,6 +116,7 @@ export const _MatButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(M
   moduleId: module.id,
   selector: `button[mat-button], button[mat-raised-button], button[mat-icon-button],
              button[mat-fab], button[mat-mini-fab]`,
+  exportAs: 'matButton',
   host: {
     '[disabled]': 'disabled || null',
   },
@@ -181,6 +182,7 @@ export class MatButton extends _MatButtonMixinBase
 @Component({
   moduleId: module.id,
   selector: `a[mat-button], a[mat-raised-button], a[mat-icon-button], a[mat-fab], a[mat-mini-fab]`,
+  exportAs: 'matButton, matAnchor',
   host: {
     '[attr.tabindex]': 'disabled ? -1 : 0',
     '[attr.disabled]': 'disabled || null',
diff --git a/src/lib/card/card.ts b/src/lib/card/card.ts
index fc1e7a34ace3..7c39254b93fa 100644
--- a/src/lib/card/card.ts
+++ b/src/lib/card/card.ts
@@ -55,6 +55,7 @@ export class MatCardSubtitle {}
  */
 @Directive({
   selector: 'mat-card-actions',
+  exportAs: 'matCardActions',
   host: {
     'class': 'mat-card-actions',
     '[class.mat-card-actions-align-end]': 'align === "end"',
@@ -150,6 +151,7 @@ export class MatCardAvatar {}
 @Component({
   moduleId: module.id,
   selector: 'mat-card',
+  exportAs: 'matCard',
   templateUrl: 'card.html',
   styleUrls: ['card.css'],
   encapsulation: ViewEncapsulation.None,
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 8fdf69618351..587618eae722 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -98,6 +98,7 @@ export const _MatCheckboxMixinBase =
   selector: 'mat-checkbox',
   templateUrl: 'checkbox.html',
   styleUrls: ['checkbox.css'],
+  exportAs: 'matCheckbox',
   host: {
     'class': 'mat-checkbox',
     '[id]': 'id',
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 8ad69e3a98e0..c186c0905661 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -23,6 +23,7 @@ export interface MatChipInputEvent {
  */
 @Directive({
   selector: 'input[matChipInputFor]',
+  exportAs: 'matChipInput, matChipInputFor',
   host: {
     'class': 'mat-chip-input mat-input-element',
     '(keydown)': '_keydown($event)',
diff --git a/src/lib/core/option/optgroup.ts b/src/lib/core/option/optgroup.ts
index 7315448e8421..0524c384ac3b 100644
--- a/src/lib/core/option/optgroup.ts
+++ b/src/lib/core/option/optgroup.ts
@@ -23,6 +23,7 @@ let _uniqueOptgroupIdCounter = 0;
 @Component({
   moduleId: module.id,
   selector: 'mat-optgroup',
+  exportAs: 'matOptgroup',
   templateUrl: 'optgroup.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index 7303d46d2311..a5fb3be86f51 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -39,6 +39,7 @@ export class MatOptionSelectionChange {
 @Component({
   moduleId: module.id,
   selector: 'mat-option',
+  exportAs: 'matOption',
   host: {
     'role': 'option',
     '[attr.tabindex]': '_getTabIndex()',
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 3b5f783fbb86..0793be2dc4e5 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -120,6 +120,7 @@ export class MatDatepickerContent<D> implements AfterContentInit {
   moduleId: module.id,
   selector: 'mat-datepicker',
   template: '',
+  exportAs: 'matDatepicker',
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
diff --git a/src/lib/dialog/dialog-content-directives.ts b/src/lib/dialog/dialog-content-directives.ts
index 99dd5c900c02..3717cef1449c 100644
--- a/src/lib/dialog/dialog-content-directives.ts
+++ b/src/lib/dialog/dialog-content-directives.ts
@@ -18,6 +18,7 @@ let dialogElementUid = 0;
  */
 @Directive({
   selector: `button[mat-dialog-close], button[matDialogClose]`,
+  exportAs: 'matDialogClose',
   host: {
     '(click)': 'dialogRef.close(dialogResult)',
     '[attr.aria-label]': 'ariaLabel',
@@ -49,6 +50,7 @@ export class MatDialogClose implements OnChanges {
  */
 @Directive({
   selector: '[mat-dialog-title], [matDialogTitle]',
+  exportAs: 'matDialogTitle',
   host: {
     'class': 'mat-dialog-title',
     '[id]': 'id',
diff --git a/src/lib/expansion/accordion.ts b/src/lib/expansion/accordion.ts
index 17c72e0a2831..7c60ff0c5725 100644
--- a/src/lib/expansion/accordion.ts
+++ b/src/lib/expansion/accordion.ts
@@ -20,6 +20,7 @@ let nextId = 0;
  */
 @Directive({
   selector: 'cdk-accordion, [cdk-accordion]',
+  exportAs: 'cdkAccordion',
 })
 export class CdkAccordion {
   /** A readonly id value to use for unique selection coordination. */
@@ -51,6 +52,7 @@ export class CdkAccordion {
  */
 @Directive({
   selector: 'mat-accordion',
+  exportAs: 'matAccordion',
   host: {
     class: 'mat-accordion'
   }
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 2e424a642068..9e81cd921ceb 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -57,6 +57,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
   moduleId: module.id,
   styleUrls: ['./expansion-panel.css'],
   selector: 'mat-expansion-panel',
+  exportAs: 'matExpansionPanel',
   templateUrl: './expansion-panel.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 8b510e6dfd6a..609f2568ce14 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -53,6 +53,7 @@ let nextUniqueId = 0;
   moduleId: module.id,
   // TODO(mmalerba): the input-container selectors and classes are deprecated and will be removed.
   selector: 'mat-input-container, mat-form-field',
+  exportAs: 'matFormField',
   templateUrl: 'form-field.html',
   // MatInput is a directive and can't have styles, so we need to include its styles here.
   // The MatInput styles are fairly minimal so it shouldn't be a big deal for people who
diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
index dbd3b2a74bd2..a961b449d2b1 100644
--- a/src/lib/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -38,6 +38,7 @@ const MAT_FIT_MODE = 'fit';
 @Component({
   moduleId: module.id,
   selector: 'mat-grid-list',
+  exportAs: 'matGridList',
   templateUrl: 'grid-list.html',
   styleUrls: ['grid-list.css'],
   host: {
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index 6cdfd59519ae..a3c48e861517 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -24,6 +24,7 @@ import {coerceToNumber} from './grid-list-measure';
 @Component({
   moduleId: module.id,
   selector: 'mat-grid-tile',
+  exportAs: 'matGridTile',
   host: {
     'class': 'mat-grid-tile',
   },
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index 8f52ee3ba010..f29e96d04ed9 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -62,6 +62,7 @@ export const _MatIconMixinBase = mixinColor(MatIconBase);
   moduleId: module.id,
   template: '<ng-content></ng-content>',
   selector: 'mat-icon',
+  exportAs: 'matIcon',
   styleUrls: ['icon.css'],
   inputs: ['color'],
   host: {
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index b998f29cc841..45b2e40d644e 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -45,6 +45,7 @@ let nextUniqueId = 0;
 /** Directive that allows a native input to work inside a `MatFormField`. */
 @Directive({
   selector: `input[matInput], textarea[matInput]`,
+  exportAs: 'matInput',
   host: {
     'class': 'mat-input-element mat-form-field-autofill-control',
     // Native input properties that are overwritten by Angular inputs need to be synced with
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index ab7d90daa514..6cb85860c0a5 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -46,6 +46,7 @@ export class MatListDivider {}
 @Component({
   moduleId: module.id,
   selector: 'mat-list, mat-nav-list',
+  exportAs: 'matList, matNavList',
   host: {'role': 'list'},
   template: '<ng-content></ng-content>',
   styleUrls: ['list.css'],
@@ -120,6 +121,7 @@ export class MatListSubheaderCssMatStyler {}
 @Component({
   moduleId: module.id,
   selector: 'mat-list-item, a[mat-list-item]',
+  exportAs: 'matListItem',
   host: {
     'role': 'listitem',
     'class': 'mat-list-item',
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index a8357d787e52..a0c4829fa8c6 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -60,6 +60,7 @@ export interface MatSelectionListOptionEvent {
 @Component({
   moduleId: module.id,
   selector: 'mat-list-option',
+  exportAs: 'matListOption',
   inputs: ['disableRipple'],
   host: {
     'role': 'option',
@@ -186,6 +187,7 @@ export class MatListOption extends _MatListOptionMixinBase
 @Component({
   moduleId: module.id,
   selector: 'mat-selection-list',
+  exportAs: 'matSelectionList',
   inputs: ['disabled', 'disableRipple'],
   host: {
     'role': 'listbox',
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index c08a7e39cf3a..23c32ddb84f9 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -29,6 +29,7 @@ export const _MatMenuItemMixinBase = mixinDisabled(MatMenuItemBase);
 @Component({
   moduleId: module.id,
   selector: '[mat-menu-item]',
+  exportAs: 'matMenuItem',
   inputs: ['disabled'],
   host: {
     'role': 'menuitem',
@@ -45,7 +46,6 @@ export const _MatMenuItemMixinBase = mixinDisabled(MatMenuItemBase);
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   templateUrl: 'menu-item.html',
-  exportAs: 'matMenuItem',
 })
 export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOption, CanDisable,
   OnDestroy {
diff --git a/src/lib/paginator/paginator.ts b/src/lib/paginator/paginator.ts
index 5e45fd2a1205..5b4a4126cff3 100644
--- a/src/lib/paginator/paginator.ts
+++ b/src/lib/paginator/paginator.ts
@@ -46,6 +46,7 @@ export class PageEvent {
 @Component({
   moduleId: module.id,
   selector: 'mat-paginator',
+  exportAs: 'matPaginator',
   templateUrl: 'paginator.html',
   styleUrls: ['paginator.css'],
   host: {
diff --git a/src/lib/progress-bar/progress-bar.ts b/src/lib/progress-bar/progress-bar.ts
index 2396d693e012..e97d9b03ec05 100644
--- a/src/lib/progress-bar/progress-bar.ts
+++ b/src/lib/progress-bar/progress-bar.ts
@@ -18,6 +18,7 @@ import {Component, ChangeDetectionStrategy, Input, ViewEncapsulation} from '@ang
 @Component({
   moduleId: module.id,
   selector: 'mat-progress-bar',
+  exportAs: 'matProgressBar',
   host: {
     'role': 'progressbar',
     'aria-valuemin': '0',
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 56b4f1e872f8..5bf92bee427e 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -69,6 +69,7 @@ export const _MatProgressSpinnerMixinBase = mixinColor(MatProgressSpinnerBase, '
 @Component({
   moduleId: module.id,
   selector: 'mat-progress-spinner',
+  exportAs: 'matProgressSpinner',
   host: {
     'role': 'progressbar',
     'class': 'mat-progress-spinner',
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 2c2ad1307e38..6d714502ec73 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -75,6 +75,7 @@ export const _MatRadioGroupMixinBase = mixinDisabled(MatRadioGroupBase);
  */
 @Directive({
   selector: 'mat-radio-group',
+  exportAs: 'matRadioGroup',
   providers: [MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR],
   host: {
     'role': 'radiogroup',
@@ -331,6 +332,7 @@ export const _MatRadioButtonMixinBase =
   inputs: ['color', 'disableRipple'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  exportAs: 'matRadioButton',
   host: {
     'class': 'mat-radio-button',
     '[class.mat-radio-checked]': 'checked',
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index d9e4d6d8394f..8172be8eff09 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -147,6 +147,7 @@ export class MatSelectTrigger {}
 @Component({
   moduleId: module.id,
   selector: 'mat-select',
+  exportAs: 'matSelect',
   templateUrl: 'select.html',
   styleUrls: ['select.css'],
   inputs: ['disabled', 'tabIndex'],
@@ -179,7 +180,6 @@ export class MatSelectTrigger {}
     fadeInContent
   ],
   providers: [{provide: MatFormFieldControl, useExisting: MatSelect}],
-  exportAs: 'matSelect',
 })
 export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
     ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any> {
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 563d64a61797..216ef4cf26f8 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -95,6 +95,7 @@ export class MatDrawerContent implements AfterContentInit {
 @Component({
   moduleId: module.id,
   selector: 'mat-drawer',
+  exportAs: 'matDrawer',
   template: '<ng-content></ng-content>',
   animations: [
     trigger('transform', [
@@ -354,6 +355,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
 @Component({
   moduleId: module.id,
   selector: 'mat-drawer-container',
+  exportAs: 'matDrawerContainer',
   templateUrl: 'drawer-container.html',
   styleUrls: ['drawer.css'],
   host: {
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index 411df9a4a9ae..b152fd0fa7b9 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -42,6 +42,7 @@ export class MatSidenavContent extends MatDrawerContent {
 @Component({
   moduleId: module.id,
   selector: 'mat-sidenav',
+  exportAs: 'matSidenav',
   template: '<ng-content></ng-content>',
   animations: [
     trigger('transform', [
@@ -108,6 +109,7 @@ export class MatSidenav extends MatDrawer {
 @Component({
   moduleId: module.id,
   selector: 'mat-sidenav-container',
+  exportAs: 'matSidenavContainer',
   templateUrl: 'sidenav-container.html',
   styleUrls: ['drawer.css'],
   host: {
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index f865fa9bb9ce..bd4061a54438 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -94,6 +94,7 @@ export const _MatSliderMixinBase = mixinColor(mixinDisabled(MatSliderBase), 'acc
 @Component({
   moduleId: module.id,
   selector: 'mat-slider',
+  exportAs: 'matSlider',
   providers: [MAT_SLIDER_VALUE_ACCESSOR],
   host: {
     '(focus)': '_onFocus()',
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index b7331142f7e7..33ea8cd88fff 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -36,6 +36,7 @@ export const _MatStepper = CdkStepper;
   templateUrl: 'step.html',
   providers: [{provide: ErrorStateMatcher, useExisting: MatStep}],
   encapsulation: ViewEncapsulation.None,
+  exportAs: 'matStep',
   preserveWhitespaces: false,
 })
 export class MatStep extends _MatStep implements ErrorStateMatcher {
@@ -74,6 +75,7 @@ export class MatStepper extends _MatStepper {
 @Component({
   moduleId: module.id,
   selector: 'mat-horizontal-stepper',
+  exportAs: 'matHorizontalStepper',
   templateUrl: 'stepper-horizontal.html',
   styleUrls: ['stepper.css'],
   inputs: ['selectedIndex'],
@@ -98,6 +100,7 @@ export class MatHorizontalStepper extends MatStepper { }
 @Component({
   moduleId: module.id,
   selector: 'mat-vertical-stepper',
+  exportAs: 'matVerticalStepper',
   templateUrl: 'stepper-vertical.html',
   styleUrls: ['stepper.css'],
   inputs: ['selectedIndex'],
diff --git a/src/lib/table/row.ts b/src/lib/table/row.ts
index 121a2bc045a1..f23c5fd4c8a0 100644
--- a/src/lib/table/row.ts
+++ b/src/lib/table/row.ts
@@ -56,6 +56,7 @@ export class MatRowDef<T> extends _MatCdkRowDef<T> {
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  exportAs: 'matHeaderRow',
   preserveWhitespaces: false,
 })
 export class MatHeaderRow extends _MatHeaderRow { }
@@ -71,6 +72,7 @@ export class MatHeaderRow extends _MatHeaderRow { }
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
+  exportAs: 'matRow',
   preserveWhitespaces: false,
 })
 export class MatRow extends _MatRow { }
diff --git a/src/lib/table/table.ts b/src/lib/table/table.ts
index 97f936f1046c..70d4a2892d29 100644
--- a/src/lib/table/table.ts
+++ b/src/lib/table/table.ts
@@ -18,6 +18,7 @@ export const _MatTable = CdkTable;
 @Component({
   moduleId: module.id,
   selector: 'mat-table',
+  exportAs: 'matTable',
   template: CDK_TABLE_TEMPLATE,
   styleUrls: ['table.css'],
   host: {
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index d2726c5c4aa3..16da9f3a4b47 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -64,6 +64,7 @@ export const _MatTabGroupMixinBase = mixinColor(mixinDisableRipple(MatTabGroupBa
 @Component({
   moduleId: module.id,
   selector: 'mat-tab-group',
+  exportAs: 'matTabGroup',
   templateUrl: 'tab-group.html',
   styleUrls: ['tab-group.css'],
   encapsulation: ViewEncapsulation.None,
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 34336e2fa8e4..8f068d01ccc1 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -62,6 +62,7 @@ export const _MatTabNavMixinBase = mixinDisableRipple(mixinColor(MatTabNavBase,
 @Component({
   moduleId: module.id,
   selector: '[mat-tab-nav-bar]',
+  exportAs: 'matTabNavBar, matTabNav',
   inputs: ['color', 'disableRipple'],
   templateUrl: 'tab-nav-bar.html',
   styleUrls: ['tab-nav-bar.css'],
@@ -180,6 +181,7 @@ export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
  */
 @Directive({
   selector: '[mat-tab-link], [matTabLink]',
+  exportAs: 'matTabLink',
   inputs: ['disabled'],
   host: {
     'class': 'mat-tab-link',
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index b27331206107..607f2c0bf02d 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -19,6 +19,7 @@ import {CanColor, mixinColor} from '@angular/material/core';
 
 @Directive({
   selector: 'mat-toolbar-row',
+  exportAs: 'matToolbarRow',
   host: {'class': 'mat-toolbar-row'},
 })
 export class MatToolbarRow {}
@@ -34,6 +35,7 @@ export const _MatToolbarMixinBase = mixinColor(MatToolbarBase);
 @Component({
   moduleId: module.id,
   selector: 'mat-toolbar',
+  exportAs: 'matToolbar',
   templateUrl: 'toolbar.html',
   styleUrls: ['toolbar.css'],
   inputs: ['color'],
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 22b585fb78e2..168c088a3a03 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -87,6 +87,7 @@ export const MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
  */
 @Directive({
   selector: '[mat-tooltip], [matTooltip]',
+  exportAs: 'matTooltip',
   host: {
     '(longpress)': 'show()',
     '(focus)': 'show()',
@@ -94,7 +95,6 @@ export const MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
     '(keydown)': '_handleKeydown($event)',
     '(touchend)': 'hide(' + TOUCHEND_HIDE_DELAY + ')',
   },
-  exportAs: 'matTooltip',
 })
 export class MatTooltip implements OnDestroy {
   _overlayRef: OverlayRef | null;

From f0d20ca6cf97b62ba12fb6f127d6a0d267fa090a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 23:53:14 +0200
Subject: [PATCH 246/575] feat(menu): support typeahead focus (#7385)

---
 src/lib/menu/menu-directive.ts |  2 +-
 src/lib/menu/menu-item.ts      | 21 +++++++++++++++++++++
 src/lib/menu/menu.spec.ts      | 31 +++++++++++++++++++++++++++++--
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index e66f232f0742..d74e049c9344 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -150,7 +150,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
     @Inject(MAT_MENU_DEFAULT_OPTIONS) private _defaultOptions: MatMenuDefaultOptions) { }
 
   ngAfterContentInit() {
-    this._keyManager = new FocusKeyManager<MatMenuItem>(this.items).withWrap();
+    this._keyManager = new FocusKeyManager<MatMenuItem>(this.items).withWrap().withTypeAhead();
     this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close.emit('keydown'));
   }
 
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index 23c32ddb84f9..bf3467987713 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -97,5 +97,26 @@ export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOptio
     }
   }
 
+  /** Gets the label to be used when determining whether the option should be focused. */
+  getLabel(): string {
+    const element: HTMLElement = this._elementRef.nativeElement;
+    let output = '';
+
+    if (element.childNodes) {
+      const length = element.childNodes.length;
+
+      // Go through all the top-level text nodes and extract their text.
+      // We skip anything that's not a text node to prevent the text from
+      // being thrown off by something like an icon.
+      for (let i = 0; i < length; i++) {
+        if (element.childNodes[i].nodeType === Node.TEXT_NODE) {
+          output += element.childNodes[i].textContent;
+        }
+      }
+    }
+
+    return output.trim();
+  }
+
 }
 
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 83b8cb8db4e7..912fd29371ec 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -9,6 +9,8 @@ import {
   Output,
   TemplateRef,
   ViewChild,
+  ViewChildren,
+  QueryList,
 } from '@angular/core';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {OverlayContainer} from '@angular/cdk/overlay';
@@ -21,6 +23,7 @@ import {
   MatMenuTrigger,
   MenuPositionX,
   MenuPositionY,
+  MatMenuItem,
 } from './index';
 import {MENU_PANEL_TOP_PADDING} from './menu-trigger';
 import {extendObject} from '@angular/material/core';
@@ -49,7 +52,8 @@ describe('MatMenu', () => {
         CustomMenu,
         NestedMenu,
         NestedMenuCustomElevation,
-        NestedMenuRepeater
+        NestedMenuRepeater,
+        FakeIcon
       ],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
@@ -175,6 +179,18 @@ describe('MatMenu', () => {
     expect(fixture.destroy.bind(fixture)).not.toThrow();
   });
 
+  it('should be able to extract the menu item text', () => {
+    const fixture = TestBed.createComponent(SimpleMenu);
+    fixture.detectChanges();
+    expect(fixture.componentInstance.items.first.getLabel()).toBe('Item');
+  });
+
+  it('should filter out non-text nodes when figuring out the label', () => {
+    const fixture = TestBed.createComponent(SimpleMenu);
+    fixture.detectChanges();
+    expect(fixture.componentInstance.items.last.getLabel()).toBe('Item with an icon');
+  });
+
   describe('positions', () => {
     let fixture: ComponentFixture<PositionedMenu>;
     let panel: HTMLElement;
@@ -1070,7 +1086,7 @@ describe('MatMenu default overrides', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MatMenuModule, NoopAnimationsModule],
-      declarations: [SimpleMenu],
+      declarations: [SimpleMenu, FakeIcon],
       providers: [{
         provide: MAT_MENU_DEFAULT_OPTIONS,
         useValue: {overlapTrigger: false, xPosition: 'before', yPosition: 'above'},
@@ -1095,6 +1111,10 @@ describe('MatMenu default overrides', () => {
     <mat-menu class="custom-one custom-two" #menu="matMenu" (close)="closeCallback($event)">
       <button mat-menu-item> Item </button>
       <button mat-menu-item disabled> Disabled </button>
+      <button mat-menu-item>
+        <fake-icon>unicorn</fake-icon>
+        Item with an icon
+      </button>
     </mat-menu>
   `
 })
@@ -1102,6 +1122,7 @@ class SimpleMenu {
   @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
   @ViewChild('triggerEl') triggerEl: ElementRef;
   @ViewChild(MatMenu) menu: MatMenu;
+  @ViewChildren(MatMenuItem) items: QueryList<MatMenuItem>;
   closeCallback = jasmine.createSpy('menu closed callback');
 }
 
@@ -1284,3 +1305,9 @@ class NestedMenuRepeater {
 
   items = ['one', 'two', 'three'];
 }
+
+@Component({
+  selector: 'fake-icon',
+  template: '<ng-content></ng-content>'
+})
+class FakeIcon { }

From 4d278dd91eeb895fff0c28a0edb874901df8561c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 23:53:33 +0200
Subject: [PATCH 247/575] fix(drawer): drawer container animating when open by
 default (#7129)

Fixes #7007.
---
 src/lib/sidenav/drawer.spec.ts | 12 ++++++++++++
 src/lib/sidenav/drawer.ts      | 36 +++++++++++++++++++---------------
 src/lib/sidenav/sidenav.ts     |  2 +-
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index ce39efa443dc..c763866bd0c3 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -327,6 +327,7 @@ describe('MatDrawerContainer', () => {
       declarations: [
         DrawerContainerTwoDrawerTestApp,
         DrawerDelayed,
+        DrawerSetToOpenedTrue,
         DrawerContainerStateChangesTestApp,
       ],
     });
@@ -418,6 +419,17 @@ describe('MatDrawerContainer', () => {
     expect(parseInt(contentElement.style.marginLeft)).toBeLessThan(initialMargin);
   }));
 
+  it('should not animate when the sidenav is open on load ', fakeAsync(() => {
+    const fixture = TestBed.createComponent(DrawerSetToOpenedTrue);
+
+    fixture.detectChanges();
+    tick();
+
+    const container = fixture.debugElement.nativeElement.querySelector('.mat-drawer-container');
+
+    expect(container.classList).not.toContain('mat-drawer-transition');
+  }));
+
 });
 
 
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 216ef4cf26f8..4691afe6e045 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -33,10 +33,8 @@ import {
 } from '@angular/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
-import {first} from 'rxjs/operator/first';
-import {startWith} from 'rxjs/operator/startWith';
-import {takeUntil} from 'rxjs/operator/takeUntil';
 import {Subject} from 'rxjs/Subject';
+import {RxChain, filter, first, startWith, takeUntil} from '@angular/cdk/rxjs';
 
 
 /** Throws an exception when two MatDrawer are matching the same position. */
@@ -114,7 +112,7 @@ export class MatDrawerContent implements AfterContentInit {
   host: {
     'class': 'mat-drawer',
     '[@transform]': '_animationState',
-    '(@transform.start)': '_onAnimationStart()',
+    '(@transform.start)': '_onAnimationStart($event)',
     '(@transform.done)': '_onAnimationEnd($event)',
     '(keydown)': 'handleKeydown($event)',
     // must prevent the browser from aligning text based on value
@@ -174,7 +172,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   private _opened: boolean = false;
 
   /** Emits whenever the drawer has started animating. */
-  _animationStarted = new EventEmitter<void>();
+  _animationStarted = new EventEmitter<AnimationEvent>();
 
   /** Whether the drawer is animating. Used to prevent overlapping animations. */
   _isAnimating = false;
@@ -317,9 +315,9 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     }
   }
 
-  _onAnimationStart() {
+  _onAnimationStart(event: AnimationEvent) {
     this._isAnimating = true;
-    this._animationStarted.emit();
+    this._animationStarted.emit(event);
   }
 
   _onAnimationEnd(event: AnimationEvent) {
@@ -448,13 +446,19 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
    * is properly hidden.
    */
   private _watchDrawerToggle(drawer: MatDrawer): void {
-    takeUntil.call(drawer._animationStarted, this._drawers.changes).subscribe(() => {
-      // Set the transition class on the container so that the animations occur. This should not
-      // be set initially because animations should only be triggered via a change in state.
-      this._renderer.addClass(this._element.nativeElement, 'mat-drawer-transition');
-      this._updateContentMargins();
-      this._changeDetectorRef.markForCheck();
-    });
+    RxChain.from(drawer._animationStarted)
+      .call(takeUntil, this._drawers.changes)
+      .call(filter, (event: AnimationEvent) => event.fromState !== event.toState)
+      .subscribe((event: AnimationEvent) => {
+        // Set the transition class on the container so that the animations occur. This should not
+        // be set initially because animations should only be triggered via a change in state.
+        if (event.toState !== 'open-instant') {
+          this._renderer.addClass(this._element.nativeElement, 'mat-drawer-transition');
+        }
+
+        this._updateContentMargins();
+        this._changeDetectorRef.markForCheck();
+      });
 
     if (drawer.mode !== 'side') {
       takeUntil.call(merge(drawer.onOpen, drawer.onClose), this._drawers.changes).subscribe(() =>
@@ -463,8 +467,8 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   }
 
   /**
-   * Subscribes to drawer onPositionChanged event in order to re-validate drawers when the position
-   * changes.
+   * Subscribes to drawer onPositionChanged event in order to
+   * re-validate drawers when the position changes.
    */
   private _watchDrawerPosition(drawer: MatDrawer): void {
     if (!drawer) {
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index b152fd0fa7b9..04c7a8b8a407 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -62,7 +62,7 @@ export class MatSidenavContent extends MatDrawerContent {
     'class': 'mat-drawer mat-sidenav',
     'tabIndex': '-1',
     '[@transform]': '_animationState',
-    '(@transform.start)': '_onAnimationStart()',
+    '(@transform.start)': '_onAnimationStart($event)',
     '(@transform.done)': '_onAnimationEnd($event)',
     '(keydown)': 'handleKeydown($event)',
     // must prevent the browser from aligning text based on value

From c2c6e04ed64e6952bf3ee26b5c31dfe5ab66e2ae Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 4 Oct 2017 23:53:55 +0200
Subject: [PATCH 248/575] fix(stepper): switch to OnPush change detection
 (#7119)

---
 src/cdk/stepper/stepper.ts         | 29 +++++++++++++++++++++++------
 src/lib/dialog/dialog-container.ts |  4 ++++
 src/lib/stepper/step-header.ts     |  2 ++
 src/lib/stepper/stepper.ts         |  4 ++++
 tslint.json                        |  3 ++-
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 8183508376ab..de0a06f9a978 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -24,7 +24,10 @@ import {
   ViewEncapsulation,
   Optional,
   Inject,
-  forwardRef
+  forwardRef,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  OnChanges,
 } from '@angular/core';
 import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
 import {CdkStepLabel} from './step-label';
@@ -63,8 +66,9 @@ export class StepperSelectionEvent {
   templateUrl: 'step.html',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class CdkStep {
+export class CdkStep implements OnChanges {
   /** Template for step label if it exists. */
   @ContentChild(CdkStepLabel) stepLabel: CdkStepLabel;
 
@@ -74,12 +78,11 @@ export class CdkStep {
   /** The top level abstract control of the step. */
   @Input() stepControl: AbstractControl;
 
-  /** Whether user has seen the expanded step content or not . */
+  /** Whether user has seen the expanded step content or not. */
   interacted = false;
 
   /** Label of the step. */
-  @Input()
-  label: string;
+  @Input() label: string;
 
   @Input()
   get editable() { return this._editable; }
@@ -116,6 +119,12 @@ export class CdkStep {
   select(): void {
     this._stepper.selected = this;
   }
+
+  ngOnChanges() {
+    // Since basically all inputs of the MdStep get proxied through the view down to the
+    // underlying MdStepHeader, we have to make sure that change detection runs correctly.
+    this._stepper._stateChanged();
+  }
 }
 
 @Directive({
@@ -166,7 +175,9 @@ export class CdkStepper {
   /** Used to track unique ID for each stepper component. */
   _groupId: number;
 
-  constructor(@Optional() private _dir: Directionality) {
+  constructor(
+    @Optional() private _dir: Directionality,
+    private _changeDetectorRef: ChangeDetectorRef) {
     this._groupId = nextId++;
   }
 
@@ -190,6 +201,11 @@ export class CdkStepper {
     return `mat-step-content-${this._groupId}-${i}`;
   }
 
+  /** Marks the component to be change detected. */
+  _stateChanged() {
+    this._changeDetectorRef.markForCheck();
+  }
+
   /** Returns position state of the step with the given index. */
   _getAnimationDirection(index: number): StepContentPositionState {
     const position = index - this._selectedIndex;
@@ -220,6 +236,7 @@ export class CdkStepper {
       previouslySelectedStep: stepsArray[this._selectedIndex],
     });
     this._selectedIndex = newIndex;
+    this._stateChanged();
   }
 
   _onKeydown(event: KeyboardEvent) {
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 372e21ee072a..fdd382729175 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -17,6 +17,7 @@ import {
   ChangeDetectorRef,
   ViewChild,
   ViewEncapsulation,
+  ChangeDetectionStrategy,
 } from '@angular/core';
 import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
 import {DOCUMENT} from '@angular/platform-browser';
@@ -51,6 +52,9 @@ export function throwMatDialogContentAlreadyAttachedError() {
   styleUrls: ['dialog.css'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  // Using OnPush for dialogs caused some G3 sync issues. Disabled until we can track them down.
+  // tslint:disable-next-line:validate-decorators
+  changeDetection: ChangeDetectionStrategy.Default,
   animations: [
     trigger('slideDialog', [
       // Note: The `enter` animation doesn't transition to something like `translate3d(0, 0, 0)
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 42f11b755ee1..75aed4164b95 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -16,6 +16,7 @@ import {
   OnDestroy,
   ElementRef,
   Renderer2,
+  ChangeDetectionStrategy,
 } from '@angular/core';
 import {MatStepLabel} from './step-label';
 import {MatStepperIntl} from './stepper-intl';
@@ -33,6 +34,7 @@ import {Subscription} from 'rxjs/Subscription';
   },
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatStepHeader implements OnDestroy {
   private _intlSubscription: Subscription;
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 33ea8cd88fff..28a5d356dd82 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -20,6 +20,7 @@ import {
   SkipSelf,
   ViewChildren,
   ViewEncapsulation,
+  ChangeDetectionStrategy,
 } from '@angular/core';
 import {NgControl, FormGroupDirective, NgForm} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material/core';
@@ -38,6 +39,7 @@ export const _MatStepper = CdkStepper;
   encapsulation: ViewEncapsulation.None,
   exportAs: 'matStep',
   preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatStep extends _MatStep implements ErrorStateMatcher {
   /** Content for step label given by <ng-template matStepLabel>. */
@@ -94,6 +96,7 @@ export class MatStepper extends _MatStepper {
   providers: [{provide: MatStepper, useExisting: MatHorizontalStepper}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatHorizontalStepper extends MatStepper { }
 
@@ -119,5 +122,6 @@ export class MatHorizontalStepper extends MatStepper { }
   providers: [{provide: MatStepper, useExisting: MatVerticalStepper}],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatVerticalStepper extends MatStepper { }
diff --git a/tslint.json b/tslint.json
index 2e40ca7b22e9..31beb1d556e9 100644
--- a/tslint.json
+++ b/tslint.json
@@ -91,7 +91,8 @@
       "Component": {
         "encapsulation": "\\.None$",
         "moduleId": "^module\\.id$",
-        "preserveWhitespaces": "false$"
+        "preserveWhitespaces": "false$",
+        "changeDetection": "\\.OnPush$"
       }
     }, "src/+(lib|cdk)/**/!(*.spec).ts"],
     "require-license-banner": [

From adf9b5b9783f44d503ef68733bbbaaea816206ac Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 4 Oct 2017 15:46:10 -0700
Subject: [PATCH 249/575] docs(form-field): add docs, examples, and guide
 (#7424)

---
 .../creating-a-custom-form-field-control.md   | 337 ++++++++++++++++++
 src/lib/form-field/README.md                  |   1 +
 src/lib/form-field/form-field-control.ts      |   2 +-
 src/lib/form-field/form-field.md              | 129 +++++++
 src/material-examples/example-module.ts       |  56 +++
 .../form-field-custom-control-example.css     |  21 ++
 .../form-field-custom-control-example.html    |   7 +
 .../form-field-custom-control-example.ts      | 137 +++++++
 .../form-field-error-example.css              |   8 +
 .../form-field-error-example.html             |   6 +
 .../form-field-error-example.ts               |  18 +
 .../form-field-hint-example.css               |   8 +
 .../form-field-hint-example.html              |  13 +
 .../form-field-hint-example.ts                |   9 +
 .../form-field-overview-example.css           |   8 +
 .../form-field-overview-example.html          |  15 +
 .../form-field-overview-example.ts            |   9 +
 .../form-field-placeholder-example.css        |  20 ++
 .../form-field-placeholder-example.html       |  29 ++
 .../form-field-placeholder-example.ts         |  19 +
 .../form-field-prefix-suffix-example.css      |  17 +
 .../form-field-prefix-suffix-example.html     |  12 +
 .../form-field-prefix-suffix-example.ts       |  11 +
 .../form-field-theming-example.css            |   8 +
 .../form-field-theming-example.html           |  14 +
 .../form-field-theming-example.ts             |  23 ++
 26 files changed, 936 insertions(+), 1 deletion(-)
 create mode 100644 guides/creating-a-custom-form-field-control.md
 create mode 100644 src/lib/form-field/README.md
 create mode 100644 src/lib/form-field/form-field.md
 create mode 100644 src/material-examples/form-field-custom-control/form-field-custom-control-example.css
 create mode 100644 src/material-examples/form-field-custom-control/form-field-custom-control-example.html
 create mode 100644 src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
 create mode 100644 src/material-examples/form-field-error/form-field-error-example.css
 create mode 100644 src/material-examples/form-field-error/form-field-error-example.html
 create mode 100644 src/material-examples/form-field-error/form-field-error-example.ts
 create mode 100644 src/material-examples/form-field-hint/form-field-hint-example.css
 create mode 100644 src/material-examples/form-field-hint/form-field-hint-example.html
 create mode 100644 src/material-examples/form-field-hint/form-field-hint-example.ts
 create mode 100644 src/material-examples/form-field-overview/form-field-overview-example.css
 create mode 100644 src/material-examples/form-field-overview/form-field-overview-example.html
 create mode 100644 src/material-examples/form-field-overview/form-field-overview-example.ts
 create mode 100644 src/material-examples/form-field-placeholder/form-field-placeholder-example.css
 create mode 100644 src/material-examples/form-field-placeholder/form-field-placeholder-example.html
 create mode 100644 src/material-examples/form-field-placeholder/form-field-placeholder-example.ts
 create mode 100644 src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.css
 create mode 100644 src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.html
 create mode 100644 src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.ts
 create mode 100644 src/material-examples/form-field-theming/form-field-theming-example.css
 create mode 100644 src/material-examples/form-field-theming/form-field-theming-example.html
 create mode 100644 src/material-examples/form-field-theming/form-field-theming-example.ts

diff --git a/guides/creating-a-custom-form-field-control.md b/guides/creating-a-custom-form-field-control.md
new file mode 100644
index 000000000000..7cf5bb6bed45
--- /dev/null
+++ b/guides/creating-a-custom-form-field-control.md
@@ -0,0 +1,337 @@
+It is possible to create custom form field controls that can be used inside `<mat-form-field>`. This
+can be useful if you need to create a component that shares a lot of common behavior with a form
+field, but adds some additional logic.
+
+For example in this guide we'll learn how to create a custom input for inputting US telephone
+numbers and hook it up to work with `<mat-form-field>`. Here is what we'll build by the end of this
+guide:
+
+<!-- example(form-field-custom-control) -->
+
+In order to learn how to build custom form field controls, let's start with a simple input component
+that we want to work inside the form field. For example, a phone number input that segments the
+parts of the number into their own inputs. (Note: this is not intended to be a robust component,
+just a starting point for us to learn.)
+
+```ts
+class MyTel {
+  constructor(public area: string, public exchange: string, public subscriber: string) {}
+}
+
+@Component({
+  selector: 'my-tel-input',
+  template: `
+    <div [formGroup]="parts">
+      <input class="area" formControlName="area" size="3">
+      <span>&ndash;</span>
+      <input class="exchange" formControlName="exchange" size="3">
+      <span>&ndash;</span>
+      <input class="subscriber" formControlName="subscriber" size="4">
+    </div>
+  `,
+  styles: [`
+    div {
+      display: flex;
+    }
+    input {
+      border: none;
+      background: none;
+      padding: 0;
+      outline: none;
+      font: inherit;
+      text-align: center;
+    }
+  `],
+})
+class MyTelInput {
+  parts: FormGroup;
+
+  @Input()
+  get value(): MyTel | null {
+    let n = this.parts.value;
+    if (n.area.length == 3 && n.exchange.length == 3 && n.subscriber.length == 4) {
+      return new MyTel(n.area, n.exchange, n.subscriber);
+    }
+    return null;
+  }
+  set value(tel: MyTel | null) {
+    tel = tel || new MyTel('', '', '');
+    this.parts.setValue({area: tel.area, exchange: tel.exchange, subscriber: tel.subscriber});
+  }
+  
+  constructor(fb: FormBuilder) {
+    this.parts =  fb.group({
+      'area': '',
+      'exchange': '',
+      'subscriber': '',
+    });
+  }
+}
+```
+
+### Providing our component as a MatFormFieldControl
+The first step is to provide our new component as an implementation of the `MatFormFieldControl`
+interface that the `<mat-form-field>` knows how to work with. To do this, we will have our class
+implement `MatFormFieldControl`. Since this is a generic interface, we'll need to include a type
+parameter indicating the type of data our control will work with, in this case `MyTel`. We then add
+a provider to our component so that the form field will be able to inject it as a
+`MatFormFieldControl`.
+
+```ts
+@Component({
+  ...
+  providers: [{provide: MatFormFieldControl, useExisting: MyTelInput}],
+})
+class MyTelInput implements MatFormFieldControl<MyTel> {
+  ...
+}
+```
+
+This sets up our component so it can work with `<mat-form-field>`, but now we need to implement the
+various methods and properties declared by the interface we just implemented. To learn more about
+the `MatFormFieldControl` interface, see its
+[definition](https://github.com/angular/material2/blob/master/src/lib/form-field/form-field-control.ts).
+(Unfortunately generated API docs are not available yet, but we'll go through the methods and
+properties in this guide.) 
+
+### Implementing the methods and properties of MatFormFieldControl
+#### `value`
+This property allows someone to set or get the value of our control. Its type should be the same
+type we used for the type parameter when we implemented `MatFormFieldControl`. Since our component 
+already has a value property, we don't need to do anything for this one.
+
+#### `stateChanges`
+Because the `<mat-form-field>` uses the `OnPush` change detection strategy, we need to let it know
+when something happens in the form field control that may require the form field to run change
+detection. We do this via the `stateChanges` property. So far the only thing the form field needs to
+know about is when the value changes. We'll need to emit on the stateChanges stream when that
+happens, and as we continue flushing out these properties we'll likely find more places we need to
+emit. We should also make sure to complete `stateChanges` when our component is destroyed.
+
+```ts
+stateChanges = new Subject<void>();
+
+set value(tel: MyTel | null) {
+  ...
+  this.stateChanges.next();
+}
+
+ngOnDestroy() {
+  this.stateChanges.complete();
+}
+```
+
+#### `id`
+This property should return the ID of an element in the component's template that we want the
+`<mat-form-field>` to associate all of its labels and hints with. In this case, we'll use the host
+element and just generate a unique ID for it.
+
+```ts
+static nextId = 0;
+
+@HostBinding() id = `my-tel-input-${MyTelInput.nextId++}`;
+```
+
+#### `placeholder`
+This property allows us to tell the `<mat-form-field>` what to use as a placeholder. In this
+example, we'll do the same thing as `matInput` and `<mat-select>` and allow the user to specify it
+via an `@Input()`. Since the value of the placeholder may change over time, we need to make sure to
+trigger change detection in the parent form field by emitting on the `stateChanges` stream when the
+placeholder changes.
+
+```ts
+@Input()
+get placeholder() {
+  return this._placeholder;
+}
+set placeholder(plh) {
+  this._placeholder = plh;
+  this.stateChanges.next();
+}
+private _placeholder: string;
+```
+
+#### `ngControl`
+This property allows the form field control to specify the `@angular/forms` control that is bound to
+this component. Since we haven't set up our component to act as a `ControlValueAccessor`, we'll just
+set this to `null` in our component. In any real component, you would probably want to implement
+`ControlValueAccessor` so that your component can work with `formControl` and `ngModel`.
+
+```ts
+ngControl = null;
+```
+
+If you did implement `ControlValueAccessor`, you could simply inject the `NgControl` and make it
+publicly available. (For additional information about `ControlValueAccessor` see the
+[API docs](https://angular.io/api/forms/ControlValueAccessor).)
+
+```ts
+constructor(..., @Optional() @Self() public ngControl: NgControl) { ... }
+```
+
+#### `focused`
+This property indicates whether or not the form field control should be considered to be in a
+focused state. When it is in a focused state, the form field is displayed with a solid color
+underline. For the purposes of our component, we want to consider it focused if any of the part
+inputs are focused. We can use the `FocusMonitor` from `@angular/cdk` to easily check this. We also
+need to remember to emit on the `stateChanges` stream so change detection can happen.
+
+```ts
+focused = false;
+
+constructor(fb: FormBuilder, private fm: FocusMonitor, private elRef: ElementRef,
+            renderer: Renderer2) {
+  ...
+  fm.monitor(elRef.nativeElement, renderer, true).subscribe(origin => {
+    this.focused = !!origin;
+    this.stateChanges.next();
+  });
+}
+
+ngOnDestroy() {
+  ...
+  this.fm.stopMonitoring(this.elRef.nativeElement);
+}
+```
+
+#### `empty`
+This property indicates whether the form field control is empty. For our control, we'll consider it
+empty if all of the parts are empty.
+
+```ts
+get empty() {
+  let n = this.parts.value;
+  return !n.area && !n.exchange && !n.subscriber;
+}
+```
+
+#### `shouldPlaceholderFloat`
+This property is used to indicate whether the placeholder should be in the floating position. We'll
+use the same logic as `matInput` and float the placeholder when the input is focused or non-empty.
+Since the placeholder will be overlapping our control when when it's not floating, we should hide
+the `–` characters when it's not floating.
+
+```ts
+@HostBinding('class.floating')
+get shouldPlaceholderFloat() {
+  return this.focused || !this.empty;
+}
+```
+```css
+span {
+  opacity: 0;
+  transition: opacity 200ms;
+}
+:host.floating span {
+  opacity: 1;
+}
+```
+
+#### `required`
+This property is used to indicate whether the input is required. `<mat-form-field>` uses this
+information to add a required indicator to the placeholder. Again, we'll want to make sure we run
+change detection if the required state changes.
+
+```ts
+@Input()
+get required() {
+  return this._required;
+}
+set required(req) {
+  this._required = coerceBooleanProperty(req);
+  this.stateChanges.next();
+}
+private _required = false;
+```
+
+#### `disabled`
+This property tells the form field when it should be in the disabled state. In addition to reporting
+the right state to the form field, we need to set the disabled state on the individual inputs that
+make up our component.
+
+```ts
+@Input()
+get disabled() {
+  return this._disabled;
+}
+set disabled(dis) {
+  this._disabled = coerceBooleanProperty(dis);
+  this.stateChanges.next();
+}
+private _disabled = false;
+```
+```html
+<input class="area" formControlName="area" size="3" [disabled]="disabled">
+<span>&ndash;</span>
+<input class="exchange" formControlName="exchange" size="3" [disabled]="disabled">
+<span>&ndash;</span>
+<input class="subscriber" formControlName="subscriber" size="4" [disabled]="disabled">
+```
+
+#### `errorState`
+This property indicates whether the associated `NgControl` is in an error state. Since we're not
+using an `NgControl` in this example, we don't need to do anything other than just set it to `false`.
+
+```ts
+errorState = false;
+```
+
+#### `controlType`
+This property allows us to specify a unique string for the type of control in form field. The
+`<mat-form-field>` will add an additional class based on this type that can be used to easily apply
+special styles to a `<mat-form-field>` that contains a specific type of control. In this example
+we'll use `my-tel-input` as our control type which will result in the form field adding the class
+`mat-form-field-my-tel-input`.
+
+```ts
+controlType = 'my-tel-input';
+```
+
+#### `setAriaDescribedByIds(ids: string[])`
+This method is used by the `<mat-form-field>` to specify the IDs that should be used for the
+`aria-describedby` attribute of your component. The method has one parameter, the list of IDs, we
+just need to apply the given IDs to our host element.
+
+```ts
+@HostBinding('attr.aria-describedby') describedBy = '';
+  
+setDescribedByIds(ids: string[]) {
+  this.describedBy = ids.join(' ');
+}
+```
+
+#### `onContainerClick(event: MouseEvent)`
+This method will be called when the form field is clicked on. It allows your component to hook in
+and handle that click however it wants. The method has one parameter, the `MouseEvent` for the
+click. In our case we'll just focus the first `<input>` if the user isn't about to click an
+`<input>` anyways.
+
+```ts
+onContainerClick(event: MouseEvent) {
+  if ((event.target as Element).tagName.toLowerCase() != 'input') {
+    this.elRef.nativeElement.querySelector('input').focus();
+  }
+}
+```
+
+### Trying it out
+Now that we've fully implemented the interface, we're ready to try our component out! All we need to
+do is place it inside of a `<mat-form-field>`
+
+```html
+<mat-form-field>
+  <my-tel-input></my-tel-input>
+</mat-form-field>
+```
+
+We also get all of the features that come with `<mat-form-field>` such as floating placeholder,
+prefix, suffix, hints, and errors (if we've given the form field an `NgControl` and correctly report
+the error state).
+
+```html
+<mat-form-field>
+  <my-tel-input placeholder="Phone number" required></my-tel-input>
+  <mat-icon matPrefix>phone</mat-icon>
+  <mat-hint>Include area code</mat-hint>
+</mat-form-field>
+```
diff --git a/src/lib/form-field/README.md b/src/lib/form-field/README.md
new file mode 100644
index 000000000000..7a1234123cc2
--- /dev/null
+++ b/src/lib/form-field/README.md
@@ -0,0 +1 @@
+Please see the official documentation at https://material.angular.io/components/component/form-field
diff --git a/src/lib/form-field/form-field-control.ts b/src/lib/form-field/form-field-control.ts
index f2f006421a44..c8d02dd6e97c 100644
--- a/src/lib/form-field/form-field-control.ts
+++ b/src/lib/form-field/form-field-control.ts
@@ -13,7 +13,7 @@ import {NgControl} from '@angular/forms';
 /** An interface which allows a control to work inside of a `MatFormField`. */
 export abstract class MatFormFieldControl<T> {
   /** The value of the control. */
-  value: T;
+  value: T | null;
 
   /**
    * Stream that emits whenever the state of the control changes such that the parent `MatFormField`
diff --git a/src/lib/form-field/form-field.md b/src/lib/form-field/form-field.md
new file mode 100644
index 000000000000..7872e9c8ba0b
--- /dev/null
+++ b/src/lib/form-field/form-field.md
@@ -0,0 +1,129 @@
+`<mat-form-field>` is a component used to wrap several Angular Material components and apply common
+[Text field](https://material.io/guidelines/components/text-fields.html) styles such as the
+underline, floating label, and hint messages.
+
+In this document, "form field" refers to the wrapper component `<mat-form-field>` and
+"form field control" refers to the component that the `<mat-form-field>` is wrapping
+(e.g. the input, textarea, select, etc.)
+
+The following Angular Material components are designed to work inside a `<mat-form-field>`:
+* [&lt;input matInput&gt; &amp; &lt;textarea matInput&gt;](https://material.angular.io/components/input/overview)
+* [&lt;mat-select&gt;](https://material.angular.io/components/select/overview)
+* [&lt;mat-chip-list&gt;](https://material.angular.io/components/chips/overview)
+
+<!-- example(form-field-overview) -->
+
+### Floating placeholder
+The floating placeholder is a text label displayed on top of the form field control when
+the control does not contain any text. By default, when text is present the floating placeholder
+floats above the form field control.
+
+Placeholder text can be specified using the `placeholder` property on the form field control, or
+by adding a `<mat-placeholder>` element inside the form field. Only one of these options should be
+used, specifying both will raise an error.
+
+If the form field control is marked with a `required` attribute, an asterisk will be appended to the
+placeholder to indicate the fact that it is a required field. If unwanted, this can be disabled by
+setting the `hideRequiredMarker` property on `<mat-form-field>`
+
+The `floatPlaceholder` property of `<mat-form-field>` can be used to change this default floating
+behavior. It can set to `never` to hide the placeholder instead of float it when text is present in
+the form field control. It can be set to `always` to float the placeholder even when no text is
+present in the form field control. It can also be set to `auto` to restore the default behavior.
+
+<!-- example(form-field-placeholder) -->
+
+Global default placeholder options can be specified by setting providing a value for
+`MAT_PLACEHOLDER_GLOBAL_OPTIONS` in your application's root module. Like the property, the global
+setting can be either `always`, `never`, or `auto`.
+
+```ts
+@NgModule({
+  providers: [
+    {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: {float: 'always'}}
+  ]
+})
+```
+
+### Hint labels
+Hint labels are additional descriptive text that appears below the form field's underline. A
+`<mat-form-field>` can have up to two hint labels; one start-aligned (left in an LTR language, right
+in RTL), and one end-aligned.
+
+Hint labels are specified in one of two ways: either by using the `hintLabel` property of
+`<mat-form-field>`, or by adding a `<mat-hint>` element inside the form field. When adding a hint
+via the `hintLabel` property, it will be treated as the start hint. Hints added via the
+`<mat-hint>` hint element can be added to either side by setting the `align` property on
+`<mat-hint>` to either `start` or `end`. Attempting to add multiple hints to the same side will
+raise an error.
+
+<!-- example(form-field-hint) -->
+
+### Error messages
+Error messages can be shown under the form field underline by adding `mat-error` elements inside the
+form field. Errors are hidden initially and will be displayed on invalid form fields after the user
+has interacted with the element or the parent form has been submitted. Since the errors occupy the
+same space as the hints, the hints are hidden when the errors are shown.
+
+If a form field can have more than one error state, it is up to the consumer to toggle which
+messages should be displayed. This can be done with CSS, `ngIf` or `ngSwitch`. Multiple error
+messages can be shown at the same time if desired, but the `<mat-form-field>` only reserves enough
+space to display one error message at a time. Ensuring that enough space is available to display
+multiple errors is up to the user.
+
+<!-- example(form-field-error) -->
+
+### Prefix & suffix
+Custom content can be included before and after the input tag, as a prefix or suffix. It will be
+included within the visual container that wraps the form control as per the Material specification.
+
+Adding the `matPrefix` directive to an element inside the `<mat-form-field>` will designate it as
+the prefix. Similarly, adding `matSuffix` will designate it as the suffix.
+
+<!-- example(form-field-prefix-suffix) -->
+
+### Custom form field controls
+In addition to the form field controls that Angular Material provides, it is possible to create
+custom form field controls that work with `<mat-form-field>` in the same way. For additional
+information on this see the guide on
+[Creating Custom mat-form-field Controls](https://material.angular.io/guide/creating-a-custom-form-field-control).
+
+### Theming
+`<mat-form-field>` has a `color` property which can be set to `primary`, `accent`, or `warn`. This
+will set the color of the form field underline and floating placeholder based on the theme colors
+of your app.
+
+`<mat-form-field>` inherits its `font-size` from its parent element. This can be overridden to an
+explicit size using CSS. We recommend a specificity of at least 1 element + 1 class.
+
+```css
+mat-form-field.mat-form-field {
+  font-size: 16px;
+}
+```
+
+<!-- example(form-field-theming) -->
+
+### Accessibility
+If a floating placeholder is specified, it will be automatically used as the label for the form field
+control. If no floating placeholder is specified, the user should label the form field control
+themselves using `aria-label`, `aria-labelledby` or `<label for=...>`.
+
+Any errors and hints added to the form field are automatically added to the form field control's
+`aria-describedby` set.
+
+### Troubleshooting
+#### Error: Placeholder attribute and child element were both specified
+This error occurs when you have specified two conflicting placeholders. Make sure that you haven't
+included both a `placeholder` property on your form field control and a `<mat-placeholder>`
+element.
+
+#### Error: A hint was already declared for align="..."
+This error occurs if you have added multiple hints for the same side. Keep in mind that the
+`hintLabel` property adds a hint to the start side.
+
+#### Error: mat-form-field must contain a MatFormFieldControl
+This error occurs when you have not added a form field control to your form field. If your form
+field contains a native `<input>` or `<textarea>` element, make sure you've added the `matInput`
+directive to it. Other components that can act as a form field control include `<mat-select>`,
+`<mat-chip-list>`, and any custom form field controls you've created.
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 9a0fa11c6e4c..73dd42caaaa6 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -41,6 +41,13 @@ import {DialogElementsExampleDialog,DialogElementsExample} from './dialog-elemen
 import {DialogOverviewExampleDialog,DialogOverviewExample} from './dialog-overview/dialog-overview-example';
 import {ExpansionOverviewExample} from './expansion-overview/expansion-overview-example';
 import {ExpansionStepsExample} from './expansion-steps/expansion-steps-example';
+import {MyTelInput,FormFieldCustomControlExample} from './form-field-custom-control/form-field-custom-control-example';
+import {FormFieldErrorExample} from './form-field-error/form-field-error-example';
+import {FormFieldHintExample} from './form-field-hint/form-field-hint-example';
+import {FormFieldOverviewExample} from './form-field-overview/form-field-overview-example';
+import {FormFieldPlaceholderExample} from './form-field-placeholder/form-field-placeholder-example';
+import {FormFieldPrefixSuffixExample} from './form-field-prefix-suffix/form-field-prefix-suffix-example';
+import {FormFieldThemingExample} from './form-field-theming/form-field-theming-example';
 import {GridListDynamicExample} from './grid-list-dynamic/grid-list-dynamic-example';
 import {GridListOverviewExample} from './grid-list-overview/grid-list-overview-example';
 import {IconOverviewExample} from './icon-overview/icon-overview-example';
@@ -260,6 +267,48 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'form-field-custom-control': {
+    title: 'Form field with custom telephone number input control. ',
+    component: FormFieldCustomControlExample,
+    additionalFiles: ["form-field-custom-control-example.html"],
+    selectorName: 'FormFieldCustomControlExample, MyTelInput'
+  },
+  'form-field-error': {
+    title: 'Form field with error messages ',
+    component: FormFieldErrorExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'form-field-hint': {
+    title: 'Form field with hints ',
+    component: FormFieldHintExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'form-field-overview': {
+    title: 'Simple form field ',
+    component: FormFieldOverviewExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'form-field-placeholder': {
+    title: 'Form field with placeholder ',
+    component: FormFieldPlaceholderExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'form-field-prefix-suffix': {
+    title: 'Form field with prefix & suffix ',
+    component: FormFieldPrefixSuffixExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'form-field-theming': {
+    title: 'Form field theming ',
+    component: FormFieldThemingExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'grid-list-dynamic': {
     title: 'Dynamic grid-list',
     component: GridListDynamicExample,
@@ -585,6 +634,13 @@ export const EXAMPLE_LIST = [
   DialogOverviewExampleDialog,DialogOverviewExample,
   ExpansionOverviewExample,
   ExpansionStepsExample,
+  MyTelInput,FormFieldCustomControlExample,
+  FormFieldErrorExample,
+  FormFieldHintExample,
+  FormFieldOverviewExample,
+  FormFieldPlaceholderExample,
+  FormFieldPrefixSuffixExample,
+  FormFieldThemingExample,
   GridListDynamicExample,
   GridListOverviewExample,
   IconOverviewExample,
diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.css b/src/material-examples/form-field-custom-control/form-field-custom-control-example.css
new file mode 100644
index 000000000000..b62ee863b52b
--- /dev/null
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.css
@@ -0,0 +1,21 @@
+div {
+  display: flex;
+}
+
+input {
+  border: none;
+  background: none;
+  padding: 0;
+  outline: none;
+  font: inherit;
+  text-align: center;
+}
+
+span {
+  opacity: 0;
+  transition: opacity 200ms;
+}
+
+:host.floating span {
+  opacity: 1;
+}
diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.html b/src/material-examples/form-field-custom-control/form-field-custom-control-example.html
new file mode 100644
index 000000000000..cfa6188f73b1
--- /dev/null
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.html
@@ -0,0 +1,7 @@
+<div [formGroup]="parts">
+  <input class="area" formControlName="area" size="3" [disabled]="disabled">
+  <span>&ndash;</span>
+  <input class="exchange" formControlName="exchange" size="3" [disabled]="disabled">
+  <span>&ndash;</span>
+  <input class="subscriber" formControlName="subscriber" size="4" [disabled]="disabled">
+</div>
diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
new file mode 100644
index 000000000000..10a52245175a
--- /dev/null
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
@@ -0,0 +1,137 @@
+import {FocusMonitor} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {Component, ElementRef, HostBinding, Input, OnDestroy, Renderer2} from '@angular/core';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {MatFormFieldControl} from '@angular/material/form-field';
+import {Subject} from 'rxjs/Subject';
+
+
+/** Data structure for holding telephone number. */
+export class MyTel {
+  constructor(public area: string, public exchange: string, public subscriber: string) {}
+}
+
+
+/** Custom `MatFormFieldControl` for telephone number input. */
+@Component({
+  selector: 'my-tel-input',
+  templateUrl: 'form-field-custom-control-example.html',
+  styleUrls: ['form-field-custom-control-example.css'],
+  providers: [{provide: MatFormFieldControl, useExisting: MyTelInput}],
+})
+export class MyTelInput implements MatFormFieldControl<MyTel>, OnDestroy {
+  static nextId = 0;
+
+  parts: FormGroup;
+
+  stateChanges = new Subject<void>();
+
+  focused = false;
+
+  ngControl = null;
+
+  errorState = false;
+
+  controlType = 'my-tel-input';
+
+  get empty() {
+    let n = this.parts.value;
+    return !n.area && !n.exchange && !n.subscriber;
+  }
+
+  @HostBinding('class.floating')
+  get shouldPlaceholderFloat() {
+    return this.focused || !this.empty;
+  }
+
+  @HostBinding() id = `my-tel-input-${MyTelInput.nextId++}`;
+
+  @HostBinding('attr.aria-describedby') describedBy = '';
+
+  @Input()
+  get placeholder() {
+    return this._placeholder;
+  }
+  set placeholder(plh) {
+    this._placeholder = plh;
+    this.stateChanges.next();
+  }
+  private _placeholder: string;
+
+  @Input()
+  get required() {
+    return this._required;
+  }
+  set required(req) {
+    this._required = coerceBooleanProperty(req);
+    this.stateChanges.next();
+  }
+  private _required = false;
+
+  @Input()
+  get disabled() {
+    return this._disabled;
+  }
+  set disabled(dis) {
+    this._disabled = coerceBooleanProperty(dis);
+    this.stateChanges.next();
+  }
+  private _disabled = false;
+
+  @Input()
+  get value(): MyTel | null {
+    let n = this.parts.value;
+    if (n.area.length == 3 && n.exchange.length == 3 && n.subscriber.length == 4) {
+      return new MyTel(n.area, n.exchange, n.subscriber);
+    }
+    return null;
+  }
+  set value(tel: MyTel | null) {
+    tel = tel || new MyTel('', '', '');
+    this.parts.setValue({area: tel.area, exchange: tel.exchange, subscriber: tel.subscriber});
+    this.stateChanges.next();
+  }
+
+  constructor(fb: FormBuilder, private fm: FocusMonitor, private elRef: ElementRef,
+              renderer: Renderer2) {
+    this.parts =  fb.group({
+      'area': '',
+      'exchange': '',
+      'subscriber': '',
+    });
+
+    fm.monitor(elRef.nativeElement, renderer, true).subscribe((origin) => {
+      this.focused = !!origin;
+      this.stateChanges.next();
+    });
+  }
+
+  ngOnDestroy() {
+    this.stateChanges.complete();
+    this.fm.stopMonitoring(this.elRef.nativeElement);
+  }
+
+  setDescribedByIds(ids: string[]) {
+    this.describedBy = ids.join(' ');
+  }
+
+  onContainerClick(event: MouseEvent) {
+    if ((event.target as Element).tagName.toLowerCase() != 'input') {
+      this.elRef.nativeElement.querySelector('input').focus();
+    }
+  }
+}
+
+
+/** @title Form field with custom telephone number input control. */
+@Component({
+  selector: 'form-field-custom-control-example',
+  template: `
+    <mat-form-field>
+      <my-tel-input placeholder="Phone number" required></my-tel-input>
+      <mat-icon matSuffix>phone</mat-icon>
+      <mat-hint>Include area code</mat-hint>
+    </mat-form-field>
+  `
+})
+export class FormFieldCustomControlExample {}
diff --git a/src/material-examples/form-field-error/form-field-error-example.css b/src/material-examples/form-field-error/form-field-error-example.css
new file mode 100644
index 000000000000..cfd4505c7c7a
--- /dev/null
+++ b/src/material-examples/form-field-error/form-field-error-example.css
@@ -0,0 +1,8 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.example-container > * {
+  width: 100%;
+}
diff --git a/src/material-examples/form-field-error/form-field-error-example.html b/src/material-examples/form-field-error/form-field-error-example.html
new file mode 100644
index 000000000000..4b06c9b07b86
--- /dev/null
+++ b/src/material-examples/form-field-error/form-field-error-example.html
@@ -0,0 +1,6 @@
+<div class="example-container">
+  <mat-form-field>
+    <input matInput placeholder="Enter your email" [formControl]="email" required>
+    <mat-error *ngIf="email.invalid">{{getErrorMessage()}}</mat-error>
+  </mat-form-field>
+</div>
diff --git a/src/material-examples/form-field-error/form-field-error-example.ts b/src/material-examples/form-field-error/form-field-error-example.ts
new file mode 100644
index 000000000000..ac867e7157f0
--- /dev/null
+++ b/src/material-examples/form-field-error/form-field-error-example.ts
@@ -0,0 +1,18 @@
+import {Component} from '@angular/core';
+import {FormControl, Validators} from '@angular/forms';
+
+/** @title Form field with error messages */
+@Component({
+  selector: 'form-field-error-example',
+  templateUrl: 'form-field-error-example.html',
+  styleUrls: ['form-field-error-example.css']
+})
+export class FormFieldErrorExample {
+  email = new FormControl('', [Validators.required, Validators.email]);
+
+  getErrorMessage() {
+    return this.email.hasError('required') ? 'You must enter a value' :
+        this.email.hasError('email') ? 'Not a valid email' :
+            '';
+  }
+}
diff --git a/src/material-examples/form-field-hint/form-field-hint-example.css b/src/material-examples/form-field-hint/form-field-hint-example.css
new file mode 100644
index 000000000000..cfd4505c7c7a
--- /dev/null
+++ b/src/material-examples/form-field-hint/form-field-hint-example.css
@@ -0,0 +1,8 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.example-container > * {
+  width: 100%;
+}
diff --git a/src/material-examples/form-field-hint/form-field-hint-example.html b/src/material-examples/form-field-hint/form-field-hint-example.html
new file mode 100644
index 000000000000..a402d988c0fa
--- /dev/null
+++ b/src/material-examples/form-field-hint/form-field-hint-example.html
@@ -0,0 +1,13 @@
+<div class="example-container">
+  <mat-form-field hintLabel="Max 10 characters">
+    <input matInput #input maxlength="10" placeholder="Enter some input">
+    <mat-hint align="end">{{input.value?.length || 0}}/10</mat-hint>
+  </mat-form-field>
+
+  <mat-form-field>
+    <mat-select placeholder="Select me">
+      <mat-option value="option">Option</mat-option>
+    </mat-select>
+    <mat-hint align="end">Here's the dropdown arrow ^</mat-hint>
+  </mat-form-field>
+</div>
diff --git a/src/material-examples/form-field-hint/form-field-hint-example.ts b/src/material-examples/form-field-hint/form-field-hint-example.ts
new file mode 100644
index 000000000000..1ae1b159368e
--- /dev/null
+++ b/src/material-examples/form-field-hint/form-field-hint-example.ts
@@ -0,0 +1,9 @@
+import {Component} from '@angular/core';
+
+/** @title Form field with hints */
+@Component({
+  selector: 'form-field-hint-example',
+  templateUrl: 'form-field-hint-example.html',
+  styleUrls: ['form-field-hint-example.css']
+})
+export class FormFieldHintExample {}
diff --git a/src/material-examples/form-field-overview/form-field-overview-example.css b/src/material-examples/form-field-overview/form-field-overview-example.css
new file mode 100644
index 000000000000..cfd4505c7c7a
--- /dev/null
+++ b/src/material-examples/form-field-overview/form-field-overview-example.css
@@ -0,0 +1,8 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.example-container > * {
+  width: 100%;
+}
diff --git a/src/material-examples/form-field-overview/form-field-overview-example.html b/src/material-examples/form-field-overview/form-field-overview-example.html
new file mode 100644
index 000000000000..6427e7df313b
--- /dev/null
+++ b/src/material-examples/form-field-overview/form-field-overview-example.html
@@ -0,0 +1,15 @@
+<div class="example-container">
+  <mat-form-field>
+    <input matInput placeholder="Input">
+  </mat-form-field>
+
+  <mat-form-field>
+    <textarea matInput placeholder="Textarea"></textarea>
+  </mat-form-field>
+
+  <mat-form-field>
+    <mat-select placeholder="Select">
+      <mat-option value="option">Option</mat-option>
+    </mat-select>
+  </mat-form-field>
+</div>
diff --git a/src/material-examples/form-field-overview/form-field-overview-example.ts b/src/material-examples/form-field-overview/form-field-overview-example.ts
new file mode 100644
index 000000000000..252002097827
--- /dev/null
+++ b/src/material-examples/form-field-overview/form-field-overview-example.ts
@@ -0,0 +1,9 @@
+import {Component} from '@angular/core';
+
+/** @title Simple form field */
+@Component({
+  selector: 'form-field-overview-example',
+  templateUrl: 'form-field-overview-example.html',
+  styleUrls: ['form-field-overview-example.css']
+})
+export class FormFieldOverviewExample {}
diff --git a/src/material-examples/form-field-placeholder/form-field-placeholder-example.css b/src/material-examples/form-field-placeholder/form-field-placeholder-example.css
new file mode 100644
index 000000000000..333087a490e5
--- /dev/null
+++ b/src/material-examples/form-field-placeholder/form-field-placeholder-example.css
@@ -0,0 +1,20 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.example-container > * {
+  width: 100%;
+}
+
+.example-container form {
+  margin-bottom: 20px;
+}
+
+.example-container form > * {
+  margin: 5px 0;
+}
+
+.example-container .mat-radio-button {
+  margin: 0 5px;
+}
diff --git a/src/material-examples/form-field-placeholder/form-field-placeholder-example.html b/src/material-examples/form-field-placeholder/form-field-placeholder-example.html
new file mode 100644
index 000000000000..01ef48d34310
--- /dev/null
+++ b/src/material-examples/form-field-placeholder/form-field-placeholder-example.html
@@ -0,0 +1,29 @@
+<div class="example-container">
+  <form class="example-container" [formGroup]="options">
+    <mat-checkbox formControlName="hideRequired">Hide required marker</mat-checkbox>
+    <div>
+      <label>Float placeholder: </label>
+      <mat-radio-group formControlName="floatPlaceholder">
+        <mat-radio-button value="auto">Auto</mat-radio-button>
+        <mat-radio-button value="always">Always</mat-radio-button>
+        <mat-radio-button value="never">Never</mat-radio-button>
+      </mat-radio-group>
+    </div>
+  </form>
+
+  <mat-form-field
+      [hideRequiredMarker]="options.value.hideRequired"
+      [floatPlaceholder]="options.value.floatPlaceholder">
+    <input matInput placeholder="Simple placeholder" required>
+  </mat-form-field>
+
+  <mat-form-field
+      [hideRequiredMarker]="options.value.hideRequired"
+      [floatPlaceholder]="options.value.floatPlaceholder">
+    <mat-select required>
+      <mat-option>-- None --</mat-option>
+      <mat-option value="option">Option</mat-option>
+    </mat-select>
+    <mat-placeholder><mat-icon>favorite</mat-icon> <b> Fancy</b> <i> placeholder</i></mat-placeholder>
+  </mat-form-field>
+</div>
diff --git a/src/material-examples/form-field-placeholder/form-field-placeholder-example.ts b/src/material-examples/form-field-placeholder/form-field-placeholder-example.ts
new file mode 100644
index 000000000000..8d21f1ebb244
--- /dev/null
+++ b/src/material-examples/form-field-placeholder/form-field-placeholder-example.ts
@@ -0,0 +1,19 @@
+import {Component} from '@angular/core';
+import {FormBuilder, FormGroup} from '@angular/forms';
+
+/** @title Form field with placeholder */
+@Component({
+  selector: 'form-field-placeholder-example',
+  templateUrl: 'form-field-placeholder-example.html',
+  styleUrls: ['form-field-placeholder-example.css']
+})
+export class FormFieldPlaceholderExample {
+  options: FormGroup;
+
+  constructor(fb: FormBuilder) {
+    this.options = fb.group({
+      hideRequired: false,
+      floatPlaceholder: 'auto',
+    });
+  }
+}
diff --git a/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.css b/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.css
new file mode 100644
index 000000000000..0a7a621eff5e
--- /dev/null
+++ b/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.css
@@ -0,0 +1,17 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.example-container > * {
+  width: 100%;
+}
+
+.example-right-align {
+  text-align: right;
+}
+
+input.example-right-align::-webkit-outer-spin-button,
+input.example-right-align::-webkit-inner-spin-button {
+  display: none;
+}
diff --git a/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.html b/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.html
new file mode 100644
index 000000000000..e3099d906804
--- /dev/null
+++ b/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.html
@@ -0,0 +1,12 @@
+<div class="example-container">
+  <mat-form-field>
+    <input matInput placeholder="Enter your password" [type]="hide ? 'password' : 'text'">
+    <mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility' : 'visibility_off'}}</mat-icon>
+  </mat-form-field>
+
+  <mat-form-field>
+    <input matInput placeholder="Amount" type="number" class="example-right-align">
+    <span matPrefix>$&nbsp;</span>
+    <span matSuffix>.00</span>
+  </mat-form-field>
+</div>
diff --git a/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.ts b/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.ts
new file mode 100644
index 000000000000..16b24e7b45ec
--- /dev/null
+++ b/src/material-examples/form-field-prefix-suffix/form-field-prefix-suffix-example.ts
@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+
+/** @title Form field with prefix & suffix */
+@Component({
+  selector: 'form-field-prefix-suffix-example',
+  templateUrl: 'form-field-prefix-suffix-example.html',
+  styleUrls: ['form-field-prefix-suffix-example.css']
+})
+export class FormFieldPrefixSuffixExample {
+  hide = true;
+}
diff --git a/src/material-examples/form-field-theming/form-field-theming-example.css b/src/material-examples/form-field-theming/form-field-theming-example.css
new file mode 100644
index 000000000000..cfd4505c7c7a
--- /dev/null
+++ b/src/material-examples/form-field-theming/form-field-theming-example.css
@@ -0,0 +1,8 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.example-container > * {
+  width: 100%;
+}
diff --git a/src/material-examples/form-field-theming/form-field-theming-example.html b/src/material-examples/form-field-theming/form-field-theming-example.html
new file mode 100644
index 000000000000..8545ebefd2a6
--- /dev/null
+++ b/src/material-examples/form-field-theming/form-field-theming-example.html
@@ -0,0 +1,14 @@
+<form class="example-container" [formGroup]="options" [style.fontSize.px]="getFontSize()">
+  <mat-form-field [color]="options.value.color">
+    <mat-select placeholder="Color" formControlName="color">
+      <mat-option value="primary">Primary</mat-option>
+      <mat-option value="accent">Accent</mat-option>
+      <mat-option value="warn">Warn</mat-option>
+    </mat-select>
+  </mat-form-field>
+
+  <mat-form-field [color]="options.value.color">
+    <input matInput type="number" placeholder="Font size (px)" formControlName="fontSize" min="10">
+    <mat-error *ngIf="options.get('fontSize').invalid">Min size: 10px</mat-error>
+  </mat-form-field>
+</form>
diff --git a/src/material-examples/form-field-theming/form-field-theming-example.ts b/src/material-examples/form-field-theming/form-field-theming-example.ts
new file mode 100644
index 000000000000..1e27dbc40b29
--- /dev/null
+++ b/src/material-examples/form-field-theming/form-field-theming-example.ts
@@ -0,0 +1,23 @@
+import {Component} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+
+/** @title Form field theming */
+@Component({
+  selector: 'form-field-theming-example',
+  templateUrl: 'form-field-theming-example.html',
+  styleUrls: ['form-field-theming-example.css']
+})
+export class FormFieldThemingExample {
+  options: FormGroup;
+
+  constructor(fb: FormBuilder) {
+    this.options = fb.group({
+      'color': 'primary',
+      'fontSize': [16, Validators.min(10)],
+    });
+  }
+
+  getFontSize() {
+    return Math.max(10, this.options.value.fontSize);
+  }
+}

From 3f0142b51e075954ea1c832c1076b8b33c9bbaca Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 4 Oct 2017 16:41:27 -0700
Subject: [PATCH 250/575] chore: don't use HostBinding in example (#7540)

---
 .../form-field-custom-control-example.ts             | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
index 10a52245175a..7aa65c0b762b 100644
--- a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
@@ -1,6 +1,6 @@
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {Component, ElementRef, HostBinding, Input, OnDestroy, Renderer2} from '@angular/core';
+import {Component, ElementRef, Input, OnDestroy, Renderer2} from '@angular/core';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {MatFormFieldControl} from '@angular/material/form-field';
 import {Subject} from 'rxjs/Subject';
@@ -18,6 +18,11 @@ export class MyTel {
   templateUrl: 'form-field-custom-control-example.html',
   styleUrls: ['form-field-custom-control-example.css'],
   providers: [{provide: MatFormFieldControl, useExisting: MyTelInput}],
+  host: {
+    '[class.floating]': 'shouldPlaceholderFloat',
+    '[id]': 'id',
+    '[attr.aria-describedby]': 'describedBy',
+  }
 })
 export class MyTelInput implements MatFormFieldControl<MyTel>, OnDestroy {
   static nextId = 0;
@@ -39,14 +44,13 @@ export class MyTelInput implements MatFormFieldControl<MyTel>, OnDestroy {
     return !n.area && !n.exchange && !n.subscriber;
   }
 
-  @HostBinding('class.floating')
   get shouldPlaceholderFloat() {
     return this.focused || !this.empty;
   }
 
-  @HostBinding() id = `my-tel-input-${MyTelInput.nextId++}`;
+  id = `my-tel-input-${MyTelInput.nextId++}`;
 
-  @HostBinding('attr.aria-describedby') describedBy = '';
+  describedBy = '';
 
   @Input()
   get placeholder() {

From 3b0915adf0d12b30a2f5ca0a5c9acc5857745328 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 5 Oct 2017 02:23:20 +0200
Subject: [PATCH 251/575] feat(viewport-ruler): add common window resize
 handler (#7113)

BREAKING CHANGE: Previously the `ScrollDispatcher.scrolled` subscription would react both on scroll events and on window resize events. Now it only reacts to scroll events. To react to resize events, subscribe to the `ViewportRuler.change()` stream.
---
 src/cdk/overlay/overlay-ref.ts                |  6 ++-
 .../position/connected-position-strategy.ts   | 16 +++++-
 src/cdk/overlay/position/position-strategy.ts |  3 ++
 src/cdk/scrolling/scroll-dispatcher.spec.ts   |  1 -
 src/cdk/scrolling/scroll-dispatcher.ts        |  6 +--
 src/cdk/scrolling/viewport-ruler.spec.ts      | 40 +++++++++++++-
 src/cdk/scrolling/viewport-ruler.ts           | 52 +++++++++++++++----
 src/lib/tabs/tab-group.spec.ts                |  6 +--
 src/lib/tabs/tab-header.spec.ts               |  7 ++-
 src/lib/tabs/tab-header.ts                    |  9 ++--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts  |  6 +--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts       | 19 +++----
 12 files changed, 124 insertions(+), 47 deletions(-)

diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 8bac983a41f0..998b1d9bccbc 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -95,11 +95,15 @@ export class OverlayRef implements PortalHost {
     // pointer events therefore. Depends on the position strategy and the applied pane boundaries.
     this._togglePointerEvents(false);
 
+    if (this._config.positionStrategy && this._config.positionStrategy.detach) {
+      this._config.positionStrategy.detach();
+    }
+
     if (this._config.scrollStrategy) {
       this._config.scrollStrategy.disable();
     }
 
-    const detachmentResult  = this._portalHost.detach();
+    const detachmentResult = this._portalHost.detach();
 
     // Only emit after everything is detached.
     this._detachments.next();
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 4384f0316687..33f1c290d36a 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -17,6 +17,7 @@ import {
   ScrollingVisibility,
 } from './connected-position';
 import {Subject} from 'rxjs/Subject';
+import {Subscription} from 'rxjs/Subscription';
 import {Observable} from 'rxjs/Observable';
 import {Scrollable} from '@angular/cdk/scrolling';
 import {isElementScrolledOutsideView, isElementClippedByScrolling} from './scroll-clip';
@@ -35,6 +36,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   /** The overlay to which this strategy is attached. */
   private _overlayRef: OverlayRef;
 
+  /** Layout direction of the position strategy. */
   private _dir = 'ltr';
 
   /** The offset in pixels for the overlay connection point on the x-axis */
@@ -46,6 +48,9 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   /** The Scrollable containers used to check scrollable view properties on position change. */
   private scrollables: Scrollable[] = [];
 
+  /** Subscription to viewport resize events. */
+  private _resizeSubscription = Subscription.EMPTY;
+
   /** Whether the we're dealing with an RTL context */
   get _isRtl() {
     return this._dir === 'rtl';
@@ -88,10 +93,19 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   attach(overlayRef: OverlayRef): void {
     this._overlayRef = overlayRef;
     this._pane = overlayRef.overlayElement;
+    this._resizeSubscription.unsubscribe();
+    this._resizeSubscription = this._viewportRuler.change().subscribe(() => this.apply());
   }
 
   /** Performs any cleanup after the element is destroyed. */
-  dispose() { }
+  dispose() {
+    this._resizeSubscription.unsubscribe();
+  }
+
+  /** @docs-private */
+  detach() {
+    this._resizeSubscription.unsubscribe();
+  }
 
   /**
    * Updates the position of the overlay element, using whichever preferred position relative
diff --git a/src/cdk/overlay/position/position-strategy.ts b/src/cdk/overlay/position/position-strategy.ts
index d848f4f4c51c..2483fb3594b0 100644
--- a/src/cdk/overlay/position/position-strategy.ts
+++ b/src/cdk/overlay/position/position-strategy.ts
@@ -18,6 +18,9 @@ export interface PositionStrategy {
   /** Updates the position of the overlay element. */
   apply(): void;
 
+  /** Called when the overlay is detached. */
+  detach?(): void;
+
   /** Cleans up any DOM modifications made by the position strategy, if necessary. */
   dispose(): void;
 }
diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index 68c94a5e3bef..6fcb17c619ff 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -72,7 +72,6 @@ describe('Scroll Dispatcher', () => {
 
       scroll.scrolled(0, () => {});
       dispatchFakeEvent(document, 'scroll');
-      dispatchFakeEvent(window, 'resize');
 
       expect(spy).not.toHaveBeenCalled();
       subscription.unsubscribe();
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 177f830ac2c0..0e0e5b6aa1d1 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -11,7 +11,6 @@ import {Platform} from '@angular/cdk/platform';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {fromEvent} from 'rxjs/observable/fromEvent';
-import {merge} from 'rxjs/observable/merge';
 import {auditTime} from 'rxjs/operator/auditTime';
 import {Scrollable} from './scrollable';
 
@@ -87,10 +86,7 @@ export class ScrollDispatcher {
 
     if (!this._globalSubscription) {
       this._globalSubscription = this._ngZone.runOutsideAngular(() => {
-        return merge(
-          fromEvent(window.document, 'scroll'),
-          fromEvent(window, 'resize')
-        ).subscribe(() => this._notify());
+        return fromEvent(window.document, 'scroll').subscribe(() => this._notify());
       });
     }
 
diff --git a/src/cdk/scrolling/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts
index f5afd837e752..678e9fb116b9 100644
--- a/src/cdk/scrolling/viewport-ruler.spec.ts
+++ b/src/cdk/scrolling/viewport-ruler.spec.ts
@@ -1,6 +1,7 @@
-import {TestBed, inject} from '@angular/core/testing';
+import {TestBed, inject, fakeAsync, tick} from '@angular/core/testing';
 import {ScrollDispatchModule} from './public-api';
 import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
+import {dispatchFakeEvent} from '@angular/cdk/testing';
 
 
 // For all tests, we assume the browser window is 1024x786 (outerWidth x outerHeight).
@@ -32,6 +33,10 @@ describe('ViewportRuler', () => {
     scrollTo(0, 0);
   }));
 
+  afterEach(() => {
+    ruler.ngOnDestroy();
+  });
+
   it('should get the viewport bounds when the page is not scrolled', () => {
     let bounds = ruler.getViewportRect();
     expect(bounds.top).toBe(0);
@@ -101,4 +106,37 @@ describe('ViewportRuler', () => {
 
     document.body.removeChild(veryLargeElement);
   });
+
+  describe('changed event', () => {
+    it('should dispatch an event when the window is resized', () => {
+      const spy = jasmine.createSpy('viewport changed spy');
+      const subscription = ruler.change(0).subscribe(spy);
+
+      dispatchFakeEvent(window, 'resize');
+      expect(spy).toHaveBeenCalled();
+      subscription.unsubscribe();
+    });
+
+    it('should dispatch an event when the orientation is changed', () => {
+      const spy = jasmine.createSpy('viewport changed spy');
+      const subscription = ruler.change(0).subscribe(spy);
+
+      dispatchFakeEvent(window, 'orientationchange');
+      expect(spy).toHaveBeenCalled();
+      subscription.unsubscribe();
+    });
+
+    it('should be able to throttle the callback', fakeAsync(() => {
+      const spy = jasmine.createSpy('viewport changed spy');
+      const subscription = ruler.change(1337).subscribe(spy);
+
+      dispatchFakeEvent(window, 'resize');
+      expect(spy).not.toHaveBeenCalled();
+
+      tick(1337);
+
+      expect(spy).toHaveBeenCalledTimes(1);
+      subscription.unsubscribe();
+    }));
+  });
 });
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index 8d7087c70f25..683d5853ce77 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -6,23 +6,49 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional, SkipSelf} from '@angular/core';
+import {Injectable, Optional, SkipSelf, NgZone, OnDestroy} from '@angular/core';
+import {Platform} from '@angular/cdk/platform';
 import {ScrollDispatcher} from './scroll-dispatcher';
+import {Observable} from 'rxjs/Observable';
+import {fromEvent} from 'rxjs/observable/fromEvent';
+import {merge} from 'rxjs/observable/merge';
+import {auditTime} from 'rxjs/operator/auditTime';
+import {Subscription} from 'rxjs/Subscription';
+import {of as observableOf} from 'rxjs/observable/of';
 
+/** Time in ms to throttle the resize events by default. */
+export const DEFAULT_RESIZE_TIME = 20;
 
 /**
  * Simple utility for getting the bounds of the browser viewport.
  * @docs-private
  */
 @Injectable()
-export class ViewportRuler {
+export class ViewportRuler implements OnDestroy {
 
   /** Cached document client rectangle. */
   private _documentRect?: ClientRect;
 
-  constructor(scrollDispatcher: ScrollDispatcher) {
+  /** Stream of viewport change events. */
+  private _change: Observable<Event>;
+
+  /** Subscriptions to streams that invalidate the cached viewport dimensions. */
+  private _invalidateCacheSubscriptions: Subscription[];
+
+  constructor(platform: Platform, ngZone: NgZone, scrollDispatcher: ScrollDispatcher) {
+    this._change = platform.isBrowser ? ngZone.runOutsideAngular(() => {
+      return merge<Event>(fromEvent(window, 'resize'), fromEvent(window, 'orientationchange'));
+    }) : observableOf();
+
     // Subscribe to scroll and resize events and update the document rectangle on changes.
-    scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry());
+    this._invalidateCacheSubscriptions = [
+      scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry()),
+      this.change().subscribe(() => this._cacheViewportGeometry())
+    ];
+  }
+
+  ngOnDestroy() {
+    this._invalidateCacheSubscriptions.forEach(subscription => subscription.unsubscribe());
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
@@ -56,7 +82,6 @@ export class ViewportRuler {
     };
   }
 
-
   /**
    * Gets the (top, left) scroll position of the viewport.
    * @param documentRect
@@ -75,7 +100,7 @@ export class ViewportRuler {
     // `document.documentElement` works consistently, where the `top` and `left` values will
     // equal negative the scroll position.
     const top = -documentRect!.top || document.body.scrollTop || window.scrollY ||
-                  document.documentElement.scrollTop || 0;
+                 document.documentElement.scrollTop || 0;
 
     const left = -documentRect!.left || document.body.scrollLeft || window.scrollX ||
                   document.documentElement.scrollLeft || 0;
@@ -83,23 +108,32 @@ export class ViewportRuler {
     return {top, left};
   }
 
+  /**
+   * Returns a stream that emits whenever the size of the viewport changes.
+   * @param throttle Time in milliseconds to throttle the stream.
+   */
+  change(throttleTime: number = DEFAULT_RESIZE_TIME): Observable<string> {
+    return throttleTime > 0 ? auditTime.call(this._change, throttleTime) : this._change;
+  }
+
   /** Caches the latest client rectangle of the document element. */
   _cacheViewportGeometry() {
     this._documentRect = document.documentElement.getBoundingClientRect();
   }
-
 }
 
 /** @docs-private */
 export function VIEWPORT_RULER_PROVIDER_FACTORY(parentRuler: ViewportRuler,
+                                                platform: Platform,
+                                                ngZone: NgZone,
                                                 scrollDispatcher: ScrollDispatcher) {
-  return parentRuler || new ViewportRuler(scrollDispatcher);
+  return parentRuler || new ViewportRuler(platform, ngZone, scrollDispatcher);
 }
 
 /** @docs-private */
 export const VIEWPORT_RULER_PROVIDER = {
   // If there is already a ViewportRuler available, use that. Otherwise, provide a new one.
   provide: ViewportRuler,
-  deps: [[new Optional(), new SkipSelf(), ViewportRuler], ScrollDispatcher],
+  deps: [[new Optional(), new SkipSelf(), ViewportRuler], Platform, NgZone, ScrollDispatcher],
   useFactory: VIEWPORT_RULER_PROVIDER_FACTORY
 };
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index cf1f72a54711..5134ee024677 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -2,8 +2,7 @@ import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/t
 import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {By} from '@angular/platform-browser';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent} from '@angular/cdk/testing';
 import {Observable} from 'rxjs/Observable';
 import {MatTab, MatTabGroup, MatTabHeaderPosition, MatTabsModule} from './index';
 
@@ -20,9 +19,6 @@ describe('MatTabGroup', () => {
         DisabledTabsTestApp,
         TabGroupWithSimpleApi,
       ],
-      providers: [
-        {provide: ViewportRuler, useClass: FakeViewportRuler},
-      ]
     });
 
     TestBed.compileComponents();
diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index 19e6f2d67199..97cc051c33d1 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -6,15 +6,14 @@ import {CommonModule} from '@angular/common';
 import {By} from '@angular/platform-browser';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
 import {PortalModule} from '@angular/cdk/portal';
-import {ViewportRuler} from '@angular/cdk/scrolling';
 import {Direction, Directionality} from '@angular/cdk/bidi';
-import {dispatchFakeEvent, dispatchKeyboardEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {MatTabHeader} from './tab-header';
 import {MatRippleModule} from '@angular/material/core';
 import {MatInkBar} from './ink-bar';
 import {MatTabLabelWrapper} from './tab-label-wrapper';
 import {Subject} from 'rxjs/Subject';
-
+import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 
 
 describe('MatTabHeader', () => {
@@ -34,8 +33,8 @@ describe('MatTabHeader', () => {
         SimpleTabHeaderApp,
       ],
       providers: [
+        VIEWPORT_RULER_PROVIDER,
         {provide: Directionality, useFactory: () => ({value: dir, change: change.asObservable()})},
-        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 8132ebf6ab3a..668f0acf57a2 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -8,7 +8,7 @@
 
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
-import {auditTime, startWith} from '@angular/cdk/rxjs';
+import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentChecked,
   AfterContentInit,
@@ -28,12 +28,12 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
-import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subscription} from 'rxjs/Subscription';
 import {MatInkBar} from './ink-bar';
 import {MatTabLabelWrapper} from './tab-label-wrapper';
+import {ViewportRuler} from '@angular/cdk/scrolling';
 
 
 /**
@@ -134,6 +134,7 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
   constructor(private _elementRef: ElementRef,
               private _renderer: Renderer2,
               private _changeDetectorRef: ChangeDetectorRef,
+              private _viewportRuler: ViewportRuler,
               @Optional() private _dir: Directionality) {
     super();
   }
@@ -186,9 +187,7 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
    */
   ngAfterContentInit() {
     const dirChange = this._dir ? this._dir.change : observableOf(null);
-    const resize = typeof window !== 'undefined' ?
-        auditTime.call(fromEvent(window, 'resize'), 150) :
-        observableOf(null);
+    const resize = this._viewportRuler.change(150);
 
     this._realignInkBar = startWith.call(merge(dirChange, resize), null).subscribe(() => {
       this._updatePagination();
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index 19eb376cd0db..3aa7542e9c5a 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -1,8 +1,7 @@
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchFakeEvent, dispatchMouseEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {Subject} from 'rxjs/Subject';
 import {MatTabNav, MatTabsModule, MatTabLink} from '../index';
@@ -24,7 +23,6 @@ describe('MatTabNavBar', () => {
           value: dir,
           change: dirChange.asObservable()
         })},
-        {provide: ViewportRuler, useClass: FakeViewportRuler},
       ]
     });
 
@@ -173,7 +171,7 @@ describe('MatTabNavBar', () => {
       spyOn(inkBar, 'alignToElement');
 
       dispatchFakeEvent(window, 'resize');
-      tick(10);
+      tick(150);
       fixture.detectChanges();
 
       expect(inkBar.alignToElement).toHaveBeenCalled();
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 8f068d01ccc1..9c8dcef2bceb 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -9,7 +9,8 @@
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Platform} from '@angular/cdk/platform';
-import {auditTime, takeUntil} from '@angular/cdk/rxjs';
+import {takeUntil} from '@angular/cdk/rxjs';
+import {ViewportRuler} from '@angular/cdk/scrolling';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -41,7 +42,6 @@ import {
   RippleGlobalOptions,
   ThemePalette,
 } from '@angular/material/core';
-import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subject} from 'rxjs/Subject';
@@ -114,7 +114,8 @@ export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit,
               elementRef: ElementRef,
               @Optional() private _dir: Directionality,
               private _ngZone: NgZone,
-              private _changeDetectorRef: ChangeDetectorRef) {
+              private _changeDetectorRef: ChangeDetectorRef,
+              private _viewportRuler: ViewportRuler) {
     super(renderer, elementRef);
   }
 
@@ -130,14 +131,10 @@ export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit,
 
   ngAfterContentInit(): void {
     this._ngZone.runOutsideAngular(() => {
-      let dirChange = this._dir ? this._dir.change : observableOf(null);
-      let resize = typeof window !== 'undefined' ?
-          auditTime.call(fromEvent(window, 'resize'), 10) :
-          observableOf(null);
-
-      return takeUntil.call(merge(dirChange, resize), this._onDestroy).subscribe(() => {
-        this._alignInkBar();
-      });
+      const dirChange = this._dir ? this._dir.change : observableOf(null);
+
+      return takeUntil.call(merge(dirChange, this._viewportRuler.change(10)), this._onDestroy)
+          .subscribe(() => this._alignInkBar());
     });
 
     this._setLinkDisableRipple();

From 9bffe07a380ee6a2d87c2c62ce2c2960e6d21919 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 4 Oct 2017 17:24:49 -0700
Subject: [PATCH 252/575] build: fix firebase demo (#7499)

---
 tools/gulp/tasks/development.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index 8380e70edbc4..2efc892d7cd5 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -68,6 +68,8 @@ task('serve:devapp', ['build:devapp'], sequenceTask([':serve:devapp', ':watch:de
 task('stage-deploy:devapp', ['build:devapp'], () => {
   copyFiles(join(projectDir, 'node_modules'), vendorGlob, join(outDir, 'node_modules'));
   copyFiles(bundlesDir, '*.+(js|map)', join(outDir, 'dist/bundles'));
+  copyFiles(cdkPackage.outputDir, '**/*.+(js|map)', join(outDir, 'dist/packages/cdk'));
+  copyFiles(materialPackage.outputDir, '**/*.+(js|map)', join(outDir, 'dist/packages/material'));
   copyFiles(materialPackage.outputDir, '**/prebuilt/*.+(css|map)',
       join(outDir, 'dist/packages/material'));
 });

From edd792491fb3d022b75a93ad4d53cb435c30ec2a Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Wed, 4 Oct 2017 20:04:09 -0500
Subject: [PATCH 253/575] chore(demo): update chip input demo (#7526)

---
 .../chips-input/chips-input-example.html             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/material-examples/chips-input/chips-input-example.html b/src/material-examples/chips-input/chips-input-example.html
index 3d118fcbfd30..1307f3c4ee1b 100644
--- a/src/material-examples/chips-input/chips-input-example.html
+++ b/src/material-examples/chips-input/chips-input-example.html
@@ -1,14 +1,14 @@
 <mat-form-field class="demo-chip-list">
-  <mat-chip-list matPrefix #chipList>
+  <mat-chip-list #chipList>
     <mat-chip *ngFor="let fruit of fruits" [selectable]="selectable"
              [removable]="removable" (remove)="remove(fruit)">
       {{fruit.name}}
       <mat-icon matChipRemove *ngIf="removable">cancel</mat-icon>
     </mat-chip>
+    <input placeholder="New fruit..."
+           [matChipInputFor]="chipList"
+           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+           [matChipInputAddOnBlur]="addOnBlur"
+           (matChipInputTokenEnd)="add($event)" />
   </mat-chip-list>
-  <input matInput placeholder="New fruit..."
-         [matChipInputFor]="chipList"
-         [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-         [matChipInputAddOnBlur]="addOnBlur"
-         (matChipInputTokenEnd)="add($event)" />
 </mat-form-field>

From ff52d95ec28580590a2ea0d343092cf581ba2596 Mon Sep 17 00:00:00 2001
From: Alyssa Nicoll <mail@alyssanicoll.com>
Date: Wed, 4 Oct 2017 20:04:29 -0500
Subject: [PATCH 254/575] docs(radio-button): add a bit of padding to radio
 button example (#7433)

---
 .../radio-overview/radio-overview-example.css                 | 4 +++-
 .../radio-overview/radio-overview-example.ts                  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/material-examples/radio-overview/radio-overview-example.css b/src/material-examples/radio-overview/radio-overview-example.css
index 7432308753e6..26280cf21134 100644
--- a/src/material-examples/radio-overview/radio-overview-example.css
+++ b/src/material-examples/radio-overview/radio-overview-example.css
@@ -1 +1,3 @@
-/** No CSS for this example */
+.mat-radio-button ~ .mat-radio-button {
+  padding-right: 16px;
+}
diff --git a/src/material-examples/radio-overview/radio-overview-example.ts b/src/material-examples/radio-overview/radio-overview-example.ts
index 916ce6632403..381429475086 100644
--- a/src/material-examples/radio-overview/radio-overview-example.ts
+++ b/src/material-examples/radio-overview/radio-overview-example.ts
@@ -6,5 +6,6 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'radio-overview-example',
   templateUrl: 'radio-overview-example.html',
+  styleUrls: ['radio-overview-example.css'],
 })
 export class RadioOverviewExample {}

From 4a1a68d13814f54437ee549671c125bc0f1f15a0 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 5 Oct 2017 03:30:17 +0200
Subject: [PATCH 255/575] fix(ripple): remove unused ScrollDispatchModule
 (#7528)

---
 src/lib/core/ripple/index.ts       |  3 +--
 src/lib/core/ripple/ripple.spec.ts | 12 +-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts
index 15e9347f7820..4fd6ed5e9bfe 100644
--- a/src/lib/core/ripple/index.ts
+++ b/src/lib/core/ripple/index.ts
@@ -7,7 +7,6 @@
  */
 
 import {NgModule} from '@angular/core';
-import {ScrollDispatchModule} from '@angular/cdk/scrolling';
 import {PlatformModule} from '@angular/cdk/platform';
 import {MatCommonModule} from '../common-behaviors/common-module';
 import {MatRipple} from './ripple';
@@ -17,7 +16,7 @@ export {RippleRef, RippleState} from './ripple-ref';
 export {RippleConfig, RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from './ripple-renderer';
 
 @NgModule({
-  imports: [MatCommonModule, PlatformModule, ScrollDispatchModule],
+  imports: [MatCommonModule, PlatformModule],
   exports: [MatRipple, MatCommonModule],
   declarations: [MatRipple],
 })
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index b8e9c55cd62b..071973d03d76 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -1,7 +1,6 @@
 import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
@@ -13,7 +12,6 @@ describe('MatRipple', () => {
   let fixture: ComponentFixture<any>;
   let rippleTarget: HTMLElement;
   let originalBodyMargin: string | null;
-  let viewportRuler: ViewportRuler;
   let platform: Platform;
 
   /** Extracts the numeric value of a pixel size string like '123px'.  */
@@ -24,7 +22,6 @@ describe('MatRipple', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [MatRippleModule],
-      providers: [VIEWPORT_RULER_PROVIDER],
       declarations: [
         BasicRippleContainer,
         RippleContainerWithInputBindings,
@@ -34,8 +31,7 @@ describe('MatRipple', () => {
     });
   });
 
-  beforeEach(inject([ViewportRuler, Platform], (ruler: ViewportRuler, p: Platform) => {
-    viewportRuler = ruler;
+  beforeEach(inject([Platform], (p: Platform) => {
     platform = p;
 
     // Set body margin to 0 during tests so it doesn't mess up position calculations.
@@ -239,9 +235,6 @@ describe('MatRipple', () => {
 
         // Mobile safari
         window.scrollTo(pageScrollLeft, pageScrollTop);
-        // Force an update of the cached viewport geometries because IE11 emits the
-        // scroll event later.
-        viewportRuler._cacheViewportGeometry();
       });
 
       afterEach(() => {
@@ -255,9 +248,6 @@ describe('MatRipple', () => {
 
         // Mobile safari
         window.scrollTo(0, 0);
-        // Force an update of the cached viewport geometries because IE11 emits the
-        // scroll event later.
-        viewportRuler._cacheViewportGeometry();
       });
 
       it('create ripple with correct position', () => {

From 00e933824bac337b57642140d5a69c7547908b15 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Wed, 4 Oct 2017 18:30:37 -0700
Subject: [PATCH 256/575] feat(nav-tabs): add `mat-tab-label-active` class to
 active nav tab labels (#7508)

---
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts | 18 ++++++++++++++++++
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts      |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index 3aa7542e9c5a..fa0149135546 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -49,6 +49,24 @@ describe('MatTabNavBar', () => {
       expect(fixture.componentInstance.activeIndex).toBe(2);
     });
 
+    it('should add the active class if active', () => {
+      let tabLink1 = fixture.debugElement.queryAll(By.css('a'))[0];
+      let tabLink2 = fixture.debugElement.queryAll(By.css('a'))[1];
+      const tabLinkElements = fixture.debugElement.queryAll(By.css('a'))
+        .map(tabLinkDebugEl => tabLinkDebugEl.nativeElement);
+
+      tabLink1.nativeElement.click();
+      fixture.detectChanges();
+      expect(tabLinkElements[0].classList.contains('mat-tab-label-active')).toBeTruthy();
+      expect(tabLinkElements[1].classList.contains('mat-tab-label-active')).toBeFalsy();
+
+      tabLink2.nativeElement.click();
+      fixture.detectChanges();
+      expect(tabLinkElements[0].classList.contains('mat-tab-label-active')).toBeFalsy();
+      expect(tabLinkElements[1].classList.contains('mat-tab-label-active')).toBeTruthy();
+
+    });
+
     it('should add the disabled class if disabled', () => {
       const tabLinkElements = fixture.debugElement.queryAll(By.css('a'))
         .map(tabLinkDebugEl => tabLinkDebugEl.nativeElement);
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 9c8dcef2bceb..0615446f0e50 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -184,7 +184,8 @@ export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
     'class': 'mat-tab-link',
     '[attr.aria-disabled]': 'disabled.toString()',
     '[attr.tabindex]': 'tabIndex',
-    '[class.mat-tab-disabled]': 'disabled'
+    '[class.mat-tab-disabled]': 'disabled',
+    '[class.mat-tab-label-active]': 'active',
   }
 })
 export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDisable {

From 58d3bb82661fbc5d6d395019c53c0d15085a834b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 5 Oct 2017 03:30:54 +0200
Subject: [PATCH 257/575] fix(snack-bar): positioned snack bar animation not
 starting off-screen (#7453)

---
 src/lib/snack-bar/snack-bar-container.scss | 13 ++++++++++---
 src/lib/snack-bar/snack-bar-container.ts   | 15 ++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar-container.scss b/src/lib/snack-bar/snack-bar-container.scss
index 72e1ae221690..1a4c966a3e5e 100644
--- a/src/lib/snack-bar/snack-bar-container.scss
+++ b/src/lib/snack-bar/snack-bar-container.scss
@@ -15,14 +15,17 @@ $mat-snack-bar-spacing-margin: 24px !default;
   min-width: $mat-snack-bar-min-width;
   padding: $mat-snack-bar-padding;
   // Initial transformation is applied to start snack bar out of view, below its target position.
-  transform: translateY(100%);
+  // Note: it's preferred to use a series of transforms, instead of something like `calc()`, because
+  // IE won't animate transforms that contain a `calc`.
+  transform: translateY(100%) translateY($mat-snack-bar-spacing-margin);
 
-  /** 
+  /**
    * Removes margin of snack bars which are center positioned horizontally.  This
    * is done to align snack bars to the edge of the view vertically to match spec.
    */
   &.mat-snack-bar-center {
     margin: 0;
+    transform: translateY(100%);
   }
 
   /**
@@ -30,7 +33,11 @@ $mat-snack-bar-spacing-margin: 24px !default;
    * direction, set the translation to start the snack bar above the target position.
    */
   &.mat-snack-bar-top {
-    transform: translateY(-100%);
+    transform: translateY(-100%) translateY(#{-$mat-snack-bar-spacing-margin});
+
+    &.mat-snack-bar-center {
+      transform: translateY(-100%);
+    }
   }
 
   @include cdk-high-contrast {
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 84eeeea76c53..8b117ac374cd 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -63,17 +63,10 @@ export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
   },
   animations: [
     trigger('state', [
-      // Animation from top.
-      state('visible-top', style({transform: 'translateY(0%)'})),
-      state('hidden-top', style({transform: 'translateY(-100%)'})),
-      transition('visible-top => hidden-top', animate(HIDE_ANIMATION)),
-      transition('void => visible-top', animate(SHOW_ANIMATION)),
-      // Animation from bottom.
-      state('visible-bottom', style({transform: 'translateY(0%)'})),
-      state('hidden-bottom', style({transform: 'translateY(100%)'})),
-      transition('visible-bottom => hidden-bottom', animate(HIDE_ANIMATION)),
-      transition('void => visible-bottom',
-        animate(SHOW_ANIMATION)),
+      state('visible-top, visible-bottom', style({transform: 'translateY(0%)'})),
+      transition('visible-top => hidden-top, visible-bottom => hidden-bottom',
+        animate(HIDE_ANIMATION)),
+      transition('void => visible-top, void => visible-bottom', animate(SHOW_ANIMATION)),
     ])
   ],
 })

From c3af25b827e940a4b5b458f7c4848630b4ab9e63 Mon Sep 17 00:00:00 2001
From: Kara <kara@users.noreply.github.com>
Date: Wed, 4 Oct 2017 19:50:41 -0700
Subject: [PATCH 258/575] chore: fix tab header tests (#7545)

---
 src/lib/tabs/tab-header.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index 97cc051c33d1..77cc4d680389 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -13,7 +13,7 @@ import {MatRippleModule} from '@angular/material/core';
 import {MatInkBar} from './ink-bar';
 import {MatTabLabelWrapper} from './tab-label-wrapper';
 import {Subject} from 'rxjs/Subject';
-import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
+import {VIEWPORT_RULER_PROVIDER, ScrollDispatchModule} from '@angular/cdk/scrolling';
 
 
 describe('MatTabHeader', () => {
@@ -25,7 +25,7 @@ describe('MatTabHeader', () => {
   beforeEach(async(() => {
     dir = 'ltr';
     TestBed.configureTestingModule({
-      imports: [CommonModule, PortalModule, MatRippleModule],
+      imports: [CommonModule, PortalModule, MatRippleModule, ScrollDispatchModule],
       declarations: [
         MatTabHeader,
         MatInkBar,

From c2a95166118c43d0329c8c5dfc0d375146db5b1f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 5 Oct 2017 17:53:33 +0200
Subject: [PATCH 259/575] fix(selection-list): tabIndex should respect disabled
 state (#7039)

---
 src/lib/list/selection-list.spec.ts | 56 +++++++++++++++++++++++++++++
 src/lib/list/selection-list.ts      | 25 +++++++------
 2 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 388c93a3499c..8ff20613a8c3 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -270,6 +270,49 @@ describe('MatSelectionList', () => {
     });
   });
 
+  describe('with tabindex', () => {
+
+    beforeEach(async(() => {
+      TestBed.configureTestingModule({
+        imports: [MatListModule],
+        declarations: [
+          SelectionListWithTabindexAttr,
+          SelectionListWithTabindexBinding,
+        ]
+      });
+
+      TestBed.compileComponents();
+    }));
+
+    it('should properly handle native tabindex attribute', () => {
+      const fixture = TestBed.createComponent(SelectionListWithTabindexAttr);
+      const selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
+
+      expect(selectionList.componentInstance.tabIndex)
+        .toBe(5, 'Expected the selection-list tabindex to be set to the attribute value.');
+    });
+
+    it('should support changing the tabIndex through binding', () => {
+      const fixture = TestBed.createComponent(SelectionListWithTabindexBinding);
+      const selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
+
+      expect(selectionList.componentInstance.tabIndex)
+        .toBe(0, 'Expected the tabIndex to be set to "0" by default.');
+
+      fixture.componentInstance.tabIndex = 3;
+      fixture.detectChanges();
+
+      expect(selectionList.componentInstance.tabIndex)
+        .toBe(3, 'Expected the tabIndex to updated through binding.');
+
+      fixture.componentInstance.disabled = true;
+      fixture.detectChanges();
+
+      expect(selectionList.componentInstance.tabIndex)
+        .toBe(-1, 'Expected the tabIndex to be set to "-1" if selection list is disabled.');
+    });
+  });
+
   describe('with single option', () => {
     let fixture: ComponentFixture<SelectionListWithOnlyOneOption>;
     let listOption: DebugElement;
@@ -523,3 +566,16 @@ class SelectionListWithSelectedOption {
   </mat-selection-list>`})
 class SelectionListWithOnlyOneOption {
 }
+
+@Component({
+  template: `<mat-selection-list tabindex="5"></mat-selection-list>`
+})
+class SelectionListWithTabindexAttr {}
+
+@Component({
+  template: `<mat-selection-list [tabIndex]="tabIndex" [disabled]="disabled"></mat-selection-list>`
+})
+class SelectionListWithTabindexBinding {
+  tabIndex: number;
+  disabled: boolean;
+}
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index a0c4829fa8c6..0d134b5133a5 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -12,6 +12,7 @@ import {SelectionModel} from '@angular/cdk/collections';
 import {SPACE} from '@angular/cdk/keycodes';
 import {
   AfterContentInit,
+  Attribute,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -32,16 +33,19 @@ import {
 import {
   CanDisable,
   CanDisableRipple,
+  HasTabIndex,
   MatLine,
   MatLineSetter,
   mixinDisabled,
   mixinDisableRipple,
+  mixinTabIndex,
 } from '@angular/material/core';
 
 
 /** @docs-private */
 export class MatSelectionListBase {}
-export const _MatSelectionListMixinBase = mixinDisableRipple(mixinDisabled(MatSelectionListBase));
+export const _MatSelectionListMixinBase =
+  mixinTabIndex(mixinDisableRipple(mixinDisabled(MatSelectionListBase)));
 
 /** @docs-private */
 export class MatListOptionBase {}
@@ -188,10 +192,10 @@ export class MatListOption extends _MatListOptionMixinBase
   moduleId: module.id,
   selector: 'mat-selection-list',
   exportAs: 'matSelectionList',
-  inputs: ['disabled', 'disableRipple'],
+  inputs: ['disabled', 'disableRipple', 'tabIndex'],
   host: {
     'role': 'listbox',
-    '[attr.tabindex]': '_tabIndex',
+    '[tabIndex]': 'tabIndex',
     'class': 'mat-selection-list',
     '(focus)': 'focus()',
     '(keydown)': '_keydown($event)',
@@ -202,11 +206,8 @@ export class MatListOption extends _MatListOptionMixinBase
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MatSelectionList extends _MatSelectionListMixinBase
-    implements FocusableOption, CanDisable, CanDisableRipple, AfterContentInit {
-
-  /** Tab index for the selection-list. */
-  _tabIndex = 0;
+export class MatSelectionList extends _MatSelectionListMixinBase implements FocusableOption,
+    CanDisable, CanDisableRipple, HasTabIndex, AfterContentInit {
 
   /** The FocusKeyManager which handles focus. */
   _keyManager: FocusKeyManager<MatListOption>;
@@ -217,16 +218,14 @@ export class MatSelectionList extends _MatSelectionListMixinBase
   /** The currently selected options. */
   selectedOptions: SelectionModel<MatListOption> = new SelectionModel<MatListOption>(true);
 
-  constructor(private _element: ElementRef) {
+  constructor(private _element: ElementRef, @Attribute('tabindex') tabIndex: string) {
     super();
+
+    this.tabIndex = parseInt(tabIndex) || 0;
   }
 
   ngAfterContentInit(): void {
     this._keyManager = new FocusKeyManager<MatListOption>(this.options).withWrap();
-
-    if (this.disabled) {
-      this._tabIndex = -1;
-    }
   }
 
   /** Focus the selection-list. */

From 630dfad30238cb47447463d0fee89a7536c01983 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 5 Oct 2017 17:54:08 +0200
Subject: [PATCH 260/575] feat(progress-spinner): switch to css-based animation
 (#6551)

---
 .../progress-spinner-demo.html                |   4 +-
 .../_progress-spinner-theme.scss              |   6 +-
 .../progress-spinner-module.ts                |  21 +-
 .../progress-spinner/progress-spinner.html    |  21 +-
 .../progress-spinner/progress-spinner.scss    | 119 ++++--
 .../progress-spinner/progress-spinner.spec.ts | 101 ++---
 src/lib/progress-spinner/progress-spinner.ts  | 386 ++++++------------
 .../kitchen-sink/kitchen-sink.html            |   4 +
 8 files changed, 272 insertions(+), 390 deletions(-)

diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.html b/src/demo-app/progress-spinner/progress-spinner-demo.html
index 27a9dfcec7c3..01eeeff43b82 100644
--- a/src/demo-app/progress-spinner/progress-spinner-demo.html
+++ b/src/demo-app/progress-spinner/progress-spinner-demo.html
@@ -9,9 +9,9 @@ <h1>Determinate</h1>
 
 <div class="demo-progress-spinner">
   <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
-      [value]="progressValue" color="primary" [strokeWidth]="1"></mat-progress-spinner>
+      [value]="progressValue" color="primary" [strokeWidth]="1" [diameter]="32"></mat-progress-spinner>
   <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
-      [value]="progressValue" color="accent"></mat-progress-spinner>
+      [value]="progressValue" color="accent" [diameter]="50"></mat-progress-spinner>
 </div>
 
 <h1>Indeterminate</h1>
diff --git a/src/lib/progress-spinner/_progress-spinner-theme.scss b/src/lib/progress-spinner/_progress-spinner-theme.scss
index a062443d0043..353cb3cf0be7 100644
--- a/src/lib/progress-spinner/_progress-spinner-theme.scss
+++ b/src/lib/progress-spinner/_progress-spinner-theme.scss
@@ -8,15 +8,15 @@
   $warn: map-get($theme, warn);
 
   .mat-progress-spinner, .mat-spinner {
-    path {
+    circle {
       stroke: mat-color($primary);
     }
 
-    &.mat-accent path {
+    &.mat-accent circle {
       stroke: mat-color($accent);
     }
 
-    &.mat-warn path {
+    &.mat-warn circle {
       stroke: mat-color($warn);
     }
   }
diff --git a/src/lib/progress-spinner/progress-spinner-module.ts b/src/lib/progress-spinner/progress-spinner-module.ts
index 11e7e841acab..abbef18f3c5f 100644
--- a/src/lib/progress-spinner/progress-spinner-module.ts
+++ b/src/lib/progress-spinner/progress-spinner-module.ts
@@ -5,28 +5,23 @@
  * 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 {NgModule} from '@angular/core';
+import {PlatformModule} from '@angular/cdk/platform';
 import {MatCommonModule} from '@angular/material/core';
-import {
-  MatProgressSpinner,
-  MatSpinner,
-  MatProgressSpinnerCssMatStyler,
-} from './progress-spinner';
-
+import {MatProgressSpinner, MatSpinner} from './progress-spinner';
 
 @NgModule({
-  imports: [MatCommonModule],
+  imports: [MatCommonModule, PlatformModule],
   exports: [
     MatProgressSpinner,
     MatSpinner,
-    MatCommonModule,
-    MatProgressSpinnerCssMatStyler
+    MatCommonModule
   ],
   declarations: [
     MatProgressSpinner,
-    MatSpinner,
-    MatProgressSpinnerCssMatStyler
+    MatSpinner
   ],
 })
-export class MatProgressSpinnerModule {}
+class MatProgressSpinnerModule {}
+
+export {MatProgressSpinnerModule};
diff --git a/src/lib/progress-spinner/progress-spinner.html b/src/lib/progress-spinner/progress-spinner.html
index bb27e80f90b6..237f087fcb07 100644
--- a/src/lib/progress-spinner/progress-spinner.html
+++ b/src/lib/progress-spinner/progress-spinner.html
@@ -4,8 +4,21 @@
   element containing the SVG. `focusable="false"` prevents IE from allowing the user to
   tab into the SVG element.
 -->
-<svg viewBox="0 0 100 100"
-     preserveAspectRatio="xMidYMid meet"
-     focusable="false">
-  <path #path [style.strokeWidth]="strokeWidth"></path>
+
+<svg
+  [style.width.px]="_elementSize"
+  [style.height.px]="_elementSize"
+  [attr.viewBox]="_viewBox"
+  preserveAspectRatio="xMidYMid meet"
+  focusable="false">
+
+  <circle
+    cx="50%"
+    cy="50%"
+    [attr.r]="_circleRadius"
+    [style.animation-name]="'mat-progress-spinner-stroke-rotate-' + diameter"
+    [style.stroke-dashoffset.px]="_strokeDashOffset"
+    [style.stroke-dasharray.px]="_strokeCircumference"
+    [style.transform.rotate]="'360deg'"
+    [style.stroke-width.px]="strokeWidth"></circle>
 </svg>
diff --git a/src/lib/progress-spinner/progress-spinner.scss b/src/lib/progress-spinner/progress-spinner.scss
index d213c518e15e..9406f80d2848 100644
--- a/src/lib/progress-spinner/progress-spinner.scss
+++ b/src/lib/progress-spinner/progress-spinner.scss
@@ -1,51 +1,54 @@
 @import '../core/style/variables';
 
 
-// Animation Durations
-$mat-progress-spinner-duration: 5250ms !default;
-$mat-progress-spinner-constant-rotate-duration: $mat-progress-spinner-duration * 0.55 !default;
-$mat-progress-spinner-sporadic-rotate-duration: $mat-progress-spinner-duration !default;
-
-// Component sizing
-$mat-progress-spinner-stroke-width: 10px !default;
-// Height and weight of the viewport for mat-progress-spinner.
-$mat-progress-spinner-viewport-size: 100px !default;
+// Animation config
+$mat-progress-spinner-stroke-rotate-fallback-duration: 10 * 1000ms !default;
+$mat-progress-spinner-stroke-rotate-fallback-ease: cubic-bezier(0.87, 0.03, 0.33, 1) !default;
 
+$_mat-progress-spinner-default-radius: 45px;
+$_mat-progress-spinner-default-circumference: $pi * $_mat-progress-spinner-default-radius * 2;
 
 .mat-progress-spinner {
   display: block;
-  // Height and width are provided for mat-progress-spinner to act as a default.
-  // The height and width are expected to be overwritten by application css.
-  height: $mat-progress-spinner-viewport-size;
-  width: $mat-progress-spinner-viewport-size;
-  overflow: hidden;
-
-  // SVG's viewBox is defined as 0 0 100 100, this means that all SVG children will placed
-  // based on a 100px by 100px box.  Additionally all SVG sizes and locations are in reference to
-  // this viewBox.
+  position: relative;
+
   svg {
-    height: 100%;
-    width: 100%;
+    position: absolute;
+    transform: translate(-50%, -50%) rotate(-90deg);
+    top: 50%;
+    left: 50%;
     transform-origin: center;
+    overflow: visible;
   }
 
-
-  path {
+  circle {
     fill: transparent;
+    transform-origin: center;
+    transition: stroke-dashoffset 225ms linear;
+  }
+
+  &.mat-progress-spinner-indeterminate-animation[mode='indeterminate'] {
+    animation: mat-progress-spinner-linear-rotate $swift-ease-in-out-duration * 4
+        linear infinite;
 
-    transition: stroke $swift-ease-in-duration $ease-in-out-curve-function;
+    circle {
+      transition-property: stroke;
+      // Note: we multiply the duration by 8, because the animation is spread out in 8 stages.
+      animation-duration: $swift-ease-in-out-duration * 8;
+      animation-timing-function: $ease-in-out-curve-function;
+      animation-iteration-count: infinite;
+    }
   }
 
+  &.mat-progress-spinner-indeterminate-fallback-animation[mode='indeterminate'] {
+    animation: mat-progress-spinner-stroke-rotate-fallback
+               $mat-progress-spinner-stroke-rotate-fallback-duration
+               $mat-progress-spinner-stroke-rotate-fallback-ease
+               infinite;
 
-  &[mode='indeterminate'] svg {
-    animation-duration: $mat-progress-spinner-sporadic-rotate-duration,
-    $mat-progress-spinner-constant-rotate-duration;
-    animation-name: mat-progress-spinner-sporadic-rotate,
-                    mat-progress-spinner-linear-rotate;
-    animation-timing-function: $ease-in-out-curve-function,
-                               linear;
-    animation-iteration-count: infinite;
-    transition: none;
+    circle {
+      transition-property: stroke;
+    }
   }
 }
 
@@ -55,13 +58,47 @@ $mat-progress-spinner-viewport-size: 100px !default;
   0%       { transform: rotate(0deg); }
   100%     { transform: rotate(360deg); }
 }
-@keyframes mat-progress-spinner-sporadic-rotate {
-  12.5%    { transform: rotate( 135deg); }
-  25%      { transform: rotate( 270deg); }
-  37.5%    { transform: rotate( 405deg); }
-  50%      { transform: rotate( 540deg); }
-  62.5%    { transform: rotate( 675deg); }
-  75%      { transform: rotate( 810deg); }
-  87.5%    { transform: rotate( 945deg); }
-  100%     { transform: rotate(1080deg); }
+
+@at-root {
+  $start: (1 - 0.05) * $_mat-progress-spinner-default-circumference; // start the animation at 5%
+  $end: (1 - 0.8) * $_mat-progress-spinner-default-circumference; // end the animation at 80%
+  $fallback-iterations: 4;
+
+  @keyframes mat-progress-spinner-stroke-rotate-100 {
+    /*
+      stylelint-disable declaration-block-single-line-max-declarations,
+        declaration-block-semicolon-space-after
+    */
+    0%      { stroke-dashoffset: $start;  transform: rotate(0); }
+    12.5%   { stroke-dashoffset: $end;    transform: rotate(0); }
+    12.51%  { stroke-dashoffset: $end;    transform: rotateX(180deg) rotate(72.5deg); }
+    25%     { stroke-dashoffset: $start;  transform: rotateX(180deg) rotate(72.5deg); }
+
+    25.1%   { stroke-dashoffset: $start;  transform: rotate(270deg); }
+    37.5%   { stroke-dashoffset: $end;    transform: rotate(270deg); }
+    37.51%  { stroke-dashoffset: $end;    transform: rotateX(180deg) rotate(161.5deg); }
+    50%     { stroke-dashoffset: $start;  transform: rotateX(180deg) rotate(161.5deg); }
+
+    50.01%  { stroke-dashoffset: $start;  transform: rotate(180deg); }
+    62.5%   { stroke-dashoffset: $end;    transform: rotate(180deg); }
+    62.51%  { stroke-dashoffset: $end;    transform: rotateX(180deg) rotate(251.5deg); }
+    75%     { stroke-dashoffset: $start;  transform: rotateX(180deg) rotate(251.5deg); }
+
+    75.01%  { stroke-dashoffset: $start;  transform: rotate(90deg); }
+    87.5%   { stroke-dashoffset: $end;    transform: rotate(90deg); }
+    87.51%  { stroke-dashoffset: $end;    transform: rotateX(180deg) rotate(341.5deg); }
+    100%    { stroke-dashoffset: $start;  transform: rotateX(180deg) rotate(341.5deg); }
+    // stylelint-enable
+  }
+
+  // For IE11 and Edge, we fall back to simply rotating the spinner because
+  // animating stroke-dashoffset is not supported. The fallback uses multiple
+  // iterations to vary where the spin "lands".
+  @keyframes mat-progress-spinner-stroke-rotate-fallback {
+    @for $i from 0 through $fallback-iterations {
+      $percent: 100 / $fallback-iterations * $i;
+      $offset: 360 / $fallback-iterations;
+      #{$percent}% { transform: rotate(#{$i * (360 * 3 + $offset)}deg); }
+    }
+  }
 }
diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index 755b499398b1..4fc66ebf738b 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -2,7 +2,6 @@ import {TestBed, async} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {MatProgressSpinnerModule} from './index';
-import {PROGRESS_SPINNER_STROKE_WIDTH} from './progress-spinner';
 
 
 describe('MatProgressSpinner', () => {
@@ -16,13 +15,10 @@ describe('MatProgressSpinner', () => {
         ProgressSpinnerWithValueAndBoundMode,
         ProgressSpinnerWithColor,
         ProgressSpinnerCustomStrokeWidth,
-        IndeterminateProgressSpinnerWithNgIf,
-        SpinnerWithNgIf,
-        SpinnerWithColor
+        ProgressSpinnerCustomDiameter,
+        SpinnerWithColor,
       ],
-    });
-
-    TestBed.compileComponents();
+    }).compileComponents();
   }));
 
   it('should apply a mode of "determinate" if no mode is provided.', () => {
@@ -84,51 +80,57 @@ describe('MatProgressSpinner', () => {
     expect(progressComponent.value).toBe(0);
   });
 
-  it('should clean up the indeterminate animation when the element is destroyed', () => {
-    let fixture = TestBed.createComponent(IndeterminateProgressSpinnerWithNgIf);
-    fixture.detectChanges();
-
-    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
-    expect(progressElement.componentInstance.interdeterminateInterval).toBeTruthy();
-
-    fixture.componentInstance.isHidden = true;
-    fixture.detectChanges();
-    expect(progressElement.componentInstance.interdeterminateInterval).toBeFalsy();
-  });
+  it('should allow a custom diameter', () => {
+    const fixture = TestBed.createComponent(ProgressSpinnerCustomDiameter);
+    const spinner = fixture.debugElement.query(By.css('mat-progress-spinner')).nativeElement;
+    const svgElement = fixture.nativeElement.querySelector('svg');
 
-  it('should clean up the animation when a spinner is destroyed', () => {
-    let fixture = TestBed.createComponent(SpinnerWithNgIf);
+    fixture.componentInstance.diameter = 32;
     fixture.detectChanges();
 
-    let progressElement = fixture.debugElement.query(By.css('mat-spinner'));
+    expect(parseInt(spinner.style.width))
+        .toBe(32, 'Expected the custom diameter to be applied to the host element width.');
+    expect(parseInt(spinner.style.height))
+        .toBe(32, 'Expected the custom diameter to be applied to the host element height.');
+    expect(parseInt(svgElement.style.width))
+        .toBe(32, 'Expected the custom diameter to be applied to the svg element width.');
+    expect(parseInt(svgElement.style.height))
+        .toBe(32, 'Expected the custom diameter to be applied to the svg element height.');
+    expect(svgElement.getAttribute('viewBox'))
+        .toBe('0 0 32 32', 'Expected the custom diameter to be applied to the svg viewBox.');
+  });
 
-    expect(progressElement.componentInstance.interdeterminateInterval).toBeTruthy();
+  it('should allow a custom stroke width', () => {
+    const fixture = TestBed.createComponent(ProgressSpinnerCustomStrokeWidth);
+    const circleElement = fixture.nativeElement.querySelector('circle');
 
-    fixture.componentInstance.isHidden = true;
+    fixture.componentInstance.strokeWidth = 40;
     fixture.detectChanges();
 
-    expect(progressElement.componentInstance.interdeterminateInterval).toBeFalsy();
+    expect(parseInt(circleElement.style.strokeWidth))
+      .toBe(40, 'Expected the custom stroke width to be applied to the circle element.');
   });
 
-  it('should set a default stroke width', () => {
-    let fixture = TestBed.createComponent(BasicProgressSpinner);
-    let pathElement = fixture.nativeElement.querySelector('path');
+  it('should expand the host element if the stroke width is greater than the default', () => {
+    const fixture = TestBed.createComponent(ProgressSpinnerCustomStrokeWidth);
+    const element = fixture.debugElement.nativeElement.querySelector('.mat-progress-spinner');
 
+    fixture.componentInstance.strokeWidth = 40;
     fixture.detectChanges();
 
-    expect(parseInt(pathElement.style.strokeWidth))
-      .toBe(PROGRESS_SPINNER_STROKE_WIDTH, 'Expected the default stroke-width to be applied.');
+    expect(element.style.width).toBe('130px');
+    expect(element.style.height).toBe('130px');
   });
 
-  it('should allow a custom stroke width', () => {
-    let fixture = TestBed.createComponent(ProgressSpinnerCustomStrokeWidth);
-    let pathElement = fixture.nativeElement.querySelector('path');
+  it('should not collapse the host element if the stroke width is less than the default', () => {
+    const fixture = TestBed.createComponent(ProgressSpinnerCustomStrokeWidth);
+    const element = fixture.debugElement.nativeElement.querySelector('.mat-progress-spinner');
 
-    fixture.componentInstance.strokeWidth = 40;
+    fixture.componentInstance.strokeWidth = 5;
     fixture.detectChanges();
 
-    expect(parseInt(pathElement.style.strokeWidth))
-      .toBe(40, 'Expected the custom stroke width to be applied to the path element.');
+    expect(element.style.width).toBe('100px');
+    expect(element.style.height).toBe('100px');
   });
 
   it('should set the color class on the mat-spinner', () => {
@@ -161,23 +163,6 @@ describe('MatProgressSpinner', () => {
     expect(progressElement.nativeElement.classList).not.toContain('mat-primary');
   });
 
-  it('should re-render the circle when switching from indeterminate to determinate mode', () => {
-    let fixture = TestBed.createComponent(ProgressSpinnerWithValueAndBoundMode);
-    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner')).nativeElement;
-
-    fixture.componentInstance.mode = 'indeterminate';
-    fixture.detectChanges();
-
-    let path = progressElement.querySelector('path');
-    let oldDimesions = path.getAttribute('d');
-
-    fixture.componentInstance.mode = 'determinate';
-    fixture.detectChanges();
-
-    expect(path.getAttribute('d')).not
-        .toBe(oldDimesions, 'Expected circle dimensions to have changed.');
-  });
-
   it('should remove the underlying SVG element from the tab order explicitly', () => {
     const fixture = TestBed.createComponent(BasicProgressSpinner);
 
@@ -197,19 +182,17 @@ class ProgressSpinnerCustomStrokeWidth {
   strokeWidth: number;
 }
 
+@Component({template: '<mat-progress-spinner [diameter]="diameter"></mat-progress-spinner>'})
+class ProgressSpinnerCustomDiameter {
+  diameter: number;
+}
+
 @Component({template: '<mat-progress-spinner mode="indeterminate"></mat-progress-spinner>'})
 class IndeterminateProgressSpinner { }
 
 @Component({template: '<mat-progress-spinner value="50" [mode]="mode"></mat-progress-spinner>'})
 class ProgressSpinnerWithValueAndBoundMode { mode = 'indeterminate'; }
 
-@Component({template: `
-    <mat-progress-spinner mode="indeterminate" *ngIf="!isHidden"></mat-progress-spinner>`})
-class IndeterminateProgressSpinnerWithNgIf { isHidden = false; }
-
-@Component({template: `<mat-spinner *ngIf="!isHidden"></mat-spinner>`})
-class SpinnerWithNgIf { isHidden = false; }
-
 @Component({template: `<mat-spinner [color]="color"></mat-spinner>`})
 class SpinnerWithColor { color: string = 'primary'; }
 
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 5bf92bee427e..0be373bf8a59 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -9,53 +9,22 @@
 import {
   Component,
   ChangeDetectionStrategy,
-  OnDestroy,
   Input,
   ElementRef,
-  NgZone,
   Renderer2,
-  Directive,
-  ViewChild,
+  SimpleChanges,
+  OnChanges,
   ViewEncapsulation,
+  Optional,
+  Inject,
 } from '@angular/core';
 import {CanColor, mixinColor} from '@angular/material/core';
+import {Platform} from '@angular/cdk/platform';
+import {DOCUMENT} from '@angular/common';
 
-
-// TODO(josephperrott): Benchpress tests.
-
-/** A single degree in radians. */
-const DEGREE_IN_RADIANS = Math.PI / 180;
-/** Duration of the indeterminate animation. */
-const DURATION_INDETERMINATE = 667;
-/** Duration of the indeterminate animation. */
-const DURATION_DETERMINATE = 225;
-/** Start animation value of the indeterminate animation */
-const startIndeterminate = 3;
-/** End animation value of the indeterminate animation */
-const endIndeterminate = 80;
-/** Maximum angle for the arc. The angle can't be exactly 360, because the arc becomes hidden. */
-const MAX_ANGLE = 359.99 / 100;
-/** Whether the user's browser supports requestAnimationFrame. */
-const HAS_RAF = typeof requestAnimationFrame !== 'undefined';
-/** Default stroke width as a percentage of the viewBox. */
-export const PROGRESS_SPINNER_STROKE_WIDTH = 10;
-
+/** Possible mode for a progress spinner. */
 export type ProgressSpinnerMode = 'determinate' | 'indeterminate';
 
-type EasingFn = (currentTime: number, startValue: number,
-                 changeInValue: number, duration: number) => number;
-
-
-/**
- * Directive whose purpose is to add the mat- CSS styling to this selector.
- * @docs-private
- */
-@Directive({
-  selector: 'mat-progress-spinner',
-  host: {'class': 'mat-progress-spinner'}
-})
-export class MatProgressSpinnerCssMatStyler {}
-
 // Boilerplate for applying mixins to MatProgressSpinner.
 /** @docs-private */
 export class MatProgressSpinnerBase {
@@ -63,6 +32,30 @@ export class MatProgressSpinnerBase {
 }
 export const _MatProgressSpinnerMixinBase = mixinColor(MatProgressSpinnerBase, 'primary');
 
+const INDETERMINATE_ANIMATION_TEMPLATE = `
+ @keyframes mat-progress-spinner-stroke-rotate-DIAMETER {
+    0%      { stroke-dashoffset: START_VALUE;  transform: rotate(0); }
+    12.5%   { stroke-dashoffset: END_VALUE;    transform: rotate(0); }
+    12.51%  { stroke-dashoffset: END_VALUE;    transform: rotateX(180deg) rotate(72.5deg); }
+    25%     { stroke-dashoffset: START_VALUE;  transform: rotateX(180deg) rotate(72.5deg); }
+
+    25.1%   { stroke-dashoffset: START_VALUE;  transform: rotate(270deg); }
+    37.5%   { stroke-dashoffset: END_VALUE;    transform: rotate(270deg); }
+    37.51%  { stroke-dashoffset: END_VALUE;    transform: rotateX(180deg) rotate(161.5deg); }
+    50%     { stroke-dashoffset: START_VALUE;  transform: rotateX(180deg) rotate(161.5deg); }
+
+    50.01%  { stroke-dashoffset: START_VALUE;  transform: rotate(180deg); }
+    62.5%   { stroke-dashoffset: END_VALUE;    transform: rotate(180deg); }
+    62.51%  { stroke-dashoffset: END_VALUE;    transform: rotateX(180deg) rotate(251.5deg); }
+    75%     { stroke-dashoffset: START_VALUE;  transform: rotateX(180deg) rotate(251.5deg); }
+
+    75.01%  { stroke-dashoffset: START_VALUE;  transform: rotate(90deg); }
+    87.5%   { stroke-dashoffset: END_VALUE;    transform: rotate(90deg); }
+    87.51%  { stroke-dashoffset: END_VALUE;    transform: rotateX(180deg) rotate(341.5deg); }
+    100%    { stroke-dashoffset: START_VALUE;  transform: rotateX(180deg) rotate(341.5deg); }
+  }
+`;
+
 /**
  * <mat-progress-spinner> component.
  */
@@ -73,8 +66,10 @@ export const _MatProgressSpinnerMixinBase = mixinColor(MatProgressSpinnerBase, '
   host: {
     'role': 'progressbar',
     'class': 'mat-progress-spinner',
-    '[attr.aria-valuemin]': '_ariaValueMin',
-    '[attr.aria-valuemax]': '_ariaValueMax',
+    '[style.width.px]': '_elementSize',
+    '[style.height.px]': '_elementSize',
+    '[attr.aria-valuemin]': 'mode === "determinate" ? 0 : null',
+    '[attr.aria-valuemax]': 'mode === "determinate" ? 100 : null',
     '[attr.aria-valuenow]': 'value',
     '[attr.mode]': 'mode',
   },
@@ -85,189 +80,117 @@ export const _MatProgressSpinnerMixinBase = mixinColor(MatProgressSpinnerBase, '
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MatProgressSpinner extends _MatProgressSpinnerMixinBase
-    implements OnDestroy, CanColor {
-
-  /** The id of the last requested animation. */
-  private _lastAnimationId: number = 0;
-
-  /** The id of the indeterminate interval. */
-  private _interdeterminateInterval: number | null;
+export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements CanColor,
+  OnChanges {
 
-  /** The SVG <path> node that is used to draw the circle. */
-  @ViewChild('path') private _path: ElementRef;
-
-  private _mode: ProgressSpinnerMode = 'determinate';
   private _value: number;
+  private readonly _baseSize = 100;
+  private readonly _baseStrokeWidth = 10;
+  private _fallbackAnimation = false;
 
-  /** Stroke width of the progress spinner. By default uses 10px as stroke width. */
-  @Input() strokeWidth: number = PROGRESS_SPINNER_STROKE_WIDTH;
+  /** The width and height of the host element. Will grow with stroke width. **/
+  _elementSize = this._baseSize;
 
-  /**
-   * Values for aria max and min are only defined as numbers when in a determinate mode.  We do this
-   * because voiceover does not report the progress indicator as indeterminate if the aria min
-   * and/or max value are number values.
-   */
-  get _ariaValueMin() {
-    return this.mode == 'determinate' ? 0 : null;
-  }
+  /** Tracks diameters of existing instances to de-dupe generated styles (default d = 100) */
+  static diameters = new Set<number>([100]);
 
-  get _ariaValueMax() {
-    return this.mode == 'determinate' ? 100 : null;
+  /** The diameter of the progress spinner (will set width and height of svg). */
+  @Input()
+  get diameter(): number {
+    return this._diameter;
   }
 
-  /** @docs-private */
-  get interdeterminateInterval() {
-    return this._interdeterminateInterval;
+  set diameter(size: number) {
+    this._setDiameterAndInitStyles(size);
   }
-  /** @docs-private */
-  set interdeterminateInterval(interval: number | null) {
-    if (this._interdeterminateInterval) {
-      clearInterval(this._interdeterminateInterval);
-    }
+  _diameter = this._baseSize;
 
-    this._interdeterminateInterval = interval;
-  }
+  /** Stroke width of the progress spinner. */
+  @Input() strokeWidth: number = 10;
 
-  /**
-   * Clean up any animations that were running.
-   */
-  ngOnDestroy() {
-    this._cleanupIndeterminateAnimation();
-  }
+  /** Mode of the progress circle */
+  @Input() mode: ProgressSpinnerMode = 'determinate';
 
-  /** Value of the progress circle. It is bound to the host as the attribute aria-valuenow. */
+  /** Value of the progress circle. */
   @Input()
   get value() {
-    if (this.mode == 'determinate') {
-      return this._value;
-    }
-
-    return 0;
+    return this.mode === 'determinate' ? this._value : 0;
   }
-  set value(v: number) {
-    if (v != null && this.mode == 'determinate') {
-      let newValue = clamp(v);
-      this._animateCircle(this.value || 0, newValue);
-      this._value = newValue;
+  set value(newValue: number) {
+    if (newValue != null && this.mode === 'determinate') {
+      this._value = Math.max(0, Math.min(100, newValue));
     }
   }
 
-  /**
-   * Mode of the progress circle
-   *
-   * Input must be one of the values from ProgressMode, defaults to 'determinate'.
-   * mode is bound to the host as the attribute host.
-   */
-  @Input()
-  get mode() { return this._mode; }
-  set mode(mode: ProgressSpinnerMode) {
-    if (mode !== this._mode) {
-      if (mode === 'indeterminate') {
-        this._startIndeterminateAnimation();
-      } else {
-        this._cleanupIndeterminateAnimation();
-        this._animateCircle(0, this._value);
-      }
-      this._mode = mode;
-    }
-  }
-
-  constructor(renderer: Renderer2,
-              elementRef: ElementRef,
-              private _ngZone: NgZone) {
-    super(renderer, elementRef);
-  }
+  constructor(public _renderer: Renderer2, public _elementRef: ElementRef,
+              platform: Platform, @Optional() @Inject(DOCUMENT) private _document: any) {
+    super(_renderer, _elementRef);
 
+    this._fallbackAnimation = platform.EDGE || platform.TRIDENT;
 
-  /**
-   * Animates the circle from one percentage value to another.
-   *
-   * @param animateFrom The percentage of the circle filled starting the animation.
-   * @param animateTo The percentage of the circle filled ending the animation.
-   * @param ease The easing function to manage the pace of change in the animation.
-   * @param duration The length of time to show the animation, in milliseconds.
-   * @param rotation The starting angle of the circle fill, with 0° represented at the top center
-   *    of the circle.
-   */
-  private _animateCircle(animateFrom: number, animateTo: number, ease: EasingFn = linearEase,
-                        duration = DURATION_DETERMINATE, rotation = 0) {
+    // On IE and Edge, we can't animate the `stroke-dashoffset`
+    // reliably so we fall back to a non-spec animation.
+    const animationClass = this._fallbackAnimation ?
+      'mat-progress-spinner-indeterminate-fallback-animation' :
+      'mat-progress-spinner-indeterminate-animation';
 
-    let id = ++this._lastAnimationId;
-    let startTime = Date.now();
-    let changeInValue = animateTo - animateFrom;
+    _renderer.addClass(_elementRef.nativeElement, animationClass);
+  }
 
-    // No need to animate it if the values are the same
-    if (animateTo === animateFrom) {
-      this._renderArc(animateTo, rotation);
-    } else {
-      let animation = () => {
-        // If there is no requestAnimationFrame, skip ahead to the end of the animation.
-        let elapsedTime = HAS_RAF ?
-            Math.max(0, Math.min(Date.now() - startTime, duration)) :
-            duration;
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes.strokeWidth || changes.diameter) {
+      this._elementSize =
+          this._diameter + Math.max(this.strokeWidth - this._baseStrokeWidth, 0);
+    }
+  }
 
-        this._renderArc(
-          ease(elapsedTime, animateFrom, changeInValue, duration),
-          rotation
-        );
+  /** The radius of the spinner, adjusted for stroke width. */
+  get _circleRadius() {
+    return (this.diameter - this._baseStrokeWidth) / 2;
+  }
 
-        // Prevent overlapping animations by checking if a new animation has been called for and
-        // if the animation has lasted longer than the animation duration.
-        if (id === this._lastAnimationId && elapsedTime < duration) {
-          requestAnimationFrame(animation);
-        }
-      };
+  /** The view box of the spinner's svg element. */
+  get _viewBox() {
+    return `0 0 ${this._elementSize} ${this._elementSize}`;
+  }
 
-      // Run the animation outside of Angular's zone, in order to avoid
-      // hitting ZoneJS and change detection on each frame.
-      this._ngZone.runOutsideAngular(animation);
-    }
+  /** The stroke circumference of the svg circle. */
+  get _strokeCircumference(): number {
+    return 2 * Math.PI * this._circleRadius;
   }
 
+  /** The dash offset of the svg circle. */
+  get _strokeDashOffset() {
+    if (this.mode === 'determinate') {
+      return this._strokeCircumference * (100 - this._value) / 100;
+    }
 
-  /**
-   * Starts the indeterminate animation interval, if it is not already running.
-   */
-  private _startIndeterminateAnimation() {
-    let rotationStartPoint = 0;
-    let start = startIndeterminate;
-    let end = endIndeterminate;
-    let duration = DURATION_INDETERMINATE;
-    let animate = () => {
-      this._animateCircle(start, end, materialEase, duration, rotationStartPoint);
-      // Prevent rotation from reaching Number.MAX_SAFE_INTEGER.
-      rotationStartPoint = (rotationStartPoint + end) % 100;
-      let temp = start;
-      start = -end;
-      end = -temp;
-    };
+    return null;
+  }
 
-    if (!this.interdeterminateInterval) {
-      this._ngZone.runOutsideAngular(() => {
-        this.interdeterminateInterval = setInterval(animate, duration + 50, 0, false);
-        animate();
-      });
+  /** Sets the diameter and adds diameter-specific styles if necessary. */
+  private _setDiameterAndInitStyles(size: number): void {
+    this._diameter = size;
+    if (!MatProgressSpinner.diameters.has(this.diameter) && !this._fallbackAnimation) {
+      this._attachStyleNode();
     }
   }
 
-
-  /**
-   * Removes interval, ending the animation.
-   */
-  private _cleanupIndeterminateAnimation() {
-    this.interdeterminateInterval = null;
+  /** Dynamically generates a style tag containing the correct animation for this diameter. */
+  private _attachStyleNode(): void {
+    const styleTag = this._renderer.createElement('style');
+    styleTag.textContent = this._getAnimationText();
+    this._renderer.appendChild(this._document.head, styleTag);
+    MatProgressSpinner.diameters.add(this.diameter);
   }
 
-  /**
-   * Renders the arc onto the SVG element. Proxies `getArc` while setting the proper
-   * DOM attribute on the `<path>`.
-   */
-  private _renderArc(currentValue: number, rotation = 0) {
-    if (this._path) {
-      const svgArc = getSvgArc(currentValue, rotation, this.strokeWidth);
-      this._renderer.setAttribute(this._path.nativeElement, 'd', svgArc);
-    }
+  /** Generates animation styles adjusted for the spinner's diameter. */
+  private _getAnimationText(): string {
+    return INDETERMINATE_ANIMATION_TEMPLATE
+        // Animation should begin at 5% and end at 80%
+        .replace(/START_VALUE/g, `${0.95 * this._strokeCircumference}`)
+        .replace(/END_VALUE/g, `${0.2 * this._strokeCircumference}`)
+        .replace(/DIAMETER/g, `${this.diameter}`);
   }
 }
 
@@ -285,6 +208,8 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase
     'role': 'progressbar',
     'mode': 'indeterminate',
     'class': 'mat-spinner mat-progress-spinner',
+    '[style.width.px]': '_elementSize',
+    '[style.height.px]': '_elementSize',
   },
   inputs: ['color'],
   templateUrl: 'progress-spinner.html',
@@ -294,84 +219,9 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase
   preserveWhitespaces: false,
 })
 export class MatSpinner extends MatProgressSpinner {
-  constructor(elementRef: ElementRef, ngZone: NgZone, renderer: Renderer2) {
-    super(renderer, elementRef, ngZone);
+  constructor(renderer: Renderer2, elementRef: ElementRef, platform: Platform,
+              @Optional() @Inject(DOCUMENT) document: any) {
+    super(renderer, elementRef, platform, document);
     this.mode = 'indeterminate';
   }
 }
-
-
-/**
- * Module functions.
- */
-
-/** Clamps a value to be between 0 and 100. */
-function clamp(v: number) {
-  return Math.max(0, Math.min(100, v));
-}
-
-
-/**
- * Converts Polar coordinates to Cartesian.
- */
-function polarToCartesian(radius: number, pathRadius: number, angleInDegrees: number) {
-  let angleInRadians = (angleInDegrees - 90) * DEGREE_IN_RADIANS;
-
-  return (radius + (pathRadius * Math.cos(angleInRadians))) +
-    ',' + (radius + (pathRadius * Math.sin(angleInRadians)));
-}
-
-
-/**
- * Easing function for linear animation.
- */
-function linearEase(currentTime: number, startValue: number,
-                    changeInValue: number, duration: number) {
-  return changeInValue * currentTime / duration + startValue;
-}
-
-
-/**
- * Easing function to match material design indeterminate animation.
- */
-function materialEase(currentTime: number, startValue: number,
-                      changeInValue: number, duration: number) {
-  let time = currentTime / duration;
-  let timeCubed = Math.pow(time, 3);
-  let timeQuad = Math.pow(time, 4);
-  let timeQuint = Math.pow(time, 5);
-  return startValue + changeInValue * ((6 * timeQuint) + (-15 * timeQuad) + (10 * timeCubed));
-}
-
-
-/**
- * Determines the path value to define the arc.  Converting percentage values to to polar
- * coordinates on the circle, and then to cartesian coordinates in the viewport.
- *
- * @param currentValue The current percentage value of the progress circle, the percentage of the
- *    circle to fill.
- * @param rotation The starting point of the circle with 0 being the 0 degree point.
- * @param strokeWidth Stroke width of the progress spinner arc.
- * @return A string for an SVG path representing a circle filled from the starting point to the
- *    percentage value provided.
- */
-function getSvgArc(currentValue: number, rotation: number, strokeWidth: number): string {
-  let startPoint = rotation || 0;
-  let radius = 50;
-  let pathRadius = radius - strokeWidth;
-
-  let startAngle = startPoint * MAX_ANGLE;
-  let endAngle = currentValue * MAX_ANGLE;
-  let start = polarToCartesian(radius, pathRadius, startAngle);
-  let end = polarToCartesian(radius, pathRadius, endAngle + startAngle);
-  let arcSweep = endAngle < 0 ? 0 : 1;
-  let largeArcFlag: number;
-
-  if (endAngle < 0) {
-    largeArcFlag = endAngle >= -180 ? 0 : 1;
-  } else {
-    largeArcFlag = endAngle <= 180 ? 0 : 1;
-  }
-
-  return `M${start}A${pathRadius},${pathRadius} 0 ${largeArcFlag},${arcSweep} ${end}`;
-}
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 9e8b398b2bd9..120ca00242d8 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -142,6 +142,10 @@ <h2>Progress bar</h2>
 <mat-progress-bar mode="indeterminate"></mat-progress-bar>
 <mat-progress-bar mode="query"></mat-progress-bar>
 
+<h2>Progress spinner</h2>
+
+<mat-progress-spinner mode="indeterminate" [diameter]="32"></mat-progress-spinner>
+<mat-progress-spinner mode="determinate" [value]="60"></mat-progress-spinner>
 
 <h2>Radio buttons</h2>
 

From 4383f51a58de1fccad2ed64443a5e22ab435c02b Mon Sep 17 00:00:00 2001
From: Kara <kara@users.noreply.github.com>
Date: Thu, 5 Oct 2017 09:38:21 -0700
Subject: [PATCH 261/575] chore: change ErrorStateMatcher to use FormControl
 again (#7555)

---
 src/demo-app/input/input-demo.ts    |  4 ++--
 src/lib/core/error/error-options.ts |  6 +++---
 src/lib/input/input.md              |  2 +-
 src/lib/input/input.ts              |  5 +++--
 src/lib/select/select.ts            | 11 +++++++++--
 src/lib/stepper/stepper.ts          |  4 ++--
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts
index 2f28f2b6f922..d107aaf996cc 100644
--- a/src/demo-app/input/input-demo.ts
+++ b/src/demo-app/input/input-demo.ts
@@ -1,5 +1,5 @@
 import {Component, ChangeDetectionStrategy} from '@angular/core';
-import {FormControl, NgControl, Validators} from '@angular/forms';
+import {FormControl, Validators} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material';
 
 
@@ -54,7 +54,7 @@ export class InputDemo {
   }
 
   customErrorStateMatcher: ErrorStateMatcher = {
-    isErrorState: (control: NgControl | null) => {
+    isErrorState: (control: FormControl | null) => {
       if (control) {
         const hasInteraction = control.dirty || control.touched;
         const isInvalid = control.invalid;
diff --git a/src/lib/core/error/error-options.ts b/src/lib/core/error/error-options.ts
index 261906995c22..503f0ba10e1c 100644
--- a/src/lib/core/error/error-options.ts
+++ b/src/lib/core/error/error-options.ts
@@ -7,12 +7,12 @@
  */
 
 import {Injectable} from '@angular/core';
-import {FormGroupDirective, NgForm, NgControl} from '@angular/forms';
+import {FormGroupDirective, NgForm, FormControl} from '@angular/forms';
 
 /** Error state matcher that matches when a control is invalid and dirty. */
 @Injectable()
 export class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher {
-  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
     return !!(control && control.invalid && (control.dirty || (form && form.submitted)));
   }
 }
@@ -20,7 +20,7 @@ export class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher {
 /** Provider that defines how form controls behave with regards to displaying error messages. */
 @Injectable()
 export class ErrorStateMatcher {
-  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
     return !!(control && control.invalid && (control.touched || (form && form.submitted)));
   }
 }
diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index c86da66c654f..99a95c914044 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -127,7 +127,7 @@ returns a boolean. A result of `true` will display the error messages.
 
 ```ts
 class MyErrorStateMatcher implements ErrorStateMatcher {
-  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
     // Error when invalid control is dirty, touched, or submitted
     const isSubmitted = form && form.submitted;
     return !!(control && control.invalid && (control.dirty || control.touched || isSubmitted)));
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 45b2e40d644e..dea8e13816ea 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -18,7 +18,7 @@ import {
   Self,
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {FormGroupDirective, NgControl, NgForm, FormControl} from '@angular/forms';
 import {Platform, getSupportedInputTypes} from '@angular/cdk/platform';
 import {getMatInputUnsupportedTypeError} from './input-errors';
 import {ErrorStateMatcher} from '@angular/material/core';
@@ -225,7 +225,8 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
     const oldState = this.errorState;
     const parent = this._parentFormGroup || this._parentForm;
     const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
-    const newState = matcher.isErrorState(this.ngControl, parent);
+    const control = this.ngControl ? this.ngControl.control as FormControl : null;
+    const newState = matcher.isErrorState(control, parent);
 
     if (newState !== oldState) {
       this.errorState = newState;
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8172be8eff09..2aff32be3180 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -45,7 +45,13 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {
+  ControlValueAccessor,
+  FormGroupDirective,
+  NgControl,
+  NgForm,
+  FormControl
+} from '@angular/forms';
 import {
   CanDisable,
   HasTabIndex,
@@ -687,8 +693,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   get errorState(): boolean {
     const parent = this._parentFormGroup || this._parentForm;
     const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
+    const control = this.ngControl ? this.ngControl.control as FormControl : null;
 
-    return matcher.isErrorState(this.ngControl, parent);
+    return matcher.isErrorState(control, parent);
   }
 
   private _initializeSelection(): void {
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 28a5d356dd82..4d9f4325ee1d 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -22,7 +22,7 @@ import {
   ViewEncapsulation,
   ChangeDetectionStrategy,
 } from '@angular/core';
-import {NgControl, FormGroupDirective, NgForm} from '@angular/forms';
+import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material/core';
 import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
@@ -51,7 +51,7 @@ export class MatStep extends _MatStep implements ErrorStateMatcher {
   }
 
   /** Custom error state matcher that additionally checks for validity of interacted form. */
-  isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
     const originalErrorState = this._errorStateMatcher.isErrorState(control, form);
 
     // Custom error state checks for the validity of form that is not submitted or touched

From cef1eba2b1d231c185f80bc5e253858442a5a2cb Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Thu, 5 Oct 2017 13:34:30 -0700
Subject: [PATCH 262/575] chore: add svg to the assetsGlob for the demo app

---
 tools/gulp/tasks/development.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index 2efc892d7cd5..d2c8cece3ec1 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -26,7 +26,7 @@ const appVendors = [
 const vendorGlob = `+(${appVendors.join('|')})/**/*.+(html|css|js|map)`;
 
 /** Glob that matches all assets that need to be copied to the output. */
-const assetsGlob = join(appDir, `**/*.+(html|css)`);
+const assetsGlob = join(appDir, `**/*.+(html|css|svg)`);
 
 task(':watch:devapp', () => {
   watchFiles(join(appDir, '**/*.ts'), [':build:devapp:ts']);

From 3e458eeb17e2c6780689e6aaf084fadfb12a5fbb Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 5 Oct 2017 23:30:41 +0200
Subject: [PATCH 263/575] build: include importAs in metadata (#7448)

---
 tools/package-tools/build-release.ts     | 12 ++++++++----
 tools/package-tools/metadata-reexport.ts |  8 +++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/package-tools/build-release.ts b/tools/package-tools/build-release.ts
index 87f2c4668968..f3fc35f3dff6 100644
--- a/tools/package-tools/build-release.ts
+++ b/tools/package-tools/build-release.ts
@@ -24,6 +24,7 @@ export function composeRelease(buildPackage: BuildPackage) {
   const {name, sourceDir} = buildPackage;
   const packageOut = buildPackage.outputDir;
   const releasePath = join(outputDir, 'releases', name);
+  const importAsName = `@angular/${name}`;
 
   inlinePackageMetadataFiles(packageOut);
 
@@ -48,7 +49,7 @@ export function composeRelease(buildPackage: BuildPackage) {
 
   replaceVersionPlaceholders(releasePath);
   createTypingsReexportFile(releasePath, './typings/index', name);
-  createMetadataReexportFile(releasePath, './typings/index', name);
+  createMetadataReexportFile(releasePath, './typings/index', name, importAsName);
 
   if (buildPackage.secondaryEntryPoints.length) {
     createFilesForSecondaryEntryPoint(buildPackage, releasePath);
@@ -70,7 +71,8 @@ export function composeRelease(buildPackage: BuildPackage) {
     createMetadataReexportFile(
         releasePath,
         buildPackage.secondaryEntryPoints.concat(['typings/index']).map(p => `./${p}`),
-        name);
+        name,
+        importAsName);
   }
 }
 
@@ -85,6 +87,7 @@ function createFilesForSecondaryEntryPoint(buildPackage: BuildPackage, releasePa
     // * An index.d.ts file that re-exports the index.d.ts from the typings/ directory
     // * A metadata.json re-export for this entry-point's metadata.
     const entryPointDir = join(releasePath, entryPointName);
+    const importAsName = `@angular/${name}/${entryPointName}`;
 
     mkdirpSync(entryPointDir);
     createEntryPointPackageJson(entryPointDir, name, entryPointName);
@@ -98,12 +101,13 @@ function createFilesForSecondaryEntryPoint(buildPackage: BuildPackage, releasePa
     // Create a typings and a metadata re-export within the entry-point to point to the
     // typings we just copied.
     createTypingsReexportFile(entryPointDir, `./typings/index`, 'index');
-    createMetadataReexportFile(entryPointDir, `./typings/index`, 'index');
+    createMetadataReexportFile(entryPointDir, `./typings/index`, 'index', importAsName);
 
     // Finally, create both a d.ts and metadata file for this entry-point in the root of
     // the package that re-exports from the entry-point's directory.
     createTypingsReexportFile(releasePath, `./${entryPointName}/index`, entryPointName);
-    createMetadataReexportFile(releasePath, `./${entryPointName}/index`, entryPointName);
+    createMetadataReexportFile(releasePath, `./${entryPointName}/index`, entryPointName,
+        importAsName);
   });
 }
 
diff --git a/tools/package-tools/metadata-reexport.ts b/tools/package-tools/metadata-reexport.ts
index 6f61ce8ddd65..adf3b6b92101 100644
--- a/tools/package-tools/metadata-reexport.ts
+++ b/tools/package-tools/metadata-reexport.ts
@@ -2,7 +2,8 @@ import {writeFileSync} from 'fs';
 import {join} from 'path';
 
 /** Creates a metadata file that re-exports the metadata bundle inside of the typings. */
-export function createMetadataReexportFile(destDir: string, from: string|string[], name: string) {
+export function createMetadataReexportFile(destDir: string, from: string|string[],
+                                           entryPointName: string, importAsName: string) {
   from = Array.isArray(from) ? from : [from];
 
   const metadataJsonContent = JSON.stringify({
@@ -10,8 +11,9 @@ export function createMetadataReexportFile(destDir: string, from: string|string[
     version: 3,
     metadata: {},
     exports: from.map(f => ({from: f})),
-    flatModuleIndexRedirect: true
+    flatModuleIndexRedirect: true,
+    importAs: importAsName
   }, null, 2);
 
-  writeFileSync(join(destDir, `${name}.metadata.json`), metadataJsonContent, 'utf-8');
+  writeFileSync(join(destDir, `${entryPointName}.metadata.json`), metadataJsonContent, 'utf-8');
 }

From 9fadf12c2941b739aa87e6d741b79dabc919dc61 Mon Sep 17 00:00:00 2001
From: Kara <kara@users.noreply.github.com>
Date: Thu, 5 Oct 2017 16:36:24 -0700
Subject: [PATCH 264/575] chore: bump version to beta.12 (#7568)

---
 CHANGELOG.md | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |   2 +-
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a8ab702792d..f9cb4d2f1842 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,108 @@
+<a name="2.0.0-beta.12"></a>
+# [2.0.0-beta.12 marble-mustache](https://github.com/angular/material2/compare/2.0.0-beta.11...2.0.0-beta.12) (2017-10-05)
+
+### Highlights
+
+* Progress spinner is now entirely css-based. 
+* Fixed sidenav: the sidenav can now be configured to use fixed positioning. This resolves a longstanding issue where sidenav-container would always introduce a scrolling region.
+* `mat-select` is now used inside `mat-form-field`. This makes all of the existing form-field features available with `mat-select`, including hints, errors, prefixes, and suffixes. This also ensures that `mat-select` and `matInput` have a consistent presentation.
+
+```html
+<mat-form-field>
+  <mat-select placeholder="State">
+    <mat-option *ngFor="let state of states" [value]="state">{{ state }}</mat-option>
+  </mat-select>
+</mat-form-field>
+```
+
+
+### Breaking Changes
+
+* Previously the `ScrollDispatcher.scrolled` subscription would react both on scroll events and on window resize events. Now it only reacts to scroll events. To react to resize events, subscribe to the `ViewportRuler.change()` stream.
+* `UniqueSelectionDispatcher`, `UniqueSelectionDispatcherListener` and `UNIQUE_SELECTION_DISPATCHER_PROVIDER` are no longer
+available from @angular/material and instead must be imported from @angular/cdk/collections
+* `isFocusTrapEnabled` is now properly marked internal.
+* The `OverlayRef.getState` method has been renamed to `OverlayRef.getConfig`.
+* `defaultErrorStateMatcher` has been replaced by `ErrorStateMatcher`. For more info, see the [input docs](https://github.com/angular/material2/blob/master/src/lib/input/input.md#custom-error-matcher).
+
+### Features
+
+* **autocomplete:** add md-autocomplete classes to overlay panel ([#7176](https://github.com/angular/material2/issues/7176)) ([f8cd790](https://github.com/angular/material2/commit/f8cd790)), closes [#4196](https://github.com/angular/material2/issues/4196)
+* **dialog:** add datepicker dialog and popup classes for easy styling ([#7013](https://github.com/angular/material2/issues/7013)) ([0ff8d5d](https://github.com/angular/material2/commit/0ff8d5d))
+* **menu:** support typeahead focus ([#7385](https://github.com/angular/material2/issues/7385)) ([f0d20ca](https://github.com/angular/material2/commit/f0d20ca))
+* **nav-tabs:** add `mat-tab-label-active` class to active nav tab labels ([#7508](https://github.com/angular/material2/issues/7508)) ([00e9338](https://github.com/angular/material2/commit/00e9338))
+* **progress-spinner:** switch to css-based animation ([#6551](https://github.com/angular/material2/issues/6551)) ([630dfad](https://github.com/angular/material2/commit/630dfad))
+* **select:** add support for custom error state matcher ([#7443](https://github.com/angular/material2/issues/7443)) ([a774688](https://github.com/angular/material2/commit/a774688)), closes [#7419](https://github.com/angular/material2/issues/7419)
+* **select:** make select work inside form-field ([#6488](https://github.com/angular/material2/issues/6488)) ([d914cc4](https://github.com/angular/material2/commit/d914cc4))
+* **selection-model:** de/select multiple values at the same time ([#7001](https://github.com/angular/material2/issues/7001)) ([e52beeb](https://github.com/angular/material2/commit/e52beeb))
+* **sidenav:** Add support for fixed sidenavs ([#6712](https://github.com/angular/material2/issues/6712)) ([61579bc](https://github.com/angular/material2/commit/61579bc))
+* **sort:** add enter and leave arrow animations ([#7180](https://github.com/angular/material2/issues/7180)) ([2d350a0](https://github.com/angular/material2/commit/2d350a0))
+* **table:** add row when predicate ([#6795](https://github.com/angular/material2/issues/6795)) ([0875b85](https://github.com/angular/material2/commit/0875b85))
+* **viewport-ruler:** add common window resize handler ([#7113](https://github.com/angular/material2/issues/7113)) ([3b0915a](https://github.com/angular/material2/commit/3b0915a))
+
+### Bug Fixes
+
+* add exportAs to missing components ([#7392](https://github.com/angular/material2/issues/7392)) ([31e9775](https://github.com/angular/material2/commit/31e9775)), closes [#7361](https://github.com/angular/material2/issues/7361)
+* remove all md prefixes ([#7241](https://github.com/angular/material2/issues/7241)) ([20a23f1](https://github.com/angular/material2/commit/20a23f1))
+* **slide-toggle:** report change to model before firing a change event ([#7076](https://github.com/angular/material2/issues/7076)) ([c82fca8](https://github.com/angular/material2/commit/c82fca8)), closes [#7074](https://github.com/angular/material2/issues/7074)
+* remove cdk re-exports from [@angular](https://github.com/angular)/material ([#7112](https://github.com/angular/material2/issues/7112)) ([f9b5ccd](https://github.com/angular/material2/commit/f9b5ccd))
+* **autocomplete:** don't open panel for readonly inputs ([#7271](https://github.com/angular/material2/issues/7271)) ([5f8615f](https://github.com/angular/material2/commit/5f8615f)), closes [#7269](https://github.com/angular/material2/issues/7269)
+* **autocomplete:** emit closing action for escape keydown event ([#6250](https://github.com/angular/material2/issues/6250)) ([f4673a5](https://github.com/angular/material2/commit/f4673a5))
+* **autocomplete:** empty not cleaning up on tab ([#7270](https://github.com/angular/material2/issues/7270)) ([6be0462](https://github.com/angular/material2/commit/6be0462)), closes [#7268](https://github.com/angular/material2/issues/7268)
+* **autocomplete:** error if panel is added asynchronously ([#7078](https://github.com/angular/material2/issues/7078)) ([504ba70](https://github.com/angular/material2/commit/504ba70)), closes [#7069](https://github.com/angular/material2/issues/7069)
+* **autocomplete:** remove invalid aria markup ([#7107](https://github.com/angular/material2/issues/7107)) ([6bd6b9f](https://github.com/angular/material2/commit/6bd6b9f)), closes [#7100](https://github.com/angular/material2/issues/7100)
+* **button:** allow for elevation to be overwritten ([#7305](https://github.com/angular/material2/issues/7305)) ([92a868e](https://github.com/angular/material2/commit/92a868e)), closes [#7264](https://github.com/angular/material2/issues/7264)
+* **calendar:** not reacting to min/max boundary changes ([#7234](https://github.com/angular/material2/issues/7234)) ([eb012cc](https://github.com/angular/material2/commit/eb012cc)), closes [#7202](https://github.com/angular/material2/issues/7202)
+* **checkbox:** defaulting to invalid name and value attributes ([#7130](https://github.com/angular/material2/issues/7130)) ([26788f1](https://github.com/angular/material2/commit/26788f1))
+* **checkbox:** support native tabindex attribute ([#6793](https://github.com/angular/material2/issues/6793)) ([0270cf5](https://github.com/angular/material2/commit/0270cf5))
+* **chips:** do not set chips value if there's no ngControl or value ([#7285](https://github.com/angular/material2/issues/7285)) ([d9ba13f](https://github.com/angular/material2/commit/d9ba13f))
+* **chips:** fix chip list focus and keyboard behaviors ([#7319](https://github.com/angular/material2/issues/7319)) ([f166468](https://github.com/angular/material2/commit/f166468))
+* **common:** don't log doctype warning when rendering server-side ([#6833](https://github.com/angular/material2/issues/6833)) ([f8ed442](https://github.com/angular/material2/commit/f8ed442))
+* **common-module:** check if computed styles are available ([#7003](https://github.com/angular/material2/issues/7003)) ([5da9e64](https://github.com/angular/material2/commit/5da9e64)), closes [#7000](https://github.com/angular/material2/issues/7000)
+* **datepicker:** make sure _datepickerInput exists before accessing its ([#7033](https://github.com/angular/material2/issues/7033)) ([2129b7a](https://github.com/angular/material2/commit/2129b7a))
+* **dialog:** directionality not injected into child components ([#7111](https://github.com/angular/material2/issues/7111)) ([daa3880](https://github.com/angular/material2/commit/daa3880))
+* **drawer:** backdrop not transitioning on close ([#6651](https://github.com/angular/material2/issues/6651)) ([80310a5](https://github.com/angular/material2/commit/80310a5))
+* **drawer:** drawer container animating when open by default ([#7129](https://github.com/angular/material2/issues/7129)) ([4d278dd](https://github.com/angular/material2/commit/4d278dd)), closes [#7007](https://github.com/angular/material2/issues/7007)
+* **drawer:** drawer container not reacting to drawer removal ([#7060](https://github.com/angular/material2/issues/7060)) ([b0b91f4](https://github.com/angular/material2/commit/b0b91f4)), closes [#6271](https://github.com/angular/material2/issues/6271)
+* **drawer:** open event not firing on init ([#7214](https://github.com/angular/material2/issues/7214)) ([ba5653d](https://github.com/angular/material2/commit/ba5653d)), closes [#7208](https://github.com/angular/material2/issues/7208)
+* **input:** apply readonly attribute when readonly ([#7439](https://github.com/angular/material2/issues/7439)) ([01622b1](https://github.com/angular/material2/commit/01622b1))
+* **input:** don't highlight container when readonly input is focused ([#7273](https://github.com/angular/material2/issues/7273)) ([f076390](https://github.com/angular/material2/commit/f076390))
+* **input:** make autosize work inside tabs & stepper ([#7341](https://github.com/angular/material2/issues/7341)) ([c6824d5](https://github.com/angular/material2/commit/c6824d5))
+* **list-key-manager:** align matching logic with native listbox ([#7212](https://github.com/angular/material2/issues/7212)) ([846cc13](https://github.com/angular/material2/commit/846cc13))
+* **list-key-manager:** don't focus disabled items in typeahead mode ([#7382](https://github.com/angular/material2/issues/7382)) ([1823b2f](https://github.com/angular/material2/commit/1823b2f))
+* **menu:** multiple close events for a single close ([#7037](https://github.com/angular/material2/issues/7037)) ([2dcb76c](https://github.com/angular/material2/commit/2dcb76c))
+* **menu:** nested menu error when items are rendered in a repeater ([#6766](https://github.com/angular/material2/issues/6766)) ([7a96570](https://github.com/angular/material2/commit/7a96570)), closes [#6765](https://github.com/angular/material2/issues/6765)
+* **overlay:** detach method returns undefined ([#7449](https://github.com/angular/material2/issues/7449)) ([0584cdf](https://github.com/angular/material2/commit/0584cdf)), closes [#7408](https://github.com/angular/material2/issues/7408)
+* **paginator:** page size selector not working ([#7263](https://github.com/angular/material2/issues/7263)) ([2b3d795](https://github.com/angular/material2/commit/2b3d795))
+* **radio:** defaulting to invalid name attribute ([#7131](https://github.com/angular/material2/issues/7131)) ([c5e162b](https://github.com/angular/material2/commit/c5e162b))
+* **ripple:** handle touch events ([#7299](https://github.com/angular/material2/issues/7299)) ([fe0864b](https://github.com/angular/material2/commit/fe0864b)), closes [#7062](https://github.com/angular/material2/issues/7062)
+* **ripple:** remove unused ScrollDispatchModule ([#7528](https://github.com/angular/material2/issues/7528)) ([4a1a68d](https://github.com/angular/material2/commit/4a1a68d))
+* **ripple:** use element coordinates instead of page coordinates ([#7446](https://github.com/angular/material2/issues/7446)) ([7714a5c](https://github.com/angular/material2/commit/7714a5c)), closes [#7436](https://github.com/angular/material2/issues/7436)
+* **select:** losing focus when selecting values through binding ([#7296](https://github.com/angular/material2/issues/7296)) ([86bea91](https://github.com/angular/material2/commit/86bea91)), closes [#7092](https://github.com/angular/material2/issues/7092)
+* **select:** multiple change events emitted when changing options of a closed select ([#7232](https://github.com/angular/material2/issues/7232)) ([c7ab828](https://github.com/angular/material2/commit/c7ab828)), closes [#7227](https://github.com/angular/material2/issues/7227)
+* **select:** prevent nbsp from getting butchered in AOT ([#7363](https://github.com/angular/material2/issues/7363)) ([2e71cac](https://github.com/angular/material2/commit/2e71cac))
+* **select:** theme not being transferred to the panel ([#7342](https://github.com/angular/material2/issues/7342)) ([6b70ca6](https://github.com/angular/material2/commit/6b70ca6))
+* **selection-list:** model not updated when option is selected programmatically ([#7334](https://github.com/angular/material2/issues/7334)) ([f40a7cc](https://github.com/angular/material2/commit/f40a7cc)), closes [#7318](https://github.com/angular/material2/issues/7318)
+* **selection-list:** restore focus if active item is destroyed ([#7125](https://github.com/angular/material2/issues/7125)) ([e05f939](https://github.com/angular/material2/commit/e05f939))
+* **selection-list:** tabIndex should respect disabled state ([#7039](https://github.com/angular/material2/issues/7039)) ([c2a9516](https://github.com/angular/material2/commit/c2a9516))
+* **sidenav:** change content from md- to mat- ([#7307](https://github.com/angular/material2/issues/7307)) ([d05dcfa](https://github.com/angular/material2/commit/d05dcfa))
+* **slider:** change event is not being emitted ([#7278](https://github.com/angular/material2/issues/7278)) ([39543a3](https://github.com/angular/material2/commit/39543a3)), closes [#7207](https://github.com/angular/material2/issues/7207)
+* **snack-bar:** positioned snack bar animation not starting off-screen ([#7453](https://github.com/angular/material2/issues/7453)) ([58d3bb8](https://github.com/angular/material2/commit/58d3bb8))
+* **snack-bar:** subsequent snack bars not opening; animation issues ([#7086](https://github.com/angular/material2/issues/7086)) ([8e77261](https://github.com/angular/material2/commit/8e77261)), closes [#7063](https://github.com/angular/material2/issues/7063)
+* **sort:** fix incorrect conditional grouping ([#7427](https://github.com/angular/material2/issues/7427)) ([f5e916d](https://github.com/angular/material2/commit/f5e916d))
+* **sort:** style changes to fix IE ([#7375](https://github.com/angular/material2/issues/7375)) ([75f26e8](https://github.com/angular/material2/commit/75f26e8))
+* **sort:** throw error on invalid direction ([#7378](https://github.com/angular/material2/issues/7378)) ([cc6f39e](https://github.com/angular/material2/commit/cc6f39e))
+* **stepper:** align appearance with spec ([#7279](https://github.com/angular/material2/issues/7279)) ([4122ae2](https://github.com/angular/material2/commit/4122ae2)), closes [#7260](https://github.com/angular/material2/issues/7260)
+* **stepper:** avoid blurry content on IE ([#6992](https://github.com/angular/material2/issues/6992)) ([6f48710](https://github.com/angular/material2/commit/6f48710))
+* **stepper:** selected is always undefined ([#7213](https://github.com/angular/material2/issues/7213)) ([217840c](https://github.com/angular/material2/commit/217840c))
+* **stepper:** switch to OnPush change detection ([#7119](https://github.com/angular/material2/issues/7119)) ([c2c6e04](https://github.com/angular/material2/commit/c2c6e04))
+* **stepper:** unable to internationalize labels ([#7122](https://github.com/angular/material2/issues/7122)) ([6e3bbcb](https://github.com/angular/material2/commit/6e3bbcb))
+* **tabs:** blurry content in IE ([#6954](https://github.com/angular/material2/issues/6954)) ([7a354a0](https://github.com/angular/material2/commit/7a354a0)), closes [#6944](https://github.com/angular/material2/issues/6944)
+* **tabs:** update tab output names  ([#7134](https://github.com/angular/material2/issues/7134)) ([38268d3](https://github.com/angular/material2/commit/38268d3))
+* **theming:** incorrect green-500 contrast color ([#7492](https://github.com/angular/material2/issues/7492)) ([c1f6ea1](https://github.com/angular/material2/commit/c1f6ea1)), closes [#7490](https://github.com/angular/material2/issues/7490)
+* **tooltip:** ensure tooltip stays within viewport ([#6659](https://github.com/angular/material2/issues/6659)) ([c8ddd39](https://github.com/angular/material2/commit/c8ddd39)), closes [#5428](https://github.com/angular/material2/issues/5428)
+* **tooltip:** minification issue ([#7430](https://github.com/angular/material2/issues/7430)) ([b121e32](https://github.com/angular/material2/commit/b121e32))
+
 <a name="2.0.0-beta.11"></a>
 # [2.0.0-beta.11 carapace-parapet](https://github.com/angular/material2/compare/2.0.0-beta.10...2.0.0-beta.11) (2017-09-21)
 
diff --git a/package.json b/package.json
index 26cd4141c1ae..c8805ddb83e6 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "docs": "gulp docs",
     "api": "gulp api-docs"
   },
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.12",
   "license": "MIT",
   "engines": {
     "node": ">= 5.4.1"

From 0e36c662357e37c10308bb448791f9adc4810d59 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 6 Oct 2017 11:54:42 -0400
Subject: [PATCH 265/575] docs(changelog): add missing breaking changes (#7585)

---
 CHANGELOG.md      | 4 ++++
 guides/theming.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9cb4d2f1842..f11ffb111111 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,10 @@
 
 ### Breaking Changes
 
+* All "md" prefixes have been removed. See the [deprecation notice in the beta.11 notes for more
+information](https://github.com/angular/material2/blob/master/CHANGELOG.md#deprecation-of-md-prefix).
+* All cdk re-exports in `@angular/material` have been removed. See the [the beta.10 notes for more
+information](https://github.com/angular/material2/blob/master/CHANGELOG.md#breaking-changes-2).
 * Previously the `ScrollDispatcher.scrolled` subscription would react both on scroll events and on window resize events. Now it only reacts to scroll events. To react to resize events, subscribe to the `ViewportRuler.change()` stream.
 * `UniqueSelectionDispatcher`, `UniqueSelectionDispatcherListener` and `UNIQUE_SELECTION_DISPATCHER_PROVIDER` are no longer
 available from @angular/material and instead must be imported from @angular/cdk/collections
diff --git a/guides/theming.md b/guides/theming.md
index aca2e50fc65c..9c38f2aa242e 100644
--- a/guides/theming.md
+++ b/guides/theming.md
@@ -172,7 +172,7 @@ an additional step is required for those components to be affected by the theme'
 To do this, you can add the appropriate class to the global overlay container. For the example above,
 this would look like:
 ```ts
-import {OverlayContainer} from '@angular/material';
+import {OverlayContainer} from '@angular/cdk/overlay';
 
 @NgModule({
   // ...

From db3e248e6ec674cdd98d3115eb50a5f815988cf7 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 20:28:29 +0200
Subject: [PATCH 266/575] chore: remove leftover md- prefixes (#7537)

Fixes a few places where we still had leftover `md-` prefixes. Also gets rid of all instances of the `md-24` class in icon examples since it doesn't do anything.
---
 e2e/components/icon-e2e.spec.ts               |  2 +-
 src/demo-app/a11y/button/button-a11y.html     | 12 +++----
 .../button-toggle/button-toggle-demo.html     |  6 ++--
 src/demo-app/button/button-demo.html          | 30 ++++++++--------
 src/demo-app/demo-app/demo-app.html           |  4 +--
 .../screen-type/screen-type-demo.html         | 34 +++++++++----------
 src/e2e-app/button/button-e2e.html            |  4 +--
 src/e2e-app/icon/icon-e2e.html                |  4 +--
 src/lib/autocomplete/autocomplete.ts          |  2 +-
 .../button-types/button-types-example.html    | 14 ++++----
 10 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/e2e/components/icon-e2e.spec.ts b/e2e/components/icon-e2e.spec.ts
index 0c17ac1ff1f2..f0261f5d2d85 100644
--- a/e2e/components/icon-e2e.spec.ts
+++ b/e2e/components/icon-e2e.spec.ts
@@ -13,7 +13,7 @@ describe('icon', () => {
     it('should have the correct class when used', async () => {
       const attr = await testIcon.getAttribute('class');
 
-      expect(attr).toContain('md-24');
+      expect(attr).toContain('custom-class');
       expect(attr).toContain('material-icons');
     });
 
diff --git a/src/demo-app/a11y/button/button-a11y.html b/src/demo-app/a11y/button/button-a11y.html
index 71c5a7d8a086..fdfd08af2a0a 100644
--- a/src/demo-app/a11y/button/button-a11y.html
+++ b/src/demo-app/a11y/button/button-a11y.html
@@ -7,15 +7,15 @@ <h2>Button elements</h2>
     <button mat-raised-button (click)="increase()">Pitch</button>
     <button mat-fab (click)="increase()"
             aria-label="Activate floating action style button to increase the button counter">
-      <mat-icon class="md-24">plus_one</mat-icon>
+      <mat-icon>plus_one</mat-icon>
     </button>
     <button mat-mini-fab (click)="increase()"
             aria-label="Mini floating action button to increase the button counter by 1">
-      <mat-icon class="md-24">plus_one</mat-icon>
+      <mat-icon>plus_one</mat-icon>
     </button>
     <button mat-icon-button (click)="increase()"
             aria-label="Icon button to increase the button counter by 1">
-      <mat-icon class="md-24">plus_one</mat-icon>
+      <mat-icon>plus_one</mat-icon>
     </button>
   </section>
 
@@ -25,15 +25,15 @@ <h2>Anchor elements</h2>
     <a href="https://www.youtube.com/" mat-raised-button>YouTube</a>
     <a href="http://www.google.com" mat-fab
        aria-label="Activate floating action style google search link">
-      <mat-icon class="md-24">search</mat-icon>
+      <mat-icon>search</mat-icon>
     </a>
     <a href="http://www.google.com" mat-mini-fab
        aria-label="Activate mini floating action style google search link">
-      <mat-icon class="md-24">search</mat-icon>
+      <mat-icon>search</mat-icon>
     </a>
     <a href="http://www.google.com" mat-icon-button
        aria-label="Activate icon style google search link">
-      <mat-icon class="md-24">search</mat-icon>
+      <mat-icon>search</mat-icon>
     </a>
   </section>
 
diff --git a/src/demo-app/button-toggle/button-toggle-demo.html b/src/demo-app/button-toggle/button-toggle-demo.html
index 3d81775b284e..fdb4c24fafa1 100644
--- a/src/demo-app/button-toggle/button-toggle-demo.html
+++ b/src/demo-app/button-toggle/button-toggle-demo.html
@@ -22,13 +22,13 @@ <h1>Disabled Group</h1>
 <section class="demo-section">
   <mat-button-toggle-group name="checkbox" [vertical]="isVertical" [disabled]="isDisabled">
     <mat-button-toggle value="bold">
-      <mat-icon class="md-24">format_bold</mat-icon>
+      <mat-icon>format_bold</mat-icon>
     </mat-button-toggle>
     <mat-button-toggle value="italic">
-      <mat-icon class="md-24">format_italic</mat-icon>
+      <mat-icon>format_italic</mat-icon>
     </mat-button-toggle>
     <mat-button-toggle value="underline">
-      <mat-icon class="md-24">format_underline</mat-icon>
+      <mat-icon>format_underline</mat-icon>
     </mat-button-toggle>
   </mat-button-toggle-group>
 </section>
diff --git a/src/demo-app/button/button-demo.html b/src/demo-app/button/button-demo.html
index 38ffdfd83e83..2b3400b15761 100644
--- a/src/demo-app/button/button-demo.html
+++ b/src/demo-app/button/button-demo.html
@@ -3,13 +3,13 @@
     <button mat-button>flat</button>
     <button mat-raised-button>raised</button>
     <button mat-fab>
-      <mat-icon class="md-24">check</mat-icon>
+      <mat-icon>check</mat-icon>
     </button>
     <button mat-fab>Btn</button>
     <a mat-fab routerLink=".">Link</a>
-    <a mat-fab routerLink="."><mat-icon class="md-24">check</mat-icon></a>
+    <a mat-fab routerLink="."><mat-icon>check</mat-icon></a>
     <button mat-mini-fab>
-      <mat-icon class="md-24">check</mat-icon>
+      <mat-icon>check</mat-icon>
     </button>
     <button mat-mini-fab>Btn</button>
     <a mat-mini-fab routerLink=".">Link</a>
@@ -19,10 +19,10 @@
     <a href="http://www.google.com" mat-button color="primary">SEARCH</a>
     <a href="http://www.google.com" mat-raised-button>SEARCH</a>
     <a href="http://www.google.com" mat-fab>
-      <mat-icon class="md-24">check</mat-icon>
+      <mat-icon>check</mat-icon>
     </a>
     <a href="http://www.google.com" mat-mini-fab>
-      <mat-icon class="md-24">check</mat-icon>
+      <mat-icon>check</mat-icon>
     </a>
   </section>
 
@@ -40,27 +40,27 @@
 
   <section>
     <button mat-fab color="primary">
-      <mat-icon class="md-24">home</mat-icon>
+      <mat-icon>home</mat-icon>
     </button>
     <button mat-fab color="accent">
-      <mat-icon class="md-24">favorite</mat-icon>
+      <mat-icon>favorite</mat-icon>
     </button>
     <button mat-fab color="warn">
-      <mat-icon class="md-24">feedback</mat-icon>
+      <mat-icon>feedback</mat-icon>
     </button>
   </section>
 
   <section>
     <button mat-icon-button color="primary">
-      <mat-icon class="md-24">menu</mat-icon>
+      <mat-icon>menu</mat-icon>
     </button>
 
     <button mat-icon-button color="accent">
-      <mat-icon class="md-24">favorite</mat-icon>
+      <mat-icon>favorite</mat-icon>
     </button>
 
     <button mat-icon-button>
-      <mat-icon class="md-24">more_vert</mat-icon>
+      <mat-icon>more_vert</mat-icon>
     </button>
   </section>
 
@@ -79,11 +79,11 @@
     <a href="http://www.google.com" #button2 mat-button color="accent" [disabled]="isDisabled">off</a>
     <button mat-raised-button #button3 color="primary" [disabled]="isDisabled">off</button>
     <button mat-mini-fab [disabled]="isDisabled">
-      <mat-icon class="md-24">check</mat-icon>
+      <mat-icon>check</mat-icon>
     </button>
 
     <button mat-icon-button color="accent" [disabled]="isDisabled">
-      <mat-icon class="md-24">favorite</mat-icon>
+      <mat-icon>favorite</mat-icon>
     </button>
   </section>
   <section>
@@ -97,13 +97,13 @@
   <section>
     <button mat-raised-button>More<mat-icon>more_vert</mat-icon></button>
     <button mat-raised-button>Check<mat-icon>check</mat-icon></button>
-    <button mat-raised-button>Check<mat-icon class="md-24">favorite</mat-icon></button>
+    <button mat-raised-button>Check<mat-icon>favorite</mat-icon></button>
     <button mat-raised-button>Last<mat-icon>navigate_before</mat-icon></button>
   </section>
   <section>
     <button mat-button>More<mat-icon>more_vert</mat-icon></button>
     <button mat-button>Check<mat-icon>check</mat-icon></button>
-    <button mat-button>Check<mat-icon class="md-24">favorite</mat-icon></button>
+    <button mat-button>Check<mat-icon>favorite</mat-icon></button>
     <button mat-button>Last<mat-icon>navigate_before</mat-icon></button>
   </section>
   <section>
diff --git a/src/demo-app/demo-app/demo-app.html b/src/demo-app/demo-app/demo-app.html
index 496b93d96346..cb6e9d904537 100644
--- a/src/demo-app/demo-app/demo-app.html
+++ b/src/demo-app/demo-app/demo-app.html
@@ -25,13 +25,13 @@
   <div>
     <mat-toolbar color="primary">
       <button mat-icon-button (click)="start.open()">
-        <mat-icon class="md-24">menu</mat-icon>
+        <mat-icon>menu</mat-icon>
       </button>
       <div class="demo-toolbar">
         <h1>Angular Material Demos</h1>
         <div>
           <button mat-icon-button (click)="toggleFullscreen()" title="Toggle fullscreen">
-            <mat-icon class="md-24">fullscreen</mat-icon>
+            <mat-icon>fullscreen</mat-icon>
           </button>
           <button mat-button (click)="toggleTheme()">{{dark ? 'Light' : 'Dark'}} theme</button>
           <button mat-button (click)="root.dir = (root.dir == 'rtl' ? 'ltr' : 'rtl')" title="Toggle between RTL and LTR">
diff --git a/src/demo-app/screen-type/screen-type-demo.html b/src/demo-app/screen-type/screen-type-demo.html
index 6632da3f6f91..738a872f9392 100644
--- a/src/demo-app/screen-type/screen-type-demo.html
+++ b/src/demo-app/screen-type/screen-type-demo.html
@@ -1,29 +1,29 @@
 <h2>Screen Type</h2>
 
-<md-grid-list cols="6" rowHeight="1:2">
-  <md-grid-tile [class.active]="(isHandset | async)?.matches"
+<mat-grid-list cols="6" rowHeight="1:2">
+  <mat-grid-tile [class.active]="(isHandset | async)?.matches"
                 colspan="2">
-    <md-icon>smartphone</md-icon>
+    <mat-icon>smartphone</mat-icon>
     <p>Handset</p>
-  </md-grid-tile>
-  <md-grid-tile [class.active]="(isTablet | async)?.matches"
+  </mat-grid-tile>
+  <mat-grid-tile [class.active]="(isTablet | async)?.matches"
                 colspan="2">
-    <md-icon>tablet_android</md-icon>
+    <mat-icon>tablet_android</mat-icon>
     <p>Tablet</p>
-  </md-grid-tile>
-  <md-grid-tile [class.active]="(isWeb | async)?.matches"
+  </mat-grid-tile>
+  <mat-grid-tile [class.active]="(isWeb | async)?.matches"
                 colspan="2">
-    <md-icon>laptop</md-icon>
+    <mat-icon>laptop</mat-icon>
     <p>Web</p>
-  </md-grid-tile>
-  <md-grid-tile [class.active]="(isPortrait | async)?.matches"
+  </mat-grid-tile>
+  <mat-grid-tile [class.active]="(isPortrait | async)?.matches"
                 colspan="3">
-    <md-icon>stay_current_portrait</md-icon>
+    <mat-icon>stay_current_portrait</mat-icon>
     <p>Portrait</p>
-  </md-grid-tile>
-  <md-grid-tile [class.active]="(isLandscape | async)?.matches"
+  </mat-grid-tile>
+  <mat-grid-tile [class.active]="(isLandscape | async)?.matches"
                 colspan="3">
-    <md-icon>stay_current_landscape</md-icon>
+    <mat-icon>stay_current_landscape</mat-icon>
     <p>Landscape</p>
-  </md-grid-tile>
-</md-grid-list>
+  </mat-grid-tile>
+</mat-grid-list>
diff --git a/src/e2e-app/button/button-e2e.html b/src/e2e-app/button/button-e2e.html
index 74510d8c9015..762b3289c9c9 100644
--- a/src/e2e-app/button/button-e2e.html
+++ b/src/e2e-app/button/button-e2e.html
@@ -27,10 +27,10 @@
   </button>
 
   <button mat-mini-fab [disabled]="isDisabled" aria-label="Check">
-    <mat-icon class="md-24">check</mat-icon>
+    <mat-icon>check</mat-icon>
   </button>
 
   <button mat-icon-button color="accent" [disabled]="isDisabled" aria-label="Check">
-    <mat-icon class="md-24">favorite</mat-icon>
+    <mat-icon>favorite</mat-icon>
   </button>
 </section>
diff --git a/src/e2e-app/icon/icon-e2e.html b/src/e2e-app/icon/icon-e2e.html
index 65a0e62c71e9..78e142c11f4c 100644
--- a/src/e2e-app/icon/icon-e2e.html
+++ b/src/e2e-app/icon/icon-e2e.html
@@ -1,3 +1,3 @@
 <section>
-  <mat-icon class="md-24" id="test-icon">favorite</mat-icon>
-</section>
\ No newline at end of file
+  <mat-icon class="custom-class" id="test-icon">favorite</mat-icon>
+</section>
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index e7238dcb5687..ba4080ec729d 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -84,7 +84,7 @@ export class MatAutocomplete implements AfterContentInit {
       new EventEmitter<MatAutocompleteSelectedEvent>();
 
   /**
-   * Takes classes set on the host md-autocomplete element and applies them to the panel
+   * Takes classes set on the host mat-autocomplete element and applies them to the panel
    * inside the overlay container to allow for easy styling.
    */
   @Input('class')
diff --git a/src/material-examples/button-types/button-types-example.html b/src/material-examples/button-types/button-types-example.html
index 2e06c96f7913..852556d94561 100644
--- a/src/material-examples/button-types/button-types-example.html
+++ b/src/material-examples/button-types/button-types-example.html
@@ -21,19 +21,19 @@ <h3>Raised Buttons</h3>
 <h3>Icon Buttons</h3>
 <div class="button-row">
   <button mat-icon-button>
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
   <button mat-icon-button color="primary">
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
   <button mat-icon-button color="accent">
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
   <button mat-icon-button color="warn">
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
   <button mat-icon-button disabled>
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
 </div>
 
@@ -45,7 +45,7 @@ <h3>Fab Buttons</h3>
   <button mat-fab color="warn">Warn</button>
   <button mat-fab disabled>Disabled</button>
   <button mat-fab>
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
   <a mat-fab routerLink=".">Link</a>
 </div>
@@ -58,7 +58,7 @@ <h3>Mini Fab Buttons</h3>
   <button mat-mini-fab color="warn">Warn</button>
   <button mat-mini-fab disabled>Disabled</button>
   <button mat-mini-fab>
-    <mat-icon class="md-24" aria-label="Example icon-button with a heart icon">favorite</mat-icon>
+    <mat-icon aria-label="Example icon-button with a heart icon">favorite</mat-icon>
   </button>
   <a mat-mini-fab routerLink=".">Link</a>
 </div>

From 8bb471f70355bc0adf2188b9981f05173265ca1f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 6 Oct 2017 20:30:08 +0200
Subject: [PATCH 267/575] build: fix version placeholder replacement (#7598)

---
 tools/package-tools/version-placeholders.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/package-tools/version-placeholders.ts b/tools/package-tools/version-placeholders.ts
index 7af4c61dd06f..c08530179325 100644
--- a/tools/package-tools/version-placeholders.ts
+++ b/tools/package-tools/version-placeholders.ts
@@ -49,12 +49,12 @@ function buildPlaceholderFindCommand(packageDir: string) {
   if (platform() === 'win32') {
     return {
       binary: 'findstr',
-      args: ['/msi', `"${ngVersionPlaceholderText} ${versionPlaceholderText}"`, `${packageDir}\\*`]
+      args: ['/msi', `${ngVersionPlaceholderText} ${versionPlaceholderText}`, `${packageDir}\\*`]
     };
   } else {
     return {
       binary: 'grep',
-      args: ['-ril', `"${ngVersionPlaceholderText}\\|${versionPlaceholderText}"`, packageDir]
+      args: ['-ril', `${ngVersionPlaceholderText}\\|${versionPlaceholderText}`, packageDir]
     };
   }
 }

From 0834a31d03ae6707633e01d43200703840b70c5a Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 6 Oct 2017 14:31:05 -0400
Subject: [PATCH 268/575] chore: update copyright to Google LLC (#7589)

---
 LICENSE                                                         | 2 +-
 build-config.js                                                 | 2 +-
 src/cdk/a11y/a11y-module.ts                                     | 2 +-
 src/cdk/a11y/activedescendant-key-manager.ts                    | 2 +-
 src/cdk/a11y/aria-describer.ts                                  | 2 +-
 src/cdk/a11y/aria-reference.ts                                  | 2 +-
 src/cdk/a11y/fake-mousedown.ts                                  | 2 +-
 src/cdk/a11y/focus-key-manager.ts                               | 2 +-
 src/cdk/a11y/focus-monitor.ts                                   | 2 +-
 src/cdk/a11y/focus-trap.ts                                      | 2 +-
 src/cdk/a11y/index.ts                                           | 2 +-
 src/cdk/a11y/interactivity-checker.ts                           | 2 +-
 src/cdk/a11y/list-key-manager.ts                                | 2 +-
 src/cdk/a11y/live-announcer.ts                                  | 2 +-
 src/cdk/a11y/public-api.ts                                      | 2 +-
 src/cdk/bidi/bidi-module.ts                                     | 2 +-
 src/cdk/bidi/dir.ts                                             | 2 +-
 src/cdk/bidi/directionality.ts                                  | 2 +-
 src/cdk/bidi/index.ts                                           | 2 +-
 src/cdk/bidi/public-api.ts                                      | 2 +-
 src/cdk/coercion/array.ts                                       | 2 +-
 src/cdk/coercion/boolean-property.ts                            | 2 +-
 src/cdk/coercion/index.ts                                       | 2 +-
 src/cdk/coercion/number-property.ts                             | 2 +-
 src/cdk/coercion/public-api.ts                                  | 2 +-
 src/cdk/collections/collection-viewer.ts                        | 2 +-
 src/cdk/collections/data-source.ts                              | 2 +-
 src/cdk/collections/index.ts                                    | 2 +-
 src/cdk/collections/public-api.ts                               | 2 +-
 src/cdk/collections/selection.ts                                | 2 +-
 src/cdk/collections/unique-selection-dispatcher.ts              | 2 +-
 src/cdk/index.ts                                                | 2 +-
 src/cdk/keycodes/index.ts                                       | 2 +-
 src/cdk/keycodes/keycodes.ts                                    | 2 +-
 src/cdk/keycodes/public-api.ts                                  | 2 +-
 src/cdk/layout/breakpoints-observer.spec.ts                     | 2 +-
 src/cdk/layout/breakpoints-observer.ts                          | 2 +-
 src/cdk/layout/breakpoints.ts                                   | 2 +-
 src/cdk/layout/index.ts                                         | 2 +-
 src/cdk/layout/media-matcher.spec.ts                            | 2 +-
 src/cdk/layout/media-matcher.ts                                 | 2 +-
 src/cdk/layout/public-api.ts                                    | 2 +-
 src/cdk/observers/index.ts                                      | 2 +-
 src/cdk/observers/observe-content.ts                            | 2 +-
 src/cdk/observers/public-api.ts                                 | 2 +-
 src/cdk/overlay/fullscreen-overlay-container.ts                 | 2 +-
 src/cdk/overlay/generic-component-type.ts                       | 2 +-
 src/cdk/overlay/index.ts                                        | 2 +-
 src/cdk/overlay/overlay-config.ts                               | 2 +-
 src/cdk/overlay/overlay-container.ts                            | 2 +-
 src/cdk/overlay/overlay-directives.ts                           | 2 +-
 src/cdk/overlay/overlay-module.ts                               | 2 +-
 src/cdk/overlay/overlay-ref.ts                                  | 2 +-
 src/cdk/overlay/overlay.ts                                      | 2 +-
 src/cdk/overlay/position/connected-position-strategy.ts         | 2 +-
 src/cdk/overlay/position/connected-position.ts                  | 2 +-
 src/cdk/overlay/position/global-position-strategy.ts            | 2 +-
 src/cdk/overlay/position/overlay-position-builder.ts            | 2 +-
 src/cdk/overlay/position/position-strategy.ts                   | 2 +-
 src/cdk/overlay/position/scroll-clip.ts                         | 2 +-
 src/cdk/overlay/public-api.ts                                   | 2 +-
 src/cdk/overlay/scroll/block-scroll-strategy.ts                 | 2 +-
 src/cdk/overlay/scroll/close-scroll-strategy.ts                 | 2 +-
 src/cdk/overlay/scroll/index.ts                                 | 2 +-
 src/cdk/overlay/scroll/noop-scroll-strategy.ts                  | 2 +-
 src/cdk/overlay/scroll/reposition-scroll-strategy.ts            | 2 +-
 src/cdk/overlay/scroll/scroll-strategy-options.ts               | 2 +-
 src/cdk/overlay/scroll/scroll-strategy.ts                       | 2 +-
 src/cdk/platform/features.ts                                    | 2 +-
 src/cdk/platform/index.ts                                       | 2 +-
 src/cdk/platform/platform-module.ts                             | 2 +-
 src/cdk/platform/platform.ts                                    | 2 +-
 src/cdk/platform/public-api.ts                                  | 2 +-
 src/cdk/portal/dom-portal-host.ts                               | 2 +-
 src/cdk/portal/index.ts                                         | 2 +-
 src/cdk/portal/portal-directives.ts                             | 2 +-
 src/cdk/portal/portal-errors.ts                                 | 2 +-
 src/cdk/portal/portal-injector.ts                               | 2 +-
 src/cdk/portal/portal.ts                                        | 2 +-
 src/cdk/portal/public-api.ts                                    | 2 +-
 src/cdk/public-api.ts                                           | 2 +-
 src/cdk/rxjs/index.ts                                           | 2 +-
 src/cdk/rxjs/public-api.ts                                      | 2 +-
 src/cdk/rxjs/rx-chain.ts                                        | 2 +-
 src/cdk/rxjs/rx-operators.ts                                    | 2 +-
 src/cdk/scrolling/index.ts                                      | 2 +-
 src/cdk/scrolling/public-api.ts                                 | 2 +-
 src/cdk/scrolling/scroll-dispatcher.ts                          | 2 +-
 src/cdk/scrolling/scrollable.ts                                 | 2 +-
 src/cdk/scrolling/scrolling-module.ts                           | 2 +-
 src/cdk/scrolling/viewport-ruler.ts                             | 2 +-
 src/cdk/stepper/index.ts                                        | 2 +-
 src/cdk/stepper/public-api.ts                                   | 2 +-
 src/cdk/stepper/step-label.ts                                   | 2 +-
 src/cdk/stepper/stepper-button.ts                               | 2 +-
 src/cdk/stepper/stepper-module.ts                               | 2 +-
 src/cdk/stepper/stepper.ts                                      | 2 +-
 src/cdk/table/cell.ts                                           | 2 +-
 src/cdk/table/index.ts                                          | 2 +-
 src/cdk/table/public-api.ts                                     | 2 +-
 src/cdk/table/row.ts                                            | 2 +-
 src/cdk/table/table-errors.ts                                   | 2 +-
 src/cdk/table/table-module.ts                                   | 2 +-
 src/cdk/table/table.ts                                          | 2 +-
 src/cdk/testing/dispatch-events.ts                              | 2 +-
 src/cdk/testing/event-objects.ts                                | 2 +-
 src/cdk/testing/fake-viewport-ruler.ts                          | 2 +-
 src/cdk/testing/index.ts                                        | 2 +-
 src/cdk/testing/public-api.ts                                   | 2 +-
 src/cdk/testing/type-in-element.ts                              | 2 +-
 src/cdk/testing/wrapped-error-message.ts                        | 2 +-
 src/cdk/version.ts                                              | 2 +-
 src/lib/autocomplete/autocomplete-module.ts                     | 2 +-
 src/lib/autocomplete/autocomplete-trigger.ts                    | 2 +-
 src/lib/autocomplete/autocomplete.ts                            | 2 +-
 src/lib/autocomplete/index.ts                                   | 2 +-
 src/lib/autocomplete/public-api.ts                              | 2 +-
 src/lib/button-toggle/button-toggle-module.ts                   | 2 +-
 src/lib/button-toggle/button-toggle.ts                          | 2 +-
 src/lib/button-toggle/index.ts                                  | 2 +-
 src/lib/button-toggle/public-api.ts                             | 2 +-
 src/lib/button/button-module.ts                                 | 2 +-
 src/lib/button/button.ts                                        | 2 +-
 src/lib/button/index.ts                                         | 2 +-
 src/lib/button/public-api.ts                                    | 2 +-
 src/lib/card/card-module.ts                                     | 2 +-
 src/lib/card/card.ts                                            | 2 +-
 src/lib/card/index.ts                                           | 2 +-
 src/lib/card/public-api.ts                                      | 2 +-
 src/lib/checkbox/checkbox-module.ts                             | 2 +-
 src/lib/checkbox/checkbox-required-validator.ts                 | 2 +-
 src/lib/checkbox/checkbox.ts                                    | 2 +-
 src/lib/checkbox/index.ts                                       | 2 +-
 src/lib/checkbox/public-api.ts                                  | 2 +-
 src/lib/chips/chip-input.ts                                     | 2 +-
 src/lib/chips/chip-list.ts                                      | 2 +-
 src/lib/chips/chip.ts                                           | 2 +-
 src/lib/chips/chips-module.ts                                   | 2 +-
 src/lib/chips/index.ts                                          | 2 +-
 src/lib/chips/public-api.ts                                     | 2 +-
 src/lib/core/animation/animation.ts                             | 2 +-
 src/lib/core/common-behaviors/color.ts                          | 2 +-
 src/lib/core/common-behaviors/common-module.ts                  | 2 +-
 src/lib/core/common-behaviors/constructor.ts                    | 2 +-
 src/lib/core/common-behaviors/disable-ripple.ts                 | 2 +-
 src/lib/core/common-behaviors/disabled.ts                       | 2 +-
 src/lib/core/common-behaviors/index.ts                          | 2 +-
 src/lib/core/common-behaviors/tabindex.ts                       | 2 +-
 src/lib/core/compatibility/compatibility.ts                     | 2 +-
 src/lib/core/datetime/date-adapter.ts                           | 2 +-
 src/lib/core/datetime/date-formats.ts                           | 2 +-
 src/lib/core/datetime/index.ts                                  | 2 +-
 src/lib/core/datetime/native-date-adapter.ts                    | 2 +-
 src/lib/core/datetime/native-date-formats.ts                    | 2 +-
 src/lib/core/error/error-options.ts                             | 2 +-
 src/lib/core/gestures/gesture-annotations.ts                    | 2 +-
 src/lib/core/gestures/gesture-config.ts                         | 2 +-
 src/lib/core/index.ts                                           | 2 +-
 src/lib/core/line/line.ts                                       | 2 +-
 src/lib/core/option/index.ts                                    | 2 +-
 src/lib/core/option/optgroup.ts                                 | 2 +-
 src/lib/core/option/option.ts                                   | 2 +-
 src/lib/core/placeholder/placeholder-options.ts                 | 2 +-
 src/lib/core/public-api.ts                                      | 2 +-
 src/lib/core/ripple/index.ts                                    | 2 +-
 src/lib/core/ripple/ripple-ref.ts                               | 2 +-
 src/lib/core/ripple/ripple-renderer.ts                          | 2 +-
 src/lib/core/ripple/ripple.ts                                   | 2 +-
 src/lib/core/selection/index.ts                                 | 2 +-
 src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts       | 2 +-
 src/lib/core/style/apply-transform.ts                           | 2 +-
 src/lib/core/style/index.ts                                     | 2 +-
 src/lib/core/testing/month-constants.ts                         | 2 +-
 src/lib/core/util/object-extend.ts                              | 2 +-
 src/lib/datepicker/calendar-body.ts                             | 2 +-
 src/lib/datepicker/calendar.ts                                  | 2 +-
 src/lib/datepicker/coerce-date-property.ts                      | 2 +-
 src/lib/datepicker/datepicker-errors.ts                         | 2 +-
 src/lib/datepicker/datepicker-input.ts                          | 2 +-
 src/lib/datepicker/datepicker-intl.ts                           | 2 +-
 src/lib/datepicker/datepicker-module.ts                         | 2 +-
 src/lib/datepicker/datepicker-toggle.ts                         | 2 +-
 src/lib/datepicker/datepicker.ts                                | 2 +-
 src/lib/datepicker/index.ts                                     | 2 +-
 src/lib/datepicker/month-view.ts                                | 2 +-
 src/lib/datepicker/public-api.ts                                | 2 +-
 src/lib/datepicker/year-view.ts                                 | 2 +-
 src/lib/dialog/dialog-config.ts                                 | 2 +-
 src/lib/dialog/dialog-container.ts                              | 2 +-
 src/lib/dialog/dialog-content-directives.ts                     | 2 +-
 src/lib/dialog/dialog-module.ts                                 | 2 +-
 src/lib/dialog/dialog-ref.ts                                    | 2 +-
 src/lib/dialog/dialog.ts                                        | 2 +-
 src/lib/dialog/index.ts                                         | 2 +-
 src/lib/dialog/public-api.ts                                    | 2 +-
 src/lib/expansion/accordion-item.ts                             | 2 +-
 src/lib/expansion/accordion.ts                                  | 2 +-
 src/lib/expansion/expansion-module.ts                           | 2 +-
 src/lib/expansion/expansion-panel-header.ts                     | 2 +-
 src/lib/expansion/expansion-panel.ts                            | 2 +-
 src/lib/expansion/index.ts                                      | 2 +-
 src/lib/expansion/public-api.ts                                 | 2 +-
 src/lib/form-field/error.ts                                     | 2 +-
 src/lib/form-field/form-field-control.ts                        | 2 +-
 src/lib/form-field/form-field-errors.ts                         | 2 +-
 src/lib/form-field/form-field-module.ts                         | 2 +-
 src/lib/form-field/form-field.ts                                | 2 +-
 src/lib/form-field/hint.ts                                      | 2 +-
 src/lib/form-field/index.ts                                     | 2 +-
 src/lib/form-field/placeholder.ts                               | 2 +-
 src/lib/form-field/prefix.ts                                    | 2 +-
 src/lib/form-field/public-api.ts                                | 2 +-
 src/lib/form-field/suffix.ts                                    | 2 +-
 src/lib/grid-list/grid-list-measure.ts                          | 2 +-
 src/lib/grid-list/grid-list-module.ts                           | 2 +-
 src/lib/grid-list/grid-list.ts                                  | 2 +-
 src/lib/grid-list/grid-tile.ts                                  | 2 +-
 src/lib/grid-list/index.ts                                      | 2 +-
 src/lib/grid-list/public-api.ts                                 | 2 +-
 src/lib/grid-list/tile-coordinator.ts                           | 2 +-
 src/lib/grid-list/tile-styler.ts                                | 2 +-
 src/lib/icon/fake-svgs.ts                                       | 2 +-
 src/lib/icon/icon-module.ts                                     | 2 +-
 src/lib/icon/icon-registry.ts                                   | 2 +-
 src/lib/icon/icon.ts                                            | 2 +-
 src/lib/icon/index.ts                                           | 2 +-
 src/lib/icon/public-api.ts                                      | 2 +-
 src/lib/input/autosize.ts                                       | 2 +-
 src/lib/input/index.ts                                          | 2 +-
 src/lib/input/input-errors.ts                                   | 2 +-
 src/lib/input/input-module.ts                                   | 2 +-
 src/lib/input/input.ts                                          | 2 +-
 src/lib/input/public-api.ts                                     | 2 +-
 src/lib/list/index.ts                                           | 2 +-
 src/lib/list/list-module.ts                                     | 2 +-
 src/lib/list/list.ts                                            | 2 +-
 src/lib/list/public-api.ts                                      | 2 +-
 src/lib/list/selection-list.ts                                  | 2 +-
 src/lib/menu/index.ts                                           | 2 +-
 src/lib/menu/menu-animations.ts                                 | 2 +-
 src/lib/menu/menu-directive.ts                                  | 2 +-
 src/lib/menu/menu-errors.ts                                     | 2 +-
 src/lib/menu/menu-item.ts                                       | 2 +-
 src/lib/menu/menu-module.ts                                     | 2 +-
 src/lib/menu/menu-panel.ts                                      | 2 +-
 src/lib/menu/menu-positions.ts                                  | 2 +-
 src/lib/menu/menu-trigger.ts                                    | 2 +-
 src/lib/menu/menu.ts                                            | 2 +-
 src/lib/menu/public-api.ts                                      | 2 +-
 src/lib/paginator/index.ts                                      | 2 +-
 src/lib/paginator/paginator-intl.ts                             | 2 +-
 src/lib/paginator/paginator-module.ts                           | 2 +-
 src/lib/paginator/paginator.ts                                  | 2 +-
 src/lib/paginator/public-api.ts                                 | 2 +-
 src/lib/progress-bar/index.ts                                   | 2 +-
 src/lib/progress-bar/progress-bar-module.ts                     | 2 +-
 src/lib/progress-bar/progress-bar.ts                            | 2 +-
 src/lib/progress-bar/public-api.ts                              | 2 +-
 src/lib/progress-spinner/index.ts                               | 2 +-
 src/lib/progress-spinner/progress-spinner-module.ts             | 2 +-
 src/lib/progress-spinner/progress-spinner.ts                    | 2 +-
 src/lib/progress-spinner/public-api.ts                          | 2 +-
 src/lib/public-api.ts                                           | 2 +-
 src/lib/radio/index.ts                                          | 2 +-
 src/lib/radio/public-api.ts                                     | 2 +-
 src/lib/radio/radio-module.ts                                   | 2 +-
 src/lib/radio/radio.ts                                          | 2 +-
 src/lib/select/index.ts                                         | 2 +-
 src/lib/select/public-api.ts                                    | 2 +-
 src/lib/select/select-animations.ts                             | 2 +-
 src/lib/select/select-errors.ts                                 | 2 +-
 src/lib/select/select-module.ts                                 | 2 +-
 src/lib/select/select.ts                                        | 2 +-
 src/lib/sidenav/drawer.ts                                       | 2 +-
 src/lib/sidenav/index.ts                                        | 2 +-
 src/lib/sidenav/public-api.ts                                   | 2 +-
 src/lib/sidenav/sidenav-module.ts                               | 2 +-
 src/lib/sidenav/sidenav.ts                                      | 2 +-
 src/lib/slide-toggle/index.ts                                   | 2 +-
 src/lib/slide-toggle/public-api.ts                              | 2 +-
 src/lib/slide-toggle/slide-toggle-module.ts                     | 2 +-
 src/lib/slide-toggle/slide-toggle.ts                            | 2 +-
 src/lib/slider/index.ts                                         | 2 +-
 src/lib/slider/public-api.ts                                    | 2 +-
 src/lib/slider/slider-module.ts                                 | 2 +-
 src/lib/slider/slider.ts                                        | 2 +-
 src/lib/slider/test-gesture-config.ts                           | 2 +-
 src/lib/snack-bar/index.ts                                      | 2 +-
 src/lib/snack-bar/public-api.ts                                 | 2 +-
 src/lib/snack-bar/simple-snack-bar.ts                           | 2 +-
 src/lib/snack-bar/snack-bar-config.ts                           | 2 +-
 src/lib/snack-bar/snack-bar-container.ts                        | 2 +-
 src/lib/snack-bar/snack-bar-module.ts                           | 2 +-
 src/lib/snack-bar/snack-bar-ref.ts                              | 2 +-
 src/lib/snack-bar/snack-bar.ts                                  | 2 +-
 src/lib/sort/index.ts                                           | 2 +-
 src/lib/sort/public-api.ts                                      | 2 +-
 src/lib/sort/sort-direction.ts                                  | 2 +-
 src/lib/sort/sort-errors.ts                                     | 2 +-
 src/lib/sort/sort-header-intl.ts                                | 2 +-
 src/lib/sort/sort-header.ts                                     | 2 +-
 src/lib/sort/sort-module.ts                                     | 2 +-
 src/lib/sort/sort.ts                                            | 2 +-
 src/lib/stepper/index.ts                                        | 2 +-
 src/lib/stepper/public-api.ts                                   | 2 +-
 src/lib/stepper/step-header.ts                                  | 2 +-
 src/lib/stepper/step-label.ts                                   | 2 +-
 src/lib/stepper/stepper-button.ts                               | 2 +-
 src/lib/stepper/stepper-intl.ts                                 | 2 +-
 src/lib/stepper/stepper-module.ts                               | 2 +-
 src/lib/stepper/stepper.ts                                      | 2 +-
 src/lib/table/cell.ts                                           | 2 +-
 src/lib/table/index.ts                                          | 2 +-
 src/lib/table/public-api.ts                                     | 2 +-
 src/lib/table/row.ts                                            | 2 +-
 src/lib/table/table-module.ts                                   | 2 +-
 src/lib/table/table.ts                                          | 2 +-
 src/lib/tabs/index.ts                                           | 2 +-
 src/lib/tabs/ink-bar.ts                                         | 2 +-
 src/lib/tabs/public-api.ts                                      | 2 +-
 src/lib/tabs/tab-body.ts                                        | 2 +-
 src/lib/tabs/tab-group.ts                                       | 2 +-
 src/lib/tabs/tab-header.ts                                      | 2 +-
 src/lib/tabs/tab-label-wrapper.ts                               | 2 +-
 src/lib/tabs/tab-label.ts                                       | 2 +-
 src/lib/tabs/tab-nav-bar/index.ts                               | 2 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts                         | 2 +-
 src/lib/tabs/tab.ts                                             | 2 +-
 src/lib/tabs/tabs-module.ts                                     | 2 +-
 src/lib/toolbar/index.ts                                        | 2 +-
 src/lib/toolbar/public-api.ts                                   | 2 +-
 src/lib/toolbar/toolbar-module.ts                               | 2 +-
 src/lib/toolbar/toolbar.ts                                      | 2 +-
 src/lib/tooltip/index.ts                                        | 2 +-
 src/lib/tooltip/public-api.ts                                   | 2 +-
 src/lib/tooltip/tooltip-module.ts                               | 2 +-
 src/lib/tooltip/tooltip.ts                                      | 2 +-
 src/lib/version.ts                                              | 2 +-
 src/material-moment-adapter/adapter/index.ts                    | 2 +-
 src/material-moment-adapter/adapter/moment-date-adapter.spec.ts | 2 +-
 src/material-moment-adapter/adapter/moment-date-adapter.ts      | 2 +-
 src/material-moment-adapter/adapter/moment-date-formats.ts      | 2 +-
 src/material-moment-adapter/index.ts                            | 2 +-
 src/material-moment-adapter/public-api.ts                       | 2 +-
 344 files changed, 344 insertions(+), 344 deletions(-)

diff --git a/LICENSE b/LICENSE
index 47bfda24adf2..113bbc0ba162 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Google, Inc.
+Copyright (c) 2017 Google LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/build-config.js b/build-config.js
index 46438a76edb1..e47b125d381b 100644
--- a/build-config.js
+++ b/build-config.js
@@ -15,7 +15,7 @@ const angularVersion = package.dependencies['@angular/core'];
 /** License that will be placed inside of all created bundles. */
 const buildLicense = `/**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/a11y-module.ts b/src/cdk/a11y/a11y-module.ts
index 3535993dab87..1cb501da20df 100644
--- a/src/cdk/a11y/a11y-module.ts
+++ b/src/cdk/a11y/a11y-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/activedescendant-key-manager.ts b/src/cdk/a11y/activedescendant-key-manager.ts
index 0c3781936bce..39c524a598ba 100644
--- a/src/cdk/a11y/activedescendant-key-manager.ts
+++ b/src/cdk/a11y/activedescendant-key-manager.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/aria-describer.ts b/src/cdk/a11y/aria-describer.ts
index ca6a57d6477f..7e7bc63c40d7 100644
--- a/src/cdk/a11y/aria-describer.ts
+++ b/src/cdk/a11y/aria-describer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/aria-reference.ts b/src/cdk/a11y/aria-reference.ts
index 4202890a95bf..45bd71263562 100644
--- a/src/cdk/a11y/aria-reference.ts
+++ b/src/cdk/a11y/aria-reference.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/fake-mousedown.ts b/src/cdk/a11y/fake-mousedown.ts
index 87f6eb92592e..1376faa3ca1b 100644
--- a/src/cdk/a11y/fake-mousedown.ts
+++ b/src/cdk/a11y/fake-mousedown.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/focus-key-manager.ts b/src/cdk/a11y/focus-key-manager.ts
index 8c8f06102a87..451440753289 100644
--- a/src/cdk/a11y/focus-key-manager.ts
+++ b/src/cdk/a11y/focus-key-manager.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/focus-monitor.ts b/src/cdk/a11y/focus-monitor.ts
index d3a5fd61c68a..8d63982b67cc 100644
--- a/src/cdk/a11y/focus-monitor.ts
+++ b/src/cdk/a11y/focus-monitor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index 9adb9d3de00a..45fe47f82f37 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/index.ts b/src/cdk/a11y/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/a11y/index.ts
+++ b/src/cdk/a11y/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/interactivity-checker.ts b/src/cdk/a11y/interactivity-checker.ts
index dac06f66ea4f..79474eaad996 100644
--- a/src/cdk/a11y/interactivity-checker.ts
+++ b/src/cdk/a11y/interactivity-checker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index 81e56cadd07f..9801635863cc 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/live-announcer.ts b/src/cdk/a11y/live-announcer.ts
index d1789e06f88c..9c30e63c3f15 100644
--- a/src/cdk/a11y/live-announcer.ts
+++ b/src/cdk/a11y/live-announcer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/a11y/public-api.ts b/src/cdk/a11y/public-api.ts
index 2a84193417e9..c615cd7d5f6d 100644
--- a/src/cdk/a11y/public-api.ts
+++ b/src/cdk/a11y/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/bidi/bidi-module.ts b/src/cdk/bidi/bidi-module.ts
index a411fcf673fe..de5f96118d94 100644
--- a/src/cdk/bidi/bidi-module.ts
+++ b/src/cdk/bidi/bidi-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/bidi/dir.ts b/src/cdk/bidi/dir.ts
index 31bf0c489f1f..2568fe541270 100644
--- a/src/cdk/bidi/dir.ts
+++ b/src/cdk/bidi/dir.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/bidi/directionality.ts b/src/cdk/bidi/directionality.ts
index c04962b3c85d..d3c9f4bcf2ff 100644
--- a/src/cdk/bidi/directionality.ts
+++ b/src/cdk/bidi/directionality.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/bidi/index.ts b/src/cdk/bidi/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/bidi/index.ts
+++ b/src/cdk/bidi/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/bidi/public-api.ts b/src/cdk/bidi/public-api.ts
index 8f594855d6db..a26b28a4e190 100644
--- a/src/cdk/bidi/public-api.ts
+++ b/src/cdk/bidi/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/coercion/array.ts b/src/cdk/coercion/array.ts
index c8a6766390b5..6ab9c7eb1d4b 100644
--- a/src/cdk/coercion/array.ts
+++ b/src/cdk/coercion/array.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/coercion/boolean-property.ts b/src/cdk/coercion/boolean-property.ts
index a48fe51187ad..ca95f2a81f8a 100644
--- a/src/cdk/coercion/boolean-property.ts
+++ b/src/cdk/coercion/boolean-property.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/coercion/index.ts b/src/cdk/coercion/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/coercion/index.ts
+++ b/src/cdk/coercion/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/coercion/number-property.ts b/src/cdk/coercion/number-property.ts
index eaa782c97c63..d10568e2700f 100644
--- a/src/cdk/coercion/number-property.ts
+++ b/src/cdk/coercion/number-property.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/coercion/public-api.ts b/src/cdk/coercion/public-api.ts
index 4aa4d40d308e..aa2fd160b1ab 100644
--- a/src/cdk/coercion/public-api.ts
+++ b/src/cdk/coercion/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/collections/collection-viewer.ts b/src/cdk/collections/collection-viewer.ts
index 83591723829f..031d488720aa 100644
--- a/src/cdk/collections/collection-viewer.ts
+++ b/src/cdk/collections/collection-viewer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/collections/data-source.ts b/src/cdk/collections/data-source.ts
index c52c155e04f9..b872d1c49cec 100644
--- a/src/cdk/collections/data-source.ts
+++ b/src/cdk/collections/data-source.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/collections/index.ts b/src/cdk/collections/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/collections/index.ts
+++ b/src/cdk/collections/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/collections/public-api.ts b/src/cdk/collections/public-api.ts
index f5eb48e42b7d..f18860e3756c 100644
--- a/src/cdk/collections/public-api.ts
+++ b/src/cdk/collections/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/collections/selection.ts b/src/cdk/collections/selection.ts
index eb789ca95b44..b03f90672035 100644
--- a/src/cdk/collections/selection.ts
+++ b/src/cdk/collections/selection.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/collections/unique-selection-dispatcher.ts b/src/cdk/collections/unique-selection-dispatcher.ts
index 76c390951080..67784f326972 100644
--- a/src/cdk/collections/unique-selection-dispatcher.ts
+++ b/src/cdk/collections/unique-selection-dispatcher.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/index.ts b/src/cdk/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/index.ts
+++ b/src/cdk/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/keycodes/index.ts b/src/cdk/keycodes/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/keycodes/index.ts
+++ b/src/cdk/keycodes/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/keycodes/keycodes.ts b/src/cdk/keycodes/keycodes.ts
index d1ddf1231f03..4b36d51e3484 100644
--- a/src/cdk/keycodes/keycodes.ts
+++ b/src/cdk/keycodes/keycodes.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/keycodes/public-api.ts b/src/cdk/keycodes/public-api.ts
index e486715ffd5e..35f62cbde084 100644
--- a/src/cdk/keycodes/public-api.ts
+++ b/src/cdk/keycodes/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/breakpoints-observer.spec.ts b/src/cdk/layout/breakpoints-observer.spec.ts
index 6272b9d00d79..e4298638704a 100644
--- a/src/cdk/layout/breakpoints-observer.spec.ts
+++ b/src/cdk/layout/breakpoints-observer.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
index 3a7c481c4f6f..7e919318556a 100644
--- a/src/cdk/layout/breakpoints-observer.ts
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/breakpoints.ts b/src/cdk/layout/breakpoints.ts
index 278ab780ec6a..19e3f22edf1b 100644
--- a/src/cdk/layout/breakpoints.ts
+++ b/src/cdk/layout/breakpoints.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/index.ts b/src/cdk/layout/index.ts
index 289a64186096..ca845d8223a8 100644
--- a/src/cdk/layout/index.ts
+++ b/src/cdk/layout/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/media-matcher.spec.ts b/src/cdk/layout/media-matcher.spec.ts
index 10f0bf5c45e9..f355b3533667 100644
--- a/src/cdk/layout/media-matcher.spec.ts
+++ b/src/cdk/layout/media-matcher.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/media-matcher.ts b/src/cdk/layout/media-matcher.ts
index b5a2db900d19..2b0aed2aac8c 100644
--- a/src/cdk/layout/media-matcher.ts
+++ b/src/cdk/layout/media-matcher.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/layout/public-api.ts b/src/cdk/layout/public-api.ts
index 43468c08fb3b..a6f7fa6b5b0a 100644
--- a/src/cdk/layout/public-api.ts
+++ b/src/cdk/layout/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/observers/index.ts b/src/cdk/observers/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/observers/index.ts
+++ b/src/cdk/observers/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index 947a1fd2ad24..f4775f04f33a 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/observers/public-api.ts b/src/cdk/observers/public-api.ts
index 942aea5b4892..de8a4a9fea9e 100644
--- a/src/cdk/observers/public-api.ts
+++ b/src/cdk/observers/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/fullscreen-overlay-container.ts b/src/cdk/overlay/fullscreen-overlay-container.ts
index 08f1db6b3f4e..5165f8ce97de 100644
--- a/src/cdk/overlay/fullscreen-overlay-container.ts
+++ b/src/cdk/overlay/fullscreen-overlay-container.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/generic-component-type.ts b/src/cdk/overlay/generic-component-type.ts
index e4c7688dba2f..200256516ee8 100644
--- a/src/cdk/overlay/generic-component-type.ts
+++ b/src/cdk/overlay/generic-component-type.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/index.ts b/src/cdk/overlay/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/overlay/index.ts
+++ b/src/cdk/overlay/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/overlay-config.ts b/src/cdk/overlay/overlay-config.ts
index cde1d5050da3..cd362ced3fe0 100644
--- a/src/cdk/overlay/overlay-config.ts
+++ b/src/cdk/overlay/overlay-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/overlay-container.ts b/src/cdk/overlay/overlay-container.ts
index 4b3422d66986..e932e75f4210 100644
--- a/src/cdk/overlay/overlay-container.ts
+++ b/src/cdk/overlay/overlay-container.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 67eb87452881..431addab3d90 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/overlay-module.ts b/src/cdk/overlay/overlay-module.ts
index fc8f814e10d2..22421a0138d3 100644
--- a/src/cdk/overlay/overlay-module.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 998b1d9bccbc..71684e924bf5 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 651f7e6d4f2f..2bfa74a58126 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 33f1c290d36a..cbdf83b30bf8 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/position/connected-position.ts b/src/cdk/overlay/position/connected-position.ts
index e9affad91dba..66cc66ce680e 100644
--- a/src/cdk/overlay/position/connected-position.ts
+++ b/src/cdk/overlay/position/connected-position.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/position/global-position-strategy.ts b/src/cdk/overlay/position/global-position-strategy.ts
index 4844b1ade9aa..9e8840a55a7a 100644
--- a/src/cdk/overlay/position/global-position-strategy.ts
+++ b/src/cdk/overlay/position/global-position-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/position/overlay-position-builder.ts b/src/cdk/overlay/position/overlay-position-builder.ts
index 58e2d44dc2e4..07eda8bd61db 100644
--- a/src/cdk/overlay/position/overlay-position-builder.ts
+++ b/src/cdk/overlay/position/overlay-position-builder.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/position/position-strategy.ts b/src/cdk/overlay/position/position-strategy.ts
index 2483fb3594b0..1b60b9ec4f97 100644
--- a/src/cdk/overlay/position/position-strategy.ts
+++ b/src/cdk/overlay/position/position-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/position/scroll-clip.ts b/src/cdk/overlay/position/scroll-clip.ts
index 07b2a20d9dc1..d074ce513c70 100644
--- a/src/cdk/overlay/position/scroll-clip.ts
+++ b/src/cdk/overlay/position/scroll-clip.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/public-api.ts b/src/cdk/overlay/public-api.ts
index c00527e42bfa..e60adb6f4586 100644
--- a/src/cdk/overlay/public-api.ts
+++ b/src/cdk/overlay/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.ts b/src/cdk/overlay/scroll/block-scroll-strategy.ts
index 3960e7604912..a1701c5c0c9b 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts
index 7d445ac49953..07a2d9911e76 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/index.ts b/src/cdk/overlay/scroll/index.ts
index 1bd3b1b6fbc4..c9bd2c004dd9 100644
--- a/src/cdk/overlay/scroll/index.ts
+++ b/src/cdk/overlay/scroll/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/noop-scroll-strategy.ts b/src/cdk/overlay/scroll/noop-scroll-strategy.ts
index 64a4bfb1276b..1aa1eac9e0fa 100644
--- a/src/cdk/overlay/scroll/noop-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/noop-scroll-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
index 9ef899cf384d..77b9f4a54b0a 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/scroll-strategy-options.ts b/src/cdk/overlay/scroll/scroll-strategy-options.ts
index 4b558805fc11..2fb71b1e696a 100644
--- a/src/cdk/overlay/scroll/scroll-strategy-options.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/overlay/scroll/scroll-strategy.ts b/src/cdk/overlay/scroll/scroll-strategy.ts
index fe49d67e45f3..b5a5c8c62026 100644
--- a/src/cdk/overlay/scroll/scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/platform/features.ts b/src/cdk/platform/features.ts
index 67dfeb589e0f..b6b82c3636b4 100644
--- a/src/cdk/platform/features.ts
+++ b/src/cdk/platform/features.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/platform/index.ts b/src/cdk/platform/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/platform/index.ts
+++ b/src/cdk/platform/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/platform/platform-module.ts b/src/cdk/platform/platform-module.ts
index f22d00f6c0d8..7ab0c2bc3304 100644
--- a/src/cdk/platform/platform-module.ts
+++ b/src/cdk/platform/platform-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/platform/platform.ts b/src/cdk/platform/platform.ts
index 11e12b85eb71..534fb62c261b 100755
--- a/src/cdk/platform/platform.ts
+++ b/src/cdk/platform/platform.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/platform/public-api.ts b/src/cdk/platform/public-api.ts
index 8d7a3bb4b669..18ad6c9e4cec 100644
--- a/src/cdk/platform/public-api.ts
+++ b/src/cdk/platform/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/dom-portal-host.ts b/src/cdk/portal/dom-portal-host.ts
index 1dcefe35648f..f39b09d7b824 100644
--- a/src/cdk/portal/dom-portal-host.ts
+++ b/src/cdk/portal/dom-portal-host.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/index.ts b/src/cdk/portal/index.ts
index cb3190feb609..96b6b70a6230 100644
--- a/src/cdk/portal/index.ts
+++ b/src/cdk/portal/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts
index 99fa35bff939..9f4b9e217067 100644
--- a/src/cdk/portal/portal-directives.ts
+++ b/src/cdk/portal/portal-directives.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/portal-errors.ts b/src/cdk/portal/portal-errors.ts
index b2530e8efa57..aa9063e05f5b 100644
--- a/src/cdk/portal/portal-errors.ts
+++ b/src/cdk/portal/portal-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/portal-injector.ts b/src/cdk/portal/portal-injector.ts
index 98945fa75299..ca2267f8edc5 100644
--- a/src/cdk/portal/portal-injector.ts
+++ b/src/cdk/portal/portal-injector.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts
index 32eb30ec9025..8352e5b31586 100644
--- a/src/cdk/portal/portal.ts
+++ b/src/cdk/portal/portal.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/portal/public-api.ts b/src/cdk/portal/public-api.ts
index 253d39a60f41..ff3db2670fd8 100644
--- a/src/cdk/portal/public-api.ts
+++ b/src/cdk/portal/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/public-api.ts b/src/cdk/public-api.ts
index 2a5af4f06cb7..326c704b094c 100644
--- a/src/cdk/public-api.ts
+++ b/src/cdk/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/rxjs/index.ts b/src/cdk/rxjs/index.ts
index cb3190feb609..96b6b70a6230 100644
--- a/src/cdk/rxjs/index.ts
+++ b/src/cdk/rxjs/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/rxjs/public-api.ts b/src/cdk/rxjs/public-api.ts
index a6f22e575d8e..6e857f015fab 100644
--- a/src/cdk/rxjs/public-api.ts
+++ b/src/cdk/rxjs/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/rxjs/rx-chain.ts b/src/cdk/rxjs/rx-chain.ts
index 0d6d25e7f190..e6d61b9e68c3 100644
--- a/src/cdk/rxjs/rx-chain.ts
+++ b/src/cdk/rxjs/rx-chain.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/rxjs/rx-operators.ts b/src/cdk/rxjs/rx-operators.ts
index 5c9ed9c33bb3..164ef48fadae 100644
--- a/src/cdk/rxjs/rx-operators.ts
+++ b/src/cdk/rxjs/rx-operators.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/scrolling/index.ts b/src/cdk/scrolling/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/scrolling/index.ts
+++ b/src/cdk/scrolling/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/scrolling/public-api.ts b/src/cdk/scrolling/public-api.ts
index 7a069a29a314..ffbd65d14e06 100644
--- a/src/cdk/scrolling/public-api.ts
+++ b/src/cdk/scrolling/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 0e0e5b6aa1d1..bc7108ee91e9 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/scrolling/scrollable.ts b/src/cdk/scrolling/scrollable.ts
index 17e185e75a67..2431f9041d08 100644
--- a/src/cdk/scrolling/scrollable.ts
+++ b/src/cdk/scrolling/scrollable.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/scrolling/scrolling-module.ts b/src/cdk/scrolling/scrolling-module.ts
index 1f0a669e39a3..a798bbc19816 100644
--- a/src/cdk/scrolling/scrolling-module.ts
+++ b/src/cdk/scrolling/scrolling-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index 683d5853ce77..d895fc18f71f 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/stepper/index.ts b/src/cdk/stepper/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/cdk/stepper/index.ts
+++ b/src/cdk/stepper/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/stepper/public-api.ts b/src/cdk/stepper/public-api.ts
index b5c762587815..5ff98ead2f60 100644
--- a/src/cdk/stepper/public-api.ts
+++ b/src/cdk/stepper/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/stepper/step-label.ts b/src/cdk/stepper/step-label.ts
index e253b4bfcab5..974c3800165b 100644
--- a/src/cdk/stepper/step-label.ts
+++ b/src/cdk/stepper/step-label.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/stepper/stepper-button.ts b/src/cdk/stepper/stepper-button.ts
index c63d8c822eef..21b944435e45 100644
--- a/src/cdk/stepper/stepper-button.ts
+++ b/src/cdk/stepper/stepper-button.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/stepper/stepper-module.ts b/src/cdk/stepper/stepper-module.ts
index e52cb742a796..f0a596c7eb64 100644
--- a/src/cdk/stepper/stepper-module.ts
+++ b/src/cdk/stepper/stepper-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index de0a06f9a978..9ce5937309ca 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/cell.ts b/src/cdk/table/cell.ts
index 994156fbf448..fc677ead759b 100644
--- a/src/cdk/table/cell.ts
+++ b/src/cdk/table/cell.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/index.ts b/src/cdk/table/index.ts
index cb3190feb609..96b6b70a6230 100644
--- a/src/cdk/table/index.ts
+++ b/src/cdk/table/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/public-api.ts b/src/cdk/table/public-api.ts
index 8f01d6e237f6..5ea6957e7ecc 100644
--- a/src/cdk/table/public-api.ts
+++ b/src/cdk/table/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index dda4cea31eb8..56864ae274c0 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/table-errors.ts b/src/cdk/table/table-errors.ts
index d2b19ef8e075..7ec1b8c531bc 100644
--- a/src/cdk/table/table-errors.ts
+++ b/src/cdk/table/table-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/table-module.ts b/src/cdk/table/table-module.ts
index 5ad1975e5578..7bc9f1da81b2 100644
--- a/src/cdk/table/table-module.ts
+++ b/src/cdk/table/table-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 28ce82d00735..eb70b25f5fd2 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/dispatch-events.ts b/src/cdk/testing/dispatch-events.ts
index 9163c33db07f..c4600947d47d 100644
--- a/src/cdk/testing/dispatch-events.ts
+++ b/src/cdk/testing/dispatch-events.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/event-objects.ts b/src/cdk/testing/event-objects.ts
index 7b2fe2407bc4..fce56a683d20 100644
--- a/src/cdk/testing/event-objects.ts
+++ b/src/cdk/testing/event-objects.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/fake-viewport-ruler.ts b/src/cdk/testing/fake-viewport-ruler.ts
index b2f894ab3f07..644b8ffa310b 100644
--- a/src/cdk/testing/fake-viewport-ruler.ts
+++ b/src/cdk/testing/fake-viewport-ruler.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/index.ts b/src/cdk/testing/index.ts
index cb3190feb609..96b6b70a6230 100644
--- a/src/cdk/testing/index.ts
+++ b/src/cdk/testing/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/public-api.ts b/src/cdk/testing/public-api.ts
index 91d9bedf97c8..c3c76f48c5a6 100644
--- a/src/cdk/testing/public-api.ts
+++ b/src/cdk/testing/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/type-in-element.ts b/src/cdk/testing/type-in-element.ts
index b33f6e86af20..4a16bf588965 100644
--- a/src/cdk/testing/type-in-element.ts
+++ b/src/cdk/testing/type-in-element.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/testing/wrapped-error-message.ts b/src/cdk/testing/wrapped-error-message.ts
index 3cfd0dbe6298..a5fd8595992a 100644
--- a/src/cdk/testing/wrapped-error-message.ts
+++ b/src/cdk/testing/wrapped-error-message.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/cdk/version.ts b/src/cdk/version.ts
index 4d5a1335755f..fe791edbde7a 100644
--- a/src/cdk/version.ts
+++ b/src/cdk/version.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/autocomplete/autocomplete-module.ts b/src/lib/autocomplete/autocomplete-module.ts
index 96029b6c2bd5..7847f54f2311 100644
--- a/src/lib/autocomplete/autocomplete-module.ts
+++ b/src/lib/autocomplete/autocomplete-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index afc41b06b4a0..a7811a83b11c 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts
index ba4080ec729d..0311b4880bd4 100644
--- a/src/lib/autocomplete/autocomplete.ts
+++ b/src/lib/autocomplete/autocomplete.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/autocomplete/index.ts b/src/lib/autocomplete/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/autocomplete/index.ts
+++ b/src/lib/autocomplete/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/autocomplete/public-api.ts b/src/lib/autocomplete/public-api.ts
index dab3c54fc9d8..ce1c67cdd3ef 100644
--- a/src/lib/autocomplete/public-api.ts
+++ b/src/lib/autocomplete/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button-toggle/button-toggle-module.ts b/src/lib/button-toggle/button-toggle-module.ts
index 851b98fe2838..fca49ad1f6f8 100644
--- a/src/lib/button-toggle/button-toggle-module.ts
+++ b/src/lib/button-toggle/button-toggle-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index d05009344211..5c958cddc2bb 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button-toggle/index.ts b/src/lib/button-toggle/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/button-toggle/index.ts
+++ b/src/lib/button-toggle/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button-toggle/public-api.ts b/src/lib/button-toggle/public-api.ts
index 1912abb6d7e3..cb22390df749 100644
--- a/src/lib/button-toggle/public-api.ts
+++ b/src/lib/button-toggle/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button/button-module.ts b/src/lib/button/button-module.ts
index b72265dc739d..308d8472bf11 100644
--- a/src/lib/button/button-module.ts
+++ b/src/lib/button/button-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 13c0fbb4ad5a..9003eb85e9b3 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button/index.ts b/src/lib/button/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/button/index.ts
+++ b/src/lib/button/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/button/public-api.ts b/src/lib/button/public-api.ts
index b8b9355bf302..4afc4d786d2d 100644
--- a/src/lib/button/public-api.ts
+++ b/src/lib/button/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/card/card-module.ts b/src/lib/card/card-module.ts
index e30a338ff45e..93f79c0263a5 100644
--- a/src/lib/card/card-module.ts
+++ b/src/lib/card/card-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/card/card.ts b/src/lib/card/card.ts
index 7c39254b93fa..89ffb1bdf98f 100644
--- a/src/lib/card/card.ts
+++ b/src/lib/card/card.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/card/index.ts b/src/lib/card/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/card/index.ts
+++ b/src/lib/card/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/card/public-api.ts b/src/lib/card/public-api.ts
index 8917e375f934..eceefd2e8a84 100644
--- a/src/lib/card/public-api.ts
+++ b/src/lib/card/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/checkbox/checkbox-module.ts b/src/lib/checkbox/checkbox-module.ts
index 90bf880804c8..c03134548125 100644
--- a/src/lib/checkbox/checkbox-module.ts
+++ b/src/lib/checkbox/checkbox-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/checkbox/checkbox-required-validator.ts b/src/lib/checkbox/checkbox-required-validator.ts
index 41ab27739504..0c89ade9393f 100644
--- a/src/lib/checkbox/checkbox-required-validator.ts
+++ b/src/lib/checkbox/checkbox-required-validator.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 587618eae722..8959caeaf8a4 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/checkbox/index.ts b/src/lib/checkbox/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/checkbox/index.ts
+++ b/src/lib/checkbox/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/checkbox/public-api.ts b/src/lib/checkbox/public-api.ts
index 89bc5a134764..e93c91626f04 100644
--- a/src/lib/checkbox/public-api.ts
+++ b/src/lib/checkbox/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index c186c0905661..6e3ec4ca6613 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index be82b408731b..5195bba0badd 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 8d8c3c6c7ace..ab41a1572eaf 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/chips/chips-module.ts b/src/lib/chips/chips-module.ts
index e74b17793131..1d29f093c2e5 100644
--- a/src/lib/chips/chips-module.ts
+++ b/src/lib/chips/chips-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/chips/index.ts b/src/lib/chips/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/chips/index.ts
+++ b/src/lib/chips/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/chips/public-api.ts b/src/lib/chips/public-api.ts
index dfff919ca34f..a93755ac6646 100644
--- a/src/lib/chips/public-api.ts
+++ b/src/lib/chips/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/animation/animation.ts b/src/lib/core/animation/animation.ts
index fae799bb1d0a..21e23e3e6d2c 100644
--- a/src/lib/core/animation/animation.ts
+++ b/src/lib/core/animation/animation.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/color.ts b/src/lib/core/common-behaviors/color.ts
index 5e615c74a437..026d8fd6b83a 100644
--- a/src/lib/core/common-behaviors/color.ts
+++ b/src/lib/core/common-behaviors/color.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/common-module.ts b/src/lib/core/common-behaviors/common-module.ts
index 30fdbfd92c2d..b2fb6f0865b8 100644
--- a/src/lib/core/common-behaviors/common-module.ts
+++ b/src/lib/core/common-behaviors/common-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/constructor.ts b/src/lib/core/common-behaviors/constructor.ts
index 956c9b408deb..7e3963f343d1 100644
--- a/src/lib/core/common-behaviors/constructor.ts
+++ b/src/lib/core/common-behaviors/constructor.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/disable-ripple.ts b/src/lib/core/common-behaviors/disable-ripple.ts
index c68e3dac63ea..d264bd6a5398 100644
--- a/src/lib/core/common-behaviors/disable-ripple.ts
+++ b/src/lib/core/common-behaviors/disable-ripple.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/disabled.ts b/src/lib/core/common-behaviors/disabled.ts
index c2ea6d497580..4853a54d9ea7 100644
--- a/src/lib/core/common-behaviors/disabled.ts
+++ b/src/lib/core/common-behaviors/disabled.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/index.ts b/src/lib/core/common-behaviors/index.ts
index 8ec520969ad7..b4f74da4e4ef 100644
--- a/src/lib/core/common-behaviors/index.ts
+++ b/src/lib/core/common-behaviors/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/common-behaviors/tabindex.ts b/src/lib/core/common-behaviors/tabindex.ts
index a2efb44b3994..8ed2c209fdf0 100644
--- a/src/lib/core/common-behaviors/tabindex.ts
+++ b/src/lib/core/common-behaviors/tabindex.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts
index eaaaacf16241..ce0f0040e620 100644
--- a/src/lib/core/compatibility/compatibility.ts
+++ b/src/lib/core/compatibility/compatibility.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index ec645c214882..4c3dc8572a52 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/datetime/date-formats.ts b/src/lib/core/datetime/date-formats.ts
index 2a0a15361916..b012a58bcba3 100644
--- a/src/lib/core/datetime/date-formats.ts
+++ b/src/lib/core/datetime/date-formats.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/datetime/index.ts b/src/lib/core/datetime/index.ts
index a7035f4b62b6..0059b79b50bc 100644
--- a/src/lib/core/datetime/index.ts
+++ b/src/lib/core/datetime/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index 8c672c477f61..216f17d35cfb 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/datetime/native-date-formats.ts b/src/lib/core/datetime/native-date-formats.ts
index 2c8bd3e494ba..12fe9c05ab57 100644
--- a/src/lib/core/datetime/native-date-formats.ts
+++ b/src/lib/core/datetime/native-date-formats.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/error/error-options.ts b/src/lib/core/error/error-options.ts
index 503f0ba10e1c..c2454278a44b 100644
--- a/src/lib/core/error/error-options.ts
+++ b/src/lib/core/error/error-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/gestures/gesture-annotations.ts b/src/lib/core/gestures/gesture-annotations.ts
index be533f539b68..c7193f31b9eb 100644
--- a/src/lib/core/gestures/gesture-annotations.ts
+++ b/src/lib/core/gestures/gesture-annotations.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/gestures/gesture-config.ts b/src/lib/core/gestures/gesture-config.ts
index ad145d7593f3..3172f71d835f 100644
--- a/src/lib/core/gestures/gesture-config.ts
+++ b/src/lib/core/gestures/gesture-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/index.ts b/src/lib/core/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/core/index.ts
+++ b/src/lib/core/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/line/line.ts b/src/lib/core/line/line.ts
index fa76897daa17..3bcfb3d6f593 100644
--- a/src/lib/core/line/line.ts
+++ b/src/lib/core/line/line.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/option/index.ts b/src/lib/core/option/index.ts
index cb72fc3876ff..f675318bef97 100644
--- a/src/lib/core/option/index.ts
+++ b/src/lib/core/option/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/option/optgroup.ts b/src/lib/core/option/optgroup.ts
index 0524c384ac3b..87cd4b35c2f8 100644
--- a/src/lib/core/option/optgroup.ts
+++ b/src/lib/core/option/optgroup.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index a5fb3be86f51..4b47c9bf5a4c 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/placeholder/placeholder-options.ts b/src/lib/core/placeholder/placeholder-options.ts
index ba024ad3cfd2..66a3c1257f69 100644
--- a/src/lib/core/placeholder/placeholder-options.ts
+++ b/src/lib/core/placeholder/placeholder-options.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/public-api.ts b/src/lib/core/public-api.ts
index 2723a2d05c5f..7b8efd834400 100644
--- a/src/lib/core/public-api.ts
+++ b/src/lib/core/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts
index 4fd6ed5e9bfe..94da47051775 100644
--- a/src/lib/core/ripple/index.ts
+++ b/src/lib/core/ripple/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/ripple/ripple-ref.ts b/src/lib/core/ripple/ripple-ref.ts
index 1f1ec0984ca3..c680f8e571b0 100644
--- a/src/lib/core/ripple/ripple-ref.ts
+++ b/src/lib/core/ripple/ripple-ref.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
index 76bbe3333435..866b0cf84412 100644
--- a/src/lib/core/ripple/ripple-renderer.ts
+++ b/src/lib/core/ripple/ripple-renderer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index ab8ca67ecbda..a2d21e7eb799 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/selection/index.ts b/src/lib/core/selection/index.ts
index 48df48afef60..a1a0a857d5a0 100644
--- a/src/lib/core/selection/index.ts
+++ b/src/lib/core/selection/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
index b7188b2c3927..d9fb35bf6e38 100644
--- a/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
+++ b/src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/style/apply-transform.ts b/src/lib/core/style/apply-transform.ts
index 593fde30eb0f..bdf0c0a4c423 100644
--- a/src/lib/core/style/apply-transform.ts
+++ b/src/lib/core/style/apply-transform.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/style/index.ts b/src/lib/core/style/index.ts
index c97f88c2e49e..dbf38684361c 100644
--- a/src/lib/core/style/index.ts
+++ b/src/lib/core/style/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/testing/month-constants.ts b/src/lib/core/testing/month-constants.ts
index 5d8de9dd25eb..df581929364d 100644
--- a/src/lib/core/testing/month-constants.ts
+++ b/src/lib/core/testing/month-constants.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/core/util/object-extend.ts b/src/lib/core/util/object-extend.ts
index e111ff997524..aeb48f9fdd84 100644
--- a/src/lib/core/util/object-extend.ts
+++ b/src/lib/core/util/object-extend.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/calendar-body.ts b/src/lib/datepicker/calendar-body.ts
index 6272f5d8799c..ad263133d369 100644
--- a/src/lib/datepicker/calendar-body.ts
+++ b/src/lib/datepicker/calendar-body.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index 94681fafa1e8..fec74a95466e 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/coerce-date-property.ts b/src/lib/datepicker/coerce-date-property.ts
index 08fb8ffbb9a6..d85a54f06021 100644
--- a/src/lib/datepicker/coerce-date-property.ts
+++ b/src/lib/datepicker/coerce-date-property.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/datepicker-errors.ts b/src/lib/datepicker/datepicker-errors.ts
index 18eb6f2f912f..1d0539290496 100644
--- a/src/lib/datepicker/datepicker-errors.ts
+++ b/src/lib/datepicker/datepicker-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index fc3fee065f54..15e13801a87a 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/datepicker-intl.ts b/src/lib/datepicker/datepicker-intl.ts
index 377db19cbf95..c21e476afc49 100644
--- a/src/lib/datepicker/datepicker-intl.ts
+++ b/src/lib/datepicker/datepicker-intl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/datepicker-module.ts b/src/lib/datepicker/datepicker-module.ts
index 4b34d46bcdd5..30effd62c312 100644
--- a/src/lib/datepicker/datepicker-module.ts
+++ b/src/lib/datepicker/datepicker-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index ff84a574f3a2..c1924a8d5bca 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 0793be2dc4e5..51e501df2c30 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/index.ts b/src/lib/datepicker/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/datepicker/index.ts
+++ b/src/lib/datepicker/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index f112f67125b4..afbdec8177dc 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/public-api.ts b/src/lib/datepicker/public-api.ts
index 661e07c2aac0..ca079144a7fd 100644
--- a/src/lib/datepicker/public-api.ts
+++ b/src/lib/datepicker/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index 36c3c1babade..2e999a6eff02 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
index f2dc3e0bd500..424bec9e84ab 100644
--- a/src/lib/dialog/dialog-config.ts
+++ b/src/lib/dialog/dialog-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index fdd382729175..91d0c9ba96db 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/dialog-content-directives.ts b/src/lib/dialog/dialog-content-directives.ts
index 3717cef1449c..72f072f7d120 100644
--- a/src/lib/dialog/dialog-content-directives.ts
+++ b/src/lib/dialog/dialog-content-directives.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/dialog-module.ts b/src/lib/dialog/dialog-module.ts
index ef6e7a236080..648847eae6c9 100644
--- a/src/lib/dialog/dialog-module.ts
+++ b/src/lib/dialog/dialog-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index e647cbc4fd1c..9af728c0fb43 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 38621ce96286..54d358c8556e 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/index.ts b/src/lib/dialog/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/dialog/index.ts
+++ b/src/lib/dialog/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/dialog/public-api.ts b/src/lib/dialog/public-api.ts
index 39d91ce6af2e..7df9a5f3b1dd 100644
--- a/src/lib/dialog/public-api.ts
+++ b/src/lib/dialog/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/accordion-item.ts b/src/lib/expansion/accordion-item.ts
index 137cc9f20d36..023af49a9b0f 100644
--- a/src/lib/expansion/accordion-item.ts
+++ b/src/lib/expansion/accordion-item.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/accordion.ts b/src/lib/expansion/accordion.ts
index 7c60ff0c5725..8e4291a2a43d 100644
--- a/src/lib/expansion/accordion.ts
+++ b/src/lib/expansion/accordion.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/expansion-module.ts b/src/lib/expansion/expansion-module.ts
index 7858f7d679a6..3df247680e1e 100644
--- a/src/lib/expansion/expansion-module.ts
+++ b/src/lib/expansion/expansion-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 2da0a225a61e..c2f5369fb93b 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 9e81cd921ceb..3a5f1bf14e2b 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/index.ts b/src/lib/expansion/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/expansion/index.ts
+++ b/src/lib/expansion/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/expansion/public-api.ts b/src/lib/expansion/public-api.ts
index 919561d57005..27de282f5622 100644
--- a/src/lib/expansion/public-api.ts
+++ b/src/lib/expansion/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/error.ts b/src/lib/form-field/error.ts
index 21c659d5dd55..6f5e9494fa12 100644
--- a/src/lib/form-field/error.ts
+++ b/src/lib/form-field/error.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/form-field-control.ts b/src/lib/form-field/form-field-control.ts
index c8d02dd6e97c..7846a0b656c6 100644
--- a/src/lib/form-field/form-field-control.ts
+++ b/src/lib/form-field/form-field-control.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/form-field-errors.ts b/src/lib/form-field/form-field-errors.ts
index 21869d7fc271..2cdb0efa5208 100644
--- a/src/lib/form-field/form-field-errors.ts
+++ b/src/lib/form-field/form-field-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/form-field-module.ts b/src/lib/form-field/form-field-module.ts
index eecad6ddb328..dd4dff39789a 100644
--- a/src/lib/form-field/form-field-module.ts
+++ b/src/lib/form-field/form-field-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 609f2568ce14..0569f2871982 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/hint.ts b/src/lib/form-field/hint.ts
index 8b0079d84f0e..6299bc3b7a92 100644
--- a/src/lib/form-field/hint.ts
+++ b/src/lib/form-field/hint.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/index.ts b/src/lib/form-field/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/form-field/index.ts
+++ b/src/lib/form-field/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/placeholder.ts b/src/lib/form-field/placeholder.ts
index 12473820043d..aed894f09022 100644
--- a/src/lib/form-field/placeholder.ts
+++ b/src/lib/form-field/placeholder.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/prefix.ts b/src/lib/form-field/prefix.ts
index 8bb192de1864..29574d570471 100644
--- a/src/lib/form-field/prefix.ts
+++ b/src/lib/form-field/prefix.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/public-api.ts b/src/lib/form-field/public-api.ts
index 0ef3a74f0654..416a3eb17e84 100644
--- a/src/lib/form-field/public-api.ts
+++ b/src/lib/form-field/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/form-field/suffix.ts b/src/lib/form-field/suffix.ts
index 8f707f93a996..39bfeaa493c6 100644
--- a/src/lib/form-field/suffix.ts
+++ b/src/lib/form-field/suffix.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/grid-list-measure.ts b/src/lib/grid-list/grid-list-measure.ts
index e6ec02e9450c..56b8f8f98611 100644
--- a/src/lib/grid-list/grid-list-measure.ts
+++ b/src/lib/grid-list/grid-list-measure.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/grid-list-module.ts b/src/lib/grid-list/grid-list-module.ts
index f8206cd014cb..7b234bf0edfd 100644
--- a/src/lib/grid-list/grid-list-module.ts
+++ b/src/lib/grid-list/grid-list-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
index a961b449d2b1..185f18fd543b 100644
--- a/src/lib/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index a3c48e861517..d1708c0a1a3f 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/index.ts b/src/lib/grid-list/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/grid-list/index.ts
+++ b/src/lib/grid-list/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/public-api.ts b/src/lib/grid-list/public-api.ts
index dadf36d92a04..0bcd7ada32b8 100644
--- a/src/lib/grid-list/public-api.ts
+++ b/src/lib/grid-list/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/tile-coordinator.ts b/src/lib/grid-list/tile-coordinator.ts
index 281db2482fc9..841dd7780d64 100644
--- a/src/lib/grid-list/tile-coordinator.ts
+++ b/src/lib/grid-list/tile-coordinator.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/grid-list/tile-styler.ts b/src/lib/grid-list/tile-styler.ts
index 1be3f05e54f8..87e6e8fc51b5 100644
--- a/src/lib/grid-list/tile-styler.ts
+++ b/src/lib/grid-list/tile-styler.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/icon/fake-svgs.ts b/src/lib/icon/fake-svgs.ts
index c4acf7c7e18c..cce128143837 100644
--- a/src/lib/icon/fake-svgs.ts
+++ b/src/lib/icon/fake-svgs.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/icon/icon-module.ts b/src/lib/icon/icon-module.ts
index 75a0d144810b..467dae0ecf46 100644
--- a/src/lib/icon/icon-module.ts
+++ b/src/lib/icon/icon-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 550aacbdd2ce..6bd6db4864c2 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index f29e96d04ed9..b7e474a065dd 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/icon/index.ts b/src/lib/icon/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/icon/index.ts
+++ b/src/lib/icon/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/icon/public-api.ts b/src/lib/icon/public-api.ts
index acfae35041ea..7714c30fff55 100644
--- a/src/lib/icon/public-api.ts
+++ b/src/lib/icon/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts
index 51b0554f16c2..02e6d1756f6b 100644
--- a/src/lib/input/autosize.ts
+++ b/src/lib/input/autosize.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/input/index.ts b/src/lib/input/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/input/index.ts
+++ b/src/lib/input/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/input/input-errors.ts b/src/lib/input/input-errors.ts
index 139696d2097f..b1f5fe8ad119 100644
--- a/src/lib/input/input-errors.ts
+++ b/src/lib/input/input-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/input/input-module.ts b/src/lib/input/input-module.ts
index 3271ab7f0fc2..d89a13c3db5b 100644
--- a/src/lib/input/input-module.ts
+++ b/src/lib/input/input-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index dea8e13816ea..204f6b8a8557 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/input/public-api.ts b/src/lib/input/public-api.ts
index 9e8ec8323b49..bc0416c79413 100644
--- a/src/lib/input/public-api.ts
+++ b/src/lib/input/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/list/index.ts b/src/lib/list/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/list/index.ts
+++ b/src/lib/list/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/list/list-module.ts b/src/lib/list/list-module.ts
index 509f5ea0ad7e..dea04202fd89 100644
--- a/src/lib/list/list-module.ts
+++ b/src/lib/list/list-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 6cb85860c0a5..b132d9893235 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/list/public-api.ts b/src/lib/list/public-api.ts
index bea6b187f243..294c4d765b7b 100644
--- a/src/lib/list/public-api.ts
+++ b/src/lib/list/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 0d134b5133a5..ea4df023e9af 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/index.ts b/src/lib/menu/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/menu/index.ts
+++ b/src/lib/menu/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-animations.ts b/src/lib/menu/menu-animations.ts
index 7a594819fc85..c0190a4f4e99 100644
--- a/src/lib/menu/menu-animations.ts
+++ b/src/lib/menu/menu-animations.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index d74e049c9344..5365d1e54124 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-errors.ts b/src/lib/menu/menu-errors.ts
index 0ab32e469c05..ed6d9895a6de 100644
--- a/src/lib/menu/menu-errors.ts
+++ b/src/lib/menu/menu-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index bf3467987713..96c04201310e 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-module.ts b/src/lib/menu/menu-module.ts
index 3c35206d6e46..19827a471397 100644
--- a/src/lib/menu/menu-module.ts
+++ b/src/lib/menu/menu-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-panel.ts b/src/lib/menu/menu-panel.ts
index 3f1a6eb18492..3573f3ab71a1 100644
--- a/src/lib/menu/menu-panel.ts
+++ b/src/lib/menu/menu-panel.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-positions.ts b/src/lib/menu/menu-positions.ts
index 6569e76a6c71..ca492026c1f9 100644
--- a/src/lib/menu/menu-positions.ts
+++ b/src/lib/menu/menu-positions.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index a37c541f3e1e..fa8f8c76bddc 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/menu.ts b/src/lib/menu/menu.ts
index 4d0993cd6763..28c202b71878 100644
--- a/src/lib/menu/menu.ts
+++ b/src/lib/menu/menu.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/menu/public-api.ts b/src/lib/menu/public-api.ts
index 39c6fdda609b..71b517e58184 100644
--- a/src/lib/menu/public-api.ts
+++ b/src/lib/menu/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/paginator/index.ts b/src/lib/paginator/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/paginator/index.ts
+++ b/src/lib/paginator/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/paginator/paginator-intl.ts b/src/lib/paginator/paginator-intl.ts
index 5e0bac5dda7e..d8e3566c4b30 100644
--- a/src/lib/paginator/paginator-intl.ts
+++ b/src/lib/paginator/paginator-intl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/paginator/paginator-module.ts b/src/lib/paginator/paginator-module.ts
index c5eede24e2ff..25eb8f645508 100644
--- a/src/lib/paginator/paginator-module.ts
+++ b/src/lib/paginator/paginator-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/paginator/paginator.ts b/src/lib/paginator/paginator.ts
index 5b4a4126cff3..7f4b4fb6061d 100644
--- a/src/lib/paginator/paginator.ts
+++ b/src/lib/paginator/paginator.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/paginator/public-api.ts b/src/lib/paginator/public-api.ts
index 0dc5a6a5505c..78f1e9a6b329 100644
--- a/src/lib/paginator/public-api.ts
+++ b/src/lib/paginator/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-bar/index.ts b/src/lib/progress-bar/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/progress-bar/index.ts
+++ b/src/lib/progress-bar/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-bar/progress-bar-module.ts b/src/lib/progress-bar/progress-bar-module.ts
index 0d8bf6c1086c..5295cc84f591 100644
--- a/src/lib/progress-bar/progress-bar-module.ts
+++ b/src/lib/progress-bar/progress-bar-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-bar/progress-bar.ts b/src/lib/progress-bar/progress-bar.ts
index e97d9b03ec05..1f6d1e89ed6d 100644
--- a/src/lib/progress-bar/progress-bar.ts
+++ b/src/lib/progress-bar/progress-bar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-bar/public-api.ts b/src/lib/progress-bar/public-api.ts
index 4d60aeebce2a..739a6192faea 100644
--- a/src/lib/progress-bar/public-api.ts
+++ b/src/lib/progress-bar/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-spinner/index.ts b/src/lib/progress-spinner/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/progress-spinner/index.ts
+++ b/src/lib/progress-spinner/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-spinner/progress-spinner-module.ts b/src/lib/progress-spinner/progress-spinner-module.ts
index abbef18f3c5f..aaed4fb46971 100644
--- a/src/lib/progress-spinner/progress-spinner-module.ts
+++ b/src/lib/progress-spinner/progress-spinner-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 0be373bf8a59..e68b35e098ed 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/progress-spinner/public-api.ts b/src/lib/progress-spinner/public-api.ts
index fc42969ad9c2..42fb976850ef 100644
--- a/src/lib/progress-spinner/public-api.ts
+++ b/src/lib/progress-spinner/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/public-api.ts b/src/lib/public-api.ts
index 526918c24de5..c29802fbed02 100644
--- a/src/lib/public-api.ts
+++ b/src/lib/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/radio/index.ts b/src/lib/radio/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/radio/index.ts
+++ b/src/lib/radio/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/radio/public-api.ts b/src/lib/radio/public-api.ts
index 0456641c48fa..3a8222a3a913 100644
--- a/src/lib/radio/public-api.ts
+++ b/src/lib/radio/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/radio/radio-module.ts b/src/lib/radio/radio-module.ts
index 31a2aea986b7..b76bfd8476c1 100644
--- a/src/lib/radio/radio-module.ts
+++ b/src/lib/radio/radio-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 6d714502ec73..9817815779f8 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/select/index.ts b/src/lib/select/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/select/index.ts
+++ b/src/lib/select/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/select/public-api.ts b/src/lib/select/public-api.ts
index b51fac91de9a..a89d7fe23e80 100644
--- a/src/lib/select/public-api.ts
+++ b/src/lib/select/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/select/select-animations.ts b/src/lib/select/select-animations.ts
index 870081304b46..434be7c71681 100644
--- a/src/lib/select/select-animations.ts
+++ b/src/lib/select/select-animations.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/select/select-errors.ts b/src/lib/select/select-errors.ts
index 8075a08d2452..932e04d83877 100644
--- a/src/lib/select/select-errors.ts
+++ b/src/lib/select/select-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/select/select-module.ts b/src/lib/select/select-module.ts
index 057be7effae8..3da48beca6bd 100644
--- a/src/lib/select/select-module.ts
+++ b/src/lib/select/select-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 2aff32be3180..95dd9e61ef81 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 4691afe6e045..cc1f72d3146f 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sidenav/index.ts b/src/lib/sidenav/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/sidenav/index.ts
+++ b/src/lib/sidenav/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sidenav/public-api.ts b/src/lib/sidenav/public-api.ts
index 2c05f01f99eb..32be34343165 100644
--- a/src/lib/sidenav/public-api.ts
+++ b/src/lib/sidenav/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sidenav/sidenav-module.ts b/src/lib/sidenav/sidenav-module.ts
index 8d69d9eef7ff..49e81a3db878 100644
--- a/src/lib/sidenav/sidenav-module.ts
+++ b/src/lib/sidenav/sidenav-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index 04c7a8b8a407..e9e32927a339 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slide-toggle/index.ts b/src/lib/slide-toggle/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/slide-toggle/index.ts
+++ b/src/lib/slide-toggle/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slide-toggle/public-api.ts b/src/lib/slide-toggle/public-api.ts
index f668652b5c9c..79b095fe1005 100644
--- a/src/lib/slide-toggle/public-api.ts
+++ b/src/lib/slide-toggle/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slide-toggle/slide-toggle-module.ts b/src/lib/slide-toggle/slide-toggle-module.ts
index 7c5ee84151b3..09a8a52a95e5 100644
--- a/src/lib/slide-toggle/slide-toggle-module.ts
+++ b/src/lib/slide-toggle/slide-toggle-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 240052f138e4..a2688a3b1320 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slider/index.ts b/src/lib/slider/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/slider/index.ts
+++ b/src/lib/slider/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slider/public-api.ts b/src/lib/slider/public-api.ts
index b448421096c6..ab7708f1942b 100644
--- a/src/lib/slider/public-api.ts
+++ b/src/lib/slider/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slider/slider-module.ts b/src/lib/slider/slider-module.ts
index 64f6679adb4f..d866f2431c67 100644
--- a/src/lib/slider/slider-module.ts
+++ b/src/lib/slider/slider-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index bd4061a54438..0e1033329cbd 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/slider/test-gesture-config.ts b/src/lib/slider/test-gesture-config.ts
index 486ff3fd252b..d26a7550205c 100644
--- a/src/lib/slider/test-gesture-config.ts
+++ b/src/lib/slider/test-gesture-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/index.ts b/src/lib/snack-bar/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/snack-bar/index.ts
+++ b/src/lib/snack-bar/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/public-api.ts b/src/lib/snack-bar/public-api.ts
index 14496ed504b4..7bf602760cfd 100644
--- a/src/lib/snack-bar/public-api.ts
+++ b/src/lib/snack-bar/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/simple-snack-bar.ts b/src/lib/snack-bar/simple-snack-bar.ts
index a10c004c61d8..982e7269f93a 100644
--- a/src/lib/snack-bar/simple-snack-bar.ts
+++ b/src/lib/snack-bar/simple-snack-bar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/snack-bar-config.ts b/src/lib/snack-bar/snack-bar-config.ts
index 44a6844ef769..67eabd078b51 100644
--- a/src/lib/snack-bar/snack-bar-config.ts
+++ b/src/lib/snack-bar/snack-bar-config.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 8b117ac374cd..64ad981d71ee 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/snack-bar-module.ts b/src/lib/snack-bar/snack-bar-module.ts
index 7d3da1c1b4d8..42bddfc1efc4 100644
--- a/src/lib/snack-bar/snack-bar-module.ts
+++ b/src/lib/snack-bar/snack-bar-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/snack-bar-ref.ts b/src/lib/snack-bar/snack-bar-ref.ts
index b329f5e54c07..cdd1a42140c4 100644
--- a/src/lib/snack-bar/snack-bar-ref.ts
+++ b/src/lib/snack-bar/snack-bar-ref.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 2372fce93726..a2c875e519ae 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/index.ts b/src/lib/sort/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/sort/index.ts
+++ b/src/lib/sort/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/public-api.ts b/src/lib/sort/public-api.ts
index 382f6c9168da..651365193d3c 100644
--- a/src/lib/sort/public-api.ts
+++ b/src/lib/sort/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/sort-direction.ts b/src/lib/sort/sort-direction.ts
index 9a1f2657efa6..e3bc3d6109b9 100644
--- a/src/lib/sort/sort-direction.ts
+++ b/src/lib/sort/sort-direction.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/sort-errors.ts b/src/lib/sort/sort-errors.ts
index bcbc82d8f4e4..27a1cc94d460 100644
--- a/src/lib/sort/sort-errors.ts
+++ b/src/lib/sort/sort-errors.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/sort-header-intl.ts b/src/lib/sort/sort-header-intl.ts
index 35c45470c4c1..38be337a1373 100644
--- a/src/lib/sort/sort-header-intl.ts
+++ b/src/lib/sort/sort-header-intl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index deffa25850c1..16034b8647f9 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/sort-module.ts b/src/lib/sort/sort-module.ts
index df4ad12434e1..0d3941a33a9b 100644
--- a/src/lib/sort/sort-module.ts
+++ b/src/lib/sort/sort-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index 890141646610..25e08089dc47 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/index.ts b/src/lib/stepper/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/stepper/index.ts
+++ b/src/lib/stepper/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/public-api.ts b/src/lib/stepper/public-api.ts
index 302085124235..40d5d6395e10 100644
--- a/src/lib/stepper/public-api.ts
+++ b/src/lib/stepper/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 75aed4164b95..55203b2b690f 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/step-label.ts b/src/lib/stepper/step-label.ts
index e4f166057a10..c9016274c9f9 100644
--- a/src/lib/stepper/step-label.ts
+++ b/src/lib/stepper/step-label.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/stepper-button.ts b/src/lib/stepper/stepper-button.ts
index 46d209710bfd..13e6cf5f45f2 100644
--- a/src/lib/stepper/stepper-button.ts
+++ b/src/lib/stepper/stepper-button.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/stepper-intl.ts b/src/lib/stepper/stepper-intl.ts
index 2975cdb8006a..df099d9a23b2 100644
--- a/src/lib/stepper/stepper-intl.ts
+++ b/src/lib/stepper/stepper-intl.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/stepper-module.ts b/src/lib/stepper/stepper-module.ts
index 2d93ce64e1ba..170fefc10e2d 100644
--- a/src/lib/stepper/stepper-module.ts
+++ b/src/lib/stepper/stepper-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 4d9f4325ee1d..173d2d472604 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/table/cell.ts b/src/lib/table/cell.ts
index f7e7fc0407e7..ed1b02964492 100644
--- a/src/lib/table/cell.ts
+++ b/src/lib/table/cell.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/table/index.ts b/src/lib/table/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/table/index.ts
+++ b/src/lib/table/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/table/public-api.ts b/src/lib/table/public-api.ts
index 50da1057bc1c..a447e57b94b3 100644
--- a/src/lib/table/public-api.ts
+++ b/src/lib/table/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/table/row.ts b/src/lib/table/row.ts
index f23c5fd4c8a0..e81ad99e00af 100644
--- a/src/lib/table/row.ts
+++ b/src/lib/table/row.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/table/table-module.ts b/src/lib/table/table-module.ts
index 378e92aac47d..3878ad2abb93 100644
--- a/src/lib/table/table-module.ts
+++ b/src/lib/table/table-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/table/table.ts b/src/lib/table/table.ts
index 70d4a2892d29..c5892884baf1 100644
--- a/src/lib/table/table.ts
+++ b/src/lib/table/table.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/index.ts b/src/lib/tabs/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/tabs/index.ts
+++ b/src/lib/tabs/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/ink-bar.ts b/src/lib/tabs/ink-bar.ts
index 363fe443f1ac..75c4b6bb8154 100644
--- a/src/lib/tabs/ink-bar.ts
+++ b/src/lib/tabs/ink-bar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/public-api.ts b/src/lib/tabs/public-api.ts
index eaa78fceb60b..9d08a2fef027 100644
--- a/src/lib/tabs/public-api.ts
+++ b/src/lib/tabs/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index 7b3d06828a31..9eb53f5f7316 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 16da9f3a4b47..28e0cb596561 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 668f0acf57a2..20b9b133ef50 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-label-wrapper.ts b/src/lib/tabs/tab-label-wrapper.ts
index eecb69e12b9b..44177c937628 100644
--- a/src/lib/tabs/tab-label-wrapper.ts
+++ b/src/lib/tabs/tab-label-wrapper.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-label.ts b/src/lib/tabs/tab-label.ts
index 6704220f8e08..66f73f86a290 100644
--- a/src/lib/tabs/tab-label.ts
+++ b/src/lib/tabs/tab-label.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-nav-bar/index.ts b/src/lib/tabs/tab-nav-bar/index.ts
index bf99775fe360..c7e9bf2c9782 100644
--- a/src/lib/tabs/tab-nav-bar/index.ts
+++ b/src/lib/tabs/tab-nav-bar/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 0615446f0e50..4196d73fd7ca 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index f1a29aa84d3f..ba0ca42d27f5 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tabs/tabs-module.ts b/src/lib/tabs/tabs-module.ts
index 9c0f0e3c514b..40e4e962cbf4 100644
--- a/src/lib/tabs/tabs-module.ts
+++ b/src/lib/tabs/tabs-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/toolbar/index.ts b/src/lib/toolbar/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/toolbar/index.ts
+++ b/src/lib/toolbar/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/toolbar/public-api.ts b/src/lib/toolbar/public-api.ts
index 6a4d6c7635ed..438833bf935e 100644
--- a/src/lib/toolbar/public-api.ts
+++ b/src/lib/toolbar/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/toolbar/toolbar-module.ts b/src/lib/toolbar/toolbar-module.ts
index b974fd224417..d91a5993ae60 100644
--- a/src/lib/toolbar/toolbar-module.ts
+++ b/src/lib/toolbar/toolbar-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index 607f2c0bf02d..919b28ee87da 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tooltip/index.ts b/src/lib/tooltip/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/lib/tooltip/index.ts
+++ b/src/lib/tooltip/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tooltip/public-api.ts b/src/lib/tooltip/public-api.ts
index 7bb70a658c74..6d24abe03a81 100644
--- a/src/lib/tooltip/public-api.ts
+++ b/src/lib/tooltip/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tooltip/tooltip-module.ts b/src/lib/tooltip/tooltip-module.ts
index 8c49d490fd41..1fe55ef5a9fa 100644
--- a/src/lib/tooltip/tooltip-module.ts
+++ b/src/lib/tooltip/tooltip-module.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 168c088a3a03..b65f5a75c51a 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/lib/version.ts b/src/lib/version.ts
index 7d04cb1fda3f..e983426f6702 100644
--- a/src/lib/version.ts
+++ b/src/lib/version.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/material-moment-adapter/adapter/index.ts b/src/material-moment-adapter/adapter/index.ts
index 300f6e4e323f..d2bef474a2e9 100644
--- a/src/material-moment-adapter/adapter/index.ts
+++ b/src/material-moment-adapter/adapter/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
index 032b5c4c47bf..f9bf51316851 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.ts b/src/material-moment-adapter/adapter/moment-date-adapter.ts
index cbf42b5b2199..fbba8886cce5 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/material-moment-adapter/adapter/moment-date-formats.ts b/src/material-moment-adapter/adapter/moment-date-formats.ts
index caec58f8a603..df6569f55652 100644
--- a/src/material-moment-adapter/adapter/moment-date-formats.ts
+++ b/src/material-moment-adapter/adapter/moment-date-formats.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/material-moment-adapter/index.ts b/src/material-moment-adapter/index.ts
index d6e71197ad19..676ca90f1ffa 100644
--- a/src/material-moment-adapter/index.ts
+++ b/src/material-moment-adapter/index.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
diff --git a/src/material-moment-adapter/public-api.ts b/src/material-moment-adapter/public-api.ts
index 26149a398c2c..c9246d3a07b8 100644
--- a/src/material-moment-adapter/public-api.ts
+++ b/src/material-moment-adapter/public-api.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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

From 766faa10b7770cbd955b456cabdd64c1733321a9 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 22:22:22 +0200
Subject: [PATCH 269/575] refactor(scroll-dispatcher): remove the need to pass
 in a callback to the scrolled method (#6679)

---
 .../scroll/close-scroll-strategy.spec.ts      |  8 +--
 .../overlay/scroll/close-scroll-strategy.ts   |  2 +-
 .../scroll/reposition-scroll-strategy.spec.ts |  8 +--
 .../scroll/reposition-scroll-strategy.ts      |  2 +-
 src/cdk/scrolling/scroll-dispatcher.spec.ts   |  8 +--
 src/cdk/scrolling/scroll-dispatcher.ts        | 67 +++++++++----------
 src/cdk/scrolling/viewport-ruler.ts           | 10 ++-
 src/lib/autocomplete/autocomplete.spec.ts     |  8 +--
 src/lib/select/select.spec.ts                 |  8 +--
 9 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
index 995a241d665f..57617f6c8bef 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
@@ -21,11 +21,9 @@ describe('CloseScrollStrategy', () => {
     TestBed.configureTestingModule({
       imports: [OverlayModule, PortalModule, OverlayTestModule],
       providers: [
-        {provide: ScrollDispatcher, useFactory: () => {
-          return {scrolled: (_delay: number, callback: () => any) => {
-            return scrolledSubject.asObservable().subscribe(callback);
-          }};
-        }}
+        {provide: ScrollDispatcher, useFactory: () => ({
+          scrolled: () => scrolledSubject.asObservable()
+        })}
       ]
     });
 
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts
index 07a2d9911e76..1f8a328b163e 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts
@@ -31,7 +31,7 @@ export class CloseScrollStrategy implements ScrollStrategy {
 
   enable() {
     if (!this._scrollSubscription) {
-      this._scrollSubscription = this._scrollDispatcher.scrolled(0, () => {
+      this._scrollSubscription = this._scrollDispatcher.scrolled(0).subscribe(() => {
         if (this._overlayRef.hasAttached()) {
           this._overlayRef.detach();
         }
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
index 042089de1db3..0969222af312 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
@@ -21,11 +21,9 @@ describe('RepositionScrollStrategy', () => {
     TestBed.configureTestingModule({
       imports: [OverlayModule, PortalModule, OverlayTestModule],
       providers: [
-        {provide: ScrollDispatcher, useFactory: () => {
-          return {scrolled: (_delay: number, callback: () => any) => {
-            return scrolledSubject.asObservable().subscribe(callback);
-          }};
-        }}
+        {provide: ScrollDispatcher, useFactory: () => ({
+          scrolled: () => scrolledSubject.asObservable()
+        })}
       ]
     });
 
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
index 77b9f4a54b0a..f4d0468dcb66 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
@@ -41,7 +41,7 @@ export class RepositionScrollStrategy implements ScrollStrategy {
     if (!this._scrollSubscription) {
       let throttle = this._config ? this._config.scrollThrottle : 0;
 
-      this._scrollSubscription = this._scrollDispatcher.scrolled(throttle, () => {
+      this._scrollSubscription = this._scrollDispatcher.scrolled(throttle).subscribe(() => {
         this._overlayRef.updatePosition();
       });
     }
diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index 6fcb17c619ff..e16d3278afe7 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -47,7 +47,7 @@ describe('Scroll Dispatcher', () => {
       // Listen for notifications from scroll service with a throttle of 100ms
       const throttleTime = 100;
       const serviceSpy = jasmine.createSpy('service scroll callback');
-      scroll.scrolled(throttleTime, serviceSpy);
+      scroll.scrolled(throttleTime).subscribe(serviceSpy);
 
       // Emit a scroll event from the scrolling element in our component.
       // This event should be picked up by the scrollable directive and notify.
@@ -70,7 +70,7 @@ describe('Scroll Dispatcher', () => {
       const spy = jasmine.createSpy('zone unstable callback');
       const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
 
-      scroll.scrolled(0, () => {});
+      scroll.scrolled(0).subscribe(() => {});
       dispatchFakeEvent(document, 'scroll');
 
       expect(spy).not.toHaveBeenCalled();
@@ -89,7 +89,7 @@ describe('Scroll Dispatcher', () => {
 
     it('should be able to unsubscribe from the global scrollable', () => {
       const spy = jasmine.createSpy('global scroll callback');
-      const subscription = scroll.scrolled(0, spy);
+      const subscription = scroll.scrolled(0).subscribe(spy);
 
       dispatchFakeEvent(document, 'scroll');
       expect(spy).toHaveBeenCalledTimes(1);
@@ -132,7 +132,7 @@ describe('Scroll Dispatcher', () => {
     it('should lazily add global listeners as service subscriptions are added and removed', () => {
       expect(scroll._globalSubscription).toBeNull('Expected no global listeners on init.');
 
-      const subscription = scroll.scrolled(0, () => {});
+      const subscription = scroll.scrolled(0).subscribe(() => {});
 
       expect(scroll._globalSubscription).toBeTruthy(
           'Expected global listeners after a subscription has been added.');
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index bc7108ee91e9..9060f4569bc9 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -10,7 +10,9 @@ import {ElementRef, Injectable, NgZone, Optional, SkipSelf} from '@angular/core'
 import {Platform} from '@angular/cdk/platform';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
+import {Observable} from 'rxjs/Observable';
 import {fromEvent} from 'rxjs/observable/fromEvent';
+import {of as observableOf} from 'rxjs/observable/of';
 import {auditTime} from 'rxjs/operator/auditTime';
 import {Scrollable} from './scrollable';
 
@@ -27,7 +29,7 @@ export class ScrollDispatcher {
   constructor(private _ngZone: NgZone, private _platform: Platform) { }
 
   /** Subject for notifying that a registered scrollable reference element has been scrolled. */
-  _scrolled: Subject<void> = new Subject<void>();
+  private _scrolled: Subject<void> = new Subject<void>();
 
   /** Keeps track of the global `scroll` and `resize` subscriptions. */
   _globalSubscription: Subscription | null = null;
@@ -47,8 +49,7 @@ export class ScrollDispatcher {
    * @param scrollable Scrollable instance to be registered.
    */
   register(scrollable: Scrollable): void {
-    const scrollSubscription = scrollable.elementScrolled().subscribe(() => this._notify());
-
+    const scrollSubscription = scrollable.elementScrolled().subscribe(() => this._scrolled.next());
     this.scrollableReferences.set(scrollable, scrollSubscription);
   }
 
@@ -66,44 +67,34 @@ export class ScrollDispatcher {
   }
 
   /**
-   * Subscribes to an observable that emits an event whenever any of the registered Scrollable
+   * Returns an observable that emits an event whenever any of the registered Scrollable
    * references (or window, document, or body) fire a scrolled event. Can provide a time in ms
    * to override the default "throttle" time.
    */
-  scrolled(auditTimeInMs: number = DEFAULT_SCROLL_TIME, callback: () => any): Subscription {
-    // Scroll events can only happen on the browser, so do nothing if we're not on the browser.
-    if (!this._platform.isBrowser) {
-      return Subscription.EMPTY;
-    }
-
-    // In the case of a 0ms delay, use an observable without auditTime
-    // since it does add a perceptible delay in processing overhead.
-    let observable = auditTimeInMs > 0 ?
-      auditTime.call(this._scrolled.asObservable(), auditTimeInMs) :
-      this._scrolled.asObservable();
-
-    this._scrolledCount++;
-
-    if (!this._globalSubscription) {
-      this._globalSubscription = this._ngZone.runOutsideAngular(() => {
-        return fromEvent(window.document, 'scroll').subscribe(() => this._notify());
-      });
-    }
+  scrolled(auditTimeInMs: number = DEFAULT_SCROLL_TIME): Observable<void> {
+    return this._platform.isBrowser ? Observable.create(observer => {
+      if (!this._globalSubscription) {
+        this._addGlobalListener();
+      }
 
-    // Note that we need to do the subscribing from here, in order to be able to remove
-    // the global event listeners once there are no more subscriptions.
-    let subscription = observable.subscribe(callback);
+      // In the case of a 0ms delay, use an observable without auditTime
+      // since it does add a perceptible delay in processing overhead.
+      const subscription = auditTimeInMs > 0 ?
+        auditTime.call(this._scrolled, auditTimeInMs).subscribe(observer) :
+        this._scrolled.subscribe(observer);
 
-    subscription.add(() => {
-      this._scrolledCount--;
+      this._scrolledCount++;
 
-      if (this._globalSubscription && !this.scrollableReferences.size && !this._scrolledCount) {
-        this._globalSubscription.unsubscribe();
-        this._globalSubscription = null;
-      }
-    });
+      return () => {
+        subscription.unsubscribe();
+        this._scrolledCount--;
 
-    return subscription;
+        if (this._globalSubscription && !this.scrollableReferences.size && !this._scrolledCount) {
+          this._globalSubscription.unsubscribe();
+          this._globalSubscription = null;
+        }
+      };
+    }) : observableOf<void>();
   }
 
   /** Returns all registered Scrollables that contain the provided element. */
@@ -133,9 +124,11 @@ export class ScrollDispatcher {
     return false;
   }
 
-  /** Sends a notification that a scroll event has been fired. */
-  _notify() {
-    this._scrolled.next();
+  /** Sets up the global scroll and resize listeners. */
+  private _addGlobalListener() {
+    this._globalSubscription = this._ngZone.runOutsideAngular(() => {
+      return fromEvent(window.document, 'scroll').subscribe(() => this._scrolled.next());
+    });
   }
 }
 
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index d895fc18f71f..f5d840f4646f 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -33,7 +33,7 @@ export class ViewportRuler implements OnDestroy {
   private _change: Observable<Event>;
 
   /** Subscriptions to streams that invalidate the cached viewport dimensions. */
-  private _invalidateCacheSubscriptions: Subscription[];
+  private _invalidateCacheSubscription = Subscription.EMPTY;
 
   constructor(platform: Platform, ngZone: NgZone, scrollDispatcher: ScrollDispatcher) {
     this._change = platform.isBrowser ? ngZone.runOutsideAngular(() => {
@@ -41,14 +41,12 @@ export class ViewportRuler implements OnDestroy {
     }) : observableOf();
 
     // Subscribe to scroll and resize events and update the document rectangle on changes.
-    this._invalidateCacheSubscriptions = [
-      scrollDispatcher.scrolled(0, () => this._cacheViewportGeometry()),
-      this.change().subscribe(() => this._cacheViewportGeometry())
-    ];
+    this._invalidateCacheSubscription = merge(scrollDispatcher.scrolled(0), this.change())
+      .subscribe(() => this._cacheViewportGeometry());
   }
 
   ngOnDestroy() {
-    this._invalidateCacheSubscriptions.forEach(subscription => subscription.unsubscribe());
+    this._invalidateCacheSubscription.unsubscribe();
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 80929c5c383b..ccd6da21eee4 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -80,11 +80,9 @@ describe('MatAutocomplete', () => {
           return {getContainerElement: () => overlayContainerElement};
         }},
         {provide: Directionality, useFactory: () => ({value: dir})},
-        {provide: ScrollDispatcher, useFactory: () => {
-          return {scrolled: (_delay: number, callback: () => any) => {
-            return scrolledSubject.asObservable().subscribe(callback);
-          }};
-        }}
+        {provide: ScrollDispatcher, useFactory: () => ({
+          scrolled: () => scrolledSubject.asObservable()
+        })}
       ]
     });
 
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 54cf03800823..27c37c045198 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -114,11 +114,9 @@ describe('MatSelect', () => {
           return {getContainerElement: () => overlayContainerElement};
         }},
         {provide: Directionality, useFactory: () => dir = { value: 'ltr' }},
-        {provide: ScrollDispatcher, useFactory: () => {
-          return {scrolled: (_delay: number, callback: () => any) => {
-            return scrolledSubject.asObservable().subscribe(callback);
-          }};
-        }}
+        {provide: ScrollDispatcher, useFactory: () => ({
+          scrolled: () => scrolledSubject.asObservable()
+        })}
       ]
     });
 

From 085827f3f5488aaa17595cac19f6d4348962a2ca Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 22:23:00 +0200
Subject: [PATCH 270/575] fix(drawer): unable to toggle while drawer is
 animating (#6810)

Fixes #6376.
---
 src/lib/sidenav/drawer.spec.ts | 22 ++++++++++++++++-
 src/lib/sidenav/drawer.ts      | 45 +++++++++-------------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index c763866bd0c3..ccd132030d2c 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -46,7 +46,6 @@ describe('MatDrawer', () => {
       tick();
       fixture.detectChanges();
 
-      expect(drawer.componentInstance._isAnimating).toBe(false);
       expect(testComponent.openCount).toBe(1);
       expect(testComponent.closeCount).toBe(0);
       expect(getComputedStyle(drawer.nativeElement).visibility).toBe('visible');
@@ -67,6 +66,27 @@ describe('MatDrawer', () => {
       expect(getComputedStyle(drawerBackdropElement.nativeElement).visibility).toBe('hidden');
     }));
 
+    it('should be able to close while the open animation is running', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicTestApp);
+      fixture.detectChanges();
+
+      const testComponent: BasicTestApp = fixture.debugElement.componentInstance;
+      fixture.debugElement.query(By.css('.open')).nativeElement.click();
+      fixture.detectChanges();
+
+      expect(testComponent.openCount).toBe(0);
+      expect(testComponent.closeCount).toBe(0);
+
+      fixture.debugElement.query(By.css('.close')).nativeElement.click();
+      fixture.detectChanges();
+
+      tick();
+      fixture.detectChanges();
+
+      expect(testComponent.openCount).toBe(1);
+      expect(testComponent.closeCount).toBe(1);
+    }));
+
     it('does not throw when created without a drawer', fakeAsync(() => {
       expect(() => {
         let fixture = TestBed.createComponent(BasicTestApp);
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index cc1f72d3146f..4a82ff1b0d03 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -174,19 +174,9 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   /** Emits whenever the drawer has started animating. */
   _animationStarted = new EventEmitter<AnimationEvent>();
 
-  /** Whether the drawer is animating. Used to prevent overlapping animations. */
-  _isAnimating = false;
-
   /** Current state of the sidenav animation. */
   _animationState: 'open-instant' | 'open' | 'void' = 'void';
 
-  /**
-   * Promise that resolves when the open/close animation completes. It is here for backwards
-   * compatibility and should be removed next time we do drawer breaking changes.
-   * @deprecated
-   */
-  private _currentTogglePromise: Promise<MatDrawerToggleResult> | null;
-
   /** Event emitted when the drawer is fully opened. */
   @Output('open') onOpen = new EventEmitter<MatDrawerToggleResult | void>();
 
@@ -281,27 +271,23 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
    * @param isOpen Whether the drawer should be open.
    */
   toggle(isOpen: boolean = !this.opened): Promise<MatDrawerToggleResult> {
-    if (!this._isAnimating) {
-      this._opened = isOpen;
+    this._opened = isOpen;
 
-      if (isOpen) {
-        this._animationState = this._enableAnimations ? 'open' : 'open-instant';
-      } else {
-        this._animationState = 'void';
-      }
-
-      this._currentTogglePromise = new Promise(resolve => {
-        first.call(isOpen ? this.onOpen : this.onClose).subscribe(resolve);
-      });
+    if (isOpen) {
+      this._animationState = this._enableAnimations ? 'open' : 'open-instant';
+    } else {
+      this._animationState = 'void';
+    }
 
-      if (this._focusTrap) {
-        this._focusTrap.enabled = this._isFocusTrapEnabled;
-      }
+    if (this._focusTrap) {
+      this._focusTrap.enabled = this._isFocusTrapEnabled;
     }
 
     // TODO(crisbeto): This promise is here for backwards-compatibility.
     // It should be removed next time we do breaking changes in the drawer.
-    return this._currentTogglePromise!;
+    return new Promise(resolve => {
+      first.call(isOpen ? this.onOpen : this.onClose).subscribe(resolve);
+    });
   }
 
   /**
@@ -316,7 +302,6 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   }
 
   _onAnimationStart(event: AnimationEvent) {
-    this._isAnimating = true;
     this._animationStarted.emit(event);
   }
 
@@ -328,14 +313,6 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     } else if (toState === 'void' && fromState.indexOf('open') === 0) {
       this.onClose.emit(new MatDrawerToggleResult('close', true));
     }
-
-    // Note: as of Angular 4.3, the animations module seems to fire the `start` callback before
-    // the end if animations are disabled. Make this call async to ensure that it still fires
-    // at the appropriate time.
-    Promise.resolve().then(() => {
-      this._isAnimating = false;
-      this._currentTogglePromise = null;
-    });
   }
 
   get _width() {

From 746799fbed24fa2b489968297f661022dc71d878 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 6 Oct 2017 22:23:24 +0200
Subject: [PATCH 271/575] chore(tabs): remove unused initialized check (#7476)

---
 src/lib/tabs/tab-group.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 28e0cb596561..3868f8972323 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -9,7 +9,6 @@
 import {
   AfterContentChecked,
   AfterContentInit,
-  AfterViewChecked,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -78,15 +77,12 @@ export const _MatTabGroupMixinBase = mixinColor(mixinDisableRipple(MatTabGroupBa
   },
 })
 export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentInit,
-    AfterContentChecked, AfterViewChecked, OnDestroy, CanColor, CanDisableRipple {
+    AfterContentChecked, OnDestroy, CanColor, CanDisableRipple {
 
   @ContentChildren(MatTab) _tabs: QueryList<MatTab>;
 
   @ViewChild('tabBodyWrapper') _tabBodyWrapper: ElementRef;
 
-  /** Whether this component has been initialized. */
-  private _isInitialized: boolean = false;
-
   /** The tab index that should be selected after the content has been checked. */
   private _indexToSelect: number | null = 0;
 
@@ -218,14 +214,6 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
     this._tabLabelSubscription.unsubscribe();
   }
 
-  /**
-   * Waits one frame for the view to update, then updates the ink bar
-   * Note: This must be run outside of the zone or it will create an infinite change detection loop.
-   */
-  ngAfterViewChecked(): void {
-    this._isInitialized = true;
-  }
-
   _focusChanged(index: number) {
     this.focusChange.emit(this._createChangeEvent(index));
   }

From 4bb696e8e507e8b05fa5fb87691bbe6a1483a976 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 22:23:51 +0200
Subject: [PATCH 272/575] fix(progress-spinner): fallback animation not working
 (#7599)

Fixes #7599.
---
 src/lib/progress-spinner/progress-spinner.html | 1 -
 src/lib/progress-spinner/progress-spinner.scss | 6 +++---
 src/lib/progress-spinner/progress-spinner.ts   | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lib/progress-spinner/progress-spinner.html b/src/lib/progress-spinner/progress-spinner.html
index 237f087fcb07..303d1d0ebfe0 100644
--- a/src/lib/progress-spinner/progress-spinner.html
+++ b/src/lib/progress-spinner/progress-spinner.html
@@ -19,6 +19,5 @@
     [style.animation-name]="'mat-progress-spinner-stroke-rotate-' + diameter"
     [style.stroke-dashoffset.px]="_strokeDashOffset"
     [style.stroke-dasharray.px]="_strokeCircumference"
-    [style.transform.rotate]="'360deg'"
     [style.stroke-width.px]="strokeWidth"></circle>
 </svg>
diff --git a/src/lib/progress-spinner/progress-spinner.scss b/src/lib/progress-spinner/progress-spinner.scss
index 9406f80d2848..01449362b014 100644
--- a/src/lib/progress-spinner/progress-spinner.scss
+++ b/src/lib/progress-spinner/progress-spinner.scss
@@ -14,9 +14,9 @@ $_mat-progress-spinner-default-circumference: $pi * $_mat-progress-spinner-defau
 
   svg {
     position: absolute;
-    transform: translate(-50%, -50%) rotate(-90deg);
-    top: 50%;
-    left: 50%;
+    transform: rotate(-90deg);
+    top: 0;
+    left: 0;
     transform-origin: center;
     overflow: visible;
   }
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index e68b35e098ed..43f87936f870 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -165,6 +165,11 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
       return this._strokeCircumference * (100 - this._value) / 100;
     }
 
+    // In fallback mode set the circle to 80% and rotate it with CSS.
+    if (this._fallbackAnimation && this.mode === 'indeterminate') {
+      return this._strokeCircumference * 0.2;
+    }
+
     return null;
   }
 

From 66e71c8542f0e73e8f14ed0142c74c1d125844a4 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 6 Oct 2017 13:24:29 -0700
Subject: [PATCH 273/575] fix(datepicker): use disabled state from FormControl
 (#7514)

---
 src/demo-app/datepicker/datepicker-demo.html | 22 ++++++++--
 src/demo-app/datepicker/datepicker-demo.ts   |  5 ++-
 src/lib/datepicker/datepicker-input.ts       |  4 +-
 src/lib/datepicker/datepicker-toggle.ts      | 43 +++++++++++---------
 src/lib/datepicker/datepicker.spec.ts        | 14 ++++++-
 src/lib/datepicker/datepicker.ts             |  2 +-
 6 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/src/demo-app/datepicker/datepicker-demo.html b/src/demo-app/datepicker/datepicker-demo.html
index 127c5ec2bc8d..03de75ca83de 100644
--- a/src/demo-app/datepicker/datepicker-demo.html
+++ b/src/demo-app/datepicker/datepicker-demo.html
@@ -94,14 +94,30 @@ <h2>Input disabled datepicker</h2>
   </mat-form-field>
 </p>
 
-<h2>Input disabled, datepicker popup enabled</h2>
+<h2>Input disabled via FormControl</h2>
 <p>
   <mat-datepicker-toggle [for]="datePicker2"></mat-datepicker-toggle>
   <mat-form-field>
-    <input matInput disabled [matDatepicker]="datePicker2" [(ngModel)]="date" [min]="minDate"
+    <input matInput [matDatepicker]="datePicker2" [formControl]="dateCtrl" [min]="minDate"
+           [max]="maxDate" [matDatepickerFilter]="filterOdd ? dateFilter : null"
+           placeholder="FormControl disabled">
+    <mat-datepicker #datePicker2 [touchUi]="touch" [startAt]="startAt"
+                    [startView]="yearView ? 'year' : 'month'"></mat-datepicker>
+  </mat-form-field>
+
+  <button mat-button (click)="dateCtrl.disabled ? dateCtrl.enable() : dateCtrl.disable()">
+    {{dateCtrl.disabled ? 'Enable' : 'Disable'}} FormControl
+  </button>
+</p>
+
+<h2>Input disabled, datepicker popup enabled</h2>
+<p>
+  <mat-datepicker-toggle [for]="datePicker3"></mat-datepicker-toggle>
+  <mat-form-field>
+    <input matInput disabled [matDatepicker]="datePicker3" [(ngModel)]="date" [min]="minDate"
            [max]="maxDate" [matDatepickerFilter]="filterOdd ? dateFilter : null"
            placeholder="Input disabled, datepicker enabled">
-    <mat-datepicker #datePicker2 [touchUi]="touch" [disabled]="false" [startAt]="startAt"
+    <mat-datepicker #datePicker3 [touchUi]="touch" [disabled]="false" [startAt]="startAt"
                    [startView]="yearView ? 'year' : 'month'"></mat-datepicker>
   </mat-form-field>
 </p>
diff --git a/src/demo-app/datepicker/datepicker-demo.ts b/src/demo-app/datepicker/datepicker-demo.ts
index fe363d322b5e..974ea3ec4e63 100644
--- a/src/demo-app/datepicker/datepicker-demo.ts
+++ b/src/demo-app/datepicker/datepicker-demo.ts
@@ -1,5 +1,6 @@
 import {ChangeDetectionStrategy, Component} from '@angular/core';
-import {MatDatepickerInputEvent} from '@angular/material';
+import {FormControl} from '@angular/forms';
+import {MatDatepickerInputEvent} from '@angular/material/datepicker';
 
 
 @Component({
@@ -26,4 +27,6 @@ export class DatepickerDemo {
 
   onDateInput = (e: MatDatepickerInputEvent<Date>) => this.lastDateInput = e.value;
   onDateChange = (e: MatDatepickerInputEvent<Date>) => this.lastDateChange = e.value;
+
+  dateCtrl = new FormControl();
 }
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 15e13801a87a..d1ee19ad40bd 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -147,7 +147,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
 
   /** Whether the datepicker-input is disabled. */
   @Input()
-  get disabled() { return this._disabled; }
+  get disabled() { return !!this._disabled; }
   set disabled(value: any) {
     const newValue = coerceBooleanProperty(value);
 
@@ -289,7 +289,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
 
   // Implemented as part of ControlValueAccessor
   setDisabledState(disabled: boolean): void {
-    this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', disabled);
+    this.disabled = disabled;
   }
 
   _onKeydown(event: KeyboardEvent) {
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index c1924a8d5bca..3d4b889329dd 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
+  AfterContentInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -16,12 +18,11 @@ import {
   SimpleChanges,
   ViewEncapsulation,
 } from '@angular/core';
-import {MatDatepicker} from './datepicker';
-import {MatDatepickerIntl} from './datepicker-intl';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {Subscription} from 'rxjs/Subscription';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
+import {Subscription} from 'rxjs/Subscription';
+import {MatDatepicker} from './datepicker';
+import {MatDatepickerIntl} from './datepicker-intl';
 
 
 @Component({
@@ -35,7 +36,7 @@ import {of as observableOf} from 'rxjs/observable/of';
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MatDatepickerToggle<D> implements OnChanges, OnDestroy {
+export class MatDatepickerToggle<D> implements AfterContentInit, OnChanges, OnDestroy {
   private _stateChanges = Subscription.EMPTY;
 
   /** Datepicker instance that the button will toggle. */
@@ -44,28 +45,18 @@ export class MatDatepickerToggle<D> implements OnChanges, OnDestroy {
   /** Whether the toggle button is disabled. */
   @Input()
   get disabled(): boolean {
-    return this._disabled === undefined ? this.datepicker.disabled : this._disabled;
+    return this._disabled === undefined ? this.datepicker.disabled : !!this._disabled;
   }
-  set disabled(value) {
+  set disabled(value: boolean) {
     this._disabled = coerceBooleanProperty(value);
   }
   private _disabled: boolean;
 
-  constructor(
-    public _intl: MatDatepickerIntl,
-    private _changeDetectorRef: ChangeDetectorRef) {}
+  constructor(public _intl: MatDatepickerIntl, private _changeDetectorRef: ChangeDetectorRef) {}
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.datepicker) {
-      const datepicker: MatDatepicker<D> = changes.datepicker.currentValue;
-      const datepickerDisabled = datepicker ? datepicker._disabledChange : observableOf();
-      const inputDisabled = datepicker && datepicker._datepickerInput ?
-        datepicker._datepickerInput._disabledChange :
-        observableOf();
-
-      this._stateChanges.unsubscribe();
-      this._stateChanges = merge(this._intl.changes, datepickerDisabled, inputDisabled)
-        .subscribe(() => this._changeDetectorRef.markForCheck());
+      this._watchStateChanges();
     }
   }
 
@@ -73,10 +64,24 @@ export class MatDatepickerToggle<D> implements OnChanges, OnDestroy {
     this._stateChanges.unsubscribe();
   }
 
+  ngAfterContentInit() {
+    this._watchStateChanges();
+  }
+
   _open(event: Event): void {
     if (this.datepicker && !this.disabled) {
       this.datepicker.open();
       event.stopPropagation();
     }
   }
+
+  private _watchStateChanges() {
+    const datepickerDisabled = this.datepicker ? this.datepicker._disabledChange : observableOf();
+    const inputDisabled = this.datepicker && this.datepicker._datepickerInput ?
+        this.datepicker._datepickerInput._disabledChange : observableOf();
+
+    this._stateChanges.unsubscribe();
+    this._stateChanges = merge(this._intl.changes, datepickerDisabled, inputDisabled)
+        .subscribe(() => this._changeDetectorRef.markForCheck());
+  }
 }
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index dfcf2df0a509..919539a44db3 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -25,6 +25,7 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatInputModule} from '../input/index';
 import {MatDatepicker} from './datepicker';
 import {MatDatepickerInput} from './datepicker-input';
+import {MatDatepickerToggle} from './datepicker-toggle';
 import {MatDatepickerIntl, MatDatepickerModule} from './index';
 
 
@@ -539,6 +540,15 @@ describe('MatDatepicker', () => {
 
         expect(inputEl.disabled).toBe(true);
       });
+
+      it('should disable toggle when form control disabled', () => {
+        expect(testComponent.datepickerToggle.disabled).toBe(false);
+
+        testComponent.formControl.disable();
+        fixture.detectChanges();
+
+        expect(testComponent.datepickerToggle.disabled).toBe(true);
+      });
     });
 
     describe('datepicker with mat-datepicker-toggle', () => {
@@ -582,7 +592,7 @@ describe('MatDatepicker', () => {
       });
 
       it('should not open calendar when toggle clicked if input is disabled', () => {
-        expect(testComponent.datepicker.disabled).toBeUndefined();
+        expect(testComponent.datepicker.disabled).toBe(false);
 
         testComponent.input.disabled = true;
         fixture.detectChanges();
@@ -1120,6 +1130,7 @@ class DatepickerWithNgModel {
 @Component({
   template: `
     <input [formControl]="formControl" [matDatepicker]="d">
+    <mat-datepicker-toggle [for]="d"></mat-datepicker-toggle>
     <mat-datepicker #d></mat-datepicker>
   `,
 })
@@ -1127,6 +1138,7 @@ class DatepickerWithFormControl {
   formControl = new FormControl();
   @ViewChild('d') datepicker: MatDatepicker<Date>;
   @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
+  @ViewChild(MatDatepickerToggle) datepickerToggle: MatDatepickerToggle<Date>;
 }
 
 
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 51e501df2c30..4bb98d541480 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -149,7 +149,7 @@ export class MatDatepicker<D> implements OnDestroy {
   @Input()
   get disabled() {
     return this._disabled === undefined && this._datepickerInput ?
-        this._datepickerInput.disabled : this._disabled;
+        this._datepickerInput.disabled : !!this._disabled;
   }
   set disabled(value: any) {
     const newValue = coerceBooleanProperty(value);

From 5eb5cbdc032ed612cfbd19f2fe0d8504b9538f50 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 22:24:46 +0200
Subject: [PATCH 274/575] refactor(progress-spinner): re-use keyframe
 stylesheet element (#7563)

---
 src/lib/progress-spinner/progress-spinner.ts | 25 ++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 43f87936f870..f7f098b83fcc 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -92,7 +92,10 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   _elementSize = this._baseSize;
 
   /** Tracks diameters of existing instances to de-dupe generated styles (default d = 100) */
-  static diameters = new Set<number>([100]);
+  private static diameters = new Set<number>([100]);
+
+  /** Used for storing all of the generated keyframe animations. */
+  private static styleTag: HTMLStyleElement;
 
   /** The diameter of the progress spinner (will set width and height of svg). */
   @Input()
@@ -130,9 +133,8 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
 
     // On IE and Edge, we can't animate the `stroke-dashoffset`
     // reliably so we fall back to a non-spec animation.
-    const animationClass = this._fallbackAnimation ?
-      'mat-progress-spinner-indeterminate-fallback-animation' :
-      'mat-progress-spinner-indeterminate-animation';
+    const animationClass =
+      `mat-progress-spinner-indeterminate${this._fallbackAnimation ? '-fallback' : ''}-animation`;
 
     _renderer.addClass(_elementRef.nativeElement, animationClass);
   }
@@ -183,9 +185,18 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
 
   /** Dynamically generates a style tag containing the correct animation for this diameter. */
   private _attachStyleNode(): void {
-    const styleTag = this._renderer.createElement('style');
-    styleTag.textContent = this._getAnimationText();
-    this._renderer.appendChild(this._document.head, styleTag);
+    let styleTag = MatProgressSpinner.styleTag;
+
+    if (!styleTag) {
+      styleTag = this._renderer.createElement('style');
+      this._renderer.appendChild(this._document.head, styleTag);
+      MatProgressSpinner.styleTag = styleTag;
+    }
+
+    if (styleTag.sheet) {
+      (styleTag.sheet as CSSStyleSheet).insertRule(this._getAnimationText());
+    }
+
     MatProgressSpinner.diameters.add(this.diameter);
   }
 

From 2b9c470b1c555210c7a4b25c57cce6ddb53a3732 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 22:25:08 +0200
Subject: [PATCH 275/575] fix(snack-bar): add content fade in animation (#7504)

---
 src/lib/snack-bar/simple-snack-bar.scss |  1 +
 src/lib/snack-bar/simple-snack-bar.ts   | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/lib/snack-bar/simple-snack-bar.scss b/src/lib/snack-bar/simple-snack-bar.scss
index f052fe4d29f3..dc25b4c8fc21 100644
--- a/src/lib/snack-bar/simple-snack-bar.scss
+++ b/src/lib/snack-bar/simple-snack-bar.scss
@@ -8,6 +8,7 @@ $mat-snack-bar-button-margin: 48px !default;
   display: flex;
   justify-content: space-between;
   line-height: 20px;
+  opacity: 1;
 }
 
 .mat-simple-snackbar-action {
diff --git a/src/lib/snack-bar/simple-snack-bar.ts b/src/lib/snack-bar/simple-snack-bar.ts
index 982e7269f93a..1433adbc3717 100644
--- a/src/lib/snack-bar/simple-snack-bar.ts
+++ b/src/lib/snack-bar/simple-snack-bar.ts
@@ -7,6 +7,8 @@
  */
 
 import {Component, ViewEncapsulation, Inject, ChangeDetectionStrategy} from '@angular/core';
+import {trigger, style, transition, animate} from '@angular/animations';
+import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 import {MatSnackBarRef} from './snack-bar-ref';
 import {MAT_SNACK_BAR_DATA} from './snack-bar-config';
 
@@ -23,7 +25,16 @@ import {MAT_SNACK_BAR_DATA} from './snack-bar-config';
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [
+    trigger('contentFade', [
+      transition(':enter', [
+        style({opacity: '0'}),
+        animate(`${AnimationDurations.COMPLEX} ${AnimationCurves.STANDARD_CURVE}`)
+      ])
+    ])
+  ],
   host: {
+    '[@contentFade]': '',
     'class': 'mat-simple-snackbar',
   }
 })

From 5b7982f2784ae3816b50e81598a60294821e62d8 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 6 Oct 2017 13:25:32 -0700
Subject: [PATCH 276/575] feat(snack-bar): set snack bar to be responsive.
 (#7485)

---
 src/demo-app/snack-bar/snack-bar-demo.ts   |  2 +-
 src/lib/snack-bar/snack-bar-container.scss | 16 +++++++++++++++-
 src/lib/snack-bar/snack-bar-module.ts      |  2 ++
 src/lib/snack-bar/snack-bar.ts             | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 94bffbcc0acf..91bc1aae67da 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -33,7 +33,7 @@ export class SnackBarDemo {
     let config = new MatSnackBarConfig();
     config.verticalPosition = this.verticalPosition;
     config.horizontalPosition = this.horizontalPosition;
-    config.duration = this.autoHide;
+    config.duration = this.setAutoHide ? this.autoHide : 0;
     config.extraClasses = this.addExtraClass ? ['party'] : undefined;
     config.direction = this.dir.value;
     this.snackBar.open(this.message, this.action ? this.actionButtonLabel : undefined, config);
diff --git a/src/lib/snack-bar/snack-bar-container.scss b/src/lib/snack-bar/snack-bar-container.scss
index 1a4c966a3e5e..7a58a63c62dd 100644
--- a/src/lib/snack-bar/snack-bar-container.scss
+++ b/src/lib/snack-bar/snack-bar-container.scss
@@ -8,7 +8,7 @@ $mat-snack-bar-spacing-margin: 24px !default;
 
 .mat-snack-bar-container {
   border-radius: 2px;
-  box-sizing: content-box;
+  box-sizing: border-box;
   display: block;
   margin: $mat-snack-bar-spacing-margin;
   max-width: $mat-snack-bar-max-width;
@@ -44,3 +44,17 @@ $mat-snack-bar-spacing-margin: 24px !default;
     border: solid 1px;
   }
 }
+
+/**
+ * The mat-snack-bar-handset class will be applied to the overlay
+ * element causing styling to both it and the snack bar container.
+ */
+.mat-snack-bar-handset {
+  width: 100%;
+
+  .mat-snack-bar-container {
+    margin: 0;
+    max-width: inherit;
+    width: 100%;
+  }
+}
diff --git a/src/lib/snack-bar/snack-bar-module.ts b/src/lib/snack-bar/snack-bar-module.ts
index 42bddfc1efc4..79cf441daa02 100644
--- a/src/lib/snack-bar/snack-bar-module.ts
+++ b/src/lib/snack-bar/snack-bar-module.ts
@@ -11,6 +11,7 @@ import {CommonModule} from '@angular/common';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
 import {LIVE_ANNOUNCER_PROVIDER} from '@angular/cdk/a11y';
+import {LayoutModule} from '@angular/cdk/layout';
 import {MatCommonModule} from '@angular/material/core';
 import {MatSnackBar} from './snack-bar';
 import {MatSnackBarContainer} from './snack-bar-container';
@@ -23,6 +24,7 @@ import {SimpleSnackBar} from './simple-snack-bar';
     PortalModule,
     CommonModule,
     MatCommonModule,
+    LayoutModule,
   ],
   exports: [MatSnackBarContainer, MatCommonModule],
   declarations: [MatSnackBarContainer, SimpleSnackBar],
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index a2c875e519ae..44f19625f5ea 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -15,6 +15,8 @@ import {SimpleSnackBar} from './simple-snack-bar';
 import {MAT_SNACK_BAR_DATA, MatSnackBarConfig} from './snack-bar-config';
 import {MatSnackBarContainer} from './snack-bar-container';
 import {MatSnackBarRef} from './snack-bar-ref';
+import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
+import {RxChain, takeUntil, first} from '@angular/cdk/rxjs';
 
 
 /**
@@ -47,6 +49,7 @@ export class MatSnackBar {
       private _overlay: Overlay,
       private _live: LiveAnnouncer,
       private _injector: Injector,
+      private _breakpointObserver: BreakpointObserver,
       @Optional() @SkipSelf() private _parentSnackBar: MatSnackBar) {}
 
   /**
@@ -145,6 +148,19 @@ export class MatSnackBar {
     // We can't pass this via the injector, because the injector is created earlier.
     snackBarRef.instance = contentRef.instance;
 
+    // Subscribe to the breakpoint observer and attach the mat-snack-bar-handset class as
+    // appropriate. This class is applied to the overlay element because the overlay must expand to
+    // fill the width of the screen for full width snackbars.
+    RxChain.from(this._breakpointObserver.observe(Breakpoints.Handset))
+      .call(takeUntil, first.call(overlayRef.detachments()))
+      .subscribe(state => {
+        if (state.matches) {
+          overlayRef.overlayElement.classList.add('mat-snack-bar-handset');
+        } else {
+          overlayRef.overlayElement.classList.remove('mat-snack-bar-handset');
+        }
+      });
+
     return snackBarRef;
   }
 

From 60707b385a11d4c2517e6fac7c72165b2daa9354 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 6 Oct 2017 22:26:26 +0200
Subject: [PATCH 277/575] fix(stepper): don't grey out non-linear steps (#7479)

Fixes #7260.
---
 src/lib/stepper/stepper-horizontal.html | 2 +-
 src/lib/stepper/stepper-vertical.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/stepper/stepper-horizontal.html b/src/lib/stepper/stepper-horizontal.html
index 905f8dee8034..5388801e155c 100644
--- a/src/lib/stepper/stepper-horizontal.html
+++ b/src/lib/stepper/stepper-horizontal.html
@@ -11,7 +11,7 @@
                      [icon]="_getIndicatorType(i)"
                      [label]="step.stepLabel || step.label"
                      [selected]="selectedIndex === i"
-                     [active]="step.completed || selectedIndex === i"
+                     [active]="step.completed || selectedIndex === i || !linear"
                      [optional]="step.optional">
     </mat-step-header>
     <div *ngIf="!isLast" class="mat-stepper-horizontal-line"></div>
diff --git a/src/lib/stepper/stepper-vertical.html b/src/lib/stepper/stepper-vertical.html
index 29a2f16f16fb..41bbefec72e7 100644
--- a/src/lib/stepper/stepper-vertical.html
+++ b/src/lib/stepper/stepper-vertical.html
@@ -10,7 +10,7 @@
                    [icon]="_getIndicatorType(i)"
                    [label]="step.stepLabel || step.label"
                    [selected]="selectedIndex === i"
-                   [active]="step.completed || selectedIndex === i"
+                   [active]="step.completed || selectedIndex === i || !linear"
                    [optional]="step.optional">
   </mat-step-header>
 

From 37a423beb25b42237b58d089586dd25b1fc604e8 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 6 Oct 2017 22:26:52 +0200
Subject: [PATCH 278/575] revert(ripple): handle touch events (#7557)

---
 src/lib/core/ripple/ripple-renderer.ts | 44 ++++++++------------------
 src/lib/core/ripple/ripple.spec.ts     | 16 +---------
 2 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
index 866b0cf84412..bb5f61aafd0e 100644
--- a/src/lib/core/ripple/ripple-renderer.ts
+++ b/src/lib/core/ripple/ripple-renderer.ts
@@ -40,8 +40,8 @@ export class RippleRenderer {
   /** Element which triggers the ripple elements on mouse events. */
   private _triggerElement: HTMLElement | null;
 
-  /** Whether the pointer is currently being held on the trigger or not. */
-  private _isPointerDown: boolean = false;
+  /** Whether the mouse is currently down or not. */
+  private _isMousedown: boolean = false;
 
   /** Events to be registered on the trigger element. */
   private _triggerEvents = new Map<string, any>();
@@ -62,12 +62,8 @@ export class RippleRenderer {
 
       // Specify events which need to be registered on the trigger.
       this._triggerEvents.set('mousedown', this.onMousedown.bind(this));
-      this._triggerEvents.set('touchstart', this.onTouchstart.bind(this));
-
-      this._triggerEvents.set('mouseup', this.onPointerUp.bind(this));
-      this._triggerEvents.set('touchend', this.onPointerUp.bind(this));
-
-      this._triggerEvents.set('mouseleave', this.onPointerLeave.bind(this));
+      this._triggerEvents.set('mouseup', this.onMouseup.bind(this));
+      this._triggerEvents.set('mouseleave', this.onMouseup.bind(this));
 
       // By default use the host element as trigger element.
       this.setTriggerElement(this._containerElement);
@@ -77,7 +73,7 @@ export class RippleRenderer {
   /**
    * Fades in a ripple at the given coordinates.
    * @param x Coordinate within the element, along the X axis at which to start the ripple.
-   * @param Y Coordinate within the element, along the Y axis at which to start the ripple.
+   * @param y Coordinate within the element, along the Y axis at which to start the ripple.
    * @param config Extra ripple options.
    */
   fadeInRipple(x: number, y: number, config: RippleConfig = {}): RippleRef {
@@ -126,7 +122,7 @@ export class RippleRenderer {
     this.runTimeoutOutsideZone(() => {
       rippleRef.state = RippleState.VISIBLE;
 
-      if (!config.persistent && !this._isPointerDown) {
+      if (!config.persistent && !this._isMousedown) {
         rippleRef.fadeOut();
       }
     }, duration);
@@ -182,14 +178,18 @@ export class RippleRenderer {
   /** Function being called whenever the trigger is being pressed. */
   private onMousedown(event: MouseEvent) {
     if (!this.rippleDisabled) {
-      this._isPointerDown = true;
+      this._isMousedown = true;
       this.fadeInRipple(event.clientX, event.clientY, this.rippleConfig);
     }
   }
 
-  /** Function being called whenever the pointer is being released. */
-  private onPointerUp() {
-    this._isPointerDown = false;
+  /** Function being called whenever the trigger is being released. */
+  private onMouseup() {
+    if (!this._isMousedown) {
+      return;
+    }
+
+    this._isMousedown = false;
 
     // Fade-out all ripples that are completely visible and not persistent.
     this._activeRipples.forEach(ripple => {
@@ -199,22 +199,6 @@ export class RippleRenderer {
     });
   }
 
-  /** Function being called whenever the pointer leaves the trigger. */
-  private onPointerLeave() {
-    if (this._isPointerDown) {
-      this.onPointerUp();
-    }
-  }
-
-  /** Function being called whenever the trigger is being touched. */
-  private onTouchstart(event: TouchEvent) {
-    if (!this.rippleDisabled) {
-      const {clientX, clientY} = event.touches[0];
-      this._isPointerDown = true;
-      this.fadeInRipple(clientX, clientY, this.rippleConfig);
-    }
-  }
-
   /** Runs a timeout outside of the Angular zone to avoid triggering the change detection. */
   private runTimeoutOutsideZone(fn: Function, delay = 0) {
     this._ngZone.runOutsideAngular(() => setTimeout(fn, delay));
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index 071973d03d76..709569d927b1 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -1,7 +1,7 @@
 import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing';
+import {dispatchMouseEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
   MatRipple, MatRippleModule, MAT_RIPPLE_GLOBAL_OPTIONS, RippleState, RippleGlobalOptions
@@ -104,20 +104,6 @@ describe('MatRipple', () => {
       expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(2);
     });
 
-    it('should launch ripples on touchstart', fakeAsync(() => {
-      dispatchTouchEvent(rippleTarget, 'touchstart');
-      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
-
-      tick(RIPPLE_FADE_IN_DURATION);
-      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
-
-      dispatchTouchEvent(rippleTarget, 'touchend');
-
-      tick(RIPPLE_FADE_OUT_DURATION);
-
-      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
-    }));
-
     it('removes ripple after timeout', fakeAsync(() => {
       dispatchMouseEvent(rippleTarget, 'mousedown');
       dispatchMouseEvent(rippleTarget, 'mouseup');

From fa441bc3d64bfe4ece5bc41347f17b86c459f47a Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 6 Oct 2017 22:27:06 +0200
Subject: [PATCH 279/575] fix: missing exportAs names (#7554)

---
 src/lib/slide-toggle/slide-toggle.ts | 1 +
 src/lib/sort/sort-header.ts          | 1 +
 src/lib/sort/sort.ts                 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index a2688a3b1320..ef3d48ec991a 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -68,6 +68,7 @@ export const _MatSlideToggleMixinBase =
 @Component({
   moduleId: module.id,
   selector: 'mat-slide-toggle',
+  exportAs: 'matSlideToggle',
   host: {
     'class': 'mat-slide-toggle',
     '[id]': 'id',
diff --git a/src/lib/sort/sort-header.ts b/src/lib/sort/sort-header.ts
index 16034b8647f9..67e395b3906e 100644
--- a/src/lib/sort/sort-header.ts
+++ b/src/lib/sort/sort-header.ts
@@ -46,6 +46,7 @@ const SORT_ANIMATION_TRANSITION =
 @Component({
   moduleId: module.id,
   selector: '[mat-sort-header]',
+  exportAs: 'matSortHeader',
   templateUrl: 'sort-header.html',
   styleUrls: ['sort-header.css'],
   host: {
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index 25e08089dc47..59cfb57937b4 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -29,6 +29,7 @@ export interface Sort {
 /** Container for MatSortables to manage the sort state and provide default sort parameters. */
 @Directive({
   selector: '[matSort]',
+  exportAs: 'matSort',
 })
 export class MatSort {
   /** Collection of all registered sortables that this directive manages. */

From 4321f322c6146a777f17471fe9fa8dec49aa18c4 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 6 Oct 2017 17:25:36 -0400
Subject: [PATCH 280/575] fix(overlay): import BidiModule in OverlayModule
 (#7566)

---
 src/cdk/overlay/overlay-module.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cdk/overlay/overlay-module.ts b/src/cdk/overlay/overlay-module.ts
index 22421a0138d3..cd45630228c1 100644
--- a/src/cdk/overlay/overlay-module.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -6,17 +6,18 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule, Provider} from '@angular/core';
+import {BidiModule} from '@angular/cdk/bidi';
 import {PortalModule} from '@angular/cdk/portal';
-import {Overlay} from './overlay';
 import {ScrollDispatchModule, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
+import {NgModule, Provider} from '@angular/core';
+import {Overlay} from './overlay';
+import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
 import {
   ConnectedOverlayDirective,
   MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
   OverlayOrigin,
 } from './overlay-directives';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
-import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
 import {ScrollStrategyOptions} from './scroll/scroll-strategy-options';
 
 export const OVERLAY_PROVIDERS: Provider[] = [
@@ -28,7 +29,7 @@ export const OVERLAY_PROVIDERS: Provider[] = [
 ];
 
 @NgModule({
-  imports: [PortalModule, ScrollDispatchModule],
+  imports: [BidiModule, PortalModule, ScrollDispatchModule],
   exports: [ConnectedOverlayDirective, OverlayOrigin, ScrollDispatchModule],
   declarations: [ConnectedOverlayDirective, OverlayOrigin],
   providers: [OVERLAY_PROVIDERS, ScrollStrategyOptions],

From 4d97271786855598cfd18921641d5ffaafa079d8 Mon Sep 17 00:00:00 2001
From: Christian Grail <cgrail@users.noreply.github.com>
Date: Sat, 7 Oct 2017 00:10:27 +0200
Subject: [PATCH 281/575] highlight alternate angular material/cdk install
 (#7552)

---
 guides/getting-started.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guides/getting-started.md b/guides/getting-started.md
index 21d9d8172e97..677b210b2355 100644
--- a/guides/getting-started.md
+++ b/guides/getting-started.md
@@ -9,6 +9,8 @@ For existing apps, follow these steps to begin using Angular Material.
 npm install --save @angular/material @angular/cdk
 ```
 
+#### Alternative: Snapshot Build
+
 A snapshot build with the latest changes from master is also available. Note that this snapshot
 build should not be considered stable and may break between releases.
 

From bb424e2f059aea3f9722527a22a0987818413006 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 9 Oct 2017 15:47:05 -0700
Subject: [PATCH 282/575] fix(table): cell content should not stretch width
 (#7666)

---
 src/lib/table/table.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/table/table.scss b/src/lib/table/table.scss
index 88980592fded..661542ddec57 100644
--- a/src/lib/table/table.scss
+++ b/src/lib/table/table.scss
@@ -16,4 +16,6 @@ $mat-row-horizontal-padding: 24px;
 
 .mat-cell, .mat-header-cell {
   flex: 1;
+  overflow: hidden;
+  word-wrap: break-word;
 }

From dc76c097830eec9aa16cb00812dd6fe4a8282ccd Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 9 Oct 2017 15:47:13 -0700
Subject: [PATCH 283/575] fix(chip-list): use role = listbox only if chip list
 is not empty (#7664)

---
 src/lib/chips/chip-list.spec.ts | 13 +++++++++++++
 src/lib/chips/chip-list.ts      |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index fd8ba8bda5c2..25a0b60f2bef 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -68,6 +68,8 @@ describe('MatChipList', () => {
       beforeEach(async(() => {
         fixture = TestBed.createComponent(SelectedChipList);
         fixture.detectChanges();
+        chipListDebugElement = fixture.debugElement.query(By.directive(MatChipList));
+        chipListNativeElement = chipListDebugElement.nativeElement;
       }));
 
       it('should not override chips selected', () => {
@@ -77,6 +79,17 @@ describe('MatChipList', () => {
         expect(instanceChips[1].selected).toBe(false, 'Expected second option to be not selected.');
         expect(instanceChips[2].selected).toBe(true, 'Expected third option to be selected.');
       });
+
+      it('should have role listbox', () => {
+        expect(chipListNativeElement.getAttribute('role')).toBe('listbox');
+      });
+
+      it('should not have role when empty', () => {
+        fixture.componentInstance.foods = [];
+        fixture.detectChanges();
+
+        expect(chipListNativeElement.getAttribute('role')).toBeNull('Expect no role attribute');
+      });
     });
 
     describe('focus behaviors', () => {
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 5195bba0badd..f419823e28f6 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -63,10 +63,10 @@ export class MatChipListChange {
     '[attr.aria-disabled]': 'disabled.toString()',
     '[attr.aria-invalid]': 'errorState',
     '[attr.aria-multiselectable]': 'multiple',
+    '[attr.role]': 'role',
     '[class.mat-chip-list-disabled]': 'disabled',
     '[class.mat-chip-list-invalid]': 'errorState',
     '[class.mat-chip-list-required]': 'required',
-    'role': 'listbox',
     '[attr.aria-orientation]': 'ariaOrientation',
     'class': 'mat-chip-list',
     '(focus)': 'focus()',
@@ -170,6 +170,10 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
     return this.multiple ? this._selectionModel.selected : this._selectionModel.selected[0];
   }
 
+  get role(): string|null {
+    return this.empty ? null : 'listbox';
+  }
+
   /** Whether the user should be allowed to select multiple chips. */
   @Input()
   get multiple(): boolean { return this._multiple; }

From d2f41a4da1faf3c8abcf076676347b5e1e044fb9 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:47:21 +0200
Subject: [PATCH 284/575] fix(select): errors not shown on submit (#7640)

Fixes `mat-select` error messages not being shown when the parent form is submitted.

Fixes #7634.
---
 src/lib/select/select.spec.ts | 13 +++++++++++++
 src/lib/select/select.ts      | 35 ++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 27c37c045198..e75128ab82c8 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -2947,6 +2947,17 @@ describe('MatSelect', () => {
           .toBe('true', 'Expected aria-invalid to be set to true.');
     });
 
+    it('should render the error messages when the parent form is submitted', () => {
+      const debugEl = fixture.debugElement.nativeElement;
+
+      expect(debugEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error messages');
+
+      dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
+      fixture.detectChanges();
+
+      expect(debugEl.querySelectorAll('mat-error').length).toBe(1, 'Expected one error message');
+    });
+
     it('should be able to override the error matching behavior via an @Input', () => {
       fixture.destroy();
 
@@ -3652,6 +3663,8 @@ class InvalidSelectInForm {
           <mat-option value="steak-0">Steak</mat-option>
           <mat-option value="pizza-1">Pizza</mat-option>
         </mat-select>
+
+        <mat-error>This field is required</mat-error>
       </mat-form-field>
     </form>
   `
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 95dd9e61ef81..468f84d85765 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -44,6 +44,7 @@ import {
   Self,
   ViewChild,
   ViewEncapsulation,
+  DoCheck,
 } from '@angular/core';
 import {
   ControlValueAccessor,
@@ -188,7 +189,7 @@ export class MatSelectTrigger {}
   providers: [{provide: MatFormFieldControl, useExisting: MatSelect}],
 })
 export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
-    ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any> {
+    DoCheck, ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any> {
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
@@ -458,6 +459,12 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     });
   }
 
+  ngDoCheck() {
+    if (this.ngControl) {
+      this._updateErrorState();
+    }
+  }
+
   ngOnDestroy() {
     this._dropSubscriptions();
     this._changeSubscription.unsubscribe();
@@ -690,13 +697,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   }
 
   /** Whether the select is in an error state. */
-  get errorState(): boolean {
-    const parent = this._parentFormGroup || this._parentForm;
-    const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
-    const control = this.ngControl ? this.ngControl.control as FormControl : null;
-
-    return matcher.isErrorState(control, parent);
-  }
+  errorState: boolean;
 
   private _initializeSelection(): void {
     // Defer setting the value in order to avoid the "Expression
@@ -1200,6 +1201,20 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
   }
 
+  /** Updates the select's error state. Only relevant when used with @angular/forms. */
+  private _updateErrorState() {
+    const oldState = this.errorState;
+    const parent = this._parentFormGroup || this._parentForm;
+    const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
+    const control = this.ngControl ? this.ngControl.control as FormControl : null;
+    const newState = matcher.isErrorState(control, parent);
+
+    if (newState !== oldState) {
+      this.errorState = newState;
+      this.stateChanges.next();
+    }
+  }
+
   // Implemented as part of MatFormFieldControl.
   setDescribedByIds(ids: string[]) {
     this._ariaDescribedby = ids.join(' ');
@@ -1212,5 +1227,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   }
 
   // Implemented as part of MatFormFieldControl.
-  get shouldPlaceholderFloat(): boolean { return this._panelOpen || !this.empty; }
+  get shouldPlaceholderFloat(): boolean {
+    return this._panelOpen || !this.empty;
+  }
 }

From f7a12b62bb42c46336713d44e5999b8402e46478 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:47:41 +0200
Subject: [PATCH 285/575] fix(focus-trap): server-side rendering error (#7635)

Fixes a couple of errors in the focus trap during server-side rendering. They manifested when there's a sidenav that is open by default.

Fixes #7633.
---
 src/cdk/a11y/focus-trap.ts                       | 8 ++++++++
 src/cdk/a11y/interactivity-checker.ts            | 3 ++-
 src/universal-app/kitchen-sink/kitchen-sink.html | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index 45fe47f82f37..c01eff86098a 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -145,6 +145,10 @@ export class FocusTrap {
    * @returns The boundary element.
    */
   private _getRegionBoundary(bound: 'start' | 'end'): HTMLElement | null {
+    if (!this._platform.isBrowser) {
+      return null;
+    }
+
     // Contains the deprecated version of selector, for temporary backwards comparability.
     let markers = this._element.querySelectorAll(`[cdk-focus-region-${bound}], ` +
                                                  `[cdk-focus-${bound}]`) as NodeListOf<HTMLElement>;
@@ -168,6 +172,10 @@ export class FocusTrap {
    * @returns Returns whether focus was moved successfuly.
    */
   focusInitialElement(): boolean {
+    if (!this._platform.isBrowser) {
+      return false;
+    }
+
     const redirectToElement = this._element.querySelector('[cdk-focus-initial]') as HTMLElement;
 
     if (redirectToElement) {
diff --git a/src/cdk/a11y/interactivity-checker.ts b/src/cdk/a11y/interactivity-checker.ts
index 79474eaad996..7d092c9f1fad 100644
--- a/src/cdk/a11y/interactivity-checker.ts
+++ b/src/cdk/a11y/interactivity-checker.ts
@@ -148,7 +148,8 @@ export class InteractivityChecker {
 function hasGeometry(element: HTMLElement): boolean {
   // Use logic from jQuery to check for an invisible element.
   // See https://github.com/jquery/jquery/blob/master/src/css/hiddenVisibleSelectors.js#L12
-  return !!(element.offsetWidth || element.offsetHeight || element.getClientRects().length);
+  return !!(element.offsetWidth || element.offsetHeight ||
+      (typeof element.getClientRects === 'function' && element.getClientRects().length));
 }
 
 /** Gets whether an element's  */
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 120ca00242d8..6330e55cfc8d 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -173,8 +173,9 @@ <h2>Select</h2>
 
 <h2>Sidenav</h2>
 <mat-sidenav-container>
-  <mat-sidenav>On the side</mat-sidenav>
+  <mat-sidenav opened>On the side</mat-sidenav>
   Main content
+  <button>Click me</button>
 </mat-sidenav-container>
 
 <h2>Slide-toggle</h2>

From 717f2523ded31759fa5f8aa8b123fd11f0b2bbe4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:47:48 +0200
Subject: [PATCH 286/575] fix(select): not scrolling active option into view
 when typing (#7620)

* Fixes an issue that caused the active option not to be scrolled into view if it was changed via typing. The issue got introduced after we switched to using `aria-activedescendant` for focus management and it happens because the key presses in typeahead mode are debounced in order to allow the user to type in longer words.
* Introduces a `change` subject on the `ListKeyManager`, allowing users to subscribe to changes. This wasn't necessary before, because everything was synchronous, but it is now because of the typeahead.
* Fixes a potential memory leak in the select due to the `onStable` subscription.
* Refactors the selector to remove the need for managing subscriptions manually. Uses a `takeUntil(destroyed)` instead.
---
 src/cdk/a11y/list-key-manager.spec.ts | 13 +++++
 src/cdk/a11y/list-key-manager.ts      |  4 ++
 src/lib/select/select.spec.ts         | 49 +++++++++++++++++-
 src/lib/select/select.ts              | 73 +++++++++++----------------
 4 files changed, 95 insertions(+), 44 deletions(-)

diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index f6ecd96105e1..167ea52ba792 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -242,6 +242,19 @@ describe('Key managers', () => {
         expect(keyManager.activeItemIndex).toBe(0, 'Expected first item to become active.');
       });
 
+      it('should emit an event whenever the active item changes', () => {
+        const spy = jasmine.createSpy('change spy');
+        const subscription = keyManager.change.subscribe(spy);
+
+        keyManager.onKeydown(fakeKeyEvents.downArrow);
+        expect(spy).toHaveBeenCalledTimes(1);
+
+        keyManager.onKeydown(fakeKeyEvents.upArrow);
+        expect(spy).toHaveBeenCalledTimes(2);
+
+        subscription.unsubscribe();
+      });
+
     });
 
     describe('programmatic focus', () => {
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index 9801635863cc..af8e82711a56 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -42,6 +42,9 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
    */
   tabOut: Subject<void> = new Subject<void>();
 
+  /** Stream that emits whenever the active item of the list manager changes. */
+  change = new Subject<number>();
+
   /**
    * Turns on wrapping mode, which ensures that the active item will wrap to
    * the other end of list when there are no more items in the given direction.
@@ -98,6 +101,7 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
   setActiveItem(index: number): void {
     this._activeItemIndex = index;
     this._activeItem = this._items.toArray()[index];
+    this.change.next(index);
   }
 
   /**
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index e75128ab82c8..aa63c39c2e76 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -3,7 +3,13 @@ import {DOWN_ARROW, END, ENTER, HOME, SPACE, TAB, UP_ARROW} from '@angular/cdk/k
 import {OverlayContainer} from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchFakeEvent, dispatchKeyboardEvent, wrappedErrorMessage} from '@angular/cdk/testing';
+import {
+  dispatchFakeEvent,
+  dispatchEvent,
+  createKeyboardEvent,
+  dispatchKeyboardEvent,
+  wrappedErrorMessage,
+} from '@angular/cdk/testing';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -3158,6 +3164,47 @@ describe('MatSelect', () => {
       // <(option index + group labels) * height> - <panel height> = (9 + 3) * 48 - 256 = 320
       expect(panel.scrollTop).toBe(320, 'Expected scroll to be at the 9th option.');
     }));
+
+    it('should scroll top the top when pressing HOME', fakeAsync(() => {
+      for (let i = 0; i < 20; i++) {
+        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        tick();
+        fixture.detectChanges();
+      }
+
+      expect(panel.scrollTop).toBeGreaterThan(0, 'Expected panel to be scrolled down.');
+
+      dispatchKeyboardEvent(host, 'keydown', HOME);
+      tick();
+      fixture.detectChanges();
+
+      expect(panel.scrollTop).toBe(0, 'Expected panel to be scrolled to the top');
+    }));
+
+    it('should scroll to the bottom of the panel when pressing END', fakeAsync(() => {
+      dispatchKeyboardEvent(host, 'keydown', END);
+      tick();
+      fixture.detectChanges();
+
+      // <option amount> * <option height> - <panel height> = 30 * 48 - 256 = 1184
+      expect(panel.scrollTop).toBe(1184, 'Expected panel to be scrolled to the bottom');
+    }));
+
+    it('should scroll to the active option when typing', fakeAsync(() => {
+      for (let i = 0; i < 15; i++) {
+        // Press the letter 'o' 15 times since all the options are named 'Option <index>'
+        dispatchEvent(host, createKeyboardEvent('keydown', 79, undefined, 'o'));
+        tick();
+        fixture.detectChanges();
+        tick(200);
+      }
+
+      tick(200);
+
+      // <option index * height> - <panel height> = 16 * 48 - 256 = 512
+      expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
+    }));
+
   });
 });
 
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 468f84d85765..8dfbe825b4d9 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
   ViewportRuler,
 } from '@angular/cdk/overlay';
-import {filter, first, startWith} from '@angular/cdk/rxjs';
+import {filter, first, startWith, takeUntil, RxChain} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   Attribute,
@@ -67,7 +67,6 @@ import {MatFormField, MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
-import {Subscription} from 'rxjs/Subscription';
 import {fadeInContent, transformPanel} from './select-animations';
 import {
   getMatSelectDynamicMultipleError,
@@ -193,15 +192,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
-  /** Subscriptions to option events. */
-  private _optionSubscription = Subscription.EMPTY;
-
-  /** Subscription to changes in the option list. */
-  private _changeSubscription = Subscription.EMPTY;
-
-  /** Subscription to tab events while overlay is focused. */
-  private _tabSubscription = Subscription.EMPTY;
-
   /** Whether filling out the select is required in the form.  */
   private _required: boolean = false;
 
@@ -220,6 +210,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   /** Unique id for this input. */
   private _uid = `mat-select-${nextUniqueId++}`;
 
+  /** Emits whenever the component is destroyed. */
+  private _destroy = new Subject<void>();
+
   /** The last measured value for the trigger's client bounding rect. */
   _triggerRect: ClientRect;
 
@@ -453,10 +446,13 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   ngAfterContentInit() {
     this._initKeyManager();
 
-    this._changeSubscription = startWith.call(this.options.changes, null).subscribe(() => {
-      this._resetOptions();
-      this._initializeSelection();
-    });
+    RxChain.from(this.options.changes)
+      .call(startWith, null)
+      .call(takeUntil, this._destroy)
+      .subscribe(() => {
+        this._resetOptions();
+        this._initializeSelection();
+      });
   }
 
   ngDoCheck() {
@@ -466,9 +462,8 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   }
 
   ngOnDestroy() {
-    this._dropSubscriptions();
-    this._changeSubscription.unsubscribe();
-    this._tabSubscription.unsubscribe();
+    this._destroy.next();
+    this._destroy.complete();
   }
 
   /** Toggles the overlay panel open or closed. */
@@ -493,7 +488,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._changeDetectorRef.markForCheck();
 
     // Set the font size on the panel element once it exists.
-    first.call(this._ngZone.onStable).subscribe(() => {
+    first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
       if (this._triggerFontSize && this.overlayDir.overlayRef &&
           this.overlayDir.overlayRef.overlayElement) {
         this.overlayDir.overlayRef.overlayElement.style.fontSize = `${this._triggerFontSize}px`;
@@ -621,13 +616,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
       this._keyManager.activeItem._selectViaInteraction();
     } else {
       this._keyManager.onKeydown(event);
-
-      // TODO(crisbeto): get rid of the Promise.resolve when #6441 gets in.
-      Promise.resolve().then(() => {
-        if (this.panelOpen) {
-          this._scrollActiveOptionIntoView();
-        }
-      });
     }
   }
 
@@ -781,28 +769,32 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   /** Sets up a key manager to listen to keyboard events on the overlay panel. */
   private _initKeyManager() {
     this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withTypeAhead();
-    this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close());
+
+    takeUntil.call(this._keyManager.tabOut, this._destroy)
+      .subscribe(() => this.close());
+
+    RxChain.from(this._keyManager.change)
+      .call(takeUntil, this._destroy)
+      .call(filter, () => this._panelOpen && !!this.panel)
+      .subscribe(() => this._scrollActiveOptionIntoView());
   }
 
   /** Drops current option subscriptions and IDs and resets from scratch. */
   private _resetOptions(): void {
-    this._dropSubscriptions();
-    this._listenToOptions();
-    this._setOptionIds();
-    this._setOptionMultiple();
-    this._setOptionDisableRipple();
-  }
-
-  /** Listens to user-generated selection events on each option. */
-  private _listenToOptions(): void {
-    this._optionSubscription = filter.call(this.optionSelectionChanges,
-      event => event.isUserInput).subscribe(event => {
+    RxChain.from(this.optionSelectionChanges)
+      .call(takeUntil, merge(this._destroy, this.options.changes))
+      .call(filter, event => event.isUserInput)
+      .subscribe(event => {
         this._onSelect(event.source);
 
         if (!this.multiple) {
           this.close();
         }
       });
+
+    this._setOptionIds();
+    this._setOptionMultiple();
+    this._setOptionDisableRipple();
   }
 
   /** Invoked when an option is clicked. */
@@ -848,11 +840,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     }
   }
 
-  /** Unsubscribes from all option subscriptions. */
-  private _dropSubscriptions(): void {
-    this._optionSubscription.unsubscribe();
-  }
-
   /** Emits change event to set the model value. */
   private _propagateChanges(fallbackValue?: any): void {
     let valueToEmit: any = null;

From c12e4b59a4e9e5a5139cef3e3607fad1aa8d5489 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 9 Oct 2017 15:48:28 -0700
Subject: [PATCH 287/575] fix(paginator): fix select baseline; support mobile
 (#7610)

* fix(paginator): fix select baseline; support mobile

* use margin variable

* Update paginator.html
---
 src/lib/paginator/paginator.html | 82 +++++++++++++++++---------------
 src/lib/paginator/paginator.scss | 20 ++++++--
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/src/lib/paginator/paginator.html b/src/lib/paginator/paginator.html
index c8b207b4c426..eac222963d0e 100644
--- a/src/lib/paginator/paginator.html
+++ b/src/lib/paginator/paginator.html
@@ -1,43 +1,47 @@
-<div class="mat-paginator-page-size">
-  <div class="mat-paginator-page-size-label">
-    {{_intl.itemsPerPageLabel}}
-  </div>
+<div class="mat-paginator-container">
+  <div class="mat-paginator-page-size">
+    <div class="mat-paginator-page-size-label">
+      {{_intl.itemsPerPageLabel}}
+    </div>
 
-  <mat-form-field
-    *ngIf="_displayedPageSizeOptions.length > 1"
-    class="mat-paginator-page-size-select">
-    <mat-select
-      [value]="pageSize"
-      [aria-label]="_intl.itemsPerPageLabel"
-      (change)="_changePageSize($event.value)">
-      <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
-        {{pageSizeOption}}
-      </mat-option>
-    </mat-select>
-  </mat-form-field>
+    <mat-form-field
+      *ngIf="_displayedPageSizeOptions.length > 1"
+      class="mat-paginator-page-size-select">
+      <mat-select
+        [value]="pageSize"
+        [aria-label]="_intl.itemsPerPageLabel"
+        (change)="_changePageSize($event.value)">
+        <mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
+          {{pageSizeOption}}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
 
-  <div *ngIf="_displayedPageSizeOptions.length <= 1">{{pageSize}}</div>
-</div>
+    <div *ngIf="_displayedPageSizeOptions.length <= 1">{{pageSize}}</div>
+  </div>
 
-<div class="mat-paginator-range-label">
-  {{_intl.getRangeLabel(pageIndex, pageSize, length)}}
-</div>
+  <div class="mat-paginator-range-actions">
+    <div class="mat-paginator-range-label">
+      {{_intl.getRangeLabel(pageIndex, pageSize, length)}}
+    </div>
 
-<button mat-icon-button type="button"
-        class="mat-paginator-navigation-previous"
-        (click)="previousPage()"
-        [attr.aria-label]="_intl.previousPageLabel"
-        [matTooltip]="_intl.previousPageLabel"
-        [matTooltipPosition]="'above'"
-        [disabled]="!hasPreviousPage()">
-  <div class="mat-paginator-increment"></div>
-</button>
-<button mat-icon-button type="button"
-        class="mat-paginator-navigation-next"
-        (click)="nextPage()"
-        [attr.aria-label]="_intl.nextPageLabel"
-        [matTooltip]="_intl.nextPageLabel"
-        [matTooltipPosition]="'above'"
-        [disabled]="!hasNextPage()">
-  <div class="mat-paginator-decrement"></div>
-</button>
+    <button mat-icon-button type="button"
+            class="mat-paginator-navigation-previous"
+            (click)="previousPage()"
+            [attr.aria-label]="_intl.previousPageLabel"
+            [matTooltip]="_intl.previousPageLabel"
+            [matTooltipPosition]="'above'"
+            [disabled]="!hasPreviousPage()">
+      <div class="mat-paginator-increment"></div>
+    </button>
+    <button mat-icon-button type="button"
+            class="mat-paginator-navigation-next"
+            (click)="nextPage()"
+            [attr.aria-label]="_intl.nextPageLabel"
+            [matTooltip]="_intl.nextPageLabel"
+            [matTooltipPosition]="'above'"
+            [disabled]="!hasNextPage()">
+      <div class="mat-paginator-decrement"></div>
+    </button>
+  </div>
+</div>
diff --git a/src/lib/paginator/paginator.scss b/src/lib/paginator/paginator.scss
index 4562996aa8ea..61d0bc760d4a 100644
--- a/src/lib/paginator/paginator.scss
+++ b/src/lib/paginator/paginator.scss
@@ -1,11 +1,15 @@
 $mat-paginator-height: 56px;
 $mat-paginator-padding: 0 8px;
 
+$mat-paginator-page-size-margin-right: 8px;
+
 $mat-paginator-items-per-page-label-margin: 0 4px;
-$mat-paginator-selector-margin: 0 4px;
+$mat-paginator-selector-margin: 6px 4px 0 4px;
 $mat-paginator-selector-trigger-min-width: 56px;
 
-$mat-paginator-range-label-margin: 0 32px;
+$mat-paginator-range-actions-min-height: 48px;
+
+$mat-paginator-range-label-margin: 0 32px 0 24px;
 
 $mat-paginator-button-margin: 8px;
 $mat-paginator-button-icon-height: 8px;
@@ -14,17 +18,19 @@ $mat-paginator-button-icon-width: 8px;
 $mat-paginator-button-decrement-icon-margin: 12px;
 $mat-paginator-button-increment-icon-margin: 16px;
 
-.mat-paginator {
+.mat-paginator-container {
   display: flex;
   align-items: center;
   justify-content: flex-end;
   min-height: $mat-paginator-height;
   padding: $mat-paginator-padding;
+  flex-wrap: wrap-reverse;
 }
 
 .mat-paginator-page-size {
   display: flex;
-  align-items: center;
+  align-items: baseline;
+  margin-right: $mat-paginator-page-size-margin-right;
 }
 
 .mat-paginator-page-size-label {
@@ -76,3 +82,9 @@ $mat-paginator-button-increment-icon-margin: 16px;
     margin-right: $mat-paginator-button-increment-icon-margin;
   }
 }
+
+.mat-paginator-range-actions {
+  display: flex;
+  align-items: center;
+  min-height: $mat-paginator-range-actions-min-height;
+}

From d55aa0c7a05891ad20f3f2c75673450d70c35b39 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:48:38 +0200
Subject: [PATCH 288/575] fix(select): unable to preselect array value in
 single selection mode (#7603)

Fixes not being able to preselect an array if a select is in single selection mode due to an assumption that an array value means that we're in mutliple selection mode.

Fixes #7584.
---
 src/lib/select/select.spec.ts | 39 +++++++++++++++++++++++++++++++++++
 src/lib/select/select.ts      | 21 +++++++++----------
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index aa63c39c2e76..cc53f2eeb005 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -105,6 +105,7 @@ describe('MatSelect', () => {
         SelectInsideFormGroup,
         NgModelCompareWithSelect,
         CustomErrorBehaviorSelect,
+        SingleSelectWithPreselectedArrayValues,
       ],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
@@ -1010,6 +1011,19 @@ describe('MatSelect', () => {
         });
       });
     }));
+
+    it('should be able to preselect an array value in single-selection mode', fakeAsync(() => {
+      const fixture = TestBed.createComponent(SingleSelectWithPreselectedArrayValues);
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+
+      expect(trigger.textContent).toContain('Pizza');
+      expect(fixture.componentInstance.options.toArray()[1].selected).toBe(true);
+    }));
+
   });
 
   describe('misc forms', () => {
@@ -3872,3 +3886,28 @@ class CustomErrorBehaviorSelect {
   ];
   errorStateMatcher: ErrorStateMatcher;
 }
+
+
+@Component({
+  template: `
+    <mat-form-field>
+      <mat-select placeholder="Food" [(ngModel)]="selectedFoods">
+        <mat-option *ngFor="let food of foods"
+                    [value]="food.value">{{ food.viewValue }}
+        </mat-option>
+      </mat-select>
+    </mat-form-field>
+  `
+})
+class SingleSelectWithPreselectedArrayValues {
+  foods: any[] = [
+    { value: ['steak-0', 'steak-1'], viewValue: 'Steak' },
+    { value: ['pizza-1', 'pizza-2'], viewValue: 'Pizza' },
+    { value: ['tacos-2', 'tacos-3'], viewValue: 'Tacos' },
+  ];
+
+  selectedFoods = this.foods[1].value;
+
+  @ViewChild(MatSelect) select: MatSelect;
+  @ViewChildren(MatOption) options: QueryList<MatOption>;
+}
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8dfbe825b4d9..210c386ac319 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -700,18 +700,17 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * found with the designated value, the select trigger is cleared.
    */
   private _setSelectionByValue(value: any | any[], isUserInput = false): void {
-    const isArray = Array.isArray(value);
-
-    if (this.multiple && value && !isArray) {
-      throw getMatSelectNonArrayValueError();
-    }
-
-    this._clearSelection();
+    if (this.multiple && value) {
+      if (!Array.isArray(value)) {
+        throw getMatSelectNonArrayValueError();
+      }
 
-    if (isArray) {
+      this._clearSelection();
       value.forEach((currentValue: any) => this._selectValue(currentValue, isUserInput));
       this._sortValues();
     } else {
+      this._clearSelection();
+
       const correspondingOption = this._selectValue(value, isUserInput);
 
       // Shift focus to the active item. Note that we shouldn't do this in multiple
@@ -844,10 +843,10 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   private _propagateChanges(fallbackValue?: any): void {
     let valueToEmit: any = null;
 
-    if (Array.isArray(this.selected)) {
-      valueToEmit = this.selected.map(option => option.value);
+    if (this.multiple) {
+      valueToEmit = (this.selected as MatOption[]).map(option => option.value);
     } else {
-      valueToEmit = this.selected ? this.selected.value : fallbackValue;
+      valueToEmit = this.selected ? (this.selected as MatOption).value : fallbackValue;
     }
 
     this._value = valueToEmit;

From 6efb777768cd48c9d12bbf03ba7234ab41dadabb Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 10 Oct 2017 00:48:46 +0200
Subject: [PATCH 289/575] chore(selection-list): superfluous disabled check
 (#7594)

Removes the unnecessary `disabled` check in the `ngAfterContentInit` lifecycle hook of the selection list. The `selectionList.disabled` state is being respected by the getter.
---
 src/lib/list/selection-list.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index ea4df023e9af..4e68a34d5c0d 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -142,10 +142,6 @@ export class MatListOption extends _MatListOptionMixinBase
 
   ngAfterContentInit() {
     this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
-
-    if (this.selectionList.disabled) {
-      this.disabled = true;
-    }
   }
 
   ngOnDestroy(): void {

From 147ae46c794bd0cd528dee75a33efc690b3ed7d8 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 9 Oct 2017 15:49:06 -0700
Subject: [PATCH 290/575] fix(sort): fix arrow on width-constrained headers
 (#7569)

---
 src/lib/sort/sort-header.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/sort/sort-header.scss b/src/lib/sort/sort-header.scss
index 25310804a255..088a5429f68e 100644
--- a/src/lib/sort/sort-header.scss
+++ b/src/lib/sort/sort-header.scss
@@ -29,6 +29,7 @@ $mat-sort-header-arrow-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1);
 .mat-sort-header-arrow {
   height: $mat-sort-header-arrow-container-size;
   width: $mat-sort-header-arrow-container-size;
+  min-width: $mat-sort-header-arrow-container-size;
   margin: 0 0 0 $mat-sort-header-arrow-margin;
   position: relative;
   display: flex;

From 5cffd7c0e161f75e943054d0ea84e85cd6c4a70e Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 9 Oct 2017 15:49:17 -0700
Subject: [PATCH 291/575] fix(form-field): fix underline at different zoom
 levels (#7567)

---
 src/lib/form-field/form-field.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index a3e5bbf295d2..f91817b6c324 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -145,6 +145,8 @@ $mat-form-field-underline-height: 1px !default;
   position: absolute;
   height: $mat-form-field-underline-height;
   width: 100%;
+  // Prevents underline from disappearing at lower zoom levels.
+  transform: perspective(1px);
 
   &.mat-disabled {
     background-position: 0;

From d6698e19528f1e0cb643ccf73d9a47c4ce7f842b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:49:25 +0200
Subject: [PATCH 292/575] perf: remove persistent global scroll listener
 (#7560)

* Removes the global scroll listener from the viewport ruler, which was being used to invalidate the scroll position cache. Caching the scroll position is pointless since it'll be invalidated very frequently. Since most Material components depend on the `ViewportRuler` one way or another, it meant that there was a good chance that the scroll listener would stay around forever.
* Fixes an issue that caused the scroll dispatcher not to remove its global scroll listener, if there are any scrollables on the page, even though nothing was subscribed to it.

Fixes #6882.
---
 src/cdk/scrolling/scroll-dispatcher.spec.ts | 20 ++++++++++++++++++++
 src/cdk/scrolling/scroll-dispatcher.ts      |  2 +-
 src/cdk/scrolling/viewport-ruler.ts         | 20 ++++++++------------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index e16d3278afe7..7e8fc9d1a9d0 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -143,6 +143,26 @@ describe('Scroll Dispatcher', () => {
           'Expected global listeners to have been removed after the subscription has stopped.');
     });
 
+    it('should remove global listeners on unsubscribe, despite any other live scrollables', () => {
+      const fixture = TestBed.createComponent(NestedScrollingComponent);
+      fixture.detectChanges();
+
+      expect(scroll._globalSubscription).toBeNull('Expected no global listeners on init.');
+      expect(scroll.scrollableReferences.size).toBe(4, 'Expected multiple scrollables');
+
+      const subscription = scroll.scrolled(0).subscribe(() => {});
+
+      expect(scroll._globalSubscription).toBeTruthy(
+          'Expected global listeners after a subscription has been added.');
+
+      subscription.unsubscribe();
+
+      expect(scroll._globalSubscription).toBeNull(
+          'Expected global listeners to have been removed after the subscription has stopped.');
+      expect(scroll.scrollableReferences.size)
+          .toBe(4, 'Expected scrollable count to stay the same');
+    });
+
   });
 });
 
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 9060f4569bc9..95d5c3667450 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -89,7 +89,7 @@ export class ScrollDispatcher {
         subscription.unsubscribe();
         this._scrolledCount--;
 
-        if (this._globalSubscription && !this.scrollableReferences.size && !this._scrolledCount) {
+        if (this._globalSubscription && !this._scrolledCount) {
           this._globalSubscription.unsubscribe();
           this._globalSubscription = null;
         }
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index f5d840f4646f..f042899a86e6 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -8,7 +8,6 @@
 
 import {Injectable, Optional, SkipSelf, NgZone, OnDestroy} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {ScrollDispatcher} from './scroll-dispatcher';
 import {Observable} from 'rxjs/Observable';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
@@ -32,21 +31,19 @@ export class ViewportRuler implements OnDestroy {
   /** Stream of viewport change events. */
   private _change: Observable<Event>;
 
-  /** Subscriptions to streams that invalidate the cached viewport dimensions. */
-  private _invalidateCacheSubscription = Subscription.EMPTY;
+  /** Subscription to streams that invalidate the cached viewport dimensions. */
+  private _invalidateCache: Subscription;
 
-  constructor(platform: Platform, ngZone: NgZone, scrollDispatcher: ScrollDispatcher) {
+  constructor(platform: Platform, ngZone: NgZone) {
     this._change = platform.isBrowser ? ngZone.runOutsideAngular(() => {
       return merge<Event>(fromEvent(window, 'resize'), fromEvent(window, 'orientationchange'));
     }) : observableOf();
 
-    // Subscribe to scroll and resize events and update the document rectangle on changes.
-    this._invalidateCacheSubscription = merge(scrollDispatcher.scrolled(0), this.change())
-      .subscribe(() => this._cacheViewportGeometry());
+    this._invalidateCache = this.change().subscribe(() => this._cacheViewportGeometry());
   }
 
   ngOnDestroy() {
-    this._invalidateCacheSubscription.unsubscribe();
+    this._invalidateCache.unsubscribe();
   }
 
   /** Gets a ClientRect for the viewport's bounds. */
@@ -123,15 +120,14 @@ export class ViewportRuler implements OnDestroy {
 /** @docs-private */
 export function VIEWPORT_RULER_PROVIDER_FACTORY(parentRuler: ViewportRuler,
                                                 platform: Platform,
-                                                ngZone: NgZone,
-                                                scrollDispatcher: ScrollDispatcher) {
-  return parentRuler || new ViewportRuler(platform, ngZone, scrollDispatcher);
+                                                ngZone: NgZone) {
+  return parentRuler || new ViewportRuler(platform, ngZone);
 }
 
 /** @docs-private */
 export const VIEWPORT_RULER_PROVIDER = {
   // If there is already a ViewportRuler available, use that. Otherwise, provide a new one.
   provide: ViewportRuler,
-  deps: [[new Optional(), new SkipSelf(), ViewportRuler], Platform, NgZone, ScrollDispatcher],
+  deps: [[new Optional(), new SkipSelf(), ViewportRuler], Platform, NgZone],
   useFactory: VIEWPORT_RULER_PROVIDER_FACTORY
 };

From 57f19cd086bde26724b6430c63baacd1f835380a Mon Sep 17 00:00:00 2001
From: Emilio <emilio-martinez@users.noreply.github.com>
Date: Mon, 9 Oct 2017 15:50:21 -0700
Subject: [PATCH 293/575] feat(dialog): support minWidth, minHeight, maxWidth
 and maxHeight (#7488)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(dialog): support minWidth, minHeight, maxWidth and maxHeight

* Adds Dialog support for `minWidth`, `minHeight`, `maxWidth` and `maxHeight` via config. Mostly delegates to Overlay.
* Moves declared `max-width` on `. mat-dialog-container` stylesheet to be authored via `MatDialogConfig`, providing the same default `80vw` value. Without this change, there would likely be undesired layout results due to different constraints being set on the overlay container vs the nested the dialog container.
* Added note on `minHeight` and `maxHeight` regarding the potential need to also set a `height` due to the rules around computed height resolution (https://www.w3.org/TR/CSS2/visudet.html#min-max-widths).  Any value set on `height` as a default would probably be assuming too much and may have varying results across browsers.

* test(dialog): add tests for minWidth, minHeight, maxWidth and maxHeight

* demo(dialog): add fields for minWidth, minHeight, maxWidth and maxHeight

Not adding `minWidth`, `minHeight`, `maxWidth` and `maxHeight` to `config` to avoid overriding the default value of `maxWidth` particularly—the type checker will require it to be a string. Instead, setting `config` to type `MatDialogConfig` is prefered to appease the type checker since those four properties are optional.

* demo(dialog): address AOT issues

Appeases the AOT type checker for the template by extending `MatDialogConfig` to disallow `position` from being undefined, given that it’s optional. Guards cannot be set on the template because the values are bound to NgModel.

* chore(dialog): address feedback regarding over-verbose comments

* fix(dialog): address feedback to not initialize some dialog config props

* demo(dialog): set init values for minWidth, minHeight, maxWidth and maxHeight

* chore(dialog): allow number|string for min/max widths and heights
---
 src/demo-app/dialog/dialog-demo.html | 18 ++++++++
 src/demo-app/dialog/dialog-demo.ts   |  7 +++-
 src/lib/dialog/dialog-config.ts      | 12 ++++++
 src/lib/dialog/dialog.scss           |  2 -
 src/lib/dialog/dialog.spec.ts        | 63 ++++++++++++++++++++++++++++
 src/lib/dialog/dialog.ts             |  6 ++-
 6 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/src/demo-app/dialog/dialog-demo.html b/src/demo-app/dialog/dialog-demo.html
index ffceaaae13bf..b54508cf30b0 100644
--- a/src/demo-app/dialog/dialog-demo.html
+++ b/src/demo-app/dialog/dialog-demo.html
@@ -23,6 +23,24 @@ <h2>Dialog dimensions</h2>
       </mat-form-field>
     </p>
 
+    <p>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.minWidth" placeholder="Min Width">
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.minHeight" placeholder="Min Height">
+      </mat-form-field>
+    </p>
+
+    <p>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.maxWidth" placeholder="Max Width">
+      </mat-form-field>
+      <mat-form-field>
+        <input matInput [(ngModel)]="config.maxHeight" placeholder="Max Height">
+      </mat-form-field>
+    </p>
+
     <h2>Dialog position</h2>
 
     <p>
diff --git a/src/demo-app/dialog/dialog-demo.ts b/src/demo-app/dialog/dialog-demo.ts
index 87c67b151e18..1895b6e31f48 100644
--- a/src/demo-app/dialog/dialog-demo.ts
+++ b/src/demo-app/dialog/dialog-demo.ts
@@ -1,7 +1,8 @@
 import {Component, Inject, ViewChild, TemplateRef} from '@angular/core';
 import {DOCUMENT} from '@angular/platform-browser';
-import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
+import {MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
 
+const defaultDialogConfig = new MatDialogConfig();
 
 @Component({
   moduleId: module.id,
@@ -21,6 +22,10 @@ export class DialogDemo {
     backdropClass: '',
     width: '',
     height: '',
+    minWidth: '',
+    minHeight: '',
+    maxWidth: defaultDialogConfig.maxWidth,
+    maxHeight: '',
     position: {
       top: '',
       bottom: '',
diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
index 424bec9e84ab..7f6f47d42da4 100644
--- a/src/lib/dialog/dialog-config.ts
+++ b/src/lib/dialog/dialog-config.ts
@@ -57,6 +57,18 @@ export class MatDialogConfig {
   /** Height of the dialog. */
   height?: string = '';
 
+  /** Min-width of the dialog. If a number is provided, pixel units are assumed. */
+  minWidth?: number | string;
+
+  /** Min-height of the dialog. If a number is provided, pixel units are assumed. */
+  minHeight?: number | string;
+
+  /** Max-width of the dialog. If a number is provided, pixel units are assumed. Defaults to 80vw */
+  maxWidth?: number | string = '80vw';
+
+  /** Max-height of the dialog. If a number is provided, pixel units are assumed. */
+  maxHeight?: number | string;
+
   /** Position overrides. */
   position?: DialogPosition;
 
diff --git a/src/lib/dialog/dialog.scss b/src/lib/dialog/dialog.scss
index 2f04aec0b4cb..4a72cc903a01 100644
--- a/src/lib/dialog/dialog.scss
+++ b/src/lib/dialog/dialog.scss
@@ -5,7 +5,6 @@
 
 $mat-dialog-padding: 24px !default;
 $mat-dialog-border-radius: 2px !default;
-$mat-dialog-max-width: 80vw !default;
 $mat-dialog-max-height: 65vh !default;
 $mat-dialog-button-margin: 8px !default;
 
@@ -17,7 +16,6 @@ $mat-dialog-button-margin: 8px !default;
   border-radius: $mat-dialog-border-radius;
   box-sizing: border-box;
   overflow: auto;
-  max-width: $mat-dialog-max-width;
   outline: 0;
 
   // The dialog container should completely fill its parent overlay element.
diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 1ce22f92d319..4d4b0fde7242 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -336,6 +336,69 @@ describe('MatDialog', () => {
     expect(overlayPane.style.height).toBe('100px');
   });
 
+  it('should should override the min-width of the overlay pane', () => {
+    dialog.open(PizzaMsg, {
+      minWidth: '500px'
+    });
+
+    viewContainerFixture.detectChanges();
+
+    let overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(overlayPane.style.minWidth).toBe('500px');
+  });
+
+  it('should should override the max-width of the overlay pane', fakeAsync(() => {
+    let dialogRef = dialog.open(PizzaMsg);
+
+    viewContainerFixture.detectChanges();
+
+    let overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(overlayPane.style.maxWidth).toBe('80vw',
+      'Expected dialog to set a default max-width on overlay pane');
+
+    dialogRef.close();
+
+    tick(500);
+    viewContainerFixture.detectChanges();
+    flushMicrotasks();
+
+    dialogRef = dialog.open(PizzaMsg, {
+      maxWidth: '100px'
+    });
+
+    viewContainerFixture.detectChanges();
+
+    overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(overlayPane.style.maxWidth).toBe('100px');
+  }));
+
+  it('should should override the min-height of the overlay pane', () => {
+    dialog.open(PizzaMsg, {
+      minHeight: '300px'
+    });
+
+    viewContainerFixture.detectChanges();
+
+    let overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(overlayPane.style.minHeight).toBe('300px');
+  });
+
+  it('should should override the max-height of the overlay pane', () => {
+    dialog.open(PizzaMsg, {
+      maxHeight: '100px'
+    });
+
+    viewContainerFixture.detectChanges();
+
+    let overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(overlayPane.style.maxHeight).toBe('100px');
+  });
+
   it('should should override the top offset of the overlay pane', () => {
     dialog.open(PizzaMsg, {
       position: {
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 54d358c8556e..f9a370ea8ff1 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -190,7 +190,11 @@ export class MatDialog {
       scrollStrategy: this._scrollStrategy(),
       panelClass: dialogConfig.panelClass,
       hasBackdrop: dialogConfig.hasBackdrop,
-      direction: dialogConfig.direction
+      direction: dialogConfig.direction,
+      minWidth: dialogConfig.minWidth,
+      minHeight: dialogConfig.minHeight,
+      maxWidth: dialogConfig.maxWidth,
+      maxHeight: dialogConfig.maxHeight
     });
 
     if (dialogConfig.backdropClass) {

From 004e0fef2fe5172b6e6ed2c4d368d21dab051355 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 9 Oct 2017 17:50:30 -0500
Subject: [PATCH 294/575] chore(api): new output api #6677 (#7450)

* chore(api): new output api #6677

* chore(nit): add 2way test and nit spacing
---
 src/lib/sidenav/drawer.spec.ts | 33 ++++++++++++++++--
 src/lib/sidenav/drawer.ts      | 62 +++++++++++++++++++++++++---------
 2 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index ccd132030d2c..b3f941de525a 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -20,6 +20,7 @@ describe('MatDrawer', () => {
         DrawerSetToOpenedTrue,
         DrawerDynamicPosition,
         DrawerWitFocusableElements,
+        DrawerOpenBinding,
       ],
     });
 
@@ -287,6 +288,20 @@ describe('MatDrawer', () => {
 
       expect(() => fixture.detectChanges()).not.toThrow();
     });
+
+    it('should bind 2-way bind on opened property', fakeAsync(() => {
+      const fixture = TestBed.createComponent(DrawerOpenBinding);
+      fixture.detectChanges();
+
+      let drawer: MatDrawer = fixture.debugElement
+          .query(By.directive(MatDrawer)).componentInstance;
+
+      drawer.open();
+      fixture.detectChanges();
+      tick();
+
+      expect(fixture.componentInstance.isOpen).toBe(true);
+    }));
   });
 
   describe('focus trapping behavior', () => {
@@ -474,8 +489,8 @@ class DrawerContainerTwoDrawerTestApp {
   template: `
     <mat-drawer-container (backdropClick)="backdropClicked()">
       <mat-drawer #drawer position="start"
-                 (open)="open()"
-                 (close)="close()">
+                 (opened)="open()"
+                 (closed)="close()">
         <button #drawerButton>Content.</button>
       </mat-drawer>
       <button (click)="drawer.open()" class="open" #openButton></button>
@@ -517,7 +532,7 @@ class DrawerSetToOpenedFalse { }
 @Component({
   template: `
     <mat-drawer-container>
-      <mat-drawer #drawer mode="side" opened="true" (open)="openCallback()">
+      <mat-drawer #drawer mode="side" opened="true" (opened)="openCallback()">
         Closed Drawer.
       </mat-drawer>
     </mat-drawer-container>`,
@@ -526,6 +541,18 @@ class DrawerSetToOpenedTrue {
   openCallback = jasmine.createSpy('open callback');
 }
 
+@Component({
+  template: `
+    <mat-drawer-container>
+      <mat-drawer #drawer mode="side" [(opened)]="isOpen">
+        Closed Drawer.
+      </mat-drawer>
+    </mat-drawer-container>`,
+})
+class DrawerOpenBinding {
+  isOpen = false;
+}
+
 @Component({
   template: `
     <mat-drawer-container>
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 4a82ff1b0d03..9fd9a2b449a7 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -34,7 +34,8 @@ import {
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
-import {RxChain, filter, first, startWith, takeUntil} from '@angular/cdk/rxjs';
+import {Observable} from 'rxjs/Observable';
+import {RxChain, filter, map, first, startWith, takeUntil} from '@angular/cdk/rxjs';
 
 
 /** Throws an exception when two MatDrawer are matching the same position. */
@@ -177,11 +178,38 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   /** Current state of the sidenav animation. */
   _animationState: 'open-instant' | 'open' | 'void' = 'void';
 
-  /** Event emitted when the drawer is fully opened. */
-  @Output('open') onOpen = new EventEmitter<MatDrawerToggleResult | void>();
+  /** Event emitted when the drawer open state is changed. */
+  @Output() openedChange: EventEmitter<boolean> = new EventEmitter<boolean>();
 
-  /** Event emitted when the drawer is fully closed. */
-  @Output('close') onClose = new EventEmitter<MatDrawerToggleResult | void>();
+  /** Event emitted when the drawer has been opened. */
+  @Output('opened')
+  get _openedStream(): Observable<void> {
+    return RxChain.from(this.openedChange)
+        .call(filter, o => o)
+        .call(map, () => {})
+        .result();
+  }
+
+  /** Event emitted when the drawer has been closed. */
+  @Output('closed')
+  get _closedStream(): Observable<void> {
+    return RxChain.from(this.openedChange)
+        .call(filter, o => !o)
+        .call(map, () => {})
+        .result();
+  }
+
+  /**
+   * Event emitted when the drawer is fully opened.
+   * @deprecated Use `openedChange` instead.
+   */
+  @Output('open') onOpen = this._openedStream;
+
+  /**
+   * Event emitted when the drawer is fully closed.
+   * @deprecated Use `openedChange` instead.
+   */
+  @Output('close') onClose = this._closedStream;
 
   /** Event emitted when the drawer's position changes. */
   @Output('positionChanged') onPositionChanged = new EventEmitter<void>();
@@ -203,17 +231,19 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   constructor(private _elementRef: ElementRef,
               private _focusTrapFactory: FocusTrapFactory,
               @Optional() @Inject(DOCUMENT) private _doc: any) {
-    this.onOpen.subscribe(() => {
-      if (this._doc) {
-        this._elementFocusedBeforeDrawerWasOpened = this._doc.activeElement as HTMLElement;
-      }
+    this.openedChange.subscribe((opened: boolean) => {
+      if (opened) {
+        if (this._doc) {
+          this._elementFocusedBeforeDrawerWasOpened = this._doc.activeElement as HTMLElement;
+        }
 
-      if (this._isFocusTrapEnabled && this._focusTrap) {
-        this._focusTrap.focusInitialElementWhenReady();
+        if (this._isFocusTrapEnabled && this._focusTrap) {
+          this._focusTrap.focusInitialElementWhenReady();
+        }
+      } else {
+        this._restoreFocus();
       }
     });
-
-    this.onClose.subscribe(() => this._restoreFocus());
   }
 
   /**
@@ -309,9 +339,9 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     const {fromState, toState} = event;
 
     if (toState.indexOf('open') === 0 && fromState === 'void') {
-      this.onOpen.emit(new MatDrawerToggleResult('open', true));
+      this.openedChange.emit(true);
     } else if (toState === 'void' && fromState.indexOf('open') === 0) {
-      this.onClose.emit(new MatDrawerToggleResult('close', true));
+      this.openedChange.emit(false);
     }
   }
 
@@ -438,7 +468,7 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
       });
 
     if (drawer.mode !== 'side') {
-      takeUntil.call(merge(drawer.onOpen, drawer.onClose), this._drawers.changes).subscribe(() =>
+      takeUntil.call(drawer.openedChange, this._drawers.changes).subscribe(() =>
           this._setContainerClass(drawer.opened));
     }
   }

From 3e3ef2a0c72333ccf250a36715ef1ac9898dbcfc Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Mon, 9 Oct 2017 15:50:41 -0700
Subject: [PATCH 295/575] Disable tabs using changes to response to events
 rather than `pointer-events: none` (#7364)

---
 src/lib/tabs/_tabs-common.scss               |  1 -
 src/lib/tabs/tab-group.html                  |  8 ++++----
 src/lib/tabs/tab-group.ts                    | 16 ++++++++++++++++
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts |  4 +++-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts      |  8 ++++----
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/lib/tabs/_tabs-common.scss b/src/lib/tabs/_tabs-common.scss
index 990d48789162..4d413b67c2cc 100644
--- a/src/lib/tabs/_tabs-common.scss
+++ b/src/lib/tabs/_tabs-common.scss
@@ -24,7 +24,6 @@ $mat-tab-animation-duration: 500ms !default;
 
   &.mat-tab-disabled {
     cursor: default;
-    pointer-events: none;
   }
 }
 
diff --git a/src/lib/tabs/tab-group.html b/src/lib/tabs/tab-group.html
index da2d053b913d..c0c05d8eac9b 100644
--- a/src/lib/tabs/tab-group.html
+++ b/src/lib/tabs/tab-group.html
@@ -6,15 +6,15 @@
   <div class="mat-tab-label" role="tab" matTabLabelWrapper mat-ripple
        *ngFor="let tab of _tabs; let i = index"
        [id]="_getTabLabelId(i)"
-       [tabIndex]="selectedIndex == i ? 0 : -1"
+       [attr.tabIndex]="_getTabIndex(tab, i)"
        [attr.aria-controls]="_getTabContentId(i)"
        [attr.aria-selected]="selectedIndex == i"
        [class.mat-tab-label-active]="selectedIndex == i"
        [disabled]="tab.disabled"
-       [matRippleDisabled]="disableRipple"
-       (click)="tabHeader.focusIndex = selectedIndex = i">
+       [matRippleDisabled]="tab.disabled || disableRipple"
+       (click)="_handleClick(tab, tabHeader, i)">
 
-    <!-- If there is a label template, use it. -->
+       <!-- If there is a label template, use it. -->
     <ng-template [ngIf]="tab.templateLabel">
       <ng-template [cdkPortalHost]="tab.templateLabel"></ng-template>
     </ng-template>
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index 3868f8972323..a41bd2225867 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -26,6 +26,7 @@ import {
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
 import {MatTab} from './tab';
+import {MatTabHeader} from './tab-header';
 import {merge} from 'rxjs/observable/merge';
 import {
   CanColor,
@@ -278,4 +279,19 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
     this._tabBodyWrapperHeight = this._tabBodyWrapper.nativeElement.clientHeight;
     this._renderer.setStyle(this._tabBodyWrapper.nativeElement, 'height', '');
   }
+
+  /** Handle click events, setting new selected index if appropriate. */
+  _handleClick(tab: MatTab, tabHeader: MatTabHeader, idx: number) {
+    if (!tab.disabled) {
+      this.selectedIndex = tabHeader.focusIndex = idx;
+    }
+  }
+
+  /** Retrieves the tabindex for the tab. */
+  _getTabIndex(tab: MatTab, idx: number): number | null {
+    if (tab.disabled) {
+      return null;
+    }
+    return this.selectedIndex === idx ? 0 : -1;
+  }
 }
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index fa0149135546..f0956b4a2a72 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -119,7 +119,9 @@ describe('MatTabNavBar', () => {
       fixture.componentInstance.disabled = true;
       fixture.detectChanges();
 
-      expect(tabLinkElements.every(tabLink => tabLink.tabIndex === -1))
+      expect(tabLinkElements.every(tabLink => {
+        return tabLink.getAttribute('tabIndex') === null;
+      }))
         .toBe(true, 'Expected element to no longer be keyboard focusable if disabled.');
     });
 
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 4196d73fd7ca..fec6c8abdf86 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -183,7 +183,7 @@ export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
   host: {
     'class': 'mat-tab-link',
     '[attr.aria-disabled]': 'disabled.toString()',
-    '[attr.tabindex]': 'tabIndex',
+    '[attr.tabIndex]': 'tabIndex',
     '[class.mat-tab-disabled]': 'disabled',
     '[class.mat-tab-label-active]': 'active',
   }
@@ -209,7 +209,7 @@ export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDi
   }
 
   /** Whether ripples should be disabled or not. */
-  get disableRipple(): boolean { return this._disableRipple; }
+  get disableRipple(): boolean { return this.disabled || this._disableRipple; }
   set disableRipple(value: boolean) {
     this._disableRipple = value;
     this._tabLinkRipple.disabled = this.disableRipple;
@@ -217,8 +217,8 @@ export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDi
   }
 
   /** @docs-private */
-  get tabIndex(): number {
-    return this.disabled ? -1 : 0;
+  get tabIndex(): number | null {
+    return this.disabled ? null : 0;
   }
 
   constructor(private _tabNavBar: MatTabNav,

From 90a55fa3456fd2e69edcd69d3d0892eedc3e3dd3 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:50:52 +0200
Subject: [PATCH 296/575] fix(tooltip): don't open from programmatic focus
 (#7258)

Prevents the tooltip from opening when its trigger is focused programmatically.

Fixes #7245.
---
 src/lib/tooltip/tooltip.spec.ts | 14 ++++++++++++++
 src/lib/tooltip/tooltip.ts      | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 1e27a1432590..61446059f112 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -485,8 +485,22 @@ describe('MatTooltip', () => {
         dispatchKeyboardEvent(buttonElement, 'keydown', ESCAPE);
         fixture.detectChanges();
       }).not.toThrow();
+
+      tick(0);
     }));
 
+    it('should not show the tooltip on progammatic focus', fakeAsync(() => {
+      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+
+      buttonElement.focus();
+      tick(0);
+      fixture.detectChanges();
+      tick(500);
+
+      expect(overlayContainerElement.querySelector('.mat-tooltip')).toBeNull();
+    }));
+
+
   });
 
   describe('fallback positions', () => {
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index b65f5a75c51a..d368952ca511 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -5,9 +5,8 @@
  * 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 {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
-import {AriaDescriber} from '@angular/cdk/a11y';
+import {AriaDescriber, FocusMonitor} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ESCAPE} from '@angular/cdk/keycodes';
@@ -90,8 +89,6 @@ export const MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER = {
   exportAs: 'matTooltip',
   host: {
     '(longpress)': 'show()',
-    '(focus)': 'show()',
-    '(blur)': 'hide(0)',
     '(keydown)': '_handleKeydown($event)',
     '(touchend)': 'hide(' + TOUCHEND_HIDE_DELAY + ')',
   },
@@ -177,6 +174,7 @@ export class MatTooltip implements OnDestroy {
     private _ngZone: NgZone,
     private _platform: Platform,
     private _ariaDescriber: AriaDescriber,
+    private _focusMonitor: FocusMonitor,
     @Inject(MAT_TOOLTIP_SCROLL_STRATEGY) private _scrollStrategy,
     @Optional() private _dir: Directionality) {
 
@@ -188,6 +186,15 @@ export class MatTooltip implements OnDestroy {
       this._leaveListener =
         renderer.listen(_elementRef.nativeElement, 'mouseleave', () => this.hide());
     }
+
+    _focusMonitor.monitor(_elementRef.nativeElement, renderer, false).subscribe(origin => {
+      // Note that the focus monitor runs outside the Angular zone.
+      if (!origin) {
+        _ngZone.run(() => this.hide(0));
+      } else if (origin !== 'program') {
+        _ngZone.run(() => this.show());
+      }
+    });
   }
 
   /**
@@ -197,6 +204,7 @@ export class MatTooltip implements OnDestroy {
     if (this._tooltipInstance) {
       this._disposeTooltip();
     }
+
     // Clean up the event listeners set in the constructor
     if (!this._platform.IOS) {
       this._enterListener();
@@ -204,6 +212,7 @@ export class MatTooltip implements OnDestroy {
     }
 
     this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this.message);
+    this._focusMonitor.stopMonitoring(this._elementRef.nativeElement);
   }
 
   /** Shows the tooltip after the delay in ms, defaults to tooltip-delay-show or 0ms if no input */

From aa77aa1b919c3b7b3efec43572c6f5205573ef63 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 00:52:54 +0200
Subject: [PATCH 297/575] fix(expansion-panel): prevent content from being
 clipped (#7617)

Removes the overflows from expansion panels that aren't animating in order avoid clipping content, as well as things like ripples.

Relates to #7616.
---
 src/demo-app/expansion/expansion-demo.html |  3 +++
 src/lib/expansion/expansion-panel.scss     | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/demo-app/expansion/expansion-demo.html b/src/demo-app/expansion/expansion-demo.html
index b14c6434c650..3c3c0ee0c724 100644
--- a/src/demo-app/expansion/expansion-demo.html
+++ b/src/demo-app/expansion/expansion-demo.html
@@ -5,7 +5,10 @@ <h1>Single Expansion Panel</h1>
     <mat-panel-description>This is a panel description.</mat-panel-description>
     <mat-panel-title>Panel Title</mat-panel-title>
   </mat-expansion-panel-header>
+
     This is the content text that makes sense here.
+    <mat-checkbox>Trigger a ripple</mat-checkbox>
+
   <mat-action-row>
     <button mat-button (click)="myPanel.expanded = false">CANCEL</button>
     <button mat-button>SAVE</button>
diff --git a/src/lib/expansion/expansion-panel.scss b/src/lib/expansion/expansion-panel.scss
index a0e8b91db776..c242181478ee 100644
--- a/src/lib/expansion/expansion-panel.scss
+++ b/src/lib/expansion/expansion-panel.scss
@@ -11,12 +11,17 @@
 }
 
 .mat-expansion-panel-content {
-  overflow: hidden;
+  .mat-expanded & {
+    overflow: visible;
+  }
+
+  &, &.ng-animating {
+    overflow: hidden;
+  }
 }
 
 .mat-expansion-panel-body {
-  margin: 0 24px 16px;
-  overflow: auto;
+  padding: 0 24px 16px;
 }
 
 .mat-expansion-panel-spacing {

From 7fe1b81a47b6de036ae85c183328400e45c40b15 Mon Sep 17 00:00:00 2001
From: Christi Kaes <christikaes@gmail.com>
Date: Mon, 9 Oct 2017 18:53:26 -0400
Subject: [PATCH 298/575] fix(menu): add typography mat-font-weight

Custom typography font-weight was not being carried over for menu items.

This change applies the subheading-2 font-weight to the mat-menu-typography mixin
---
 src/lib/menu/_menu-theme.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/menu/_menu-theme.scss b/src/lib/menu/_menu-theme.scss
index 3439edb75751..73bd3cd702e8 100644
--- a/src/lib/menu/_menu-theme.scss
+++ b/src/lib/menu/_menu-theme.scss
@@ -39,6 +39,7 @@
     font: {
       family: mat-font-family($config, subheading-2);
       size: mat-font-size($config, subheading-2);
+      weight: mat-font-weight($config, subheading-2);
     }
   }
 }

From 236198376e7fc43f004f1b1014b25d4555459743 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 10 Oct 2017 22:47:00 +0200
Subject: [PATCH 299/575] fix(progress-spinner): spinner with narrower stroke
 not taking up entire element (#7686)

Fixes spinners that have a stroke smaller than the default not taking up the entire available space.

Fixes #7674.
---
 src/lib/progress-spinner/progress-spinner.spec.ts | 3 +++
 src/lib/progress-spinner/progress-spinner.ts      | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index 4fc66ebf738b..4c117bb28d20 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -103,12 +103,15 @@ describe('MatProgressSpinner', () => {
   it('should allow a custom stroke width', () => {
     const fixture = TestBed.createComponent(ProgressSpinnerCustomStrokeWidth);
     const circleElement = fixture.nativeElement.querySelector('circle');
+    const svgElement = fixture.nativeElement.querySelector('svg');
 
     fixture.componentInstance.strokeWidth = 40;
     fixture.detectChanges();
 
     expect(parseInt(circleElement.style.strokeWidth))
       .toBe(40, 'Expected the custom stroke width to be applied to the circle element.');
+    expect(svgElement.getAttribute('viewBox'))
+      .toBe('0 0 130 130', 'Expected the viewBox to be adjusted based on the stroke width.');
   });
 
   it('should expand the host element if the stroke width is greater than the default', () => {
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index f7f098b83fcc..5bddea884375 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -153,7 +153,8 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
 
   /** The view box of the spinner's svg element. */
   get _viewBox() {
-    return `0 0 ${this._elementSize} ${this._elementSize}`;
+    const viewBox = this._circleRadius * 2 + this.strokeWidth;
+    return `0 0 ${viewBox} ${viewBox}`;
   }
 
   /** The stroke circumference of the svg circle. */

From a9600e7ce919ada72b8ce2a19484a27e84694d84 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Tue, 10 Oct 2017 16:36:52 -0700
Subject: [PATCH 300/575] feat(table): add MatTableDataSource (#6747)

* feat(table): add MdTableDataSource

* change license
---
 src/cdk/rxjs/rx-operators.ts          |  29 ++-
 src/demo-app/table/table-demo.html    | 102 ++++++--
 src/demo-app/table/table-demo.ts      |  36 ++-
 src/lib/sort/sort-header.html         |   2 +-
 src/lib/sort/sort.ts                  |   2 +-
 src/lib/table/public-api.ts           |   2 +-
 src/lib/table/table-data-source.ts    | 213 ++++++++++++++++
 src/lib/table/table.spec.ts           | 349 +++++++++++++++++++++++---
 tools/package-tools/rollup-globals.ts |   2 +
 9 files changed, 657 insertions(+), 80 deletions(-)
 create mode 100644 src/lib/table/table-data-source.ts

diff --git a/src/cdk/rxjs/rx-operators.ts b/src/cdk/rxjs/rx-operators.ts
index 164ef48fadae..fe5c6d32a407 100644
--- a/src/cdk/rxjs/rx-operators.ts
+++ b/src/cdk/rxjs/rx-operators.ts
@@ -6,7 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Observable, ObservableInput} from 'rxjs/Observable';
+// Subscribable needs to be imported because combineLatest has or is using it, but it does not need
+// to be used in any of the explicit typings in this file.
+// tslint:disable-next-line:no-unused-variable
+import {Observable, ObservableInput, Subscribable} from 'rxjs/Observable';
 import {PartialObserver} from 'rxjs/Observer';
 import {Subscription} from 'rxjs/Subscription';
 import {IScheduler} from 'rxjs/Scheduler';
@@ -22,6 +25,7 @@ import {startWith as startWithOperator} from 'rxjs/operator/startWith';
 import {debounceTime as debounceTimeOperator} from 'rxjs/operator/debounceTime';
 import {auditTime as auditTimeOperator} from 'rxjs/operator/auditTime';
 import {takeUntil as takeUntilOperator} from 'rxjs/operator/takeUntil';
+import {combineLatest as combineLatestOperator} from 'rxjs/operator/combineLatest';
 import {delay as delayOperator} from 'rxjs/operator/delay';
 
 /**
@@ -38,16 +42,16 @@ import {delay as delayOperator} from 'rxjs/operator/delay';
  */
 export interface StrictRxChain<T> {
   call<R>(operator: mapOperatorType<T, R>,
-      project: (value: T, index: number) => R, thisArg?: any): StrictRxChain<R>;
+          project: (value: T, index: number) => R, thisArg?: any): StrictRxChain<R>;
 
   call<R>(operator: switchMapOperatorType<T, R>,
-      project: (value: T, index: number) => ObservableInput<R>): StrictRxChain<R>;
+          project: (value: T, index: number) => ObservableInput<R>): StrictRxChain<R>;
 
   call<R>(operator: catchOperatorType<T, R>,
-      selector: (err: any, caught: Observable<T>) => ObservableInput<R>): StrictRxChain<T | R>;
+          selector: (err: any, caught: Observable<T>) => ObservableInput<R>): StrictRxChain<T | R>;
 
   call(operator: filterOperatorType<T>,
-      predicate: (value: T, index: number) => boolean, thisArg?: any): StrictRxChain<T>;
+       predicate: (value: T, index: number) => boolean, thisArg?: any): StrictRxChain<T>;
 
   call(operator: shareOperatorType<T>): StrictRxChain<T>;
 
@@ -65,15 +69,18 @@ export interface StrictRxChain<T> {
   call(operator: startWithOperatorType<T>, ...args: any[]): StrictRxChain<T>;
 
   call(operator: debounceTimeOperatorType<T>, dueTime: number,
-      scheduler?: IScheduler): StrictRxChain<T>;
+       scheduler?: IScheduler): StrictRxChain<T>;
 
   call(operator: auditTimeOperatorType<T>, duration: number,
-      scheduler?: IScheduler): StrictRxChain<T>;
+       scheduler?: IScheduler): StrictRxChain<T>;
 
   call(operator: takeUntilOperatorType<T>, notifier: Observable<any>): StrictRxChain<T>;
 
+  call<T2>(operator: combineLatestOperatorType<T, T2>,
+           v2: ObservableInput<T2>): StrictRxChain<[T, T2]>;
+
   call(operator: delayOperatorType<T>, delay: number | Date, scheduler?: IScheduler):
-        StrictRxChain<T>;
+      StrictRxChain<T>;
 
   subscribe(fn: (t: T) => void): Subscription;
 
@@ -93,6 +100,7 @@ export class StartWithBrand { private _; }
 export class DebounceTimeBrand { private _; }
 export class AuditTimeBrand { private _; }
 export class TakeUntilBrand { private _; }
+export class CombineLatestBrand { private _; }
 export class DelayBrand { private _; }
 /* tslint:enable:no-unused-variable */
 
@@ -109,9 +117,10 @@ export type startWithOperatorType<T> = typeof startWithOperator & StartWithBrand
 export type debounceTimeOperatorType<T> = typeof debounceTimeOperator & DebounceTimeBrand;
 export type auditTimeOperatorType<T> = typeof auditTimeOperator & AuditTimeBrand;
 export type takeUntilOperatorType<T> = typeof takeUntilOperator & TakeUntilBrand;
+export type combineLatestOperatorType<T, R> = typeof combineLatestOperator & CombineLatestBrand;
 export type delayOperatorType<T> = typeof delayOperator & DelayBrand;
 
-// We add `Function` to the type intersection to make this nomically different from
+// We add `Function` to the type intersection to make this nominally different from
 // `finallyOperatorType` while still being structurally the same. Without this, TypeScript tries to
 // reduce `typeof _finallyOperator & FinallyBrand` to `finallyOperatorType<T>` and then fails
 // because `T` isn't known.
@@ -129,4 +138,6 @@ export const debounceTime =
     debounceTimeOperator as typeof debounceTimeOperator & DebounceTimeBrand & Function;
 export const auditTime = auditTimeOperator as typeof auditTimeOperator & AuditTimeBrand & Function;
 export const takeUntil = takeUntilOperator as typeof takeUntilOperator & TakeUntilBrand & Function;
+export const combineLatest =
+    combineLatestOperator as typeof combineLatestOperator & CombineLatestBrand & Function;
 export const delay = delayOperator as typeof delayOperator & DelayBrand & Function;
diff --git a/src/demo-app/table/table-demo.html b/src/demo-app/table/table-demo.html
index a7f4c5b66efd..0433ee7f1ad7 100644
--- a/src/demo-app/table/table-demo.html
+++ b/src/demo-app/table/table-demo.html
@@ -59,24 +59,24 @@ <h3>CdkTable Example</h3>
   </div>
 
   <cdk-table #table matSort
-               [dataSource]="dataSource"
-               [trackBy]="userTrackBy">
+             [dataSource]="dataSource"
+             [trackBy]="userTrackBy">
 
     <!-- Column Definition: ID -->
     <ng-container cdkColumnDef="userId">
       <cdk-header-cell *cdkHeaderCellDef
                        mat-sort-header arrowPosition="before">
-          ID
-        </cdk-header-cell>
+        ID
+      </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row"> {{row.id}} </cdk-cell>
     </ng-container>
 
     <!-- Column Definition: Progress -->
     <ng-container cdkColumnDef="progress">
       <cdk-header-cell *cdkHeaderCellDef
-                         mat-sort-header start="desc">
-          Progress
-        </cdk-header-cell>
+                       mat-sort-header start="desc">
+        Progress
+      </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row">
         <div class="demo-progress-stat">{{row.progress}}%</div>
         <div class="demo-progress-indicator-container">
@@ -91,30 +91,30 @@ <h3>CdkTable Example</h3>
     <!-- Column Definition: Name -->
     <ng-container cdkColumnDef="userName">
       <cdk-header-cell *cdkHeaderCellDef mat-sort-header>
-          Name
-        </cdk-header-cell>
+        Name
+      </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row"> {{row.name}} </cdk-cell>
     </ng-container>
 
     <!-- Column Definition: Color -->
     <ng-container cdkColumnDef="color">
       <cdk-header-cell *cdkHeaderCellDef
-                         mat-sort-header disableClear>
-          Color
-        </cdk-header-cell>
+                       mat-sort-header disableClear>
+        Color
+      </cdk-header-cell>
       <cdk-cell *cdkCellDef="let row" [style.color]="row.color"> {{row.color}} </cdk-cell>
     </ng-container>
 
     <cdk-header-row *cdkHeaderRowDef="displayedColumns"></cdk-header-row>
     <cdk-row *cdkRowDef="let row; columns: displayedColumns;
                            let first = first; let last = last; let even = even; let odd = odd"
-               [ngClass]="{
+             [ngClass]="{
                  'demo-row-highlight-first': highlights.has('first') && first,
                  'demo-row-highlight-last': highlights.has('last') && last,
                  'demo-row-highlight-even': highlights.has('even') && even,
                  'demo-row-highlight-odd': highlights.has('odd') && odd
                }">
-      </cdk-row>
+    </cdk-row>
   </cdk-table>
 </mat-card>
 
@@ -168,7 +168,7 @@ <h3>MatTable Example</h3>
   <mat-paginator #paginator
                 [length]="_peopleDatabase.data.length"
                 [pageSize]="10"
-                [pageSizeOptions]="[5, 10, 25, 100]">
+                 [pageSizeOptions]="[5, 10, 25, 100]">
   </mat-paginator>
 </div>
 
@@ -200,13 +200,71 @@ <h3> MatTable Using 'When' Rows for Interactive Details</h3>
 
     <mat-header-row *matHeaderRowDef="['userId', 'userName']"></mat-header-row>
     <mat-row *matRowDef="let row; columns: ['userId', 'userName'];"
-            matRipple
-            class="user-row"
-            [style.borderBottomColor]="expandedPerson == row ? 'transparent' : ''"
-            (click)="expandedPerson = row; wasExpanded.add(row)"></mat-row>
+             matRipple
+             class="user-row"
+             [style.borderBottomColor]="expandedPerson == row ? 'transparent' : ''"
+             (click)="expandedPerson = row; wasExpanded.add(row)"></mat-row>
     <mat-row *matRowDef="let row; columns: ['details']; when: isDetailRow"
-            [@detailExpand]="row.data == expandedPerson ? 'expanded' : 'collapsed'"
-            style="overflow: hidden">
+             [@detailExpand]="row.data == expandedPerson ? 'expanded' : 'collapsed'"
+             style="overflow: hidden">
     </mat-row>
   </mat-table>
-</mat-card>
\ No newline at end of file
+</mat-card>
+
+<h3>MatTable With MatTableDataSource Example</h3>
+
+<mat-form-field>
+  <input matInput [formControl]="filter">
+</mat-form-field>
+
+<div class="demo-table-container demo-mat-table-example mat-elevation-z4">
+
+  <table-header-demo (shiftColumns)="displayedColumns.push(displayedColumns.shift())"
+                     (toggleColorColumn)="toggleColorColumn()">
+  </table-header-demo>
+
+  <mat-table [dataSource]="matTableDataSource" [trackBy]="userTrackBy" matSort
+             #sortForDataSource="matSort">
+
+    <!-- Column Definition: ID -->
+    <ng-container cdkColumnDef="userId">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> ID </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
+    </ng-container>
+
+    <!-- Column Definition: Progress -->
+    <ng-container matColumnDef="progress">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Progress </mat-header-cell>
+      <mat-cell *matCellDef="let row">
+        <div class="demo-progress-stat">{{row.progress}}%</div>
+        <div class="demo-progress-indicator-container">
+          <div class="demo-progress-indicator"
+               [style.background]="row.progress > 50 ? 'green' : 'red'"
+               [style.opacity]="getOpacity(row.progress)"
+               [style.width.%]="row.progress"></div>
+        </div>
+      </mat-cell>
+    </ng-container>
+
+    <!-- Column Definition: Name -->
+    <ng-container matColumnDef="userName">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
+      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
+    </ng-container>
+
+    <!-- Column Definition: Color -->
+    <ng-container matColumnDef="color">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>Color</mat-header-cell>
+      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
+    </ng-container>
+
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
+
+  </mat-table>
+
+  <mat-paginator #paginatorForDataSource
+                 [length]="_peopleDatabase.data.length"
+                 [pageSizeOptions]="[10, 25, 100]">
+  </mat-paginator>
+</div>
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index d2d123df4cfd..efecfc9e6995 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -1,9 +1,10 @@
 import {Component, ViewChild} from '@angular/core';
 import {PeopleDatabase, UserData} from './people-database';
 import {PersonDataSource} from './person-data-source';
-import {MatPaginator, MatSort} from '@angular/material';
+import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 import {DetailRow, PersonDetailDataSource} from './person-detail-data-source';
 import {animate, state, style, transition, trigger} from '@angular/animations';
+import {FormControl} from '@angular/forms';
 
 export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
 
@@ -27,24 +28,48 @@ const properties = ['id', 'name', 'progress', 'color'];
 export class TableDemo {
   dataSource: PersonDataSource | null;
   dataSourceWithDetails: PersonDetailDataSource | null;
+  matTableDataSource = new MatTableDataSource<UserData>();
   displayedColumns: UserProperties[] = [];
   trackByStrategy: TrackByStrategy = 'reference';
   changeReferences = false;
   highlights = new Set<string>();
   wasExpanded = new Set<UserData>();
 
+  filter = new FormControl();
+
   dynamicColumnDefs: any[] = [];
   dynamicColumnIds: string[] = [];
 
   expandedPerson: UserData;
 
-  @ViewChild(MatPaginator) _paginator: MatPaginator;
-
+  @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
   isDetailRow = (row: DetailRow|UserData) => row.hasOwnProperty('detailRow');
 
-  constructor(public _peopleDatabase: PeopleDatabase) { }
+  @ViewChild('paginatorForDataSource') paginatorForDataSource: MatPaginator;
+  @ViewChild('sortForDataSource') sortForDataSource: MatSort;
+
+  constructor(public _peopleDatabase: PeopleDatabase) {
+    this.matTableDataSource.sortingDataAccessor = (data: UserData, property: string) => {
+      switch (property) {
+        case 'userId': return +data.id;
+        case 'userName': return data.name;
+        case 'progress': return +data.progress;
+        case 'color': return data.color;
+        default: return '';
+      }
+    };
+    this.matTableDataSource.filterTermAccessor = (data: UserData) => data.name;
+    this.filter.valueChanges.subscribe(filter => this.matTableDataSource!.filter = filter);
+  }
+
+  ngAfterViewInit() {
+    // Needs to be set up after the view is initialized since the data source will look at the sort
+    // and paginator's initial values to know what data should be rendered.
+    this.matTableDataSource!.paginator = this.paginatorForDataSource;
+    this.matTableDataSource!.sort = this.sortForDataSource;
+  }
 
   ngOnInit() {
     this.connect();
@@ -69,9 +94,10 @@ export class TableDemo {
   connect() {
     this.displayedColumns = ['userId', 'userName', 'progress', 'color'];
     this.dataSource = new PersonDataSource(this._peopleDatabase,
-        this._paginator, this.sort);
+        this.paginator, this.sort);
     this.dataSourceWithDetails = new PersonDetailDataSource(this.dataSource);
     this._peopleDatabase.initialize();
+    this.matTableDataSource!.data = this._peopleDatabase.data.slice();
   }
 
   disconnect() {
diff --git a/src/lib/sort/sort-header.html b/src/lib/sort/sort-header.html
index b181902952cf..4061041b1930 100644
--- a/src/lib/sort/sort-header.html
+++ b/src/lib/sort/sort-header.html
@@ -16,5 +16,5 @@
 </div>
 
 <span class="cdk-visually-hidden" *ngIf="_isSorted()">
-  {{_intl.sortDescriptionLabel(id, _sort.direction)}}
+  &nbsp;{{_intl.sortDescriptionLabel(id, _sort.direction)}}
 </span>
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index 59cfb57937b4..05f63c264985 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -29,7 +29,7 @@ export interface Sort {
 /** Container for MatSortables to manage the sort state and provide default sort parameters. */
 @Directive({
   selector: '[matSort]',
-  exportAs: 'matSort',
+  exportAs: 'matSort'
 })
 export class MatSort {
   /** Collection of all registered sortables that this directive manages. */
diff --git a/src/lib/table/public-api.ts b/src/lib/table/public-api.ts
index a447e57b94b3..4f19885ff1db 100644
--- a/src/lib/table/public-api.ts
+++ b/src/lib/table/public-api.ts
@@ -10,4 +10,4 @@ export * from './table-module';
 export * from './cell';
 export * from './table';
 export * from './row';
-
+export * from './table-data-source';
diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
new file mode 100644
index 000000000000..14852a5f570f
--- /dev/null
+++ b/src/lib/table/table-data-source.ts
@@ -0,0 +1,213 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {DataSource} from '@angular/cdk/table';
+import {BehaviorSubject} from 'rxjs/BehaviorSubject';
+import {MatPaginator} from '@angular/material/paginator';
+import {MatSort} from '@angular/material/sort';
+import {Subscription} from 'rxjs/Subscription';
+import {combineLatest, map, RxChain, startWith} from '@angular/cdk/rxjs';
+import {empty} from 'rxjs/observable/empty';
+
+/**
+ * Data source that accepts a client-side data array and includes native support of filtering,
+ * sorting (using MatSort), and pagination (using MatPaginator).
+ *
+ * Allows for sort customization by overriding sortingDataAccessor, which defines how data
+ * properties are accessed. Also allows for filter customization by overriding filterTermAccessor,
+ * which defines how row data is converted to a string for filter matching.
+ */
+export class MatTableDataSource<T> implements DataSource<T> {
+  /** Stream that emits when a new data array is set on the data source. */
+  private _data: BehaviorSubject<T[]>;
+
+  /** Stream emitting render data to the table (depends on ordered data changes). */
+  private _renderData = new BehaviorSubject<T[]>([]);
+
+  /** Stream that emits when a new filter string is set on the data source. */
+  private _filter = new BehaviorSubject<string>('');
+
+  /**
+   * Subscription to the changes that should trigger an update to the table's rendered rows, such
+   * as filtering, sorting, pagination, or base data changes.
+   */
+  _renderChangesSubscription: Subscription;
+
+  /** Array of data that should be rendered by the table, where each object represents one row. */
+  set data(data: T[]) { this._data.next(data); }
+  get data() { return this._data.value; }
+
+  /**
+   * Filter term that should be used to filter out objects from the data array. To override how
+   * the filter matches data objects, provide a custom function on filterTermAccessor.
+   */
+  set filter(filter: string) { this._filter.next(filter); }
+  get filter(): string { return this._filter.value; }
+
+  /**
+   * Instance of the MatSort directive used by the table to control its sorting. Sort changes
+   * emitted by the MatSort will trigger an update to the table's rendered data.
+   */
+  set sort(sort: MatSort|null) {
+    this._sort = sort;
+    this._updateChangeSubscription();
+  }
+  get sort(): MatSort|null { return this._sort; }
+  private _sort: MatSort|null;
+
+  /**
+   * Instance of the MatPaginator component used by the table to control what page of the data is
+   * displayed. Page changes emitted by the MatPaginator will trigger an update to the
+   * table's rendered data.
+   *
+   * Note that the data source uses the paginator's properties to calculate which page of data
+   * should be displayed. If the paginator receives its properties as template inputs,
+   * e.g. `[pageLength]=100` or `[pageIndex]=1`, then be sure that the paginator's view has been
+   * initialized before assigning it to this data source.
+   */
+  set paginator(paginator: MatPaginator|null) {
+    this._paginator = paginator;
+    this._updateChangeSubscription();
+  }
+  get paginator(): MatPaginator|null { return this._paginator; }
+  private _paginator: MatPaginator|null;
+
+  /**
+   * Data accessor function that is used for accessing data properties for sorting.
+   * This default function assumes that the sort header IDs (which defaults to the column name)
+   * matches the data's properties (e.g. column Xyz represents data['Xyz']).
+   * May be set to a custom function for different behavior.
+   * @param data Data object that is being accessed.
+   * @param sortHeaderId The name of the column that represents the data.
+   */
+  sortingDataAccessor = (data: T, sortHeaderId: string): string|number => {
+    const value: number|string = data[sortHeaderId];
+    return isNaN(+value) ? value : +value;
+  }
+
+  /**
+   * Transforms data objects into a filter term that will be used to check against the filter if
+   * a filter is set. By default, the function will iterate over the values of the data object
+   * and convert them to a lowercase string.
+   * @param data Data object to convert to a string that checked for containing the filter term.
+   */
+  filterTermAccessor: ((data: T) => string) = (data: T): string => {
+    const accumulator = (currentTerm, key) => currentTerm + data[key];
+    return Object.keys(data).reduce(accumulator, '').toLowerCase();
+  }
+
+  constructor(initialData: T[] = []) {
+    this._data = new BehaviorSubject<T[]>(initialData);
+    this._updateChangeSubscription();
+  }
+
+  /**
+   * Subscribe to changes that should trigger an update to the table's rendered rows. When the
+   * changes occur, process the current state of the filter, sort, and pagination along with
+   * the provided base data and send it to the table for rendering.
+   */
+  _updateChangeSubscription() {
+    // Sorting and/or pagination should be watched if MatSort and/or MatPaginator are provided.
+    // Otherwise, use an empty observable stream to take their place.
+    const sortChange = this._sort ? this._sort.sortChange : empty();
+    const pageChange = this._paginator ? this._paginator.page : empty();
+
+    if (this._renderChangesSubscription) { this._renderChangesSubscription.unsubscribe(); }
+    this._renderChangesSubscription = RxChain.from(this._data)
+    // Watch for base data or filter changes to provide a filtered set of data.
+        .call(combineLatest, this._filter)
+        .call(map, ([data]) => this._filterData(data))
+        // Watch for filtered data or sort changes to provide an ordered set of data.
+        .call(combineLatest, startWith.call(sortChange, null))
+        .call(map, ([data]) => this._orderData(data))
+        // Watch for ordered data or page changes to provide a paged set of data.
+        .call(combineLatest, startWith.call(pageChange, null))
+        .call(map, ([data]) => this._pageData(data))
+        // Watched for paged data changes and send the result to the table to render.
+        .subscribe(data => this._renderData.next(data));
+  }
+
+  /**
+   * Returns a filtered data array where each filter object contains the filter string within
+   * the result of the filterTermAccessor function. If no filter is set, returns the data array
+   * as provided.
+   */
+  _filterData(data: T[]) {
+    // If there is a filter string, filter out data that does not contain it.
+    // Each data object is converted to a string using the function defined by filterTermAccessor.
+    // May be overriden for customization.
+    const filteredData = !this.filter ? data : data.filter(obj => {
+      return this.filterTermAccessor(obj).indexOf(this.filter) != -1;
+    });
+
+    if (this.paginator) { this._updatePaginator(filteredData.length); }
+
+    return filteredData;
+  }
+
+  /**
+   * Returns a sorted copy of the data if MatSort has a sort applied, otherwise just returns the
+   * data array as provided. Uses the default data accessor for data lookup, unless a
+   * sortDataAccessor function is defined.
+   */
+  _orderData(data: T[]): T[] {
+    // If there is no active sort or direction, return the data without trying to sort.
+    if (!this.sort || !this.sort.active || this.sort.direction == '') { return data; }
+
+    const active = this.sort.active;
+    const direction = this.sort.direction;
+
+    return data.slice().sort((a, b) => {
+      let valueA = this.sortingDataAccessor(a, active);
+      let valueB = this.sortingDataAccessor(b, active);
+      return (valueA < valueB ? -1 : 1) * (direction == 'asc' ? 1 : -1);
+    });
+  }
+
+  /**
+   * Returns a paged splice of the provided data array according to the provided MatPaginator's page
+   * index and length. If there is no paginator provided, returns the data array as provided.
+   */
+  _pageData(data: T[]): T[] {
+    if (!this.paginator) { return data; }
+
+    const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
+    return data.slice().splice(startIndex, this.paginator.pageSize);
+  }
+
+  /**
+   * Updates the paginator to reflect the length of the filtered data, and makes sure that the page
+   * index does not exceed the paginator's last page. Values are changed in a resolved promise to
+   * guard against making property changes within a round of change detection.
+   */
+  _updatePaginator(filteredDataLength: number) {
+    Promise.resolve().then(() => {
+      if (!this.paginator) { return; }
+
+      this.paginator.length = filteredDataLength;
+
+      // If the page index is set beyond the page, reduce it to the last page.
+      if (this.paginator.pageIndex > 0) {
+        const lastPageIndex = Math.ceil(this.paginator.length / this.paginator.pageSize) - 1 || 0;
+        this.paginator.pageIndex = Math.min(this.paginator.pageIndex, lastPageIndex);
+      }
+    });
+  }
+
+  /**
+   * Used by the MatTable. Called when it connects to the data source.
+   * @docs-private
+   */
+  connect() { return this._renderData; }
+
+  /**
+   * Used by the MatTable. Called when it is destroyed. No-op.
+   * @docs-private
+   */
+  disconnect() { }
+}
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index 5333c2bb0e4b..39949cf92b19 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -1,67 +1,220 @@
-import {async, TestBed} from '@angular/core/testing';
+import {async, ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
 import {MatTableModule} from './index';
 import {MatTable} from './table';
+import {MatPaginator, MatPaginatorModule} from '../paginator/index';
+import {MatSort, MatSortHeader, MatSortModule} from '../sort/index';
+import {MatTableDataSource} from './table-data-source';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
 describe('MatTable', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MatTableModule],
-      declarations: [MatTableApp, MatTableWithWhenRowApp],
+      imports: [MatTableModule, MatPaginatorModule, MatSortModule, NoopAnimationsModule],
+      declarations: [MatTableApp, MatTableWithWhenRowApp, ArrayDataSourceMatTableApp],
     }).compileComponents();
   }));
 
-  it('should be able to create a table with the right content and without when row', () => {
-    let fixture = TestBed.createComponent(MatTableApp);
-    fixture.detectChanges();
+  describe('with basic data source', () => {
+    it('should be able to create a table with the right content and without when row', () => {
+      let fixture = TestBed.createComponent(MatTableApp);
+      fixture.detectChanges();
 
-    const tableElement = fixture.nativeElement.querySelector('.mat-table');
-    const headerRow = tableElement.querySelectorAll('.mat-header-cell');
-    expectTextContent(headerRow[0], 'Column A');
-    expectTextContent(headerRow[1], 'Column B');
-    expectTextContent(headerRow[2], 'Column C');
-
-    const rows = tableElement.querySelectorAll('.mat-row');
+      const tableElement = fixture.nativeElement.querySelector('.mat-table')!;
+      const data = fixture.componentInstance.dataSource!.data;
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        [data[0].a, data[0].b, data[0].c],
+        [data[1].a, data[1].b, data[1].c],
+        [data[2].a, data[2].b, data[2].c],
+        ['fourth_row']
+      ]);
+    });
 
-    // First three rows use columns ['column_a', 'column_b', 'column_c']
-    for (let i = 0; i < 3; i++) {
-      const cells = rows[i].querySelectorAll('.mat-cell');
-      expectTextContent(cells[0], `a_${i + 1}`);
-      expectTextContent(cells[1], `b_${i + 1}`);
-      expectTextContent(cells[2], `c_${i + 1}`);
-    }
+    it('should create a table with special when row', () => {
+      let fixture = TestBed.createComponent(MatTableWithWhenRowApp);
+      fixture.detectChanges();
 
-    // Fourth row uses a special when predicate to show a different colummn
-    expect(rows[3].textContent.trim()).toBe('fourth_row');
+      const tableElement = fixture.nativeElement.querySelector('.mat-table');
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_1'],
+        ['a_2'],
+        ['a_3'],
+        ['fourth_row']
+      ]);
+    });
   });
 
-  it('should create a table with special when row', () => {
-    let fixture = TestBed.createComponent(MatTableWithWhenRowApp);
-    fixture.detectChanges();
+  describe('with MatTableDataSource', () => {
+    let tableElement: HTMLElement;
+    let fixture: ComponentFixture<ArrayDataSourceMatTableApp>;
+    let dataSource: MatTableDataSource<TestData>;
+    let component: ArrayDataSourceMatTableApp;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ArrayDataSourceMatTableApp);
+      fixture.detectChanges();
+
+      tableElement = fixture.nativeElement.querySelector('.mat-table');
+      component = fixture.componentInstance;
+      dataSource = fixture.componentInstance.dataSource;
+    });
+
+    it('should create table and display data source contents', () => {
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+      ]);
+    });
+
+    it('changing data should update the table contents', () => {
+      // Add data
+      component.underlyingDataSource.addData();
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+        ['a_4', 'b_4', 'c_4'],
+      ]);
+
+      // Remove data
+      const modifiedData = dataSource.data.slice();
+      modifiedData.shift();
+      dataSource.data = modifiedData;
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+        ['a_4', 'b_4', 'c_4'],
+      ]);
+    });
+
+    it('should be able to filter the table contents', fakeAsync(() => {
+      // Change filter to a_1, should match one row
+      dataSource.filter = 'a_1';
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+      ]);
+      flushMicrotasks();  // Resolve promise that updates paginator's length
+      expect(dataSource.paginator!.length).toBe(1);
+
+      // Change filter to a_2, should match one row
+      dataSource.filter = 'a_2';
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_2', 'b_2', 'c_2'],
+      ]);
+
+      // Change filter to empty string, should match all rows
+      dataSource.filter = '';
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+      ]);
+
+      // Change filter function and filter, should match to rows.
+      dataSource.filterTermAccessor = data => {
+        switch (data.a) {
+          case 'a_1': return 'elephant';
+          case 'a_2': return 'zebra';
+          case 'a_3': return 'monkey';
+          default: return '';
+        }
+      };
+      dataSource.filter = 'zebra';
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_2', 'b_2', 'c_2'],
+      ]);
+    }));
+
+    it('should be able to sort the table contents', () => {
+      // Activate column A sort
+      component.sort.sort(component.sortHeader);
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A\xa0Sorted by a ascending', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+      ]);
+
+      // Activate column A sort again (reverse direction)
+      component.sort.sort(component.sortHeader);
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A\xa0Sorted by a descending', 'Column B', 'Column C'],
+        ['a_3', 'b_3', 'c_3'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_1', 'b_1', 'c_1'],
+      ]);
+
+      // Change sort function to customize how it sorts - first column 1, then 3, then 2
+      dataSource.sortingDataAccessor = data => {
+        switch (data.a) {
+          case 'a_1': return 'elephant';
+          case 'a_2': return 'zebra';
+          case 'a_3': return 'monkey';
+          default: return '';
+        }
+      };
+      component.sort.direction = '';
+      component.sort.sort(component.sortHeader);
+      expectTableToMatchContent(tableElement, [
+        ['Column A\xa0Sorted by a descending', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+        ['a_3', 'b_3', 'c_3'],
+        ['a_2', 'b_2', 'c_2'],
+      ]);
+    });
 
-    const tableElement = fixture.nativeElement.querySelector('.mat-table');
-    const headerRow = tableElement.querySelectorAll('.mat-header-cell');
-    expectTextContent(headerRow[0], 'Column A');
+    it('should be able to page the table contents', fakeAsync(() => {
+      // Add 100 rows, should only display first 5 since page length is 5
+      for (let i = 0; i < 100; i++) {
+        component.underlyingDataSource.addData();
+      }
+      fixture.detectChanges();
+      flushMicrotasks();  // Resolve promise that updates paginator's length
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_1', 'b_1', 'c_1'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+        ['a_4', 'b_4', 'c_4'],
+        ['a_5', 'b_5', 'c_5'],
+      ]);
 
-    const rows = tableElement.querySelectorAll('.mat-row');
-    expect(rows[0].textContent.trim()).toBe('a_1');
-    expect(rows[1].textContent.trim()).toBe('a_2');
-    expect(rows[2].textContent.trim()).toBe('a_3');
-    expect(rows[3].textContent.trim()).toBe('fourth_row');
+      // Navigate to the next page
+      component.paginator.nextPage();
+      fixture.detectChanges();
+      expectTableToMatchContent(tableElement, [
+        ['Column A', 'Column B', 'Column C'],
+        ['a_6', 'b_6', 'c_6'],
+        ['a_7', 'b_7', 'c_7'],
+        ['a_8', 'b_8', 'c_8'],
+        ['a_9', 'b_9', 'c_9'],
+        ['a_10', 'b_10', 'c_10'],
+      ]);
+    }));
   });
 });
 
-function expectTextContent(el, text) {
-  if (el && el.textContent) {
-    expect(el.textContent.trim()).toBe(text);
-  } else {
-    fail(`Missing text content of ${text} in element ${el}`);
-  }
-}
-
 interface TestData {
   a: string;
   b: string;
@@ -159,3 +312,117 @@ class MatTableWithWhenRowApp {
 
   @ViewChild(MatTable) table: MatTable<TestData>;
 }
+
+
+@Component({
+  template: `
+    <mat-table [dataSource]="dataSource" matSort>
+      <ng-container matColumnDef="column_a">
+        <mat-header-cell *matHeaderCellDef mat-sort-header="a"> Column A</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.a}}</mat-cell>
+      </ng-container>
+
+      <ng-container matColumnDef="column_b">
+        <mat-header-cell *matHeaderCellDef> Column B</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.b}}</mat-cell>
+      </ng-container>
+
+      <ng-container matColumnDef="column_c">
+        <mat-header-cell *matHeaderCellDef> Column C</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.c}}</mat-cell>
+      </ng-container>
+
+      <mat-header-row *matHeaderRowDef="columnsToRender"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: columnsToRender"></mat-row>
+    </mat-table>
+
+    <mat-paginator [pageSize]="5"></mat-paginator>
+  `
+})
+class ArrayDataSourceMatTableApp {
+  underlyingDataSource = new FakeDataSource();
+  dataSource = new MatTableDataSource<TestData>();
+  columnsToRender = ['column_a', 'column_b', 'column_c'];
+
+  @ViewChild(MatTable) table: MatTable<TestData>;
+  @ViewChild(MatPaginator) paginator: MatPaginator;
+  @ViewChild(MatSort) sort: MatSort;
+  @ViewChild(MatSortHeader) sortHeader: MatSortHeader;
+
+  constructor() {
+    this.underlyingDataSource.data = [];
+
+    // Add three rows of data
+    this.underlyingDataSource.addData();
+    this.underlyingDataSource.addData();
+    this.underlyingDataSource.addData();
+
+    this.underlyingDataSource.connect().subscribe(data => {
+      this.dataSource.data = data;
+    });
+  }
+
+  ngAfterViewInit() {
+    // Needs to be set up after the view is initialized since the data source will look at the sort
+    // and paginator's initial values to know what data should be rendered.
+    this.dataSource!.sort = this.sort;
+    this.dataSource!.paginator = this.paginator;
+  }
+}
+
+// Utilities copied from CDKTable's spec
+function getElements(element: Element, query: string): Element[] {
+  return [].slice.call(element.querySelectorAll(query));
+}
+
+function getHeaderRow(tableElement: Element): Element {
+  return tableElement.querySelector('.mat-header-row')!;
+}
+
+function getRows(tableElement: Element): Element[] {
+  return getElements(tableElement, '.mat-row');
+}
+function getCells(row: Element): Element[] {
+  return row ? getElements(row, '.mat-cell') : [];
+}
+
+function getHeaderCells(tableElement: Element): Element[] {
+  return getElements(getHeaderRow(tableElement), '.mat-header-cell');
+}
+
+function expectTableToMatchContent(tableElement: Element, expectedTableContent: any[]) {
+  const missedExpectations: string[] = [];
+  function checkCellContent(cell: Element, expectedTextContent: string) {
+    const actualTextContent = cell.textContent!.trim();
+    if (actualTextContent !== expectedTextContent) {
+      missedExpectations.push(
+          `Expected cell contents to be ${expectedTextContent} but was ${actualTextContent}`);
+    }
+  }
+
+  // Check header cells
+  const expectedHeaderContent = expectedTableContent.shift();
+  getHeaderCells(tableElement).forEach((cell, index) => {
+    const expected = expectedHeaderContent ?
+        expectedHeaderContent[index] :
+        null;
+    checkCellContent(cell, expected);
+  });
+
+  // Check data row cells
+  const rows = getRows(tableElement);
+  expect(rows.length).toBe(expectedTableContent.length,
+      `Found ${rows.length} rows but expected ${expectedTableContent.length}`);
+  rows.forEach((row, rowIndex) => {
+    getCells(row).forEach((cell, cellIndex) => {
+      const expected = expectedTableContent.length ?
+          expectedTableContent[rowIndex][cellIndex] :
+          null;
+      checkCellContent(cell, expected);
+    });
+  });
+
+  if (missedExpectations.length) {
+    fail(missedExpectations.join('\n'));
+  }
+}
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index b1273dc0bc2b..93db1bddf4e9 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -64,10 +64,12 @@ export const rollupGlobals = {
   'rxjs/observable/fromEventPattern': 'Rx.Observable',
   'rxjs/observable/merge': 'Rx.Observable',
   'rxjs/observable/of': 'Rx.Observable',
+  'rxjs/observable/empty': 'Rx.Observable',
   'rxjs/observable/throw': 'Rx.Observable',
   'rxjs/observable/defer': 'Rx.Observable',
   'rxjs/operator/auditTime': 'Rx.Observable.prototype',
   'rxjs/operator/catch': 'Rx.Observable.prototype',
+  'rxjs/operator/combineLatest': 'Rx.Observable.prototype',
   'rxjs/operator/debounceTime': 'Rx.Observable.prototype',
   'rxjs/operator/do': 'Rx.Observable.prototype',
   'rxjs/operator/filter': 'Rx.Observable.prototype',

From d822a3948e7b6e04547fdee324bcd90ee654d58d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:37:07 +0200
Subject: [PATCH 301/575] fix(menu): not handling keyboard events when opened
 by mouse (#4843)

Fixes the menu keyboard interactions not working when it is opened by a click.

Fixes #4991.
---
 e2e/components/menu-e2e.spec.ts |  4 ++--
 src/lib/menu/menu-directive.ts  |  8 ++++++++
 src/lib/menu/menu-panel.ts      |  1 +
 src/lib/menu/menu-trigger.ts    | 14 ++++++++++----
 src/lib/menu/menu.html          |  1 +
 src/lib/menu/menu.scss          |  1 +
 src/lib/menu/menu.spec.ts       | 33 +++++++++++++++++++--------------
 7 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/e2e/components/menu-e2e.spec.ts b/e2e/components/menu-e2e.spec.ts
index f1b3a3dec680..c5b1870719d6 100644
--- a/e2e/components/menu-e2e.spec.ts
+++ b/e2e/components/menu-e2e.spec.ts
@@ -97,9 +97,9 @@ describe('menu', () => {
       expectFocusOn(page.items(0));
     });
 
-    it('should not focus the first item when opened with mouse', () => {
+    it('should focus the panel when opened by mouse', () => {
       page.trigger().click();
-      expectFocusOn(page.trigger());
+      expectFocusOn(page.menu());
     });
 
     it('should focus subsequent items when down arrow is pressed', () => {
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 5365d1e54124..b7d2fbd29b65 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -205,6 +205,14 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
     this._keyManager.setFirstItemActive();
   }
 
+  /**
+   * Resets the active item in the menu. This is used when the menu is opened by mouse,
+   * allowing the user to start from the first option when pressing the down arrow.
+   */
+  resetActiveItem() {
+    this._keyManager.setActiveItem(-1);
+  }
+
   /**
    * It's necessary to set position-based classes to ensure the menu panel animation
    * folds out from the correct direction.
diff --git a/src/lib/menu/menu-panel.ts b/src/lib/menu/menu-panel.ts
index 3573f3ab71a1..fa05e8c34f1a 100644
--- a/src/lib/menu/menu-panel.ts
+++ b/src/lib/menu/menu-panel.ts
@@ -19,6 +19,7 @@ export interface MatMenuPanel {
   parentMenu?: MatMenuPanel | undefined;
   direction?: Direction;
   focusFirstItem: () => void;
+  resetActiveItem: () => void;
   setPositionClasses: (x: MenuPositionX, y: MenuPositionY) => void;
   setElevation?(depth: number): void;
 }
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index fa8f8c76bddc..f135a8e63798 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -225,10 +225,16 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
     this._setMenuElevation();
     this._setIsMenuOpen(true);
 
-    // Should only set focus if opened via the keyboard, so keyboard users can
-    // can easily navigate menu items. According to spec, mouse users should not
-    // see the focus style.
-    if (!this._openedByMouse) {
+    // If the menu was opened by mouse, we focus the root node, which allows for the keyboard
+    // interactions to work. Otherwise, if the menu was opened by keyboard, we focus the first item.
+    if (this._openedByMouse) {
+      let rootNode = this._overlayRef!.overlayElement.firstElementChild as HTMLElement;
+
+      if (rootNode) {
+        this.menu.resetActiveItem();
+        rootNode.focus();
+      }
+    } else {
       this.menu.focusFirstItem();
     }
   }
diff --git a/src/lib/menu/menu.html b/src/lib/menu/menu.html
index 87e582d5a525..ddbad3894152 100644
--- a/src/lib/menu/menu.html
+++ b/src/lib/menu/menu.html
@@ -6,6 +6,7 @@
     (click)="close.emit('click')"
     [@transformMenu]="_panelAnimationState"
     (@transformMenu.done)="_onAnimationDone($event)"
+    tabindex="-1"
     role="menu">
     <div class="mat-menu-content" [@fadeInItems]="'showing'">
       <ng-content></ng-content>
diff --git a/src/lib/menu/menu.scss b/src/lib/menu/menu.scss
index b2173add544b..a78f594df93c 100644
--- a/src/lib/menu/menu.scss
+++ b/src/lib/menu/menu.scss
@@ -14,6 +14,7 @@ $mat-menu-submenu-indicator-size: 10px !default;
   @include mat-menu-positions();
   max-height: calc(100vh - #{$mat-menu-item-height});
   border-radius: $mat-menu-border-radius;
+  outline: 0;
 
   // Prevent the user from interacting while the panel is still animating.
   // This avoids issues where the user could accidentally open a sub-menu,
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 912fd29371ec..4835376973f4 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -33,6 +33,7 @@ import {
   dispatchEvent,
   createKeyboardEvent,
   createMouseEvent,
+  dispatchFakeEvent,
 } from '@angular/cdk/testing';
 
 
@@ -191,6 +192,23 @@ describe('MatMenu', () => {
     expect(fixture.componentInstance.items.last.getLabel()).toBe('Item with an icon');
   });
 
+  it('should focus the menu panel root node when it was opened by mouse', () => {
+    const fixture = TestBed.createComponent(SimpleMenu);
+
+    fixture.detectChanges();
+
+    const triggerEl = fixture.componentInstance.triggerEl.nativeElement;
+
+    dispatchFakeEvent(triggerEl, 'mousedown');
+    triggerEl.click();
+    fixture.detectChanges();
+
+    const panel = overlayContainerElement.querySelector('.mat-menu-panel');
+
+    expect(panel).toBeTruthy('Expected the panel to be rendered.');
+    expect(document.activeElement).toBe(panel, 'Expected the panel to be focused.');
+  });
+
   describe('positions', () => {
     let fixture: ComponentFixture<PositionedMenu>;
     let panel: HTMLElement;
@@ -811,20 +829,6 @@ describe('MatMenu', () => {
           .toBe(true, 'Expected focus to be back inside the root menu');
     });
 
-    it('should not shift focus to the sub-menu when it was opened by hover', () => {
-      compileTestComponent();
-      instance.rootTriggerEl.nativeElement.click();
-      fixture.detectChanges();
-
-      const levelOneTrigger = overlay.querySelector('#level-one-trigger')! as HTMLElement;
-
-      dispatchMouseEvent(levelOneTrigger, 'mouseenter');
-      fixture.detectChanges();
-
-      expect(overlay.querySelectorAll('.mat-menu-panel')[1].contains(document.activeElement))
-          .toBe(false, 'Expected focus to not be inside the nested menu');
-    });
-
     it('should position the sub-menu to the right edge of the trigger in ltr', () => {
       compileTestComponent();
       instance.rootTriggerEl.nativeElement.style.position = 'fixed';
@@ -1179,6 +1183,7 @@ class CustomMenuPanel implements MatMenuPanel {
   @ViewChild(TemplateRef) templateRef: TemplateRef<any>;
   @Output() close = new EventEmitter<void | 'click' | 'keydown'>();
   focusFirstItem = () => {};
+  resetActiveItem = () => {};
   setPositionClasses = () => {};
 }
 

From f299d258353091fa22822138320326442be0796d Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 10 Oct 2017 19:37:52 -0400
Subject: [PATCH 302/575] fix(overlay): wait until after change detection to
 position overlays (#6527)

* wip

* wip debugging

* wip debugging

* wip select tests

* fix: select test failures

* chore: revert dialog workaround

* chore: avoid memory leak

* fix: address PR feedback

* chore: more test failures

* chore: faulty merge

* chore: more test failures
---
 src/cdk/overlay/overlay-ref.ts                |   9 +-
 src/cdk/overlay/overlay.spec.ts               |  12 +-
 .../position/connected-position-strategy.ts   |   5 +
 src/lib/autocomplete/autocomplete.spec.ts     |  34 +-
 src/lib/menu/menu.spec.ts                     |  24 +-
 src/lib/select/select.spec.ts                 | 489 ++++++++++--------
 src/lib/select/select.ts                      |   8 +-
 src/lib/snack-bar/snack-bar.spec.ts           | 340 ++++++------
 8 files changed, 527 insertions(+), 394 deletions(-)

diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 71684e924bf5..d1bd5c4657b9 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -11,6 +11,7 @@ import {PortalHost, Portal} from '@angular/cdk/portal';
 import {OverlayConfig} from './overlay-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
+import {first} from 'rxjs/operator/first';
 
 
 /**
@@ -55,12 +56,18 @@ export class OverlayRef implements PortalHost {
     this._updateStackingOrder();
     this.updateSize();
     this.updateDirection();
-    this.updatePosition();
 
     if (this._config.scrollStrategy) {
       this._config.scrollStrategy.enable();
     }
 
+    // Update the position once the zone is stable so that the overlay will be fully rendered
+    // before attempting to position it, as the position may depend on the size of the rendered
+    // content.
+    first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+      this.updatePosition();
+    });
+
     // Enable pointer events for the overlay pane element.
     this._togglePointerEvents(true);
 
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index e8af0f9ff4ab..b5b35cc15ba9 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -1,4 +1,4 @@
-import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
+import {async, fakeAsync, tick, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {Component, NgModule, ViewChild, ViewContainerRef} from '@angular/core';
 import {
   ComponentPortal,
@@ -107,7 +107,7 @@ describe('Overlay', () => {
     expect(overlayContainerElement.textContent).toBe('');
   });
 
-  it('should ensure that the most-recently-attached overlay is on top', () => {
+  it('should ensure that the most-recently-attached overlay is on top', (() => {
     let pizzaOverlayRef = overlay.create();
     let cakeOverlayRef = overlay.create();
 
@@ -130,7 +130,7 @@ describe('Overlay', () => {
         .toBeTruthy('Expected pizza to still be on the bottom.');
     expect(cakeOverlayRef.overlayElement.nextSibling)
         .toBeFalsy('Expected cake to still be on top.');
-  });
+  }));
 
   it('should set the direction', () => {
     const config = new OverlayConfig({direction: 'rtl'});
@@ -226,13 +226,15 @@ describe('Overlay', () => {
       config = new OverlayConfig();
     });
 
-    it('should apply the positioning strategy', () => {
+    it('should apply the positioning strategy', fakeAsync(() => {
       config.positionStrategy = new FakePositionStrategy();
 
       overlay.create(config).attach(componentPortal);
+      viewContainerFixture.detectChanges();
+      tick();
 
       expect(overlayContainerElement.querySelectorAll('.fake-positioned').length).toBe(1);
-    });
+    }));
   });
 
   describe('size', () => {
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index cbdf83b30bf8..3c26d310823b 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -161,6 +161,11 @@ export class ConnectedPositionStrategy implements PositionStrategy {
    * allows one to re-align the panel without changing the orientation of the panel.
    */
   recalculateLastPosition(): void {
+    // If the overlay has never been positioned before, do nothing.
+    if (!this._lastConnectedPosition) {
+      return;
+    }
+
     const originRect = this._origin.getBoundingClientRect();
     const overlayRect = this._pane.getBoundingClientRect();
     const viewportRect = this._viewportRuler.getViewportRect();
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index ccd6da21eee4..ec0b229b28a4 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1190,17 +1190,19 @@ describe('MatAutocomplete', () => {
       inputReference = fixture.debugElement.query(By.css('.mat-input-flex')).nativeElement;
     });
 
-    it('should use below positioning by default', () => {
+    it('should use below positioning by default', async(() => {
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
 
-      const inputBottom = inputReference.getBoundingClientRect().bottom;
-      const panel = overlayContainerElement.querySelector('.mat-autocomplete-panel')!;
-      const panelTop = panel.getBoundingClientRect().top;
+      fixture.whenStable().then(() => {
+        const inputBottom = inputReference.getBoundingClientRect().bottom;
+        const panel = overlayContainerElement.querySelector('.mat-autocomplete-panel')!;
+        const panelTop = panel.getBoundingClientRect().top;
 
-      expect(Math.floor(inputBottom))
-          .toEqual(Math.floor(panelTop), `Expected panel top to match input bottom by default.`);
-    });
+        expect(Math.floor(inputBottom))
+            .toEqual(Math.floor(panelTop), `Expected panel top to match input bottom by default.`);
+      });
+    }));
 
     it('should reposition the panel on scroll', () => {
       const spacer = document.createElement('div');
@@ -1216,7 +1218,7 @@ describe('MatAutocomplete', () => {
       fixture.detectChanges();
 
       const inputBottom = inputReference.getBoundingClientRect().bottom;
-      const panel = overlayContainerElement.querySelector('.mat-autocomplete-panel')!;
+      const panel = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
       const panelTop = panel.getBoundingClientRect().top;
 
       expect(Math.floor(inputBottom)).toEqual(Math.floor(panelTop),
@@ -1225,7 +1227,7 @@ describe('MatAutocomplete', () => {
       document.body.removeChild(spacer);
     });
 
-    it('should fall back to above position if panel cannot fit below', () => {
+    it('should fall back to above position if panel cannot fit below', async(() => {
       // Push the autocomplete trigger down so it won't have room to open "below"
       inputReference.style.top = '600px';
       inputReference.style.position = 'relative';
@@ -1233,13 +1235,15 @@ describe('MatAutocomplete', () => {
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
 
-      const inputTop = inputReference.getBoundingClientRect().top;
-      const panel = overlayContainerElement.querySelector('.mat-autocomplete-panel')!;
-      const panelBottom = panel.getBoundingClientRect().bottom;
+      fixture.whenStable().then(() => {
+        const inputTop = inputReference.getBoundingClientRect().top;
+        const panel = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+        const panelBottom = panel.getBoundingClientRect().bottom;
 
-      expect(Math.floor(inputTop))
-          .toEqual(Math.floor(panelBottom), `Expected panel to fall back to above position.`);
-    });
+        expect(Math.floor(inputTop))
+            .toEqual(Math.floor(panelBottom), `Expected panel to fall back to above position.`);
+      });
+    }));
 
     it('should align panel properly when filtering in "above" position', async(() => {
       // Push the autocomplete trigger down so it won't have room to open "below"
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 4835376973f4..7eae9d1bae64 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -400,8 +400,8 @@ describe('MatMenu', () => {
      * subject.openMenu();
      */
     class OverlapSubject<T extends TestableMenu> {
-      private readonly fixture: ComponentFixture<T>;
-      private readonly trigger: any;
+      readonly fixture: ComponentFixture<T>;
+      readonly trigger: any;
 
       constructor(ctor: {new(): T; }, inputs: {[key: string]: any} = {}) {
         this.fixture = TestBed.createComponent(ctor);
@@ -419,6 +419,7 @@ describe('MatMenu', () => {
         return extendObject(this.trigger.style, style);
       }
 
+
       get overlayRect() {
         return this.overlayPane.getBoundingClientRect();
       }
@@ -480,11 +481,11 @@ describe('MatMenu', () => {
 
       it('repositions the origin to be below, so the menu opens from the trigger', () => {
         subject.openMenu();
+        subject.fixture.detectChanges();
 
         expect(subject.menuPanel!.classList).toContain('mat-menu-below');
         expect(subject.menuPanel!.classList).not.toContain('mat-menu-above');
       });
-
     });
   });
 
@@ -841,7 +842,7 @@ describe('MatMenu', () => {
       fixture.detectChanges();
 
       const triggerRect = overlay.querySelector('#level-one-trigger')!.getBoundingClientRect();
-      const panelRect = overlay.querySelectorAll('.mat-menu-panel')[1].getBoundingClientRect();
+      const panelRect = overlay.querySelectorAll('.cdk-overlay-pane')[1].getBoundingClientRect();
 
       expect(Math.round(triggerRect.right)).toBe(Math.round(panelRect.left));
       expect(Math.round(triggerRect.top)).toBe(Math.round(panelRect.top) + MENU_PANEL_TOP_PADDING);
@@ -859,7 +860,7 @@ describe('MatMenu', () => {
       fixture.detectChanges();
 
       const triggerRect = overlay.querySelector('#level-one-trigger')!.getBoundingClientRect();
-      const panelRect = overlay.querySelectorAll('.mat-menu-panel')[1].getBoundingClientRect();
+      const panelRect = overlay.querySelectorAll('.cdk-overlay-pane')[1].getBoundingClientRect();
 
       expect(Math.round(triggerRect.left)).toBe(Math.round(panelRect.right));
       expect(Math.round(triggerRect.top)).toBe(Math.round(panelRect.top) + MENU_PANEL_TOP_PADDING);
@@ -878,13 +879,13 @@ describe('MatMenu', () => {
       fixture.detectChanges();
 
       const triggerRect = overlay.querySelector('#level-one-trigger')!.getBoundingClientRect();
-      const panelRect = overlay.querySelectorAll('.mat-menu-panel')[1].getBoundingClientRect();
+      const panelRect = overlay.querySelectorAll('.cdk-overlay-pane')[1].getBoundingClientRect();
 
       expect(Math.round(triggerRect.left)).toBe(Math.round(panelRect.right));
       expect(Math.round(triggerRect.top)).toBe(Math.round(panelRect.top) + MENU_PANEL_TOP_PADDING);
     });
 
-    it('should fall back to aligning to the right edge of the trigger in rtl', () => {
+    it('should fall back to aligning to the right edge of the trigger in rtl', fakeAsync(() => {
       dir = 'rtl';
       compileTestComponent();
       instance.rootTriggerEl.nativeElement.style.position = 'fixed';
@@ -892,16 +893,18 @@ describe('MatMenu', () => {
       instance.rootTriggerEl.nativeElement.style.top = '50%';
       instance.rootTrigger.openMenu();
       fixture.detectChanges();
+      tick(500);
 
       instance.levelOneTrigger.openMenu();
       fixture.detectChanges();
+      tick(500);
 
       const triggerRect = overlay.querySelector('#level-one-trigger')!.getBoundingClientRect();
-      const panelRect = overlay.querySelectorAll('.mat-menu-panel')[1].getBoundingClientRect();
+      const panelRect = overlay.querySelectorAll('.cdk-overlay-pane')[1].getBoundingClientRect();
 
       expect(Math.round(triggerRect.right)).toBe(Math.round(panelRect.left));
       expect(Math.round(triggerRect.top)).toBe(Math.round(panelRect.top) + MENU_PANEL_TOP_PADDING);
-    });
+    }));
 
     it('should close all of the menus when an item is clicked', fakeAsync(() => {
       compileTestComponent();
@@ -1030,9 +1033,6 @@ describe('MatMenu', () => {
       tick(500);
 
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(0, 'Expected no open menus');
-      expect(instance.rootCloseCallback).toHaveBeenCalledTimes(1);
-      expect(instance.levelOneCloseCallback).toHaveBeenCalledTimes(1);
-      expect(instance.levelTwoCloseCallback).toHaveBeenCalledTimes(1);
     }));
 
     it('should toggle a nested menu when its trigger is added after init', fakeAsync(() => {
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index cc53f2eeb005..6f0400ccfa58 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -125,9 +125,7 @@ describe('MatSelect', () => {
           scrolled: () => scrolledSubject.asObservable()
         })}
       ]
-    });
-
-    TestBed.compileComponents();
+    }).compileComponents();
   }));
 
   beforeEach(inject([ViewportRuler], (_ruler: ViewportRuler) => {
@@ -1148,72 +1146,83 @@ describe('MatSelect', () => {
         formField.style.left = '20px';
       });
 
-      it('should align the first option with the trigger text if no option is selected', () => {
+      it('should align the first option with trigger text if no option is selected', async(() => {
         trigger.click();
         fixture.detectChanges();
 
         const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        // The panel should be scrolled to 0 because centering the option is not possible.
-        expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
-
-        checkTriggerAlignedWithOption(0);
-      });
-
-      it('should align a selected option too high to be centered with the trigger text', () => {
-        // Select the second option, because it can't be scrolled any further downward
-        fixture.componentInstance.control.setValue('pizza-1');
-        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          // The panel should be scrolled to 0 because centering the option is not possible.
+          expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+          checkTriggerAlignedWithOption(0);
+        });
+      }));
 
-        trigger.click();
-        fixture.detectChanges();
+      it('should align a selected option too high to be centered with the trigger text',
+        async(() => {
+          // Select the second option, because it can't be scrolled any further downward
+          fixture.componentInstance.control.setValue('pizza-1');
+          fixture.detectChanges();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+          trigger.click();
+          fixture.detectChanges();
 
-        // The panel should be scrolled to 0 because centering the option is not possible.
-        expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        checkTriggerAlignedWithOption(1);
-      });
+          fixture.whenStable().then(() => {
+            // The panel should be scrolled to 0 because centering the option is not possible.
+            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+            checkTriggerAlignedWithOption(1);
+          });
+        }));
 
-      it('should align a selected option in the middle with the trigger text', () => {
+      it('should align a selected option in the middle with the trigger text', async(() => {
         // Select the fifth option, which has enough space to scroll to the center
         fixture.componentInstance.control.setValue('chips-4');
         fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          trigger.click();
+          fixture.detectChanges();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        // The selected option should be scrolled to the center of the panel.
-        // This will be its original offset from the scrollTop - half the panel height + half the
-        // option height. 4 (index) * 48 (option height) = 192px offset from scrollTop
-        // 192 - 256/2 + 48/2 = 88px
-        expect(scrollContainer.scrollTop)
-            .toEqual(88, `Expected overlay panel to be scrolled to center the selected option.`);
+          fixture.whenStable().then(() => {
+            // The selected option should be scrolled to the center of the panel.
+            // This will be its original offset from the scrollTop - half the panel height + half
+            // the option height. 4 (index) * 48 (option height) = 192px offset from scrollTop
+            // 192 - 256/2 + 48/2 = 88px
+            expect(scrollContainer.scrollTop)
+              .toEqual(88, `Expected overlay panel to be scrolled to center the selected option.`);
 
-        checkTriggerAlignedWithOption(4);
-      });
+            checkTriggerAlignedWithOption(4);
+          });
+        });
+      }));
 
-      it('should align a selected option at the scroll max with the trigger text', () => {
+      it('should align a selected option at the scroll max with the trigger text', async(() => {
         // Select the last option in the list
         fixture.componentInstance.control.setValue('sushi-7');
         fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          trigger.click();
+          fixture.detectChanges();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        // The selected option should be scrolled to the max scroll position.
-        // This will be the height of the scrollContainer - the panel height.
-        // 8 options * 48px = 384 scrollContainer height, 384 - 256 = 128px max scroll
-        expect(scrollContainer.scrollTop)
-            .toEqual(128, `Expected overlay panel to be scrolled to its maximum position.`);
+          fixture.whenStable().then(() => {
+            // The selected option should be scrolled to the max scroll position.
+            // This will be the height of the scrollContainer - the panel height.
+            // 8 options * 48px = 384 scrollContainer height, 384 - 256 = 128px max scroll
+            expect(scrollContainer.scrollTop)
+                .toEqual(128, `Expected overlay panel to be scrolled to its maximum position.`);
 
-        checkTriggerAlignedWithOption(7);
-      });
+            checkTriggerAlignedWithOption(7);
+          });
+        });
+      }));
 
       it('should account for preceding label groups when aligning the option', async(() => {
         fixture.destroy();
@@ -1239,8 +1248,8 @@ describe('MatSelect', () => {
         fixture.whenStable().then(() => {
           // The selected option should be scrolled to the center of the panel.
           // This will be its original offset from the scrollTop - half the panel height + half the
-          // option height. 10 (option index + 3 group labels before it) * 48 (option height) =
-          // 480px. 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
+          // option height. 10 (option index + 3 group labels before it) * 48 (option height) = 480
+          // 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
           expect(Math.floor(scrollContainer.scrollTop))
               .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
 
@@ -1294,17 +1303,19 @@ describe('MatSelect', () => {
         fixture.componentInstance.control.setValue('chips-4');
         fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          trigger.click();
+          fixture.detectChanges();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        fixture.whenStable().then(() => {
-          expect(Math.ceil(scrollContainer.scrollTop))
-              .toEqual(Math.ceil(idealScrollTop + 5),
-                  `Expected panel to adjust scroll position to fit in viewport.`);
+          fixture.whenStable().then(() => {
+            expect(Math.ceil(scrollContainer.scrollTop))
+                .toEqual(Math.ceil(idealScrollTop + 5),
+                    `Expected panel to adjust scroll position to fit in viewport.`);
 
-          checkTriggerAlignedWithOption(4);
+            checkTriggerAlignedWithOption(4);
+          });
         });
       }));
 
@@ -1376,7 +1387,7 @@ describe('MatSelect', () => {
         });
       }));
 
-      it('should fall back to "above" positioning if scroll adjustment will not help', () => {
+      it('should fall back to "above" positioning if scroll adjustment will not help', async(() => {
         // Push the select to a position with not enough space on the bottom to open
         formField.style.bottom = '56px';
         fixture.detectChanges();
@@ -1388,13 +1399,14 @@ describe('MatSelect', () => {
         trigger.click();
         fixture.detectChanges();
 
-        const overlayPane = document.querySelector('.cdk-overlay-pane')!;
-        const triggerBottom = trigger.getBoundingClientRect().bottom;
-        const overlayBottom = overlayPane.getBoundingClientRect().bottom;
-        const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
+        fixture.whenStable().then(() => {
+          const overlayPane = document.querySelector('.cdk-overlay-pane')!;
+          const triggerBottom = trigger.getBoundingClientRect().bottom;
+          const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+          const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
 
-        // Expect no scroll to be attempted
-        expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+          // Expect no scroll to be attempted
+          expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
 
         const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
 
@@ -1403,11 +1415,12 @@ describe('MatSelect', () => {
         expect(Math.abs(difference) < 2)
             .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
 
-        expect(fixture.componentInstance.select._transformOrigin)
-            .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
-      });
+          expect(fixture.componentInstance.select._transformOrigin)
+              .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
+        });
+      }));
 
-      it('should fall back to "below" positioning if scroll adjustment will not help', () => {
+      it('should fall back to "below" positioning if scroll adjustment won\'t help', async(() => {
         // Push the select to a position with not enough space on the top to open
         formField.style.top = '85px';
 
@@ -1415,23 +1428,27 @@ describe('MatSelect', () => {
         fixture.componentInstance.control.setValue('sushi-7');
         fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          trigger.click();
+          fixture.detectChanges();
 
-        const overlayPane = document.querySelector('.cdk-overlay-pane')!;
-        const triggerTop = trigger.getBoundingClientRect().top;
-        const overlayTop = overlayPane.getBoundingClientRect().top;
-        const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
+          fixture.whenStable().then(() => {
+            const overlayPane = document.querySelector('.cdk-overlay-pane')!;
+            const triggerTop = trigger.getBoundingClientRect().top;
+            const overlayTop = overlayPane.getBoundingClientRect().top;
+            const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
 
-        // Expect scroll to remain at the max scroll position
-        expect(scrollContainer.scrollTop).toEqual(128, `Expected panel to be at max scroll.`);
+            // Expect scroll to remain at the max scroll position
+            expect(scrollContainer.scrollTop).toEqual(128, `Expected panel to be at max scroll.`);
 
-        expect(Math.floor(overlayTop))
-            .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
+            expect(Math.floor(overlayTop))
+                .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
 
-        expect(fixture.componentInstance.select._transformOrigin)
-            .toContain(`top`, `Expected panel animation to originate at the top.`);
-      });
+            expect(fixture.componentInstance.select._transformOrigin)
+                .toContain(`top`, `Expected panel animation to originate at the top.`);
+          });
+        });
+      }));
 
     });
 
@@ -1441,58 +1458,64 @@ describe('MatSelect', () => {
         formField.style.top = '200px';
       });
 
-      it('should stay within the viewport when overflowing on the left in ltr', fakeAsync(() => {
+      it('should stay within the viewport when overflowing on the left in ltr', async(() => {
         formField.style.left = '-100px';
         trigger.click();
-        tick(400);
         fixture.detectChanges();
 
-        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+        fixture.whenStable().then(() => {
+          const panelLeft = document.querySelector('.mat-select-panel')!
+              .getBoundingClientRect().left;
 
-        expect(panelLeft).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in ltr.`);
+          expect(panelLeft).toBeGreaterThan(0,
+              `Expected select panel to be inside the viewport in ltr.`);
+        });
       }));
 
-      it('should stay within the viewport when overflowing on the left in rtl', fakeAsync(() => {
+      it('should stay within the viewport when overflowing on the left in rtl', async(() => {
         dir.value = 'rtl';
         formField.style.left = '-100px';
         trigger.click();
-        tick(400);
         fixture.detectChanges();
 
-        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+        fixture.whenStable().then(() => {
+          const panelLeft = document.querySelector('.mat-select-panel')!
+              .getBoundingClientRect().left;
 
-        expect(panelLeft).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in rtl.`);
+          expect(panelLeft).toBeGreaterThan(0,
+              `Expected select panel to be inside the viewport in rtl.`);
+        });
       }));
 
-      it('should stay within the viewport when overflowing on the right in ltr', fakeAsync(() => {
+      it('should stay within the viewport when overflowing on the right in ltr', async(() => {
         formField.style.right = '-100px';
         trigger.click();
-        tick(400);
         fixture.detectChanges();
 
-        const viewportRect = viewportRuler.getViewportRect().right;
-        const panelRight = document.querySelector('.mat-select-panel')!
-            .getBoundingClientRect().right;
+        fixture.whenStable().then(() => {
+          const viewportRect = viewportRuler.getViewportRect().right;
+          const panelRight = document.querySelector('.mat-select-panel')!
+              .getBoundingClientRect().right;
 
-        expect(viewportRect - panelRight).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in ltr.`);
+          expect(viewportRect - panelRight).toBeGreaterThan(0,
+              `Expected select panel to be inside the viewport in ltr.`);
+        });
       }));
 
-      it('should stay within the viewport when overflowing on the right in rtl', fakeAsync(() => {
+      it('should stay within the viewport when overflowing on the right in rtl', async(() => {
         dir.value = 'rtl';
         formField.style.right = '-100px';
         trigger.click();
-        tick(400);
         fixture.detectChanges();
 
-        const viewportRect = viewportRuler.getViewportRect().right;
-        const panelRight = document.querySelector('.mat-select-panel')!
-            .getBoundingClientRect().right;
+        fixture.whenStable().then(() => {
+          const viewportRect = viewportRuler.getViewportRect().right;
+          const panelRight = document.querySelector('.mat-select-panel')!
+              .getBoundingClientRect().right;
 
-        expect(viewportRect - panelRight).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in rtl.`);
+          expect(viewportRect - panelRight).toBeGreaterThan(0,
+              `Expected select panel to be inside the viewport in rtl.`);
+        });
       }));
 
       it('should keep the position within the viewport on repeat openings', fakeAsync(() => {
@@ -1501,20 +1524,27 @@ describe('MatSelect', () => {
         fixture.detectChanges();
         tick(SELECT_OPEN_ANIMATION);
 
-        let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
-        expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
+        fixture.whenStable().then(() => {
+          let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-        fixture.componentInstance.select.close();
-        fixture.detectChanges();
-        tick(SELECT_CLOSE_ANIMATION);
+          expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
 
-        trigger.click();
-        fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
-        panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+          fixture.componentInstance.select.close();
+          fixture.detectChanges();
 
-        expect(panelLeft).toBeGreaterThan(0,
-            `Expected select panel continue being inside the viewport.`);
+          fixture.whenStable().then(() => {
+            trigger.click();
+            fixture.detectChanges();
+
+            fixture.whenStable().then(() => {
+              panelLeft = document.querySelector('.mat-select-panel')!
+                .getBoundingClientRect().left;
+
+              expect(panelLeft).toBeGreaterThan(0,
+                  `Expected select panel continue being inside the viewport.`);
+            });
+          });
+        });
       }));
     });
 
@@ -1539,7 +1569,7 @@ describe('MatSelect', () => {
         formField.style.marginRight = '20px';
       });
 
-      it('should align the first option properly when scrolled', () => {
+      it('should align the first option properly when scrolled', async(() => {
         // Give the select enough space to open
         fixture.componentInstance.heightBelow = 400;
         fixture.detectChanges();
@@ -1547,13 +1577,24 @@ describe('MatSelect', () => {
         // Scroll the select into view
         setScrollTop(1700);
 
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
+        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
+        // successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
+
         trigger.click();
         fixture.detectChanges();
 
-        checkTriggerAlignedWithOption(0);
-      });
+        fixture.whenStable().then(() => {
+          checkTriggerAlignedWithOption(0);
+        });
+      }));
 
-      it('should align a centered option properly when scrolled', () => {
+      it('should align a centered option properly when scrolled', async(() => {
         // Give the select enough space to open
         fixture.componentInstance.heightBelow = 400;
         fixture.detectChanges();
@@ -1561,32 +1602,50 @@ describe('MatSelect', () => {
         fixture.componentInstance.control.setValue('chips-4');
         fixture.detectChanges();
 
-        // Scroll the select into view
-        setScrollTop(1700);
+        fixture.whenStable().then(() => {
+          // Scroll the select into view
+          setScrollTop(1700);
+
+          // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+          // body causes karma's iframe for the test to stretch to fit that content once we attempt
+          // to scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does
+          // not successfully constrain its size. As such, skip assertions in environments where the
+          // window size has changed since the start of the test.
+          if (window.innerHeight > startingWindowHeight) {
+            return;
+          }
 
-        trigger.click();
-        fixture.detectChanges();
+          trigger.click();
+          fixture.detectChanges();
 
-        checkTriggerAlignedWithOption(4);
-      });
+          fixture.whenStable().then(() => {
+            checkTriggerAlignedWithOption(4);
+          });
+        });
+      }));
 
-      it('should align a centered option properly when scrolling while the panel is open', () => {
-        fixture.componentInstance.heightBelow = 400;
-        fixture.componentInstance.heightAbove = 400;
-        fixture.componentInstance.control.setValue('chips-4');
-        fixture.detectChanges();
+      it('should align a centered option properly when scrolling while the panel is open',
+        async(() => {
+          fixture.componentInstance.heightBelow = 400;
+          fixture.componentInstance.heightAbove = 400;
+          fixture.componentInstance.control.setValue('chips-4');
+          fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+          fixture.whenStable().then(() => {
+            trigger.click();
+            fixture.detectChanges();
 
-        setScrollTop(100);
-        scrolledSubject.next();
-        fixture.detectChanges();
+            fixture.whenStable().then(() => {
+              setScrollTop(100);
+              scrolledSubject.next();
+              fixture.detectChanges();
 
-        checkTriggerAlignedWithOption(4);
-      });
+              checkTriggerAlignedWithOption(4);
+            });
+          });
+        }));
 
-      it('should fall back to "above" positioning properly when scrolled', () => {
+      it('should fall back to "above" positioning properly when scrolled', async(() => {
         // Give the select insufficient space to open below the trigger
         fixture.componentInstance.heightAbove = 0;
         fixture.componentInstance.heightBelow = 100;
@@ -1608,18 +1667,20 @@ describe('MatSelect', () => {
         trigger.click();
         fixture.detectChanges();
 
-        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-        const triggerBottom = trigger.getBoundingClientRect().bottom;
-        const overlayBottom = overlayPane.getBoundingClientRect().bottom;
-        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
-
-        // Check that the values are within a pixel of each other. This avoids sub-pixel
-        // deviations between OS and browser versions.
-        expect(Math.abs(difference) < 2)
-            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
-      });
+        fixture.whenStable().then(() => {
+          const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+          const triggerBottom = trigger.getBoundingClientRect().bottom;
+          const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+          const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
+
+          // Check that the values are within a pixel of each other. This avoids sub-pixel
+          // deviations between OS and browser versions.
+          expect(Math.abs(difference) < 2)
+              .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
+        });
+      }));
 
-      it('should fall back to "below" positioning properly when scrolled', () => {
+      it('should fall back to "below" positioning properly when scrolled', async(() => {
         // Give plenty of space for the select to open below the trigger
         fixture.componentInstance.heightBelow = 650;
         fixture.detectChanges();
@@ -1631,16 +1692,28 @@ describe('MatSelect', () => {
         // Scroll the select so that it has insufficient space to open above the trigger
         setScrollTop(1950);
 
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
+        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
+        // successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
+
         trigger.click();
         fixture.detectChanges();
 
-        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-        const triggerTop = trigger.getBoundingClientRect().top;
-        const overlayTop = overlayPane.getBoundingClientRect().top;
+        fixture.whenStable().then(() => {
+          const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+          const triggerTop = trigger.getBoundingClientRect().top;
+          const overlayTop = overlayPane.getBoundingClientRect().top;
+
+          expect(Math.floor(overlayTop))
+              .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
+        });
+      }));
 
-        expect(Math.floor(overlayTop))
-            .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
-      });
     });
 
     describe('x-axis positioning', () => {
@@ -1649,38 +1722,39 @@ describe('MatSelect', () => {
         formField.style.left = '30px';
       });
 
-      it('should align the trigger and the selected option on the x-axis in ltr', fakeAsync(() => {
+      it('should align the trigger and the selected option on the x-axis in ltr', async(() => {
         trigger.click();
-        tick(400);
         fixture.detectChanges();
 
-        const triggerLeft = trigger.getBoundingClientRect().left;
-        const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
-            .getBoundingClientRect().left;
+        fixture.whenStable().then(() => {
+          const triggerLeft = trigger.getBoundingClientRect().left;
+          const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
+              .getBoundingClientRect().left;
 
-        // Each option is 32px wider than the trigger, so it must be adjusted 16px
-        // to ensure the text overlaps correctly.
-        expect(Math.floor(firstOptionLeft)).toEqual(Math.floor(triggerLeft - 16),
-            `Expected trigger to align with the selected option on the x-axis in LTR.`);
+          // Each option is 32px wider than the trigger, so it must be adjusted 16px
+          // to ensure the text overlaps correctly.
+          expect(Math.floor(firstOptionLeft)).toEqual(Math.floor(triggerLeft - 16),
+              `Expected trigger to align with the selected option on the x-axis in LTR.`);
+        });
       }));
 
-      it('should align the trigger and the selected option on the x-axis in rtl', fakeAsync(() => {
+      it('should align the trigger and the selected option on the x-axis in rtl', async(() => {
         dir.value = 'rtl';
         fixture.detectChanges();
 
         trigger.click();
-        tick(400);
         fixture.detectChanges();
-
-        const triggerRight = trigger.getBoundingClientRect().right;
-        const firstOptionRight =
-            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
-
-        // Each option is 32px wider than the trigger, so it must be adjusted 16px
-        // to ensure the text overlaps correctly.
-        expect(Math.floor(firstOptionRight))
-            .toEqual(Math.floor(triggerRight + 16),
-                `Expected trigger to align with the selected option on the x-axis in RTL.`);
+        fixture.whenStable().then(() => {
+          const triggerRight = trigger.getBoundingClientRect().right;
+          const firstOptionRight =
+              document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+
+          // Each option is 32px wider than the trigger, so it must be adjusted 16px
+          // to ensure the text overlaps correctly.
+          expect(Math.floor(firstOptionRight))
+              .toEqual(Math.floor(triggerRight + 16),
+                  `Expected trigger to align with the selected option on the x-axis in RTL.`);
+        });
       }));
     });
 
@@ -1714,20 +1788,21 @@ describe('MatSelect', () => {
         });
       }));
 
-      it('should adjust for the checkbox in rtl', fakeAsync(() => {
+      it('should adjust for the checkbox in rtl', async(() => {
         dir.value = 'rtl';
         trigger.click();
-        tick(400);
         multiFixture.detectChanges();
 
-        const triggerRight = trigger.getBoundingClientRect().right;
-        const firstOptionRight =
-            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+        multiFixture.whenStable().then(() => {
+          const triggerRight = trigger.getBoundingClientRect().right;
+          const firstOptionRight =
+              document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
 
-        // 44px accounts for the checkbox size, margin and the panel's padding.
-        expect(Math.floor(firstOptionRight))
+          // 44px accounts for the checkbox size, margin and the panel's padding.
+          expect(Math.floor(firstOptionRight))
             .toEqual(Math.floor(triggerRight + 44),
-                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
+              `Expected trigger label to align along x-axis, accounting for the checkbox.`);
+        });
       }));
     });
 
@@ -1745,24 +1820,26 @@ describe('MatSelect', () => {
         formField.style.left = '60px';
       });
 
-      it('should adjust for the group padding in ltr', fakeAsync(() => {
+      it('should adjust for the group padding in ltr', async(() => {
         groupFixture.componentInstance.control.setValue('oddish-1');
         groupFixture.detectChanges();
 
         trigger.click();
         groupFixture.detectChanges();
 
-        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
-        const triggerLeft = trigger.getBoundingClientRect().left;
-        const selectedOptionLeft = group.querySelector('mat-option.mat-selected')!
-            .getBoundingClientRect().left;
+        groupFixture.whenStable().then(() => {
+          const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
+          const triggerLeft = trigger.getBoundingClientRect().left;
+          const selectedOptionLeft = group.querySelector('mat-option.mat-selected')!
+              .getBoundingClientRect().left;
 
-        // 32px is the 16px default padding plus 16px of padding when an option is in a group.
-        expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 32),
-            `Expected trigger label to align along x-axis, accounting for the padding in ltr.`);
+          // 32px is the 16px default padding plus 16px of padding when an option is in a group.
+          expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 32),
+              `Expected trigger label to align along x-axis, accounting for the padding in ltr.`);
+        });
       }));
 
-      it('should adjust for the group padding in rtl', fakeAsync(() => {
+      it('should adjust for the group padding in rtl', async(() => {
         dir.value = 'rtl';
         groupFixture.componentInstance.control.setValue('oddish-1');
         groupFixture.detectChanges();
@@ -1770,30 +1847,34 @@ describe('MatSelect', () => {
         trigger.click();
         groupFixture.detectChanges();
 
-        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
-        const triggerRight = trigger.getBoundingClientRect().right;
-        const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
-            .getBoundingClientRect().right;
+        groupFixture.whenStable().then(() => {
+          const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
+          const triggerRight = trigger.getBoundingClientRect().right;
+          const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
+              .getBoundingClientRect().right;
 
-        // 32px is the 16px default padding plus 16px of padding when an option is in a group.
-        expect(Math.floor(selectedOptionRight)).toEqual(Math.floor(triggerRight + 32),
-            `Expected trigger label to align along x-axis, accounting for the padding in rtl.`);
+          // 32px is the 16px default padding plus 16px of padding when an option is in a group.
+          expect(Math.floor(selectedOptionRight)).toEqual(Math.floor(triggerRight + 32),
+              `Expected trigger label to align along x-axis, accounting for the padding in rtl.`);
+        });
       }));
 
       it('should not adjust if all options are within a group, except the selected one',
-        fakeAsync(() => {
+        async(() => {
           groupFixture.componentInstance.control.setValue('mime-11');
           groupFixture.detectChanges();
 
           trigger.click();
           groupFixture.detectChanges();
 
-          const selected = document.querySelector('.cdk-overlay-pane mat-option.mat-selected')!;
-          const selectedOptionLeft = selected.getBoundingClientRect().left;
-          const triggerLeft = trigger.getBoundingClientRect().left;
+          fixture.whenStable().then(() => {
+            const selected = document.querySelector('.cdk-overlay-pane mat-option.mat-selected')!;
+            const selectedOptionLeft = selected.getBoundingClientRect().left;
+            const triggerLeft = trigger.getBoundingClientRect().left;
 
-          // 16px is the default option padding
-          expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 16));
+            // 16px is the default option padding
+            expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 16));
+          });
         }));
 
       it('should align the first option to the trigger, if nothing is selected', async(() => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 210c386ac319..541bff6c1859 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -669,9 +669,11 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * Callback that is invoked when the overlay panel has been attached.
    */
   _onAttached(): void {
-    this._changeDetectorRef.detectChanges();
-    this._calculateOverlayOffsetX();
-    this.panel.nativeElement.scrollTop = this._scrollTop;
+    first.call(this.overlayDir.positionChange).subscribe(() => {
+      this._changeDetectorRef.detectChanges();
+      this._calculateOverlayOffsetX();
+      this.panel.nativeElement.scrollTop = this._scrollTop;
+    });
   }
 
   /** Returns the theme to be used on the panel. */
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 2133b84d810f..2fe92877e571 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -549,199 +549,231 @@ describe('MatSnackBar Positioning', () => {
 
   beforeEach(() => {
     viewContainerFixture = TestBed.createComponent(ComponentWithChildViewContainer);
-
     viewContainerFixture.detectChanges();
     testViewContainerRef = viewContainerFixture.componentInstance.childViewContainer;
   });
 
-  it('should default to bottom center', () => {
-    let config: MatSnackBarConfig = {};
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-   });
+  it('should default to bottom center', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel);
+
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
 
-  it('should be in the bottom left corner', () => {
-    let config: MatSnackBarConfig = {
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+
+      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+  }));
+
+  it('should be in the bottom left corner', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'bottom',
       horizontalPosition: 'left'
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-   });
+    });
+
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+    });
+   }));
 
-   it('should be in the bottom right corner', () => {
-    let config: MatSnackBarConfig = {
+   it('should be in the bottom right corner', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'bottom',
       horizontalPosition: 'right'
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-   });
+    });
 
-   it('should be in the bottom center', () => {
-    let config: MatSnackBarConfig = {
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+   }));
+
+   it('should be in the bottom center', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'bottom',
       horizontalPosition: 'center'
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-   });
+    });
+
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+   }));
 
-   it('should be in the top left corner', () => {
-    let config: MatSnackBarConfig = {
+   it('should be in the top left corner', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'left'
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-   });
+    });
 
-   it('should be in the top right corner', () => {
-    let config: MatSnackBarConfig = {
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+    });
+   }));
+
+   it('should be in the top right corner', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'right'
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-   });
+    });
 
-   it('should be in the top center', () => {
-    let config: MatSnackBarConfig = {
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+   }));
+
+   it('should be in the top center', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'center'
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-   });
+    });
+
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+   }));
 
-   it('should handle start based on direction (rtl)', () => {
-    let config: MatSnackBarConfig = {
+   it('should handle start based on direction (rtl)', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'start',
       direction: 'rtl',
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-  });
+    });
 
-  it('should handle start based on direction (ltr)', () => {
-    let config: MatSnackBarConfig = {
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+  }));
+
+  it('should handle start based on direction (ltr)', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'start',
       direction: 'ltr',
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-  });
+    });
 
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+    });
+  }));
 
-  it('should handle end based on direction (rtl)', () => {
-    let config: MatSnackBarConfig = {
+  it('should handle end based on direction (rtl)', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'end',
       direction: 'rtl',
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-  });
+    });
+
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
+    });
+  }));
 
-  it('should handle end based on direction (ltr)', () => {
-    let config: MatSnackBarConfig = {
+  it('should handle end based on direction (ltr)', async(() => {
+    snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'end',
       direction: 'ltr',
-    };
-    snackBar.open(simpleMessage, simpleActionLabel, config);
-    let containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-    let overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
-
-    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-  });
+    });
+
+    viewContainerFixture.detectChanges();
+    viewContainerFixture.whenStable().then(() => {
+      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
+    });
+  }));
 
 });
 

From 9976988e47bb471d7f5e48802c35d46a24925601 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Tue, 10 Oct 2017 19:38:07 -0400
Subject: [PATCH 303/575] docs(autocomplete): add mention of reactive forms
 (#7691)

* docs(autocomplete): add mention of reactive forms

* Rearrange words
---
 src/lib/autocomplete/autocomplete.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete.md b/src/lib/autocomplete/autocomplete.md
index 4989442172c7..91e50f70a845 100644
--- a/src/lib/autocomplete/autocomplete.md
+++ b/src/lib/autocomplete/autocomplete.md
@@ -3,8 +3,13 @@ You can read more about autocompletes in the [Material Design spec](https://mate
 
 ### Simple autocomplete
 
-Start by adding a regular `matInput` to the page. Let's assume you're using the `formControl`
-directive from the `@angular/forms` module to track the value of the input.
+Start by adding a regular `matInput` to your template. Let's assume you're using the `formControl`
+directive from `ReactiveFormsModule` to track the value of the input.
+
+> Note: It is possible to use template-driven forms instead, if you prefer. We use reactive forms
+in this example because it makes subscribing to changes in the input's value easy. For this example, be sure to
+import `ReactiveFormsModule` from `@angular/forms` into your `NgModule`. If you are unfamiliar with using reactive
+forms, you can read more about the subject in the [Angular documentation](https://angular.io/guide/reactive-forms).
 
 *my-comp.html*
 ```html

From 6f67e032e454cc8cc7386b4c7b21bd036abe0f91 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 11 Oct 2017 01:38:14 +0200
Subject: [PATCH 304/575] chore: fix dashboard deployment (#7632)

* Fixes that the dashboard deployment fails due to incorrect dependencies with AngularFire.
* Upgrades to the latest AngularFire version with a new API for the Realtime Database.
* Less code duplication for different panels in the dashboard.
---
 tools/dashboard/package.json                  |  4 ++--
 .../app/coverage-chart/coverage-chart.html    |  5 ++++-
 .../app/coverage-chart/coverage-chart.scss    | 20 ------------------
 .../src/app/coverage-chart/coverage-chart.ts  |  5 ++++-
 tools/dashboard/src/app/dashboard-app.ts      | 11 +++++-----
 .../src/app/payload-chart/payload-chart.html  |  5 ++++-
 .../src/app/payload-chart/payload-chart.scss  | 20 ------------------
 .../src/app/payload-chart/payload-chart.ts    |  5 ++++-
 tools/dashboard/src/styles.scss               | 21 +++++++++++++++++++
 9 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index cd3866c3c137..6f40ff784e83 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -22,10 +22,10 @@
     "@angular/platform-browser-dynamic": "^4.4.4",
     "@angular/router": "^4.4.4",
     "@swimlane/ngx-charts": "^6.0.0",
-    "angularfire2": "^4.0.0-rc.1",
+    "angularfire2": "^5.0.0-rc.2",
     "core-js": "^2.4.1",
     "d3": "^4.9.1",
-    "firebase": "^4.1.3",
+    "firebase": "^4.5.0",
     "rxjs": "^5.4.2",
     "zone.js": "^0.8.12"
   },
diff --git a/tools/dashboard/src/app/coverage-chart/coverage-chart.html b/tools/dashboard/src/app/coverage-chart/coverage-chart.html
index 8779d008b6d6..09bd71f98818 100644
--- a/tools/dashboard/src/app/coverage-chart/coverage-chart.html
+++ b/tools/dashboard/src/app/coverage-chart/coverage-chart.html
@@ -14,4 +14,7 @@
   [autoScale]="true">
 </ngx-charts-line-chart>
 
-<mat-spinner *ngIf="!chartData.length" class="coverage-chart-loading"></mat-spinner>
+<mat-spinner *ngIf="!chartData.length" class="panel-loading-indicator"
+             [diameter]="50"
+             [strokeWidth]="5">
+</mat-spinner>
diff --git a/tools/dashboard/src/app/coverage-chart/coverage-chart.scss b/tools/dashboard/src/app/coverage-chart/coverage-chart.scss
index 7f0563ac5cdc..e69de29bb2d1 100644
--- a/tools/dashboard/src/app/coverage-chart/coverage-chart.scss
+++ b/tools/dashboard/src/app/coverage-chart/coverage-chart.scss
@@ -1,20 +0,0 @@
-$coverage-chart-loading-size: 50px;
-
-:host {
-  display: block;
-  position: relative;
-
-  height: 400px;
-  width: 100%;
-  max-width: 700px;
-}
-
-.coverage-chart-loading {
-  position: absolute;
-
-  top: calc(50% - #{$coverage-chart-loading-size});
-  left: calc(50% - #{$coverage-chart-loading-size});
-
-  height: $coverage-chart-loading-size;
-  width: $coverage-chart-loading-size;
-}
diff --git a/tools/dashboard/src/app/coverage-chart/coverage-chart.ts b/tools/dashboard/src/app/coverage-chart/coverage-chart.ts
index df47bfa10828..24ff8a849b61 100644
--- a/tools/dashboard/src/app/coverage-chart/coverage-chart.ts
+++ b/tools/dashboard/src/app/coverage-chart/coverage-chart.ts
@@ -6,7 +6,10 @@ import {NgxChartResult} from '../ngx-definitions';
   selector: 'coverage-chart',
   templateUrl: './coverage-chart.html',
   styleUrls: ['./coverage-chart.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: {
+    'class': 'dashboard-panel'
+  }
 })
 export class CoverageChart {
 
diff --git a/tools/dashboard/src/app/dashboard-app.ts b/tools/dashboard/src/app/dashboard-app.ts
index bdfac0666513..e9c336bc42d2 100644
--- a/tools/dashboard/src/app/dashboard-app.ts
+++ b/tools/dashboard/src/app/dashboard-app.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {AngularFireDatabase, FirebaseListObservable} from 'angularfire2/database';
+import {AngularFireDatabase} from 'angularfire2/database';
+import {Observable} from 'rxjs/Observable';
 
 // This import is only used to define a generic type. The current TypeScript version incorrectly
 // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
@@ -14,14 +15,14 @@ import {PayloadResult, CoverageResult} from './data-definitions';
 export class DashboardApp {
 
   /** Observable that emits all payload results from Firebase. */
-  payloads: FirebaseListObservable<PayloadResult[]>;
+  payloads: Observable<PayloadResult[]>;
 
   /** Observable that emits all coverage reports from Firebase. */
-  coverage: FirebaseListObservable<CoverageResult[]>;
+  coverage: Observable<CoverageResult[]>;
 
   constructor(database: AngularFireDatabase) {
-    this.payloads = database.list(`payloads`);
-    this.coverage = database.list(`coverage-reports`);
+    this.payloads = database.list(`payloads`).valueChanges();
+    this.coverage = database.list(`coverage-reports`).valueChanges();
   }
 }
 
diff --git a/tools/dashboard/src/app/payload-chart/payload-chart.html b/tools/dashboard/src/app/payload-chart/payload-chart.html
index 0583940b4d97..09bd71f98818 100644
--- a/tools/dashboard/src/app/payload-chart/payload-chart.html
+++ b/tools/dashboard/src/app/payload-chart/payload-chart.html
@@ -14,4 +14,7 @@
   [autoScale]="true">
 </ngx-charts-line-chart>
 
-<mat-spinner *ngIf="!chartData.length" class="payload-chart-loading"></mat-spinner>
+<mat-spinner *ngIf="!chartData.length" class="panel-loading-indicator"
+             [diameter]="50"
+             [strokeWidth]="5">
+</mat-spinner>
diff --git a/tools/dashboard/src/app/payload-chart/payload-chart.scss b/tools/dashboard/src/app/payload-chart/payload-chart.scss
index c7f42c0a507b..e69de29bb2d1 100644
--- a/tools/dashboard/src/app/payload-chart/payload-chart.scss
+++ b/tools/dashboard/src/app/payload-chart/payload-chart.scss
@@ -1,20 +0,0 @@
-$payload-chart-loading-size: 50px;
-
-:host {
-  display: block;
-  position: relative;
-
-  height: 400px;
-  width: 100%;
-  max-width: 700px;
-}
-
-.payload-chart-loading {
-  position: absolute;
-
-  top: calc(50% - #{$payload-chart-loading-size});
-  left: calc(50% - #{$payload-chart-loading-size});
-
-  height: $payload-chart-loading-size;
-  width: $payload-chart-loading-size;
-}
diff --git a/tools/dashboard/src/app/payload-chart/payload-chart.ts b/tools/dashboard/src/app/payload-chart/payload-chart.ts
index 33703ee22311..33223fc50cc9 100644
--- a/tools/dashboard/src/app/payload-chart/payload-chart.ts
+++ b/tools/dashboard/src/app/payload-chart/payload-chart.ts
@@ -6,7 +6,10 @@ import {NgxChartItem, NgxChartResult} from '../ngx-definitions';
   selector: 'payload-chart',
   templateUrl: './payload-chart.html',
   styleUrls: ['./payload-chart.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: {
+    'class': 'dashboard-panel'
+  }
 })
 export class PayloadChart {
 
diff --git a/tools/dashboard/src/styles.scss b/tools/dashboard/src/styles.scss
index 62b0318fc4bc..e3ff923218a6 100644
--- a/tools/dashboard/src/styles.scss
+++ b/tools/dashboard/src/styles.scss
@@ -1,5 +1,26 @@
+$panel-loading-indicator-diameter: 50px;
+
 body, html {
   margin: 0;
   font-family: Roboto, Arial, sans-serif;
   min-height: 100vh;
 }
+
+.panel-loading-indicator {
+  position: absolute;
+
+  top: calc(50% - #{$panel-loading-indicator-diameter});
+  left: calc(50% - #{$panel-loading-indicator-diameter});
+
+  height: $panel-loading-indicator-diameter;
+  width: $panel-loading-indicator-diameter;
+}
+
+.dashboard-panel {
+  display: block;
+  position: relative;
+
+  height: 400px;
+  width: 100%;
+  max-width: 700px;
+}

From 0d003743b4c226fa85178ab54dda808ac9538598 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 11 Oct 2017 01:38:35 +0200
Subject: [PATCH 305/575] chore: inconsistent package version in screenshot
 tool (#7631)

Makes the `@angular/animations` version of the screenshot tool consistent with the rest of the Angular dependencies.
---
 tools/screenshot-test/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index a73f30f0f514..5ec860168667 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -9,7 +9,7 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.0.2",
+    "@angular/animations": "^4.4.4",
     "@angular/cdk": "angular/cdk-builds",
     "@angular/common": "^4.4.4",
     "@angular/compiler": "^4.4.4",

From 2d72ac9f0a24f49245207c0d368720d189a85fa9 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 11 Oct 2017 01:38:46 +0200
Subject: [PATCH 306/575] chore: remove outdated golden screenshots (#7628)

* chore: remove outdated golden screenshots

Currently if a screenshot test changed its name, the old golden reference image won't be deleted. This causes the screenshot diff task to compare against nothing (screenshot diffs now always fail).

With this change, outdated screenshot images will be deleted in master builds.

* Address feedback
---
 tools/gulp/tasks/screenshots.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/gulp/tasks/screenshots.ts b/tools/gulp/tasks/screenshots.ts
index fd5ffbd1fffa..4d5d65ae6668 100644
--- a/tools/gulp/tasks/screenshots.ts
+++ b/tools/gulp/tasks/screenshots.ts
@@ -188,15 +188,26 @@ function compareScreenshotFile(fileName: string, database: Database, prNumber: s
 }
 
 /** Uploads golden screenshots to the Google Cloud Storage bucket for the screenshots. */
-function uploadGoldenScreenshots() {
+async function uploadGoldenScreenshots() {
   const bucket = openScreenshotsBucket();
+  const localScreenshots = getLocalScreenshotFiles(SCREENSHOT_DIR);
+  const storageGoldenFiles = (await bucket.getFiles({prefix: FIREBASE_STORAGE_GOLDENS}))[0];
 
-  return Promise.all(getLocalScreenshotFiles(SCREENSHOT_DIR).map(fileName => {
+  // Only delete golden images that are outdated to avoid collisions with other screenshot diffs.
+  // Deleting every golden screenshot may also work, but will likely cause flakiness if multiple
+  // screenshot tasks run.
+  const deleteOutdatedGoldenFiles = Promise.all(storageGoldenFiles
+    .filter((file: any) => !localScreenshots.includes(path.basename(file.name)))
+    .map((file: any) => file.delete()));
+
+  const uploadNewGoldenImages = Promise.all(localScreenshots.map(fileName => {
     const filePath = path.join(SCREENSHOT_DIR, fileName);
     const storageDestination = `${FIREBASE_STORAGE_GOLDENS}/${fileName}`;
 
     return bucket.upload(filePath, { destination: storageDestination });
   }));
+
+  await Promise.all([deleteOutdatedGoldenFiles, uploadNewGoldenImages]);
 }
 
 /**

From 94584dbc5640893844274038995cd522aadba8ef Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 11 Oct 2017 01:38:53 +0200
Subject: [PATCH 307/575] build: deploy dashboard, screenshot-tool in cronjob
 (#7618)

* No longer deploy the dashboard and screenshot-tool per commit.
---
 scripts/ci/travis-deploy.sh | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/scripts/ci/travis-deploy.sh b/scripts/ci/travis-deploy.sh
index 1feb6871fbad..7350356143bd 100755
--- a/scripts/ci/travis-deploy.sh
+++ b/scripts/ci/travis-deploy.sh
@@ -27,18 +27,25 @@ echo ""
 echo "Starting the deployment script. Running mode: ${DEPLOY_MODE}"
 echo ""
 
-if [[ "${DEPLOY_MODE}" == "build-artifacts" ]]; then
-  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-build-artifacts.sh
-fi
-
-if [[ "${DEPLOY_MODE}" == "docs-content" ]]; then
-  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-docs-content.sh
-fi
-
-if [[ "${DEPLOY_MODE}" == "screenshot-tool" ]]; then
-  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-screenshot-tool.sh
-fi
-
-if [[ "${DEPLOY_MODE}" == "dashboard" ]]; then
-  retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-dashboard.sh
+# Deployment of the screenshot tool or dashboard should happen inside of a Cronjob.
+# For example, always deploying the screenshot functions on a per-commit base might cause problems
+# with the screenshot tests, because the functions can be non-responsive for a few seconds.
+if [[ "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then
+  if [[ "${DEPLOY_MODE}" == "screenshot-tool" ]]; then
+    retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-screenshot-tool.sh
+  fi
+
+  if [[ "${DEPLOY_MODE}" == "dashboard" ]]; then
+    retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-dashboard.sh
+  fi
+# Deployment of the build artifacts and docs-content should only happen on a per-commit base.
+# The target is to provide build artifacts in the GitHub repository for every commit.
+else
+  if [[ "${DEPLOY_MODE}" == "build-artifacts" ]]; then
+    retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-build-artifacts.sh
+  fi
+
+  if [[ "${DEPLOY_MODE}" == "docs-content" ]]; then
+    retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-docs-content.sh
+  fi
 fi

From 9b0771286aa867ca111987e5d8232137d6a45d33 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 10 Oct 2017 16:39:04 -0700
Subject: [PATCH 308/575] demo(sidenav): add accessibility demo pages (#7498)

* change sidenav demo to drawer

* create sidenav demo

* create sidenav example shells

* basic example

* mobile example

* dual demo

* some cleanup

* cleanup after rebase

* fix minor issues

* auto-focus first playlist element
---
 src/demo-app/a11y/a11y-module.ts              | 22 +++++++---
 src/demo-app/a11y/a11y.html                   | 18 +++++---
 src/demo-app/a11y/a11y.ts                     | 40 ++++++++++++-----
 src/demo-app/a11y/routes.ts                   | 12 +++++-
 .../a11y/sidenav/basic-sidenav-a11y.html      | 24 +++++++++++
 .../a11y/sidenav/basic-sidenav-a11y.ts        | 13 ++++++
 .../a11y/sidenav/dual-sidenav-a11y.html       | 43 +++++++++++++++++++
 .../a11y/sidenav/dual-sidenav-a11y.scss       | 13 ++++++
 .../a11y/sidenav/dual-sidenav-a11y.ts         | 20 +++++++++
 .../a11y/sidenav/mobile-sidenav-a11y.html     | 34 +++++++++++++++
 .../a11y/sidenav/mobile-sidenav-a11y.scss     |  4 ++
 .../a11y/sidenav/mobile-sidenav-a11y.ts       | 28 ++++++++++++
 src/demo-app/a11y/sidenav/shared.scss         | 29 +++++++++++++
 src/demo-app/a11y/sidenav/sidenav-a11y.html   | 20 +++++++++
 src/demo-app/a11y/sidenav/sidenav-a11y.ts     | 10 +++++
 src/demo-app/sidenav/sidenav-demo.html        |  4 +-
 src/demo-app/sidenav/sidenav-demo.ts          |  1 +
 17 files changed, 306 insertions(+), 29 deletions(-)
 create mode 100644 src/demo-app/a11y/sidenav/basic-sidenav-a11y.html
 create mode 100644 src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
 create mode 100644 src/demo-app/a11y/sidenav/dual-sidenav-a11y.html
 create mode 100644 src/demo-app/a11y/sidenav/dual-sidenav-a11y.scss
 create mode 100644 src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
 create mode 100644 src/demo-app/a11y/sidenav/mobile-sidenav-a11y.html
 create mode 100644 src/demo-app/a11y/sidenav/mobile-sidenav-a11y.scss
 create mode 100644 src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
 create mode 100644 src/demo-app/a11y/sidenav/shared.scss
 create mode 100644 src/demo-app/a11y/sidenav/sidenav-a11y.html
 create mode 100644 src/demo-app/a11y/sidenav/sidenav-a11y.ts

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index a19d73441da0..bbb138ab9e7d 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -40,6 +40,10 @@ import {
   FoggyTabContent,
 } from './tabs/tabs-a11y';
 import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
+import {SidenavAccessibilityDemo} from './sidenav/sidenav-a11y';
+import {SidenavBasicAccessibilityDemo} from './sidenav/basic-sidenav-a11y';
+import {SidenavDualAccessibilityDemo} from './sidenav/dual-sidenav-a11y';
+import {SidenavMobileAccessibilityDemo} from './sidenav/mobile-sidenav-a11y';
 
 
 @NgModule({
@@ -77,6 +81,7 @@ export class AccessibilityRoutingModule {}
     DialogNeptuneIFrameDialog,
     DialogWelcomeExampleDialog,
     ExpansionPanelAccessibilityDemo,
+    FoggyTabContent,
     GridListAccessibilityDemo,
     IconAccessibilityDemo,
     InputAccessibilityDemo,
@@ -84,15 +89,18 @@ export class AccessibilityRoutingModule {}
     ProgressBarAccessibilityDemo,
     ProgressSpinnerAccessibilityDemo,
     RadioAccessibilityDemo,
-    ToolbarAccessibilityDemo,
+    RainyTabContent,
+    SelectAccessibilityDemo,
+    SidenavAccessibilityDemo,
+    SidenavBasicAccessibilityDemo,
+    SidenavDualAccessibilityDemo,
+    SidenavMobileAccessibilityDemo,
     SliderAccessibilityDemo,
     SlideToggleAccessibilityDemo,
     SnackBarAccessibilityDemo,
-    SelectAccessibilityDemo,
-    TabsAccessibilityDemo,
     SunnyTabContent,
-    RainyTabContent,
-    FoggyTabContent,
+    TabsAccessibilityDemo,
+    ToolbarAccessibilityDemo,
     TooltipAccessibilityDemo,
   ],
   entryComponents: [
@@ -102,9 +110,9 @@ export class AccessibilityRoutingModule {}
     DialogNeptuneExampleDialog,
     DialogNeptuneIFrameDialog,
     DialogWelcomeExampleDialog,
-    SunnyTabContent,
-    RainyTabContent,
     FoggyTabContent,
+    RainyTabContent,
+    SunnyTabContent,
   ]
 })
 export class AccessibilityDemoModule {}
diff --git a/src/demo-app/a11y/a11y.html b/src/demo-app/a11y/a11y.html
index 3a0f318264e9..511dc5263762 100644
--- a/src/demo-app/a11y/a11y.html
+++ b/src/demo-app/a11y/a11y.html
@@ -1,11 +1,15 @@
-<h1>Accessibility Demo</h1>
+<ng-container *ngIf="!fullscreen">
+  <h1>
+    Accessibility Demo
+  </h1>
 
-<nav>
-  <a (click)="skipNavigation()" href="javascript:void(0)">Skip navigation</a>
-  <a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]" (click)="skipNavigation()">
-    {{navItem.name}}
-  </a>
-</nav>
+  <nav>
+    <a (click)="skipNavigation()" href="javascript:void(0)">Skip navigation</a>
+    <a *ngFor="let navItem of navItems" [routerLink]="[navItem.route]" (click)="skipNavigation()">
+      {{navItem.name}}
+    </a>
+  </nav>
+</ng-container>
 
 <div #maincontent tabindex="-1">
   <h1 #header tabindex="-1" *ngIf="!!currentComponent">{{currentComponent}} Demo</h1>
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index d6dd7063b52f..527c548d1eb1 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -1,5 +1,6 @@
-import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
+import {Component, ElementRef, OnDestroy, ViewChild, ViewEncapsulation} from '@angular/core';
 import {NavigationEnd, Router} from '@angular/router';
+import {Subscription} from 'rxjs/Subscription';
 
 @Component({
   moduleId: module.id,
@@ -16,17 +17,21 @@ export class AccessibilityHome {}
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class AccessibilityDemo {
+export class AccessibilityDemo implements OnDestroy {
   currentComponent: string = '';
 
+  fullscreen = false;
+
+  private _routerSubscription = Subscription.EMPTY;
+
   @ViewChild('maincontent') mainContent: ElementRef;
   @ViewChild('header') sectionHeader: ElementRef;
 
   navItems = [
     {name: 'Home', route: '.'},
     {name: 'Autocomplete', route: 'autocomplete'},
-    {name: 'Button', route: 'button'},
     {name: 'Button toggle', route: 'button-toggle'},
+    {name: 'Button', route: 'button'},
     {name: 'Card', route: 'card'},
     {name: 'Checkbox', route: 'checkbox'},
     {name: 'Chips', route: 'chips'},
@@ -40,26 +45,39 @@ export class AccessibilityDemo {
     {name: 'Progress bar', route: 'progress-bar'},
     {name: 'Progress spinner', route: 'progress-spinner'},
     {name: 'Radio buttons', route: 'radio'},
-    {name: 'Slider', route: 'slider'},
+    {name: 'Select', route: 'select'},
+    {name: 'Sidenav', route: 'sidenav'},
     {name: 'Slide toggle', route: 'slide-toggle'},
+    {name: 'Slider', route: 'slider'},
     {name: 'Snack bar', route: 'snack-bar'},
-    {name: 'Select', route: 'select'},
     {name: 'Tabs', route: 'tabs'},
     {name: 'Toolbar', route: 'toolbar'},
     {name: 'Tooltip', route: 'tooltip'},
   ];
 
   constructor(router: Router) {
-    router.events.subscribe(event => {
-      let nav = this.navItems.find(navItem => {
-        let fragments = (event as NavigationEnd).url.split('/');
-        return fragments[fragments.length - 1] === navItem.route;
-      });
-      this.currentComponent = nav ? nav.name : '';
+    this._routerSubscription = router.events.subscribe((e) => {
+      if (e instanceof NavigationEnd) {
+        let fragments = e.url.split('/');
+        let nav = this.navItems.find(navItem => {
+          return fragments[fragments.length - 1] === navItem.route;
+        });
+        this.currentComponent = nav ? nav.name : '';
+
+        let routerState = router.routerState.root;
+        while (routerState.children.length) {
+          routerState = routerState.children[0];
+        }
+        this.fullscreen = !!routerState.snapshot.data.fullscreen;
+      }
     });
   }
 
   skipNavigation() {
     (this.currentComponent ? this.sectionHeader : this.mainContent).nativeElement.focus();
   }
+
+  ngOnDestroy() {
+    this._routerSubscription.unsubscribe();
+  }
 }
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index 6f4af2c023e0..e075dd4acf25 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -24,6 +24,10 @@ import {SelectAccessibilityDemo} from './select/select-a11y';
 import {TabsAccessibilityDemo} from './tabs/tabs-a11y';
 import {TABS_DEMO_ROUTES} from './tabs/routes';
 import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
+import {SidenavAccessibilityDemo} from './sidenav/sidenav-a11y';
+import {SidenavBasicAccessibilityDemo} from './sidenav/basic-sidenav-a11y';
+import {SidenavDualAccessibilityDemo} from './sidenav/dual-sidenav-a11y';
+import {SidenavMobileAccessibilityDemo} from './sidenav/mobile-sidenav-a11y';
 
 export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: '', component: AccessibilityHome},
@@ -43,10 +47,14 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'progress-bar', component: ProgressBarAccessibilityDemo},
   {path: 'progress-spinner', component: ProgressSpinnerAccessibilityDemo},
   {path: 'radio', component: RadioAccessibilityDemo},
-  {path: 'slider', component: SliderAccessibilityDemo},
+  {path: 'select', component: SelectAccessibilityDemo},
+  {path: 'sidenav', component: SidenavAccessibilityDemo},
+  {path: 'sidenav/basic', component: SidenavBasicAccessibilityDemo, data: {fullscreen: true}},
+  {path: 'sidenav/dual', component: SidenavDualAccessibilityDemo, data: {fullscreen: true}},
+  {path: 'sidenav/mobile', component: SidenavMobileAccessibilityDemo, data: {fullscreen: true}},
   {path: 'slide-toggle', component: SlideToggleAccessibilityDemo},
+  {path: 'slider', component: SliderAccessibilityDemo},
   {path: 'snack-bar', component: SnackBarAccessibilityDemo},
-  {path: 'select', component: SelectAccessibilityDemo},
   {path: 'tabs', component: TabsAccessibilityDemo, children: TABS_DEMO_ROUTES},
   {path: 'toolbar', component: ToolbarAccessibilityDemo},
   {path: 'tooltip', component: TooltipAccessibilityDemo},
diff --git a/src/demo-app/a11y/sidenav/basic-sidenav-a11y.html b/src/demo-app/a11y/sidenav/basic-sidenav-a11y.html
new file mode 100644
index 000000000000..38dc634eb0a5
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/basic-sidenav-a11y.html
@@ -0,0 +1,24 @@
+<mat-toolbar color="primary" role="header" aria-label="Basic sidenav app">
+  <button mat-icon-button aria-label="Navigation menu" (click)="snav.toggle()">
+    <mat-icon aria-hidden="true">menu</mat-icon>
+  </button>
+  <h1 class="a11y-demo-sidenav-app-name">Basic Sidenav App</h1>
+</mat-toolbar>
+
+<mat-sidenav-container class="a11y-demo-sidenav-container">
+  <mat-sidenav #snav mode="side" role="navigation">
+    <mat-nav-list>
+      <a mat-list-item routerLink="..">Home</a>
+      <a mat-list-item routerLink="../basic">Basic sidenav example</a>
+      <a mat-list-item routerLink="../mobile">Responsive sidenav example</a>
+      <a mat-list-item routerLink="../dual">Dual sidenavs example</a>
+    </mat-nav-list>
+  </mat-sidenav>
+
+  <mat-sidenav-content role="region">
+    <button mat-raised-button aria-label="Close basic sidenav example" color="primary"
+            class="a11y-demo-sidenav-close" routerLink="..">
+      Close example
+    </button>
+  </mat-sidenav-content>
+</mat-sidenav-container>
diff --git a/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
new file mode 100644
index 000000000000..431a84f341e1
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
@@ -0,0 +1,13 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'basic-sidenav-a11y',
+  templateUrl: 'basic-sidenav-a11y.html',
+  styleUrls: ['shared.css'],
+  host: {'class': 'a11y-demo-sidenav-app'},
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+})
+export class SidenavBasicAccessibilityDemo {}
diff --git a/src/demo-app/a11y/sidenav/dual-sidenav-a11y.html b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.html
new file mode 100644
index 000000000000..38b6c43bb23e
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.html
@@ -0,0 +1,43 @@
+<mat-toolbar color="primary" role="header" aria-label="Dual sidenav app">
+  <button mat-icon-button aria-label="Navigation menu" (click)="startSnav.toggle()">
+    <mat-icon aria-hidden="true">menu</mat-icon>
+  </button>
+  <h1 class="a11y-demo-sidenav-app-name">Dual Sidenav App</h1>
+  <span class="a11y-demo-sidenav-spacer" aria-hidden="true"></span>
+  <button mat-icon-button aria-label="Playlist menu" (click)="endSnav.toggle()">
+    <mat-icon aria-hidden="true">playlist_play</mat-icon>
+  </button>
+</mat-toolbar>
+
+<mat-sidenav-container class="a11y-demo-sidenav-container">
+  <mat-sidenav #startSnav mode="side" role="navigation">
+    <mat-nav-list>
+      <a mat-list-item routerLink="..">Home</a>
+      <a mat-list-item routerLink="../basic">Basic sidenav example</a>
+      <a mat-list-item routerLink="../mobile">Responsive sidenav example</a>
+      <a mat-list-item routerLink="../dual">Dual sidenavs example</a>
+    </mat-nav-list>
+  </mat-sidenav>
+
+  <mat-sidenav-content role="region">
+    <button mat-raised-button aria-label="Close dual sidenav example" color="primary"
+            class="a11y-demo-sidenav-close" routerLink="..">
+      Close example
+    </button>
+  </mat-sidenav-content>
+
+  <mat-sidenav #endSnav mode="side" position="end" class="a11y-demo-sidenav-playlist" role="region"
+               (open)="playlist1.focus()">
+    <h2 class="a11y-demo-sidenav-playlist-header">Playlists</h2>
+    <button #playlist1 mat-button aria-label="Thumbs up playlist" (click)="play('Thumbs up')">
+      Thumbs up
+    </button>
+    <button mat-button aria-label="Last added playlist" (click)="play('Last added')">
+      Last added
+    </button>
+    <button mat-button aria-label="Free and purchased playlist"
+            (click)="play('Free and purchased')">
+      Free and purchased
+    </button>
+  </mat-sidenav>
+</mat-sidenav-container>
diff --git a/src/demo-app/a11y/sidenav/dual-sidenav-a11y.scss b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.scss
new file mode 100644
index 000000000000..7dca328564d8
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.scss
@@ -0,0 +1,13 @@
+.a11y-demo-sidenav-spacer {
+  flex: 1;
+}
+
+mat-sidenav.a11y-demo-sidenav-playlist {
+  display: flex;
+  flex-direction: column;
+  width: 200px;
+}
+
+.a11y-demo-sidenav-playlist-header {
+  text-align: center;
+}
diff --git a/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
new file mode 100644
index 000000000000..7d8271242a94
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
@@ -0,0 +1,20 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+import {MatSnackBar} from '@angular/material/snack-bar';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'dual-sidenav-a11y',
+  templateUrl: 'dual-sidenav-a11y.html',
+  styleUrls: ['shared.css', 'dual-sidenav-a11y.css'],
+  host: {'class': 'a11y-demo-sidenav-app'},
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+})
+export class SidenavDualAccessibilityDemo {
+  constructor(private _snackbar: MatSnackBar) {}
+
+  play(list: string) {
+    this._snackbar.open(`Playing "${list}"`, '', {duration: 1000});
+  }
+}
diff --git a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.html b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.html
new file mode 100644
index 000000000000..addb089205bd
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.html
@@ -0,0 +1,34 @@
+<mat-toolbar color="primary" role="header" aria-label="Responsive sidenav app"
+            [class.a11y-demo-sidenav-header-fixed]="mobileQuery.matches">
+  <button mat-icon-button aria-label="Navigation menu" (click)="snav.toggle()">
+    <mat-icon aria-hidden="true">menu</mat-icon>
+  </button>
+  <h1 class="a11y-demo-sidenav-app-name">Responsive Sidenav App</h1>
+</mat-toolbar>
+
+<mat-sidenav-container
+    class="a11y-demo-sidenav-container"
+    [class.a11y-demo-sidenav-container-fixed]="mobileQuery.matches"
+    [style.marginTop.px]="mobileQuery.matches ? 56 : 0">
+  <mat-sidenav
+      #snav
+      role="navigation"
+      [mode]="mobileQuery.matches ? 'over' : 'side'"
+      [fixedInViewport]="mobileQuery.matches">
+    <mat-nav-list>
+      <a mat-list-item routerLink="..">Home</a>
+      <a mat-list-item routerLink="../basic">Basic sidenav example</a>
+      <a mat-list-item routerLink="../mobile">Responsive sidenav example</a>
+      <a mat-list-item routerLink="../dual">Dual sidenavs example</a>
+    </mat-nav-list>
+    <p class="a11y-demo-sidenav-filler" *ngFor="let f of filler">Filler content</p>
+  </mat-sidenav>
+
+  <mat-sidenav-content role="region">
+    <button mat-raised-button aria-label="Close responsive sidenav example" color="primary"
+            class="a11y-demo-sidenav-close" routerLink="..">
+      Close example
+    </button>
+    <p class="a11y-demo-sidenav-filler" *ngFor="let f of filler">Filler content</p>
+  </mat-sidenav-content>
+</mat-sidenav-container>
diff --git a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.scss b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.scss
new file mode 100644
index 000000000000..5e3b79c72cb1
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.scss
@@ -0,0 +1,4 @@
+.a11y-demo-sidenav-header-fixed {
+  position: fixed;
+  z-index: 2;
+}
diff --git a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
new file mode 100644
index 000000000000..bbb3c5a57363
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
@@ -0,0 +1,28 @@
+import {ChangeDetectorRef, Component, OnDestroy, ViewEncapsulation} from '@angular/core';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'mobile-sidenav-a11y',
+  templateUrl: 'mobile-sidenav-a11y.html',
+  styleUrls: ['shared.css', 'mobile-sidenav-a11y.css'],
+  host: {'class': 'a11y-demo-sidenav-app'},
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+})
+export class SidenavMobileAccessibilityDemo implements OnDestroy {
+  mobileQuery = matchMedia('(max-width: 600px)');
+
+  filler = Array(20).fill(0);
+
+  _mobileQueryListener: () => void;
+
+  constructor(changeDetectorRef: ChangeDetectorRef) {
+    this._mobileQueryListener = () => changeDetectorRef.detectChanges();
+    this.mobileQuery.addListener(this._mobileQueryListener);
+  }
+
+  ngOnDestroy(): void {
+    this.mobileQuery.removeListener(this._mobileQueryListener);
+  }
+}
diff --git a/src/demo-app/a11y/sidenav/shared.scss b/src/demo-app/a11y/sidenav/shared.scss
new file mode 100644
index 000000000000..7311cf913d93
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/shared.scss
@@ -0,0 +1,29 @@
+.a11y-demo-sidenav-app {
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+.a11y-demo-sidenav-container {
+  flex: 1;
+}
+
+.a11y-demo-sidenav-container-fixed {
+  flex: none;
+}
+
+h1.a11y-demo-sidenav-app-name {
+  margin-left: 8px;
+}
+
+button.a11y-demo-sidenav-close {
+  margin: 20px;
+}
+
+.a11y-demo-sidenav-filler {
+  margin: 100px 20px;
+}
diff --git a/src/demo-app/a11y/sidenav/sidenav-a11y.html b/src/demo-app/a11y/sidenav/sidenav-a11y.html
new file mode 100644
index 000000000000..320b9babbabe
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/sidenav-a11y.html
@@ -0,0 +1,20 @@
+<section>
+  <h2>Basic sidenav (e.g. desktop app with hamburger menu)</h2>
+  <a mat-raised-button aria-label="View basic sidenav example" color="primary" routerLink="basic">
+    View example
+  </a>
+</section>
+
+<section>
+  <h2>Mobile sidenav (e.g. responsive design hamburger menu)</h2>
+  <a mat-raised-button aria-label="View mobile sidenav example" color="primary" routerLink="mobile">
+    View example
+  </a>
+</section>
+
+<section>
+  <h2>Dual sidenavs (e.g. music app with hamburger menu and playlist sidenav)</h2>
+  <a mat-raised-button aria-label="View dual sidenav example" color="primary" routerLink="dual">
+    View example
+  </a>
+</section>
diff --git a/src/demo-app/a11y/sidenav/sidenav-a11y.ts b/src/demo-app/a11y/sidenav/sidenav-a11y.ts
new file mode 100644
index 000000000000..af217e747617
--- /dev/null
+++ b/src/demo-app/a11y/sidenav/sidenav-a11y.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+
+@Component({
+  moduleId: module.id,
+  selector: 'sidenav-a11y',
+  templateUrl: 'sidenav-a11y.html',
+  preserveWhitespaces: false,
+})
+export class SidenavAccessibilityDemo {}
diff --git a/src/demo-app/sidenav/sidenav-demo.html b/src/demo-app/sidenav/sidenav-demo.html
index 3603f87421aa..31de4f40dd7f 100644
--- a/src/demo-app/sidenav/sidenav-demo.html
+++ b/src/demo-app/sidenav/sidenav-demo.html
@@ -6,7 +6,7 @@
   <mat-toolbar *ngIf="showHeader && !coverHeader">Header</mat-toolbar>
   <mat-sidenav-container>
     <mat-sidenav #start (open)="myinput.focus()" [mode]="mode"
-                [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
+                 [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       Start Side Sidenav
       <br>
       <button mat-button (click)="start.close()">Close</button>
@@ -21,7 +21,7 @@
     </mat-sidenav>
 
     <mat-sidenav #end position="end"
-                [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
+                 [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       End Side Sidenav
       <br>
       <button mat-button (click)="end.close()">Close</button>
diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts
index 37a8873aad82..5b4694dab24b 100644
--- a/src/demo-app/sidenav/sidenav-demo.ts
+++ b/src/demo-app/sidenav/sidenav-demo.ts
@@ -7,6 +7,7 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'sidenav-demo.html',
   styleUrls: ['sidenav-demo.css'],
   encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
 })
 export class SidenavDemo {
   isLaunched = false;

From 650103d0cda1199327baa29c7101286b1409d8ad Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 11 Oct 2017 13:47:53 -0700
Subject: [PATCH 309/575] demo(sidenav-a11y): use MediaMatcher (#7724)

---
 src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
index bbb3c5a57363..7dca39aca930 100644
--- a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
+++ b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
@@ -1,3 +1,4 @@
+import {MediaMatcher} from '@angular/cdk/layout';
 import {ChangeDetectorRef, Component, OnDestroy, ViewEncapsulation} from '@angular/core';
 
 
@@ -11,14 +12,15 @@ import {ChangeDetectorRef, Component, OnDestroy, ViewEncapsulation} from '@angul
   preserveWhitespaces: false,
 })
 export class SidenavMobileAccessibilityDemo implements OnDestroy {
-  mobileQuery = matchMedia('(max-width: 600px)');
+  mobileQuery: MediaQueryList;
 
   filler = Array(20).fill(0);
 
   _mobileQueryListener: () => void;
 
-  constructor(changeDetectorRef: ChangeDetectorRef) {
+  constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher) {
     this._mobileQueryListener = () => changeDetectorRef.detectChanges();
+    this.mobileQuery = media.matchMedia('(max-width: 600px)');
     this.mobileQuery.addListener(this._mobileQueryListener);
   }
 

From 291a87cb61185b2f558ff7c83ff79ce3561d85f7 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 11 Oct 2017 16:48:40 -0400
Subject: [PATCH 310/575] fix(icon): use SafeResourceUrl in getSvgIconFromUrl
 (#7535)

---
 src/lib/icon/icon-registry.ts |  2 +-
 src/lib/icon/icon.spec.ts     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 6bd6db4864c2..6bae77049de4 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -201,7 +201,7 @@ export class MatIconRegistry {
       return observableOf(cloneSvg(cachedIcon));
     }
 
-    return RxChain.from(this._loadSvgIconFromConfig(new SvgIconConfig(url)))
+    return RxChain.from(this._loadSvgIconFromConfig(new SvgIconConfig(safeUrl)))
       .call(doOperator, svg => this._cachedIconsByUrl.set(url!, svg))
       .call(map, svg => cloneSvg(svg))
       .result();
diff --git a/src/lib/icon/icon.spec.ts b/src/lib/icon/icon.spec.ts
index 13ff507a24fc..b84adc46734e 100644
--- a/src/lib/icon/icon.spec.ts
+++ b/src/lib/icon/icon.spec.ts
@@ -1,4 +1,4 @@
-import {inject, async, TestBed} from '@angular/core/testing';
+import {inject, async, fakeAsync, tick, TestBed} from '@angular/core/testing';
 import {SafeResourceUrl, DomSanitizer} from '@angular/platform-browser';
 import {HttpModule, XHRBackend} from '@angular/http';
 import {MockBackend} from '@angular/http/testing';
@@ -126,7 +126,7 @@ describe('MatIcon', () => {
   });
 
   describe('Icons from URLs', () => {
-    it('should register icon URLs by name', () => {
+    it('should register icon URLs by name', fakeAsync(() => {
       iconRegistry.addSvgIcon('fluffy', trust('cat.svg'));
       iconRegistry.addSvgIcon('fido', trust('dog.svg'));
 
@@ -153,7 +153,14 @@ describe('MatIcon', () => {
       svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'woof');
       expect(httpRequestUrls).toEqual(['dog.svg', 'cat.svg']);
-    });
+
+      // Assert that a registered icon can be looked-up by url.
+      iconRegistry.getSvgIconFromUrl(trust('cat.svg')).subscribe(element => {
+        verifyPathChildElement(element, 'meow');
+      });
+
+      tick();
+    }));
 
     it('should throw an error when using an untrusted icon url', () => {
       iconRegistry.addSvgIcon('fluffy', 'farm-set-1.svg');

From 4d04472d3feb25c3aafde6a890065244fdef0031 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Wed, 11 Oct 2017 22:18:54 -0700
Subject: [PATCH 311/575] chore(accordion): move CdkAccordion to @angular/cdk
 (#7530)

* Move UniqueSelectionDispatcher to CDK.

BREAKING CHANGE: UniqueSelectionDispatcher, UniqueSelectionDispatcherListener and UNIQUE_SELECTION_DISPATCHER_PROVIDER are no longer
available from @angular/material and instead must be imported from @angular/cdk/collections

* Move UniqueSelectionDispatcher to CDK.

BREAKING CHANGE: UniqueSelectionDispatcher, UniqueSelectionDispatcherListener and UNIQUE_SELECTION_DISPATCHER_PROVIDER are no longer
available from @angular/material and instead must be imported from @angular/cdk/collections

* Move CdkAccordion to @angular/cdk/accordion

BREAKING CHANGE:
  - CdkAccordion is now in @angular/cdk/accordion
  - AccordionChild is renamed to CdkAccordionChild
  - CdkAccordion no longer has displayMode and hideToggle @Inputs
  - CdkAccordionItem is now a @Directive
  - CdkAccordion is now exportedAs CdkAccordion for template referencing
  - CdkAccordionItem is now exported as CdkAccordionItem for template referencing
---
 src/cdk/accordion/accordion-item.spec.ts      | 155 ++++++++++++++++++
 .../accordion}/accordion-item.ts              |  15 +-
 src/cdk/accordion/accordion-module.ts         |  19 +++
 src/cdk/accordion/accordion.spec.ts           |  67 ++++++++
 src/cdk/accordion/accordion.ts                |  30 ++++
 src/cdk/accordion/index.ts                    |   9 +
 src/cdk/accordion/public-api.ts               |  11 ++
 src/cdk/accordion/tsconfig-build.json         |  13 ++
 src/cdk/accordion/tsconfig-es5.json           |  13 ++
 src/demo-app/demo-material-module.ts          |   2 +
 src/demo-app/expansion/expansion-demo.html    |  37 ++++-
 src/demo-app/system-config.ts                 |   1 +
 src/e2e-app/system-config.ts                  |   1 +
 src/lib/expansion/accordion.ts                |  38 ++---
 src/lib/expansion/expansion-module.ts         |  14 +-
 src/lib/expansion/expansion-panel.ts          |  20 ++-
 src/lib/expansion/public-api.ts               |  19 +--
 src/lib/radio/radio-module.ts                 |   4 +-
 test/karma-test-shim.js                       |   1 +
 19 files changed, 408 insertions(+), 61 deletions(-)
 create mode 100644 src/cdk/accordion/accordion-item.spec.ts
 rename src/{lib/expansion => cdk/accordion}/accordion-item.ts (89%)
 create mode 100644 src/cdk/accordion/accordion-module.ts
 create mode 100644 src/cdk/accordion/accordion.spec.ts
 create mode 100644 src/cdk/accordion/accordion.ts
 create mode 100644 src/cdk/accordion/index.ts
 create mode 100644 src/cdk/accordion/public-api.ts
 create mode 100644 src/cdk/accordion/tsconfig-build.json
 create mode 100644 src/cdk/accordion/tsconfig-es5.json

diff --git a/src/cdk/accordion/accordion-item.spec.ts b/src/cdk/accordion/accordion-item.spec.ts
new file mode 100644
index 000000000000..57604d67cd43
--- /dev/null
+++ b/src/cdk/accordion/accordion-item.spec.ts
@@ -0,0 +1,155 @@
+import {async, TestBed, ComponentFixture} from '@angular/core/testing';
+import {Component} from '@angular/core';
+import {By} from '@angular/platform-browser';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {CdkAccordionModule, CdkAccordionItem} from './public-api';
+
+describe('CdkAccordionItem', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserAnimationsModule,
+        CdkAccordionModule
+      ],
+      declarations: [
+        SingleItem,
+        ItemGroupWithoutAccordion,
+        ItemGroupWithAccordion
+      ],
+    });
+    TestBed.compileComponents();
+  }));
+
+  describe('single item', () => {
+    let fixture: ComponentFixture<SingleItem>;
+    let item: CdkAccordionItem;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SingleItem);
+      item = fixture.debugElement
+        .query(By.directive(CdkAccordionItem))
+        .injector.get(CdkAccordionItem);
+    });
+
+    it('should toggle its expanded state', () => {
+      expect(item.expanded).toBeFalsy();
+      item.toggle();
+      expect(item.expanded).toBeTruthy();
+      item.toggle();
+      expect(item.expanded).toBeFalsy();
+    });
+
+    it('should set its expanded state to expanded', () => {
+      item.expanded = false;
+      item.open();
+      expect(item.expanded).toBeTruthy();
+    });
+
+    it('should set its expanded state to closed', () => {
+      item.expanded = true;
+      item.close();
+      expect(item.expanded).toBeFalsy();
+    });
+
+    it('should emit a closed event', () => {
+      spyOn(item.closed, 'emit');
+      item.close();
+      fixture.detectChanges();
+      expect(item.closed.emit).toHaveBeenCalledWith();
+    });
+
+    it('should emit an opened event', () => {
+      spyOn(item.opened, 'emit');
+      item.open();
+      fixture.detectChanges();
+      expect(item.opened.emit).toHaveBeenCalledWith();
+    });
+
+    it('should emit an destroyed event', () => {
+      spyOn(item.destroyed, 'emit');
+      item.ngOnDestroy();
+      fixture.detectChanges();
+      expect(item.destroyed.emit).toHaveBeenCalledWith();
+    });
+  });
+
+  describe('items without accordion', () => {
+    let fixture: ComponentFixture<SingleItem>;
+    let firstItem: CdkAccordionItem;
+    let secondItem: CdkAccordionItem;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ItemGroupWithoutAccordion);
+      [firstItem, secondItem] = fixture.debugElement
+        .queryAll(By.directive(CdkAccordionItem))
+        .map(el => {
+          return el.injector.get(CdkAccordionItem) as CdkAccordionItem;
+        });
+    });
+
+    it('should not change expanded state based on unrelated items', () => {
+      expect(firstItem.expanded).toBeFalsy();
+      expect(secondItem.expanded).toBeFalsy();
+      firstItem.open();
+      fixture.detectChanges();
+      expect(firstItem.expanded).toBeTruthy();
+      expect(secondItem.expanded).toBeFalsy();
+      secondItem.open();
+      fixture.detectChanges();
+      expect(firstItem.expanded).toBeTruthy();
+      expect(secondItem.expanded).toBeTruthy();
+    });
+  });
+
+
+  describe('items in accordion', () => {
+    let fixture: ComponentFixture<SingleItem>;
+    let firstItem: CdkAccordionItem;
+    let secondItem: CdkAccordionItem;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ItemGroupWithAccordion);
+      [firstItem, secondItem] = fixture.debugElement
+        .queryAll(By.directive(CdkAccordionItem))
+        .map(el => {
+          return el.injector.get(CdkAccordionItem) as CdkAccordionItem;
+        });
+    });
+
+    it('should change expanded state based on related items', () => {
+      expect(firstItem.expanded).toBeFalsy();
+      expect(secondItem.expanded).toBeFalsy();
+      firstItem.open();
+      fixture.detectChanges();
+      expect(firstItem.expanded).toBeTruthy();
+      expect(secondItem.expanded).toBeFalsy();
+      secondItem.open();
+      fixture.detectChanges();
+      expect(firstItem.expanded).toBeFalsy();
+      expect(secondItem.expanded).toBeTruthy();
+    });
+  });
+});
+
+@Component({
+  template: `<cdk-accordion-item #item1></cdk-accordion-item>`
+})
+class SingleItem {}
+
+@Component({
+  template: `
+    <cdk-accordion-item #item1></cdk-accordion-item>
+    <cdk-accordion-item #item2></cdk-accordion-item>
+  `
+})
+class ItemGroupWithoutAccordion {}
+
+@Component({
+  template: `
+    <cdk-accordion>
+      <cdk-accordion-item #item1></cdk-accordion-item>
+      <cdk-accordion-item #item2></cdk-accordion-item>
+    </cdk-accordion>
+  `
+})
+class ItemGroupWithAccordion {}
diff --git a/src/lib/expansion/accordion-item.ts b/src/cdk/accordion/accordion-item.ts
similarity index 89%
rename from src/lib/expansion/accordion-item.ts
rename to src/cdk/accordion/accordion-item.ts
index 023af49a9b0f..1323bf00cca3 100644
--- a/src/lib/expansion/accordion-item.ts
+++ b/src/cdk/accordion/accordion-item.ts
@@ -8,9 +8,9 @@
 
 import {
   Output,
+  Directive,
   EventEmitter,
   Input,
-  Injectable,
   OnDestroy,
   Optional,
   ChangeDetectorRef,
@@ -18,15 +18,18 @@ import {
 import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {CdkAccordion} from './accordion';
 
-/** Used to generate unique ID for each expansion panel. */
+/** Used to generate unique ID for each accordion item. */
 let nextId = 0;
 
 /**
- * An abstract class to be extended and decorated as a component.  Sets up all
+ * An basic directive expected to be extended and decorated as a component.  Sets up all
  * events and attributes needed to be managed by a CdkAccordion parent.
  */
-@Injectable()
-export class AccordionItem implements OnDestroy {
+@Directive({
+  selector: 'cdk-accordion-item',
+  exportAs: 'cdkAccordionItem',
+})
+export class CdkAccordionItem implements OnDestroy {
   /** Event emitted every time the AccordionItem is closed. */
   @Output() closed = new EventEmitter<void>();
   /** Event emitted every time the AccordionItem is opened. */
@@ -62,7 +65,7 @@ export class AccordionItem implements OnDestroy {
   }
   private _expanded: boolean;
 
-  /** Unregister function for _expansionDispatcher **/
+  /** Unregister function for _expansionDispatcher. */
   private _removeUniqueSelectionListener: () => void = () => {};
 
   constructor(@Optional() public accordion: CdkAccordion,
diff --git a/src/cdk/accordion/accordion-module.ts b/src/cdk/accordion/accordion-module.ts
new file mode 100644
index 000000000000..7536e3ef4e53
--- /dev/null
+++ b/src/cdk/accordion/accordion-module.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {NgModule} from '@angular/core';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
+import {CdkAccordion} from './accordion';
+import {CdkAccordionItem} from './accordion-item';
+
+@NgModule({
+  exports: [CdkAccordion, CdkAccordionItem],
+  declarations: [CdkAccordion, CdkAccordionItem],
+  providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER],
+})
+export class CdkAccordionModule {}
diff --git a/src/cdk/accordion/accordion.spec.ts b/src/cdk/accordion/accordion.spec.ts
new file mode 100644
index 000000000000..4fd65bf86a60
--- /dev/null
+++ b/src/cdk/accordion/accordion.spec.ts
@@ -0,0 +1,67 @@
+import {async, TestBed} from '@angular/core/testing';
+import {Component, ViewChild} from '@angular/core';
+import {By} from '@angular/platform-browser';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {CdkAccordionModule, CdkAccordionItem} from './public-api';
+
+describe('CdkAccordion', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserAnimationsModule,
+        CdkAccordionModule
+      ],
+      declarations: [
+        SetOfItems
+      ],
+    });
+    TestBed.compileComponents();
+  }));
+
+  it('should ensure only one item is expanded at a time', () => {
+    const fixture = TestBed.createComponent(SetOfItems);
+    const [firstPanel, secondPanel] = fixture.debugElement
+      .queryAll(By.directive(CdkAccordionItem))
+      .map(el => {
+        return el.injector.get(CdkAccordionItem) as CdkAccordionItem;
+      });
+
+    firstPanel.open();
+    fixture.detectChanges();
+    expect(firstPanel.expanded).toBeTruthy();
+    expect(secondPanel.expanded).toBeFalsy();
+
+    secondPanel.open();
+    fixture.detectChanges();
+    expect(firstPanel.expanded).toBeFalsy();
+    expect(secondPanel.expanded).toBeTruthy();
+  });
+
+  it('should allow multiple items to be expanded simultaneously', () => {
+    const fixture = TestBed.createComponent(SetOfItems);
+    const [firstPanel, secondPanel] = fixture.debugElement
+      .queryAll(By.directive(CdkAccordionItem))
+      .map(el => {
+        return el.injector.get(CdkAccordionItem) as CdkAccordionItem;
+      });
+
+    fixture.componentInstance.multi = true;
+    fixture.detectChanges();
+    firstPanel.expanded = true;
+    secondPanel.expanded = true;
+    fixture.detectChanges();
+    expect(firstPanel.expanded).toBeTruthy();
+    expect(secondPanel.expanded).toBeTruthy();
+  });
+});
+
+@Component({template: `
+  <cdk-accordion [multi]="multi">
+    <cdk-accordion-item #item1></cdk-accordion-item>
+    <cdk-accordion-item #item2></cdk-accordion-item>
+  </cdk-accordion>`})
+class SetOfItems {
+  @ViewChild('item1') item1;
+  @ViewChild('item2') item2;
+  multi: boolean = false;
+}
diff --git a/src/cdk/accordion/accordion.ts b/src/cdk/accordion/accordion.ts
new file mode 100644
index 000000000000..cc8e4e2a899b
--- /dev/null
+++ b/src/cdk/accordion/accordion.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google LLC 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, Input} from '@angular/core';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+
+/** Used to generate unique ID for each accordion. */
+let nextId = 0;
+
+/**
+ * Directive whose purpose is to manage the expanded state of CdkAccordionItem children.
+ */
+@Directive({
+  selector: 'cdk-accordion, [cdk-accordion]',
+  exportAs: 'cdkAccordion',
+})
+export class CdkAccordion {
+  /** A readonly id value to use for unique selection coordination. */
+  readonly id = `cdk-accordion-${nextId++}`;
+
+  /** Whether the accordion should allow multiple expanded accordion items simulateously. */
+  @Input() get multi(): boolean { return this._multi; }
+  set multi(multi: boolean) { this._multi = coerceBooleanProperty(multi); }
+  private  _multi: boolean = false;
+}
diff --git a/src/cdk/accordion/index.ts b/src/cdk/accordion/index.ts
new file mode 100644
index 000000000000..746305603e52
--- /dev/null
+++ b/src/cdk/accordion/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+ export * from './public-api';
diff --git a/src/cdk/accordion/public-api.ts b/src/cdk/accordion/public-api.ts
new file mode 100644
index 000000000000..9464746d6f99
--- /dev/null
+++ b/src/cdk/accordion/public-api.ts
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+ export {CdkAccordionItem} from './accordion-item';
+export {CdkAccordion} from './accordion';
+export * from './accordion-module';
diff --git a/src/cdk/accordion/tsconfig-build.json b/src/cdk/accordion/tsconfig-build.json
new file mode 100644
index 000000000000..054f98f2f2fe
--- /dev/null
+++ b/src/cdk/accordion/tsconfig-build.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-build",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/accordion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/accordion/tsconfig-es5.json b/src/cdk/accordion/tsconfig-es5.json
new file mode 100644
index 000000000000..96ab7d413373
--- /dev/null
+++ b/src/cdk/accordion/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/accordion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index 4da1bc2e0575..c5903c2bbe35 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -33,6 +33,7 @@ import {
 } from '@angular/material';
 import {MatNativeDateModule, MatRippleModule} from '@angular/material';
 import {CdkTableModule} from '@angular/cdk/table';
+import {CdkAccordionModule} from '@angular/cdk/accordion';
 import {A11yModule} from '@angular/cdk/a11y';
 import {BidiModule} from '@angular/cdk/bidi';
 import {OverlayModule} from '@angular/cdk/overlay';
@@ -80,6 +81,7 @@ import {PortalModule} from '@angular/cdk/portal';
     CdkTableModule,
     A11yModule,
     BidiModule,
+    CdkAccordionModule,
     ObserversModule,
     OverlayModule,
     PlatformModule,
diff --git a/src/demo-app/expansion/expansion-demo.html b/src/demo-app/expansion/expansion-demo.html
index 3c3c0ee0c724..71f8aac725ae 100644
--- a/src/demo-app/expansion/expansion-demo.html
+++ b/src/demo-app/expansion/expansion-demo.html
@@ -25,7 +25,7 @@ <h1>Single Expansion Panel</h1>
 </mat-form-field>
 <br>
 
-<h1>Accordion</h1>
+<h1>matAccordion</h1>
 <div>
   <p>Accordion Options</p>
   <div>
@@ -65,3 +65,38 @@ <h1>Accordion</h1>
     </mat-action-row>
   </mat-expansion-panel>
 </mat-accordion>
+<!--
+<h1>CdkAccordion</h1>
+<div>
+  <p>Accordion Options</p>
+  <div>
+    <mat-slide-toggle [(ngModel)]="accordion1.multi">Allow Multi Expansion</mat-slide-toggle>
+  </div>
+</div>
+<cdk-accordion class="mat-expansion-demo-width" #accordion1="cdkAccordion">
+  <cdk-accordion-item #item1="cdkAccordionItem">
+    <p>
+      Item 1:
+      <button mat-button (click)="item1.expanded = true">Expand</button>
+      <button mat-button (click)="item1.expanded = false">Collapse</button>
+    </p>
+    <p *ngIf="item1.expanded">I only show if item 1 is expanded</p>
+  </cdk-accordion-item>
+  <cdk-accordion-item #item2="cdkAccordionItem">
+    <p>
+      Item 2:
+      <button mat-button (click)="item2.expanded = true">Expand</button>
+      <button mat-button (click)="item2.expanded = false">Collapse</button>
+    </p>
+    <p *ngIf="item2.expanded">I only show if item 2 is expanded</p>
+  </cdk-accordion-item>
+  <cdk-accordion-item #item3="cdkAccordionItem">
+    <p>
+      Item 3:
+      <button mat-button (click)="item3.expanded = true">Expand</button>
+      <button mat-button (click)="item3.expanded = false">Collapse</button>
+    </p>
+    <p *ngIf="item3.expanded">I only show if item 3 is expanded</p>
+  </cdk-accordion-item>
+</cdk-accordion>
+ -->
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 47c7ff114954..e67879e8575d 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -31,6 +31,7 @@ System.config({
     '@angular/material': 'dist/packages/material/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
+    '@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
     '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index e59642791d16..291c4a71f0fd 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -28,6 +28,7 @@ System.config({
     '@angular/material': 'dist/bundles/material.umd.js',
     '@angular/cdk': 'dist/bundles/cdk.umd.js',
     '@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
+    '@angular/cdk/accordion': 'dist/bundles/cdk-accordion.umd.js',
     '@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
     '@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
     '@angular/cdk/collections': 'dist/bundles/cdk-collections.umd.js',
diff --git a/src/lib/expansion/accordion.ts b/src/lib/expansion/accordion.ts
index 8e4291a2a43d..fab66e184c0e 100644
--- a/src/lib/expansion/accordion.ts
+++ b/src/lib/expansion/accordion.ts
@@ -8,29 +8,25 @@
 
 import {Directive, Input} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {CdkAccordion} from '@angular/cdk/accordion';
+
+/** Workaround for https://github.com/angular/angular/issues/17849 */
+export const _CdkAccordion = CdkAccordion;
 
 /** MatAccordion's display modes. */
 export type MatAccordionDisplayMode = 'default' | 'flat';
 
-/** Unique ID counter */
-let nextId = 0;
-
 /**
- * Directive whose purpose is to manage the expanded state of CdkAccordionItem children.
+ * Directive for a Material Design Accordion.
  */
 @Directive({
-  selector: 'cdk-accordion, [cdk-accordion]',
-  exportAs: 'cdkAccordion',
+  selector: 'mat-accordion',
+  exportAs: 'matAccordion',
+  host: {
+    class: 'mat-accordion'
+  }
 })
-export class CdkAccordion {
-  /** A readonly id value to use for unique selection coordination. */
-  readonly id = `cdk-accordion-${nextId++}`;
-
-  /** Whether the accordion should allow multiple expanded accordion items simulateously. */
-  @Input() get multi(): boolean { return this._multi; }
-  set multi(multi: boolean) { this._multi = coerceBooleanProperty(multi); }
-  private  _multi: boolean = false;
-
+export class MatAccordion extends _CdkAccordion {
   /** Whether the expansion indicator should be hidden. */
   @Input() get hideToggle(): boolean { return this._hideToggle; }
   set hideToggle(show: boolean) { this._hideToggle = coerceBooleanProperty(show); }
@@ -46,15 +42,3 @@ export class CdkAccordion {
    */
   @Input() displayMode: MatAccordionDisplayMode = 'default';
 }
-
-/**
- * Directive for a Material Design Accordion.
- */
-@Directive({
-  selector: 'mat-accordion',
-  exportAs: 'matAccordion',
-  host: {
-    class: 'mat-accordion'
-  }
-})
-export class MatAccordion extends CdkAccordion {}
diff --git a/src/lib/expansion/expansion-module.ts b/src/lib/expansion/expansion-module.ts
index 3df247680e1e..85c952ca56b4 100644
--- a/src/lib/expansion/expansion-module.ts
+++ b/src/lib/expansion/expansion-module.ts
@@ -9,9 +9,14 @@
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
+import {CdkAccordionModule} from '@angular/cdk/accordion';
 import {A11yModule} from '@angular/cdk/a11y';
-import {CdkAccordion, MatAccordion} from './accordion';
-import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel';
+import {MatAccordion} from './accordion';
+import {
+  MatExpansionPanel,
+  MatExpansionPanelActionRow,
+  MatExpansionPanelBase
+} from './expansion-panel';
 import {
   MatExpansionPanelDescription,
   MatExpansionPanelHeader,
@@ -20,9 +25,8 @@ import {
 
 
 @NgModule({
-  imports: [CommonModule, A11yModule],
+  imports: [CommonModule, A11yModule, CdkAccordionModule],
   exports: [
-    CdkAccordion,
     MatAccordion,
     MatExpansionPanel,
     MatExpansionPanelActionRow,
@@ -31,7 +35,7 @@ import {
     MatExpansionPanelDescription
   ],
   declarations: [
-    CdkAccordion,
+    MatExpansionPanelBase,
     MatAccordion,
     MatExpansionPanel,
     MatExpansionPanelActionRow,
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 3a5f1bf14e2b..87684803b50b 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -21,16 +21,25 @@ import {
   SimpleChanges,
   ViewEncapsulation,
 } from '@angular/core';
+import {CdkAccordionItem} from '@angular/cdk/accordion';
 import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 import {MatAccordion} from './accordion';
-import {AccordionItem} from './accordion-item';
 
+/** Workaround for https://github.com/angular/angular/issues/17849 */
+export const _CdkAccordionItem = CdkAccordionItem;
 
 // Boilerplate for applying mixins to MatExpansionPanel.
 /** @docs-private */
-export class MatExpansionPanelBase extends AccordionItem {
+@Component({
+  template: '',
+  moduleId: module.id,
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MatExpansionPanelBase extends _CdkAccordionItem {
   constructor(accordion: MatAccordion,
               _changeDetectorRef: ChangeDetectorRef,
               _uniqueSelectionDispatcher: UniqueSelectionDispatcher) {
@@ -49,7 +58,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
  * <mat-expansion-panel> component.
  *
  * This component can be used as a single element to show expandable content, or as one of
- * multiple children of an element with the CdkAccordion directive attached.
+ * multiple children of an element with the MdAccordion directive attached.
  *
  * Please refer to README.md for examples on how to use it.
  */
@@ -69,7 +78,7 @@ export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,
     '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
   },
   providers: [
-    {provide: AccordionItem, useExisting: forwardRef(() => MatExpansionPanel)}
+    {provide: _MatExpansionPanelMixinBase, useExisting: forwardRef(() => MatExpansionPanel)}
   ],
   animations: [
     trigger('bodyExpansion', [
@@ -87,6 +96,9 @@ export class MatExpansionPanel extends _MatExpansionPanelMixinBase
   /** Stream that emits for changes in `@Input` properties. */
   _inputChanges = new Subject<SimpleChanges>();
 
+  /** Optionally defined accordion the expansion panel belongs to. */
+  accordion: MatAccordion;
+
   constructor(@Optional() @Host() accordion: MatAccordion,
               _changeDetectorRef: ChangeDetectorRef,
               _uniqueSelectionDispatcher: UniqueSelectionDispatcher) {
diff --git a/src/lib/expansion/public-api.ts b/src/lib/expansion/public-api.ts
index 27de282f5622..2e11b1d299bc 100644
--- a/src/lib/expansion/public-api.ts
+++ b/src/lib/expansion/public-api.ts
@@ -7,21 +7,8 @@
  */
 
 export * from './expansion-module';
-export {
-  CdkAccordion,
-  MatAccordion,
-  MatAccordionDisplayMode
-} from './accordion';
-export {AccordionItem} from './accordion-item';
-export {
-  MatExpansionPanel,
-  MatExpansionPanelState,
-  MatExpansionPanelActionRow
-} from './expansion-panel';
-export {
-  MatExpansionPanelHeader,
-  MatExpansionPanelDescription,
-  MatExpansionPanelTitle
-} from './expansion-panel-header';
+export * from './accordion';
+export * from './expansion-panel';
+export * from './expansion-panel-header';
 
 
diff --git a/src/lib/radio/radio-module.ts b/src/lib/radio/radio-module.ts
index b76bfd8476c1..9cde81a1898b 100644
--- a/src/lib/radio/radio-module.ts
+++ b/src/lib/radio/radio-module.ts
@@ -8,14 +8,14 @@
 
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
+import {A11yModule} from '@angular/cdk/a11y';
+import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
 import {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/overlay';
 import {
   MatRippleModule,
   MatCommonModule,
 } from '@angular/material/core';
 import {MatRadioGroup, MatRadioButton} from './radio';
-import {UNIQUE_SELECTION_DISPATCHER_PROVIDER} from '@angular/cdk/collections';
-import {A11yModule} from '@angular/cdk/a11y';
 
 @NgModule({
   imports: [CommonModule, MatRippleModule, MatCommonModule, A11yModule],
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index ed4d8b4cddff..a8d31ac482ff 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -51,6 +51,7 @@ System.config({
     '@angular/material': 'dist/packages/material/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
+    '@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
     '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',

From 9b3ffd5ba644ea8f9f5c43dc47325b4d29635232 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 07:20:03 +0200
Subject: [PATCH 312/575] refactor(select): remove async keydown handler
 (#7532)

Resolves a couple of TODOs for removing the `Promise.resolve` wrappers around a couple of calls.
---
 src/lib/select/select.spec.ts | 35 ++---------------------------------
 src/lib/select/select.ts      | 13 +++++--------
 2 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 6f0400ccfa58..0be5121e9be9 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -286,7 +286,6 @@ describe('MatSelect', () => {
 
       const event = dispatchKeyboardEvent(trigger, 'keydown', HOME);
       fixture.detectChanges();
-      tick();
 
       expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(0);
       expect(event.defaultPrevented).toBe(true);
@@ -302,7 +301,6 @@ describe('MatSelect', () => {
 
       const event = dispatchKeyboardEvent(trigger, 'keydown', END);
       fixture.detectChanges();
-      tick();
 
       expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(7);
       expect(event.defaultPrevented).toBe(true);
@@ -2037,17 +2035,13 @@ describe('MatSelect', () => {
         expect(formControl.value).toBeFalsy('Expected no initial value.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
 
         expect(options[0].selected).toBe(true, 'Expected first option to be selected.');
         expect(formControl.value).toBe(options[0].value,
           'Expected value from first option to have been set on the model.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
-
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
 
         // Note that the third option is skipped, because it is disabled.
         expect(options[3].selected).toBe(true, 'Expected fourth option to be selected.');
@@ -2055,7 +2049,6 @@ describe('MatSelect', () => {
           'Expected value from fourth option to have been set on the model.');
 
         dispatchKeyboardEvent(select, 'keydown', UP_ARROW);
-        tick();
 
         expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
         expect(formControl.value).toBe(options[1].value,
@@ -2089,7 +2082,6 @@ describe('MatSelect', () => {
         expect(formControl.pristine).toBe(true, 'Expected form control to be clean.');
 
         dispatchKeyboardEvent(select, 'keydown', 16); // Press a random key.
-        tick();
 
         expect(formControl.value).toBeNull('Expected form control value to stay empty.');
         expect(formControl.pristine).toBe(true, 'Expected form control to stay clean.');
@@ -2101,10 +2093,8 @@ describe('MatSelect', () => {
 
           formControl.setValue('eggs-5');
           fixture.detectChanges();
-          tick();
 
           dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-          tick();
 
           expect(formControl.value).toBe('pasta-6');
           expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
@@ -2141,7 +2131,6 @@ describe('MatSelect', () => {
         formControl.disable();
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
 
         expect(formControl.value).toBe('eggs-5', 'Expected value to remain unchaged.');
       }));
@@ -2151,13 +2140,11 @@ describe('MatSelect', () => {
 
         fixture.componentInstance.options.forEach(() => {
           dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-          tick();
         });
 
         expect(lastOption.selected).toBe(true, 'Expected last option to be selected.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
 
         expect(lastOption.selected).toBe(true, 'Expected last option to stay selected.');
       }));
@@ -2190,7 +2177,6 @@ describe('MatSelect', () => {
         const subscription = map.call(option.onSelectionChange, e => e.isUserInput).subscribe(spy);
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
         expect(spy).toHaveBeenCalledWith(true);
 
         subscription.unsubscribe();
@@ -2269,14 +2255,12 @@ describe('MatSelect', () => {
 
         [1, 2, 3].forEach(() => {
           dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-          tick();
           fixture.detectChanges();
         });
 
         expect(host.getAttribute('aria-activedescendant')).toBe(options[4].id);
 
         dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
-        tick();
         fixture.detectChanges();
 
         expect(host.getAttribute('aria-activedescendant')).toBe(options[3].id);
@@ -2561,7 +2545,6 @@ describe('MatSelect', () => {
       fakeAsync(() => {
         const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        tick();
 
         expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
       }));
@@ -3155,18 +3138,14 @@ describe('MatSelect', () => {
         });
       }));
 
-    });
-
-    describe('when using a non-function comparator', () => {
-      beforeEach(() => {
+      it('should throw an error when using a non-function comparator', () => {
         instance.useNullComparator();
-      });
 
-      it('should throw an error', () => {
         expect(() => {
           fixture.detectChanges();
         }).toThrowError(wrappedErrorMessage(getMatSelectNonFunctionValueError()));
       });
+
     });
   });
 
@@ -3198,8 +3177,6 @@ describe('MatSelect', () => {
 
       [1, 2, 3].forEach(() => {
         dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-        tick();
-        fixture.detectChanges();
       });
 
       expect(panel.scrollTop).toBe(initialScrollPosition, 'Expected scroll position not to change');
@@ -3208,8 +3185,6 @@ describe('MatSelect', () => {
     it('should scroll down to the active option', fakeAsync(() => {
       for (let i = 0; i < 15; i++) {
         dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-        tick();
-        fixture.detectChanges();
       }
 
       // <option index * height> - <panel height> = 16 * 48 - 256 = 512
@@ -3220,14 +3195,10 @@ describe('MatSelect', () => {
       // Scroll to the bottom.
       for (let i = 0; i < fixture.componentInstance.foods.length; i++) {
         dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-        tick();
-        fixture.detectChanges();
       }
 
       for (let i = 0; i < 20; i++) {
         dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
-        tick();
-        fixture.detectChanges();
       }
 
       // <option index * height> = 9 * 48 = 432
@@ -3250,8 +3221,6 @@ describe('MatSelect', () => {
 
       for (let i = 0; i < 5; i++) {
         dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-        tick();
-        groupFixture.detectChanges();
       }
 
       // Note that we press down 5 times, but it will skip
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 541bff6c1859..2621fad0fd44 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -1167,15 +1167,12 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
       // however the key manager only supports up/down at the moment.
       this._keyManager.onKeydown(event);
 
-      // TODO(crisbeto): get rid of the Promise.resolve when #6441 gets in.
-      Promise.resolve().then(() => {
-        const currentActiveItem = this._keyManager.activeItem;
+      const currentActiveItem = this._keyManager.activeItem;
 
-        if (currentActiveItem && currentActiveItem !== prevActiveItem) {
-          this._clearSelection();
-          this._setSelectionByValue(currentActiveItem.value, true);
-        }
-      });
+      if (currentActiveItem && currentActiveItem !== prevActiveItem) {
+        this._clearSelection();
+        this._setSelectionByValue(currentActiveItem.value, true);
+      }
     }
   }
 

From 3041124a02f70d732f6d2a8e4b32d5b9fdb3c2c4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 07:20:13 +0200
Subject: [PATCH 313/575] fix(drawer): not restoring focus on close (#7668)

Currently the drawer restores focus on close after its closing animation is done and it contains the currently-focused element. This will always evaluate to false, because the sidenav gets a `visibility: hidden` which will blur any focused elements that it may have. With these changes the drawer will restore focus when the animation starts and it's still visible.
---
 src/lib/sidenav/drawer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 9fd9a2b449a7..51193b112e3a 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -307,6 +307,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
       this._animationState = this._enableAnimations ? 'open' : 'open-instant';
     } else {
       this._animationState = 'void';
+      this._restoreFocus();
     }
 
     if (this._focusTrap) {

From e129e3db1ee1f02929420a6d7431fe4910e554cb Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Wed, 11 Oct 2017 22:20:42 -0700
Subject: [PATCH 314/575] docs(input, select): update docs and create more
 examples (#7673)

* update input docs

* input examples

* select docs & examples

* add troubleshooting section for select

* address comments

* address more comments
---
 .../creating-a-custom-form-field-control.md   |  23 +-
 src/lib/form-field/form-field.md              |  21 +-
 src/lib/input/input.md                        | 164 +++++---------
 src/lib/select/select-errors.ts               |   4 +-
 src/lib/select/select.md                      | 201 +++++++++++-------
 src/lib/select/select.ts                      |  25 ++-
 src/material-examples/example-module.ts       | 104 ++++++++-
 .../input-autosize-textarea-example.css       |   1 +
 .../input-autosize-textarea-example.html      |   4 +
 .../input-autosize-textarea-example.ts        |   9 +
 .../input-clearable-example.ts                |   2 +-
 .../input-error-state-matcher-example.css     |   9 +
 .../input-error-state-matcher-example.html    |  13 ++
 .../input-error-state-matcher-example.ts      |  26 +++
 .../input-errors/input-errors-example.html    |   2 +-
 .../input-errors/input-errors-example.ts      |   9 +-
 .../input-hint/input-hint-example.ts          |   4 +-
 .../input-overview-example.html               |   4 +
 .../input-prefix-suffix-example.ts            |   4 +-
 .../select-custom-trigger-example.css         |   4 +
 .../select-custom-trigger-example.html        |  11 +
 .../select-custom-trigger-example.ts          |  14 ++
 .../select-disabled-example.css               |   1 +
 .../select-disabled-example.html              |  12 ++
 .../select-disabled-example.ts                |  12 ++
 .../select-error-state-matcher-example.css    |   1 +
 .../select-error-state-matcher-example.html   |  12 ++
 .../select-error-state-matcher-example.ts     |  26 +++
 .../select-form/select-form-example.ts        |   1 +
 .../select-hint-error-example.css             |   1 +
 .../select-hint-error-example.html            |  10 +
 .../select-hint-error-example.ts              |  19 ++
 .../select-multiple-example.css               |   1 +
 .../select-multiple-example.html              |   5 +
 .../select-multiple-example.ts                |  14 ++
 .../select-no-ripple-example.css              |   1 +
 .../select-no-ripple-example.html             |   7 +
 .../select-no-ripple-example.ts               |   9 +
 .../select-optgroup-example.css               |   1 +
 .../select-optgroup-example.html              |  11 +
 .../select-optgroup-example.ts                |  47 ++++
 .../select-overview-example.ts                |   1 +
 .../select-panel-class-example.css            |  11 +
 .../select-panel-class-example.html           |   8 +
 .../select-panel-class-example.ts             |  15 ++
 .../select-reset/select-reset-example.css     |   1 +
 .../select-reset/select-reset-example.html    |   6 +
 .../select-reset/select-reset-example.ts      |  19 ++
 .../select-value-binding-example.css          |   1 +
 .../select-value-binding-example.html         |  10 +
 .../select-value-binding-example.ts           |  11 +
 51 files changed, 714 insertions(+), 218 deletions(-)
 create mode 100644 src/material-examples/input-autosize-textarea/input-autosize-textarea-example.css
 create mode 100644 src/material-examples/input-autosize-textarea/input-autosize-textarea-example.html
 create mode 100644 src/material-examples/input-autosize-textarea/input-autosize-textarea-example.ts
 create mode 100644 src/material-examples/input-error-state-matcher/input-error-state-matcher-example.css
 create mode 100644 src/material-examples/input-error-state-matcher/input-error-state-matcher-example.html
 create mode 100644 src/material-examples/input-error-state-matcher/input-error-state-matcher-example.ts
 create mode 100644 src/material-examples/select-custom-trigger/select-custom-trigger-example.css
 create mode 100644 src/material-examples/select-custom-trigger/select-custom-trigger-example.html
 create mode 100644 src/material-examples/select-custom-trigger/select-custom-trigger-example.ts
 create mode 100644 src/material-examples/select-disabled/select-disabled-example.css
 create mode 100644 src/material-examples/select-disabled/select-disabled-example.html
 create mode 100644 src/material-examples/select-disabled/select-disabled-example.ts
 create mode 100644 src/material-examples/select-error-state-matcher/select-error-state-matcher-example.css
 create mode 100644 src/material-examples/select-error-state-matcher/select-error-state-matcher-example.html
 create mode 100644 src/material-examples/select-error-state-matcher/select-error-state-matcher-example.ts
 create mode 100644 src/material-examples/select-hint-error/select-hint-error-example.css
 create mode 100644 src/material-examples/select-hint-error/select-hint-error-example.html
 create mode 100644 src/material-examples/select-hint-error/select-hint-error-example.ts
 create mode 100644 src/material-examples/select-multiple/select-multiple-example.css
 create mode 100644 src/material-examples/select-multiple/select-multiple-example.html
 create mode 100644 src/material-examples/select-multiple/select-multiple-example.ts
 create mode 100644 src/material-examples/select-no-ripple/select-no-ripple-example.css
 create mode 100644 src/material-examples/select-no-ripple/select-no-ripple-example.html
 create mode 100644 src/material-examples/select-no-ripple/select-no-ripple-example.ts
 create mode 100644 src/material-examples/select-optgroup/select-optgroup-example.css
 create mode 100644 src/material-examples/select-optgroup/select-optgroup-example.html
 create mode 100644 src/material-examples/select-optgroup/select-optgroup-example.ts
 create mode 100644 src/material-examples/select-panel-class/select-panel-class-example.css
 create mode 100644 src/material-examples/select-panel-class/select-panel-class-example.html
 create mode 100644 src/material-examples/select-panel-class/select-panel-class-example.ts
 create mode 100644 src/material-examples/select-reset/select-reset-example.css
 create mode 100644 src/material-examples/select-reset/select-reset-example.html
 create mode 100644 src/material-examples/select-reset/select-reset-example.ts
 create mode 100644 src/material-examples/select-vlaue-binding/select-value-binding-example.css
 create mode 100644 src/material-examples/select-vlaue-binding/select-value-binding-example.html
 create mode 100644 src/material-examples/select-vlaue-binding/select-value-binding-example.ts

diff --git a/guides/creating-a-custom-form-field-control.md b/guides/creating-a-custom-form-field-control.md
index 7cf5bb6bed45..e421d9a28cd7 100644
--- a/guides/creating-a-custom-form-field-control.md
+++ b/guides/creating-a-custom-form-field-control.md
@@ -70,6 +70,7 @@ class MyTelInput {
 ```
 
 ### Providing our component as a MatFormFieldControl
+
 The first step is to provide our new component as an implementation of the `MatFormFieldControl`
 interface that the `<mat-form-field>` knows how to work with. To do this, we will have our class
 implement `MatFormFieldControl`. Since this is a generic interface, we'll need to include a type
@@ -89,18 +90,19 @@ class MyTelInput implements MatFormFieldControl<MyTel> {
 
 This sets up our component so it can work with `<mat-form-field>`, but now we need to implement the
 various methods and properties declared by the interface we just implemented. To learn more about
-the `MatFormFieldControl` interface, see its
-[definition](https://github.com/angular/material2/blob/master/src/lib/form-field/form-field-control.ts).
-(Unfortunately generated API docs are not available yet, but we'll go through the methods and
-properties in this guide.) 
+the `MatFormFieldControl` interface, see the
+[form field API documentation](https://material.angular.io/components/form-field/api).
 
 ### Implementing the methods and properties of MatFormFieldControl
+
 #### `value`
+
 This property allows someone to set or get the value of our control. Its type should be the same
 type we used for the type parameter when we implemented `MatFormFieldControl`. Since our component 
 already has a value property, we don't need to do anything for this one.
 
 #### `stateChanges`
+
 Because the `<mat-form-field>` uses the `OnPush` change detection strategy, we need to let it know
 when something happens in the form field control that may require the form field to run change
 detection. We do this via the `stateChanges` property. So far the only thing the form field needs to
@@ -122,6 +124,7 @@ ngOnDestroy() {
 ```
 
 #### `id`
+
 This property should return the ID of an element in the component's template that we want the
 `<mat-form-field>` to associate all of its labels and hints with. In this case, we'll use the host
 element and just generate a unique ID for it.
@@ -133,6 +136,7 @@ static nextId = 0;
 ```
 
 #### `placeholder`
+
 This property allows us to tell the `<mat-form-field>` what to use as a placeholder. In this
 example, we'll do the same thing as `matInput` and `<mat-select>` and allow the user to specify it
 via an `@Input()`. Since the value of the placeholder may change over time, we need to make sure to
@@ -152,6 +156,7 @@ private _placeholder: string;
 ```
 
 #### `ngControl`
+
 This property allows the form field control to specify the `@angular/forms` control that is bound to
 this component. Since we haven't set up our component to act as a `ControlValueAccessor`, we'll just
 set this to `null` in our component. In any real component, you would probably want to implement
@@ -170,6 +175,7 @@ constructor(..., @Optional() @Self() public ngControl: NgControl) { ... }
 ```
 
 #### `focused`
+
 This property indicates whether or not the form field control should be considered to be in a
 focused state. When it is in a focused state, the form field is displayed with a solid color
 underline. For the purposes of our component, we want to consider it focused if any of the part
@@ -195,6 +201,7 @@ ngOnDestroy() {
 ```
 
 #### `empty`
+
 This property indicates whether the form field control is empty. For our control, we'll consider it
 empty if all of the parts are empty.
 
@@ -206,6 +213,7 @@ get empty() {
 ```
 
 #### `shouldPlaceholderFloat`
+
 This property is used to indicate whether the placeholder should be in the floating position. We'll
 use the same logic as `matInput` and float the placeholder when the input is focused or non-empty.
 Since the placeholder will be overlapping our control when when it's not floating, we should hide
@@ -228,6 +236,7 @@ span {
 ```
 
 #### `required`
+
 This property is used to indicate whether the input is required. `<mat-form-field>` uses this
 information to add a required indicator to the placeholder. Again, we'll want to make sure we run
 change detection if the required state changes.
@@ -245,6 +254,7 @@ private _required = false;
 ```
 
 #### `disabled`
+
 This property tells the form field when it should be in the disabled state. In addition to reporting
 the right state to the form field, we need to set the disabled state on the individual inputs that
 make up our component.
@@ -269,6 +279,7 @@ private _disabled = false;
 ```
 
 #### `errorState`
+
 This property indicates whether the associated `NgControl` is in an error state. Since we're not
 using an `NgControl` in this example, we don't need to do anything other than just set it to `false`.
 
@@ -277,6 +288,7 @@ errorState = false;
 ```
 
 #### `controlType`
+
 This property allows us to specify a unique string for the type of control in form field. The
 `<mat-form-field>` will add an additional class based on this type that can be used to easily apply
 special styles to a `<mat-form-field>` that contains a specific type of control. In this example
@@ -288,6 +300,7 @@ controlType = 'my-tel-input';
 ```
 
 #### `setAriaDescribedByIds(ids: string[])`
+
 This method is used by the `<mat-form-field>` to specify the IDs that should be used for the
 `aria-describedby` attribute of your component. The method has one parameter, the list of IDs, we
 just need to apply the given IDs to our host element.
@@ -301,6 +314,7 @@ setDescribedByIds(ids: string[]) {
 ```
 
 #### `onContainerClick(event: MouseEvent)`
+
 This method will be called when the form field is clicked on. It allows your component to hook in
 and handle that click however it wants. The method has one parameter, the `MouseEvent` for the
 click. In our case we'll just focus the first `<input>` if the user isn't about to click an
@@ -315,6 +329,7 @@ onContainerClick(event: MouseEvent) {
 ```
 
 ### Trying it out
+
 Now that we've fully implemented the interface, we're ready to try our component out! All we need to
 do is place it inside of a `<mat-form-field>`
 
diff --git a/src/lib/form-field/form-field.md b/src/lib/form-field/form-field.md
index 7872e9c8ba0b..19d954a98e26 100644
--- a/src/lib/form-field/form-field.md
+++ b/src/lib/form-field/form-field.md
@@ -7,13 +7,14 @@ In this document, "form field" refers to the wrapper component `<mat-form-field>
 (e.g. the input, textarea, select, etc.)
 
 The following Angular Material components are designed to work inside a `<mat-form-field>`:
-* [&lt;input matInput&gt; &amp; &lt;textarea matInput&gt;](https://material.angular.io/components/input/overview)
-* [&lt;mat-select&gt;](https://material.angular.io/components/select/overview)
-* [&lt;mat-chip-list&gt;](https://material.angular.io/components/chips/overview)
+* [`<input matInput>` &amp; `<textarea matInput>`](https://material.angular.io/components/input/overview)
+* [`<mat-select>`](https://material.angular.io/components/select/overview)
+* [`<mat-chip-list>`](https://material.angular.io/components/chips/overview)
 
 <!-- example(form-field-overview) -->
 
 ### Floating placeholder
+
 The floating placeholder is a text label displayed on top of the form field control when
 the control does not contain any text. By default, when text is present the floating placeholder
 floats above the form field control.
@@ -46,6 +47,7 @@ setting can be either `always`, `never`, or `auto`.
 ```
 
 ### Hint labels
+
 Hint labels are additional descriptive text that appears below the form field's underline. A
 `<mat-form-field>` can have up to two hint labels; one start-aligned (left in an LTR language, right
 in RTL), and one end-aligned.
@@ -60,6 +62,7 @@ raise an error.
 <!-- example(form-field-hint) -->
 
 ### Error messages
+
 Error messages can be shown under the form field underline by adding `mat-error` elements inside the
 form field. Errors are hidden initially and will be displayed on invalid form fields after the user
 has interacted with the element or the parent form has been submitted. Since the errors occupy the
@@ -74,6 +77,7 @@ multiple errors is up to the user.
 <!-- example(form-field-error) -->
 
 ### Prefix & suffix
+
 Custom content can be included before and after the input tag, as a prefix or suffix. It will be
 included within the visual container that wraps the form control as per the Material specification.
 
@@ -83,12 +87,14 @@ the prefix. Similarly, adding `matSuffix` will designate it as the suffix.
 <!-- example(form-field-prefix-suffix) -->
 
 ### Custom form field controls
+
 In addition to the form field controls that Angular Material provides, it is possible to create
 custom form field controls that work with `<mat-form-field>` in the same way. For additional
 information on this see the guide on
 [Creating Custom mat-form-field Controls](https://material.angular.io/guide/creating-a-custom-form-field-control).
 
 ### Theming
+
 `<mat-form-field>` has a `color` property which can be set to `primary`, `accent`, or `warn`. This
 will set the color of the form field underline and floating placeholder based on the theme colors
 of your app.
@@ -105,24 +111,29 @@ mat-form-field.mat-form-field {
 <!-- example(form-field-theming) -->
 
 ### Accessibility
-If a floating placeholder is specified, it will be automatically used as the label for the form field
-control. If no floating placeholder is specified, the user should label the form field control
+
+If a floating placeholder is specified, it will be automatically used as the label for the form
+field control. If no floating placeholder is specified, the user should label the form field control
 themselves using `aria-label`, `aria-labelledby` or `<label for=...>`.
 
 Any errors and hints added to the form field are automatically added to the form field control's
 `aria-describedby` set.
 
 ### Troubleshooting
+
 #### Error: Placeholder attribute and child element were both specified
+
 This error occurs when you have specified two conflicting placeholders. Make sure that you haven't
 included both a `placeholder` property on your form field control and a `<mat-placeholder>`
 element.
 
 #### Error: A hint was already declared for align="..."
+
 This error occurs if you have added multiple hints for the same side. Keep in mind that the
 `hintLabel` property adds a hint to the start side.
 
 #### Error: mat-form-field must contain a MatFormFieldControl
+
 This error occurs when you have not added a form field control to your form field. If your form
 field contains a native `<input>` or `<textarea>` element, make sure you've added the `matInput`
 directive to it. Other components that can act as a form field control include `<mat-select>`,
diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index 99a95c914044..0c70e6e8dafe 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -1,22 +1,19 @@
-`<mat-form-field>` is a wrapper for native `input` and `textarea` elements. This container
-applies Material Design styles and behavior while still allowing direct access to the underlying
-native element.
-
-The native element wrapped by the `mat-form-field` must be marked with the `matInput` directive.
+`matInput` is a directive that allows native `<input>` and `<textarea>` elements to work with
+[`<mat-form-field>`](https://material.angular.io/components/form-field/overview). 
 
 <!-- example(input-overview) -->
 
-### `input` and `textarea` attributes
+### `<input>` and `<textarea>` attributes
 
-All of the attributes that can be used with normal `input` and `textarea` elements can be used on
-elements inside `mat-form-field` as well. This includes Angular directives such as
-`ngModel` and `formControl`.
+All of the attributes that can be used with normal `<input>` and `<textarea>` elements can be used
+on elements inside `<mat-form-field>` as well. This includes Angular directives such as `ngModel`
+and `formControl`.
 
 The only limitations are that the `type` attribute can only be one of the values supported by
-`matInput` and the native element cannot specify a `placeholder` attribute if the `mat-form-field`
-also contains an `mat-placeholder` element.
+`matInput` and the native element cannot specify a `placeholder` attribute if the `<mat-form-field>`
+also contains an `<mat-placeholder>` element.
 
-### Supported `input` types
+### Supported `<input>` types
 
 The following [input types](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input) can
 be used with `matInput`:
@@ -33,107 +30,36 @@ be used with `matInput`:
 * url
 * week
 
-### Error messages
-
-Error messages can be shown beneath an input by specifying `mat-error` elements inside the
-`mat-form-field`. Errors are hidden by default and will be displayed on invalid inputs after
-the user has interacted with the element or the parent form has been submitted. In addition,
-whenever errors are displayed, the container's `mat-hint` labels will be hidden.
-
-If an input element can have more than one error state, it is up to the consumer to toggle which
-messages should be displayed. This can be done with CSS, `ngIf` or `ngSwitch`.
+### Form field features
 
-Note that, while multiple error messages can be displayed at the same time, it is recommended to
-only show one at a time.
-
-<!-- example(input-errors) -->
+There are a number of `<mat-form-field>` features that can be used with any `<input matInput>` or
+`<textarea matInput>`. These include error messages, hint text, prefix & suffix, and theming. For
+additional information about these features, see the
+[form field documentation](https://material.angular.io/components/form-field/overview).
 
 ### Placeholder
 
-A placeholder is an indicative text displayed in the input zone when the input does not contain
-text. When text is present, the indicative text will float above this input zone.
-
-The `floatPlaceholder` attribute of `mat-form-field` can be set to `never` to hide the
-indicative text instead when text is present in the input.
-
-When setting `floatPlaceholder` to `always`, the floating label will always show above the input.
-
-A placeholder for the input can be specified in one of two ways: either using the `placeholder`
-attribute on the `input` or `textarea`, or using an `mat-placeholder` element in the
-`mat-form-field`. Using both will raise an error.
-
-Global default placeholder options can be specified by setting the `MAT_PLACEHOLDER_GLOBAL_OPTIONS`
-provider. This setting will apply to all components that support the floating placeholder.
-
-```ts
-@NgModule({
-  providers: [
-    {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: {float: 'always'}}
-  ]
-})
-```
-
-Here are the available global options:
-
-| Name            | Type    | Values              | Description                               |
-| --------------- | ------- | ------------------- | ----------------------------------------- |
-| float           | string  | auto, always, never | The default placeholder float behavior.   |
-
-### Prefix and Suffix
-
-HTML can be included before and after the input tag, as a prefix or suffix. It will be underlined
-as per the Material specification, and clicking it will focus the input.
+A placeholder is a text label displayed in the input area when the input does not contain text.
+When text is present, the placeholder will float above the input area. The placeholder can be
+specified either via a `placeholder` attribute on the input or a `<mat-placeholder>` element in the
+same form field as the `matInput`. The `<mat-form-field>` also has additional options for changing
+the behavior of the placeholder. For more information see the
+[form field placeholder documentation](https://material.angular.io/components/form-field/overview#floating-placeholder).
 
-Adding the `matPrefix` attribute to an element inside the `mat-form-field` will designate it as
-the prefix. Similarly, adding `matSuffix` will designate it as the suffix.
+### Changing when error messages are shown
 
-<!-- example(input-prefix-suffix) -->
+The `<mat-form-field>` allows you to
+[associate error messages](https://material.angular.io/components/form-field/overview#error-messages)
+with your `matInput`. By default, these error messages are shown when the control is invalid and
+either the user has interacted with (touched) the element or the parent form has been submitted. If
+you wish to override this behavior (e.g. to show the error as soon as the invalid control is dirty
+or when a parent form group is invalid), you can use the `errorStateMatcher` property of the
+`matInput`. The property takes an instance of an `ErrorStateMatcher` object. An `ErrorStateMatcher`
+must implement a single method `isErrorState` which takes the `FormControl` for this `matInput` as
+well as the parent form and returns a boolean indicating whether errors should be shown. (`true`
+indicating that they should be shown, and `false` indicating that they should not.)
 
-### Hint Labels
-
-Hint labels are the labels that show below the underline. An `mat-form-field` can have up to two
-hint labels; one on the `start` of the line (left in an LTR language, right in RTL), and one on the
-`end`.
-
-Hint labels are specified in one of two ways: either using the `hintLabel` attribute of
-`mat-form-field`, or using an `mat-hint` element inside the `mat-form-field`, which takes an
-`align` attribute containing the side. The attribute version is assumed to be at the `start`.
-Specifying a side twice will result in an exception during initialization.
-
-<!-- example(input-hint) -->
-
-### Underline Color
-
-The underline (line under the `input` content) color can be changed by using the `color`
-attribute of `mat-form-field`. A value of `primary` is the default and will correspond to the
-theme primary color. Alternatively, `accent` or `warn` can be specified to use the theme's accent or
-warn color.
-
-### Custom Error Matcher
-
-By default, error messages are shown when the control is invalid and either the user has interacted
-with (touched) the element or the parent form has been submitted. If you wish to override this
-behavior (e.g. to show the error as soon as the invalid control is dirty or when a parent form group
-is invalid), you can use the `errorStateMatcher` property of the `matInput`. To use this property,
-create an `ErrorStateMatcher` object in your component class that has a `isErrorState` function which
-returns a boolean. A result of `true` will display the error messages.
-
-```html
-<mat-form-field>
-  <input matInput [(ngModel)]="myInput" required [errorStateMatcher]="myErrorStateMatcher">
-  <mat-error>This field is required</mat-error>
-</mat-form-field>
-```
-
-```ts
-class MyErrorStateMatcher implements ErrorStateMatcher {
-  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
-    // Error when invalid control is dirty, touched, or submitted
-    const isSubmitted = form && form.submitted;
-    return !!(control && control.invalid && (control.dirty || control.touched || isSubmitted)));
-  }
-}
-```
+<!-- example(input-error-state-matcher-example) -->
 
 A global error state matcher can be specified by setting the `ErrorStateMatcher` provider. This
 applies to all inputs. For convenience, `ShowOnDirtyErrorStateMatcher` is available in order to
@@ -146,13 +72,18 @@ globally cause input errors to show when the input is dirty and invalid.
   ]
 })
 ```
-Here are the available global options:
 
-| Name              | Type     | Description |
-| ----------------- | -------- | ----------- |
-| errorStateMatcher | Function | Returns a boolean specifying if the error should be shown |
+### Auto-resizing `<textarea>` elements
+
+`<textarea>` elements can be made to automatically resize to fit their contents by applying the
+`matTextareaAutosize` directive. This works with `<textarea matInput>` elements as well as plain
+native `<textarea>` elements. The min and max size of the textarea can be specified in rows, using
+the `matAutosizeMinRows` and `matAutosizeMaxRows` properties respectively.
+
+<!-- example(input-autosize-textarea-example) -->
 
 ### Accessibility
+
 The `matInput` directive works with native `<input>` to provide an accessible experience.
 
 If a placeholder attribute is added to the input, or a `mat-placeholder` element is added
@@ -160,4 +91,15 @@ in the form field, the placeholder text will automatically be used as the label
 If there's no placeholder specified, `aria-label`, `aria-labelledby` or `<label for=...>` should be
 added.
 
-Any `mat-error` and `mat-hint` are automatically added to the input's `aria-describedby`.
+Any `mat-error` and `mat-hint` are automatically added to the input's `aria-describedby` list, and
+`aria-invalid` is automatically updated based on the input's validity state.
+
+### Troubleshooting
+
+#### Error: Input type "..." isn't supported by matInput
+
+This error is thrown when you attempt to set an input's `type` property to a value that isn't
+supported by the `matInput` directive. If you need to use an unsupported input type with
+`<mat-form-field>` consider writing a
+[custom form field control](https://material.angular.io/guide/creating-a-custom-form-field-control)
+for it.
diff --git a/src/lib/select/select-errors.ts b/src/lib/select/select-errors.ts
index 932e04d83877..1ae550f33122 100644
--- a/src/lib/select/select-errors.ts
+++ b/src/lib/select/select-errors.ts
@@ -22,7 +22,7 @@ export function getMatSelectDynamicMultipleError(): Error {
  * @docs-private
  */
 export function getMatSelectNonArrayValueError(): Error {
-  return Error('Cannot assign truthy non-array value to select in `multiple` mode.');
+  return Error('Value must be an array in multiple-selection mode.');
 }
 
 /**
@@ -31,5 +31,5 @@ export function getMatSelectNonArrayValueError(): Error {
  * actually takes two values and returns a boolean is not checked.
  */
 export function getMatSelectNonFunctionValueError(): Error {
-  return Error('Cannot assign a non-function value to `compareWith`.');
+  return Error('`compareWith` must be a function.');
 }
diff --git a/src/lib/select/select.md b/src/lib/select/select.md
index 1a0014e929c6..b4e9f690b0c0 100644
--- a/src/lib/select/select.md
+++ b/src/lib/select/select.md
@@ -1,111 +1,166 @@
 `<mat-select>` is a form control for selecting a value from a set of options, similar to the native
 `<select>` element. You can read more about selects in the
 [Material Design spec](https://material.google.com/components/menus.html). It is designed to work
-inside of an `<mat-form-field>` element.
+inside of a [`<mat-form-field>`](https://material.angular.io/components/form-field/overview)
+element.
+
+To add options to the select, add `<mat-option>` elements to the `<mat-select>`. Each `<mat-option>`
+has a `value` property that can be used to set the value that will be selected if the user chooses
+this option. The content of the `<mat-option>` is what will be shown to the user.
 
 <!-- example(select-overview) -->
 
-### Simple select
+### Getting and setting the select value
 
-In your template, create an `mat-select` element. For each option you'd like in your select, add an
-`mat-option` tag. Note that you can disable items by adding the `disabled` boolean attribute or
-binding to it.
+The `<mat-select>` supports 2-way binding to the `value` property without the need for Angular
+forms.
 
-*my-comp.html*
-```html
-<mat-form-field>
-  <mat-select placeholder="State">
-    <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
-  </mat-select>
-</mat-form-field>
-```
+<!-- example(select-value-binding) -->
 
-### Getting and setting the select value
+The `<mat-select>` also supports all of the form directives from the core `FormsModule` and
+`ReactiveFormsModule` (`ngModel`, `formControl`, etc.) As with native `<select>`, `<mat-select>`
+also supports a `compareWith` function. (Additional information about using a custom `compareWith`
+function can be found in the
+[Angular forms documentation](https://angular.io/api/forms/SelectControlValueAccessor#caveat-option-selection)).
 
-The select component is set up as a custom value accessor, so you can manipulate the select's value using
-any of the form directives from the core `FormsModule` or `ReactiveFormsModule`: `ngModel`, `formControl`, etc.
+<!-- example(select-form) -->
 
-*my-comp.html*
-```html
-<mat-form-field>
-  <mat-select placeholder="State" [(ngModel)]="myState">
-    <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
-  </mat-select>
-</mat-form-field>
-```
+### Form field features
 
-*my-comp.ts*
-```ts
-class MyComp {
-  myState = 'AZ';
-  states = [{code: 'AL', name: 'Alabama'}...];
-}
-```
+There are a number of `<mat-form-field>` features that can be used with any `<mat-select>`. These
+include error messages, hint text, prefix & suffix, and theming. For additional information about
+these features, see the
+[form field documentation](https://material.angular.io/components/form-field/overview).
+
+<!-- example(select-hint-error) -->
+
+### Setting a static placeholder
+
+The placeholder is a text label displayed in the select trigger area when no value is selected. When
+a value is selected, the placeholder will float above the select trigger area. The placeholder can
+be specified either via a `placeholder` attribute on the `<mat-select>` or a `<mat-placeholder>`
+element in the same form field as the `<mat-select>`. The `<mat-form-field>` also has additional
+options for changing the behavior of the placeholder. For more information see the
+[form field placeholder documentation](https://material.angular.io/components/form-field/overview#floating-placeholder).
+
+### Disabling the select or individual options
+
+It is possible to disable the entire select or individual options in the select by using the
+disabled property on the `<mat-select>` and the `<mat-option>` components respectively.
+
+<!-- example(select-disabled) -->
 
 ### Resetting the select value
 
-If you want one of your options to reset the select's value, you can omit specifying its value:
+If you want one of your options to reset the select's value, you can omit specifying its value.
 
-*my-comp.html*
-```html
-<mat-form-field>
-  <mat-select placeholder="State">
-    <mat-option>None</mat-option>
-    <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
-  </mat-select>
-</mat-form-field>
-```
+<!-- example(select-reset) -->
 
-### Setting a static placeholder
+### Creating groups of options
 
-It's possible to turn off the placeholder's floating animation using the `floatPlaceholder` property. It accepts one of three string options:
-- `'auto'`: This is the default floating placeholder animation. It will float up when a selection is made.
-- `'never'`: This makes the placeholder static. Rather than floating, it will disappear once a selection is made.
-- `'always'`: This makes the placeholder permanently float above the input. It will not animate up or down.
+The `<mat-optgroup>` element can be used to group common options under a subheading. The name of the
+group can be set using the `label` property of `<mat-optgroup>`. Like individual `<mat-option>`
+elements, an entire `<mat-optgroup>` can be disabled or enabled by setting the `disabled` property
+on the group.
 
-```html
-<mat-form-field floatPlaceholder="never">
-  <mat-select placeholder="State" [(ngModel)]="myState">
-  <mat-option *ngFor="let state of states" [value]="state.code">{{ state.name }}</mat-option>
-  </mat-select>
-</mat-form-field>
-```
+<!-- example(select-optgroup) -->
+
+### Multiple selection
+
+`<mat-select>` defaults to single-selection mode, but can be configured to allow multiple selection 
+by setting the `multiple` property. This will allow the user to select multiple values at once. When
+using the `<mat-select>` in multiple selection mode, its value will be a sorted list of all selected
+values rather than a single value.
+
+<!-- example(select-multiple) -->
+
+### Customizing the trigger label
+
+If you want to display a custom trigger label inside a select, you can use the
+`<mat-select-trigger>` element.
+
+<!-- example(select-custom-trigger) -->
 
-Global default placeholder options can be specified by setting the `MAT_PLACEHOLDER_GLOBAL_OPTIONS` provider. This setting will apply to all components that support the floating placeholder.
+### Disabling the ripple effect
+
+By default, when a user clicks on a `<mat-option>`, a ripple animation is shown. This can be disabled
+by setting the `disableRipple` property on `<mat-select>`.
+
+<!-- example(select-no-ripple) -->
+
+### Adding custom styles to the dropdown panel
+
+In order to facilitate easily styling the dropdown panel, `<mat-select>` has a `panelClass` property
+which can be used to apply additional CSS classes to the dropdown panel.
+
+<!-- example(select-panel-class) -->
+
+### Changing when error messages are shown
+
+The `<mat-form-field>` allows you to
+[associate error messages](https://material.angular.io/components/form-field/overview#error-messages)
+with your `<mat-select>`. By default, these error messages are shown when the control is invalid and
+either the user has interacted with (touched) the element or the parent form has been submitted. If
+you wish to override this behavior (e.g. to show the error as soon as the invalid control is dirty
+or when a parent form group is invalid), you can use the `errorStateMatcher` property of the
+`<mat-select>`. The property takes an instance of an `ErrorStateMatcher` object. An
+`ErrorStateMatcher` must implement a single method `isErrorState` which takes the `FormControl` for
+this `<mat-select>` as well as the parent form and returns a boolean indicating whether errors
+should be shown. (`true` indicating that they should be shown, and `false` indicating that they
+should not.)
+
+<!-- example(select-error-state-matcher) -->
+
+A global error state matcher can be specified by setting the `ErrorStateMatcher` provider. This
+applies to all inputs. For convenience, `ShowOnDirtyErrorStateMatcher` is available in order to
+globally cause input errors to show when the input is dirty and invalid.
 
 ```ts
 @NgModule({
   providers: [
-    {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' }}
+    {provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher}
   ]
 })
 ```
 
-### Customizing the trigger label
-If you want to display a custom trigger label inside a select, you can use the `mat-select-trigger` element:
-
-```html
-<mat-form-field>
-  <mat-select placeholder="Favorite food" #select="matSelect">
-    <mat-select-trigger>You have selected: {{ select.selected?.viewValue }}</mat-select-trigger>
-    <mat-option *ngFor="let food of foods" [value]="food.value">{{ food.viewValue }}</mat-option>
-  </mat-select>
-</mat-form-field>
-```
-
-Here are the available global options:
-
-| Name            | Type    | Values              | Description                               |
-| --------------- | ------- | ------------------- | ----------------------------------------- |
-| float           | string  | auto, always, never | The default placeholder float behavior.   |
-
 ### Keyboard interaction
+
 - <kbd>DOWN_ARROW</kbd>: Focus next option
 - <kbd>UP_ARROW</kbd>: Focus previous option
 - <kbd>ENTER</kbd> or <kbd>SPACE</kbd>: Select focused item
 
 ### Accessibility
+
 The select component without text or label should be given a meaningful label via
 `aria-label` or `aria-labelledby`.
 
 The select component has `role="listbox"` and options inside select have `role="option"`.
+
+### Troubleshooting
+
+#### Error: Cannot change `multiple` mode of select after initialization
+
+This error is thrown if you attempt to bind the `multiple` property on `<mat-select>` to a dynamic
+value. (e.g. `[multiple]="isMultiple"` where the value of `isMultiple` changes over the course of
+the component's lifetime). If you need to change this dynamically, use `ngIf` or `ngSwitch` instead:
+
+```html
+<mat-select *ngIf="isMultiple" multiple>
+  ...
+</mat-select>
+<mat-select *ngIf="!isMultiple">
+  ...
+</mat-select>
+```
+
+#### Error: Value must be an array in multiple-selection mode
+
+This error is thrown if you attempt to assign a value other than `null`, `undefined`, or an array to
+a `<mat-select multiple>`. For example, something like `mySelect.value = 'option1'`. What you likely
+meant to do was `mySelect.value = ['option1']`.
+
+#### Error: `compareWith` must be a function
+
+This error occurs if you attempt to assign something other than a function to the `compareWith`
+property. For more information on proper usage of `compareWith` see the
+[Angular forms documentation](https://angular.io/api/forms/SelectControlValueAccessor#caveat-option-selection)).
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 2621fad0fd44..b0a5c8729ba3 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
   ViewportRuler,
 } from '@angular/cdk/overlay';
-import {filter, first, startWith, takeUntil, RxChain} from '@angular/cdk/rxjs';
+import {filter, first, RxChain, startWith, takeUntil} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   Attribute,
@@ -28,6 +28,7 @@ import {
   ContentChild,
   ContentChildren,
   Directive,
+  DoCheck,
   ElementRef,
   EventEmitter,
   Inject,
@@ -35,6 +36,7 @@ import {
   Input,
   isDevMode,
   NgZone,
+  OnChanges,
   OnDestroy,
   OnInit,
   Optional,
@@ -42,26 +44,26 @@ import {
   QueryList,
   Renderer2,
   Self,
+  SimpleChanges,
   ViewChild,
   ViewEncapsulation,
-  DoCheck,
 } from '@angular/core';
 import {
   ControlValueAccessor,
+  FormControl,
   FormGroupDirective,
   NgControl,
-  NgForm,
-  FormControl
+  NgForm
 } from '@angular/forms';
 import {
   CanDisable,
+  ErrorStateMatcher,
   HasTabIndex,
   MatOptgroup,
   MatOption,
   MatOptionSelectionChange,
   mixinDisabled,
   mixinTabIndex,
-  ErrorStateMatcher,
 } from '@angular/material/core';
 import {MatFormField, MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
@@ -187,8 +189,9 @@ export class MatSelectTrigger {}
   ],
   providers: [{provide: MatFormFieldControl, useExisting: MatSelect}],
 })
-export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnDestroy, OnInit,
-    DoCheck, ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any> {
+export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnChanges,
+    OnDestroy, OnInit, DoCheck, ControlValueAccessor, CanDisable, HasTabIndex,
+    MatFormFieldControl<any> {
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
@@ -461,6 +464,14 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     }
   }
 
+  ngOnChanges(changes: SimpleChanges) {
+    // Updating the disabled state is handled by `mixinDisabled`, but we need to additionally let
+    // the parent form field know to run change detection when the disabled state changes.
+    if (changes.disabled) {
+      this.stateChanges.next();
+    }
+  }
+
   ngOnDestroy() {
     this._destroy.next();
     this._destroy.complete();
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 73dd42caaaa6..2add4934cdc6 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -52,7 +52,9 @@ import {GridListDynamicExample} from './grid-list-dynamic/grid-list-dynamic-exam
 import {GridListOverviewExample} from './grid-list-overview/grid-list-overview-example';
 import {IconOverviewExample} from './icon-overview/icon-overview-example';
 import {IconSvgExample} from './icon-svg-example/icon-svg-example';
+import {InputAutosizeTextareaExample} from './input-autosize-textarea/input-autosize-textarea-example';
 import {InputClearableExample} from './input-clearable/input-clearable-example';
+import {InputErrorStateMatcherExample} from './input-error-state-matcher/input-error-state-matcher-example';
 import {InputErrorsExample} from './input-errors/input-errors-example';
 import {InputFormExample} from './input-form/input-form-example';
 import {InputHintExample} from './input-hint/input-hint-example';
@@ -72,8 +74,18 @@ import {ProgressSpinnerConfigurableExample} from './progress-spinner-configurabl
 import {ProgressSpinnerOverviewExample} from './progress-spinner-overview/progress-spinner-overview-example';
 import {RadioNgModelExample} from './radio-ng-model/radio-ng-model-example';
 import {RadioOverviewExample} from './radio-overview/radio-overview-example';
+import {SelectCustomTriggerExample} from './select-custom-trigger/select-custom-trigger-example';
+import {SelectDisabledExample} from './select-disabled/select-disabled-example';
+import {SelectErrorStateMatcherExample} from './select-error-state-matcher/select-error-state-matcher-example';
 import {SelectFormExample} from './select-form/select-form-example';
+import {SelectHintErrorExample} from './select-hint-error/select-hint-error-example';
+import {SelectMultipleExample} from './select-multiple/select-multiple-example';
+import {SelectNoRippleExample} from './select-no-ripple/select-no-ripple-example';
+import {SelectOptgroupExample} from './select-optgroup/select-optgroup-example';
 import {SelectOverviewExample} from './select-overview/select-overview-example';
+import {SelectPanelClassExample} from './select-panel-class/select-panel-class-example';
+import {SelectResetExample} from './select-reset/select-reset-example';
+import {SelectValueBindingExample} from './select-vlaue-binding/select-value-binding-example';
 import {SidenavFabExample} from './sidenav-fab/sidenav-fab-example';
 import {SidenavOverviewExample} from './sidenav-overview/sidenav-overview-example';
 import {SlideToggleConfigurableExample} from './slide-toggle-configurable/slide-toggle-configurable-example';
@@ -333,14 +345,26 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'input-autosize-textarea': {
+    title: 'Auto-resizing textarea ',
+    component: InputAutosizeTextareaExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'input-clearable': {
-    title: 'Input Clearable',
+    title: 'Input with a clear button',
     component: InputClearableExample,
     additionalFiles: null,
     selectorName: null
   },
+  'input-error-state-matcher': {
+    title: 'Input with a custom ErrorStateMatcher ',
+    component: InputErrorStateMatcherExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'input-errors': {
-    title: 'Input Errors',
+    title: 'Input with error messages',
     component: InputErrorsExample,
     additionalFiles: null,
     selectorName: null
@@ -352,7 +376,7 @@ export const EXAMPLE_COMPONENTS = {
     selectorName: null
   },
   'input-hint': {
-    title: 'Input hints',
+    title: 'Input with hints',
     component: InputHintExample,
     additionalFiles: null,
     selectorName: null
@@ -364,7 +388,7 @@ export const EXAMPLE_COMPONENTS = {
     selectorName: null
   },
   'input-prefix-suffix': {
-    title: 'Input Prefixes and Suffixes',
+    title: 'Inputs with prefixes and suffixes',
     component: InputPrefixSuffixExample,
     additionalFiles: null,
     selectorName: null
@@ -453,18 +477,78 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'select-custom-trigger': {
+    title: 'Select with custom trigger text ',
+    component: SelectCustomTriggerExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-disabled': {
+    title: 'Disabled select ',
+    component: SelectDisabledExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-error-state-matcher': {
+    title: 'Select with a custom ErrorStateMatcher ',
+    component: SelectErrorStateMatcherExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'select-form': {
     title: 'Select in a form',
     component: SelectFormExample,
     additionalFiles: null,
     selectorName: null
   },
+  'select-hint-error': {
+    title: 'Select with form field features ',
+    component: SelectHintErrorExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-multiple': {
+    title: 'Select with multiple selection ',
+    component: SelectMultipleExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-no-ripple': {
+    title: 'Select with cno option ripple ',
+    component: SelectNoRippleExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-optgroup': {
+    title: 'Select with option groups ',
+    component: SelectOptgroupExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'select-overview': {
     title: 'Basic select',
     component: SelectOverviewExample,
     additionalFiles: null,
     selectorName: null
   },
+  'select-panel-class': {
+    title: 'Select with custom panel styling',
+    component: SelectPanelClassExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-reset': {
+    title: 'Select with reset option ',
+    component: SelectResetExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'select-value-binding': {
+    title: 'Select with 2-way value binding ',
+    component: SelectValueBindingExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'sidenav-fab': {
     title: 'Sidenav with a FAB',
     component: SidenavFabExample,
@@ -645,7 +729,9 @@ export const EXAMPLE_LIST = [
   GridListOverviewExample,
   IconOverviewExample,
   IconSvgExample,
+  InputAutosizeTextareaExample,
   InputClearableExample,
+  InputErrorStateMatcherExample,
   InputErrorsExample,
   InputFormExample,
   InputHintExample,
@@ -665,8 +751,18 @@ export const EXAMPLE_LIST = [
   ProgressSpinnerOverviewExample,
   RadioNgModelExample,
   RadioOverviewExample,
+  SelectCustomTriggerExample,
+  SelectDisabledExample,
+  SelectErrorStateMatcherExample,
   SelectFormExample,
+  SelectHintErrorExample,
+  SelectMultipleExample,
+  SelectNoRippleExample,
+  SelectOptgroupExample,
   SelectOverviewExample,
+  SelectPanelClassExample,
+  SelectResetExample,
+  SelectValueBindingExample,
   SidenavFabExample,
   SidenavOverviewExample,
   SlideToggleConfigurableExample,
diff --git a/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.css b/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.html b/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.html
new file mode 100644
index 000000000000..e9487d20b7c4
--- /dev/null
+++ b/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.html
@@ -0,0 +1,4 @@
+<mat-form-field>
+  <textarea matInput placeholder="Autosize textarea" matTextareaAutosize matAutosizeMinRows="2"
+            matAutosizeMaxRows="5"></textarea>
+</mat-form-field>
diff --git a/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.ts b/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.ts
new file mode 100644
index 000000000000..42aac9fa0716
--- /dev/null
+++ b/src/material-examples/input-autosize-textarea/input-autosize-textarea-example.ts
@@ -0,0 +1,9 @@
+import {Component} from '@angular/core';
+
+/** @title Auto-resizing textarea */
+@Component({
+  selector: 'input-autosize-textarea-example',
+  templateUrl: './input-autosize-textarea-example.html',
+  styleUrls: ['./input-autosize-textarea-example.css'],
+})
+export class InputAutosizeTextareaExample {}
diff --git a/src/material-examples/input-clearable/input-clearable-example.ts b/src/material-examples/input-clearable/input-clearable-example.ts
index 3b469528280b..5565cc940bd1 100644
--- a/src/material-examples/input-clearable/input-clearable-example.ts
+++ b/src/material-examples/input-clearable/input-clearable-example.ts
@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 
 /**
- * @title Input Clearable
+ * @title Input with a clear button
  */
 @Component({
   selector: 'input-clearable-example',
diff --git a/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.css b/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.css
new file mode 100644
index 000000000000..08fa67536b1f
--- /dev/null
+++ b/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.css
@@ -0,0 +1,9 @@
+.example-form {
+  min-width: 150px;
+  max-width: 500px;
+  width: 100%;
+}
+
+.example-full-width {
+  width: 100%;
+}
diff --git a/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.html b/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.html
new file mode 100644
index 000000000000..a9a0244209dd
--- /dev/null
+++ b/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.html
@@ -0,0 +1,13 @@
+<form class="example-form">
+  <mat-form-field class="example-full-width">
+    <input matInput placeholder="Email" [formControl]="emailFormControl"
+           [errorStateMatcher]="matcher">
+    <mat-hint>Errors appear instantly!</mat-hint>
+    <mat-error *ngIf="emailFormControl.hasError('email') && !emailFormControl.hasError('required')">
+      Please enter a valid email address
+    </mat-error>
+    <mat-error *ngIf="emailFormControl.hasError('required')">
+      Email is <strong>required</strong>
+    </mat-error>
+  </mat-form-field>
+</form>
diff --git a/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.ts b/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.ts
new file mode 100644
index 000000000000..efefb44e9c2b
--- /dev/null
+++ b/src/material-examples/input-error-state-matcher/input-error-state-matcher-example.ts
@@ -0,0 +1,26 @@
+import {Component} from '@angular/core';
+import {FormControl, FormGroupDirective, NgForm, Validators} from '@angular/forms';
+import {ErrorStateMatcher} from '@angular/material/core';
+
+/** Error when invalid control is dirty, touched, or submitted. */
+export class MyErrorStateMatcher implements ErrorStateMatcher {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    const isSubmitted = form && form.submitted;
+    return !!(control && control.invalid && (control.dirty || control.touched || isSubmitted));
+  }
+}
+
+/** @title Input with a custom ErrorStateMatcher */
+@Component({
+  selector: 'input-error-state-matcher-example',
+  templateUrl: './input-error-state-matcher-example.html',
+  styleUrls: ['./input-error-state-matcher-example.css'],
+})
+export class InputErrorStateMatcherExample {
+  emailFormControl = new FormControl('', [
+    Validators.required,
+    Validators.email,
+  ]);
+
+  matcher = new MyErrorStateMatcher();
+}
diff --git a/src/material-examples/input-errors/input-errors-example.html b/src/material-examples/input-errors/input-errors-example.html
index c8fbba32201c..cf241eef4ffd 100644
--- a/src/material-examples/input-errors/input-errors-example.html
+++ b/src/material-examples/input-errors/input-errors-example.html
@@ -1,7 +1,7 @@
 <form class="example-form">
   <mat-form-field class="example-full-width">
     <input matInput placeholder="Email" [formControl]="emailFormControl">
-    <mat-error *ngIf="emailFormControl.hasError('pattern')">
+    <mat-error *ngIf="emailFormControl.hasError('email') && !emailFormControl.hasError('required')">
       Please enter a valid email address
     </mat-error>
     <mat-error *ngIf="emailFormControl.hasError('required')">
diff --git a/src/material-examples/input-errors/input-errors-example.ts b/src/material-examples/input-errors/input-errors-example.ts
index 8a2dbb861244..2824714890ce 100644
--- a/src/material-examples/input-errors/input-errors-example.ts
+++ b/src/material-examples/input-errors/input-errors-example.ts
@@ -1,10 +1,8 @@
 import {Component} from '@angular/core';
 import {FormControl, Validators} from '@angular/forms';
 
-const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
-
 /**
- * @title Input Errors
+ * @title Input with error messages
  */
 @Component({
   selector: 'input-errors-example',
@@ -12,9 +10,8 @@ const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA
   styleUrls: ['input-errors-example.css'],
 })
 export class InputErrorsExample {
-
   emailFormControl = new FormControl('', [
     Validators.required,
-    Validators.pattern(EMAIL_REGEX)]);
-
+    Validators.email,
+  ]);
 }
diff --git a/src/material-examples/input-hint/input-hint-example.ts b/src/material-examples/input-hint/input-hint-example.ts
index 3b3a5ebc7b66..5d990c6bd613 100644
--- a/src/material-examples/input-hint/input-hint-example.ts
+++ b/src/material-examples/input-hint/input-hint-example.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 
 /**
- * @title Input hints
+ * @title Input with hints
  */
 @Component({
   selector: 'input-hint-example',
   templateUrl: 'input-hint-example.html',
   styleUrls: ['input-hint-example.css'],
 })
-export class InputHintExample { }
+export class InputHintExample {}
diff --git a/src/material-examples/input-overview/input-overview-example.html b/src/material-examples/input-overview/input-overview-example.html
index c4daebdcc9db..5f3a09ceebc4 100644
--- a/src/material-examples/input-overview/input-overview-example.html
+++ b/src/material-examples/input-overview/input-overview-example.html
@@ -2,4 +2,8 @@
   <mat-form-field class="example-full-width">
     <input matInput placeholder="Favorite food" value="Sushi">
   </mat-form-field>
+
+  <mat-form-field class="example-full-width">
+    <textarea matInput placeholder="Leave a comment"></textarea>
+  </mat-form-field>
 </form>
diff --git a/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.ts b/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.ts
index 00ed164cd443..d2c73ebbd9be 100644
--- a/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.ts
+++ b/src/material-examples/input-prefix-suffix/input-prefix-suffix-example.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 
 /**
- * @title Input Prefixes and Suffixes
+ * @title Inputs with prefixes and suffixes
  */
 @Component({
   selector: 'input-prefix-suffix-example',
   templateUrl: 'input-prefix-suffix-example.html',
   styleUrls: ['input-prefix-suffix-example.css'],
 })
-export class InputPrefixSuffixExample { }
+export class InputPrefixSuffixExample {}
diff --git a/src/material-examples/select-custom-trigger/select-custom-trigger-example.css b/src/material-examples/select-custom-trigger/select-custom-trigger-example.css
new file mode 100644
index 000000000000..41db730a17db
--- /dev/null
+++ b/src/material-examples/select-custom-trigger/select-custom-trigger-example.css
@@ -0,0 +1,4 @@
+.example-additional-selection {
+  opacity: 0.75;
+  font-size: 0.75em;
+}
diff --git a/src/material-examples/select-custom-trigger/select-custom-trigger-example.html b/src/material-examples/select-custom-trigger/select-custom-trigger-example.html
new file mode 100644
index 000000000000..b8d7fe7ca306
--- /dev/null
+++ b/src/material-examples/select-custom-trigger/select-custom-trigger-example.html
@@ -0,0 +1,11 @@
+<mat-form-field>
+  <mat-select placeholder="Toppings" [formControl]="toppings" multiple>
+    <mat-select-trigger>
+      {{toppings.value ? toppings.value[0] : ''}}
+      <span *ngIf="toppings.value?.length > 1" class="example-additional-selection">
+        (+{{toppings.value.length - 1}} others)
+      </span>
+    </mat-select-trigger>
+    <mat-option *ngFor="let topping of toppingList" [value]="topping">{{topping}}</mat-option>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/select-custom-trigger/select-custom-trigger-example.ts b/src/material-examples/select-custom-trigger/select-custom-trigger-example.ts
new file mode 100644
index 000000000000..bc40ebd1bb98
--- /dev/null
+++ b/src/material-examples/select-custom-trigger/select-custom-trigger-example.ts
@@ -0,0 +1,14 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/** @title Select with custom trigger text */
+@Component({
+  selector: 'select-custom-trigger-example',
+  templateUrl: 'select-custom-trigger-example.html',
+  styleUrls: ['select-custom-trigger-example.css'],
+})
+export class SelectCustomTriggerExample {
+  toppings = new FormControl();
+
+  toppingList = ['Extra cheese', 'Mushroom', 'Onion', 'Pepperoni', 'Sausage', 'Tomato'];
+}
diff --git a/src/material-examples/select-disabled/select-disabled-example.css b/src/material-examples/select-disabled/select-disabled-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-disabled/select-disabled-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-disabled/select-disabled-example.html b/src/material-examples/select-disabled/select-disabled-example.html
new file mode 100644
index 000000000000..683781d3c9e8
--- /dev/null
+++ b/src/material-examples/select-disabled/select-disabled-example.html
@@ -0,0 +1,12 @@
+<p>
+  <mat-checkbox [formControl]="disableSelect">Disable select</mat-checkbox>
+</p>
+<p>
+  <mat-form-field>
+    <mat-select placeholder="Choose an option" [disabled]="disableSelect.value">
+      <mat-option value="option1">Option 1</mat-option>
+      <mat-option value="option2" disabled>Option 2 (disabled)</mat-option>
+      <mat-option value="option3">Option 3</mat-option>
+    </mat-select>
+  </mat-form-field>
+</p>
diff --git a/src/material-examples/select-disabled/select-disabled-example.ts b/src/material-examples/select-disabled/select-disabled-example.ts
new file mode 100644
index 000000000000..eecdd64f436f
--- /dev/null
+++ b/src/material-examples/select-disabled/select-disabled-example.ts
@@ -0,0 +1,12 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/** @title Disabled select */
+@Component({
+  selector: 'select-disabled-example',
+  templateUrl: 'select-disabled-example.html',
+  styleUrls: ['select-disabled-example.css'],
+})
+export class SelectDisabledExample {
+  disableSelect = new FormControl(false);
+}
diff --git a/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.css b/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.html b/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.html
new file mode 100644
index 000000000000..f6689b670019
--- /dev/null
+++ b/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.html
@@ -0,0 +1,12 @@
+<mat-form-field>
+  <mat-select placeholder="Choose one" [formControl]="selected" [errorStateMatcher]="matcher">
+    <mat-option>Clear</mat-option>
+    <mat-option value="valid">Valid option</mat-option>
+    <mat-option value="invalid">Invalid option</mat-option>
+  </mat-select>
+  <mat-hint>Errors appear instantly!</mat-hint>
+  <mat-error *ngIf="selected.hasError('required')">You must make a selection</mat-error>
+  <mat-error *ngIf="selected.hasError('pattern') && !selected.hasError('required')">
+    Your selection is invalid
+  </mat-error>
+</mat-form-field>
diff --git a/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.ts b/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.ts
new file mode 100644
index 000000000000..5341d8523114
--- /dev/null
+++ b/src/material-examples/select-error-state-matcher/select-error-state-matcher-example.ts
@@ -0,0 +1,26 @@
+import {Component} from '@angular/core';
+import {FormControl, FormGroupDirective, NgForm, Validators} from '@angular/forms';
+import {ErrorStateMatcher} from '@angular/material/core';
+
+/** Error when invalid control is dirty, touched, or submitted. */
+export class MyErrorStateMatcher implements ErrorStateMatcher {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    const isSubmitted = form && form.submitted;
+    return !!(control && control.invalid && (control.dirty || control.touched || isSubmitted));
+  }
+}
+
+/** @title Select with a custom ErrorStateMatcher */
+@Component({
+  selector: 'select-error-state-matcher-example',
+  templateUrl: 'select-error-state-matcher-example.html',
+  styleUrls: ['select-error-state-matcher-example.css'],
+})
+export class SelectErrorStateMatcherExample {
+  selected = new FormControl('valid', [
+    Validators.required,
+    Validators.pattern('valid'),
+  ]);
+
+  matcher = new MyErrorStateMatcher();
+}
diff --git a/src/material-examples/select-form/select-form-example.ts b/src/material-examples/select-form/select-form-example.ts
index 0bb2c305b178..f3ad571314a1 100644
--- a/src/material-examples/select-form/select-form-example.ts
+++ b/src/material-examples/select-form/select-form-example.ts
@@ -6,6 +6,7 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'select-form-example',
   templateUrl: 'select-form-example.html',
+  styleUrls: ['select-form-example.css'],
 })
 export class SelectFormExample {
   selectedValue: string;
diff --git a/src/material-examples/select-hint-error/select-hint-error-example.css b/src/material-examples/select-hint-error/select-hint-error-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-hint-error/select-hint-error-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-hint-error/select-hint-error-example.html b/src/material-examples/select-hint-error/select-hint-error-example.html
new file mode 100644
index 000000000000..fc7f443075ce
--- /dev/null
+++ b/src/material-examples/select-hint-error/select-hint-error-example.html
@@ -0,0 +1,10 @@
+<mat-form-field>
+  <mat-select placeholder="Favorite animal" [formControl]="animalControl" required>
+    <mat-option>--</mat-option>
+    <mat-option *ngFor="let animal of animals" [value]="animal">
+      {{animal.name}}
+    </mat-option>
+  </mat-select>
+  <mat-error *ngIf="animalControl.hasError('required')">Please choose an animal</mat-error>
+  <mat-hint>{{animalControl.value?.sound}}</mat-hint>
+</mat-form-field>
diff --git a/src/material-examples/select-hint-error/select-hint-error-example.ts b/src/material-examples/select-hint-error/select-hint-error-example.ts
new file mode 100644
index 000000000000..82fd4a193be9
--- /dev/null
+++ b/src/material-examples/select-hint-error/select-hint-error-example.ts
@@ -0,0 +1,19 @@
+import {Component} from '@angular/core';
+import {FormControl, Validators} from '@angular/forms';
+
+/** @title Select with form field features */
+@Component({
+  selector: 'select-hint-error-example',
+  templateUrl: 'select-hint-error-example.html',
+  styleUrls: ['select-hint-error-example.css'],
+})
+export class SelectHintErrorExample {
+  animalControl = new FormControl('', [Validators.required]);
+
+  animals = [
+    {name: 'Dog', sound: 'Woof!'},
+    {name: 'Cat', sound: 'Meow!'},
+    {name: 'Cow', sound: 'Moo!'},
+    {name: 'Fox', sound: 'Wa-pa-pa-pa-pa-pa-pow!'},
+  ];
+}
diff --git a/src/material-examples/select-multiple/select-multiple-example.css b/src/material-examples/select-multiple/select-multiple-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-multiple/select-multiple-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-multiple/select-multiple-example.html b/src/material-examples/select-multiple/select-multiple-example.html
new file mode 100644
index 000000000000..916ae396391a
--- /dev/null
+++ b/src/material-examples/select-multiple/select-multiple-example.html
@@ -0,0 +1,5 @@
+<mat-form-field>
+  <mat-select placeholder="Toppings" [formControl]="toppings" multiple>
+    <mat-option *ngFor="let topping of toppingList" [value]="topping">{{topping}}</mat-option>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/select-multiple/select-multiple-example.ts b/src/material-examples/select-multiple/select-multiple-example.ts
new file mode 100644
index 000000000000..7f58f4cbe78c
--- /dev/null
+++ b/src/material-examples/select-multiple/select-multiple-example.ts
@@ -0,0 +1,14 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/** @title Select with multiple selection */
+@Component({
+  selector: 'select-multiple-example',
+  templateUrl: 'select-multiple-example.html',
+  styleUrls: ['select-multiple-example.css'],
+})
+export class SelectMultipleExample {
+  toppings = new FormControl();
+
+  toppingList = ['Extra cheese', 'Mushroom', 'Onion', 'Pepperoni', 'Sausage', 'Tomato'];
+}
diff --git a/src/material-examples/select-no-ripple/select-no-ripple-example.css b/src/material-examples/select-no-ripple/select-no-ripple-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-no-ripple/select-no-ripple-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-no-ripple/select-no-ripple-example.html b/src/material-examples/select-no-ripple/select-no-ripple-example.html
new file mode 100644
index 000000000000..a0b0ad4db057
--- /dev/null
+++ b/src/material-examples/select-no-ripple/select-no-ripple-example.html
@@ -0,0 +1,7 @@
+<mat-form-field>
+  <mat-select placeholder="Select an option" disableRipple>
+    <mat-option value="1">Option 1</mat-option>
+    <mat-option value="2">Option 2</mat-option>
+    <mat-option value="3">Option 3</mat-option>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/select-no-ripple/select-no-ripple-example.ts b/src/material-examples/select-no-ripple/select-no-ripple-example.ts
new file mode 100644
index 000000000000..4c9375c6f3ff
--- /dev/null
+++ b/src/material-examples/select-no-ripple/select-no-ripple-example.ts
@@ -0,0 +1,9 @@
+import {Component} from '@angular/core';
+
+/** @title Select with no option ripple */
+@Component({
+  selector: 'select-no-ripple-example',
+  templateUrl: 'select-no-ripple-example.html',
+  styleUrls: ['select-no-ripple-example.css'],
+})
+export class SelectNoRippleExample {}
diff --git a/src/material-examples/select-optgroup/select-optgroup-example.css b/src/material-examples/select-optgroup/select-optgroup-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-optgroup/select-optgroup-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-optgroup/select-optgroup-example.html b/src/material-examples/select-optgroup/select-optgroup-example.html
new file mode 100644
index 000000000000..24859472aa67
--- /dev/null
+++ b/src/material-examples/select-optgroup/select-optgroup-example.html
@@ -0,0 +1,11 @@
+<mat-form-field>
+  <mat-select placeholder="Pokemon" [formControl]="pokemonControl">
+    <mat-option>-- None --</mat-option>
+    <mat-optgroup *ngFor="let group of pokemonGroups" [label]="group.name"
+                  [disabled]="group.disabled">
+      <mat-option *ngFor="let pokemon of group.pokemon" [value]="pokemon.value">
+        {{ pokemon.viewValue }}
+      </mat-option>
+    </mat-optgroup>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/select-optgroup/select-optgroup-example.ts b/src/material-examples/select-optgroup/select-optgroup-example.ts
new file mode 100644
index 000000000000..6113c69b4d59
--- /dev/null
+++ b/src/material-examples/select-optgroup/select-optgroup-example.ts
@@ -0,0 +1,47 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/** @title Select with option groups */
+@Component({
+  selector: 'select-optgroup-example',
+  templateUrl: 'select-optgroup-example.html',
+  styleUrls: ['select-optgroup-example.css'],
+})
+export class SelectOptgroupExample {
+  pokemonControl = new FormControl();
+
+  pokemonGroups = [
+    {
+      name: 'Grass',
+      pokemon: [
+        { value: 'bulbasaur-0', viewValue: 'Bulbasaur' },
+        { value: 'oddish-1', viewValue: 'Oddish' },
+        { value: 'bellsprout-2', viewValue: 'Bellsprout' }
+      ]
+    },
+    {
+      name: 'Water',
+      pokemon: [
+        { value: 'squirtle-3', viewValue: 'Squirtle' },
+        { value: 'psyduck-4', viewValue: 'Psyduck' },
+        { value: 'horsea-5', viewValue: 'Horsea' }
+      ]
+    },
+    {
+      name: 'Fire',
+      disabled: true,
+      pokemon: [
+        { value: 'charmander-6', viewValue: 'Charmander' },
+        { value: 'vulpix-7', viewValue: 'Vulpix' },
+        { value: 'flareon-8', viewValue: 'Flareon' }
+      ]
+    },
+    {
+      name: 'Psychic',
+      pokemon: [
+        { value: 'mew-9', viewValue: 'Mew' },
+        { value: 'mewtwo-10', viewValue: 'Mewtwo' },
+      ]
+    }
+  ];
+}
diff --git a/src/material-examples/select-overview/select-overview-example.ts b/src/material-examples/select-overview/select-overview-example.ts
index a6a2ff822eeb..8bae60ba829a 100644
--- a/src/material-examples/select-overview/select-overview-example.ts
+++ b/src/material-examples/select-overview/select-overview-example.ts
@@ -6,6 +6,7 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'select-overview-example',
   templateUrl: 'select-overview-example.html',
+  styleUrls: ['select-overview-example.css'],
 })
 export class SelectOverviewExample {
   foods = [
diff --git a/src/material-examples/select-panel-class/select-panel-class-example.css b/src/material-examples/select-panel-class/select-panel-class-example.css
new file mode 100644
index 000000000000..2d18f02f1504
--- /dev/null
+++ b/src/material-examples/select-panel-class/select-panel-class-example.css
@@ -0,0 +1,11 @@
+.example-panel-red .mat-select-content {
+  background: rgba(255, 0, 0, 0.5);
+}
+
+.example-panel-green .mat-select-content {
+  background: rgba(0, 255, 0, 0.5);
+}
+
+.example-panel-blue .mat-select-content {
+  background: rgba(0, 0, 255, 0.5);
+}
diff --git a/src/material-examples/select-panel-class/select-panel-class-example.html b/src/material-examples/select-panel-class/select-panel-class-example.html
new file mode 100644
index 000000000000..c3e560aa2dfd
--- /dev/null
+++ b/src/material-examples/select-panel-class/select-panel-class-example.html
@@ -0,0 +1,8 @@
+<mat-form-field>
+  <mat-select placeholder="Panel color" [formControl]="panelColor"
+              panelClass="example-panel-{{panelColor.value}}">
+    <mat-option value="red">Red</mat-option>
+    <mat-option value="green">Green</mat-option>
+    <mat-option value="blue">Blue</mat-option>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/select-panel-class/select-panel-class-example.ts b/src/material-examples/select-panel-class/select-panel-class-example.ts
new file mode 100644
index 000000000000..712f75f49b5f
--- /dev/null
+++ b/src/material-examples/select-panel-class/select-panel-class-example.ts
@@ -0,0 +1,15 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/**
+ * @title Select with custom panel styling
+ */
+@Component({
+  selector: 'select-panel-class-example',
+  templateUrl: 'select-panel-class-example.html',
+  styleUrls: ['select-panel-class-example.css'],
+  encapsulation: ViewEncapsulation.None,
+})
+export class SelectPanelClassExample {
+  panelColor = new FormControl('red');
+}
diff --git a/src/material-examples/select-reset/select-reset-example.css b/src/material-examples/select-reset/select-reset-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-reset/select-reset-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-reset/select-reset-example.html b/src/material-examples/select-reset/select-reset-example.html
new file mode 100644
index 000000000000..9d8e2c0ffd81
--- /dev/null
+++ b/src/material-examples/select-reset/select-reset-example.html
@@ -0,0 +1,6 @@
+<mat-form-field>
+  <mat-select placeholder="State">
+    <mat-option>None</mat-option>
+    <mat-option *ngFor="let state of states" [value]="state">{{state}}</mat-option>
+  </mat-select>
+</mat-form-field>
diff --git a/src/material-examples/select-reset/select-reset-example.ts b/src/material-examples/select-reset/select-reset-example.ts
new file mode 100644
index 000000000000..e14587ed4567
--- /dev/null
+++ b/src/material-examples/select-reset/select-reset-example.ts
@@ -0,0 +1,19 @@
+import {Component} from '@angular/core';
+
+/** @title Select with reset option */
+@Component({
+  selector: 'select-reset-example',
+  templateUrl: 'select-reset-example.html',
+  styleUrls: ['select-reset-example.css'],
+})
+export class SelectResetExample {
+  states = [
+    'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 'Colorado', 'Connecticut', 'Delaware',
+    'Florida', 'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa', 'Kansas', 'Kentucky',
+    'Louisiana', 'Maine', 'Maryland', 'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi',
+    'Missouri', 'Montana', 'Nebraska', 'Nevada', 'New Hampshire', 'New Jersey', 'New Mexico',
+    'New York', 'North Carolina', 'North Dakota', 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania',
+    'Rhode Island', 'South Carolina', 'South Dakota', 'Tennessee', 'Texas', 'Utah', 'Vermont',
+    'Virginia', 'Washington', 'West Virginia', 'Wisconsin', 'Wyoming'
+  ];
+}
diff --git a/src/material-examples/select-vlaue-binding/select-value-binding-example.css b/src/material-examples/select-vlaue-binding/select-value-binding-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/select-vlaue-binding/select-value-binding-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/select-vlaue-binding/select-value-binding-example.html b/src/material-examples/select-vlaue-binding/select-value-binding-example.html
new file mode 100644
index 000000000000..aa3e93b46e0f
--- /dev/null
+++ b/src/material-examples/select-vlaue-binding/select-value-binding-example.html
@@ -0,0 +1,10 @@
+<mat-form-field>
+  <mat-select [(value)]="selected">
+    <mat-option>None</mat-option>
+    <mat-option value="option1">Option 1</mat-option>
+    <mat-option value="option2">Option 2</mat-option>
+    <mat-option value="option3">Option 3</mat-option>
+  </mat-select>
+</mat-form-field>
+
+<p>You selected: {{selected}}</p>
diff --git a/src/material-examples/select-vlaue-binding/select-value-binding-example.ts b/src/material-examples/select-vlaue-binding/select-value-binding-example.ts
new file mode 100644
index 000000000000..8d8621262b1c
--- /dev/null
+++ b/src/material-examples/select-vlaue-binding/select-value-binding-example.ts
@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+
+/** @title Select with 2-way value binding */
+@Component({
+  selector: 'select-value-binding-example',
+  templateUrl: 'select-value-binding-example.html',
+  styleUrls: ['select-value-binding-example.css'],
+})
+export class SelectValueBindingExample {
+  selected = 'option2';
+}

From 9b4f4355bc89cb83295f10b8d1bea6ba3ab4d6d5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 07:20:51 +0200
Subject: [PATCH 315/575] fix(select): wrong cursor on disabled select (#7696)

* Fixes some area of a disabled select having a `cursor: pointer`.
* Replaces the `mat-disabled` class on the form field underline with a `mat-form-field-disabled` class on the form field itself to allow for easier styling.

Fixes #7695.
---
 src/lib/form-field/_form-field-theme.scss |  6 +++---
 src/lib/form-field/form-field.html        |  3 +--
 src/lib/form-field/form-field.scss        |  2 +-
 src/lib/form-field/form-field.ts          |  1 +
 src/lib/input/input.spec.ts               | 24 +++++++++++------------
 src/lib/select/select.scss                |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 010b6b368ce5..898a2b0a35e4 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -55,10 +55,10 @@
 
   .mat-form-field-underline {
     background-color: $underline-color;
+  }
 
-    &.mat-disabled {
-      @include mat-control-disabled-underline($underline-color);
-    }
+  .mat-form-field-disabled .mat-form-field-underline {
+    @include mat-control-disabled-underline($underline-color);
   }
 
   .mat-form-field-ripple {
diff --git a/src/lib/form-field/form-field.html b/src/lib/form-field/form-field.html
index 3ab526ce0e7e..f78d16a64000 100644
--- a/src/lib/form-field/form-field.html
+++ b/src/lib/form-field/form-field.html
@@ -35,8 +35,7 @@
     </div>
   </div>
 
-  <div class="mat-input-underline mat-form-field-underline" #underline
-       [class.mat-disabled]="_control.disabled">
+  <div class="mat-input-underline mat-form-field-underline" #underline>
     <span class="mat-input-ripple mat-form-field-ripple"
           [class.mat-accent]="color == 'accent'"
           [class.mat-warn]="color == 'warn'"></span>
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index f91817b6c324..936322c3fab0 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -148,7 +148,7 @@ $mat-form-field-underline-height: 1px !default;
   // Prevents underline from disappearing at lower zoom levels.
   transform: perspective(1px);
 
-  &.mat-disabled {
+  .mat-form-field-disabled & {
     background-position: 0;
     background-color: transparent;
   }
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 0569f2871982..92e8ffa4e808 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -75,6 +75,7 @@ let nextUniqueId = 0;
     '[class.mat-form-field-invalid]': '_control.errorState',
     '[class.mat-form-field-can-float]': '_canPlaceholderFloat',
     '[class.mat-form-field-should-float]': '_control.shouldPlaceholderFloat || _shouldAlwaysFloat',
+    '[class.mat-form-field-disabled]': '_control.disabled',
     '[class.mat-focused]': '_control.focused',
     '[class.mat-primary]': 'color == "primary"',
     '[class.mat-accent]': 'color == "accent"',
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 5f161743e271..82382d81863c 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -423,19 +423,19 @@ describe('MatInput without forms', function () {
     const fixture = TestBed.createComponent(MatInputWithDisabled);
     fixture.detectChanges();
 
-    const underlineEl =
-        fixture.debugElement.query(By.css('.mat-form-field-underline')).nativeElement;
+    const formFieldEl =
+        fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     const inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
 
-    expect(underlineEl.classList.contains('mat-disabled'))
-        .toBe(false, `Expected underline not to start out disabled.`);
+    expect(formFieldEl.classList.contains('mat-form-field-disabled'))
+        .toBe(false, `Expected form field not to start out disabled.`);
     expect(inputEl.disabled).toBe(false);
 
     fixture.componentInstance.disabled = true;
     fixture.detectChanges();
 
-    expect(underlineEl.classList.contains('mat-disabled'))
-        .toBe(true, `Expected underline to look disabled after property is set.`);
+    expect(formFieldEl.classList.contains('mat-form-field-disabled'))
+        .toBe(true, `Expected form field to look disabled after property is set.`);
     expect(inputEl.disabled).toBe(true);
   }));
 
@@ -1010,19 +1010,19 @@ describe('MatInput with forms', () => {
     const fixture = TestBed.createComponent(MatInputWithFormControl);
     fixture.detectChanges();
 
-    const underlineEl =
-        fixture.debugElement.query(By.css('.mat-form-field-underline')).nativeElement;
+    const formFieldEl =
+        fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     const inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
 
-    expect(underlineEl.classList)
-      .not.toContain('mat-disabled', `Expected underline not to start out disabled.`);
+    expect(formFieldEl.classList)
+      .not.toContain('mat-form-field-disabled', `Expected form field not to start out disabled.`);
     expect(inputEl.disabled).toBe(false);
 
     fixture.componentInstance.formControl.disable();
     fixture.detectChanges();
 
-    expect(underlineEl.classList).toContain('mat-disabled',
-      `Expected underline to look disabled after disable() is called.`);
+    expect(formFieldEl.classList).toContain('mat-form-field-disabled',
+      `Expected form field to look disabled after disable() is called.`);
     expect(inputEl.disabled).toBe(true);
   });
 
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index e3eb9f2c6f32..7f7dd9af7f0e 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -78,7 +78,7 @@ $mat-select-placeholder-arrow-space: 2 * ($mat-select-arrow-size + $mat-select-a
 }
 
 .mat-form-field-type-mat-select {
-  .mat-form-field-flex {
+  &:not(.mat-form-field-disabled) .mat-form-field-flex {
     cursor: pointer;
   }
 

From 131e98f2eab3a9505605e2c275c6e7b95dea677a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 07:21:01 +0200
Subject: [PATCH 316/575] perf(drawer): drawer content repainting on scroll
 (#7719)

Prevents the drawer content from repainting while scrolling.

Relates to #7716.
---
 src/lib/sidenav/drawer.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index c9a944b2ea16..290e0098d5a8 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -1,6 +1,7 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
 @import '../core/style/layout-common';
+@import '../core/style/vendor-prefixes';
 @import '../../cdk/a11y/a11y';
 
 $mat-drawer-content-z-index: 1;
@@ -79,6 +80,9 @@ $mat-drawer-over-drawer-z-index: 4;
 }
 
 .mat-drawer-content {
+  // `backface-visibility` prevents the element from repainting on scroll. This is the
+  // equivalent of using `translateZ(0)`, but it doesn't create a new stacking context.
+  @include backface-visibility(hidden);
   @include mat-drawer-stacking-context($mat-drawer-content-z-index);
 
   display: block;

From f52f078924762df0d730d48dcd311cc2087ea24c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 07:21:12 +0200
Subject: [PATCH 317/575] fix(progress-spinner): inaccurate stroke width on
 really small spinners (#7725)

Fixes the spinner stroke not being accurate on really small spinners (<20px). This is follow-up from #7686.
---
 src/demo-app/progress-spinner/progress-spinner-demo.html | 6 ++++--
 src/lib/progress-spinner/progress-spinner.html           | 2 +-
 src/lib/progress-spinner/progress-spinner.spec.ts        | 4 ++--
 src/lib/progress-spinner/progress-spinner.ts             | 5 +++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.html b/src/demo-app/progress-spinner/progress-spinner-demo.html
index 01eeeff43b82..eedb490dd4d1 100644
--- a/src/demo-app/progress-spinner/progress-spinner-demo.html
+++ b/src/demo-app/progress-spinner/progress-spinner-demo.html
@@ -9,9 +9,11 @@ <h1>Determinate</h1>
 
 <div class="demo-progress-spinner">
   <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
-      [value]="progressValue" color="primary" [strokeWidth]="1" [diameter]="32"></mat-progress-spinner>
+      [value]="progressValue" color="warn" [strokeWidth]="1.6" [diameter]="16"></mat-progress-spinner>
   <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
-      [value]="progressValue" color="accent" [diameter]="50"></mat-progress-spinner>
+      [value]="progressValue" color="accent" [strokeWidth]="1" [diameter]="32"></mat-progress-spinner>
+  <mat-progress-spinner [mode]="isDeterminate ? 'determinate' : 'indeterminate'"
+      [value]="progressValue" color="primary" [diameter]="50"></mat-progress-spinner>
 </div>
 
 <h1>Indeterminate</h1>
diff --git a/src/lib/progress-spinner/progress-spinner.html b/src/lib/progress-spinner/progress-spinner.html
index 303d1d0ebfe0..4de40c2dca21 100644
--- a/src/lib/progress-spinner/progress-spinner.html
+++ b/src/lib/progress-spinner/progress-spinner.html
@@ -19,5 +19,5 @@
     [style.animation-name]="'mat-progress-spinner-stroke-rotate-' + diameter"
     [style.stroke-dashoffset.px]="_strokeDashOffset"
     [style.stroke-dasharray.px]="_strokeCircumference"
-    [style.stroke-width.px]="strokeWidth"></circle>
+    [style.stroke-width.%]="_circleStrokeWidth"></circle>
 </svg>
diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index 4c117bb28d20..a1d655d765d4 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -108,8 +108,8 @@ describe('MatProgressSpinner', () => {
     fixture.componentInstance.strokeWidth = 40;
     fixture.detectChanges();
 
-    expect(parseInt(circleElement.style.strokeWidth))
-      .toBe(40, 'Expected the custom stroke width to be applied to the circle element.');
+    expect(parseInt(circleElement.style.strokeWidth)).toBe(30, 'Expected the custom stroke ' +
+      'width to be applied to the circle element as a percentage of the element size.');
     expect(svgElement.getAttribute('viewBox'))
       .toBe('0 0 130 130', 'Expected the viewBox to be adjusted based on the stroke width.');
   });
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 5bddea884375..18e298ea8865 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -176,6 +176,11 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     return null;
   }
 
+  /** Stroke width of the circle in percent. */
+  get _circleStrokeWidth() {
+    return this.strokeWidth / this._elementSize * 100;
+  }
+
   /** Sets the diameter and adds diameter-specific styles if necessary. */
   private _setDiameterAndInitStyles(size: number): void {
     this._diameter = size;

From 70c349c23f0d886d167968b33c1defe84510c877 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 07:21:19 +0200
Subject: [PATCH 318/575] fix(select): remove inert focus call (#7729)

Removes an attempt to focus the select panel after the animation is done. This doesn't do anything, because the panel isn't focusable, however it'll start throwing in an upcoming Angular release.
---
 src/lib/select/select.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index b0a5c8729ba3..88008d035466 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -652,7 +652,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   _onFadeInDone(): void {
     this._panelDoneAnimating = this.panelOpen;
-    this.panel.nativeElement.focus();
     this._changeDetectorRef.markForCheck();
   }
 

From a0bb1a36bb4bcc08e2abe9b6eae84a9be0887bb8 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 21:38:29 +0200
Subject: [PATCH 319/575] fix(button): focus styles not applied to
 programmatically focused buttons (#5966)

Currently the tint that is added on top of focused buttons won't show up if the button is focused programmatically, which means that the button won't appear focused in cases like the dialog closing and restoring focus to its trigger. This seems to have been introduced by 5d6920dde6cbe17f2888b7e09f123e02db251b0f.

Fixes #7510.
---
 src/demo-app/button/button-demo.html      |  7 +++---
 src/demo-app/demo-app/demo-app.html       |  2 +-
 src/demo-app/sidenav/sidenav-demo.html    | 10 ++++----
 src/lib/button-toggle/button-toggle.scss  |  9 ++++---
 src/lib/button/_button-base.scss          |  2 +-
 src/lib/datepicker/_datepicker-theme.scss |  3 ++-
 src/lib/sidenav/drawer.ts                 | 30 +++++++++++++++++------
 src/lib/slider/slider.scss                |  3 ++-
 8 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/demo-app/button/button-demo.html b/src/demo-app/button/button-demo.html
index 2b3400b15761..211d2c0c33b9 100644
--- a/src/demo-app/button/button-demo.html
+++ b/src/demo-app/button/button-demo.html
@@ -73,11 +73,12 @@
       <button mat-raised-button (click)="button1.focus()">Focus 1</button>
       <button mat-raised-button (click)="button2.focus()">Focus 2</button>
       <button mat-raised-button (click)="button3.focus()">Focus 3</button>
+      <button mat-raised-button (click)="button4.focus()">Focus 4</button>
     </div>
     <button mat-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1">off</button>
-    <button mat-button color="primary" [disabled]="isDisabled">off</button>
-    <a href="http://www.google.com" #button2 mat-button color="accent" [disabled]="isDisabled">off</a>
-    <button mat-raised-button #button3 color="primary" [disabled]="isDisabled">off</button>
+    <button mat-button #button2 color="primary" [disabled]="isDisabled">off</button>
+    <a href="http://www.google.com" #button3 mat-button color="accent" [disabled]="isDisabled">off</a>
+    <button mat-raised-button #button4 color="primary" [disabled]="isDisabled">off</button>
     <button mat-mini-fab [disabled]="isDisabled">
       <mat-icon>check</mat-icon>
     </button>
diff --git a/src/demo-app/demo-app/demo-app.html b/src/demo-app/demo-app/demo-app.html
index cb6e9d904537..ba6af65434be 100644
--- a/src/demo-app/demo-app/demo-app.html
+++ b/src/demo-app/demo-app/demo-app.html
@@ -24,7 +24,7 @@
   </mat-sidenav>
   <div>
     <mat-toolbar color="primary">
-      <button mat-icon-button (click)="start.open()">
+      <button mat-icon-button (click)="start.open('mouse')">
         <mat-icon>menu</mat-icon>
       </button>
       <div class="demo-toolbar">
diff --git a/src/demo-app/sidenav/sidenav-demo.html b/src/demo-app/sidenav/sidenav-demo.html
index 31de4f40dd7f..728a85dacd48 100644
--- a/src/demo-app/sidenav/sidenav-demo.html
+++ b/src/demo-app/sidenav/sidenav-demo.html
@@ -9,9 +9,9 @@
                  [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       Start Side Sidenav
       <br>
-      <button mat-button (click)="start.close()">Close</button>
+      <button mat-button (click)="start.close('mouse')">Close</button>
       <br>
-      <button mat-button (click)="end.open()">Open End Side</button>
+      <button mat-button (click)="end.open('keyboard')">Open End Side</button>
       <br>
       <button mat-button (click)="modeIndex = (modeIndex + 1) % 3">Toggle Mode</button>
       <div>Mode: {{start.mode}}</div>
@@ -24,7 +24,7 @@
                  [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       End Side Sidenav
       <br>
-      <button mat-button (click)="end.close()">Close</button>
+      <button mat-button (click)="end.close('mouse')">Close</button>
       <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
     </mat-sidenav>
 
@@ -39,8 +39,8 @@
 
         <div>
           <h3>Sidenav</h3>
-          <button mat-button (click)="start.toggle()">Toggle Start Side Sidenav</button>
-          <button mat-button (click)="end.toggle()">Toggle End Side Sidenav</button>
+          <button mat-button (click)="start.toggle(undefined, 'mouse')">Toggle Start Side Sidenav</button>
+          <button mat-button (click)="end.toggle(undefined, 'mouse')">Toggle End Side Sidenav</button>
           <mat-checkbox [(ngModel)]="fixed">Fixed mode</mat-checkbox>
           <mat-checkbox [(ngModel)]="coverHeader">Sidenav covers header/footer</mat-checkbox>
         </div>
diff --git a/src/lib/button-toggle/button-toggle.scss b/src/lib/button-toggle/button-toggle.scss
index ea408e5505bb..89c58c628809 100644
--- a/src/lib/button-toggle/button-toggle.scss
+++ b/src/lib/button-toggle/button-toggle.scss
@@ -38,10 +38,13 @@ $mat-button-toggle-border-radius: 2px !default;
 .mat-button-toggle {
   white-space: nowrap;
   position: relative;
-}
 
-.mat-button-toggle.cdk-keyboard-focused .mat-button-toggle-focus-overlay {
-  opacity: 1;
+  &.cdk-keyboard-focused,
+  &.cdk-program-focused {
+    .mat-button-toggle-focus-overlay {
+      opacity: 1;
+    }
+  }
 }
 
 .mat-button-toggle-label-content {
diff --git a/src/lib/button/_button-base.scss b/src/lib/button/_button-base.scss
index 44b9e39e3aa8..e3606174d34b 100644
--- a/src/lib/button/_button-base.scss
+++ b/src/lib/button/_button-base.scss
@@ -51,7 +51,7 @@ $mat-mini-fab-padding: 8px !default;
     cursor: default;
   }
 
-  &.cdk-keyboard-focused {
+  &.cdk-keyboard-focused, &.cdk-program-focused {
     .mat-button-focus-overlay {
       opacity: 1;
     }
diff --git a/src/lib/datepicker/_datepicker-theme.scss b/src/lib/datepicker/_datepicker-theme.scss
index 729adf43fb17..f1a48d7bf71f 100644
--- a/src/lib/datepicker/_datepicker-theme.scss
+++ b/src/lib/datepicker/_datepicker-theme.scss
@@ -52,7 +52,8 @@ $mat-calendar-weekday-table-font-size: 11px !default;
   }
 
   :not(.mat-calendar-body-disabled):hover,
-  .cdk-keyboard-focused .mat-calendar-body-active {
+  .cdk-keyboard-focused .mat-calendar-body-active,
+  .cdk-program-focused .mat-calendar-body-active {
     & > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected) {
       background-color: mat-color($background, hover);
     }
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 51193b112e3a..464afbe4254c 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -7,7 +7,7 @@
  */
 
 import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
-import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
+import {FocusTrap, FocusTrapFactory, FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ESCAPE} from '@angular/cdk/keycodes';
@@ -172,6 +172,9 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   /** Whether the drawer is opened. */
   private _opened: boolean = false;
 
+  /** How the sidenav was opened (keypress, mouse click etc.) */
+  private _openedVia: FocusOrigin | null;
+
   /** Emits whenever the drawer has started animating. */
   _animationStarted = new EventEmitter<AnimationEvent>();
 
@@ -230,6 +233,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
 
   constructor(private _elementRef: ElementRef,
               private _focusTrapFactory: FocusTrapFactory,
+              private _focusMonitor: FocusMonitor,
               @Optional() @Inject(DOCUMENT) private _doc: any) {
     this.openedChange.subscribe((opened: boolean) => {
       if (opened) {
@@ -251,16 +255,18 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
    * opened.
    */
   private _restoreFocus() {
-    let activeEl = this._doc && this._doc.activeElement;
+    const activeEl = this._doc && this._doc.activeElement;
+
     if (activeEl && this._elementRef.nativeElement.contains(activeEl)) {
       if (this._elementFocusedBeforeDrawerWasOpened instanceof HTMLElement) {
-        this._elementFocusedBeforeDrawerWasOpened.focus();
+        this._focusMonitor.focusVia(this._elementFocusedBeforeDrawerWasOpened, this._openedVia);
       } else {
         this._elementRef.nativeElement.blur();
       }
     }
 
     this._elementFocusedBeforeDrawerWasOpened = null;
+    this._openedVia = null;
   }
 
   ngAfterContentInit() {
@@ -285,10 +291,13 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     this.toggle(coerceBooleanProperty(v));
   }
 
-
-  /** Open the drawer. */
-  open(): Promise<MatDrawerToggleResult> {
-    return this.toggle(true);
+  /**
+   * Open the drawer.
+   * @param openedVia Whether the drawer was opened by a key press, mouse click or programmatically.
+   * Used for focus management after the sidenav is closed.
+   */
+  open(openedVia?: FocusOrigin): Promise<MatDrawerToggleResult> {
+    return this.toggle(true, openedVia);
   }
 
   /** Close the drawer. */
@@ -299,12 +308,17 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   /**
    * Toggle this drawer.
    * @param isOpen Whether the drawer should be open.
+   * @param openedVia Whether the drawer was opened by a key press, mouse click or programmatically.
+   * Used for focus management after the sidenav is closed.
    */
-  toggle(isOpen: boolean = !this.opened): Promise<MatDrawerToggleResult> {
+  toggle(isOpen: boolean = !this.opened, openedVia: FocusOrigin = 'program'):
+    Promise<MatDrawerToggleResult> {
+
     this._opened = isOpen;
 
     if (isOpen) {
       this._animationState = this._enableAnimations ? 'open' : 'open-instant';
+      this._openedVia = openedVia;
     } else {
       this._animationState = 'void';
       this._restoreFocus();
diff --git a/src/lib/slider/slider.scss b/src/lib/slider/slider.scss
index f27f052bd1b2..edcf83304b87 100644
--- a/src/lib/slider/slider.scss
+++ b/src/lib/slider/slider.scss
@@ -93,7 +93,8 @@ $mat-slider-focus-ring-size: 30px !default;
               background-color $swift-ease-out-duration $swift-ease-out-timing-function,
               opacity $swift-ease-out-duration $swift-ease-out-timing-function;
 
-  .cdk-keyboard-focused & {
+  .cdk-keyboard-focused &,
+  .cdk-program-focused & {
     transform: scale(1);
     opacity: 1;
   }

From 4f571b1d938dd09dc0ede8ddc3039ed52ef191e6 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Thu, 12 Oct 2017 15:38:37 -0400
Subject: [PATCH 320/575] fix(snackbar): swap enter and exit animation curves
 (#6791)

- Use animation constants for maintainability
---
 src/lib/snack-bar/snack-bar-container.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 64ad981d71ee..0e355b3887e2 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -33,15 +33,16 @@ import {
   PortalHostDirective,
 } from '@angular/cdk/portal';
 import {first} from '@angular/cdk/rxjs';
+import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {MatSnackBarConfig} from './snack-bar-config';
 
 
-// TODO(jelbourn): we can't use constants from animation.ts here because you can't use
-// a text interpolation in anything that is analyzed statically with ngc (for AoT compile).
-export const SHOW_ANIMATION = '225ms cubic-bezier(0.4,0.0,1,1)';
-export const HIDE_ANIMATION = '195ms cubic-bezier(0.0,0.0,0.2,1)';
+export const SHOW_ANIMATION =
+    `${AnimationDurations.ENTERING} ${AnimationCurves.DECELERATION_CURVE}`;
+export const HIDE_ANIMATION =
+    `${AnimationDurations.EXITING} ${AnimationCurves.ACCELERATION_CURVE}`;
 
 /**
  * Internal component that wraps user-provided snack bar content.

From 160a511e6124ac4f2f8696e7926708074faf45cb Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Thu, 12 Oct 2017 12:39:30 -0700
Subject: [PATCH 321/575] fix(form-field): remove 200px width since it messes
 up flex layouts (#7083)

* remove 200px width on form-field since it messes up flex layouts

* fix select expanding to 100%
---
 src/lib/form-field/_form-field-theme.scss | 6 ------
 src/lib/form-field/form-field.scss        | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 898a2b0a35e4..ea8163ab9658 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -23,12 +23,6 @@
   $underline-color-warn: mat-color($warn);
   $underline-focused-color: mat-color($primary);
 
-  // Define the width here so that it is easier for users to override with one css class worth
-  // of specificity.
-  .mat-form-field {
-    width: 200px;
-  }
-
   .mat-form-field-placeholder {
     color: $placeholder-color;
   }
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 936322c3fab0..9f1b72717736 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -6,6 +6,10 @@
 $mat-form-field-hint-min-space: 1em !default;
 // The height of the underline.
 $mat-form-field-underline-height: 1px !default;
+// Infix stretches to fit the container, but naturally wants to be this wide. We set this in order
+// to have a a consistent natural size for the various types of controls that can go in a form
+// field.
+$mat-form-field-default-infix-width: 180px !default;
 
 
 .mat-form-field {
@@ -60,6 +64,7 @@ $mat-form-field-underline-height: 1px !default;
   position: relative;
   flex: auto;
   min-width: 0;
+  width: $mat-form-field-default-infix-width;
 }
 
 // Used to hide the placeholder overflow on IE, since IE doesn't take transform into account when

From 3de57fb1a4789f9b1541f3ebd08d308c39fc7aaf Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Thu, 12 Oct 2017 14:39:43 -0500
Subject: [PATCH 322/575] bug(chips): fixes placeholder in chip inputs #7481
 (#7509)

* bug(chips): fixes placeholder in chip inputs #7481

* chore(nit): pr feedback

* chore(tests): fix invalid test

* chore(test): remove 'f'
---
 src/lib/chips/chip-list.spec.ts | 4 ++--
 src/lib/chips/chip-list.ts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 25a0b60f2bef..2ac30feb9287 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -366,9 +366,9 @@ describe('MatChipList', () => {
 
     });
 
-    it('should not float placeholder if no chip is selected', () => {
+    it('should float placeholder if chip is selected', () => {
       expect(formField.classList.contains('mat-form-field-should-float'))
-        .toBe(false, 'placeholder should not be floating');
+        .toBe(true, 'placeholder should be floating');
     });
 
     it('should remove selection if chip has been removed', async(() => {
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index f419823e28f6..040f862dabba 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -244,7 +244,7 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   }
 
   get shouldPlaceholderFloat(): boolean {
-    return this.empty;
+    return !this.empty || this.focused;
   }
 
   /** Whether this chip-list is disabled. */

From f17cb9969d89fba199f94f2a52118d4b2477c8c7 Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Thu, 12 Oct 2017 15:39:54 -0400
Subject: [PATCH 323/575] fix(form-field): remove specific mention of matInput
 in error (#7727)

---
 src/lib/form-field/form-field-errors.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/form-field/form-field-errors.ts b/src/lib/form-field/form-field-errors.ts
index 2cdb0efa5208..d85420f1a410 100644
--- a/src/lib/form-field/form-field-errors.ts
+++ b/src/lib/form-field/form-field-errors.ts
@@ -18,6 +18,5 @@ export function getMatFormFieldDuplicatedHintError(align: string): Error {
 
 /** @docs-private */
 export function getMatFormFieldMissingControlError(): Error {
-  return Error('mat-form-field must contain a MatFormFieldControl. ' +
-      'Did you forget to add matInput to the native input or textarea element?');
+  return Error('mat-form-field must contain a MatFormFieldControl.');
 }

From f0f6a7468fc54a4d091790a68d6d5f25486a42f3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 12 Oct 2017 22:46:48 +0200
Subject: [PATCH 324/575] chore: fix autocomplete test (#7743)

Due to https://github.com/angular/material2/commit/9b4f4355bc89cb83295f10b8d1bea6ba3ab4d6d5#diff-295d2cf77570f5880fd0c828fe60c2c4 the `mat-disabled` class is no longer being added to the underline element.

The disabled class is now being added to the host element of the `mat-form-field` component.
---
 src/lib/autocomplete/autocomplete.spec.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index ec0b229b28a4..b0e94b829819 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -543,12 +543,12 @@ describe('MatAutocomplete', () => {
     }));
 
     it('should disable input in view when disabled programmatically', () => {
-      const inputUnderline =
-          fixture.debugElement.query(By.css('.mat-form-field-underline')).nativeElement;
+      const formFieldElement =
+          fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
       expect(input.disabled)
           .toBe(false, `Expected input to start out enabled in view.`);
-      expect(inputUnderline.classList.contains('mat-disabled'))
+      expect(formFieldElement.classList.contains('mat-form-field-disabled'))
           .toBe(false, `Expected input underline to start out with normal styles.`);
 
       fixture.componentInstance.stateCtrl.disable();
@@ -556,7 +556,7 @@ describe('MatAutocomplete', () => {
 
       expect(input.disabled)
           .toBe(true, `Expected input to be disabled in view when disabled programmatically.`);
-      expect(inputUnderline.classList.contains('mat-disabled'))
+      expect(formFieldElement.classList.contains('mat-form-field-disabled'))
           .toBe(true, `Expected input underline to display disabled styles.`);
     });
 

From 074f6cea626f2d6def1e3c8309a8c762e65f752d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 22:48:07 +0200
Subject: [PATCH 325/575] fix(menu): wrong offset for nested menu in a fallback
 position (#7562)

* Adds the ability to set offsets on connected position fallbacks.
* Fixes wrong positioning of nested menu if they're in a fallback position.

Fixes #7549.
---
 .../connected-position-strategy.spec.ts       | 22 +++++++++++++++++++
 .../position/connected-position-strategy.ts   | 16 ++++++++++----
 .../overlay/position/connected-position.ts    |  7 +++++-
 src/lib/menu/menu-trigger.ts                  |  9 ++++----
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index 0ba80be29cd5..6195ea0ca8b6 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -326,6 +326,28 @@ describe('ConnectedPositionStrategy', () => {
         expect(Math.floor(overlayRect.left)).toBe(Math.floor(originRect.left));
       });
 
+      it('should allow for the fallback positions to specify their own offsets', () => {
+        originElement.style.bottom = '0';
+        originRect = originElement.getBoundingClientRect();
+        strategy = positionBuilder
+          .connectedTo(
+            fakeElementRef,
+            {originX: 'start', originY: 'top'},
+            {overlayX: 'start', overlayY: 'top'})
+          .withFallbackPosition(
+            {originX: 'start', originY: 'top'},
+            {overlayX: 'start', overlayY: 'bottom'},
+            -100, -100);
+
+        strategy.withOffsetY(50).withOffsetY(50);
+        strategy.attach(fakeOverlayRef(overlayElement));
+        strategy.apply();
+
+        let overlayRect = overlayElement.getBoundingClientRect();
+        expect(Math.floor(overlayRect.bottom)).toBe(Math.floor(originRect.top - 100));
+        expect(Math.floor(overlayRect.left)).toBe(Math.floor(originRect.left - 100));
+      });
+
     });
 
     it('should emit onPositionChange event when position changes', () => {
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 3c26d310823b..a9a946524fd6 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -192,8 +192,12 @@ export class ConnectedPositionStrategy implements PositionStrategy {
    */
   withFallbackPosition(
       originPos: OriginConnectionPosition,
-      overlayPos: OverlayConnectionPosition): this {
-    this._preferredPositions.push(new ConnectionPositionPair(originPos, overlayPos));
+      overlayPos: OverlayConnectionPosition,
+      offsetX?: number,
+      offsetY?: number): this {
+
+    const position = new ConnectionPositionPair(originPos, overlayPos, offsetX, offsetY);
+    this._preferredPositions.push(position);
     return this;
   }
 
@@ -296,9 +300,13 @@ export class ConnectedPositionStrategy implements PositionStrategy {
       overlayStartY = pos.overlayY == 'top' ? 0 : -overlayRect.height;
     }
 
+    // The (x, y) offsets of the overlay based on the current position.
+    let offsetX = typeof pos.offsetX === 'undefined' ? this._offsetX : pos.offsetX;
+    let offsetY = typeof pos.offsetY === 'undefined' ? this._offsetY : pos.offsetY;
+
     // The (x, y) coordinates of the overlay.
-    let x = originPoint.x + overlayStartX + this._offsetX;
-    let y = originPoint.y + overlayStartY + this._offsetY;
+    let x = originPoint.x + overlayStartX + offsetX;
+    let y = originPoint.y + overlayStartY + offsetY;
 
     // How much the overlay would overflow at this position, on each side.
     let leftOverflow = 0 - x;
diff --git a/src/cdk/overlay/position/connected-position.ts b/src/cdk/overlay/position/connected-position.ts
index 66cc66ce680e..ff9114fd8538 100644
--- a/src/cdk/overlay/position/connected-position.ts
+++ b/src/cdk/overlay/position/connected-position.ts
@@ -33,7 +33,12 @@ export class ConnectionPositionPair {
   overlayX: HorizontalConnectionPos;
   overlayY: VerticalConnectionPos;
 
-  constructor(origin: OriginConnectionPosition, overlay: OverlayConnectionPosition) {
+  constructor(
+    origin: OriginConnectionPosition,
+    overlay: OverlayConnectionPosition,
+    public offsetX?: number,
+    public offsetY?: number) {
+
     this.originX = origin.originX;
     this.originY = origin.originY;
     this.overlayX = overlay.overlayX;
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index f135a8e63798..abc1a1a11998 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -354,9 +354,6 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
       // to the edges of the trigger, instead of overlapping it.
       overlayFallbackX = originX = this.menu.xPosition === 'before' ? 'start' : 'end';
       originFallbackX = overlayX = originX === 'end' ? 'start' : 'end';
-
-      // TODO(crisbeto): this should be a function, once the overlay supports it.
-      // Right now it will be wrong for the fallback positions.
       offsetY = overlayY === 'bottom' ? MENU_PANEL_TOP_PADDING : -MENU_PANEL_TOP_PADDING;
     } else if (!this.menu.overlapTrigger) {
       originY = overlayY === 'top' ? 'bottom' : 'top';
@@ -372,10 +369,12 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
             {overlayX: overlayFallbackX, overlayY})
         .withFallbackPosition(
             {originX, originY: originFallbackY},
-            {overlayX, overlayY: overlayFallbackY})
+            {overlayX, overlayY: overlayFallbackY},
+            undefined, -offsetY)
         .withFallbackPosition(
             {originX: originFallbackX, originY: originFallbackY},
-            {overlayX: overlayFallbackX, overlayY: overlayFallbackY});
+            {overlayX: overlayFallbackX, overlayY: overlayFallbackY},
+            undefined, -offsetY);
   }
 
   /** Cleans up the active subscriptions. */

From 80671bf2e826d3688d14e606fb8498ce40f829b0 Mon Sep 17 00:00:00 2001
From: Derek Burgman <dereekb@gmail.com>
Date: Thu, 12 Oct 2017 16:14:01 -0500
Subject: [PATCH 326/575] fix(selection-list): fix option value coercion and
 selection events (#6901)

* fix(selection-list): fix md-list-option value coercion and selection event emitters

* md-list-option value is no longer coerced to a boolean value
* md-list-option EventEmitters selectedChange and deselected now emit an event when an option is selected/deselected

Fixes #6864

* review feedback changes

* review feedback changes

* review feedback changes

* review feedback changes
---
 src/lib/list/selection-list.spec.ts | 132 +++++++++++++++++++++++++---
 src/lib/list/selection-list.ts      |  51 ++++++-----
 2 files changed, 148 insertions(+), 35 deletions(-)

diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 8ff20613a8c3..ee71934b54c5 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -4,7 +4,7 @@ import {createKeyboardEvent, dispatchFakeEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MatListModule, MatListOption, MatSelectionList} from './index';
+import {MatListModule, MatListOption, MatSelectionList, MatListOptionChange} from './index';
 
 
 describe('MatSelectionList', () => {
@@ -483,9 +483,88 @@ describe('MatSelectionList', () => {
       expect(listItemContent.nativeElement.classList).toContain('mat-list-item-content-reverse');
     });
   });
-});
 
 
+  describe('with multiple values', () => {
+    let fixture: ComponentFixture<SelectionListWithMultipleValues>;
+    let listOption: DebugElement[];
+    let listItemEl: DebugElement;
+    let selectionList: DebugElement;
+
+    beforeEach(async(() => {
+      TestBed.configureTestingModule({
+        imports: [MatListModule],
+        declarations: [
+          SelectionListWithMultipleValues
+        ],
+      });
+
+      TestBed.compileComponents();
+    }));
+
+    beforeEach(async(() => {
+      fixture = TestBed.createComponent(SelectionListWithMultipleValues);
+      listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
+      listItemEl = fixture.debugElement.query(By.css('.mat-list-item'));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
+      fixture.detectChanges();
+    }));
+
+    it('should have a value for each item', () => {
+      expect(listOption[0].componentInstance.value).toBe(1);
+      expect(listOption[1].componentInstance.value).toBe('a');
+      expect(listOption[2].componentInstance.value).toBe(true);
+    });
+
+  });
+
+  describe('with option selected events', () => {
+    let fixture: ComponentFixture<SelectionListWithOptionEvents>;
+    let testComponent: SelectionListWithOptionEvents;
+    let listOption: DebugElement[];
+    let selectionList: DebugElement;
+
+    beforeEach(async(() => {
+      TestBed.configureTestingModule({
+        imports: [MatListModule],
+        declarations: [
+          SelectionListWithOptionEvents
+        ],
+      });
+
+      TestBed.compileComponents();
+    }));
+
+    beforeEach(async(() => {
+      fixture = TestBed.createComponent(SelectionListWithOptionEvents);
+      testComponent = fixture.debugElement.componentInstance;
+      listOption = fixture.debugElement.queryAll(By.directive(MatListOption));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
+      fixture.detectChanges();
+    }));
+
+    it('should trigger the selected and deselected events when clicked in succession.', () => {
+
+      let selected: boolean = false;
+
+      spyOn(testComponent, 'onOptionSelectionChange')
+        .and.callFake((event: MatListOptionChange) => {
+          selected = event.selected;
+        });
+
+      listOption[0].nativeElement.click();
+      expect(testComponent.onOptionSelectionChange).toHaveBeenCalledTimes(1);
+      expect(selected).toBe(true);
+
+      listOption[0].nativeElement.click();
+      expect(testComponent.onOptionSelectionChange).toHaveBeenCalledTimes(2);
+      expect(selected).toBe(false);
+    });
+
+  });
+
+});
+
 @Component({template: `
   <mat-selection-list id="selection-list-1">
     <mat-list-option checkboxPosition="before" disabled="true" value="inbox">
@@ -507,17 +586,17 @@ class SelectionListWithListOptions {
 }
 
 @Component({template: `
-  <mat-selection-list id = "selection-list-2">
-    <mat-list-option checkboxPosition = "after">
+  <mat-selection-list id="selection-list-2">
+    <mat-list-option checkboxPosition="after">
       Inbox (disabled selection-option)
     </mat-list-option>
-    <mat-list-option id = "testSelect" checkboxPosition = "after">
+    <mat-list-option id="testSelect" checkboxPosition="after">
       Starred
     </mat-list-option>
-    <mat-list-option checkboxPosition = "after">
+    <mat-list-option checkboxPosition="after">
       Sent Mail
     </mat-list-option>
-    <mat-list-option checkboxPosition = "after">
+    <mat-list-option checkboxPosition="after">
       Drafts
     </mat-list-option>
   </mat-selection-list>`})
@@ -525,17 +604,17 @@ class SelectionListWithCheckboxPositionAfter {
 }
 
 @Component({template: `
-  <mat-selection-list id = "selection-list-3" [disabled] = true>
-    <mat-list-option checkboxPosition = "after">
+  <mat-selection-list id="selection-list-3" [disabled]=true>
+    <mat-list-option checkboxPosition="after">
       Inbox (disabled selection-option)
     </mat-list-option>
-    <mat-list-option id = "testSelect" checkboxPosition = "after">
+    <mat-list-option id="testSelect" checkboxPosition="after">
       Starred
     </mat-list-option>
-    <mat-list-option checkboxPosition = "after">
+    <mat-list-option checkboxPosition="after">
       Sent Mail
     </mat-list-option>
-    <mat-list-option checkboxPosition = "after">
+    <mat-list-option checkboxPosition="after">
       Drafts
     </mat-list-option>
   </mat-selection-list>`})
@@ -559,8 +638,8 @@ class SelectionListWithSelectedOption {
 }
 
 @Component({template: `
-  <mat-selection-list id = "selection-list-4">
-    <mat-list-option checkboxPosition = "after" class="test-focus" id="123">
+  <mat-selection-list id="selection-list-4">
+    <mat-list-option checkboxPosition="after" class="test-focus" id="123">
       Inbox
     </mat-list-option>
   </mat-selection-list>`})
@@ -579,3 +658,28 @@ class SelectionListWithTabindexBinding {
   tabIndex: number;
   disabled: boolean;
 }
+
+@Component({template: `
+<mat-selection-list id="selection-list-5">
+  <mat-list-option [value]="1" checkboxPosition="after">
+    1
+  </mat-list-option>
+  <mat-list-option value="a" checkboxPosition="after">
+    a
+  </mat-list-option>
+  <mat-list-option [value]="true" checkboxPosition="after">
+    true
+  </mat-list-option>
+</mat-selection-list>`})
+class SelectionListWithMultipleValues {
+}
+
+@Component({template: `
+<mat-selection-list id="selection-list-6">
+  <mat-list-option (selectionChange)="onOptionSelectionChange($event)">
+    Inbox
+  </mat-list-option>
+</mat-selection-list>`})
+class SelectionListWithOptionEvents {
+  onOptionSelectionChange: (event?: MatListOptionChange) => void = () => {};
+}
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 4e68a34d5c0d..26b8d0146732 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -51,15 +51,18 @@ export const _MatSelectionListMixinBase =
 export class MatListOptionBase {}
 export const _MatListOptionMixinBase = mixinDisableRipple(MatListOptionBase);
 
-/** Event emitted by a selection-list whenever the state of an option is changed. */
-export interface MatSelectionListOptionEvent {
-  option: MatListOption;
+/** Change event object emitted by MatListOption */
+export class MatListOptionChange {
+  /** The source MatListOption of the event. */
+  source: MatListOption;
+  /** The new `selected` value of the option. */
+  selected: boolean;
 }
 
 /**
  * Component for list-options of selection-list. Each list-option can automatically
  * generate a checkbox and can put current item into the selectionModel of selection-list
- * if the current item is checked.
+ * if the current item is selected.
  */
 @Component({
   moduleId: module.id,
@@ -86,7 +89,6 @@ export interface MatSelectionListOptionEvent {
 export class MatListOption extends _MatListOptionMixinBase
     implements AfterContentInit, OnInit, OnDestroy, FocusableOption, CanDisableRipple {
   private _lineSetter: MatLineSetter;
-  private _selected: boolean = false;
   private _disabled: boolean = false;
 
   /** Whether the option has focus. */
@@ -97,34 +99,31 @@ export class MatListOption extends _MatListOptionMixinBase
   /** Whether the label should appear before or after the checkbox. Defaults to 'after' */
   @Input() checkboxPosition: 'before' | 'after' = 'after';
 
-  /** Value of the option */
-  @Input() value: any;
-
   /** Whether the option is disabled. */
   @Input()
-  get disabled() { return (this.selectionList && this.selectionList.disabled) || this._disabled; }
-  set disabled(value: any) { this._disabled = coerceBooleanProperty(value); }
+  get disabled(): boolean {
+    return (this.selectionList && this.selectionList.disabled) || this._disabled;
+  }
+  set disabled(value: boolean) { this._disabled = coerceBooleanProperty(value); }
+
+  /** Value of the option */
+  @Input() value: any;
 
   /** Whether the option is selected. */
   @Input()
-  get selected() { return this._selected; }
+  get selected(): boolean { return this.selectionList.selectedOptions.isSelected(this); }
   set selected(value: boolean) {
     const isSelected = coerceBooleanProperty(value);
 
-    if (isSelected !== this._selected) {
-      const selectionModel = this.selectionList.selectedOptions;
-
-      this._selected = isSelected;
-      isSelected ? selectionModel.select(this) : selectionModel.deselect(this);
+    if (isSelected !== this.selected) {
+      this.selectionList.selectedOptions.toggle(this);
       this._changeDetector.markForCheck();
+      this.selectionChange.emit(this._createChangeEvent());
     }
   }
 
-  /** Emitted when the option is selected. */
-  @Output() selectChange = new EventEmitter<MatSelectionListOptionEvent>();
-
-  /** Emitted when the option is deselected. */
-  @Output() deselected = new EventEmitter<MatSelectionListOptionEvent>();
+  /** Emitted when the option is selected or deselected. */
+  @Output() selectionChange = new EventEmitter<MatListOptionChange>();
 
   constructor(private _renderer: Renderer2,
               private _element: ElementRef,
@@ -174,6 +173,16 @@ export class MatListOption extends _MatListOptionMixinBase
     this.selectionList._setFocusedOption(this);
   }
 
+  /** Creates a selection event object from the specified option. */
+  private _createChangeEvent(option: MatListOption = this): MatListOptionChange {
+    const event = new MatListOptionChange();
+
+    event.source = option;
+    event.selected = option.selected;
+
+    return event;
+  }
+
   /** Retrieves the DOM element of the component host. */
   _getHostElement(): HTMLElement {
     return this._element.nativeElement;

From b2fbea7e8ade44a97583159b04b87844e25b6de3 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 23:39:07 +0200
Subject: [PATCH 327/575] refactor(scroll-dispatcher): API improvements (#7630)

* Adds the `ancestorScrolled` method that allows for the consumer to subscribe to scroll events coming from the element's parent scrollables.
* The `scrolled` and `ancestorScrolled` streams now expose the scrollable that was scrolled.

BREAKING CHANGES:
* The `getScrollContainers` method has been renamed to `getAncestorScrollContainers` to better describe what it does.
* The `ScrollDispatcher.scrollableReferences` property has been renamed to `scrollContainers`.
* The `ScrollDispatcher.scrollableContainsElement` method has been removed.
* The `Scrollable` class has been renamed to `CdkScrollable` for consistency.
---
 .../connected-position-strategy.spec.ts       |  4 +-
 .../position/connected-position-strategy.ts   |  6 +--
 src/cdk/overlay/scroll/index.ts               |  2 +-
 src/cdk/scrolling/scroll-dispatcher.spec.ts   | 50 +++++++++++++-----
 src/cdk/scrolling/scroll-dispatcher.ts        | 52 ++++++++++++-------
 src/cdk/scrolling/scrollable.ts               |  2 +-
 src/cdk/scrolling/scrolling-module.ts         |  6 +--
 src/cdk/testing/dispatch-events.ts            |  4 +-
 src/cdk/testing/event-objects.ts              |  4 +-
 src/lib/tooltip/tooltip.spec.ts               |  4 +-
 src/lib/tooltip/tooltip.ts                    |  6 ++-
 11 files changed, 93 insertions(+), 47 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index 6195ea0ca8b6..2ca91f9678c8 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -4,7 +4,7 @@ import {ConnectedPositionStrategy} from './connected-position-strategy';
 import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {OverlayPositionBuilder} from './overlay-position-builder';
 import {ConnectedOverlayPositionChange} from './connected-position';
-import {Scrollable} from '@angular/cdk/scrolling';
+import {CdkScrollable} from '@angular/cdk/scrolling';
 import {Subscription} from 'rxjs/Subscription';
 import {ScrollDispatchModule} from '@angular/cdk/scrolling';
 import {OverlayRef} from '../overlay-ref';
@@ -567,7 +567,7 @@ describe('ConnectedPositionStrategy', () => {
           {overlayX: 'start', overlayY: 'top'});
 
       strategy.withScrollableContainers([
-          new Scrollable(new FakeElementRef(scrollable), null!, null!, null!)]);
+          new CdkScrollable(new FakeElementRef(scrollable), null!, null!, null!)]);
       strategy.attach(fakeOverlayRef(overlayElement));
       positionChangeHandler = jasmine.createSpy('positionChangeHandler');
       onPositionChangeSubscription = strategy.onPositionChange.subscribe(positionChangeHandler);
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index a9a946524fd6..2d3269d0642a 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -19,7 +19,7 @@ import {
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {Observable} from 'rxjs/Observable';
-import {Scrollable} from '@angular/cdk/scrolling';
+import {CdkScrollable} from '@angular/cdk/scrolling';
 import {isElementScrolledOutsideView, isElementClippedByScrolling} from './scroll-clip';
 import {OverlayRef} from '../overlay-ref';
 
@@ -46,7 +46,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   private _offsetY: number = 0;
 
   /** The Scrollable containers used to check scrollable view properties on position change. */
-  private scrollables: Scrollable[] = [];
+  private scrollables: CdkScrollable[] = [];
 
   /** Subscription to viewport resize events. */
   private _resizeSubscription = Subscription.EMPTY;
@@ -181,7 +181,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
    * on reposition we can evaluate if it or the overlay has been clipped or outside view. Every
    * Scrollable must be an ancestor element of the strategy's origin element.
    */
-  withScrollableContainers(scrollables: Scrollable[]) {
+  withScrollableContainers(scrollables: CdkScrollable[]) {
     this.scrollables = scrollables;
   }
 
diff --git a/src/cdk/overlay/scroll/index.ts b/src/cdk/overlay/scroll/index.ts
index c9bd2c004dd9..d4dc631d9be7 100644
--- a/src/cdk/overlay/scroll/index.ts
+++ b/src/cdk/overlay/scroll/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {Scrollable, ScrollDispatcher} from '@angular/cdk/scrolling';
+export {CdkScrollable, ScrollDispatcher} from '@angular/cdk/scrolling';
 
 // Export pre-defined scroll strategies and interface to build custom ones.
 export {ScrollStrategy} from './scroll-strategy';
diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index 7e8fc9d1a9d0..2da6f3a342ca 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -1,6 +1,6 @@
 import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
 import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
-import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public-api';
+import {CdkScrollable, ScrollDispatcher, ScrollDispatchModule} from './public-api';
 import {dispatchFakeEvent} from '@angular/cdk/testing';
 
 describe('Scroll Dispatcher', () => {
@@ -26,15 +26,15 @@ describe('Scroll Dispatcher', () => {
 
     it('should be registered with the scrollable directive with the scroll service', () => {
       const componentScrollable = fixture.componentInstance.scrollable;
-      expect(scroll.scrollableReferences.has(componentScrollable)).toBe(true);
+      expect(scroll.scrollContainers.has(componentScrollable)).toBe(true);
     });
 
     it('should have the scrollable directive deregistered when the component is destroyed', () => {
       const componentScrollable = fixture.componentInstance.scrollable;
-      expect(scroll.scrollableReferences.has(componentScrollable)).toBe(true);
+      expect(scroll.scrollContainers.has(componentScrollable)).toBe(true);
 
       fixture.destroy();
-      expect(scroll.scrollableReferences.has(componentScrollable)).toBe(false);
+      expect(scroll.scrollContainers.has(componentScrollable)).toBe(false);
     });
 
     it('should notify through the directive and service that a scroll event occurred',
@@ -52,7 +52,7 @@ describe('Scroll Dispatcher', () => {
       // Emit a scroll event from the scrolling element in our component.
       // This event should be picked up by the scrollable directive and notify.
       // The notification should be picked up by the service.
-      dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll');
+      dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll', false);
 
       // The scrollable directive should have notified the service immediately.
       expect(directiveSpy).toHaveBeenCalled();
@@ -71,7 +71,7 @@ describe('Scroll Dispatcher', () => {
       const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
 
       scroll.scrolled(0).subscribe(() => {});
-      dispatchFakeEvent(document, 'scroll');
+      dispatchFakeEvent(document, 'scroll', false);
 
       expect(spy).not.toHaveBeenCalled();
       subscription.unsubscribe();
@@ -81,7 +81,7 @@ describe('Scroll Dispatcher', () => {
       const spy = jasmine.createSpy('zone unstable callback');
       const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
 
-      dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll');
+      dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll', false);
 
       expect(spy).not.toHaveBeenCalled();
       subscription.unsubscribe();
@@ -91,11 +91,11 @@ describe('Scroll Dispatcher', () => {
       const spy = jasmine.createSpy('global scroll callback');
       const subscription = scroll.scrolled(0).subscribe(spy);
 
-      dispatchFakeEvent(document, 'scroll');
+      dispatchFakeEvent(document, 'scroll', false);
       expect(spy).toHaveBeenCalledTimes(1);
 
       subscription.unsubscribe();
-      dispatchFakeEvent(document, 'scroll');
+      dispatchFakeEvent(document, 'scroll', false);
 
       expect(spy).toHaveBeenCalledTimes(1);
     });
@@ -104,22 +104,48 @@ describe('Scroll Dispatcher', () => {
   describe('Nested scrollables', () => {
     let scroll: ScrollDispatcher;
     let fixture: ComponentFixture<NestedScrollingComponent>;
+    let element: ElementRef;
 
     beforeEach(inject([ScrollDispatcher], (s: ScrollDispatcher) => {
       scroll = s;
 
       fixture = TestBed.createComponent(NestedScrollingComponent);
       fixture.detectChanges();
+      element = fixture.componentInstance.interestingElement;
     }));
 
     it('should be able to identify the containing scrollables of an element', () => {
-      const interestingElement = fixture.componentInstance.interestingElement;
-      const scrollContainers = scroll.getScrollContainers(interestingElement);
+      const scrollContainers = scroll.getAncestorScrollContainers(element);
       const scrollableElementIds =
           scrollContainers.map(scrollable => scrollable.getElementRef().nativeElement.id);
 
       expect(scrollableElementIds).toEqual(['scrollable-1', 'scrollable-1a']);
     });
+
+    it('should emit when one of the ancestor scrollable containers is scrolled', () => {
+      const spy = jasmine.createSpy('scroll spy');
+      const subscription = scroll.ancestorScrolled(element, 0).subscribe(spy);
+      const grandparent = fixture.debugElement.nativeElement.querySelector('#scrollable-1');
+
+      dispatchFakeEvent(grandparent, 'scroll', false);
+      expect(spy).toHaveBeenCalledTimes(1);
+
+      dispatchFakeEvent(window.document, 'scroll', false);
+      expect(spy).toHaveBeenCalledTimes(2);
+
+      subscription.unsubscribe();
+    });
+
+    it('should not emit when a non-ancestor is scrolled', () => {
+      const spy = jasmine.createSpy('scroll spy');
+      const subscription = scroll.ancestorScrolled(element, 0).subscribe(spy);
+      const stranger = fixture.debugElement.nativeElement.querySelector('#scrollable-2');
+
+      dispatchFakeEvent(stranger, 'scroll', false);
+      expect(spy).not.toHaveBeenCalled();
+
+      subscription.unsubscribe();
+    });
   });
 
   describe('lazy subscription', () => {
@@ -172,7 +198,7 @@ describe('Scroll Dispatcher', () => {
   template: `<div #scrollingElement cdk-scrollable style="height: 9999px"></div>`
 })
 class ScrollingComponent {
-  @ViewChild(Scrollable) scrollable: Scrollable;
+  @ViewChild(CdkScrollable) scrollable: CdkScrollable;
   @ViewChild('scrollingElement') scrollingElement: ElementRef;
 }
 
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 95d5c3667450..7b05738feb3a 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -13,8 +13,8 @@ import {Subscription} from 'rxjs/Subscription';
 import {Observable} from 'rxjs/Observable';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {of as observableOf} from 'rxjs/observable/of';
-import {auditTime} from 'rxjs/operator/auditTime';
-import {Scrollable} from './scrollable';
+import {auditTime, filter} from '@angular/cdk/rxjs';
+import {CdkScrollable} from './scrollable';
 
 
 /** Time in ms to throttle the scrolling events by default. */
@@ -29,7 +29,7 @@ export class ScrollDispatcher {
   constructor(private _ngZone: NgZone, private _platform: Platform) { }
 
   /** Subject for notifying that a registered scrollable reference element has been scrolled. */
-  private _scrolled: Subject<void> = new Subject<void>();
+  private _scrolled = new Subject<CdkScrollable|void>();
 
   /** Keeps track of the global `scroll` and `resize` subscriptions. */
   _globalSubscription: Subscription | null = null;
@@ -41,28 +41,30 @@ export class ScrollDispatcher {
    * Map of all the scrollable references that are registered with the service and their
    * scroll event subscriptions.
    */
-  scrollableReferences: Map<Scrollable, Subscription> = new Map();
+  scrollContainers: Map<CdkScrollable, Subscription> = new Map();
 
   /**
-   * Registers a Scrollable with the service and listens for its scrolled events. When the
-   * scrollable is scrolled, the service emits the event in its scrolled observable.
+   * Registers a scrollable instance with the service and listens for its scrolled events. When the
+   * scrollable is scrolled, the service emits the event to its scrolled observable.
    * @param scrollable Scrollable instance to be registered.
    */
-  register(scrollable: Scrollable): void {
-    const scrollSubscription = scrollable.elementScrolled().subscribe(() => this._scrolled.next());
-    this.scrollableReferences.set(scrollable, scrollSubscription);
+  register(scrollable: CdkScrollable): void {
+    const scrollSubscription = scrollable.elementScrolled()
+        .subscribe(() => this._scrolled.next(scrollable));
+
+    this.scrollContainers.set(scrollable, scrollSubscription);
   }
 
   /**
    * Deregisters a Scrollable reference and unsubscribes from its scroll event observable.
    * @param scrollable Scrollable instance to be deregistered.
    */
-  deregister(scrollable: Scrollable): void {
-    const scrollableReference = this.scrollableReferences.get(scrollable);
+  deregister(scrollable: CdkScrollable): void {
+    const scrollableReference = this.scrollContainers.get(scrollable);
 
     if (scrollableReference) {
       scrollableReference.unsubscribe();
-      this.scrollableReferences.delete(scrollable);
+      this.scrollContainers.delete(scrollable);
     }
   }
 
@@ -71,7 +73,7 @@ export class ScrollDispatcher {
    * references (or window, document, or body) fire a scrolled event. Can provide a time in ms
    * to override the default "throttle" time.
    */
-  scrolled(auditTimeInMs: number = DEFAULT_SCROLL_TIME): Observable<void> {
+  scrolled(auditTimeInMs: number = DEFAULT_SCROLL_TIME): Observable<CdkScrollable|void> {
     return this._platform.isBrowser ? Observable.create(observer => {
       if (!this._globalSubscription) {
         this._addGlobalListener();
@@ -97,12 +99,26 @@ export class ScrollDispatcher {
     }) : observableOf<void>();
   }
 
+  /**
+   * Returns an observable that emits whenever any of the
+   * scrollable ancestors of an element are scrolled.
+   * @param elementRef Element whose ancestors to listen for.
+   * @param auditTimeInMs Time to throttle the scroll events.
+   */
+  ancestorScrolled(elementRef: ElementRef, auditTimeInMs?: number): Observable<CdkScrollable> {
+    const ancestors = this.getAncestorScrollContainers(elementRef);
+
+    return filter.call(this.scrolled(auditTimeInMs), target => {
+      return !target || ancestors.indexOf(target) > -1;
+    });
+  }
+
   /** Returns all registered Scrollables that contain the provided element. */
-  getScrollContainers(elementRef: ElementRef): Scrollable[] {
-    const scrollingContainers: Scrollable[] = [];
+  getAncestorScrollContainers(elementRef: ElementRef): CdkScrollable[] {
+    const scrollingContainers: CdkScrollable[] = [];
 
-    this.scrollableReferences.forEach((_subscription: Subscription, scrollable: Scrollable) => {
-      if (this.scrollableContainsElement(scrollable, elementRef)) {
+    this.scrollContainers.forEach((_subscription: Subscription, scrollable: CdkScrollable) => {
+      if (this._scrollableContainsElement(scrollable, elementRef)) {
         scrollingContainers.push(scrollable);
       }
     });
@@ -111,7 +127,7 @@ export class ScrollDispatcher {
   }
 
   /** Returns true if the element is contained within the provided Scrollable. */
-  scrollableContainsElement(scrollable: Scrollable, elementRef: ElementRef): boolean {
+  private _scrollableContainsElement(scrollable: CdkScrollable, elementRef: ElementRef): boolean {
     let element = elementRef.nativeElement;
     let scrollableElement = scrollable.getElementRef().nativeElement;
 
diff --git a/src/cdk/scrolling/scrollable.ts b/src/cdk/scrolling/scrollable.ts
index 2431f9041d08..7c4ff9d55286 100644
--- a/src/cdk/scrolling/scrollable.ts
+++ b/src/cdk/scrolling/scrollable.ts
@@ -20,7 +20,7 @@ import {ScrollDispatcher} from './scroll-dispatcher';
 @Directive({
   selector: '[cdk-scrollable], [cdkScrollable]'
 })
-export class Scrollable implements OnInit, OnDestroy {
+export class CdkScrollable implements OnInit, OnDestroy {
   private _elementScrolled: Subject<Event> = new Subject();
   private _scrollListener: Function | null;
 
diff --git a/src/cdk/scrolling/scrolling-module.ts b/src/cdk/scrolling/scrolling-module.ts
index a798bbc19816..616f29d07581 100644
--- a/src/cdk/scrolling/scrolling-module.ts
+++ b/src/cdk/scrolling/scrolling-module.ts
@@ -8,13 +8,13 @@
 
 import {NgModule} from '@angular/core';
 import {SCROLL_DISPATCHER_PROVIDER} from './scroll-dispatcher';
-import {Scrollable} from  './scrollable';
+import {CdkScrollable} from  './scrollable';
 import {PlatformModule} from '@angular/cdk/platform';
 
 @NgModule({
   imports: [PlatformModule],
-  exports: [Scrollable],
-  declarations: [Scrollable],
+  exports: [CdkScrollable],
+  declarations: [CdkScrollable],
   providers: [SCROLL_DISPATCHER_PROVIDER],
 })
 export class ScrollDispatchModule {}
diff --git a/src/cdk/testing/dispatch-events.ts b/src/cdk/testing/dispatch-events.ts
index c4600947d47d..28413dd74a89 100644
--- a/src/cdk/testing/dispatch-events.ts
+++ b/src/cdk/testing/dispatch-events.ts
@@ -20,8 +20,8 @@ export function dispatchEvent(node: Node | Window, event: Event): Event {
 }
 
 /** Shorthand to dispatch a fake event on a specified node. */
-export function dispatchFakeEvent(node: Node | Window, type: string): Event {
-  return dispatchEvent(node, createFakeEvent(type));
+export function dispatchFakeEvent(node: Node | Window, type: string, canBubble?: boolean): Event {
+  return dispatchEvent(node, createFakeEvent(type, canBubble));
 }
 
 /** Shorthand to dispatch a keyboard event with a specified key code. */
diff --git a/src/cdk/testing/event-objects.ts b/src/cdk/testing/event-objects.ts
index fce56a683d20..9ead01e767cf 100644
--- a/src/cdk/testing/event-objects.ts
+++ b/src/cdk/testing/event-objects.ts
@@ -74,8 +74,8 @@ export function createKeyboardEvent(type: string, keyCode: number, target?: Elem
 }
 
 /** Creates a fake event object with any desired event type. */
-export function createFakeEvent(type: string) {
+export function createFakeEvent(type: string, canBubble = true, cancelable = true) {
   const event = document.createEvent('Event');
-  event.initEvent(type, true, true);
+  event.initEvent(type, canBubble, cancelable);
   return event;
 }
diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 61446059f112..bb3e6eb95482 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -17,7 +17,7 @@ import {AnimationEvent} from '@angular/animations';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Direction, Directionality} from '@angular/cdk/bidi';
-import {OverlayContainer, OverlayModule, Scrollable} from '@angular/cdk/overlay';
+import {OverlayContainer, OverlayModule, CdkScrollable} from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ESCAPE} from '@angular/cdk/keycodes';
@@ -686,7 +686,7 @@ class ScrollableTooltipDemo {
  message: string = initialTooltipMessage;
  showButton: boolean = true;
 
- @ViewChild(Scrollable) scrollingContainer: Scrollable;
+ @ViewChild(CdkScrollable) scrollingContainer: CdkScrollable;
 
  scrollDown() {
      const scrollingContainerEl = this.scrollingContainer.getElementRef().nativeElement;
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index d368952ca511..8e2aabc5367e 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -280,7 +280,11 @@ export class MatTooltip implements OnDestroy {
       .connectedTo(this._elementRef, origin.main, overlay.main)
       .withFallbackPosition(origin.fallback, overlay.fallback);
 
-    strategy.withScrollableContainers(this._scrollDispatcher.getScrollContainers(this._elementRef));
+    const scrollableAncestors = this._scrollDispatcher
+      .getAncestorScrollContainers(this._elementRef);
+
+    strategy.withScrollableContainers(scrollableAncestors);
+
     strategy.onPositionChange.subscribe(change => {
       if (this._tooltipInstance) {
         if (change.scrollableViewProperties.isOverlayClipped && this._tooltipInstance.isVisible()) {

From 7f274b4688d744eb7e80e095ffabec867d555226 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 12 Oct 2017 23:39:52 +0200
Subject: [PATCH 328/575] build: create coverage reports in chrome (#7714)

* No longer creates the coverage reports inside of Browserstack. The reports can be generated inside of Chrome Headless that doesn't run remotely on BrowserStack or Saucelabs.
---
 package-lock.json  | 76 +++++++++++++++++++++++-----------------------
 package.json       |  4 +--
 test/karma.conf.js |  2 +-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9e82ccd9d348..b243adc13690 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,89 +1,89 @@
 {
   "name": "material2-srcs",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.3.tgz",
-      "integrity": "sha1-OWxKW/sihH+eRYJFuplfnBMMDPM=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.4.tgz",
+      "integrity": "sha1-ovk1NgQ0er4V35gpIFiEL1Lwi8I=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/common": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.3.tgz",
-      "integrity": "sha1-+SrGiwK+xfDm02A6hDKU3JbJYHQ=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.4.tgz",
+      "integrity": "sha1-rgqBiqoMaj8JAee4C9lOHCLrk2U=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.3.tgz",
-      "integrity": "sha1-jwEWPa19s0CEl9mdOHVUtrGFrWY=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz",
+      "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.3.tgz",
-      "integrity": "sha1-GDr4HxQRhrjWYLBkKVktQLdUCko=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.4.tgz",
+      "integrity": "sha1-BjCApJfZF1OWglBQIixxfaGE9s8=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.4.3",
+        "@angular/tsc-wrapped": "4.4.4",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       }
     },
     "@angular/core": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.3.tgz",
-      "integrity": "sha1-5x0rB76qy6tIq39R1OIobqXXDhU=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz",
+      "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/forms": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.3.tgz",
-      "integrity": "sha1-JbQburWL8dqHJBHIUXwQ18U3PY4=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.4.tgz",
+      "integrity": "sha1-TbN5BQm2sQ8duKfBt/Uhh89kz9Q=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/http": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.3.tgz",
-      "integrity": "sha1-tVftJBRKrMRLE2zUd+hNL1eAiQM=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.4.tgz",
+      "integrity": "sha1-Zn+vYWu2JBaOr65u6S5euiOp0fI=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.3.tgz",
-      "integrity": "sha1-I/mkW9Pcf0TZeHf7+OYDLez8ncs=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.4.tgz",
+      "integrity": "sha1-o4mOLnup2E/6DUcUTGlxF5x1ruY=",
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.3.tgz",
-      "integrity": "sha1-5B3dglJDJ3UxDqtZQM3Y3wYY8IQ=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.4.tgz",
+      "integrity": "sha1-w8nrhUpShVagcFQSeTLlJ/qTLhQ=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/platform-server": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.3.tgz",
-      "integrity": "sha1-5l3OneVNbKZknMmJTFx6Mke6r0w=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.4.tgz",
+      "integrity": "sha1-c+5B+hzshij8wDF0cnsnywAxsio=",
       "dev": true,
       "requires": {
         "parse5": "3.0.2",
@@ -92,18 +92,18 @@
       }
     },
     "@angular/router": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.3.tgz",
-      "integrity": "sha1-JsyUd1o4YJRq6vHC6PYPTUTpCZE=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.4.tgz",
+      "integrity": "sha1-e+ORCW6EPLPgT58F0dZaiN+bx88=",
       "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.3.tgz",
-      "integrity": "sha1-LT84IQodTbA/yG3PHglYErhc0Rk=",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.4.tgz",
+      "integrity": "sha1-mEGCHlVha4JsoWAlD+heFfx0/8M=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
diff --git a/package.json b/package.json
index c8805ddb83e6..96fcea34a785 100644
--- a/package.json
+++ b/package.json
@@ -89,9 +89,9 @@
     "image-diff": "^1.6.3",
     "jasmine-core": "^2.6.2",
     "jsonwebtoken": "^7.4.1",
-    "karma": "^1.7.0",
+    "karma": "^1.7.1",
     "karma-browserstack-launcher": "^1.3.0",
-    "karma-chrome-launcher": "^2.1.1",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",
     "karma-firefox-launcher": "^1.0.1",
     "karma-jasmine": "^1.1.0",
diff --git a/test/karma.conf.js b/test/karma.conf.js
index b2b39d0c7185..084ca759df91 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -100,7 +100,7 @@ module.exports = (config) => {
     const buildId = `TRAVIS #${process.env.TRAVIS_BUILD_NUMBER} (${process.env.TRAVIS_BUILD_ID})`;
 
     if (process.env['TRAVIS_PULL_REQUEST'] === 'false' &&
-        process.env['MODE'] === "browserstack_required") {
+        process.env['MODE'] === "travis_required") {
 
       config.preprocessors['dist/packages/**/!(*+(.|-)spec).js'] = ['coverage'];
       config.reporters.push('coverage');

From 0ab6ebeef15765714a6a4ab9872ef7266e05d313 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 12 Oct 2017 23:40:06 +0200
Subject: [PATCH 329/575] build: run tests against ios10 (#7707)

---
 test/browser-providers.js | 3 ++-
 test/remote_browsers.json | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/browser-providers.js b/test/browser-providers.js
index e181fdcc3acf..ed2cd2ae0425 100644
--- a/test/browser-providers.js
+++ b/test/browser-providers.js
@@ -26,7 +26,8 @@ const browserConfig = {
   'Safari10':          { unitTest: {target: 'BS', required: true  }},
   'iOS7':              { unitTest: {target: null, required: false }},
   'iOS8':              { unitTest: {target: null, required: false }},
-  'iOS9':              { unitTest: {target: 'BS', required: true  }},
+  'iOS9':              { unitTest: {target: null, required: false }},
+  'iOS10':             { unitTest: {target: 'BS', required: true  }},
   'WindowsPhone':      { unitTest: {target: null, required: false }}
 };
 
diff --git a/test/remote_browsers.json b/test/remote_browsers.json
index 83816d2adfa2..b1cd2ddbdc50 100644
--- a/test/remote_browsers.json
+++ b/test/remote_browsers.json
@@ -195,6 +195,12 @@
     "os_version": "9.0",
     "resolution": "1024x768"
   },
+  "BS_IOS10": {
+    "base": "BrowserStack",
+    "device": "iPhone 7",
+    "os": "ios",
+    "os_version": "10.0"
+  },
   "BS_IE9": {
     "base": "BrowserStack",
     "browser": "ie",

From a7faebc88e9a4ae2e8a191148c7251ce8617e25e Mon Sep 17 00:00:00 2001
From: Juliano <juliano.brasil@gmail.com>
Date: Thu, 12 Oct 2017 18:40:38 -0300
Subject: [PATCH 330/575] correct some typos (#7697)

---
 src/lib/expansion/expansion.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/expansion/expansion.md b/src/lib/expansion/expansion.md
index e52b1f069d2d..abf0202d494f 100644
--- a/src/lib/expansion/expansion.md
+++ b/src/lib/expansion/expansion.md
@@ -55,7 +55,7 @@ is in its expanded state.
 #### Disabling a panel
 
 Expansion panels can be disabled using the `disabled` attribute. A disabled expansion panel can't
-be toggled by the user, but can still be manipulated using programmatically.
+be toggled by the user, but can still be manipulated programmatically.
 
 ```html
 <mat-expansion-panel [disabled]="isDisabled">
@@ -101,8 +101,8 @@ panel can be expanded at a given time:
 
 ### Accessibility
 The expansion-panel aims to mimic the experience of the native `<details>` and `<summary>` elements.
-The expansion panel header has `role="button"`. The expansion panel header has attribute
-`aria-controls` with the expansion panel's id as value.
+The expansion panel header has `role="button"` and also the attribute `aria-controls` with the 
+expansion panel's id as value.
 
 The expansion panel headers are buttons. Users can use the keyboard to activate the expansion panel
 header to switch between expanded state and collapsed state. Because the header acts as a button,

From 0680481b066716bc0629e1cd793cc9f36d6dca5f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 23:40:48 +0200
Subject: [PATCH 331/575] build: fix subpixel failures when running locally
 (#7671)

Fixes a few e2e tests that were failing due to subpixel measurement differences.
---
 e2e/util/asserts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/util/asserts.ts b/e2e/util/asserts.ts
index f507d096e399..d508ca7c79ca 100644
--- a/e2e/util/asserts.ts
+++ b/e2e/util/asserts.ts
@@ -24,8 +24,8 @@ export function expectFocusOn(element: FinderResult, expected = true): void {
  */
 export function expectLocation(element: FinderResult, {x, y}: Point): void {
   getElement(element).getLocation().then((location: Point) => {
-    expect(location.x).toEqual(x);
-    expect(location.y).toEqual(y);
+    expect(Math.round(location.x)).toEqual(Math.round(x));
+    expect(Math.round(location.y)).toEqual(Math.round(y));
   });
 }
 

From b6f7f1740b8d36d1598cbc840d3610d4a9509f89 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 12 Oct 2017 23:41:29 +0200
Subject: [PATCH 332/575] chore: remove accessor type workaround (#7659)

Due to https://github.com/angular/dgeni-packages/issues/246 the Material docs package used a workaround for accessor types.

The issue has been fixed with https://github.com/angular/dgeni-packages/pull/247 and the workaround can be removed now.
---
 package-lock.json                           | 14 ++---
 package.json                                |  2 +-
 tools/dgeni/common/dgeni-accessors-parse.ts | 62 ---------------------
 tools/dgeni/common/sort-members.ts          |  2 +-
 tools/dgeni/processors/categorizer.ts       |  2 -
 5 files changed, 9 insertions(+), 73 deletions(-)
 delete mode 100644 tools/dgeni/common/dgeni-accessors-parse.ts

diff --git a/package-lock.json b/package-lock.json
index b243adc13690..6b9b8eed58b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3025,9 +3025,9 @@
       }
     },
     "dgeni-packages": {
-      "version": "0.21.2",
-      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.21.2.tgz",
-      "integrity": "sha1-sDEZQXZQe3x9HJc16hRmSXB2OGY=",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.22.0.tgz",
+      "integrity": "sha1-ftB6+QdPZUeEclbBpltIiloXrQM=",
       "dev": true,
       "requires": {
         "canonical-path": "0.0.2",
@@ -12088,13 +12088,13 @@
       "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=",
       "dev": true,
       "requires": {
-        "@types/node": "6.0.88"
+        "@types/node": "6.0.89"
       },
       "dependencies": {
         "@types/node": {
-          "version": "6.0.88",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz",
-          "integrity": "sha512-bYDPZTX0/s1aihdjLuAgogUAT5M+TpoWChEMea2p0yOcfn5bu3k6cJb9cp6nw268XeSNIGGr+4+/8V5K6BGzLQ==",
+          "version": "6.0.89",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.89.tgz",
+          "integrity": "sha512-Z/67L97+6H1qJiEEHSN1SQapkWjDss1D90rAnFcQ6UxKkah9juzotK5UNEP1bDv/0lJ3NAQTnVfc/JWdgCGruA==",
           "dev": true
         }
       }
diff --git a/package.json b/package.json
index 96fcea34a785..5cc93735ddf2 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "axe-webdriverjs": "^1.1.1",
     "chalk": "^1.1.3",
     "dgeni": "^0.4.9",
-    "dgeni-packages": "^0.21.1",
+    "dgeni-packages": "^0.22.0",
     "firebase": "^4.0.0",
     "firebase-admin": "^5.0.0",
     "firebase-tools": "^3.11.0",
diff --git a/tools/dgeni/common/dgeni-accessors-parse.ts b/tools/dgeni/common/dgeni-accessors-parse.ts
deleted file mode 100644
index 6cd4d8abd8fb..000000000000
--- a/tools/dgeni/common/dgeni-accessors-parse.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import {getTypeText} from 'dgeni-packages/typescript/services/TsParser/getTypeText';
-import {getDecorators} from 'dgeni-packages/typescript/services/TsParser/getDecorators';
-import {
-  ClassDeclaration,
-  SyntaxKind,
-  GetAccessorDeclaration,
-  SetAccessorDeclaration,
-  Symbol,
-  displayPartsToString
-} from 'typescript';
-import {CategorizedPropertyMemberDoc} from '../processors/categorizer';
-
-/**
- * Accessors are not being parsed properly within the latest Dgeni-packages version.
- * This function re-analyzes the accessors and resolves the necessary API docs information.
- * See: https://github.com/angular/dgeni-packages/issues/246
- */
-export function dgeniAccessorsParse(propertyDoc: CategorizedPropertyMemberDoc) {
-  if ((propertyDoc.isGetAccessor || propertyDoc.isSetAccessor) && !propertyDoc.type) {
-    const classDeclaration = propertyDoc.containerDoc.symbol.valueDeclaration as ClassDeclaration;
-
-    // Walk through every TypeScript member node of the class declaration and filter for accessors
-    // with a name that match the current property member. For accessors there may be two
-    // declarations with the same name but with different type information.
-    classDeclaration.members
-      .filter((member: any) => member.kind === SyntaxKind.GetAccessor ||
-        member.kind === SyntaxKind.SetAccessor)
-      .filter((member: any) => member.name && member.name.text === propertyDoc.name)
-      .forEach((member: GetAccessorDeclaration|SetAccessorDeclaration) => {
-        if (member.type) {
-          // If there is a type specified for the current member, then this node is a getter
-          // declaration and its type describes the property.
-          propertyDoc.type = getTypeText(member.type, []);
-          propertyDoc.decorators = getDecorators(member);
-        } else if (member.parameters.length === 1 && member.parameters[0].type) {
-          const type = member.parameters[0].type;
-
-          // If there is a type specified for the first parameter of the property, then this
-          // can be considered a setter and the type of the parameter would describe the actual
-          // property. Transforming the type node to a string is done by the `getTypeText` function
-          // from Dgeni Packages.
-          if (type) {
-            propertyDoc.type = getTypeText(type, []);
-            propertyDoc.decorators = getDecorators(member);
-          }
-        }
-
-        // If the current property document doesn't have any description set and the current
-        // TypeScript has a symbol from the TypeChecker, we can try to find a documentation
-        // comment on that symbol.
-        if (!propertyDoc.description && (member as any).symbol) {
-          const memberSymbol = (member as any).symbol as Symbol;
-          propertyDoc.description = displayPartsToString(memberSymbol.getDocumentationComment());
-        }
-      });
-
-    if (!propertyDoc.type) {
-      console.warn(`Could not find type information for property "${propertyDoc.name}" in ` +
-        `${propertyDoc.fileInfo.relativePath}:${propertyDoc.startingLine}`);
-    }
-  }
-}
diff --git a/tools/dgeni/common/sort-members.ts b/tools/dgeni/common/sort-members.ts
index 8e0a01d117e8..67e06a20ee57 100644
--- a/tools/dgeni/common/sort-members.ts
+++ b/tools/dgeni/common/sort-members.ts
@@ -2,7 +2,7 @@ import {CategorizedMethodMemberDoc, CategorizedPropertyMemberDoc} from '../proce
 import {isDirectiveInput, isDirectiveOutput} from './decorators';
 
 /** Combined type for a categorized method member document. */
-type CategorizedMemberDoc = CategorizedMethodMemberDoc | CategorizedPropertyMemberDoc;
+type CategorizedMemberDoc = CategorizedMethodMemberDoc & CategorizedPropertyMemberDoc;
 
 /** Sorts members by deprecated status, member decorator, and name. */
 export function sortCategorizedMembers(docA: CategorizedMemberDoc, docB: CategorizedMemberDoc) {
diff --git a/tools/dgeni/processors/categorizer.ts b/tools/dgeni/processors/categorizer.ts
index b2719d6521f3..d9e824630499 100644
--- a/tools/dgeni/processors/categorizer.ts
+++ b/tools/dgeni/processors/categorizer.ts
@@ -20,7 +20,6 @@ import {
   isService
 } from '../common/decorators';
 import {MethodMemberDoc} from 'dgeni-packages/typescript/api-doc-types/MethodMemberDoc';
-import {dgeniAccessorsParse} from '../common/dgeni-accessors-parse';
 import {sortCategorizedMembers} from '../common/sort-members';
 
 export interface CategorizedClassDoc extends ClassExportDoc {
@@ -119,7 +118,6 @@ export class Categorizer implements Processor {
    */
   private decoratePropertyDoc(propertyDoc: CategorizedPropertyMemberDoc) {
     decorateDeprecatedDoc(propertyDoc);
-    dgeniAccessorsParse(propertyDoc);
 
     propertyDoc.isDirectiveInput = isDirectiveInput(propertyDoc);
     propertyDoc.directiveInputAlias = getDirectiveInputAlias(propertyDoc);

From b29ac45c0be7ab865dfe2a92e84a669394c474e2 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 12 Oct 2017 23:42:40 +0200
Subject: [PATCH 333/575] chore(dialog): add generic param for config data
 (#7447)

Adds a generic parameter to the `MatDialogConfig` that indicates the type of its `data`.

BREAKING CHANGE: Material now requires at least TypeScript 2.4.

Fixes #4398.
---
 src/lib/dialog/dialog-config.ts | 4 ++--
 src/lib/dialog/dialog.ts        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
index 7f6f47d42da4..71ff36ad6621 100644
--- a/src/lib/dialog/dialog-config.ts
+++ b/src/lib/dialog/dialog-config.ts
@@ -23,7 +23,7 @@ export interface DialogPosition {
 /**
  * Configuration for opening a modal dialog with the MatDialog service.
  */
-export class MatDialogConfig {
+export class MatDialogConfig<D = any> {
 
   /**
    * Where the attached component should live in Angular's *logical* component tree.
@@ -73,7 +73,7 @@ export class MatDialogConfig {
   position?: DialogPosition;
 
   /** Data being injected into the child component. */
-  data?: any = null;
+  data?: D | null = null;
 
   /** Layout direction for the dialog's content. */
   direction?: Direction = 'ltr';
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index f9a370ea8ff1..ce0b39d71c3f 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -114,8 +114,8 @@ export class MatDialog {
    * @param config Extra configuration options.
    * @returns Reference to the newly-opened dialog.
    */
-  open<T>(componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
-          config?: MatDialogConfig): MatDialogRef<T> {
+  open<T, D = any>(componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
+          config?: MatDialogConfig<D>): MatDialogRef<T> {
 
     const inProgressDialog = this.openDialogs.find(dialog => dialog._isAnimating());
 

From 9673f63c11a286639e5d3a3b9e379392fd666d2a Mon Sep 17 00:00:00 2001
From: Philip Pham <phillypham@google.com>
Date: Fri, 13 Oct 2017 10:46:05 -0700
Subject: [PATCH 334/575] fix(scroll): Replace references to
 scrollableReferences (#7752)

The demo app won't build due to PR #7630.
---
 src/cdk/scrolling/scroll-dispatcher.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index 2da6f3a342ca..bd63a5f9b1bb 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -174,7 +174,7 @@ describe('Scroll Dispatcher', () => {
       fixture.detectChanges();
 
       expect(scroll._globalSubscription).toBeNull('Expected no global listeners on init.');
-      expect(scroll.scrollableReferences.size).toBe(4, 'Expected multiple scrollables');
+      expect(scroll.scrollContainers.size).toBe(4, 'Expected multiple scrollables');
 
       const subscription = scroll.scrolled(0).subscribe(() => {});
 
@@ -185,7 +185,7 @@ describe('Scroll Dispatcher', () => {
 
       expect(scroll._globalSubscription).toBeNull(
           'Expected global listeners to have been removed after the subscription has stopped.');
-      expect(scroll.scrollableReferences.size)
+      expect(scroll.scrollContainers.size)
           .toBe(4, 'Expected scrollable count to stay the same');
     });
 

From 26bbeb2cda3ab9d03c00dbb45e2317a48feed5d8 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 16 Oct 2017 21:52:32 +0200
Subject: [PATCH 335/575] build: fix safari test failures (#7785)

Fixes a few obscure test failures on iOS Safari.
---
 src/cdk/overlay/overlay-directives.spec.ts    | 18 +++--
 .../position/global-position-strategy.spec.ts | 80 ++++++-------------
 src/lib/snack-bar/snack-bar.spec.ts           | 64 +++++++--------
 3 files changed, 63 insertions(+), 99 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index 2e0830acb922..89404d4d210b 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -1,6 +1,6 @@
 import {Component, ViewChild} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {ComponentFixture, TestBed, async} from '@angular/core/testing';
+import {ComponentFixture, TestBed, async, inject} from '@angular/core/testing';
 import {Directionality} from '@angular/cdk/bidi';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ESCAPE} from '@angular/cdk/keycodes';
@@ -11,6 +11,7 @@ import {ConnectedOverlayPositionChange} from './position/connected-position';
 
 
 describe('Overlay directives', () => {
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
   let fixture: ComponentFixture<ConnectedOverlayDirectiveTest>;
   let dir: {value: string};
@@ -20,12 +21,8 @@ describe('Overlay directives', () => {
       imports: [OverlayModule],
       declarations: [ConnectedOverlayDirectiveTest, ConnectedOverlayPropertyInitOrder],
       providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          return {getContainerElement: () => overlayContainerElement};
-        }},
         {provide: Directionality, useFactory: () => {
-          return dir = { value: 'ltr' };
+          return dir = {value: 'ltr'};
         }}
       ],
     });
@@ -36,6 +33,15 @@ describe('Overlay directives', () => {
     fixture.detectChanges();
   });
 
+  beforeEach(inject([OverlayContainer], (oc: OverlayContainer) => {
+    overlayContainer = oc;
+    overlayContainerElement = oc.getContainerElement();
+  }));
+
+  afterEach(() => {
+    overlayContainer.ngOnDestroy();
+  });
+
   /** Returns the current open overlay pane element. */
   function getPaneElement() {
     return overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
diff --git a/src/cdk/overlay/position/global-position-strategy.spec.ts b/src/cdk/overlay/position/global-position-strategy.spec.ts
index 104757e17838..6a3fe36dc886 100644
--- a/src/cdk/overlay/position/global-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/global-position-strategy.spec.ts
@@ -1,4 +1,3 @@
-import {fakeAsync, flushMicrotasks, inject} from '@angular/core/testing';
 import {GlobalPositionStrategy} from './global-position-strategy';
 import {OverlayRef} from '../overlay-ref';
 
@@ -19,11 +18,9 @@ describe('GlobalPositonStrategy', () => {
     strategy.dispose();
   });
 
-  it('should position the element to the (top, left) with an offset', fakeAsyncTest(() => {
+  it('should position the element to the (top, left) with an offset', () => {
     strategy.top('10px').left('40px').apply();
 
-    flushMicrotasks();
-
     let elementStyle = element.style;
     let parentStyle = (element.parentNode as HTMLElement).style;
 
@@ -34,13 +31,11 @@ describe('GlobalPositonStrategy', () => {
 
     expect(parentStyle.justifyContent).toBe('flex-start');
     expect(parentStyle.alignItems).toBe('flex-start');
-  }));
+  });
 
-  it('should position the element to the (bottom, right) with an offset', fakeAsyncTest(() => {
+  it('should position the element to the (bottom, right) with an offset', () => {
     strategy.bottom('70px').right('15em').apply();
 
-    flushMicrotasks();
-
     let elementStyle = element.style;
     let parentStyle = (element.parentNode as HTMLElement).style;
 
@@ -51,14 +46,11 @@ describe('GlobalPositonStrategy', () => {
 
     expect(parentStyle.justifyContent).toBe('flex-end');
     expect(parentStyle.alignItems).toBe('flex-end');
-  }));
+  });
 
-  it('should overwrite previously applied positioning', fakeAsyncTest(() => {
+  it('should overwrite previously applied positioning', () => {
     strategy.centerHorizontally().centerVertically().apply();
-    flushMicrotasks();
-
     strategy.top('10px').left('40%').apply();
-    flushMicrotasks();
 
     let elementStyle = element.style;
     let parentStyle = (element.parentNode as HTMLElement).style;
@@ -73,8 +65,6 @@ describe('GlobalPositonStrategy', () => {
 
     strategy.bottom('70px').right('15em').apply();
 
-    flushMicrotasks();
-
     expect(element.style.marginTop).toBe('');
     expect(element.style.marginLeft).toBe('');
     expect(element.style.marginBottom).toBe('70px');
@@ -82,24 +72,20 @@ describe('GlobalPositonStrategy', () => {
 
     expect(parentStyle.justifyContent).toBe('flex-end');
     expect(parentStyle.alignItems).toBe('flex-end');
-  }));
+  });
 
-  it('should center the element', fakeAsyncTest(() => {
+  it('should center the element', () => {
     strategy.centerHorizontally().centerVertically().apply();
 
-    flushMicrotasks();
-
     let parentStyle = (element.parentNode as HTMLElement).style;
 
     expect(parentStyle.justifyContent).toBe('center');
     expect(parentStyle.alignItems).toBe('center');
-  }));
+  });
 
-  it('should center the element with an offset', fakeAsyncTest(() => {
+  it('should center the element with an offset', () => {
     strategy.centerHorizontally('10px').centerVertically('15px').apply();
 
-    flushMicrotasks();
-
     let elementStyle = element.style;
     let parentStyle = (element.parentNode as HTMLElement).style;
 
@@ -108,74 +94,56 @@ describe('GlobalPositonStrategy', () => {
 
     expect(parentStyle.justifyContent).toBe('center');
     expect(parentStyle.alignItems).toBe('center');
-  }));
+  });
 
-  it('should make the element position: static', fakeAsyncTest(() => {
+  it('should make the element position: static', () => {
     strategy.apply();
 
-    flushMicrotasks();
-
     expect(element.style.position).toBe('static');
-  }));
+  });
 
-  it('should wrap the element in a `cdk-global-overlay-wrapper`', fakeAsyncTest(() => {
+  it('should wrap the element in a `cdk-global-overlay-wrapper`', () => {
     strategy.apply();
 
-    flushMicrotasks();
-
     let parent = element.parentNode as HTMLElement;
 
     expect(parent.classList.contains('cdk-global-overlay-wrapper')).toBe(true);
-  }));
+  });
 
 
-  it('should remove the parent wrapper from the DOM', fakeAsync(() => {
+  it('should remove the parent wrapper from the DOM', () => {
     strategy.apply();
 
-    flushMicrotasks();
-
     expect(document.body.contains(element.parentNode!)).toBe(true);
 
     strategy.dispose();
 
     expect(document.body.contains(element.parentNode!)).toBe(false);
-  }));
+  });
 
-  it('should set the element width', fakeAsync(() => {
+  it('should set the element width', () => {
     strategy.width('100px').apply();
 
-    flushMicrotasks();
-
     expect(element.style.width).toBe('100px');
-  }));
+  });
 
-  it('should set the element height', fakeAsync(() => {
+  it('should set the element height', () => {
     strategy.height('100px').apply();
 
-    flushMicrotasks();
-
     expect(element.style.height).toBe('100px');
-  }));
+  });
 
-  it('should reset the horizontal position and offset when the width is 100%', fakeAsync(() => {
+  it('should reset the horizontal position and offset when the width is 100%', () => {
     strategy.centerHorizontally().width('100%').apply();
 
-    flushMicrotasks();
-
     expect(element.style.marginLeft).toBe('0px');
     expect((element.parentNode as HTMLElement).style.justifyContent).toBe('flex-start');
-  }));
+  });
 
-  it('should reset the vertical position and offset when the height is 100%', fakeAsync(() => {
+  it('should reset the vertical position and offset when the height is 100%', () => {
     strategy.centerVertically().height('100%').apply();
 
-    flushMicrotasks();
-
     expect(element.style.marginTop).toBe('0px');
     expect((element.parentNode as HTMLElement).style.alignItems).toBe('flex-start');
-  }));
+  });
 });
-
-function fakeAsyncTest(fn: () => void) {
-  return inject([], fakeAsync(fn));
-}
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 2fe92877e571..6041b9c28ea5 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -4,8 +4,7 @@ import {
   ComponentFixture,
   TestBed,
   fakeAsync,
-  flushMicrotasks,
-  tick
+  tick,
 } from '@angular/core/testing';
 import {NgModule, Component, Directive, ViewChild, ViewContainerRef, Inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
@@ -21,10 +20,10 @@ import {
   MAT_SNACK_BAR_DATA,
 } from './index';
 
-
 describe('MatSnackBar', () => {
   let snackBar: MatSnackBar;
   let liveAnnouncer: LiveAnnouncer;
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
 
   let testViewContainerRef: ViewContainerRef;
@@ -36,23 +35,20 @@ describe('MatSnackBar', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
-      providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          return {getContainerElement: () => overlayContainerElement};
-        }}
-      ],
     });
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MatSnackBar, LiveAnnouncer], (sb: MatSnackBar, la: LiveAnnouncer) => {
+  beforeEach(inject([MatSnackBar, LiveAnnouncer, OverlayContainer],
+    (sb: MatSnackBar, la: LiveAnnouncer, oc: OverlayContainer) => {
     snackBar = sb;
     liveAnnouncer = la;
+    overlayContainer = oc;
+    overlayContainerElement = oc.getContainerElement();
   }));
 
   afterEach(() => {
-    overlayContainerElement.innerHTML = '';
+    overlayContainer.ngOnDestroy();
     liveAnnouncer.ngOnDestroy();
   });
 
@@ -64,8 +60,7 @@ describe('MatSnackBar', () => {
   });
 
   it('should have the role of alert', () => {
-    let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
-    snackBar.open(simpleMessage, simpleActionLabel, config);
+    snackBar.open(simpleMessage, simpleActionLabel);
 
     let containerElement = overlayContainerElement.querySelector('snack-bar-container')!;
     expect(containerElement.getAttribute('role'))
@@ -278,8 +273,7 @@ describe('MatSnackBar', () => {
     snackBar.open('Second snackbar');
     viewContainerFixture.detectChanges();
 
-    // Flush microtasks to make observables run, but don't tick such that any animations would run.
-    flushMicrotasks();
+    tick();
     expect(overlayContainerElement.textContent!.trim()).toBe('Second snackbar');
 
     // Let remaining animations run.
@@ -304,7 +298,7 @@ describe('MatSnackBar', () => {
         overlayContainerElement.querySelector('.mat-simple-snackbar-action') as HTMLButtonElement;
       actionButton.click();
       viewContainerFixture.detectChanges();
-      flushMicrotasks();
+      tick();
 
       expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
       expect(actionObservableCompleted).toBeTruthy('Expected the snack bar to notify of action');
@@ -327,7 +321,7 @@ describe('MatSnackBar', () => {
 
     snackBarRef.closeWithAction();
     viewContainerFixture.detectChanges();
-    flushMicrotasks();
+    tick();
 
     expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
     expect(actionObservableCompleted).toBeTruthy('Expected the snack bar to notify of action');
@@ -345,12 +339,12 @@ describe('MatSnackBar', () => {
     });
 
     viewContainerFixture.detectChanges();
-    flushMicrotasks();
+    tick();
     expect(dismissObservableCompleted).toBeFalsy('Expected the snack bar not to be dismissed');
 
     tick(1000);
     viewContainerFixture.detectChanges();
-    flushMicrotasks();
+    tick();
     expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
   }));
 
@@ -363,7 +357,7 @@ describe('MatSnackBar', () => {
 
     tick(600);
     viewContainerFixture.detectChanges();
-    flushMicrotasks();
+    tick();
 
     expect(viewContainerFixture.isStable()).toBe(true);
   }));
@@ -431,7 +425,7 @@ describe('MatSnackBar', () => {
 
       snackBarRef.closeWithAction();
       viewContainerFixture.detectChanges();
-      flushMicrotasks();
+      tick();
 
       expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
       expect(actionObservableCompleted).toBeTruthy('Expected the snack bar to notify of action');
@@ -446,6 +440,7 @@ describe('MatSnackBar', () => {
 describe('MatSnackBar with parent MatSnackBar', () => {
   let parentSnackBar: MatSnackBar;
   let childSnackBar: MatSnackBar;
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
   let fixture: ComponentFixture<ComponentThatProvidesMatSnackBar>;
   let liveAnnouncer: LiveAnnouncer;
@@ -454,20 +449,17 @@ describe('MatSnackBar with parent MatSnackBar', () => {
     TestBed.configureTestingModule({
       imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
       declarations: [ComponentThatProvidesMatSnackBar],
-      providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          return {getContainerElement: () => overlayContainerElement};
-        }}
-      ],
     });
 
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MatSnackBar, LiveAnnouncer], (sb: MatSnackBar, la: LiveAnnouncer) => {
+  beforeEach(inject([MatSnackBar, LiveAnnouncer, OverlayContainer],
+    (sb: MatSnackBar, la: LiveAnnouncer, oc: OverlayContainer) => {
     parentSnackBar = sb;
     liveAnnouncer = la;
+    overlayContainer = oc;
+    overlayContainerElement = oc.getContainerElement();
 
     fixture = TestBed.createComponent(ComponentThatProvidesMatSnackBar);
     childSnackBar = fixture.componentInstance.snackBar;
@@ -475,7 +467,7 @@ describe('MatSnackBar with parent MatSnackBar', () => {
   }));
 
   afterEach(() => {
-    overlayContainerElement.innerHTML = '';
+    overlayContainer.ngOnDestroy();
     liveAnnouncer.ngOnDestroy();
   });
 
@@ -516,6 +508,7 @@ describe('MatSnackBar with parent MatSnackBar', () => {
 describe('MatSnackBar Positioning', () => {
   let snackBar: MatSnackBar;
   let liveAnnouncer: LiveAnnouncer;
+  let overlayContainer: OverlayContainer;
   let overlayContainerEl: HTMLElement;
 
   let testViewContainerRef: ViewContainerRef;
@@ -527,23 +520,20 @@ describe('MatSnackBar Positioning', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
-      providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerEl = document.createElement('div');
-          return {getContainerElement: () => overlayContainerEl};
-        }}
-      ],
     });
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MatSnackBar, LiveAnnouncer], (sb: MatSnackBar, la: LiveAnnouncer) => {
+  beforeEach(inject([MatSnackBar, LiveAnnouncer, OverlayContainer],
+    (sb: MatSnackBar, la: LiveAnnouncer, oc: OverlayContainer) => {
     snackBar = sb;
     liveAnnouncer = la;
+    overlayContainer = oc;
+    overlayContainerEl = oc.getContainerElement();
   }));
 
   afterEach(() => {
-    overlayContainerEl.innerHTML = '';
+    overlayContainer.ngOnDestroy();
     liveAnnouncer.ngOnDestroy();
   });
 

From 4fc3a0bf20d4f4d60ef0919763c00678b49c529c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 18 Oct 2017 20:28:10 +0200
Subject: [PATCH 336/575] refactor(select): simplify option sync and more
 robust unit tests (#7807)

* Currently the select sets the `multiple` and `disableRipple` values on its options manually. In order to avoid "changed after checked" errors we wrap the calls in promises, however this also forces us to have `async` tests which can time out if the browser is out of focus. These changes add a provider that allows for the options to take the value directly from the select.
* Refactors some unit tests that have been timing out in Firefox to run in the `fakeAsync` zone instead of the `async` one.
---
 .../connected-position-strategy.spec.ts       |   2 +
 src/lib/core/option/option.spec.ts            |  16 +-
 src/lib/core/option/option.ts                 |  46 ++--
 src/lib/select/select.spec.ts                 | 202 +++++++++---------
 src/lib/select/select.ts                      |  28 +--
 5 files changed, 136 insertions(+), 158 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index 2ca91f9678c8..93c3630e7a9e 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -328,6 +328,8 @@ describe('ConnectedPositionStrategy', () => {
 
       it('should allow for the fallback positions to specify their own offsets', () => {
         originElement.style.bottom = '0';
+        originElement.style.left = '50%';
+        originElement.style.position = 'fixed';
         originRect = originElement.getBoundingClientRect();
         strategy = positionBuilder
           .connectedTo(
diff --git a/src/lib/core/option/option.spec.ts b/src/lib/core/option/option.spec.ts
index f03c47f8e30c..aa13e8b911a1 100644
--- a/src/lib/core/option/option.spec.ts
+++ b/src/lib/core/option/option.spec.ts
@@ -29,7 +29,7 @@ describe('MatOption component', () => {
     });
 
     it('should show ripples by default', () => {
-      expect(optionInstance.disableRipple).toBe(false, 'Expected ripples to be enabled by default');
+      expect(optionInstance.disableRipple).toBeFalsy('Expected ripples to be enabled by default');
       expect(optionNativeElement.querySelectorAll('.mat-ripple-element').length)
         .toBe(0, 'Expected no ripples to show up initially');
 
@@ -54,20 +54,6 @@ describe('MatOption component', () => {
         .toBe(0, 'Expected no ripples to show up after click on a disabled option.');
     });
 
-    it('should not show ripples if the ripples are disabled using disableRipple', () => {
-      expect(optionNativeElement.querySelectorAll('.mat-ripple-element').length)
-        .toBe(0, 'Expected no ripples to show up initially');
-
-      optionInstance.disableRipple = true;
-      fixture.detectChanges();
-
-      dispatchFakeEvent(optionNativeElement, 'mousedown');
-      dispatchFakeEvent(optionNativeElement, 'mouseup');
-
-      expect(optionNativeElement.querySelectorAll('.mat-ripple-element').length)
-        .toBe(0, 'Expected no ripples to show up after click when ripples are disabled.');
-    });
-
   });
 
 });
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index 4b47c9bf5a4c..27bb5bfa7c00 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -19,6 +19,8 @@ import {
   Output,
   QueryList,
   ViewEncapsulation,
+  InjectionToken,
+  Inject,
 } from '@angular/core';
 import {MatOptgroup} from './optgroup';
 
@@ -33,6 +35,22 @@ export class MatOptionSelectionChange {
   constructor(public source: MatOption, public isUserInput = false) { }
 }
 
+/**
+ * Describes a parent component that manages a list of options.
+ * Contains properties that the options can inherit.
+ * @docs-private
+ */
+export interface MatOptionParentComponent {
+  disableRipple?: boolean;
+  multiple?: boolean;
+}
+
+/**
+ * Injection token used to provide the parent component to options.
+ */
+export const MAT_OPTION_PARENT_COMPONENT =
+    new InjectionToken<MatOptionParentComponent>('MAT_OPTION_PARENT_COMPONENT');
+
 /**
  * Single option inside of a `<mat-select>` element.
  */
@@ -60,24 +78,13 @@ export class MatOptionSelectionChange {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatOption {
-  private _selected: boolean = false;
-  private _active: boolean = false;
-  private _multiple: boolean = false;
-  private _disableRipple: boolean = false;
-
-  /** Whether the option is disabled.  */
-  private _disabled: boolean = false;
-
-  private _id: string = `mat-option-${_uniqueIdCounter++}`;
+  private _selected = false;
+  private _active = false;
+  private _disabled = false;
+  private _id = `mat-option-${_uniqueIdCounter++}`;
 
   /** Whether the wrapping component is in multiple selection mode. */
-  get multiple() { return this._multiple; }
-  set multiple(value: boolean) {
-    if (value !== this._multiple) {
-      this._multiple = value;
-      this._changeDetectorRef.markForCheck();
-    }
-  }
+  get multiple() { return this._parent && this._parent.multiple; }
 
   /** The unique ID of the option. */
   get id(): string { return this._id; }
@@ -94,11 +101,7 @@ export class MatOption {
   set disabled(value: any) { this._disabled = coerceBooleanProperty(value); }
 
   /** Whether ripples for the option are disabled. */
-  get disableRipple() { return this._disableRipple; }
-  set disableRipple(value: boolean) {
-    this._disableRipple = value;
-    this._changeDetectorRef.markForCheck();
-  }
+  get disableRipple() { return this._parent && this._parent.disableRipple; }
 
   /** Event emitted when the option is selected or deselected. */
   @Output() onSelectionChange = new EventEmitter<MatOptionSelectionChange>();
@@ -106,6 +109,7 @@ export class MatOption {
   constructor(
     private _element: ElementRef,
     private _changeDetectorRef: ChangeDetectorRef,
+    @Optional() @Inject(MAT_OPTION_PARENT_COMPONENT) private _parent: MatOptionParentComponent,
     @Optional() public readonly group: MatOptgroup) {}
 
   /**
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 0be5121e9be9..d840b3198d46 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -248,19 +248,18 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.select.panelOpen).toBe(false);
     });
 
-    it('should set the width of the overlay if there is no placeholder', async(() => {
+    it('should set the width of the overlay if there is no placeholder', fakeAsync(() => {
       let noPlaceholder = TestBed.createComponent(BasicSelectNoPlaceholder);
 
       noPlaceholder.detectChanges();
       trigger = noPlaceholder.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-      noPlaceholder.whenStable().then(() => {
-        trigger.click();
-        noPlaceholder.detectChanges();
+      trigger.click();
+      noPlaceholder.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-        expect(parseInt(pane.style.minWidth as string)).toBeGreaterThan(0);
-      });
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(parseInt(pane.style.minWidth as string)).toBeGreaterThan(0);
     }));
 
     it('should close the panel when tabbing out', fakeAsync(() => {
@@ -348,6 +347,22 @@ describe('MatSelect', () => {
       expect(options.every(option => option.disableRipple === true))
         .toBeTruthy('Expected all options to have disableRipple set to true.');
     });
+
+    it('should not show ripples if they were disabled', fakeAsync(() => {
+      fixture.componentInstance.disableRipple = true;
+      fixture.detectChanges();
+
+      trigger.click();
+      fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
+
+      const option = overlayContainerElement.querySelector('mat-option')!;
+
+      dispatchFakeEvent(option, 'mousedown');
+      dispatchFakeEvent(option, 'mouseup');
+
+      expect(option.querySelectorAll('.mat-ripple-element').length).toBe(0);
+    }));
   });
 
   describe('selection logic', () => {
@@ -548,7 +563,7 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.select.selected).toBeUndefined();
     });
 
-    it('should not select options inside a disabled group', async(() => {
+    it('should not select options inside a disabled group', () => {
       fixture.destroy();
 
       const groupFixture = TestBed.createComponent(SelectWithGroups);
@@ -565,7 +580,7 @@ describe('MatSelect', () => {
       expect(groupFixture.componentInstance.select.panelOpen).toBe(true);
       expect(options[0].classList).not.toContain('mat-selected');
       expect(groupFixture.componentInstance.select.selected).toBeUndefined();
-    }));
+    });
 
   });
 
@@ -1944,14 +1959,10 @@ describe('MatSelect', () => {
         expect(select.getAttribute('aria-labelledby')).toBe('myLabelId');
       });
 
-      it('should not have aria-labelledby in the DOM if it`s not specified', async(() => {
-
+      it('should not have aria-labelledby in the DOM if it`s not specified', () => {
         fixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-          expect(select.hasAttribute('aria-labelledby')).toBeFalsy();
-        });
-      }));
+        expect(select.hasAttribute('aria-labelledby')).toBeFalsy();
+      });
 
       it('should set the tabindex of the select to 0 by default', () => {
         expect(select.getAttribute('tabindex')).toEqual('0');
@@ -2434,7 +2445,7 @@ describe('MatSelect', () => {
   });
 
   describe('special cases', () => {
-    it('should handle nesting in an ngIf', async(() => {
+    it('should handle nesting in an ngIf', fakeAsync(() => {
       const fixture = TestBed.createComponent(NgIfSelect);
       fixture.detectChanges();
 
@@ -2444,41 +2455,42 @@ describe('MatSelect', () => {
       const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       trigger.style.width = '300px';
 
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
-        const value = fixture.debugElement.query(By.css('.mat-select-value'));
-        expect(value.nativeElement.textContent)
-            .toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
+      fixture.detectChanges();
+      tick();
 
-        trigger.click();
-        fixture.detectChanges();
+      trigger.click();
+      fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-        expect(pane.style.minWidth).toEqual('300px');
+      const value = fixture.debugElement.query(By.css('.mat-select-value'));
+      expect(value.nativeElement.textContent)
+          .toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
 
-        expect(fixture.componentInstance.select.panelOpen).toBe(true);
-        expect(overlayContainerElement.textContent).toContain('Steak');
-        expect(overlayContainerElement.textContent).toContain('Pizza');
-        expect(overlayContainerElement.textContent).toContain('Tacos');
-      });
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(pane.style.minWidth).toEqual('300px');
+
+      expect(fixture.componentInstance.select.panelOpen).toBe(true);
+      expect(overlayContainerElement.textContent).toContain('Steak');
+      expect(overlayContainerElement.textContent).toContain('Pizza');
+      expect(overlayContainerElement.textContent).toContain('Tacos');
     }));
 
-    it('should not crash the browser when a sibling throws an error on init', async(() => {
+    it('should not crash the browser when a sibling throws an error on init', () => {
       // Note that this test can be considered successful if the error being thrown didn't
       // end up crashing the testing setup altogether.
       expect(() => {
         TestBed.createComponent(SelectWithErrorSibling).detectChanges();
       }).toThrowError(new RegExp('Oh no!', 'g'));
-    }));
+    });
 
-    it('should not throw when trying to access the selected value on init', async(() => {
+    it('should not throw when trying to access the selected value on init', () => {
       expect(() => {
         TestBed.createComponent(SelectEarlyAccessSibling).detectChanges();
       }).not.toThrow();
-    }));
+    });
 
     it('should not throw selection model-related errors in addition to the errors from ngModel',
-      async(() => {
+      () => {
         const fixture = TestBed.createComponent(InvalidSelectInForm);
 
         // The first change detection run will throw the "ngModel is missing a name" error.
@@ -2486,7 +2498,7 @@ describe('MatSelect', () => {
 
         // The second run shouldn't throw selection-model related errors.
         expect(() => fixture.detectChanges()).not.toThrow();
-      }));
+      });
 
     it('should not throw when the triggerValue is accessed when there is no selected value', () => {
       const fixture = TestBed.createComponent(BasicSelect);
@@ -2655,13 +2667,13 @@ describe('MatSelect', () => {
     let testInstance: MultiSelect;
     let trigger: HTMLElement;
 
-    beforeEach(async(() => {
+    beforeEach(() => {
       fixture = TestBed.createComponent(MultiSelect);
       testInstance = fixture.componentInstance;
       fixture.detectChanges();
 
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    }));
+    });
 
     it('should be able to select multiple values', () => {
       trigger.click();
@@ -2695,28 +2707,25 @@ describe('MatSelect', () => {
       expect(testInstance.control.value).toEqual([]);
     });
 
-    it('should update the label', async(() => {
+    it('should update the label', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        const options = overlayContainerElement.querySelectorAll('mat-option') as
-            NodeListOf<HTMLElement>;
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-        options[0].click();
-        options[2].click();
-        options[5].click();
-        fixture.detectChanges();
+      options[0].click();
+      options[2].click();
+      options[5].click();
+      fixture.detectChanges();
 
-        expect(trigger.textContent).toContain('Steak, Tacos, Eggs');
+      expect(trigger.textContent).toContain('Steak, Tacos, Eggs');
 
-        options[2].click();
-        fixture.detectChanges();
+      options[2].click();
+      fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          expect(trigger.textContent).toContain('Steak, Eggs');
-        });
-      });
+      expect(trigger.textContent).toContain('Steak, Eggs');
     }));
 
     it('should be able to set the selected value by taking an array', () => {
@@ -2771,41 +2780,39 @@ describe('MatSelect', () => {
       expect(testInstance.select.panelOpen).toBe(true);
     });
 
-    it('should sort the selected options based on their order in the panel', async(() => {
+    it('should sort the selected options based on their order in the panel', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        const options = overlayContainerElement.querySelectorAll('mat-option') as
-            NodeListOf<HTMLElement>;
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-        options[2].click();
-        options[0].click();
-        options[1].click();
-        fixture.detectChanges();
+      options[2].click();
+      options[0].click();
+      options[1].click();
+      fixture.detectChanges();
 
-        expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
-        expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
-      });
+      expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
+      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
     }));
 
-    it('should sort the selected options in reverse in rtl', async(() => {
+    it('should sort the selected options in reverse in rtl', fakeAsync(() => {
       dir.value = 'rtl';
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        const options = overlayContainerElement.querySelectorAll('mat-option') as
-            NodeListOf<HTMLElement>;
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-        options[2].click();
-        options[0].click();
-        options[1].click();
-        fixture.detectChanges();
+      options[2].click();
+      options[0].click();
+      options[1].click();
+      fixture.detectChanges();
 
-        expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
-        expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
-      });
+      expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
+      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
     }));
 
     it('should sort the values, that get set via the model, based on the panel order', () => {
@@ -2829,34 +2836,31 @@ describe('MatSelect', () => {
       expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
     });
 
-    it('should throw an exception when trying to set a non-array value', async(() => {
+    it('should throw an exception when trying to set a non-array value', () => {
       expect(() => {
         testInstance.control.setValue('not-an-array');
       }).toThrowError(wrappedErrorMessage(getMatSelectNonArrayValueError()));
-    }));
+    });
 
-    it('should throw an exception when trying to change multiple mode after init', async(() => {
+    it('should throw an exception when trying to change multiple mode after init', () => {
       expect(() => {
         testInstance.select.multiple = false;
       }).toThrowError(wrappedErrorMessage(getMatSelectDynamicMultipleError()));
-    }));
+    });
 
-    it('should pass the `multiple` value to all of the option instances', async(() => {
+    it('should pass the `multiple` value to all of the option instances', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        expect(testInstance.options.toArray().every(option => option.multiple)).toBe(true,
-            'Expected `multiple` to have been added to initial set of options.');
+      expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
+          'Expected `multiple` to have been added to initial set of options.');
 
-        testInstance.foods.push({ value: 'cake-8', viewValue: 'Cake' });
-        fixture.detectChanges();
+      testInstance.foods.push({ value: 'cake-8', viewValue: 'Cake' });
+      fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          expect(testInstance.options.toArray().every(option => option.multiple)).toBe(true,
-              'Expected `multiple` to have been set on dynamically-added option.');
-        });
-      });
+      expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
+          'Expected `multiple` to have been set on dynamically-added option.');
     }));
 
   });
@@ -2864,10 +2868,10 @@ describe('MatSelect', () => {
   describe('theming', () => {
     let fixture: ComponentFixture<BasicSelectWithTheming>;
 
-    beforeEach(async(() => {
+    beforeEach(() => {
       fixture = TestBed.createComponent(BasicSelectWithTheming);
       fixture.detectChanges();
-    }));
+    });
 
     it('should transfer the theme to the select panel', () => {
       fixture.componentInstance.theme = 'warn';
@@ -2887,7 +2891,7 @@ describe('MatSelect', () => {
     let formField: HTMLElement;
     let options: NodeListOf<HTMLElement>;
 
-    beforeEach(async(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(ResetValuesSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
@@ -2895,12 +2899,12 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
+      tick(SELECT_OPEN_ANIMATION);
 
-      fixture.whenStable().then(() => {
-        options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-        options[0].click();
-        fixture.detectChanges();
-      });
+      options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      options[0].click();
+      fixture.detectChanges();
+      tick(SELECT_CLOSE_ANIMATION);
     }));
 
     it('should reset when an option with an undefined value is selected', fakeAsync(() => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 88008d035466..8ad70fc9d2dd 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -64,6 +64,7 @@ import {
   MatOptionSelectionChange,
   mixinDisabled,
   mixinTabIndex,
+  MAT_OPTION_PARENT_COMPONENT,
 } from '@angular/material/core';
 import {MatFormField, MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
@@ -187,7 +188,10 @@ export class MatSelectTrigger {}
     transformPanel,
     fadeInContent
   ],
-  providers: [{provide: MatFormFieldControl, useExisting: MatSelect}],
+  providers: [
+    {provide: MatFormFieldControl, useExisting: MatSelect},
+    {provide: MAT_OPTION_PARENT_COMPONENT, useExisting: MatSelect}
+  ],
 })
 export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnChanges,
     OnDestroy, OnInit, DoCheck, ControlValueAccessor, CanDisable, HasTabIndex,
@@ -371,7 +375,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   get disableRipple(): boolean { return this._disableRipple; }
   set disableRipple(value: boolean) {
     this._disableRipple = coerceBooleanProperty(value);
-    this._setOptionDisableRipple();
   }
   private _disableRipple: boolean = false;
 
@@ -804,8 +807,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
       });
 
     this._setOptionIds();
-    this._setOptionMultiple();
-    this._setOptionDisableRipple();
   }
 
   /** Invoked when an option is clicked. */
@@ -873,25 +874,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._optionIds = this.options.map(option => option.id).join(' ');
   }
 
-  /**
-   * Sets the `multiple` property on each option. The promise is necessary
-   * in order to avoid Angular errors when modifying the property after init.
-   */
-  private _setOptionMultiple() {
-    if (this.multiple) {
-      Promise.resolve(null).then(() => {
-        this.options.forEach(option => option.multiple = this.multiple);
-      });
-    }
-  }
-
-  /** Sets the `disableRipple` property on each option. */
-  private _setOptionDisableRipple() {
-    if (this.options) {
-      this.options.forEach(option => option.disableRipple = this.disableRipple);
-    }
-  }
-
   /**
    * Highlights the selected item. If no option is selected, it will highlight
    * the first item instead.

From 288c2436b3661fd26404066bfc602ee6836c2dbd Mon Sep 17 00:00:00 2001
From: Juliano <juliano.brasil@gmail.com>
Date: Wed, 18 Oct 2017 21:03:54 -0200
Subject: [PATCH 337/575] fix unescaped open-close (<>) tags (#7756)

---
 src/lib/icon/icon-registry.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 6bae77049de4..6c736a4a48c2 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -181,7 +181,7 @@ export class MatIconRegistry {
   }
 
   /**
-   * Returns an Observable that produces the icon (as an <svg> DOM element) from the given URL.
+   * Returns an Observable that produces the icon (as an `<svg>` DOM element) from the given URL.
    * The response from the URL may be cached so this will not always cause an HTTP request, but
    * the produced element will always be a new copy of the originally fetched icon. (That is,
    * it will not contain any modifications made to elements previously returned).
@@ -208,7 +208,7 @@ export class MatIconRegistry {
   }
 
   /**
-   * Returns an Observable that produces the icon (as an <svg> DOM element) with the given name
+   * Returns an Observable that produces the icon (as an `<svg>` DOM element) with the given name
    * and namespace. The icon must have been previously registered with addIcon or addIconSet;
    * if not, the Observable will throw an error.
    *

From e8b2e3faaa274b0e3a4cc78aedef0af1f26ac7c3 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 19 Oct 2017 01:05:04 +0200
Subject: [PATCH 338/575] build: add karma task for easier cross-browser
 debugging (#7796)

Adds the `gulp test:static` task that is identical to `gulp test`, however it doesn't launch Chrome automatically, which is convenient for debugging any browser that isn't Chrome. Currently the debugging flow for other browsers is running the Gulp task which launches Chrome, waiting for it to finish running the tests, connect the other browser, wait for the new browser to finish and then start debugging. With the new task you can just run the Gulp task and connect and disconnect only the relevant browsers.
---
 tools/gulp/tasks/unit-test.ts | 82 ++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/tools/gulp/tasks/unit-test.ts b/tools/gulp/tasks/unit-test.ts
index 3c70bd50f68d..96494582ea66 100644
--- a/tools/gulp/tasks/unit-test.ts
+++ b/tools/gulp/tasks/unit-test.ts
@@ -5,7 +5,12 @@ import {buildConfig, sequenceTask} from 'material2-build-tools';
 // There are no type definitions available for these imports.
 const runSequence = require('run-sequence');
 
-const {packagesDir, projectDir} = buildConfig;
+// Default Karma options.
+const defaultOptions = {
+  configFile: join(buildConfig.projectDir, 'test/karma.conf.js'),
+  autoWatch: false,
+  singleRun: false
+};
 
 /** Builds everything that is necessary for karma. */
 task(':test:build', sequenceTask(
@@ -23,10 +28,7 @@ task('test:single-run', [':test:build'], (done: () => void) => {
   // Load karma not outside. Karma pollutes Promise with a different implementation.
   const karma = require('karma');
 
-  new karma.Server({
-    configFile: join(projectDir, 'test/karma.conf.js'),
-    singleRun: true
-  }, (exitCode: number) => {
+  new karma.Server({...defaultOptions, singleRun: true}, (exitCode: number) => {
     // Immediately exit the process if Karma reported errors, because due to
     // potential still running tunnel-browsers gulp won't exit properly.
     exitCode === 0 ? done() : process.exit(exitCode);
@@ -35,39 +37,51 @@ task('test:single-run', [':test:build'], (done: () => void) => {
 
 /**
  * [Watch task] Runs the unit tests, rebuilding and re-testing when sources change.
- * Does not inline resources. Note that this doesn't use Karma's built-in file
- * watching. Due to the way our build process is set up, Karma ends up firing
- * it's change detection for every file that is written to disk, which causes
- * it to run tests multiple time and makes it hard to follow the console output.
- * This approach runs the Karma server and then depends on the Gulp API to tell
- * Karma when to run the tests.
+ * Does not inline resources.
  *
  * This task should be used when running unit tests locally.
  */
-task('test', [':test:build'], () => {
-  const patternRoot = join(packagesDir, '**/*');
-  // Load karma not outside. Karma pollutes Promise with a different implementation.
-  const karma = require('karma');
+task('test', [':test:build'], karmaWatchTask());
 
-  // Configure the Karma server and override the autoWatch and singleRun just in case.
-  const server = new karma.Server({
-    configFile: join(projectDir, 'test/karma.conf.js'),
-    autoWatch: false,
-    singleRun: false
-  });
+/**
+ * Runs a Karma server which will run the unit tests against any browser that connects to it.
+ * This is identical to `gulp test`, however it won't launch and manage Chrome automatically,
+ * which makes it convenient debugging unit tests against multiple different browsers.
+ */
+task('test:static', [':test:build'], karmaWatchTask({browsers: []}));
 
-  // Refreshes Karma's file list and schedules a test run.
-  // Tests will only run if TypeScript compilation was successful.
-  const runTests = (err?: Error) => {
-    if (!err) {
-      server.refreshFiles().then(() => server._injector.get('executor').schedule());
-    }
-  };
+/**
+ * Returns a Gulp task that spawns a Karma server and reloads whenever the files change.
+ * Note that this doesn't use Karma's built-in file watching. Due to the way our build
+ * process is set up, Karma ends up firing it's change detection for every file that is
+ * written to disk, which causes it to run tests multiple time and makes it hard to follow
+ * the console output. This approach runs the Karma server and then depends on the Gulp API
+ * to tell Karma when to run the tests.
+ * @param overrides Karma options to use on top of the defaults.
+ */
+function karmaWatchTask(options?: any) {
+  return () => {
+    const patternRoot = join(buildConfig.packagesDir, '**/*');
+    // Note: Karma shouldn't be required from the outside, because it
+    // pollutes the global Promise with a custom implementation.
+    const karma = require('karma');
 
-  // Boot up the test server and run the tests whenever a new browser connects.
-  server.start();
-  server.on('browser_register', () => runTests());
+    // Configure the Karma server and override the autoWatch and singleRun just in case.
+    const server = new karma.Server({...defaultOptions, ...options});
 
-  // Whenever a file change has been recognized, rebuild and re-run the tests.
-  watch(patternRoot + '.+(ts|scss|html)', () => runSequence(':test:build', runTests));
-});
+    // Refreshes Karma's file list and schedules a test run.
+    // Tests will only run if TypeScript compilation was successful.
+    const runTests = (error?: Error) => {
+      if (!error) {
+        server.refreshFiles().then(() => server._injector.get('executor').schedule());
+      }
+    };
+
+    // Boot up the test server and run the tests whenever a new browser connects.
+    server.start();
+    server.on('browser_register', () => runTests());
+
+    // Whenever a file change has been recognized, rebuild and re-run the tests.
+    watch(patternRoot + '.+(ts|scss|html)', () => runSequence(':test:build', runTests));
+  };
+}

From df63ef06aedca16da449a634c831679daf94ef1a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 19 Oct 2017 01:06:26 +0200
Subject: [PATCH 339/575] chore: typo in example directory name (#7863)

Fixes a typo in the directory name of one of the examples.
---
 src/material-examples/example-module.ts                         | 2 +-
 .../select-value-binding-example.css                            | 0
 .../select-value-binding-example.html                           | 0
 .../select-value-binding-example.ts                             | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename src/material-examples/{select-vlaue-binding => select-value-binding}/select-value-binding-example.css (100%)
 rename src/material-examples/{select-vlaue-binding => select-value-binding}/select-value-binding-example.html (100%)
 rename src/material-examples/{select-vlaue-binding => select-value-binding}/select-value-binding-example.ts (100%)

diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 2add4934cdc6..7d78eb28d828 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -85,7 +85,7 @@ import {SelectOptgroupExample} from './select-optgroup/select-optgroup-example';
 import {SelectOverviewExample} from './select-overview/select-overview-example';
 import {SelectPanelClassExample} from './select-panel-class/select-panel-class-example';
 import {SelectResetExample} from './select-reset/select-reset-example';
-import {SelectValueBindingExample} from './select-vlaue-binding/select-value-binding-example';
+import {SelectValueBindingExample} from './select-value-binding/select-value-binding-example';
 import {SidenavFabExample} from './sidenav-fab/sidenav-fab-example';
 import {SidenavOverviewExample} from './sidenav-overview/sidenav-overview-example';
 import {SlideToggleConfigurableExample} from './slide-toggle-configurable/slide-toggle-configurable-example';
diff --git a/src/material-examples/select-vlaue-binding/select-value-binding-example.css b/src/material-examples/select-value-binding/select-value-binding-example.css
similarity index 100%
rename from src/material-examples/select-vlaue-binding/select-value-binding-example.css
rename to src/material-examples/select-value-binding/select-value-binding-example.css
diff --git a/src/material-examples/select-vlaue-binding/select-value-binding-example.html b/src/material-examples/select-value-binding/select-value-binding-example.html
similarity index 100%
rename from src/material-examples/select-vlaue-binding/select-value-binding-example.html
rename to src/material-examples/select-value-binding/select-value-binding-example.html
diff --git a/src/material-examples/select-vlaue-binding/select-value-binding-example.ts b/src/material-examples/select-value-binding/select-value-binding-example.ts
similarity index 100%
rename from src/material-examples/select-vlaue-binding/select-value-binding-example.ts
rename to src/material-examples/select-value-binding/select-value-binding-example.ts

From fe08c2b74b39474e663637f9ea7afc069f365c1d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 19 Oct 2017 01:11:36 +0200
Subject: [PATCH 340/575] build: run tests with firefox headless (#7828)

---
 .travis.yml                         | 1 +
 src/lib/list/selection-list.spec.ts | 9 +++------
 test/browser-providers.js           | 2 +-
 test/remote_browsers.json           | 6 ++++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7544dea8bd2b..3ec87189c175 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
     # we alias FIREBASE_ACCESS_TOKEN to $SAUCE_ACCESS_KEY in env.sh and set the SAUCE_ACCESS_KEY there
     - secure: "PKts/IbxuJRWWOEeiGbl8Z9zds0M+hIdCH/g/E4WbQ9yzSvSbdwzfmRfFccQFjxjsrY7+SJMVjsURZy+xUyBpzqgWYHUItnSVqjZb8DlyAU2IXyg8TM9BVLkGGe6k5k4PIFVmfMMMzQwWMM0X0W9w3oYmfHL5egxwSHvf9HIqLolLNXg8sqamIdS5d5KoCXf1c+oRjN/IMBktzNBR6N4OFOZQXVoepXNiIvTWAcTtOPBvFWdKP2n7RVioHKdm4a85aCUpDJp+LYGaLqiQZoRzmzfVTnAhTAPdd4ao5w/+jojrfZIHV55bqYF9rLnQMTneKsiyVNVYJzOLuxmARa/EEKfZld+J3rX4/o4cogrU38YSZF+T7J9g/7CTsnIZ3F6W6m+8iJbIBh55nGOQi5PVe458Q/nGb3fgQd2Z4+6lK9k479H4Ssh/Y7hbVQbepqEVIXzZKqWX6/ZE4iWoR/Q2dm0hySFmmB/R2etixX5JxhnHvgobTYIQ+1liJVp/3YFW1ru64Yg6yz/V291Bhh9g31znmTROCJ/usAmZZaLUqW1TDKnLIMP+M74MF9XERqcWKywXRFwxP4E5uDnx/vAyN49gL+SDfrBUxUtXrTkKZAlglwo9SgA7cOYEPWrionvKcGm87gCBYHFUmXZNQVzh212fpuJYXb/vy0sPDj8La4="
   chrome: stable
+  firefox: latest
 
 branches:
   only:
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index ee71934b54c5..71eef8c5c409 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -347,15 +347,12 @@ describe('MatSelectionList', () => {
     }));
 
     it('should be focused when focus on nativeElements', () => {
-      listOption.nativeElement.focus();
+      dispatchFakeEvent(listOption.nativeElement, 'focus');
       fixture.detectChanges();
 
-      expect(listItemEl.nativeElement).toBe(document.activeElement);
-      if (platform.SAFARI || platform.FIREFOX) {
-        expect(listItemEl.nativeElement.className).toContain('mat-list-item-focus');
-      }
+      expect(listItemEl.nativeElement.className).toContain('mat-list-item-focus');
 
-      listOption.nativeElement.blur();
+      dispatchFakeEvent(listOption.nativeElement, 'blur');
       fixture.detectChanges();
 
       expect(listItemEl.nativeElement.className).not.toContain('mat-list-item-focus');
diff --git a/test/browser-providers.js b/test/browser-providers.js
index ed2cd2ae0425..cc0c20584065 100644
--- a/test/browser-providers.js
+++ b/test/browser-providers.js
@@ -6,7 +6,7 @@
  */
 const browserConfig = {
   'ChromeHeadless_CI': { unitTest: {target: 'TC', required: true  }},
-  'Firefox':           { unitTest: {target: 'BS', required: true  }},
+  'FirefoxHeadless':   { unitTest: {target: 'TC', required: true  }},
   'ChromeBeta':        { unitTest: {target: null, required: false }},
   'FirefoxBeta':       { unitTest: {target: null, required: false }},
   'ChromeDev':         { unitTest: {target: null, required: true  }},
diff --git a/test/remote_browsers.json b/test/remote_browsers.json
index b1cd2ddbdc50..ae2c2cdce1c2 100644
--- a/test/remote_browsers.json
+++ b/test/remote_browsers.json
@@ -11,6 +11,12 @@
       "--window-size=1024,768"
     ]
   },
+  "FirefoxHeadless": {
+    "base": "Firefox",
+    "flags": [
+      "-headless"
+    ]
+  },
   "SL_CHROME": {
     "base": "SauceLabs",
     "browserName": "chrome",

From 5c6e3df64a32d1db5c83dd5cf9e796beebc39b2d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 20 Oct 2017 23:03:36 +0200
Subject: [PATCH 341/575] build: autocomplete test failure in iOS Safari
 (#7906)

---
 src/lib/autocomplete/autocomplete.spec.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index b0e94b829819..7a9698b8fbde 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1229,8 +1229,8 @@ describe('MatAutocomplete', () => {
 
     it('should fall back to above position if panel cannot fit below', async(() => {
       // Push the autocomplete trigger down so it won't have room to open "below"
-      inputReference.style.top = '600px';
-      inputReference.style.position = 'relative';
+      inputReference.style.bottom = '0';
+      inputReference.style.position = 'fixed';
 
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
@@ -1247,8 +1247,8 @@ describe('MatAutocomplete', () => {
 
     it('should align panel properly when filtering in "above" position', async(() => {
       // Push the autocomplete trigger down so it won't have room to open "below"
-      inputReference.style.top = '600px';
-      inputReference.style.position = 'relative';
+      inputReference.style.bottom = '0';
+      inputReference.style.position = 'fixed';
 
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();

From bf6a2c37aa57a057a1660dfc7b02448306d15618 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Sat, 21 Oct 2017 02:08:03 +0200
Subject: [PATCH 342/575] build: more stable screenshot tests (#7774)

* Most of the time the screenshot tests are failing because the caret is blinking and therefore the screenshot is different. Setting the caret-color to `transparent` for focused elements ensures that the screenshot tests are running more stable.
---
 src/e2e-app/e2e-app/e2e-app.css | 8 ++++++++
 src/e2e-app/e2e-app/e2e-app.ts  | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/e2e-app/e2e-app/e2e-app.css

diff --git a/src/e2e-app/e2e-app/e2e-app.css b/src/e2e-app/e2e-app/e2e-app.css
new file mode 100644
index 000000000000..bdaafd31d704
--- /dev/null
+++ b/src/e2e-app/e2e-app/e2e-app.css
@@ -0,0 +1,8 @@
+/**
+ * Don't show the caret for focused elements since those are causing the screenshot comparisons
+ * to be flaky. The `caret-color` CSS property is not supported in most of the browsers, but since
+ * the e2e tests run against Chrome we can use that property instead of a workaround using `color`.
+ */
+*:focus {
+  caret-color: transparent;
+}
diff --git a/src/e2e-app/e2e-app/e2e-app.ts b/src/e2e-app/e2e-app/e2e-app.ts
index 64fb2e4504a5..87283ec8725f 100644
--- a/src/e2e-app/e2e-app/e2e-app.ts
+++ b/src/e2e-app/e2e-app/e2e-app.ts
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, ViewEncapsulation} from '@angular/core';
 
 
 @Component({
@@ -11,6 +11,8 @@ export class Home {}
   moduleId: module.id,
   selector: 'e2e-app',
   templateUrl: 'e2e-app.html',
+  styleUrls: ['e2e-app.css'],
+  encapsulation: ViewEncapsulation.None,
 })
 export class E2EApp {
   showLinks: boolean = false;

From d815ebf61e978e5e85b4b82d9ef723f8f1c5db19 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 20 Oct 2017 19:08:30 -0500
Subject: [PATCH 343/575] chore(plunkr): fix plunkr demo not loading (#7832)

---
 .../{chips-input-example.scss => chips-input-example.css}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/material-examples/chips-input/{chips-input-example.scss => chips-input-example.css} (100%)

diff --git a/src/material-examples/chips-input/chips-input-example.scss b/src/material-examples/chips-input/chips-input-example.css
similarity index 100%
rename from src/material-examples/chips-input/chips-input-example.scss
rename to src/material-examples/chips-input/chips-input-example.css

From 206d9e0d91e17a67e43b5b58f9d7b1b71fa2541d Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 20 Oct 2017 17:09:11 -0700
Subject: [PATCH 344/575] docs(datepicker): update docs and add examples
 (#7837)

* make some tweaks to datepicker docs

* add examples

* fix e2e

* address comments
---
 src/demo-app/system-config.ts                 |   1 +
 src/demo-app/tsconfig-aot.json                |   2 +
 src/demo-app/tsconfig-build.json              |   2 +
 src/demo-app/tsconfig.json                    |   5 +-
 src/e2e-app/system-config.ts                  |   2 +
 src/e2e-app/tsconfig-build.json               |   1 +
 src/e2e-app/tsconfig.json                     |   1 +
 src/lib/datepicker/datepicker-errors.ts       |   3 +-
 src/lib/datepicker/datepicker.md              | 186 ++++++++++++------
 src/lib/datepicker/datepicker.ts              |   2 +-
 .../datepicker-api/datepicker-api-example.ts  |   7 +-
 .../datepicker-disabled-example.css           |   1 +
 .../datepicker-disabled-example.html          |  23 +++
 .../datepicker-disabled-example.ts            |   9 +
 .../datepicker-events-example.css             |   6 +
 .../datepicker-events-example.html            |  10 +
 .../datepicker-events-example.ts              |  16 ++
 .../datepicker-filter-example.ts              |   4 +-
 .../datepicker-formats-example.css            |   1 +
 .../datepicker-formats-example.html           |   5 +
 .../datepicker-formats-example.ts             |  44 +++++
 .../datepicker-locale-example.css             |   1 +
 .../datepicker-locale-example.html            |   7 +
 .../datepicker-locale-example.ts              |  28 +++
 .../datepicker-min-max-example.ts             |   4 +-
 .../datepicker-moment-example.css             |   1 +
 .../datepicker-moment-example.html            |   5 +
 .../datepicker-moment-example.ts              |  30 +++
 .../datepicker-overview-example.ts            |   4 +-
 .../datepicker-start-view-example.ts          |   4 +-
 .../datepicker-touch-example.ts               |   7 +-
 .../datepicker-value-example.css              |   1 +
 .../datepicker-value-example.html             |  18 ++
 .../datepicker-value-example.ts               |  13 ++
 src/material-examples/example-module.ts       |  62 +++++-
 src/material-examples/package.json            |   3 +-
 src/material-examples/tsconfig-build.json     |   3 +
 src/material-examples/tsconfig-es5.json       |   3 +
 src/material-examples/tsconfig.json           |   5 +-
 tools/gulp/tasks/e2e.ts                       |   8 +-
 tools/package-tools/rollup-globals.ts         |   1 +
 41 files changed, 443 insertions(+), 96 deletions(-)
 create mode 100644 src/material-examples/datepicker-disabled/datepicker-disabled-example.css
 create mode 100644 src/material-examples/datepicker-disabled/datepicker-disabled-example.html
 create mode 100644 src/material-examples/datepicker-disabled/datepicker-disabled-example.ts
 create mode 100644 src/material-examples/datepicker-events/datepicker-events-example.css
 create mode 100644 src/material-examples/datepicker-events/datepicker-events-example.html
 create mode 100644 src/material-examples/datepicker-events/datepicker-events-example.ts
 create mode 100644 src/material-examples/datepicker-formats/datepicker-formats-example.css
 create mode 100644 src/material-examples/datepicker-formats/datepicker-formats-example.html
 create mode 100644 src/material-examples/datepicker-formats/datepicker-formats-example.ts
 create mode 100644 src/material-examples/datepicker-locale/datepicker-locale-example.css
 create mode 100644 src/material-examples/datepicker-locale/datepicker-locale-example.html
 create mode 100644 src/material-examples/datepicker-locale/datepicker-locale-example.ts
 create mode 100644 src/material-examples/datepicker-moment/datepicker-moment-example.css
 create mode 100644 src/material-examples/datepicker-moment/datepicker-moment-example.html
 create mode 100644 src/material-examples/datepicker-moment/datepicker-moment-example.ts
 create mode 100644 src/material-examples/datepicker-value/datepicker-value-example.css
 create mode 100644 src/material-examples/datepicker-value/datepicker-value-example.html
 create mode 100644 src/material-examples/datepicker-value/datepicker-value-example.ts

diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index e67879e8575d..b42b8b36c17a 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -29,6 +29,7 @@ System.config({
 
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
     '@angular/material': 'dist/packages/material/public-api.js',
+    '@angular/material-moment-adapter': 'dist/packages/material-moment-adapter/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
diff --git a/src/demo-app/tsconfig-aot.json b/src/demo-app/tsconfig-aot.json
index fb9cc74893ed..bf6136c9d33a 100644
--- a/src/demo-app/tsconfig-aot.json
+++ b/src/demo-app/tsconfig-aot.json
@@ -4,6 +4,8 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,
     // TODO(paul): Remove once Angular has been upgraded and supports noUnusedParameters in AOT.
     "noUnusedParameters": false,
diff --git a/src/demo-app/tsconfig-build.json b/src/demo-app/tsconfig-build.json
index 8ad4d20b6c8e..a21a670730a6 100644
--- a/src/demo-app/tsconfig-build.json
+++ b/src/demo-app/tsconfig-build.json
@@ -2,6 +2,8 @@
 // since the demo-app will be served in the browser.
 {
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index f7f702c1c807..e1156619275c 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -2,12 +2,15 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "rootDir": "..",
     "baseUrl": ".",
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public-api.ts"]
+      "@angular/material": ["../lib/public-api.ts"],
+      "@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 291c4a71f0fd..2e79b7f50120 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -9,6 +9,7 @@ System.config({
   map: {
     'rxjs': 'node:rxjs',
     'main': 'main.js',
+    'moment': 'node:moment/min/moment-with-locales.min.js',
 
     // Angular specific mappings.
     '@angular/core': 'node:@angular/core/bundles/core.umd.js',
@@ -26,6 +27,7 @@ System.config({
       'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
 
     '@angular/material': 'dist/bundles/material.umd.js',
+    '@angular/material-moment-adapter': 'dist/bundles/material-moment-adapter.umd.js',
     '@angular/cdk': 'dist/bundles/cdk.umd.js',
     '@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
     '@angular/cdk/accordion': 'dist/bundles/cdk-accordion.umd.js',
diff --git a/src/e2e-app/tsconfig-build.json b/src/e2e-app/tsconfig-build.json
index b7d368a5e3ea..c6942221368c 100644
--- a/src/e2e-app/tsconfig-build.json
+++ b/src/e2e-app/tsconfig-build.json
@@ -27,6 +27,7 @@
       "@angular/cdk/*": ["./cdk/*"],
       "@angular/material": ["./material"],
       "@angular/material/*": ["./material/*"],
+      "@angular/material-moment-adapter": ["./material-moment-adapter"],
       "@angular/material-examples": ["./material-examples"]
     }
   },
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
index aef9e39b38e8..411e2992a444 100644
--- a/src/e2e-app/tsconfig.json
+++ b/src/e2e-app/tsconfig.json
@@ -8,6 +8,7 @@
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
       "@angular/material": ["../lib/public-api.ts"],
+      "@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"],
       "@angular/material-examples": ["../material-examples/public-api.ts"]
     }
   },
diff --git a/src/lib/datepicker/datepicker-errors.ts b/src/lib/datepicker/datepicker-errors.ts
index 1d0539290496..72850da997f1 100644
--- a/src/lib/datepicker/datepicker-errors.ts
+++ b/src/lib/datepicker/datepicker-errors.ts
@@ -10,5 +10,6 @@
 export function createMissingDateImplError(provider: string) {
   return Error(
       `MatDatepicker: No provider found for ${provider}. You must import one of the following ` +
-      `modules at your application root: MatNativeDateModule, or provide a custom implementation.`);
+      `modules at your application root: MatNativeDateModule, MatMomentDateModule, or provide a ` +
+      `custom implementation.`);
 }
diff --git a/src/lib/datepicker/datepicker.md b/src/lib/datepicker/datepicker.md
index 6a3ee7a32861..ae93f0197c8e 100644
--- a/src/lib/datepicker/datepicker.md
+++ b/src/lib/datepicker/datepicker.md
@@ -1,18 +1,10 @@
 The datepicker allows users to enter a date either through text input, or by choosing a date from
-the calendar. It is made up of several components and directives that work together:
+the calendar. It is made up of several components and directives that work together.
 
 <!-- example(datepicker-overview) -->
 
-### Current state
-Currently the datepicker is in the beginning stages and supports basic date selection functionality.
-There are many more features that will be added in future iterations, including:
- * Support for datetimes (e.g. May 2, 2017 at 12:30pm) and month + year only (e.g. May 2017)
- * Support for selecting and displaying date ranges
- * Support for custom time zones
- * Infinite scrolling through calendar months
- * Built in support for [Moment.js](https://momentjs.com/) dates
-
 ### Connecting a datepicker to an input
+
 A datepicker is composed of a text input and a calendar pop-up, connected via the `matDatepicker`
 property on the text input.
 
@@ -41,19 +33,44 @@ can easily be used as a prefix or suffix on the material input:
 ```
 
 ### Setting the calendar starting view
+
 By default the calendar will open in month view, this can be changed by setting the `startView`
-property of `mat-datepicker` to `"year"`. In year view the user will see all months of the year and
+property of `<mat-datepicker>` to `year`. In year view the user will see all months of the year and
 then proceed to month view after choosing a month.
 
 The month or year that the calendar opens to is determined by first checking if any date is
 currently selected, if so it will open to the month or year containing that date. Otherwise it will
 open to the month or year containing today's date. This behavior can be overridden by using the
-`startAt` property of `mat-datepicker`. In this case the calendar will open to the month or year
+`startAt` property of `<mat-datepicker>`. In this case the calendar will open to the month or year
 containing the `startAt` date.
 
 <!-- example(datepicker-start-view) -->
 
+### Setting the selected date
+
+The type of values that the datepicker expects depends on the type of `DateAdapter` provided in your
+application. The `NativeDateAdapter`, for example, works directly with plain JavaScript `Date`
+objects. When using the `MomentDateAdapter`, however, the values will all be Moment.js instances.
+This use of the adapter pattern allows the datepicker component to work with any arbitrary date
+representation with a custom `DateAdapter`.
+See [_Choosing a date implementation_](#choosing-a-date-implementation-and-date-format-settings)
+for more information.
+
+Depending on the `DateAdapter` being used, the datepicker may automatically deserialize certain date
+formats for you as well. For example, both the `NativeDateAdapter` and `MomentDateAdapter` allow
+[ISO 8601](https://tools.ietf.org/html/rfc3339) strings to be passed to the datepicker and
+automatically converted to the proper object type. This can be convenient when binding data directly
+from your backend to the datepicker. However, the datepicker will not accept date strings formatted
+in user format such as `"1/2/2017"` as this is ambiguous and will mean different things depending on
+the locale of the browser running the code.
+
+As with other types of `<input>`, the datepicker works with `@angular/forms` directives such as
+`formGroup`, `formControl`, `ngModel`, etc.
+
+<!-- example(datepicker-value) -->
+
 ### Date validation
+
 There are three properties that add date validation to the datepicker input. The first two are the
 `min` and `max` properties. In addition to enforcing validation on the input, these properties will
 disable all dates on the calendar popup before or after the respective values and prevent the user
@@ -64,8 +81,8 @@ from advancing the calendar past the `month` or `year` (depending on current vie
 
 The second way to add date validation is using the `matDatepickerFilter` property of the datepicker
 input. This property accepts a function of `<D> => boolean` (where `<D>` is the date type used by
-the datepicker, see section on
-[choosing a date implementation](#choosing-a-date-implementation-and-date-format-settings)).
+the datepicker, see
+[_Choosing a date implementation_](#choosing-a-date-implementation-and-date-format-settings)).
 A result of `true` indicates that the date is valid and a result of `false` indicates that it is
 not. Again this will also disable the dates on the calendar that are invalid. However, one important
 difference between using `matDatepickerFilter` vs using `min` or `max` is that filtering out all
@@ -84,38 +101,54 @@ Each validation property has a different error that can be checked:
  * A value that violates the `matDatepickerFilter` property will have a `matDatepickerFilter` error.
  
 ### Input and change events
-The input's native `input` and `change` events will only trigger due to user interaction with the
-input element; they will not fire when the user selects a date from the calendar popup. Because of
-this limitation, the datepicker input also has support for `dateInput` and `dateChange` events.
-These trigger when the user interacts with either the input or the popup.
-  
-```html
-<input [matDatepicker]="d" (dateInput)="onInput($event)" (dateChange)="onChange($event)">
-<mat-datepicker #d></mat-datepicker>
-```
+
+The input's native `(input)` and `(change)` events will only trigger due to user interaction with
+the input element; they will not fire when the user selects a date from the calendar popup.
+Therefore, the datepicker input also has support for `(dateInput)` and `(dateChange)` events. These
+trigger when the user interacts with either the input or the popup.
+
+The `(dateInput)` event will fire whenever the value changes due to the user typing or selecting a
+date from the calendar. The `(dateChange)` event will fire whenever the user finishes typing input
+(on `<input>` blur), or when the user chooses a date from the calendar.
+
+<!-- example(datepicker-events) -->
+
+### Disabling parts of the datepicker
+
+As with any standard `<input>`, it is possible to disable the datepicker input by adding the
+`disabled` property. By default, the `<mat-datepicker>` and `<mat-datepicker-toggle>` will inherit
+their disabled state from the `<input>`, but this can be overridden by setting the `disabled`
+property on the datepicker or toggle elements. This can be useful if you want to disable text input
+but allow selection via the calendar or vice-versa.
+
+<!-- example(datepicker-disabled) -->
 
 ### Touch UI mode
+
 The datepicker normally opens as a popup under the input. However this is not ideal for touch
 devices that don't have as much screen real estate and need bigger click targets. For this reason
-`mat-datepicker` has a `touchUi` property that can be set to `true` in order to enable a more touch
-friendly UI where the calendar opens in a large dialog.
+`<mat-datepicker>` has a `touchUi` property that can be set to `true` in order to enable a more
+touch friendly UI where the calendar opens in a large dialog.
 
 <!-- example(datepicker-touch) -->
 
 ### Manually opening and closing the calendar
+
 The calendar popup can be programmatically controlled using the `open` and `close` methods on the
-`mat-datepicker`. It also has an `opened` property that reflects the status of the popup.
+`<mat-datepicker>`. It also has an `opened` property that reflects the status of the popup.
 
 <!-- example(datepicker-api) -->
 
 ### Internationalization
-In order to support internationalization, the datepicker supports customization of the following
-three pieces via injection:
- 1. The date implementation that the datepicker accepts.
- 2. The display and parse formats used by the datepicker.
- 3. The message strings used in the datepicker's UI.
+
+Internationalization of the datepicker is configured via four aspects:
+ 1. The date locale.
+ 2. The date implementation that the datepicker accepts.
+ 3. The display and parse formats used by the datepicker.
+ 4. The message strings used in the datepicker's UI.
 
 #### Setting the locale code
+
 By default, the `MAT_DATE_LOCALE` injection token will use the existing `LOCALE_ID` locale code
 from `@angular/core`. If you want to override it, you can provide a new value for the
 `MAT_DATE_LOCALE` token:
@@ -131,28 +164,25 @@ export class MyApp {}
 
 It's also possible to set the locale at runtime using the `setLocale` method of the `DateAdapter`.
 
-```ts
-import { DateAdapter, NativeDateAdapter } from '@angular/material';
-
-@Component({
-  selector:    'foo',
-  template: ''
-})
-export class FooComponent {
-  constructor(dateAdapter: DateAdapter<NativeDateAdapter>) {
-    dateAdapter.setLocale('de-DE');
-  }
-}
-```
+<!-- example(datepicker-locale) -->
 
 #### Choosing a date implementation and date format settings
+
 The datepicker was built to be date implementation agnostic. This means that it can be made to work
 with a variety of different date implementations. However it also means that developers need to make
 sure to provide the appropriate pieces for the datepicker to work with their chosen implementation.
-The easiest way to ensure this is just to import one of the pre-made modules (currently
-`MatNativeDateModule` is the only implementation that ships with material, but there are plans to add
-a module for Moment.js support):
- * `MatNativeDateModule` - support for native JavaScript Date object
+The easiest way to ensure this is just to import one of the pre-made modules: 
+
+|Module               |Date type|Supported locales                                                      |Dependencies                      |Import from                       |
+|---------------------|---------|-----------------------------------------------------------------------|----------------------------------|----------------------------------|
+|`MatNativeDateModule`|`Date`   |en-US                                                                  |None                              |`@angular/material`               |
+|`MatMomentDateModule`|`Moment` |[See project](https://github.com/moment/moment/tree/develop/src/locale)|[Moment.js](https://momentjs.com/)|`@angular/material-moment-adapter`|
+
+*Please note: `MatNativeDateModule` is based off of the functionality available in JavaScript's
+native `Date` object, and is thus not suitable for many locales. One of the biggest shortcomings of
+the native `Date` object is the inability to set the parse format. We highly recommend using the
+`MomentDateAdapter` or a custom `DateAdapter` that works with the formatting/parsing library of your
+choice.*
 
 These modules include providers for `DateAdapter` and `MAT_DATE_FORMATS`
 
@@ -175,16 +205,14 @@ export class MyComponent {
 }
 ```
 
-*Please note: `MatNativeDateModule` is based off of the functionality available in JavaScript's
-native `Date` object, and is thus not suitable for many locales. One of the biggest shortcomings of
-the native `Date` object is the inability to set the parse format. We highly recommend using a
-custom `DateAdapter` that works with the formatting/parsing library of your choice.*
+<!-- example(datepicker-moment) -->
 
-#### Customizing the date implementation
-The datepicker does all of its interaction with date objects via the `DateAdapter`. Making the
-datepicker work with a different date implementation is as easy as extending `DateAdapter`, and
-using your subclass as the provider. You will also want to make sure that the `MAT_DATE_FORMATS`
-provided in your app are formats that can be understood by your date implementation.
+It is also possible to create your own `DateAdapter` that works with any date format your app
+requires. This is accomplished by subclassing `DateAdapter` and providing your subclass as the
+`DateAdapter` implementation. You will also want to make sure that the `MAT_DATE_FORMATS` provided
+in your app are formats that can be understood by your date implementation. See
+[_Customizing the parse and display formats_](#customizing-the-parse-and-display-formats)for more
+information about `MAT_DATE_FORMATS`. <!-- TODO(mmalerba): Add a guide about this -->
 
 ```ts
 @NgModule({
@@ -198,24 +226,30 @@ export class MyApp {}
 ```
 
 #### Customizing the parse and display formats
+
 The `MAT_DATE_FORMATS` object is just a collection of formats that the datepicker uses when parsing
 and displaying dates. These formats are passed through to the `DateAdapter` so you will want to make
 sure that the format objects you're using are compatible with the `DateAdapter` used in your app.
-This example shows how to use the native `Date` implementation from material, but with custom
-formats.
+
+If you want use one of the `DateAdapters` that ships with Angular Material, but use your own
+`MAT_DATE_FORMATS`, you can import the `NativeDateModule` or `MomentDateModule`. These modules are
+identical to the "Mat"-prefixed versions (`MatNativeDateModule` and `MatMomentDateModule`) except
+they do not include the default formats. For example:
 
 ```ts
 @NgModule({
-  imports: [MatDatepickerModule],
+  imports: [MatDatepickerModule, NativeDateModule],
   providers: [
-    {provide: DateAdapter, useClass: NativeDateAdapter},
     {provide: MAT_DATE_FORMATS, useValue: MY_NATIVE_DATE_FORMATS},
   ],
 })
 export class MyApp {}
 ```
 
+<!-- example(datepicker-formats) -->
+
 #### Localizing labels and messages
+
 The various text strings used by the datepicker are provided through `MatDatepickerIntl`.
 Localization of these messages can be done by providing a subclass with translated values in your
 application root module.
@@ -229,7 +263,9 @@ application root module.
 })
 export class MyApp {}
 ```
+
 ### Accessibility
+
 The `MatDatepickerInput` directive adds `aria-haspopup` attribute to the native input element, and it
 triggers a calendar dialog with `role="dialog"`.
 
@@ -238,6 +274,7 @@ should have a placeholder or be given a meaningful label via `aria-label`, `aria
 `MatDatepickerIntl`.
 
 #### Keyboard shortcuts
+
 The keyboard shortcuts to handle datepicker are:
 
 | Shortcut             | Action                              |
@@ -278,3 +315,30 @@ In year view:
 | `PAGE_DOWN`          | Go to next year                     |
 | `ALT` + `PAGE_DOWN`  | Go to next 10 years                 |
 | `ENTER`              | Select current month                |
+
+### Troubleshooting
+
+#### Error: MatDatepicker: No provider found for DateAdapter/MAT_DATE_FORMATS
+
+This error is thrown if you have not provided all of the injectables the datepicker needs to work.
+The easiest way to resolve this is to import the `MatNativeDateModule` or `MatMomentDateModule` in
+your application's root module. See 
+[_Choosing a date implementation_](#choosing-a-date-implementation-and-date-format-settings)) for
+more information.
+
+#### Error: A MatDatepicker can only be associated with a single input
+
+This error is thrown if more than one `<input>` tries to claim ownership over the same
+`<mat-datepicker>` (via the `matDatepicker` attribute on the input). A datepicker can only be
+associated with a single input.
+
+#### Error: Attempted to open an MatDatepicker with no associated input.
+
+This error occurs if your `<mat-datepicker>` is not associated with any `<input>`. To associate an
+input with your datepicker, create a template reference for the datepicker and assign it to the
+`matDatepicker` attribute on the input:
+
+```html
+<input [matDatepicker]="picker">
+<mat-datepicker #picker></mat-datepicker>
+```
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 4bb98d541480..5663e0526202 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -250,7 +250,7 @@ export class MatDatepicker<D> implements OnDestroy {
    */
   _registerInput(input: MatDatepickerInput<D>): void {
     if (this._datepickerInput) {
-      throw Error('An MatDatepicker can only be associated with a single input.');
+      throw Error('A MatDatepicker can only be associated with a single input.');
     }
     this._datepickerInput = input;
     this._inputSubscription =
diff --git a/src/material-examples/datepicker-api/datepicker-api-example.ts b/src/material-examples/datepicker-api/datepicker-api-example.ts
index cf4ce8ad6778..d023949efac7 100644
--- a/src/material-examples/datepicker-api/datepicker-api-example.ts
+++ b/src/material-examples/datepicker-api/datepicker-api-example.ts
@@ -1,12 +1,9 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Datepicker API
- */
+/** @title Datepicker open method */
 @Component({
   selector: 'datepicker-api-example',
   templateUrl: 'datepicker-api-example.html',
   styleUrls: ['datepicker-api-example.css'],
 })
-export class DatepickerApiExample {
-}
+export class DatepickerApiExample {}
diff --git a/src/material-examples/datepicker-disabled/datepicker-disabled-example.css b/src/material-examples/datepicker-disabled/datepicker-disabled-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/datepicker-disabled/datepicker-disabled-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/datepicker-disabled/datepicker-disabled-example.html b/src/material-examples/datepicker-disabled/datepicker-disabled-example.html
new file mode 100644
index 000000000000..ad3b0755167b
--- /dev/null
+++ b/src/material-examples/datepicker-disabled/datepicker-disabled-example.html
@@ -0,0 +1,23 @@
+<p>
+  <mat-form-field>
+    <input matInput [matDatepicker]="dp1" placeholder="Completely disabled" disabled>
+    <mat-datepicker-toggle matSuffix [for]="dp1"></mat-datepicker-toggle>
+    <mat-datepicker #dp1></mat-datepicker>
+  </mat-form-field>
+</p>
+
+<p>
+  <mat-form-field>
+    <input matInput [matDatepicker]="dp2" placeholder="Popup disabled">
+    <mat-datepicker-toggle matSuffix [for]="dp2" disabled></mat-datepicker-toggle>
+    <mat-datepicker #dp2></mat-datepicker>
+  </mat-form-field>
+</p>
+
+<p>
+  <mat-form-field>
+    <input matInput [matDatepicker]="dp3" placeholder="Input disabled" disabled>
+    <mat-datepicker-toggle matSuffix [for]="dp3"></mat-datepicker-toggle>
+    <mat-datepicker #dp3 disabled="false"></mat-datepicker>
+  </mat-form-field>
+</p>
diff --git a/src/material-examples/datepicker-disabled/datepicker-disabled-example.ts b/src/material-examples/datepicker-disabled/datepicker-disabled-example.ts
new file mode 100644
index 000000000000..3b89fafaf8ae
--- /dev/null
+++ b/src/material-examples/datepicker-disabled/datepicker-disabled-example.ts
@@ -0,0 +1,9 @@
+import {Component} from '@angular/core';
+
+/** @title Disabled datepicker */
+@Component({
+  selector: 'datepicker-disabled-example',
+  templateUrl: 'datepicker-disabled-example.html',
+  styleUrls: ['datepicker-disabled-example.css'],
+})
+export class DatepickerDisabledExample {}
diff --git a/src/material-examples/datepicker-events/datepicker-events-example.css b/src/material-examples/datepicker-events/datepicker-events-example.css
new file mode 100644
index 000000000000..a42e43962f66
--- /dev/null
+++ b/src/material-examples/datepicker-events/datepicker-events-example.css
@@ -0,0 +1,6 @@
+.example-events {
+  width: 400px;
+  height: 200px;
+  border: 1px solid #555;
+  overflow: auto;
+}
diff --git a/src/material-examples/datepicker-events/datepicker-events-example.html b/src/material-examples/datepicker-events/datepicker-events-example.html
new file mode 100644
index 000000000000..1935c718218c
--- /dev/null
+++ b/src/material-examples/datepicker-events/datepicker-events-example.html
@@ -0,0 +1,10 @@
+<mat-form-field>
+  <input matInput [matDatepicker]="picker" placeholder="Input & change events"
+         (dateInput)="addEvent('input', $event)" (dateChange)="addEvent('change', $event)">
+  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+  <mat-datepicker #picker></mat-datepicker>
+</mat-form-field>
+
+<div class="example-events">
+  <div *ngFor="let e of events">{{e}}</div>
+</div>
diff --git a/src/material-examples/datepicker-events/datepicker-events-example.ts b/src/material-examples/datepicker-events/datepicker-events-example.ts
new file mode 100644
index 000000000000..d61bbdb9237b
--- /dev/null
+++ b/src/material-examples/datepicker-events/datepicker-events-example.ts
@@ -0,0 +1,16 @@
+import {Component} from '@angular/core';
+import {MatDatepickerInputEvent} from '@angular/material/datepicker';
+
+/** @title Datepicker input and change events */
+@Component({
+  selector: 'datepicker-events-example',
+  templateUrl: 'datepicker-events-example.html',
+  styleUrls: ['datepicker-events-example.css'],
+})
+export class DatepickerEventsExample {
+  events: string[] = [];
+
+  addEvent(type: string, event: MatDatepickerInputEvent<Date>) {
+    this.events.push(`${type}: ${event.value}`);
+  }
+}
diff --git a/src/material-examples/datepicker-filter/datepicker-filter-example.ts b/src/material-examples/datepicker-filter/datepicker-filter-example.ts
index a2fe6d13f86b..01ccb8a029d7 100644
--- a/src/material-examples/datepicker-filter/datepicker-filter-example.ts
+++ b/src/material-examples/datepicker-filter/datepicker-filter-example.ts
@@ -1,8 +1,6 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Datepicker Filter
- */
+/** @title Datepicker with filter validation */
 @Component({
   selector: 'datepicker-filter-example',
   templateUrl: 'datepicker-filter-example.html',
diff --git a/src/material-examples/datepicker-formats/datepicker-formats-example.css b/src/material-examples/datepicker-formats/datepicker-formats-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/datepicker-formats/datepicker-formats-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/datepicker-formats/datepicker-formats-example.html b/src/material-examples/datepicker-formats/datepicker-formats-example.html
new file mode 100644
index 000000000000..4868f2dc21ed
--- /dev/null
+++ b/src/material-examples/datepicker-formats/datepicker-formats-example.html
@@ -0,0 +1,5 @@
+<mat-form-field>
+  <input matInput [matDatepicker]="dp" placeholder="Verbose datepicker" [formControl]="date">
+  <mat-datepicker-toggle matSuffix [for]="dp"></mat-datepicker-toggle>
+  <mat-datepicker #dp></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-formats/datepicker-formats-example.ts b/src/material-examples/datepicker-formats/datepicker-formats-example.ts
new file mode 100644
index 000000000000..03569fc0dfea
--- /dev/null
+++ b/src/material-examples/datepicker-formats/datepicker-formats-example.ts
@@ -0,0 +1,44 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+import {MomentDateAdapter} from '@angular/material-moment-adapter';
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
+
+// Depending on whether rollup is used, moment needs to be imported differently.
+// Since Moment.js doesn't have a default export, we normally need to import using the `* as`
+// syntax. However, rollup creates a synthetic default module and we thus need to import it using
+// the `default as` syntax.
+import * as _moment from 'moment';
+import {default as _rollupMoment} from 'moment';
+const moment = _rollupMoment || _moment;
+
+// See the Moment.js docs for the meaning of these formats:
+// https://momentjs.com/docs/#/displaying/format/
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'LL',
+  },
+  display: {
+    dateInput: 'LL',
+    monthYearLabel: 'MMM YYYY',
+    dateA11yLabel: 'LL',
+    monthYearA11yLabel: 'MMMM YYYY',
+  },
+};
+
+/** @title Datepicker with custom formats */
+@Component({
+  selector: 'datepicker-formats-example',
+  templateUrl: 'datepicker-formats-example.html',
+  styleUrls: ['datepicker-formats-example.css'],
+  providers: [
+    // `MomentDateAdapter` can be automatically provided by importing `MomentDateModule` in your
+    // application's root module. We provide it at the component level here, due to limitations of
+    // our example generation script.
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+
+    {provide: MAT_DATE_FORMATS, useValue: MY_FORMATS},
+  ],
+})
+export class DatepickerFormatsExample {
+  date = new FormControl(moment());
+}
diff --git a/src/material-examples/datepicker-locale/datepicker-locale-example.css b/src/material-examples/datepicker-locale/datepicker-locale-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/datepicker-locale/datepicker-locale-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/datepicker-locale/datepicker-locale-example.html b/src/material-examples/datepicker-locale/datepicker-locale-example.html
new file mode 100644
index 000000000000..f92432a48237
--- /dev/null
+++ b/src/material-examples/datepicker-locale/datepicker-locale-example.html
@@ -0,0 +1,7 @@
+<mat-form-field>
+  <input matInput [matDatepicker]="dp" placeholder="Different locale">
+  <mat-datepicker-toggle matSuffix [for]="dp"></mat-datepicker-toggle>
+  <mat-datepicker #dp></mat-datepicker>
+</mat-form-field>
+
+<button mat-button (click)="french()">Dynamically switch to French</button>
diff --git a/src/material-examples/datepicker-locale/datepicker-locale-example.ts b/src/material-examples/datepicker-locale/datepicker-locale-example.ts
new file mode 100644
index 000000000000..c99ee56aba53
--- /dev/null
+++ b/src/material-examples/datepicker-locale/datepicker-locale-example.ts
@@ -0,0 +1,28 @@
+import {Component} from '@angular/core';
+import {MAT_MOMENT_DATE_FORMATS, MomentDateAdapter} from '@angular/material-moment-adapter';
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
+
+/** @title Datepicker with different locale */
+@Component({
+  selector: 'datepicker-locale-example',
+  templateUrl: 'datepicker-locale-example.html',
+  styleUrls: ['datepicker-locale-example.css'],
+  providers: [
+    // The locale would typically be provided on the root module of your application. We do it at
+    // the component level here, due to limitations of our example generation script.
+    {provide: MAT_DATE_LOCALE, useValue: 'ja-JP'},
+
+    // `MomentDateAdapter` and `MAT_MOMENT_DATE_FORMATS` can be automatically provided by importing
+    // `MatMomentDateModule` in your applications root module. We provide it at the component level
+    // here, due to limitations of our example generation script.
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+    {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},
+  ],
+})
+export class DatepickerLocaleExample {
+  constructor(private adapter: DateAdapter<any>) {}
+
+  french() {
+    this.adapter.setLocale('fr');
+  }
+}
diff --git a/src/material-examples/datepicker-min-max/datepicker-min-max-example.ts b/src/material-examples/datepicker-min-max/datepicker-min-max-example.ts
index fea707bb1fcb..e90e68b212cd 100644
--- a/src/material-examples/datepicker-min-max/datepicker-min-max-example.ts
+++ b/src/material-examples/datepicker-min-max/datepicker-min-max-example.ts
@@ -1,8 +1,6 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Datepicker Min Max
- */
+/** @title Datepicker with min & max validation */
 @Component({
   selector: 'datepicker-min-max-example',
   templateUrl: 'datepicker-min-max-example.html',
diff --git a/src/material-examples/datepicker-moment/datepicker-moment-example.css b/src/material-examples/datepicker-moment/datepicker-moment-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/datepicker-moment/datepicker-moment-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/datepicker-moment/datepicker-moment-example.html b/src/material-examples/datepicker-moment/datepicker-moment-example.html
new file mode 100644
index 000000000000..a6ae46cc7d2d
--- /dev/null
+++ b/src/material-examples/datepicker-moment/datepicker-moment-example.html
@@ -0,0 +1,5 @@
+<mat-form-field>
+  <input matInput [matDatepicker]="dp" placeholder="Moment.js datepicker" [formControl]="date">
+  <mat-datepicker-toggle matSuffix [for]="dp"></mat-datepicker-toggle>
+  <mat-datepicker #dp></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-moment/datepicker-moment-example.ts b/src/material-examples/datepicker-moment/datepicker-moment-example.ts
new file mode 100644
index 000000000000..7aa9d1b3dc35
--- /dev/null
+++ b/src/material-examples/datepicker-moment/datepicker-moment-example.ts
@@ -0,0 +1,30 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+import {MAT_MOMENT_DATE_FORMATS, MomentDateAdapter} from '@angular/material-moment-adapter';
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
+
+// Depending on whether rollup is used, moment needs to be imported differently.
+// Since Moment.js doesn't have a default export, we normally need to import using the `* as`
+// syntax. However, rollup creates a synthetic default module and we thus need to import it using
+// the `default as` syntax.
+import * as _moment from 'moment';
+import {default as _rollupMoment} from 'moment';
+const moment = _rollupMoment || _moment;
+
+/** @title Datepicker that uses Moment.js dates */
+@Component({
+  selector: 'datepicker-moment-example',
+  templateUrl: 'datepicker-moment-example.html',
+  styleUrls: ['datepicker-moment-example.css'],
+  providers: [
+    // `MomentDateAdapter` and `MAT_MOMENT_DATE_FORMATS` can be automatically provided by importing
+    // `MatMomentDateModule` in your applications root module. We provide it at the component level
+    // here, due to limitations of our example generation script.
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+    {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},
+  ],
+})
+export class DatepickerMomentExample {
+  // Datepicker takes `Moment` objects instead of `Date` objects.
+  date = new FormControl(moment([2017, 0, 1]));
+}
diff --git a/src/material-examples/datepicker-overview/datepicker-overview-example.ts b/src/material-examples/datepicker-overview/datepicker-overview-example.ts
index b9dde7ca1d3b..afc1b398425a 100644
--- a/src/material-examples/datepicker-overview/datepicker-overview-example.ts
+++ b/src/material-examples/datepicker-overview/datepicker-overview-example.ts
@@ -1,8 +1,6 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Basic datepicker
- */
+/** @title Basic datepicker */
 @Component({
   selector: 'datepicker-overview-example',
   templateUrl: 'datepicker-overview-example.html',
diff --git a/src/material-examples/datepicker-start-view/datepicker-start-view-example.ts b/src/material-examples/datepicker-start-view/datepicker-start-view-example.ts
index cb76dba2a7a2..3477eee61afa 100644
--- a/src/material-examples/datepicker-start-view/datepicker-start-view-example.ts
+++ b/src/material-examples/datepicker-start-view/datepicker-start-view-example.ts
@@ -1,8 +1,6 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Datepicker start date
- */
+/** @title Datepicker start date */
 @Component({
   selector: 'datepicker-start-view-example',
   templateUrl: 'datepicker-start-view-example.html',
diff --git a/src/material-examples/datepicker-touch/datepicker-touch-example.ts b/src/material-examples/datepicker-touch/datepicker-touch-example.ts
index df5daa92f54e..68298a63d0ce 100644
--- a/src/material-examples/datepicker-touch/datepicker-touch-example.ts
+++ b/src/material-examples/datepicker-touch/datepicker-touch-example.ts
@@ -1,12 +1,9 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Datepicker Touch
- */
+/** @title Datepicker touch UI */
 @Component({
   selector: 'datepicker-touch-example',
   templateUrl: 'datepicker-touch-example.html',
   styleUrls: ['datepicker-touch-example.css'],
 })
-export class DatepickerTouchExample {
-}
+export class DatepickerTouchExample {}
diff --git a/src/material-examples/datepicker-value/datepicker-value-example.css b/src/material-examples/datepicker-value/datepicker-value-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/datepicker-value/datepicker-value-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/datepicker-value/datepicker-value-example.html b/src/material-examples/datepicker-value/datepicker-value-example.html
new file mode 100644
index 000000000000..fbd5f591d1f1
--- /dev/null
+++ b/src/material-examples/datepicker-value/datepicker-value-example.html
@@ -0,0 +1,18 @@
+<mat-form-field>
+  <input matInput [matDatepicker]="picker1" placeholder="Angular forms" [formControl]="date">
+  <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
+  <mat-datepicker #picker1></mat-datepicker>
+</mat-form-field>
+
+<mat-form-field>
+  <input matInput [matDatepicker]="picker2" placeholder="Angular forms (w/ deserialization)"
+         [formControl]="serializedDate">
+  <mat-datepicker-toggle matSuffix [for]="picker2"></mat-datepicker-toggle>
+  <mat-datepicker #picker2></mat-datepicker>
+</mat-form-field>
+
+<mat-form-field>
+  <input matInput [matDatepicker]="picker3" placeholder="Value binding" [value]="date.value">
+  <mat-datepicker-toggle matSuffix [for]="picker3"></mat-datepicker-toggle>
+  <mat-datepicker #picker3></mat-datepicker>
+</mat-form-field>
diff --git a/src/material-examples/datepicker-value/datepicker-value-example.ts b/src/material-examples/datepicker-value/datepicker-value-example.ts
new file mode 100644
index 000000000000..5142d3012bb1
--- /dev/null
+++ b/src/material-examples/datepicker-value/datepicker-value-example.ts
@@ -0,0 +1,13 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/** @title Datepicker selected value */
+@Component({
+  selector: 'datepicker-value-example',
+  templateUrl: 'datepicker-value-example.html',
+  styleUrls: ['datepicker-value-example.css'],
+})
+export class DatepickerValueExample {
+  date = new FormControl(new Date());
+  serializedDate = new FormControl((new Date()).toISOString());
+}
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 7d78eb28d828..b23d451531a5 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -30,11 +30,17 @@ import {ChipsInputExample} from './chips-input/chips-input-example';
 import {ChipsOverviewExample} from './chips-overview/chips-overview-example';
 import {ChipsStackedExample} from './chips-stacked/chips-stacked-example';
 import {DatepickerApiExample} from './datepicker-api/datepicker-api-example';
+import {DatepickerDisabledExample} from './datepicker-disabled/datepicker-disabled-example';
+import {DatepickerEventsExample} from './datepicker-events/datepicker-events-example';
 import {DatepickerFilterExample} from './datepicker-filter/datepicker-filter-example';
+import {DatepickerFormatsExample} from './datepicker-formats/datepicker-formats-example';
+import {DatepickerLocaleExample} from './datepicker-locale/datepicker-locale-example';
 import {DatepickerMinMaxExample} from './datepicker-min-max/datepicker-min-max-example';
+import {DatepickerMomentExample} from './datepicker-moment/datepicker-moment-example';
 import {DatepickerOverviewExample} from './datepicker-overview/datepicker-overview-example';
 import {DatepickerStartViewExample} from './datepicker-start-view/datepicker-start-view-example';
 import {DatepickerTouchExample} from './datepicker-touch/datepicker-touch-example';
+import {DatepickerValueExample} from './datepicker-value/datepicker-value-example';
 import {DialogContentExampleDialog,DialogContentExample} from './dialog-content/dialog-content-example';
 import {DialogDataExampleDialog,DialogDataExample} from './dialog-data/dialog-data-example';
 import {DialogElementsExampleDialog,DialogElementsExample} from './dialog-elements/dialog-elements-example';
@@ -208,41 +214,77 @@ export const EXAMPLE_COMPONENTS = {
     selectorName: null
   },
   'datepicker-api': {
-    title: 'Datepicker API',
+    title: 'Datepicker open method ',
     component: DatepickerApiExample,
     additionalFiles: null,
     selectorName: null
   },
+  'datepicker-disabled': {
+    title: 'Disabled datepicker ',
+    component: DatepickerDisabledExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'datepicker-events': {
+    title: 'Datepicker input and change events ',
+    component: DatepickerEventsExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'datepicker-filter': {
-    title: 'Datepicker Filter',
+    title: 'Datepicker with filter validation ',
     component: DatepickerFilterExample,
     additionalFiles: null,
     selectorName: null
   },
+  'datepicker-formats': {
+    title: 'Datepicker with custom formats ',
+    component: DatepickerFormatsExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'datepicker-locale': {
+    title: 'Datepicker with different locale ',
+    component: DatepickerLocaleExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'datepicker-min-max': {
-    title: 'Datepicker Min Max',
+    title: 'Datepicker with min & max validation ',
     component: DatepickerMinMaxExample,
     additionalFiles: null,
     selectorName: null
   },
+  'datepicker-moment': {
+    title: 'Datepicker that uses Moment.js dates ',
+    component: DatepickerMomentExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'datepicker-overview': {
-    title: 'Basic datepicker',
+    title: 'Basic datepicker ',
     component: DatepickerOverviewExample,
     additionalFiles: null,
     selectorName: null
   },
   'datepicker-start-view': {
-    title: 'Datepicker start date',
+    title: 'Datepicker start date ',
     component: DatepickerStartViewExample,
     additionalFiles: null,
     selectorName: null
   },
   'datepicker-touch': {
-    title: 'Datepicker Touch',
+    title: 'Datepicker touch UI ',
     component: DatepickerTouchExample,
     additionalFiles: null,
     selectorName: null
   },
+  'datepicker-value': {
+    title: 'Datepicker selected value ',
+    component: DatepickerValueExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'dialog-content': {
     title: 'Dialog with header, scrollable content and actions',
     component: DialogContentExample,
@@ -514,7 +556,7 @@ export const EXAMPLE_COMPONENTS = {
     selectorName: null
   },
   'select-no-ripple': {
-    title: 'Select with cno option ripple ',
+    title: 'Select with no option ripple ',
     component: SelectNoRippleExample,
     additionalFiles: null,
     selectorName: null
@@ -707,11 +749,17 @@ export const EXAMPLE_LIST = [
   ChipsOverviewExample,
   ChipsStackedExample,
   DatepickerApiExample,
+  DatepickerDisabledExample,
+  DatepickerEventsExample,
   DatepickerFilterExample,
+  DatepickerFormatsExample,
+  DatepickerLocaleExample,
   DatepickerMinMaxExample,
+  DatepickerMomentExample,
   DatepickerOverviewExample,
   DatepickerStartViewExample,
   DatepickerTouchExample,
+  DatepickerValueExample,
   DialogContentExampleDialog,DialogContentExample,
   DialogDataExampleDialog,DialogDataExample,
   DialogElementsExampleDialog,DialogElementsExample,
diff --git a/src/material-examples/package.json b/src/material-examples/package.json
index 466b289923e1..e27be11e754c 100644
--- a/src/material-examples/package.json
+++ b/src/material-examples/package.json
@@ -27,7 +27,8 @@
     "@angular/core": "0.0.0-NG",
     "@angular/common": "0.0.0-NG",
     "@angular/http": "0.0.0-NG",
-    "@angular/material": "0.0.0-PLACEHOLDER"
+    "@angular/material": "0.0.0-PLACEHOLDER",
+    "@angular/material-moment-adapter": "0.0.0-PLACEHOLDER"
   },
   "dependencies": {
     "tslib": "^1.7.1"
diff --git a/src/material-examples/tsconfig-build.json b/src/material-examples/tsconfig-build.json
index a800246ead3e..d96880b2124f 100644
--- a/src/material-examples/tsconfig-build.json
+++ b/src/material-examples/tsconfig-build.json
@@ -2,6 +2,8 @@
 // ES2015 since the build process will create FESM bundles using rollup.
 {
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "declaration": true,
     "stripInternal": false,
     "experimentalDecorators": true,
@@ -22,6 +24,7 @@
     "paths": {
       "@angular/material/*": ["../../dist/packages/material/*/public-api"],
       "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter/public-api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
diff --git a/src/material-examples/tsconfig-es5.json b/src/material-examples/tsconfig-es5.json
index 0f6a544d8044..3c4a52e343b1 100644
--- a/src/material-examples/tsconfig-es5.json
+++ b/src/material-examples/tsconfig-es5.json
@@ -2,6 +2,8 @@
 // ES2015 since the build process will create FESM bundles using rollup.
 {
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "declaration": false,
     "stripInternal": false,
     "experimentalDecorators": true,
@@ -22,6 +24,7 @@
     "paths": {
       "@angular/material/*": ["../../dist/packages/material/*/public-api"],
       "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter/public-api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
diff --git a/src/material-examples/tsconfig.json b/src/material-examples/tsconfig.json
index f7f702c1c807..e1156619275c 100644
--- a/src/material-examples/tsconfig.json
+++ b/src/material-examples/tsconfig.json
@@ -2,12 +2,15 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
     "rootDir": "..",
     "baseUrl": ".",
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public-api.ts"]
+      "@angular/material": ["../lib/public-api.ts"],
+      "@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/tools/gulp/tasks/e2e.ts b/tools/gulp/tasks/e2e.ts
index fd77e3f5159a..2b033b4ffa36 100644
--- a/tools/gulp/tasks/e2e.ts
+++ b/tools/gulp/tasks/e2e.ts
@@ -34,7 +34,12 @@ task('e2e', sequenceTask(
 /** Task that builds the e2e-app in AOT mode. */
 task('e2e-app:build', sequenceTask(
   'clean',
-  ['material:build-release', 'cdk:build-release', 'material-examples:build-release'],
+  [
+    'material:build-release',
+    'cdk:build-release',
+    'material-moment-adapter:build-release',
+    'material-examples:build-release'
+  ],
   ['e2e-app:copy-release', 'e2e-app:copy-assets'],
   'e2e-app:build-ts'
 ));
@@ -77,5 +82,6 @@ task('e2e-app:copy-release', () => {
   copySync(join(releasesDir, 'material'), join(outDir, 'material'));
   copySync(join(releasesDir, 'cdk'), join(outDir, 'cdk'));
   copySync(join(releasesDir, 'material-examples'), join(outDir, 'material-examples'));
+  copySync(join(releasesDir, 'material-moment-adapter'), join(outDir, 'material-moment-adapter'));
 });
 
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 93db1bddf4e9..4409759e6ce2 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -45,6 +45,7 @@ export const rollupGlobals = {
   // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
   '@angular/material-examples': 'ng.materialExamples',
   '@angular/material': 'ng.material',
+  '@angular/material-moment-adapter': 'ng.materialMomentAdapter',
   '@angular/cdk': 'ng.cdk',
 
   // Include secondary entry-points of the cdk and material packages

From 74bc62320e4076ab5aff2ae978f69cc8ea304ca5 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 20 Oct 2017 19:09:47 -0500
Subject: [PATCH 345/575] docs(demos): add more progress bar examples (#7859)

---
 src/lib/progress-bar/progress-bar.md          | 41 ++++++++++++-------
 src/material-examples/example-module.ts       | 34 ++++++++++++---
 .../progress-bar-buffer-example.css}          |  0
 .../progress-bar-buffer-example.html          |  1 +
 .../progress-bar-buffer-example.ts            | 10 +++++
 .../progress-bar-determinate-example.css      |  1 +
 .../progress-bar-determinate-example.html     |  1 +
 .../progress-bar-determinate-example.ts       | 10 +++++
 .../progress-bar-indeterminate-example.css    |  1 +
 .../progress-bar-indeterminate-example.html}  |  0
 .../progress-bar-indeterminate-example.ts     | 10 +++++
 .../progress-bar-overview-example.ts          | 10 -----
 .../progress-bar-query-example.css            |  1 +
 .../progress-bar-query-example.html           |  1 +
 .../progress-bar-query-example.ts             | 10 +++++
 15 files changed, 102 insertions(+), 29 deletions(-)
 rename src/material-examples/{progress-bar-overview/progress-bar-overview-example.css => progress-bar-buffer/progress-bar-buffer-example.css} (100%)
 create mode 100644 src/material-examples/progress-bar-buffer/progress-bar-buffer-example.html
 create mode 100644 src/material-examples/progress-bar-buffer/progress-bar-buffer-example.ts
 create mode 100644 src/material-examples/progress-bar-determinate/progress-bar-determinate-example.css
 create mode 100644 src/material-examples/progress-bar-determinate/progress-bar-determinate-example.html
 create mode 100644 src/material-examples/progress-bar-determinate/progress-bar-determinate-example.ts
 create mode 100644 src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.css
 rename src/material-examples/{progress-bar-overview/progress-bar-overview-example.html => progress-bar-indeterminate/progress-bar-indeterminate-example.html} (100%)
 create mode 100644 src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.ts
 delete mode 100644 src/material-examples/progress-bar-overview/progress-bar-overview-example.ts
 create mode 100644 src/material-examples/progress-bar-query/progress-bar-query-example.css
 create mode 100644 src/material-examples/progress-bar-query/progress-bar-query-example.html
 create mode 100644 src/material-examples/progress-bar-query/progress-bar-query-example.ts

diff --git a/src/lib/progress-bar/progress-bar.md b/src/lib/progress-bar/progress-bar.md
index 98c3d301913f..6ea821aec18d 100644
--- a/src/lib/progress-bar/progress-bar.md
+++ b/src/lib/progress-bar/progress-bar.md
@@ -1,29 +1,42 @@
 `<mat-progress-bar>` is a horizontal progress-bar for indicating progress and activity.
 
-<!-- example(progress-bar-overview) -->
+### Progress mode
+The progress-bar supports four modes: determinate, indeterminate, buffer and query.
 
+#### Determinate
+Operations where the percentage of the operation complete is known should use the 
+determinate indicator.
 
-### Progress mode
-The progress-bar supports four modes.
+<!-- example(progress-bar-determinate) -->
+
+This is the default mode and the progress is represented by the `value` property.
+
+#### Indeterminate
+Operations where the user is asked to wait while something finishes and it’s 
+not necessary to indicate how long it will take should use the indeterminate indicator.
 
-| Mode          | Description                                                                      |
-|---------------|----------------------------------------------------------------------------------|
-| determinate   | Standard progress bar, fills from 0% to 100%                                     |
-| indeterminate | Indicates that something is happening without conveying a discrete progress      |
-| buffer        | Dual-progress mode, typically showing both video download and playback progress  |
-| query         | Dual-stage mode, typically showing sending a request and downloading a response  |
+<!-- example(progress-bar-indeterminate) -->
 
-The default mode is "determinate". In this mode, the progress is set via the `value` property, 
-which can be a whole number between 0 and 100.
+In this mode the `value` property is ignored.
+
+#### Buffer
+Operations where the user wants to indicate some activity or loading from the server, 
+use the buffer indicator.
+
+<!-- example(progress-bar-buffer) -->
 
 In "buffer" mode, `value` determines the progress of the primary bar while the `bufferValue` is 
 used to show the additional buffering progress.
 
-In "query" mode, the progress-bar renders as an inverted "indeterminate" bar. Once the response 
-progress is available, the `mode` should be changed to determinate to convey the progress.  
+#### Query
+For situations where the user wants to indicate pre-loading (until the loading can actually be made), 
+use the query indicator.
 
-In both "indeterminate" and "query" modes, the `value` property is ignored.
+<!-- example(progress-bar-query) -->
 
+In "query" mode, the progress-bar renders as an inverted "indeterminate" bar. Once the response 
+progress is available, the `mode` should be changed to determinate to convey the progress. In
+this mode the `value` property is ignored.
 
 ### Theming
 The color of a progress-bar can be changed by using the `color` property. By default, progress-bars
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index b23d451531a5..ed950aa52cfc 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -74,8 +74,11 @@ import {MenuOverviewExample} from './menu-overview/menu-overview-example';
 import {NestedMenuExample} from './nested-menu/nested-menu-example';
 import {PaginatorConfigurableExample} from './paginator-configurable/paginator-configurable-example';
 import {PaginatorOverviewExample} from './paginator-overview/paginator-overview-example';
+import {ProgressBarBufferExample} from './progress-bar-buffer/progress-bar-buffer-example';
 import {ProgressBarConfigurableExample} from './progress-bar-configurable/progress-bar-configurable-example';
-import {ProgressBarOverviewExample} from './progress-bar-overview/progress-bar-overview-example';
+import {ProgressBarDeterminateExample} from './progress-bar-determinate/progress-bar-determinate-example';
+import {ProgressBarIndeterminateExample} from './progress-bar-indeterminate/progress-bar-indeterminate-example';
+import {ProgressBarQueryExample} from './progress-bar-query/progress-bar-query-example';
 import {ProgressSpinnerConfigurableExample} from './progress-spinner-configurable/progress-spinner-configurable-example';
 import {ProgressSpinnerOverviewExample} from './progress-spinner-overview/progress-spinner-overview-example';
 import {RadioNgModelExample} from './radio-ng-model/radio-ng-model-example';
@@ -483,15 +486,33 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'progress-bar-buffer': {
+    title: 'Buffer progress-bar',
+    component: ProgressBarBufferExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'progress-bar-configurable': {
     title: 'Configurable progress-bar',
     component: ProgressBarConfigurableExample,
     additionalFiles: null,
     selectorName: null
   },
-  'progress-bar-overview': {
-    title: 'Basic progress-bar',
-    component: ProgressBarOverviewExample,
+  'progress-bar-determinate': {
+    title: 'Determinate progress-bar',
+    component: ProgressBarDeterminateExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'progress-bar-indeterminate': {
+    title: 'Indeterminate progress-bar',
+    component: ProgressBarIndeterminateExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'progress-bar-query': {
+    title: 'Query progress-bar',
+    component: ProgressBarQueryExample,
     additionalFiles: null,
     selectorName: null
   },
@@ -793,8 +814,11 @@ export const EXAMPLE_LIST = [
   NestedMenuExample,
   PaginatorConfigurableExample,
   PaginatorOverviewExample,
+  ProgressBarBufferExample,
   ProgressBarConfigurableExample,
-  ProgressBarOverviewExample,
+  ProgressBarDeterminateExample,
+  ProgressBarIndeterminateExample,
+  ProgressBarQueryExample,
   ProgressSpinnerConfigurableExample,
   ProgressSpinnerOverviewExample,
   RadioNgModelExample,
diff --git a/src/material-examples/progress-bar-overview/progress-bar-overview-example.css b/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.css
similarity index 100%
rename from src/material-examples/progress-bar-overview/progress-bar-overview-example.css
rename to src/material-examples/progress-bar-buffer/progress-bar-buffer-example.css
diff --git a/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.html b/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.html
new file mode 100644
index 000000000000..32c7d95e25e1
--- /dev/null
+++ b/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.html
@@ -0,0 +1 @@
+<mat-progress-bar mode="buffer"></mat-progress-bar>
diff --git a/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.ts b/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.ts
new file mode 100644
index 000000000000..9a9dce0ef3c2
--- /dev/null
+++ b/src/material-examples/progress-bar-buffer/progress-bar-buffer-example.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title Buffer progress-bar
+ */
+@Component({
+  selector: 'progress-bar-buffer-example',
+  templateUrl: 'progress-bar-buffer-example.html',
+})
+export class ProgressBarBufferExample {}
diff --git a/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.css b/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.html b/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.html
new file mode 100644
index 000000000000..905e8524e00d
--- /dev/null
+++ b/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.html
@@ -0,0 +1 @@
+<mat-progress-bar mode="determinate" value="40"></mat-progress-bar>
diff --git a/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.ts b/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.ts
new file mode 100644
index 000000000000..bb26495a38c3
--- /dev/null
+++ b/src/material-examples/progress-bar-determinate/progress-bar-determinate-example.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title Determinate progress-bar
+ */
+@Component({
+  selector: 'progress-bar-determinate-example',
+  templateUrl: 'progress-bar-determinate-example.html',
+})
+export class ProgressBarDeterminateExample {}
diff --git a/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.css b/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/progress-bar-overview/progress-bar-overview-example.html b/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.html
similarity index 100%
rename from src/material-examples/progress-bar-overview/progress-bar-overview-example.html
rename to src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.html
diff --git a/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.ts b/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.ts
new file mode 100644
index 000000000000..e9fc28bc4e43
--- /dev/null
+++ b/src/material-examples/progress-bar-indeterminate/progress-bar-indeterminate-example.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title Indeterminate progress-bar
+ */
+@Component({
+  selector: 'progress-bar-indeterminate-example',
+  templateUrl: 'progress-bar-indeterminate-example.html',
+})
+export class ProgressBarIndeterminateExample {}
diff --git a/src/material-examples/progress-bar-overview/progress-bar-overview-example.ts b/src/material-examples/progress-bar-overview/progress-bar-overview-example.ts
deleted file mode 100644
index 67a6c94df90d..000000000000
--- a/src/material-examples/progress-bar-overview/progress-bar-overview-example.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {Component} from '@angular/core';
-
-/**
- * @title Basic progress-bar
- */
-@Component({
-  selector: 'progress-bar-overview-example',
-  templateUrl: 'progress-bar-overview-example.html',
-})
-export class ProgressBarOverviewExample {}
diff --git a/src/material-examples/progress-bar-query/progress-bar-query-example.css b/src/material-examples/progress-bar-query/progress-bar-query-example.css
new file mode 100644
index 000000000000..7432308753e6
--- /dev/null
+++ b/src/material-examples/progress-bar-query/progress-bar-query-example.css
@@ -0,0 +1 @@
+/** No CSS for this example */
diff --git a/src/material-examples/progress-bar-query/progress-bar-query-example.html b/src/material-examples/progress-bar-query/progress-bar-query-example.html
new file mode 100644
index 000000000000..71ef7d54a7d1
--- /dev/null
+++ b/src/material-examples/progress-bar-query/progress-bar-query-example.html
@@ -0,0 +1 @@
+<mat-progress-bar mode="query"></mat-progress-bar>
diff --git a/src/material-examples/progress-bar-query/progress-bar-query-example.ts b/src/material-examples/progress-bar-query/progress-bar-query-example.ts
new file mode 100644
index 000000000000..c65d08c9d77b
--- /dev/null
+++ b/src/material-examples/progress-bar-query/progress-bar-query-example.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title Query progress-bar
+ */
+@Component({
+  selector: 'progress-bar-query-example',
+  templateUrl: 'progress-bar-query-example.html',
+})
+export class ProgressBarQueryExample {}

From 5390abef59e74bd3bf7d94dac01b34c4f5c62ac2 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 20 Oct 2017 17:10:14 -0700
Subject: [PATCH 346/575] docs(readme): update high-level work for Q4 2017
 (#7879)

---
 README.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index a392708130d2..636aed8330b2 100644
--- a/README.md
+++ b/README.md
@@ -30,17 +30,16 @@ and which pieces are blocked) and make a comment.
 Also see our [`Good for community contribution`](https://github.com/angular/material2/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+for+community+contribution%22)
 label.
 
-High level stuff planned for Q3 2017 (July - September):
-* As many bug fixes as humanly possible
-* Additional features for data-table
-* Continued accessibility improvements
-* Nested menus
-* All components are OnPush
-* Improved documentation, guides, examples, and navigation on [material.angular.io][aio]
-* Improve library-wide API consistency
-* Stepper component
-* Sticky header helper
-* action-list and selection-list
+High level stuff planned for Q4 2017 (October - December):
+* RC and stable release
+* Research and prototyping for virtual-scroll
+* Research and exploration for data visualization
+* cdkTree and matTree
+* Expanded cdkTable features
+* cdk/svg
+* cdk/dialog
+* Switch build to bazel
+* Overlay positioning improvements
 
 
 #### Available features

From 76a6e7beab28a30d6c215600e1122808049ed83c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Sat, 21 Oct 2017 02:10:33 +0200
Subject: [PATCH 347/575] chore: re-enable prerender checks for all components
 (#7930)

Re-enables the prerender checks for the checkbox and button toggle modules since the issue that was breaking them initially has been resolved.
---
 src/universal-app/kitchen-sink/kitchen-sink.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index d74d43915bab..63f16c1ada0e 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -5,7 +5,9 @@ import {Observable} from 'rxjs/Observable';
 import {
   MatAutocompleteModule,
   MatButtonModule,
+  MatButtonToggleModule,
   MatCardModule,
+  MatCheckboxModule,
   MatChipsModule,
   MatDatepickerModule,
   MatDialogModule,
@@ -68,10 +70,9 @@ export class KitchenSink {
     BrowserModule.withServerTransition({appId: 'kitchen-sink'}),
     MatAutocompleteModule,
     MatButtonModule,
-    // Button toggle and checkbox can't work due to https://github.com/angular/angular/issues/17050
-    // MatButtonToggleModule,
+    MatButtonToggleModule,
     MatCardModule,
-    // MatCheckboxModule,
+    MatCheckboxModule,
     MatChipsModule,
     MatDatepickerModule,
     MatDialogModule,

From 2105326c468db630cfc90798f900e54203411455 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 23 Oct 2017 22:18:18 +0200
Subject: [PATCH 348/575] build: individual umd files include other
 entry-points. (#7976)

Currently every UMD file for a secondary-entry point inlines other secondary-entry points. This means that the individual secondary entry points can't be used properly in SystemJS apps.

Other secondary entry-points that are part of the current build package **should** be only inlined for the primary entry-point UMD bundle.

Fixes #7947
---
 tools/package-tools/build-bundles.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index ae06de1ddc19..a68eba62e713 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -138,10 +138,12 @@ export class PackageBundler {
       let external = Object.keys(rollupGlobals);
       external.splice(external.indexOf('tslib'), 1);
 
-      // If each secondary entry-point is re-exported at the root, we want to exlclude those
-      // secondary entry-points from the rollup globals because we want the UMD for this package
-      // to include *all* of the sources for those entry-points.
-      if (this.buildPackage.exportsSecondaryEntryPointsAtRoot) {
+      // If each secondary entry-point is re-exported at the root, we want to exclude those
+      // secondary entry-points from the rollup globals because we want the UMD for the
+      // primary entry-point to include *all* of the sources for those entry-points.
+      if (this.buildPackage.exportsSecondaryEntryPointsAtRoot &&
+          config.moduleName === `ng.${this.buildPackage.name}`) {
+
         const importRegex = new RegExp(`@angular/${this.buildPackage.name}/.+`);
         external = external.filter(e => !importRegex.test(e));
 

From edf91c99e8c3b94040bba079e8f2e5e9d2d7a6f6 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 23 Oct 2017 22:19:03 +0200
Subject: [PATCH 349/575] build: bump to tslint 5.8.0 and fix failures (#7943)

Updates to `tslint@5.8.0` and fixes a few previously-uncaught failures.
---
 package-lock.json                    | 1556 +++++++++++++++++++++++---
 package.json                         |    2 +-
 src/lib/core/option/option.ts        |    2 +-
 src/lib/dialog/dialog-ref.ts         |    2 +-
 tools/package-tools/build-package.ts |    2 +-
 5 files changed, 1429 insertions(+), 135 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b9b8eed58b0..3ca23cdd1c85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -415,16 +415,6 @@
         "@types/node": "7.0.43"
       }
     },
-    "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"
-      }
-    },
     "a-sync-waterfall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
@@ -2241,8 +2231,8 @@
       "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
         "is-text-path": "1.0.1",
+        "JSONStream": "1.3.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.1.1",
@@ -4300,7 +4290,6 @@
           "version": "0.13.4",
           "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.4.tgz",
           "integrity": "sha1-dbt/YJMc/J2U2gtdQIlQ0Lvw6Xk=",
-          "dev": true,
           "requires": {
             "array-uniq": "1.0.3",
             "arrify": "1.0.1",
@@ -4322,6 +4311,38 @@
             "through2": "2.0.3"
           }
         },
+        "@google-cloud/common-grpc": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.1.tgz",
+          "integrity": "sha1-CSZGB++4k0MJr/1jhJmG+7gPkhg=",
+          "requires": {
+            "@google-cloud/common": "0.13.4",
+            "dot-prop": "4.2.0",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "grpc": "1.6.6",
+            "is": "3.2.1",
+            "modelo": "4.2.0",
+            "retry-request": "2.0.5",
+            "through2": "2.0.3"
+          }
+        },
+        "@google-cloud/firestore": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
+          "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
+          "requires": {
+            "@google-cloud/common": "0.13.4",
+            "@google-cloud/common-grpc": "0.4.1",
+            "bun": "0.0.12",
+            "extend": "3.0.1",
+            "functional-red-black-tree": "1.0.1",
+            "google-gax": "0.14.1",
+            "grpc": "1.6.6",
+            "is": "3.2.1",
+            "through2": "2.0.3"
+          }
+        },
         "@google-cloud/storage": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
@@ -4346,6 +4367,68 @@
             "through2": "2.0.3"
           }
         },
+        "@protobufjs/aspromise": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+          "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
+        },
+        "@protobufjs/base64": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+          "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+        },
+        "@protobufjs/codegen": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+          "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+        },
+        "@protobufjs/eventemitter": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+          "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
+        },
+        "@protobufjs/fetch": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+          "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+          "requires": {
+            "@protobufjs/aspromise": "1.1.2",
+            "@protobufjs/inquire": "1.1.0"
+          }
+        },
+        "@protobufjs/float": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+          "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
+        },
+        "@protobufjs/inquire": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+          "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
+        },
+        "@protobufjs/path": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+          "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
+        },
+        "@protobufjs/pool": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+          "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
+        },
+        "@protobufjs/utf8": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+          "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
+        },
+        "@types/google-cloud__storage": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
+          "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
+          "requires": {
+            "@types/node": "8.0.22"
+          }
+        },
         "@types/jsonwebtoken": {
           "version": "7.2.3",
           "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
@@ -4355,22 +4438,43 @@
             "@types/node": "8.0.22"
           }
         },
+        "@types/long": {
+          "version": "3.0.32",
+          "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
+          "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA=="
+        },
         "@types/node": {
           "version": "8.0.22",
           "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.22.tgz",
-          "integrity": "sha512-+YQ5JLlvLP24teVUdUDep83mAWIFoAnOMosrH/2+xDeU9YMUpmMJtYOqVtbivs37h2PL9svz0R3r/MfVuEvEIA==",
-          "dev": true
+          "integrity": "sha512-+YQ5JLlvLP24teVUdUDep83mAWIFoAnOMosrH/2+xDeU9YMUpmMJtYOqVtbivs37h2PL9svz0R3r/MfVuEvEIA=="
         },
         "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"
           }
         },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "arguejs": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
+          "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc="
+        },
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+          "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",
@@ -4383,6 +4487,15 @@
           "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
           "dev": true
         },
+        "ascli": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+          "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+          "requires": {
+            "colour": "0.7.1",
+            "optjs": "3.2.2"
+          }
+        },
         "asn1": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -4392,8 +4505,7 @@
         "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
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
         },
         "async": {
           "version": "2.5.0",
@@ -4413,8 +4525,7 @@
         "aws-sign2": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-          "dev": true
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
         },
         "aws4": {
           "version": "1.6.0",
@@ -4422,6 +4533,11 @@
           "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
           "dev": true
         },
+        "balanced-match": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+        },
         "base64url": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
@@ -4442,11 +4558,19 @@
           "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"
           }
         },
+        "brace-expansion": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
         "buffer-equal": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -4459,6 +4583,50 @@
           "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
           "dev": true
         },
+        "bun": {
+          "version": "0.0.12",
+          "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
+          "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
+          "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="
+            },
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "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="
+            }
+          }
+        },
+        "bytebuffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+          "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+          "requires": {
+            "long": "3.2.0"
+          }
+        },
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+        },
         "capture-stack-trace": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
@@ -4471,12 +4639,32 @@
           "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
           "dev": true
         },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "requires": {
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
+          }
+        },
         "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="
+        },
+        "colour": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+          "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
+        },
         "combined-stream": {
           "version": "1.0.5",
           "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
@@ -4486,6 +4674,11 @@
             "delayed-stream": "1.0.0"
           }
         },
+        "concat-map": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+        },
         "concat-stream": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
@@ -4530,7 +4723,6 @@
           "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"
           },
@@ -4539,7 +4731,6 @@
               "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"
               }
@@ -4569,6 +4760,11 @@
             }
           }
         },
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+        },
         "delayed-stream": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -4579,7 +4775,6 @@
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
           "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-          "dev": true,
           "requires": {
             "is-obj": "1.0.1"
           }
@@ -4667,33 +4862,29 @@
           "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.16"
           }
         },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+        },
+        "functional-red-black-tree": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+        },
         "gcp-metadata": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.2.0.tgz",
           "integrity": "sha1-Ytr8pl86YxvIzi7Dt3Zh9fk4ego=",
-          "dev": true,
           "requires": {
             "extend": "3.0.1",
             "retry-request": "2.0.5"
-          },
-          "dependencies": {
-            "retry-request": {
-              "version": "2.0.5",
-              "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
-              "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
-              "dev": true,
-              "requires": {
-                "request": "2.81.0",
-                "through2": "2.0.3"
-              }
-            }
           }
         },
         "gcs-resumable-upload": {
@@ -4728,45 +4919,962 @@
             }
           }
         },
-        "google-auth-library": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-          "dev": true,
-          "requires": {
-            "gtoken": "1.2.2",
-            "jws": "3.1.4",
-            "lodash.noop": "3.0.1",
-            "request": "2.81.0"
-          }
-        },
-        "google-auto-auth": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.1.tgz",
-          "integrity": "sha1-yCYERJEt2M7szYOHYdVvRik3vQI=",
-          "dev": true,
-          "requires": {
-            "async": "2.5.0",
-            "gcp-metadata": "0.2.0",
-            "google-auth-library": "0.10.0",
-            "request": "2.81.0"
-          }
-        },
-        "google-p12-pem": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-          "dev": true,
-          "requires": {
-            "node-forge": "0.7.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "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"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "google-auth-library": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+          "dev": true,
+          "requires": {
+            "gtoken": "1.2.2",
+            "jws": "3.1.4",
+            "lodash.noop": "3.0.1",
+            "request": "2.81.0"
+          }
+        },
+        "google-auto-auth": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.1.tgz",
+          "integrity": "sha1-yCYERJEt2M7szYOHYdVvRik3vQI=",
+          "requires": {
+            "async": "2.5.0",
+            "gcp-metadata": "0.2.0",
+            "google-auth-library": "0.10.0",
+            "request": "2.81.0"
+          }
+        },
+        "google-gax": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.1.tgz",
+          "integrity": "sha1-/oj7nVAw0mJ3xjUIp5r3s3F54Tk=",
+          "requires": {
+            "extend": "3.0.1",
+            "globby": "6.1.0",
+            "google-auto-auth": "0.5.4",
+            "google-proto-files": "0.13.1",
+            "grpc": "1.6.6",
+            "is-stream-ended": "0.1.3",
+            "lodash": "4.17.4",
+            "process-nextick-args": "1.0.7",
+            "protobufjs": "6.8.0",
+            "readable-stream": "2.3.3",
+            "through2": "2.0.3"
+          },
+          "dependencies": {
+            "@types/node": {
+              "version": "7.0.43",
+              "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
+              "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ=="
+            },
+            "google-auto-auth": {
+              "version": "0.5.4",
+              "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.5.4.tgz",
+              "integrity": "sha1-HYbHko1jPnWpwasDSlJ+/M5KQLE=",
+              "requires": {
+                "async": "2.5.0",
+                "google-auth-library": "0.10.0",
+                "object-assign": "3.0.0",
+                "request": "2.81.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="
+            },
+            "protobufjs": {
+              "version": "6.8.0",
+              "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+              "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+              "requires": {
+                "@protobufjs/aspromise": "1.1.2",
+                "@protobufjs/base64": "1.1.2",
+                "@protobufjs/codegen": "2.0.4",
+                "@protobufjs/eventemitter": "1.1.0",
+                "@protobufjs/fetch": "1.1.0",
+                "@protobufjs/float": "1.0.2",
+                "@protobufjs/inquire": "1.1.0",
+                "@protobufjs/path": "1.1.2",
+                "@protobufjs/pool": "1.1.0",
+                "@protobufjs/utf8": "1.1.0",
+                "@types/long": "3.0.32",
+                "@types/node": "7.0.43",
+                "long": "3.2.0"
+              }
+            }
+          }
+        },
+        "google-p12-pem": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+          "dev": true,
+          "requires": {
+            "node-forge": "0.7.1"
+          }
+        },
+        "google-proto-files": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
+          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g=="
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+          "dev": true
+        },
+        "grpc": {
+          "version": "1.6.6",
+          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
+          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
+          "requires": {
+            "arguejs": "0.2.3",
+            "lodash": "4.17.4",
+            "nan": "2.7.0",
+            "node-pre-gyp": "0.6.38",
+            "protobufjs": "5.0.2"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+            },
+            "ajv": {
+              "version": "4.11.8",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+              "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+              "requires": {
+                "co": "4.6.0",
+                "json-stable-stringify": "1.0.1"
+              }
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+            },
+            "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=",
+              "requires": {
+                "delegates": "1.0.0",
+                "readable-stream": "2.3.3"
+              }
+            },
+            "asn1": {
+              "version": "0.2.3",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+            },
+            "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="
+            },
+            "asynckit": {
+              "version": "0.4.0",
+              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+            },
+            "aws-sign2": {
+              "version": "0.6.0",
+              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+              "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+            },
+            "aws4": {
+              "version": "1.6.0",
+              "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+              "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+            },
+            "bcrypt-pbkdf": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+              "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+              "optional": true,
+              "requires": {
+                "tweetnacl": "0.14.5"
+              }
+            },
+            "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=",
+              "requires": {
+                "inherits": "2.0.3"
+              }
+            },
+            "boom": {
+              "version": "2.10.1",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+              "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+              "requires": {
+                "hoek": "2.16.3"
+              }
+            },
+            "brace-expansion": {
+              "version": "1.1.8",
+              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+              "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+              "requires": {
+                "balanced-match": "1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "caseless": {
+              "version": "0.12.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+            },
+            "co": {
+              "version": "4.6.0",
+              "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+              "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+            },
+            "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="
+            },
+            "combined-stream": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+              "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+              "requires": {
+                "delayed-stream": "1.0.0"
+              }
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+              "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+            },
+            "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="
+            },
+            "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="
+            },
+            "cryptiles": {
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+              "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+              "requires": {
+                "boom": "2.10.1"
+              }
+            },
+            "dashdash": {
+              "version": "1.14.1",
+              "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+              "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+              "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="
+                }
+              }
+            },
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "deep-extend": {
+              "version": "0.4.2",
+              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+              "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+            },
+            "delayed-stream": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+              "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+              "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+            },
+            "ecc-jsbn": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+              "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+              "optional": true,
+              "requires": {
+                "jsbn": "0.1.1"
+              }
+            },
+            "extend": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+            },
+            "extsprintf": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+            },
+            "forever-agent": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+              "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+            },
+            "form-data": {
+              "version": "2.1.4",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+              "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+              "requires": {
+                "asynckit": "0.4.0",
+                "combined-stream": "1.0.5",
+                "mime-types": "2.1.17"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+            },
+            "fstream": {
+              "version": "1.0.11",
+              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+              "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+              "requires": {
+                "graceful-fs": "4.1.11",
+                "inherits": "2.0.3",
+                "mkdirp": "0.5.1",
+                "rimraf": "2.6.2"
+              }
+            },
+            "fstream-ignore": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+              "requires": {
+                "fstream": "1.0.11",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4"
+              }
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+              "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+              "requires": {
+                "aproba": "1.2.0",
+                "console-control-strings": "1.1.0",
+                "has-unicode": "2.0.1",
+                "object-assign": "4.1.1",
+                "signal-exit": "3.0.2",
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wide-align": "1.1.2"
+              }
+            },
+            "getpass": {
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+              "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+              "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="
+                }
+              }
+            },
+            "glob": {
+              "version": "7.1.2",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+              "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+              "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",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+            },
+            "har-schema": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+              "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+            },
+            "har-validator": {
+              "version": "4.2.1",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+              "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+              "requires": {
+                "ajv": "4.11.8",
+                "har-schema": "1.0.5"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+              "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+            },
+            "hawk": {
+              "version": "3.1.3",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+              "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+              "requires": {
+                "boom": "2.10.1",
+                "cryptiles": "2.0.5",
+                "hoek": "2.16.3",
+                "sntp": "1.0.9"
+              }
+            },
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+            },
+            "http-signature": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+              "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+              "requires": {
+                "assert-plus": "0.2.0",
+                "jsprim": "1.4.1",
+                "sshpk": "1.13.1"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+              "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+              "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="
+            },
+            "ini": {
+              "version": "1.3.4",
+              "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+              "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+            },
+            "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=",
+              "requires": {
+                "number-is-nan": "1.0.1"
+              }
+            },
+            "is-typedarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+            },
+            "isstream": {
+              "version": "0.1.2",
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+              "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+            },
+            "jsbn": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+              "optional": true
+            },
+            "json-schema": {
+              "version": "0.2.3",
+              "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+              "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+            },
+            "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=",
+              "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="
+            },
+            "jsonify": {
+              "version": "0.0.0",
+              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+            },
+            "jsprim": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+              "requires": {
+                "assert-plus": "1.0.0",
+                "extsprintf": "1.3.0",
+                "json-schema": "0.2.3",
+                "verror": "1.10.0"
+              },
+              "dependencies": {
+                "assert-plus": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                }
+              }
+            },
+            "mime-db": {
+              "version": "1.30.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+            },
+            "mime-types": {
+              "version": "2.1.17",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+              "requires": {
+                "mime-db": "1.30.0"
+              }
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+              "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+              "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="
+                }
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            },
+            "node-pre-gyp": {
+              "version": "0.6.38",
+              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
+              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
+              "requires": {
+                "hawk": "3.1.3",
+                "mkdirp": "0.5.1",
+                "nopt": "4.0.1",
+                "npmlog": "4.1.2",
+                "rc": "1.2.1",
+                "request": "2.81.0",
+                "rimraf": "2.6.2",
+                "semver": "5.4.1",
+                "tar": "2.2.1",
+                "tar-pack": "3.4.0"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "requires": {
+                "abbrev": "1.1.1",
+                "osenv": "0.1.4"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+              "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+              "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",
+              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+            },
+            "oauth-sign": {
+              "version": "0.8.2",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+              "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+              "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+            },
+            "once": {
+              "version": "1.4.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+              "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+              "requires": {
+                "wrappy": "1.0.2"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+              "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+            },
+            "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="
+            },
+            "osenv": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+              "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+              "requires": {
+                "os-homedir": "1.0.2",
+                "os-tmpdir": "1.0.2"
+              }
+            },
+            "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="
+            },
+            "performance-now": {
+              "version": "0.2.0",
+              "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+              "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+            },
+            "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="
+            },
+            "punycode": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+            },
+            "qs": {
+              "version": "6.4.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+              "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+            },
+            "rc": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+              "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+              "requires": {
+                "deep-extend": "0.4.2",
+                "ini": "1.3.4",
+                "minimist": "1.2.0",
+                "strip-json-comments": "2.0.1"
+              }
+            },
+            "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==",
+              "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"
+              }
+            },
+            "request": {
+              "version": "2.81.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+              "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.17",
+                "oauth-sign": "0.8.2",
+                "performance-now": "0.2.0",
+                "qs": "6.4.0",
+                "safe-buffer": "5.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.3",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+              "requires": {
+                "glob": "7.1.2"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.1",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+              "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+            },
+            "semver": {
+              "version": "5.4.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+              "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+            },
+            "sntp": {
+              "version": "1.0.9",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+              "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+              "requires": {
+                "hoek": "2.16.3"
+              }
+            },
+            "sshpk": {
+              "version": "1.13.1",
+              "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+              "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+              "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="
+                }
+              }
+            },
+            "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==",
+              "requires": {
+                "safe-buffer": "5.1.1"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "requires": {
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
+              }
+            },
+            "stringstream": {
+              "version": "0.0.5",
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+              "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "requires": {
+                "ansi-regex": "2.1.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="
+            },
+            "tar": {
+              "version": "2.2.1",
+              "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+              "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+              "requires": {
+                "block-stream": "0.0.9",
+                "fstream": "1.0.11",
+                "inherits": "2.0.3"
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "requires": {
+                "debug": "2.6.9",
+                "fstream": "1.0.11",
+                "fstream-ignore": "1.0.5",
+                "once": "1.4.0",
+                "readable-stream": "2.3.3",
+                "rimraf": "2.6.2",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              }
+            },
+            "tough-cookie": {
+              "version": "2.3.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+              "requires": {
+                "punycode": "1.4.1"
+              }
+            },
+            "tunnel-agent": {
+              "version": "0.6.0",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+              "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+              "requires": {
+                "safe-buffer": "5.1.1"
+              }
+            },
+            "tweetnacl": {
+              "version": "0.14.5",
+              "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+              "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+              "optional": true
+            },
+            "uid-number": {
+              "version": "0.0.6",
+              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+            },
+            "uuid": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+            },
+            "verror": {
+              "version": "1.10.0",
+              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+              "requires": {
+                "assert-plus": "1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "1.3.0"
+              },
+              "dependencies": {
+                "assert-plus": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                }
+              }
+            },
+            "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==",
+              "requires": {
+                "string-width": "1.0.2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+            }
+          }
+        },
         "gtoken": {
           "version": "1.2.2",
           "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
@@ -4782,14 +5890,12 @@
         "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
+          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
         },
         "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"
@@ -4808,7 +5914,6 @@
           "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",
@@ -4819,8 +5924,7 @@
         "hoek": {
           "version": "2.16.3",
           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-          "dev": true
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
         },
         "http-parser-js": {
           "version": "0.4.8",
@@ -4831,7 +5935,6 @@
           "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.1",
@@ -4844,18 +5947,40 @@
           "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
           "dev": true
         },
+        "inflight": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+          "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
         },
+        "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="
+        },
         "is": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
           "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
           "dev": true
         },
+        "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=",
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
         "is-obj": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
@@ -4999,6 +6124,14 @@
             "safe-buffer": "5.1.1"
           }
         },
+        "lcid": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+          "requires": {
+            "invert-kv": "1.0.0"
+          }
+        },
         "lodash": {
           "version": "4.17.4",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -5023,6 +6156,11 @@
           "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
           "dev": true
         },
+        "long": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+          "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
+        },
         "make-dir": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
@@ -5041,24 +6179,29 @@
         "mime": {
           "version": "1.3.6",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
-          "dev": true
+          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA="
         },
         "mime-db": {
           "version": "1.29.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-          "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=",
-          "dev": true
+          "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
         },
         "mime-types": {
           "version": "2.1.16",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
           "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
-          "dev": true,
           "requires": {
             "mime-db": "1.29.0"
           }
         },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "requires": {
+            "brace-expansion": "1.1.8"
+          }
+        },
         "modelo": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
@@ -5077,18 +6220,33 @@
           "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
           "dev": true
         },
+        "nan": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+          "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY="
+        },
         "node-forge": {
           "version": "0.7.1",
           "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
           "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
           "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="
+        },
         "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="
+        },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -5098,11 +6256,28 @@
             "wrappy": "1.0.2"
           }
         },
+        "optjs": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
+          "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4="
+        },
+        "os-locale": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+          "requires": {
+            "lcid": "1.0.0"
+          }
+        },
+        "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="
+        },
         "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
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
         },
         "pify": {
           "version": "2.3.0",
@@ -5110,12 +6285,36 @@
           "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="
+        },
+        "pinkie-promise": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+          "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+          "requires": {
+            "pinkie": "2.0.4"
+          }
+        },
         "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
         },
+        "protobufjs": {
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
+          "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
+          "requires": {
+            "ascli": "1.0.1",
+            "bytebuffer": "5.0.1",
+            "glob": "7.1.2",
+            "yargs": "3.32.0"
+          }
+        },
         "pump": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
@@ -5146,8 +6345,7 @@
         "qs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
         },
         "readable-stream": {
           "version": "2.3.3",
@@ -5168,7 +6366,6 @@
           "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",
@@ -5198,7 +6395,6 @@
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
           "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
-          "dev": true,
           "requires": {
             "request": "2.81.0",
             "through2": "2.0.3"
@@ -5219,7 +6415,6 @@
           "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"
           }
@@ -5273,12 +6468,6 @@
           "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
           "dev": true
         },
-        "string-format-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
-          "dev": true
-        },
         "string_decoder": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -5288,12 +6477,36 @@
             "safe-buffer": "5.1.1"
           }
         },
+        "string-format-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
         "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=",
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
         "stubs": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
@@ -5323,7 +6536,6 @@
           "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"
           }
@@ -5405,6 +6617,20 @@
           "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
           "dev": true
         },
+        "window-size": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "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",
@@ -5433,6 +6659,25 @@
           "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="
+        },
+        "yargs": {
+          "version": "3.32.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
+          "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"
+          }
         }
       }
     },
@@ -5443,7 +6688,6 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.25",
-        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -5463,6 +6707,7 @@
         "google-auto-auth": "0.7.2",
         "inquirer": "0.12.0",
         "jsonschema": "1.2.0",
+        "JSONStream": "1.3.1",
         "jsonwebtoken": "7.4.3",
         "lodash": "4.17.4",
         "open": "0.0.5",
@@ -9710,16 +10955,6 @@
         "through2": "0.6.5"
       },
       "dependencies": {
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -9732,6 +10967,16 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -9796,6 +11041,16 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
+      }
+    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -14389,6 +15644,15 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -14422,15 +15686,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "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"
-      }
-    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -15456,13 +16711,14 @@
       "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw="
     },
     "tslint": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz",
-      "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.8.0.tgz",
+      "integrity": "sha1-H0mtWy53x2w69N3K5VKuTjYS6xM=",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
-        "colors": "1.1.2",
+        "builtin-modules": "1.1.1",
+        "chalk": "2.2.0",
         "commander": "2.11.0",
         "diff": "3.3.1",
         "glob": "7.1.2",
@@ -15470,14 +16726,52 @@
         "resolve": "1.4.0",
         "semver": "5.4.1",
         "tslib": "1.7.1",
-        "tsutils": "2.8.2"
+        "tsutils": "2.12.1"
       },
       "dependencies": {
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.5.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
           "dev": true
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        },
+        "tsutils": {
+          "version": "2.12.1",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.1.tgz",
+          "integrity": "sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ=",
+          "dev": true,
+          "requires": {
+            "tslib": "1.7.1"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 5cc93735ddf2..d49c4b9ae77d 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "stylelint": "^7.12.0",
     "ts-node": "^3.0.4",
     "tsconfig-paths": "^2.2.0",
-    "tslint": "^5.7.0",
+    "tslint": "^5.8.0",
     "tsutils": "^2.6.0",
     "typescript": "~2.4.2",
     "uglify-js": "^2.8.14",
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index 27bb5bfa7c00..efeed564a43b 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -110,7 +110,7 @@ export class MatOption {
     private _element: ElementRef,
     private _changeDetectorRef: ChangeDetectorRef,
     @Optional() @Inject(MAT_OPTION_PARENT_COMPONENT) private _parent: MatOptionParentComponent,
-    @Optional() public readonly group: MatOptgroup) {}
+    @Optional() readonly group: MatOptgroup) {}
 
   /**
    * Whether or not the option is currently active and ready to be selected.
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 9af728c0fb43..8c8f29480eb1 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -44,7 +44,7 @@ export class MatDialogRef<T> {
   constructor(
     private _overlayRef: OverlayRef,
     private _containerInstance: MatDialogContainer,
-    public readonly id: string = `mat-dialog-${uniqueId++}`) {
+    readonly id: string = `mat-dialog-${uniqueId++}`) {
 
     // Emit when opening animation completes
     RxChain.from(_containerInstance._animationStateChanged)
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index 6c357ad8e3ed..c1f9144b82a8 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -58,7 +58,7 @@ export class BuildPackage {
   }
   private _secondaryEntryPoints: string[];
 
-  constructor(public readonly name: string, public readonly dependencies: BuildPackage[] = []) {
+  constructor(readonly name: string, readonly dependencies: BuildPackage[] = []) {
     this.sourceDir = join(packagesDir, name);
     this.outputDir = join(outputDir, 'packages', name);
     this.esm5OutputDir = join(outputDir, 'packages', name, 'esm5');

From 64b566fb953a7fa9561487ab9d4e70c4a2b6165b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 23 Oct 2017 22:19:51 +0200
Subject: [PATCH 350/575] build: fix examples not building (#7939)

Fixes an error in the `material-examples` build, because the Moment adapter wasn't added as a dependency.
---
 tools/gulp/packages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gulp/packages.ts b/tools/gulp/packages.ts
index c65002dad845..bfa109c15063 100644
--- a/tools/gulp/packages.ts
+++ b/tools/gulp/packages.ts
@@ -3,8 +3,8 @@ import {join} from 'path';
 
 export const cdkPackage = new BuildPackage('cdk');
 export const materialPackage = new BuildPackage('material', [cdkPackage]);
-export const examplesPackage = new BuildPackage('material-examples', [materialPackage, cdkPackage]);
 export const momentAdapterPackage = new BuildPackage('material-moment-adapter', [materialPackage]);
+export const examplesPackage = new BuildPackage('material-examples', [momentAdapterPackage]);
 
 // The material package re-exports its secondary entry-points at the root so that all of the
 // components can still be imported through `@angular/material`.

From c46ba07151a619f2eda138dc4618d7a9eacf67d2 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 23 Oct 2017 13:20:29 -0700
Subject: [PATCH 351/575] lint: ensure all files are owned by someone (#7937)

* lint: ensure all files are owned by someone

* address comments
---
 .github/CODEOWNERS       | 230 ++++++++++++++++++++++++++++-----------
 .gitignore               |   1 +
 package.json             |   1 +
 tools/gulp/tasks/lint.ts |  78 ++++++++++++-
 4 files changed, 245 insertions(+), 65 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index abe16bb71d0c..6fc4773ddc31 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,69 +1,177 @@
 # Angular Material components
-src/lib/list/**                    @jelbourn @crisbeto
-src/lib/tooltip/**                 @andrewseguin
-src/lib/button-toggle/**           @tinayuangao
-src/lib/snack-bar/**               @jelbourn @crisbeto @josephperrott
-src/lib/radio/**                   @tinayuangao @devversion
-src/lib/card/**                    @jelbourn
-src/lib/input/**                   @mmalerba
-src/lib/progress-spinner/**        @jelbourn @crisbeto @josephperrott
-src/lib/datepicker/**              @mmalerba
-src/lib/sort/**                    @andrewseguin
-src/lib/autocomplete/**            @kara @crisbeto
-src/lib/chips/**                   @tinayuangao
-src/lib/icon/**                    @jelbourn
-src/lib/dialog/**                  @jelbourn @crisbeto
-src/lib/progress-bar/**            @jelbourn @crisbeto @josephperrott
-src/lib/grid-list/**               @kara @jelbourn
-src/lib/select/**                  @kara @crisbeto
-src/lib/expansion/**               @josephperrott @jelbourn
-src/lib/slide-toggle/**            @devversion
-src/lib/toolbar/**                 @devversion
-src/lib/button/**                  @tinayuangao
-src/lib/checkbox/**                @tinayuangao @devversion
-src/lib/table/**                   @andrewseguin
-src/lib/slider/**                  @mmalerba
-src/lib/sidenav/**                 @mmalerba
-src/lib/menu/**                    @kara @crisbeto
-src/lib/paginator/**               @andrewseguin
-src/lib/tabs/**                    @andrewseguin
+/src/lib/*                                         @jelbourn
+/src/lib/autocomplete/**                           @kara @crisbeto
+/src/lib/button-toggle/**                          @tinayuangao
+/src/lib/button/**                                 @tinayuangao
+/src/lib/card/**                                   @jelbourn
+/src/lib/checkbox/**                               @tinayuangao @devversion
+/src/lib/chips/**                                  @tinayuangao
+/src/lib/datepicker/**                             @mmalerba
+/src/lib/dialog/**                                 @jelbourn @crisbeto
+/src/lib/expansion/**                              @josephperrott @jelbourn
+/src/lib/form-field/**                             @mmalerba
+/src/lib/grid-list/**                              @kara @jelbourn
+/src/lib/icon/**                                   @jelbourn
+/src/lib/input/**                                  @mmalerba
+/src/lib/list/**                                   @jelbourn @crisbeto
+/src/lib/menu/**                                   @kara @crisbeto
+/src/lib/paginator/**                              @andrewseguin
+/src/lib/progress-bar/**                           @jelbourn @crisbeto @josephperrott
+/src/lib/progress-spinner/**                       @jelbourn @crisbeto @josephperrott
+/src/lib/radio/**                                  @tinayuangao @devversion
+/src/lib/select/**                                 @kara @crisbeto
+/src/lib/sidenav/**                                @mmalerba
+/src/lib/slide-toggle/**                           @devversion
+/src/lib/slider/**                                 @mmalerba
+/src/lib/snack-bar/**                              @jelbourn @crisbeto @josephperrott
+/src/lib/sort/**                                   @andrewseguin
+/src/lib/stepper/**                                @mmalerba
+/src/lib/table/**                                  @andrewseguin
+/src/lib/tabs/**                                   @andrewseguin
+/src/lib/toolbar/**                                @devversion
+/src/lib/tooltip/**                                @andrewseguin
 
 # Angular Material core
-src/lib/core/selection/**          @tinayuangao @jelbourn
-src/lib/core/selection/pseudo*/**  @crisbeto @jelbourn
-src/lib/core/theming/**            @jelbourn
-src/lib/core/option/**             @kara @crisbeto
-src/lib/core/rxjs/**               @jelbourn
-src/lib/core/ripple/**             @devversion
-src/lib/core/a11y/**               @jelbourn @devversion
-src/lib/core/compatibility/**      @jelbourn
-src/lib/core/overlay/**            @jelbourn @crisbeto
-src/lib/core/overlay/scroll/**     @andrewseguin @crisbeto
-src/lib/core/platform/**           @jelbourn @devversion
-src/lib/core/bidi/**               @jelbourn
-src/lib/core/placeholder/**        @kara @mmalerba
-src/lib/core/portal/**             @jelbourn
-src/lib/core/typography/**         @crisbeto
-src/lib/core/datetime/**           @mmalerba
+/src/lib/core/*                                    @jelbourn
+/src/lib/core/animation/**                         @jelbourn
+/src/lib/core/common-behaviors/**                  @jelbourn
+/src/lib/core/compatibility/**                     @jelbourn
+/src/lib/core/datetime/**                          @mmalerba
+/src/lib/core/error/**                             @crisbeto @mmalerba
+/src/lib/core/gestures/**                          @jelbourn
+/src/lib/core/line/**                              @jelbourn
+/src/lib/core/option/**                            @kara @crisbeto
+/src/lib/core/placeholder/**                       @kara @mmalerba
+/src/lib/core/ripple/**                            @devversion
+/src/lib/core/selection/**                         @tinayuangao @jelbourn
+/src/lib/core/selection/pseudo*/**                 @crisbeto @jelbourn
+/src/lib/core/style/**                             @jelbourn
+/src/lib/core/testing/**                           @jelbourn
+/src/lib/core/theming/**                           @jelbourn
+/src/lib/core/typography/**                        @crisbeto
+/src/lib/core/util/**                              @jelbourn
 
 # CDK
-src/cdk/coercion/**                @jelbourn
-src/cdk/rxjs/**                    @jelbourn
-src/cdk/observers/**               @jelbourn @crisbeto
-src/cdk/collections/**             @jelbourn @crisbeto @andrewseguin
-src/cdk/a11y/**                    @jelbourn @devversion
-src/cdk/platform/**                @jelbourn @devversion
-src/cdk/bidi/**                    @jelbourn
-src/cdk/table/**                   @andrewseguin
-src/cdk/portal/**                  @jelbourn
+/src/cdk/*                                         @jelbourn
+/src/cdk/a11y/**                                   @jelbourn @devversion
+/src/cdk/accordion/**                              @josephperrott
+/src/cdk/bidi/**                                   @jelbourn
+/src/cdk/coercion/**                               @jelbourn
+/src/cdk/collections/**                            @jelbourn @crisbeto @andrewseguin
+/src/cdk/keycodes/**                               @jelbourn
+/src/cdk/layout/**                                 @josephperrott
+/src/cdk/observers/**                              @jelbourn @crisbeto
+/src/cdk/overlay/**                                @jelbourn @crisbeto
+/src/cdk/platform/**                               @jelbourn @devversion
+/src/cdk/portal/**                                 @jelbourn
+/src/cdk/rxjs/**                                   @jelbourn
+/src/cdk/scrolling/**                              @andrewseguin @crisbeto
+/src/cdk/stepper/**                                @mmalerba
+/src/cdk/table/**                                  @andrewseguin
+/src/cdk/testing/**                                @devversion
 
-# Tooling
-tools/**                           @devversion @jelbourn
-test/**                            @devversion @jelbourn
-scripts/**                         @devversion @jelbourn
+# Moment adapter package
+/src/material-moment-adapter/**                    @mmalerba
 
-# Docs examples
-src/material-examples/**           @amcdnl @jelbourn
+# Docs examples & guides
+/guides/**                                         @amcdnl @jelbourn
+/src/material-examples/**                          @amcdnl @jelbourn
 
-# Moment adapter package
-src/material-moment-adapter/**     @mmalerba
+# Demo app
+/src/demo-app/*                                    @jelbourn
+/src/demo-app/a11y/**                              @tinayuangao
+/src/demo-app/autocomplete/**                      @kara @crisbeto
+/src/demo-app/baseline/**                          @mmalerba
+/src/demo-app/button-toggle/**                     @tinayuangao
+/src/demo-app/button/**                            @tinayuangao
+/src/demo-app/card/**                              @jelbourn
+/src/demo-app/checkbox/**                          @tinayuangao @devversion
+/src/demo-app/chips/**                             @tinayuangao
+/src/demo-app/dataset/**                           @andrewseguin
+/src/demo-app/datepicker/**                        @mmalerba
+/src/demo-app/demo-app/**                          @jelbourn
+/src/demo-app/dialog/**                            @jelbourn @crisbeto
+/src/demo-app/drawer/**                            @mmalerba
+/src/demo-app/expansion/**                         @josephperrott
+/src/demo-app/focus-origin/**                      @mmalerba
+/src/demo-app/gestures/**                          @jelbourn
+/src/demo-app/grid-list/**                         @kara @jelbourn
+/src/demo-app/icon/**                              @jelbourn
+/src/demo-app/input/**                             @mmalerba
+/src/demo-app/list/**                              @jelbourn @crisbeto
+/src/demo-app/live-announcer/**                    @jelbourn
+/src/demo-app/menu/**                              @kara @crisbeto
+/src/demo-app/overlay/**                           @jelbourn @crisbeto
+/src/demo-app/platform/**                          @jelbourn @devversion
+/src/demo-app/portal/**                            @jelbourn
+/src/demo-app/progress-bar/**                      @jelbourn @crisbeto @josephperrott
+/src/demo-app/progress-spinner/**                  @jelbourn @crisbeto @josephperrott
+/src/demo-app/radio/**                             @tinayuangao @devversion
+/src/demo-app/ripple/**                            @devversion
+/src/demo-app/screen-type/**                       @josephperrott
+/src/demo-app/select/**                            @kara @crisbeto
+/src/demo-app/sidenav/**                           @mmalerba
+/src/demo-app/slide-toggle/**                      @devversion
+/src/demo-app/slider/**                            @mmalerba
+/src/demo-app/snack-bar/**                         @jelbourn @crisbeto @josephperrott
+/src/demo-app/stepper/**                           @mmalerba
+/src/demo-app/table/**                             @andrewseguin
+/src/demo-app/tabs/**                              @andrewseguin
+/src/demo-app/toolbar/**                           @devversion
+/src/demo-app/tooltip/**                           @andrewseguin
+/src/demo-app/typography/**                        @crisbeto
+
+# E2E app
+/e2e/*                                             @jelbourn
+/e2e/components/block-scroll-strategy-e2e.spec.ts  @andrewseguin @crisbeto
+/e2e/components/button-e2e.spec.ts                 @tinayuangao
+/e2e/components/button-toggle-e2e.spec.ts          @tinayuangao
+/e2e/components/card-e2e.spec.ts                   @jelbourn
+/e2e/components/checkbox-e2e.spec.ts               @tinayuangao @devversion
+/e2e/components/dialog-e2e.spec.ts                 @jelbourn @crisbeto
+/e2e/components/expansion-e2e.spec.ts              @josephperrott @jelbourn
+/e2e/components/fullscreen-e2e.spec.ts             @jelbourn
+/e2e/components/grid-list-e2e.spec.ts              @kara @jelbourn
+/e2e/components/icon-e2e.spec.ts                   @jelbourn
+/e2e/components/input-e2e.spec.ts                  @mmalerba
+/e2e/components/list-e2e.spec.ts                   @jelbourn @crisbeto
+/e2e/components/menu-e2e.spec.ts                   @kara @crisbeto
+/e2e/components/progress-bar-e2e.spec.ts           @jelbourn @crisbeto @josephperrott
+/e2e/components/progress-spinner-e2e.spec.ts       @jelbourn @crisbeto @josephperrott
+/e2e/components/radio-e2e.spec.ts                  @tinayuangao @devversion
+/e2e/components/sidenav-e2e.spec.ts                @mmalerba
+/e2e/components/slide-toggle-e2e.spec.ts           @devversion
+/e2e/components/stepper-e2e.spec.ts                @mmalerba
+/e2e/components/tabs-e2e.spec.ts                   @andrewseguin
+/e2e/components/toolbar-e2e.spec.ts                @devversion
+/e2e/util/**                                       @jelbourn
+/src/e2e-app/*                                     @jelbourn
+/src/e2e-app/block-scroll-strategy/**              @andrewseguin @crisbeto
+/src/e2e-app/button/**                             @tinayuangao
+/src/e2e-app/checkbox/**                           @tinayuangao @devversion
+/src/e2e-app/dialog/**                             @jelbourn @crisbeto
+/src/e2e-app/e2e-app/**                            @jelbourn
+/src/e2e-app/fullscreen/**                         @jelbourn
+/src/e2e-app/grid-list/**                          @kara @jelbourn
+/src/e2e-app/icon/**                               @jelbourn
+/src/e2e-app/input/**                              @mmalerba
+/src/e2e-app/menu/**                               @kara @crisbeto
+/src/e2e-app/progress-bar/**                       @jelbourn @crisbeto @josephperrott
+/src/e2e-app/progress-spinner/**                   @jelbourn @crisbeto @josephperrott
+/src/e2e-app/radio/**                              @tinayuangao @devversion
+/src/e2e-app/sidenav/**                            @mmalerba
+/src/e2e-app/slide-toggle/**                       @devversion
+/src/e2e-app/tabs/**                               @andrewseguin
+
+# Universal app
+/src/universal-app/**                              @jelbourn
+
+# Tooling
+/scripts/**                                        @devversion @jelbourn
+/test/**                                           @devversion @jelbourn
+/tools/**                                          @devversion @jelbourn
+
+# Misc
+/*                                                 @jelbourn
+/.github/**                                        @jelbourn
+/src/*                                             @jelbourn
diff --git a/.gitignore b/.gitignore
index 24e821d2e946..9804dad5288e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ node_modules
 npm-debug.log
 testem.log
 /.chrome
+/.git
diff --git a/package.json b/package.json
index d49c4b9ae77d..751486727401 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@types/fs-extra": "^3.0.1",
     "@types/glob": "^5.0.30",
     "@types/gulp": "3.8.32",
+    "@types/gulp-util": "^3.0.31",
     "@types/hammerjs": "^2.0.34",
     "@types/jasmine": "2.5.45",
     "@types/merge2": "^0.3.30",
diff --git a/tools/gulp/tasks/lint.ts b/tools/gulp/tasks/lint.ts
index b51b84ba654f..aca4854a0995 100644
--- a/tools/gulp/tasks/lint.ts
+++ b/tools/gulp/tasks/lint.ts
@@ -1,8 +1,11 @@
+import {red} from 'chalk';
+import {readdirSync, readFileSync, statSync} from 'fs';
 import {task} from 'gulp';
-import {execNodeTask} from '../util/task_helpers';
-import {join} from 'path';
+import {colors, log} from 'gulp-util';
 import {buildConfig} from 'material2-build-tools';
-import {red} from 'chalk';
+import {IMinimatch, Minimatch} from 'minimatch';
+import {join} from 'path';
+import {execNodeTask} from '../util/task_helpers';
 
 // These types lack of type definitions
 const madge = require('madge');
@@ -19,7 +22,13 @@ const materialOutPath = join(buildConfig.outputDir, 'packages', 'material');
 /** Path to the output of the CDK package. */
 const cdkOutPath = join(buildConfig.outputDir, 'packages', 'cdk');
 
-task('lint', ['tslint', 'stylelint', 'madge']);
+/** Path for the Github owners file. */
+const ownersFilePath = '.github/CODEOWNERS';
+
+/** Path for the .gitignore file. */
+const gitIgnorePath = '.gitignore';
+
+task('lint', ['tslint', 'stylelint', 'madge', 'ownerslint']);
 
 /** Task to lint Angular Material's scss stylesheets. */
 task('stylelint', execNodeTask(
@@ -46,6 +55,67 @@ task('madge', ['material:clean-build'], () => {
   });
 });
 
+task('ownerslint', () => {
+  let errors = 0;
+
+  let ownedPaths = readFileSync(ownersFilePath, 'utf8').split('\n')
+      // Trim lines.
+      .map(line => line.trim())
+      // Remove empty lines and comments.
+      .filter(line => line && !line.startsWith('#'))
+      // Split off just the path glob.
+      .map(line => line.split(/\s+/)[0])
+      // Turn paths into Minimatch objects.
+      .map(path => new Minimatch(path, {dot: true, matchBase: true}));
+
+  let ignoredPaths = readFileSync(gitIgnorePath, 'utf8').split('\n')
+      // Trim lines.
+      .map(line => line.trim())
+      // Remove empty lines and comments.
+      .filter(line => line && !line.startsWith('#'))
+      // Turn paths into Minimatch objects.
+      .map(path => new Minimatch(path, {dot: true, matchBase: true}));
+
+  for (let paths = getChildPaths('.'); paths.length;) {
+    paths = Array.prototype.concat(...paths
+        // Remove ignored paths
+        .filter(path => !ignoredPaths.reduce(
+            (isIgnored, ignoredPath) => isIgnored || ignoredPath.match('/' + path), false))
+        // Remove paths that match an owned path.
+        .filter(path => !ownedPaths.reduce(
+            (isOwned, ownedPath) => isOwned || isOwnedBy(path, ownedPath), false))
+        // Report an error for any files that didn't match any owned paths.
+        .filter(path => {
+          if (statSync(path).isFile()) {
+            log(colors.red(`No code owner found for "${path}".`));
+            errors++;
+            return false;
+          }
+          return true;
+        })
+        // Get the next level of children for any directories.
+        .map(path => getChildPaths(path)));
+  }
+
+  if (errors) {
+    throw Error(`Found ${errors} files with no owner.`);
+  }
+});
+
+/** Check if the given path is owned by the given owned path matcher. */
+function isOwnedBy(path: string, ownedPath: IMinimatch) {
+  // If the owned path ends with `**` its safe to eliminate whole directories.
+  if (ownedPath.pattern.endsWith('**') || statSync(path).isFile()) {
+    return ownedPath.match('/' + path);
+  }
+  return false;
+}
+
+/** Get the immediate child paths of the given path. */
+function getChildPaths(path: string) {
+  return readdirSync(path).map(child => join(path, child));
+}
+
 /** Returns a string that formats the graph of circular modules. */
 function formatMadgeCircularModules(circularModules: string[][]): string {
   return circularModules.map((modulePaths: string[]) => `\n - ${modulePaths.join(' > ')}`).join('');

From 65d36302fce8c0bf77218a34be549ec62f538844 Mon Sep 17 00:00:00 2001
From: Roy <donroyco@users.noreply.github.com>
Date: Mon, 23 Oct 2017 22:21:05 +0200
Subject: [PATCH 352/575] fix(card): change image path to https in example
 (#7800)

---
 src/material-examples/card-fancy/card-fancy-example.css  | 2 +-
 src/material-examples/card-fancy/card-fancy-example.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/material-examples/card-fancy/card-fancy-example.css b/src/material-examples/card-fancy/card-fancy-example.css
index 5792e475772c..3c506eb4e5c0 100644
--- a/src/material-examples/card-fancy/card-fancy-example.css
+++ b/src/material-examples/card-fancy/card-fancy-example.css
@@ -3,6 +3,6 @@
 }
 
 .example-header-image {
-  background-image: url('http://material.angular.io/assets/img/examples/shiba1.jpg');
+  background-image: url('https://material.angular.io/assets/img/examples/shiba1.jpg');
   background-size: cover;
 }
diff --git a/src/material-examples/card-fancy/card-fancy-example.html b/src/material-examples/card-fancy/card-fancy-example.html
index ba053f17f81e..e7fdeb8efe16 100644
--- a/src/material-examples/card-fancy/card-fancy-example.html
+++ b/src/material-examples/card-fancy/card-fancy-example.html
@@ -4,7 +4,7 @@
     <mat-card-title>Shiba Inu</mat-card-title>
     <mat-card-subtitle>Dog Breed</mat-card-subtitle>
   </mat-card-header>
-  <img mat-card-image src="http://material.angular.io/assets/img/examples/shiba2.jpg" alt="Photo of a Shiba Inu">
+  <img mat-card-image src="https://material.angular.io/assets/img/examples/shiba2.jpg" alt="Photo of a Shiba Inu">
   <mat-card-content>
     <p>
       The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan.

From 0ea43700efb105aa02ad3b1d3f800bf4a9925883 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 24 Oct 2017 19:42:35 +0200
Subject: [PATCH 353/575] refactor: switch to HttpClient (#6702)

Refactors all of the usages of the deprecated `Http` by replacing them with the `HttpClient`.

BREAKING CHANGE: Material now requires `@angular/common` instead of `@angular/http` and uses `HttpClient` instead of `Http`.
---
 package.json                                  |  2 +-
 .../closure-compiler/build-devapp-bundle.sh   |  4 +-
 src/demo-app/demo-app-module.ts               |  4 +-
 src/demo-app/system-config.ts                 |  3 +-
 src/e2e-app/system-config.ts                  |  3 +-
 src/lib/icon/fake-svgs.ts                     | 96 +++++++------------
 src/lib/icon/icon-registry.ts                 | 26 ++---
 src/lib/icon/icon.spec.ts                     | 76 +++++++--------
 src/material-examples/package.json            |  1 -
 .../table-http/table-http-example.ts          | 17 ++--
 test/karma-test-shim.js                       |  5 +-
 test/karma.conf.js                            |  1 +
 tools/dashboard/package.json                  |  1 -
 tools/package-tools/rollup-globals.ts         |  4 +-
 tools/screenshot-test/package.json            |  1 -
 .../src/app/firebase.service.ts               | 30 +++---
 .../src/app/pixacto.dashboard.module.ts       |  4 +-
 17 files changed, 121 insertions(+), 157 deletions(-)

diff --git a/package.json b/package.json
index 751486727401..511c60e3aaea 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
     "@angular/compiler": "~4.4.4",
     "@angular/core": "~4.4.4",
     "@angular/forms": "~4.4.4",
-    "@angular/http": "~4.4.4",
     "@angular/platform-browser": "~4.4.4",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
@@ -45,6 +44,7 @@
     "@angular/platform-server": "~4.4.4",
     "@angular/router": "~4.4.4",
     "@angular/tsc-wrapped": "~4.4.4",
+    "@angular/http": "~4.4.4",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^3.0.1",
diff --git a/scripts/closure-compiler/build-devapp-bundle.sh b/scripts/closure-compiler/build-devapp-bundle.sh
index f0efff42b318..0ef948ca2e8a 100755
--- a/scripts/closure-compiler/build-devapp-bundle.sh
+++ b/scripts/closure-compiler/build-devapp-bundle.sh
@@ -42,9 +42,9 @@ OPTS=(
   "--js_module_root=dist/releases/material-moment-adapter"
   "--js_module_root=node_modules/@angular/core"
   "--js_module_root=node_modules/@angular/common"
+  "--js_module_root=node_modules/@angular/common/http"
   "--js_module_root=node_modules/@angular/compiler"
   "--js_module_root=node_modules/@angular/forms"
-  "--js_module_root=node_modules/@angular/http"
   "--js_module_root=node_modules/@angular/router"
   "--js_module_root=node_modules/@angular/platform-browser"
   "--js_module_root=node_modules/@angular/platform-browser/animations"
@@ -65,9 +65,9 @@ OPTS=(
   # Include all Angular FESM bundles.
   node_modules/@angular/core/@angular/core.js
   node_modules/@angular/common/@angular/common.js
+  node_modules/@angular/common/@angular/common/http.js
   node_modules/@angular/compiler/@angular/compiler.js
   node_modules/@angular/forms/@angular/forms.js
-  node_modules/@angular/http/@angular/http.js
   node_modules/@angular/router/@angular/router.js
   node_modules/@angular/platform-browser/@angular/platform-browser.js
   node_modules/@angular/platform-browser/@angular/platform-browser/animations.js
diff --git a/src/demo-app/demo-app-module.ts b/src/demo-app/demo-app-module.ts
index 185fc2cad874..11b9268e16bd 100644
--- a/src/demo-app/demo-app-module.ts
+++ b/src/demo-app/demo-app-module.ts
@@ -1,6 +1,6 @@
 import {ApplicationRef, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
-import {HttpModule} from '@angular/http';
+import {HttpClientModule} from '@angular/common/http';
 import {RouterModule} from '@angular/router';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {ALL_ROUTES} from './demo-app/routes';
@@ -13,7 +13,7 @@ import {AccessibilityDemoModule} from './a11y/a11y-module';
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
-    HttpModule,
+    HttpClientModule,
     DemoModule,
     AccessibilityDemoModule,
     RouterModule.forRoot(ALL_ROUTES),
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index b42b8b36c17a..bd6c644d9bb7 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -9,13 +9,14 @@ System.config({
   map: {
     'rxjs': 'node:rxjs',
     'main': 'main.js',
+    'tslib': 'node:tslib/tslib.js',
     'moment': 'node:moment/min/moment-with-locales.min.js',
 
     // Angular specific mappings.
     '@angular/core': 'node:@angular/core/bundles/core.umd.js',
     '@angular/common': 'node:@angular/common/bundles/common.umd.js',
+    '@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
     '@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
-    '@angular/http': 'node:@angular/http/bundles/http.umd.js',
     '@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
     '@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
     '@angular/router': 'node:@angular/router/bundles/router.umd.js',
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 2e79b7f50120..4a6d5613faa2 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -10,12 +10,13 @@ System.config({
     'rxjs': 'node:rxjs',
     'main': 'main.js',
     'moment': 'node:moment/min/moment-with-locales.min.js',
+    'tslib': 'node:tslib/tslib.js',
 
     // Angular specific mappings.
     '@angular/core': 'node:@angular/core/bundles/core.umd.js',
     '@angular/common': 'node:@angular/common/bundles/common.umd.js',
+    '@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
     '@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
-    '@angular/http': 'node:@angular/http/bundles/http.umd.js',
     '@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
     '@angular/router': 'node:@angular/router/bundles/router.umd.js',
     '@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
diff --git a/src/lib/icon/fake-svgs.ts b/src/lib/icon/fake-svgs.ts
index cce128143837..6d38254123ca 100644
--- a/src/lib/icon/fake-svgs.ts
+++ b/src/lib/icon/fake-svgs.ts
@@ -6,69 +6,41 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Response, ResponseOptions} from '@angular/http';
-
 /**
  * Fake URLs and associated SVG documents used by tests.
  * @docs-private
  */
-const FAKE_SVGS = (() => {
-  const svgs = new Map<string, string>();
-  svgs.set('cat.svg',
-      '<svg><path id="meow"></path></svg>');
-
-  svgs.set('dog.svg',
-      '<svg><path id="woof"></path></svg>');
-
-  svgs.set('farm-set-1.svg', `
-      <svg>
-        <defs>
-          <g id="pig"><path id="oink"></path></g>
-          <g id="cow"><path id="moo"></path></g>
-        </defs>
-      </svg>
-  `);
-
-  svgs.set('farm-set-2.svg', `
-      <svg>
-        <defs>
-          <g id="cow"><path id="moo moo"></path></g>
-          <g id="sheep"><path id="baa"></path></g>
-        </defs>
-      </svg>
-  `);
-
-  svgs.set('farm-set-3.svg', `
-      <svg>
-        <symbol id="duck">
-          <path id="quack"></path>
-        </symbol>
-      </svg>
-  `);
-
-  svgs.set('arrow-set.svg', `
-      <svg>
-        <defs>
-          <svg id="left-arrow"><path id="left"></path></svg>
-          <svg id="right-arrow"><path id="right"></path></svg>
-        </defs>
-      </svg>
-  `);
-
-  return svgs;
-})();
-
-/**
- * Returns an HTTP response for a fake SVG URL.
- * @docs-private
- */
-export function getFakeSvgHttpResponse(url: string) {
-  if (FAKE_SVGS.has(url)) {
-    return new Response(new ResponseOptions({
-      status: 200,
-      body: FAKE_SVGS.get(url),
-    }));
-  } else {
-    return new Response(new ResponseOptions({status: 404}));
-  }
-}
+export const FAKE_SVGS = {
+  cat: '<svg><path id="meow"></path></svg>',
+  dog: '<svg><path id="woof"></path></svg>',
+  farmSet1: `
+    <svg>
+      <defs>
+        <g id="pig"><path id="oink"></path></g>
+        <g id="cow"><path id="moo"></path></g>
+      </defs>
+    </svg>
+  `,
+  farmSet2: `
+    <svg>
+      <defs>
+        <g id="cow"><path id="moo moo"></path></g>
+        <g id="sheep"><path id="baa"></path></g>
+      </defs>
+    </svg>
+  `,
+  farmSet3: `
+    <svg>
+      <symbol id="duck">
+        <path id="quack"></path>
+      </symbol>
+    </svg>
+  `,
+  arrows: `
+    <svg>
+      <defs>
+        <svg id="left-arrow"><path id="left"></path></svg>
+        <svg id="right-arrow"><path id="right"></path></svg>
+      </defs>
+    </svg>  `
+};
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 6c736a4a48c2..5b7ae760bb2e 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -8,7 +8,7 @@
 
 import {catchOperator, doOperator, finallyOperator, map, RxChain, share} from '@angular/cdk/rxjs';
 import {Injectable, Optional, SecurityContext, SkipSelf} from '@angular/core';
-import {Http} from '@angular/http';
+import {HttpClient} from '@angular/common/http';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
 import {forkJoin} from 'rxjs/observable/forkJoin';
@@ -32,8 +32,9 @@ export function getMatIconNameNotFoundError(iconName: string): Error {
  * @docs-private
  */
 export function getMatIconNoHttpProviderError(): Error {
-  return Error('Could not find Http provider for use with Angular Material icons. ' +
-               'Please include the HttpModule from @angular/http in your app imports.');
+  return Error('Could not find HttpClient provider for use with Angular Material icons. ' +
+               'Please include the HttpClientModule from @angular/common/http in your ' +
+               'app imports.');
 }
 
 
@@ -92,7 +93,7 @@ export class MatIconRegistry {
    */
   private _defaultFontSetClass = 'material-icons';
 
-  constructor(@Optional() private _http: Http, private _sanitizer: DomSanitizer) {}
+  constructor(@Optional() private _httpClient: HttpClient, private _sanitizer: DomSanitizer) {}
 
   /**
    * Registers an icon by URL in the default namespace.
@@ -442,7 +443,7 @@ export class MatIconRegistry {
    * cached, so future calls with the same URL may not cause another HTTP request.
    */
   private _fetchUrl(safeUrl: SafeResourceUrl): Observable<string> {
-    if (!this._http) {
+    if (!this._httpClient) {
       throw getMatIconNoHttpProviderError();
     }
 
@@ -463,8 +464,7 @@ export class MatIconRegistry {
 
     // TODO(jelbourn): for some reason, the `finally` operator "loses" the generic type on the
     // Observable. Figure out why and fix it.
-    const req = RxChain.from(this._http.get(url))
-      .call(map, response => response.text())
+    const req = RxChain.from(this._httpClient.get(url, { responseType: 'text' }))
       .call(finallyOperator, () => this._inProgressUrlFetches.delete(url))
       .call(share)
       .result();
@@ -476,15 +476,19 @@ export class MatIconRegistry {
 
 /** @docs-private */
 export function ICON_REGISTRY_PROVIDER_FACTORY(
-    parentRegistry: MatIconRegistry, http: Http, sanitizer: DomSanitizer) {
-  return parentRegistry || new MatIconRegistry(http, sanitizer);
+    parentRegistry: MatIconRegistry, httpClient: HttpClient, sanitizer: DomSanitizer) {
+  return parentRegistry || new MatIconRegistry(httpClient, sanitizer);
 }
 
 /** @docs-private */
 export const ICON_REGISTRY_PROVIDER = {
-  // If there is already an MatIconRegistry available, use that. Otherwise, provide a new one.
+  // If there is already an MdIconRegistry available, use that. Otherwise, provide a new one.
   provide: MatIconRegistry,
-  deps: [[new Optional(), new SkipSelf(), MatIconRegistry], [new Optional(), Http], DomSanitizer],
+  deps: [
+    [new Optional(), new SkipSelf(), MatIconRegistry],
+    [new Optional(), HttpClient],
+    DomSanitizer
+  ],
   useFactory: ICON_REGISTRY_PROVIDER_FACTORY
 };
 
diff --git a/src/lib/icon/icon.spec.ts b/src/lib/icon/icon.spec.ts
index b84adc46734e..4b34fd0c0ebb 100644
--- a/src/lib/icon/icon.spec.ts
+++ b/src/lib/icon/icon.spec.ts
@@ -1,11 +1,10 @@
 import {inject, async, fakeAsync, tick, TestBed} from '@angular/core/testing';
 import {SafeResourceUrl, DomSanitizer} from '@angular/platform-browser';
-import {HttpModule, XHRBackend} from '@angular/http';
-import {MockBackend} from '@angular/http/testing';
+import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
 import {Component} from '@angular/core';
 import {MatIconModule} from './index';
 import {MatIconRegistry, getMatIconNoHttpProviderError} from './icon-registry';
-import {getFakeSvgHttpResponse} from './fake-svgs';
+import {FAKE_SVGS} from './fake-svgs';
 import {wrappedErrorMessage} from '@angular/cdk/testing';
 
 
@@ -40,7 +39,7 @@ describe('MatIcon', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [HttpModule, MatIconModule],
+      imports: [HttpClientTestingModule, MatIconModule],
       declarations: [
         IconWithColor,
         IconWithLigature,
@@ -48,10 +47,6 @@ describe('MatIcon', () => {
         IconFromSvgName,
         IconWithAriaHiddenFalse,
         IconWithBindingAndNgIf,
-      ],
-      providers: [
-        MockBackend,
-        {provide: XHRBackend, useExisting: MockBackend},
       ]
     });
 
@@ -59,22 +54,15 @@ describe('MatIcon', () => {
   }));
 
   let iconRegistry: MatIconRegistry;
+  let http: HttpTestingController;
   let sanitizer: DomSanitizer;
-  let httpRequestUrls: string[];
 
-  let deps = [MatIconRegistry, MockBackend, DomSanitizer];
-  beforeEach(inject(deps, (mir: MatIconRegistry, mockBackend: MockBackend, ds: DomSanitizer) => {
-    iconRegistry = mir;
-    sanitizer = ds;
-    // Keep track of requests so we can verify caching behavior.
-    // Return responses for the SVGs defined in fake-svgs.ts.
-    httpRequestUrls = [];
-    mockBackend.connections.subscribe((connection: any) => {
-      const url = connection.request.url;
-      httpRequestUrls.push(url);
-      connection.mockRespond(getFakeSvgHttpResponse(url));
-    });
-  }));
+  beforeEach(inject([MatIconRegistry, HttpTestingController, DomSanitizer],
+    (mir: MatIconRegistry, h: HttpTestingController, ds: DomSanitizer) => {
+      iconRegistry = mir;
+      http = h;
+      sanitizer = ds;
+    }));
 
   it('should apply class based on color attribute', () => {
     let fixture = TestBed.createComponent(IconWithColor);
@@ -131,28 +119,29 @@ describe('MatIcon', () => {
       iconRegistry.addSvgIcon('fido', trust('dog.svg'));
 
       let fixture = TestBed.createComponent(IconFromSvgName);
-      const testComponent = fixture.componentInstance;
-      const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: SVGElement;
+      const testComponent = fixture.componentInstance;
+      const mdIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
 
       testComponent.iconName = 'fido';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(matIconElement);
+      http.expectOne('dog.svg').flush(FAKE_SVGS.dog);
+      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
       verifyPathChildElement(svgElement, 'woof');
 
       // Change the icon, and the SVG element should be replaced.
       testComponent.iconName = 'fluffy';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(matIconElement);
+      http.expectOne('cat.svg').flush(FAKE_SVGS.cat);
+      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
       verifyPathChildElement(svgElement, 'meow');
 
-      expect(httpRequestUrls).toEqual(['dog.svg', 'cat.svg']);
       // Using an icon from a previously loaded URL should not cause another HTTP request.
       testComponent.iconName = 'fido';
       fixture.detectChanges();
-      svgElement = verifyAndGetSingleSvgChild(matIconElement);
+      http.expectNone('dog.svg');
+      svgElement = verifyAndGetSingleSvgChild(mdIconElement);
       verifyPathChildElement(svgElement, 'woof');
-      expect(httpRequestUrls).toEqual(['dog.svg', 'cat.svg']);
 
       // Assert that a registered icon can be looked-up by url.
       iconRegistry.getSvgIconFromUrl(trust('cat.svg')).subscribe(element => {
@@ -185,8 +174,7 @@ describe('MatIcon', () => {
     it('should extract icon from SVG icon set', () => {
       iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-1.svg'));
 
-      let fixture = TestBed.createComponent(IconFromSvgName);
-
+      const fixture = TestBed.createComponent(IconFromSvgName);
       const testComponent = fixture.componentInstance;
       const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
@@ -194,6 +182,7 @@ describe('MatIcon', () => {
 
       testComponent.iconName = 'farm:pig';
       fixture.detectChanges();
+      http.expectOne('farm-set-1.svg').flush(FAKE_SVGS.farmSet1);
 
       expect(matIconElement.childNodes.length).toBe(1);
       svgElement = verifyAndGetSingleSvgChild(matIconElement);
@@ -218,10 +207,8 @@ describe('MatIcon', () => {
     it('should allow multiple icon sets in a namespace', () => {
       iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-1.svg'));
       iconRegistry.addSvgIconSetInNamespace('farm', trust('farm-set-2.svg'));
-      iconRegistry.addSvgIconSetInNamespace('arrows', trust('arrow-set.svg'));
-
-      let fixture = TestBed.createComponent(IconFromSvgName);
 
+      const fixture = TestBed.createComponent(IconFromSvgName);
       const testComponent = fixture.componentInstance;
       const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
@@ -229,6 +216,9 @@ describe('MatIcon', () => {
 
       testComponent.iconName = 'farm:pig';
       fixture.detectChanges();
+      http.expectOne('farm-set-1.svg').flush(FAKE_SVGS.farmSet1);
+      http.expectOne('farm-set-2.svg').flush(FAKE_SVGS.farmSet2);
+
       svgElement = verifyAndGetSingleSvgChild(matIconElement);
       expect(svgElement.childNodes.length).toBe(1);
       svgChild = svgElement.childNodes[0];
@@ -238,9 +228,6 @@ describe('MatIcon', () => {
       expect(svgChild.childNodes.length).toBe(1);
       verifyPathChildElement(svgChild, 'oink');
 
-      // Both icon sets registered in the 'farm' namespace should have been fetched.
-      expect(httpRequestUrls.sort()).toEqual(['farm-set-1.svg', 'farm-set-2.svg']);
-
       // Change the icon name to one that appears in both icon sets. The icon from the set that
       // was registered last should be used (with id attribute of 'moo moo' instead of 'moo'),
       // and no additional HTTP request should be made.
@@ -253,7 +240,6 @@ describe('MatIcon', () => {
       expect(svgChild.getAttribute('id')).toBe('cow');
       expect(svgChild.childNodes.length).toBe(1);
       verifyPathChildElement(svgChild, 'moo moo');
-      expect(httpRequestUrls.sort()).toEqual(['farm-set-1.svg', 'farm-set-2.svg']);
     });
 
     it('should unwrap <symbol> nodes', () => {
@@ -265,6 +251,7 @@ describe('MatIcon', () => {
 
       testComponent.iconName = 'farm:duck';
       fixture.detectChanges();
+      http.expectOne('farm-set-3.svg').flush(FAKE_SVGS.farmSet3);
 
       const svgElement = verifyAndGetSingleSvgChild(matIconElement);
       const firstChild = svgElement.childNodes[0];
@@ -278,14 +265,15 @@ describe('MatIcon', () => {
     it('should not wrap <svg> elements in icon sets in another svg tag', () => {
       iconRegistry.addSvgIconSet(trust('arrow-set.svg'));
 
-      let fixture = TestBed.createComponent(IconFromSvgName);
-
+      const fixture = TestBed.createComponent(IconFromSvgName);
       const testComponent = fixture.componentInstance;
       const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
 
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
+      http.expectOne('arrow-set.svg').flush(FAKE_SVGS.arrows);
+
       // arrow-set.svg stores its icons as nested <svg> elements, so they should be used
       // directly and not wrapped in an outer <svg> tag like the <g> elements in other sets.
       svgElement = verifyAndGetSingleSvgChild(matIconElement);
@@ -295,14 +283,14 @@ describe('MatIcon', () => {
     it('should return unmodified copies of icons from icon sets', () => {
       iconRegistry.addSvgIconSet(trust('arrow-set.svg'));
 
-      let fixture = TestBed.createComponent(IconFromSvgName);
-
+      const fixture = TestBed.createComponent(IconFromSvgName);
       const testComponent = fixture.componentInstance;
       const matIconElement = fixture.debugElement.nativeElement.querySelector('mat-icon');
       let svgElement: any;
 
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
+      http.expectOne('arrow-set.svg').flush(FAKE_SVGS.arrows);
       svgElement = verifyAndGetSingleSvgChild(matIconElement);
       verifyPathChildElement(svgElement, 'left');
       // Modify the SVG element by setting a viewBox attribute.
@@ -328,6 +316,7 @@ describe('MatIcon', () => {
       const fixture = TestBed.createComponent(IconWithBindingAndNgIf);
 
       fixture.detectChanges();
+      http.expectOne('cat.svg').flush(FAKE_SVGS.cat);
 
       expect(() => {
         fixture.componentInstance.showIcon = false;
@@ -348,6 +337,7 @@ describe('MatIcon', () => {
 
       testComponent.iconName = 'left-arrow';
       fixture.detectChanges();
+      http.expectOne('arrow-set.svg').flush(FAKE_SVGS.arrows);
 
       expect(icon.querySelector('svg')).toBeTruthy();
 
@@ -392,7 +382,7 @@ describe('MatIcon', () => {
 });
 
 
-describe('MatIcon without HttpModule', () => {
+describe('MatIcon without HttpClientModule', () => {
   let iconRegistry: MatIconRegistry;
   let sanitizer: DomSanitizer;
 
diff --git a/src/material-examples/package.json b/src/material-examples/package.json
index e27be11e754c..958a86fc1e86 100644
--- a/src/material-examples/package.json
+++ b/src/material-examples/package.json
@@ -26,7 +26,6 @@
     "@angular/cdk": "0.0.0-PLACEHOLDER",
     "@angular/core": "0.0.0-NG",
     "@angular/common": "0.0.0-NG",
-    "@angular/http": "0.0.0-NG",
     "@angular/material": "0.0.0-PLACEHOLDER",
     "@angular/material-moment-adapter": "0.0.0-PLACEHOLDER"
   },
diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index 1283f2b890a2..8dd5f2d36265 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {Http} from '@angular/http';
+import {HttpClient} from '@angular/common/http';
 import {DataSource} from '@angular/cdk/collections';
 import {MatPaginator, MatSort} from '@angular/material';
 import {Observable} from 'rxjs/Observable';
@@ -20,16 +20,16 @@ import 'rxjs/add/operator/switchMap';
 })
 export class TableHttpExample implements OnInit {
   displayedColumns = ['created_at', 'state', 'number', 'title'];
-  exampleDatabase: ExampleHttpDao | null;
+  exampleDatabase: ExampleHttpDataSource | null;
   dataSource: ExampleDataSource | null;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  constructor(private http: Http) {}
+  constructor(private _httpClient: HttpClient) {}
 
   ngOnInit() {
-    this.exampleDatabase = new ExampleHttpDao(this.http);
+    this.exampleDatabase = new ExampleHttpDataSource(this._httpClient);
     this.dataSource = new ExampleDataSource(
       this.exampleDatabase!, this.paginator, this.sort);
   }
@@ -48,16 +48,15 @@ export interface GithubIssue {
 }
 
 /** An example database that the data source uses to retrieve data for the table. */
-export class ExampleHttpDao {
-  constructor(private http: Http) {}
+export class ExampleHttpDataSource {
+  constructor(private _httpClient: HttpClient) {}
 
   getRepoIssues(sort: string, order: string, page: number): Observable<GithubApi> {
     const href = 'https://api.github.com/search/issues';
     const requestUrl =
       `${href}?q=repo:angular/material2&sort=${sort}&order=${order}&page=${page + 1}`;
 
-    return this.http.get(requestUrl)
-                    .map(response => response.json() as GithubApi);
+    return this._httpClient.get<GithubApi>(requestUrl);
   }
 }
 
@@ -74,7 +73,7 @@ export class ExampleDataSource extends DataSource<GithubIssue> {
   isLoadingResults = false;
   isRateLimitReached = false;
 
-  constructor(private exampleDatabase: ExampleHttpDao,
+  constructor(private exampleDatabase: ExampleHttpDataSource,
               private paginator: MatPaginator,
               private sort: MatSort) {
     super();
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index a8d31ac482ff..55335ad0e3a4 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -20,6 +20,7 @@ System.config({
   map: {
     'rxjs': 'node:rxjs',
     'main': 'main.js',
+    'tslib': 'node:tslib/tslib.js',
     'moment': 'node:moment/min/moment-with-locales.min.js',
 
     // Angular specific mappings.
@@ -27,10 +28,10 @@ System.config({
     '@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.js',
     '@angular/common': 'node:@angular/common/bundles/common.umd.js',
     '@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.js',
+    '@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
+    '@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.js',
     '@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
     '@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.js',
-    '@angular/http': 'node:@angular/http/bundles/http.umd.js',
-    '@angular/http/testing': 'node:@angular/http/bundles/http-testing.umd.js',
     '@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
     '@angular/forms/testing': 'node:@angular/forms/bundles/forms-testing.umd.js',
     '@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 084ca759df91..30399610d2ab 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -17,6 +17,7 @@ module.exports = (config) => {
     ],
     files: [
       {pattern: 'node_modules/core-js/client/core.js', included: true, watched: false},
+      {pattern: 'node_modules/tslib/tslib.js', included: true, watched: false},
       {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false},
       {pattern: 'node_modules/zone.js/dist/zone.js', included: true, watched: false},
       {pattern: 'node_modules/zone.js/dist/proxy.js', included: true, watched: false},
diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index 6f40ff784e83..50efa57f3891 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -16,7 +16,6 @@
     "@angular/compiler": "^4.4.4",
     "@angular/core": "^4.4.4",
     "@angular/forms": "^4.4.4",
-    "@angular/http": "^4.4.4",
     "@angular/material": "github:angular/material2-builds",
     "@angular/platform-browser": "^4.4.4",
     "@angular/platform-browser-dynamic": "^4.4.4",
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 4409759e6ce2..2748e7c5f209 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -32,7 +32,7 @@ export const rollupGlobals = {
   '@angular/core': 'ng.core',
   '@angular/common': 'ng.common',
   '@angular/forms': 'ng.forms',
-  '@angular/http': 'ng.http',
+  '@angular/common/http': 'ng.common.http',
   '@angular/router': 'ng.router',
   '@angular/platform-browser': 'ng.platformBrowser',
   '@angular/platform-server': 'ng.platformServer',
@@ -40,7 +40,7 @@ export const rollupGlobals = {
   '@angular/platform-browser/animations': 'ng.platformBrowser.animations',
   '@angular/core/testing': 'ng.core.testing',
   '@angular/common/testing': 'ng.common.testing',
-  '@angular/http/testing': 'ng.http.testing',
+  '@angular/common/http/testing': 'ng.common.http.testing',
 
   // Some packages are not really needed for the UMD bundles, but for the missingRollupGlobals rule.
   '@angular/material-examples': 'ng.materialExamples',
diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index 5ec860168667..13f79650e3a5 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -16,7 +16,6 @@
     "@angular/compiler-cli": "^4.4.4",
     "@angular/core": "^4.4.4",
     "@angular/forms": "^4.4.4",
-    "@angular/http": "^4.4.4",
     "@angular/material": "angular/material2-builds",
     "@angular/platform-browser": "^4.4.4",
     "@angular/platform-browser-dynamic": "^4.4.4",
diff --git a/tools/screenshot-test/src/app/firebase.service.ts b/tools/screenshot-test/src/app/firebase.service.ts
index fed28b72a409..3fcb235b2bb1 100644
--- a/tools/screenshot-test/src/app/firebase.service.ts
+++ b/tools/screenshot-test/src/app/firebase.service.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {Http} from '@angular/http';
+import {HttpClient} from '@angular/common/http';
 import * as firebase from 'firebase';
 import 'rxjs/add/operator/toPromise';
 
@@ -17,7 +17,7 @@ export class FirebaseService {
   /** The screenshot results */
   screenshotResultSummary: ScreenshotResultSummary;
 
-  constructor(private _http: Http) {
+  constructor(private _httpClient: HttpClient) {
     // Initialize Firebase
     firebase.initializeApp(config.firebase);
 
@@ -157,19 +157,17 @@ export class FirebaseService {
     let url =
       `https://api.github.com/repos/${config.repoSlug}/commits/` +
       `${this.screenshotResultSummary.sha}/status`;
-    return this._http.get(url).toPromise()
-      .then((response) => {
-        let statusResponse = response.json();
-        let screenshotStatus = statusResponse.statuses.find((status) =>
-          status.context === 'Screenshot Tests');
-        switch (screenshotStatus && screenshotStatus.state) {
-          case 'success':
-            this.screenshotResultSummary.githubStatus = true;
-            break;
-          case 'failure':
-            this.screenshotResultSummary.githubStatus = false;
-            return;
-        }
-      });
+    return this._httpClient.get<{statuses: any[]}>(url).toPromise().then(response => {
+      const screenshotStatus = response.statuses.find(status =>
+        status.context === 'Screenshot Tests');
+      switch (screenshotStatus && screenshotStatus.state) {
+        case 'success':
+          this.screenshotResultSummary.githubStatus = true;
+          break;
+        case 'failure':
+          this.screenshotResultSummary.githubStatus = false;
+          return;
+      }
+    });
   }
 }
diff --git a/tools/screenshot-test/src/app/pixacto.dashboard.module.ts b/tools/screenshot-test/src/app/pixacto.dashboard.module.ts
index 03e1f733edb9..a20f03989c89 100644
--- a/tools/screenshot-test/src/app/pixacto.dashboard.module.ts
+++ b/tools/screenshot-test/src/app/pixacto.dashboard.module.ts
@@ -1,7 +1,7 @@
 import {BrowserModule} from '@angular/platform-browser';
 import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
-import {HttpModule} from '@angular/http';
+import {HttpClientModule} from '@angular/common/http';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {FirebaseService} from './firebase.service';
 import {routing} from './routes';
@@ -39,7 +39,7 @@ export class PixactoMaterialModule {}
     BrowserModule,
     BrowserAnimationsModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     PixactoMaterialModule,
     routing,
   ],

From f8062865f757cb779df123e74607d233c8a9468d Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 27 Oct 2017 09:55:31 -0700
Subject: [PATCH 354/575] fix(table): update implicit when using trackby
 (#7893)

* fix(table): update implicit when using trackby

* imports

* syntax change
---
 src/cdk/table/table.spec.ts | 18 ++++++++++++++++
 src/cdk/table/table.ts      | 42 +++++++++++++++++++++++++------------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index 72d26ac3d670..6c4bbbd6dd47 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -391,6 +391,24 @@ describe('CdkTable', () => {
       expect(changedRows[1].getAttribute('initialIndex')).toBe('1');
       expect(changedRows[2].getAttribute('initialIndex')).toBe(null);
     });
+
+    it('should change row implicit data even when trackBy finds no changes', () => {
+      createTestComponentWithTrackyByTable('index');
+      const firstRow = getRows(tableElement)[0];
+      expect(firstRow.textContent!.trim()).toBe('a_1 b_1');
+      expect(firstRow.getAttribute('initialIndex')).toBe('0');
+      mutateData();
+
+      // Change each item reference to show that the trackby is checking the index.
+      // Otherwise this would cause them all to be removed/added.
+      trackByComponent.dataSource.data = trackByComponent.dataSource.data
+          .map(item => ({a: item.a, b: item.b, c: item.c}));
+
+      // Expect the rows were given the right implicit data even though the rows were not moved.
+      trackByFixture.detectChanges();
+      expect(firstRow.textContent!.trim()).toBe('a_2 b_2');
+      expect(firstRow.getAttribute('initialIndex')).toBe('0');
+    });
   });
 
   it('should match the right table content with dynamic data', () => {
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index eb70b25f5fd2..245501575bb3 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -37,7 +37,8 @@ import {Subscription} from 'rxjs/Subscription';
 import {Subject} from 'rxjs/Subject';
 import {CdkCellDef, CdkColumnDef, CdkHeaderCellDef} from './cell';
 import {
-  getTableDuplicateColumnNameError, getTableMissingMatchingRowDefError,
+  getTableDuplicateColumnNameError,
+  getTableMissingMatchingRowDefError,
   getTableMultipleDefaultRowDefsError,
   getTableUnknownColumnError
 } from './table-errors';
@@ -68,6 +69,12 @@ export const CDK_TABLE_TEMPLATE = `
   <ng-container headerRowPlaceholder></ng-container>
   <ng-container rowPlaceholder></ng-container>`;
 
+/**
+ * Class used to conveniently type the embedded view ref for rows with a context.
+ * @docs-private
+ */
+abstract class RowViewRef<T> extends EmbeddedViewRef<CdkCellOutletRowContext<T>> { }
+
 /**
  * A data table that connects with a data source to retrieve data of type `T` and renders
  * a header row and data rows. Updates the rows when new data is provided by the data source.
@@ -292,25 +299,36 @@ export class CdkTable<T> implements CollectionViewer {
     this._changeDetectorRef.markForCheck();
   }
 
-  /** Check for changes made in the data and render each change (row added/removed/moved). */
+  /**
+   * Check for changes made in the data and render each change (row added/removed/moved) and update
+   * row contexts.
+   */
   private _renderRowChanges() {
     const changes = this._dataDiffer.diff(this._data);
     if (!changes) { return; }
 
     const viewContainer = this._rowPlaceholder.viewContainer;
     changes.forEachOperation(
-        (item: IterableChangeRecord<any>, adjustedPreviousIndex: number, currentIndex: number) => {
-          if (item.previousIndex == null) {
-            this._insertRow(this._data[currentIndex], currentIndex);
+        (record: IterableChangeRecord<T>, adjustedPreviousIndex: number, currentIndex: number) => {
+          if (record.previousIndex == null) {
+            this._insertRow(record.item, currentIndex);
           } else if (currentIndex == null) {
             viewContainer.remove(adjustedPreviousIndex);
           } else {
-            const view = viewContainer.get(adjustedPreviousIndex);
+            const view = <RowViewRef<T>>viewContainer.get(adjustedPreviousIndex);
             viewContainer.move(view!, currentIndex);
           }
         });
 
-    this._updateRowContext();
+    // Update the meta context of a row's context data (index, count, first, last, ...)
+    this._updateRowIndexContext();
+
+    // Update rows that did not get added/removed/moved but may have had their identity changed,
+    // e.g. if trackBy matched data on some property but the actual data reference changed.
+    changes.forEachIdentityChange((record: IterableChangeRecord<T>) => {
+      const rowView = <RowViewRef<T>>viewContainer.get(record.currentIndex!);
+      rowView.context.$implicit = record.item;
+    });
   }
 
   /**
@@ -353,14 +371,13 @@ export class CdkTable<T> implements CollectionViewer {
   }
 
   /**
-   * Updates the context for each row to reflect any data changes that may have caused
-   * rows to be added, removed, or moved. The view container contains the same context
-   * that was provided to each of its cells.
+   * Updates the index-related context for each row to reflect any changes in the index of the rows,
+   * e.g. first/last/even/odd.
    */
-  private _updateRowContext() {
+  private _updateRowIndexContext() {
     const viewContainer = this._rowPlaceholder.viewContainer;
     for (let index = 0, count = viewContainer.length; index < count; index++) {
-      const viewRef = viewContainer.get(index) as EmbeddedViewRef<CdkCellOutletRowContext<T>>;
+      const viewRef = viewContainer.get(index) as RowViewRef<T>;
       viewRef.context.index = index;
       viewRef.context.count = count;
       viewRef.context.first = index === 0;
@@ -404,4 +421,3 @@ export class CdkTable<T> implements CollectionViewer {
     });
   }
 }
-

From dcef6045063a569ef0a8a8898d1180282c8016be Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 27 Oct 2017 18:56:04 +0200
Subject: [PATCH 355/575] refactor: remove compatibility mode (#7689)

Since the switch to the `mat-` prefix, the compatibility mode is no longer necessary. These changes remove anything that was left.

BREAKING CHANGE:
The `MATERIAL_COMPATIBILITY_MODE`, `CompatibilityModule`, `NoConflictStyleCompatibilityMode`, `MatPrefixRejector`, `MdPrefixRejector` symbols have been removed.
---
 .github/CODEOWNERS                            |   1 -
 guides/compatibility-mode.md                  |  22 --
 .../core/common-behaviors/common-module.ts    |   7 +-
 .../core/compatibility/compatibility.spec.ts  |   0
 src/lib/core/compatibility/compatibility.ts   | 205 ------------------
 src/lib/core/public-api.ts                    |   1 -
 src/lib/stepper/stepper.spec.ts               |  24 +-
 .../kitchen-sink/kitchen-sink.ts              |   2 +
 8 files changed, 11 insertions(+), 251 deletions(-)
 delete mode 100644 guides/compatibility-mode.md
 delete mode 100644 src/lib/core/compatibility/compatibility.spec.ts
 delete mode 100644 src/lib/core/compatibility/compatibility.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6fc4773ddc31..9096acabe297 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,7 +35,6 @@
 /src/lib/core/*                                    @jelbourn
 /src/lib/core/animation/**                         @jelbourn
 /src/lib/core/common-behaviors/**                  @jelbourn
-/src/lib/core/compatibility/**                     @jelbourn
 /src/lib/core/datetime/**                          @mmalerba
 /src/lib/core/error/**                             @crisbeto @mmalerba
 /src/lib/core/gestures/**                          @jelbourn
diff --git a/guides/compatibility-mode.md b/guides/compatibility-mode.md
deleted file mode 100644
index 0efea29183f3..000000000000
--- a/guides/compatibility-mode.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## What is compatibility mode?
-Compatibility mode for `@angular/material` allows the components to exist side-by-side with
-AngularJS Material components without any CSS collisions.
-
-## What does compatibility mode do?
-When enabled, compatibility mode enforces that all template APIs use the prefix `mat-` instead of
-`md-`. This will prevent any CSS from AngularJS Material from affecting the components in
-`@angular/material`.
-
-## How is compatibility mode enabled?
-Import `NoConflictStyleCompatibilityMode` into your application's root `NgModule`.
-
-
-## Example
-
-```html
-<!-- Regular mode -->
-<button md-button mdTooltip="With a tooltip">Regular button</button>
-
-<!-- In compatibility mode -->
-<button mat-button matTooltip="With a compatibility mode tooltip">Compatibility Mode button</button>
-```
diff --git a/src/lib/core/common-behaviors/common-module.ts b/src/lib/core/common-behaviors/common-module.ts
index b2fb6f0865b8..991ee6594fa8 100644
--- a/src/lib/core/common-behaviors/common-module.ts
+++ b/src/lib/core/common-behaviors/common-module.ts
@@ -8,7 +8,6 @@
 
 import {NgModule, InjectionToken, Optional, Inject, isDevMode} from '@angular/core';
 import {BidiModule} from '@angular/cdk/bidi';
-import {CompatibilityModule} from '../compatibility/compatibility';
 
 
 /** Injection token that configures whether the Material sanity checks are enabled. */
@@ -17,13 +16,13 @@ export const MATERIAL_SANITY_CHECKS = new InjectionToken<boolean>('mat-sanity-ch
 
 /**
  * Module that captures anything that should be loaded and/or run for *all* Angular Material
- * components. This includes Bidi, compatibility mode, etc.
+ * components. This includes Bidi, etc.
  *
  * This module should be imported to each top-level component module (e.g., MatTabsModule).
  */
 @NgModule({
-  imports: [CompatibilityModule, BidiModule],
-  exports: [CompatibilityModule, BidiModule],
+  imports: [BidiModule],
+  exports: [BidiModule],
   providers: [{
     provide: MATERIAL_SANITY_CHECKS, useValue: true,
   }],
diff --git a/src/lib/core/compatibility/compatibility.spec.ts b/src/lib/core/compatibility/compatibility.spec.ts
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts
deleted file mode 100644
index ce0f0040e620..000000000000
--- a/src/lib/core/compatibility/compatibility.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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, InjectionToken, NgModule} from '@angular/core';
-
-export const MATERIAL_COMPATIBILITY_MODE = new InjectionToken<boolean>('md-compatibility-mode');
-
-/** Selector that matches all elements that may have style collisions with AngularJS Material. */
-export const MAT_ELEMENTS_SELECTOR = `
-  [mat-button],
-  [mat-fab],
-  [mat-icon-button],
-  [mat-mini-fab],
-  [mat-raised-button],
-  [matCardSubtitle],
-  [matCardTitle],
-  [matCellDef],
-  [matColumnDef],
-  [matDialogActions],
-  [matDialogClose],
-  [matDialogContent],
-  [matDialogTitle],
-  [matHeaderCellDef],
-  [matHeaderRowDef],
-  [matLine],
-  [matRowDef],
-  [matStepLabel],
-  [matStepperNext],
-  [matStepperPrevious],
-  [matTabLabel],
-  [matTabLink],
-  [matTabNav],
-  [matTooltip],
-  [matInput],
-  [matPrefix],
-  [matSuffix],
-  mat-autocomplete,
-  mat-button-toggle,
-  mat-button-toggle,
-  mat-button-toggle-group,
-  mat-card,
-  mat-card-actions,
-  mat-card-content,
-  mat-card-footer,
-  mat-card-header,
-  mat-card-subtitle,
-  mat-card-title,
-  mat-card-title-group,
-  mat-cell,
-  mat-checkbox,
-  mat-chip,
-  mat-dialog-actions,
-  mat-dialog-container,
-  mat-dialog-content,
-  mat-divider,
-  mat-error,
-  mat-grid-list,
-  mat-grid-tile,
-  mat-grid-tile-footer,
-  mat-grid-tile-header,
-  mat-header-cell,
-  mat-header-row,
-  mat-hint,
-  mat-horizontal-stepper,
-  mat-icon,
-  mat-input-container,
-  mat-form-field,
-  mat-list,
-  mat-list-item,
-  mat-menu,
-  mat-nav-list,
-  mat-option,
-  mat-placeholder,
-  mat-progress-bar,
-  mat-pseudo-checkbox,
-  mat-radio-button,
-  mat-radio-group,
-  mat-row,
-  mat-select,
-  mat-sidenav,
-  mat-sidenav-container,
-  mat-slider,
-  mat-spinner,
-  mat-step,
-  mat-tab,
-  mat-table,
-  mat-tab-group,
-  mat-toolbar,
-  mat-vertical-stepper`;
-
-/** Selector that matches all elements that may have style collisions with AngularJS Material. */
-export const MD_ELEMENTS_SELECTOR = `
-  [md-button],
-  [md-fab],
-  [md-icon-button],
-  [md-mini-fab],
-  [md-raised-button],
-  [mdCardSubtitle],
-  [mdCardTitle],
-  [mdCellDef],
-  [mdColumnDef],
-  [mdDialogActions],
-  [mdDialogClose],
-  [mdDialogContent],
-  [mdDialogTitle],
-  [mdHeaderCellDef],
-  [mdHeaderRowDef],
-  [mdLine],
-  [mdRowDef],
-  [mdStepLabel],
-  [mdStepperNext],
-  [mdStepperPrevious],
-  [mdTabLabel],
-  [mdTabLink],
-  [mdTabNav],
-  [mdTooltip],
-  [mdInput],
-  [mdPrefix],
-  [mdSuffix],
-  md-autocomplete,
-  md-button-toggle,
-  md-button-toggle,
-  md-button-toggle-group,
-  md-card,
-  md-card-actions,
-  md-card-content,
-  md-card-footer,
-  md-card-header,
-  md-card-subtitle,
-  md-card-title,
-  md-card-title-group,
-  md-cell,
-  md-checkbox,
-  md-chip,
-  md-dialog-actions,
-  md-dialog-container,
-  md-dialog-content,
-  md-divider,
-  md-error,
-  md-grid-list,
-  md-grid-tile,
-  md-grid-tile-footer,
-  md-grid-tile-header,
-  md-header-cell,
-  md-header-row,
-  md-hint,
-  md-horizontal-stepper,
-  md-icon,
-  md-input-container,
-  md-form-field,
-  md-list,
-  md-list-item,
-  md-menu,
-  md-nav-list,
-  md-option,
-  md-placeholder,
-  md-progress-bar,
-  md-pseudo-checkbox,
-  md-radio-button,
-  md-radio-group,
-  md-row,
-  md-select,
-  md-sidenav,
-  md-sidenav-container,
-  md-slider,
-  md-spinner,
-  md-step,
-  md-tab,
-  md-table,
-  md-tab-group,
-  md-toolbar,
-  md-vertical-stepper`;
-
-/** Directive that enforces that the `mat-` prefix cannot be used. */
-@Directive({selector: MAT_ELEMENTS_SELECTOR})
-export class MatPrefixRejector {}
-
-/** Directive that enforces that the `md-` prefix cannot be used. */
-@Directive({selector: MD_ELEMENTS_SELECTOR})
-export class MdPrefixRejector {}
-
-
-/**
- * Module that enforces the default compatibility mode settings. When this module is loaded
- * without NoConflictStyleCompatibilityMode also being imported, it will throw an error if
- * there are any uses of the `mat-` prefix.
- */
-@NgModule({
-  declarations: [MatPrefixRejector, MdPrefixRejector],
-  exports: [MatPrefixRejector, MdPrefixRejector],
-})
-export class CompatibilityModule {}
-
-
-/**
- * Module that enforces "no-conflict" compatibility mode settings. When this module is loaded,
- * it will throw an error if there are any uses of the `md-` prefix.
- */
-@NgModule()
-export class NoConflictStyleCompatibilityMode {}
diff --git a/src/lib/core/public-api.ts b/src/lib/core/public-api.ts
index 7b8efd834400..9e4fdd29cf84 100644
--- a/src/lib/core/public-api.ts
+++ b/src/lib/core/public-api.ts
@@ -8,7 +8,6 @@
 
 export * from './animation/animation';
 export * from './common-behaviors/index';
-export * from './compatibility/compatibility';
 export * from './datetime/index';
 export * from './error/error-options';
 export * from './gestures/gesture-annotations';
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 7413e001946f..3e25aaf9465c 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -722,9 +722,7 @@ class SimpleMatHorizontalStepperApp {
       <mat-step [stepControl]="oneGroup">
         <form [formGroup]="oneGroup">
           <ng-template matStepLabel>Step one</ng-template>
-          <mat-form-field>
-            <input matInput formControlName="oneCtrl" required>
-          </mat-form-field>
+          <input formControlName="oneCtrl" required>
           <div>
             <button mat-button matStepperPrevious>Back</button>
             <button mat-button matStepperNext>Next</button>
@@ -734,9 +732,7 @@ class SimpleMatHorizontalStepperApp {
       <mat-step [stepControl]="twoGroup">
         <form [formGroup]="twoGroup">
           <ng-template matStepLabel>Step two</ng-template>
-          <mat-form-field>
-            <input matInput formControlName="twoCtrl" required>
-          </mat-form-field>
+          <input formControlName="twoCtrl" required>
           <div>
             <button mat-button matStepperPrevious>Back</button>
             <button mat-button matStepperNext>Next</button>
@@ -746,9 +742,7 @@ class SimpleMatHorizontalStepperApp {
       <mat-step [stepControl]="threeGroup" optional>
         <form [formGroup]="threeGroup">
           <ng-template matStepLabel>Step two</ng-template>
-          <mat-form-field>
-            <input matInput formControlName="threeCtrl">
-          </mat-form-field>
+          <input formControlName="threeCtrl">
           <div>
             <button mat-button matStepperPrevious>Back</button>
             <button mat-button matStepperNext>Next</button>
@@ -818,9 +812,7 @@ class SimpleMatVerticalStepperApp {
       <mat-step [stepControl]="oneGroup">
         <form [formGroup]="oneGroup">
           <ng-template matStepLabel>Step one</ng-template>
-          <mat-form-field>
-            <input matInput formControlName="oneCtrl" required>
-          </mat-form-field>
+          <input formControlName="oneCtrl" required>
           <div>
             <button mat-button matStepperPrevious>Back</button>
             <button mat-button matStepperNext>Next</button>
@@ -830,9 +822,7 @@ class SimpleMatVerticalStepperApp {
       <mat-step [stepControl]="twoGroup">
         <form [formGroup]="twoGroup">
           <ng-template matStepLabel>Step two</ng-template>
-          <mat-form-field>
-            <input matInput formControlName="twoCtrl" required>
-          </mat-form-field>
+          <input formControlName="twoCtrl" required>
           <div>
             <button mat-button matStepperPrevious>Back</button>
             <button mat-button matStepperNext>Next</button>
@@ -842,9 +832,7 @@ class SimpleMatVerticalStepperApp {
       <mat-step [stepControl]="threeGroup" optional>
         <form [formGroup]="threeGroup">
           <ng-template matStepLabel>Step two</ng-template>
-          <mat-form-field>
-            <input matInput formControlName="threeCtrl">
-          </mat-form-field>
+          <input formControlName="threeCtrl">
           <div>
             <button mat-button matStepperPrevious>Back</button>
             <button mat-button matStepperNext>Next</button>
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index 63f16c1ada0e..2945be19d4eb 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -35,6 +35,8 @@ import {
   MatToolbarModule,
   MatTooltipModule,
   MatStepperModule,
+  MatButtonToggleModule,
+  MatCheckboxModule,
 } from '@angular/material';
 import {
   CdkTableModule,

From 0f2c2721e54da3faf5e8f8fa92472a65b2f30b2f Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 27 Oct 2017 09:57:50 -0700
Subject: [PATCH 356/575] chore: expand and polish cdk docs (#7675)

* Add JsDocs where missing
* Adds and polishes overviews for main cdk subpackages
* Tweaks dgeni to disambiguate between material and cdk output (e.g. with "table").
* Tweaks markdown process to disambiguate between material and cdk output
* Fix an issue where method return types were missing from _all_ api docs
* Correct some `any` property types in cdk/stepper
* Correct table trackBy JsDoc being omitted because it was on the setter
---
 src/cdk/a11y/a11y.md                          | 92 +++++++++++++++++++
 src/cdk/a11y/focus-trap.ts                    | 23 +++--
 src/cdk/a11y/interactivity-checker.ts         |  9 +-
 src/cdk/a11y/list-key-manager.ts              |  4 +-
 src/cdk/bidi/bidi.md                          | 10 +-
 src/cdk/bidi/dir.ts                           |  9 +-
 src/cdk/bidi/directionality.ts                |  3 +
 src/cdk/layout/breakpoints-observer.ts        | 11 ++-
 src/cdk/layout/layout.md                      | 77 ++++++++++++++++
 src/cdk/layout/media-matcher.ts               |  6 +-
 src/cdk/observers/observers.md                |  8 +-
 .../overlay/fullscreen-overlay-container.ts   | 10 +-
 src/cdk/overlay/overlay-config.ts             |  2 +-
 src/cdk/overlay/overlay-container.ts          |  5 +-
 src/cdk/overlay/overlay-directives.ts         |  4 +-
 src/cdk/overlay/overlay.md                    |  4 +-
 src/cdk/overlay/overlay.ts                    |  9 +-
 .../position/connected-position-strategy.ts   |  5 +-
 .../overlay/position/connected-position.ts    | 13 ++-
 .../overlay/scroll/block-scroll-strategy.ts   |  3 +
 .../overlay/scroll/close-scroll-strategy.ts   |  3 +
 .../overlay/scroll/noop-scroll-strategy.ts    |  7 +-
 .../scroll/reposition-scroll-strategy.ts      |  3 +
 src/cdk/portal/dom-portal-host.ts             |  4 +-
 src/cdk/portal/portal-directives.ts           |  7 +-
 src/cdk/portal/portal.md                      |  4 +-
 src/cdk/portal/portal.ts                      | 10 +-
 src/cdk/scrolling/scrolling.md                | 11 ++-
 src/cdk/stepper/step-label.ts                 |  2 +-
 src/cdk/stepper/stepper.md                    | 59 ++++++++++++
 src/cdk/stepper/stepper.ts                    | 21 +++--
 src/cdk/table/cell.ts                         |  4 +-
 src/cdk/table/row.ts                          |  2 +-
 src/cdk/table/table.ts                        |  2 +-
 tools/dgeni/processors/component-grouper.ts   | 25 ++++-
 .../templates/componentGroup.template.html    |  4 +-
 tools/dgeni/templates/method.template.html    |  2 +-
 tools/gulp/tasks/docs.ts                      | 44 ++++++---
 38 files changed, 418 insertions(+), 103 deletions(-)
 create mode 100644 src/cdk/a11y/a11y.md
 create mode 100644 src/cdk/layout/layout.md
 create mode 100644 src/cdk/stepper/stepper.md

diff --git a/src/cdk/a11y/a11y.md b/src/cdk/a11y/a11y.md
new file mode 100644
index 000000000000..c42198d5cba3
--- /dev/null
+++ b/src/cdk/a11y/a11y.md
@@ -0,0 +1,92 @@
+The `a11y` package provides a number of tools to improve accessibility, described below.
+
+### ListKeyManager
+`ListKeyManager` manages the active option in a list of items based on keyboard interaction.
+Intended to be used with components that correspond to a `role="menu"` or `role="listbox"` pattern.
+
+#### Basic usage
+Any component that uses a `ListKeyManager` will generally do three things:
+* Create a `@ViewChildren` query for the options being managed.
+* Initialize the `ListKeyManager`, passing in the options.
+* Forward keyboard events from the managed component to the `ListKeyManager`.
+
+Each option should implement the `ListKeyManagerOption` interface:
+```ts
+interface ListKeyManagerOption {
+  disabled?: boolean;
+  getLabel?(): string;
+}
+```
+
+#### Wrapping
+Navigation through options can be made to wrap via the `withWrap` method
+```ts
+this.keyManager = new FocusKeyManager(...).withWrap();
+``` 
+
+#### Types of key managers
+There are two varieties of `ListKeyManager`, `FocusKeyManager` and `ActiveDescendantKeyManager`.
+
+##### FocusKeyManager
+Used when options will directly receive browser focus. Each item managed must implement the
+`FocusableOption` interface:
+```ts
+interface FocusableOption extends ListKeyManagerOption {
+  focus(): void;
+}
+```
+
+##### ActiveDescendantKeyManager
+Used when options will be marked as active via `aria-activedescendant`. 
+Each item managed must implement the
+`Highlightable` interface:
+```ts
+interface Highlightable extends ListKeyManagerOption {
+  setActiveStyles(): void;
+  setInactiveStyles(): void;
+}
+```
+
+Each item must also have an ID bound to the listbox's or menu's `aria-activedescendant`.
+
+
+### FocusTrap
+The `cdkTrapFocus` directive traps <kbd>Tab</kbd> key focus within an element. This is intended to
+be used to create accessible experience for components like
+[modal dialogs](https://www.w3.org/TR/wai-aria-practices-1.1/#dialog_modal), where focus must be
+constrained.
+
+This directive is declared in `A11yModule`.
+
+#### Example
+```html
+<div class="my-inner-dialog-content" cdkTrapFocus>
+  <!-- Tab and Shift + Tab will not leave this element. -->
+</div>
+```
+
+This directive will not prevent focus from moving out of the trapped region due to mouse
+interaction.
+
+
+### InteractivityChecker
+`InteractivityChecker` is used to check the interactivity of an element, capturing disabled,
+visible, tabbable, and focusable states for accessibility purposes. See the API docs for more
+details.
+
+
+### LiveAnnouncer
+`LiveAnnouncer` is used to announce messages for screen-reader users using an `aria-live` region.
+See [the W3C's WAI-ARIA](https://www.w3.org/TR/wai-aria/states_and_properties#aria-live)
+for more information on aria-live regions. 
+
+#### Example
+```ts
+@Component({...})
+export class MyComponent {
+
+ constructor(liveAnnouncer: LiveAnnouncer) {
+   liveAnnouncer.announce("Hey Google");
+ }
+}
+```
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index c01eff86098a..e32cf568d106 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -24,10 +24,9 @@ import {InteractivityChecker} from './interactivity-checker';
 /**
  * Class that allows for trapping focus within a DOM element.
  *
- * NOTE: This class currently uses a very simple (naive) approach to focus trapping.
+ * This class currently uses a relatively simple approach to focus trapping.
  * It assumes that the tab order is the same as DOM order, which is not necessarily true.
  * Things like tabIndex > 0, flex `order`, and shadow roots can cause to two to misalign.
- * This will be replaced with a more intelligent solution before the library is considered stable.
  */
 export class FocusTrap {
   private _startAnchor: HTMLElement | null;
@@ -169,7 +168,7 @@ export class FocusTrap {
 
   /**
    * Focuses the element that should be focused when the focus trap is initialized.
-   * @returns Returns whether focus was moved successfuly.
+   * @returns Whether focus was moved successfuly.
    */
   focusInitialElement(): boolean {
     if (!this._platform.isBrowser) {
@@ -188,7 +187,7 @@ export class FocusTrap {
 
   /**
    * Focuses the first tabbable element within the focus trap region.
-   * @returns Returns whether focus was moved successfuly.
+   * @returns Whether focus was moved successfuly.
    */
   focusFirstTabbableElement(): boolean {
     const redirectToElement = this._getRegionBoundary('start');
@@ -202,7 +201,7 @@ export class FocusTrap {
 
   /**
    * Focuses the last tabbable element within the focus trap region.
-   * @returns Returns whether focus was moved successfuly.
+   * @returns Whether focus was moved successfuly.
    */
   focusLastTabbableElement(): boolean {
     const redirectToElement = this._getRegionBoundary('end');
@@ -287,14 +286,23 @@ export class FocusTrapFactory {
       private _platform: Platform,
       private _ngZone: NgZone) { }
 
-  create(element: HTMLElement, deferAnchors: boolean = false): FocusTrap {
-    return new FocusTrap(element, this._platform, this._checker, this._ngZone, deferAnchors);
+  /**
+   * Creates a focus-trapped region around the given element.
+   * @param element The element around which focus will be trapped.
+   * @param deferCaptureElements Defers the creation of focus-capturing elements to be done
+   *     manually by the user.
+   * @returns The created focus trap instance.
+   */
+  create(element: HTMLElement, deferCaptureElements: boolean = false): FocusTrap {
+    return new FocusTrap(
+        element, this._platform, this._checker, this._ngZone, deferCaptureElements);
   }
 }
 
 
 /**
  * Directive for trapping focus within a region.
+ * @docs-private
  * @deprecated
  */
 @Directive({
@@ -330,6 +338,7 @@ export class FocusTrapDeprecatedDirective implements OnDestroy, AfterContentInit
   exportAs: 'cdkTrapFocus',
 })
 export class FocusTrapDirective implements OnDestroy, AfterContentInit {
+  /** Underlying FocusTrap instance. */
   focusTrap: FocusTrap;
 
   /** Whether the focus trap is active. */
diff --git a/src/cdk/a11y/interactivity-checker.ts b/src/cdk/a11y/interactivity-checker.ts
index 7d092c9f1fad..cc133d95c0cd 100644
--- a/src/cdk/a11y/interactivity-checker.ts
+++ b/src/cdk/a11y/interactivity-checker.ts
@@ -9,11 +9,10 @@
 import {Injectable} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
 
-/**
- * The InteractivityChecker leans heavily on the ally.js accessibility utilities.
- * Methods like `isTabbable` are only covering specific edge-cases for the browsers which are
- * supported.
- */
+
+// The InteractivityChecker leans heavily on the ally.js accessibility utilities.
+// Methods like `isTabbable` are only covering specific edge-cases for the browsers which are
+// supported.
 
 /**
  * Utility for checking the interactivity of an element, such as whether is is focusable or
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index af8e82711a56..79299ed9731e 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -12,9 +12,7 @@ import {Subscription} from 'rxjs/Subscription';
 import {UP_ARROW, DOWN_ARROW, TAB, A, Z, ZERO, NINE} from '@angular/cdk/keycodes';
 import {RxChain, debounceTime, filter, map, doOperator} from '@angular/cdk/rxjs';
 
-/**
- * This interface is for items that can be passed to a ListKeyManager.
- */
+/** This interface is for items that can be passed to a ListKeyManager. */
 export interface ListKeyManagerOption {
   disabled?: boolean;
   getLabel?(): string;
diff --git a/src/cdk/bidi/bidi.md b/src/cdk/bidi/bidi.md
index d9b92efb5e8c..dddc26874980 100644
--- a/src/cdk/bidi/bidi.md
+++ b/src/cdk/bidi/bidi.md
@@ -1,4 +1,7 @@
-### BidiModule
+The `bidi` package provides a common system for components to get and respond to change in the
+application's LTR/RTL layout direction. 
+
+### Directionality
  
 When including the CDK's `BidiModule`, components can inject `Directionality` to get the current
 text direction (RTL or LTR);
@@ -28,3 +31,8 @@ export class MyWidget implements OnDestroy {
 }  
 ```
 
+### The `Dir` directive
+The `BidiModule` also includes a directive that matches any elements with a `dir` attribute. This
+directive has the same API as Directionality and provides itself _as_ `Directionality`. By doing
+this, any component that injects `Directionality` will get the closest ancestor layout direction
+context.
diff --git a/src/cdk/bidi/dir.ts b/src/cdk/bidi/dir.ts
index 2568fe541270..cd4afa11570e 100644
--- a/src/cdk/bidi/dir.ts
+++ b/src/cdk/bidi/dir.ts
@@ -18,7 +18,8 @@ import {Direction, Directionality} from './directionality';
 /**
  * Directive to listen for changes of direction of part of the DOM.
  *
- * Would provide itself in case a component looks for the Directionality service
+ * Provides itself as Directionality such that descendant directives only need to ever inject
+ * Directionality to get the closest direction.
  */
 @Directive({
   selector: '[dir]',
@@ -27,7 +28,6 @@ import {Direction, Directionality} from './directionality';
   exportAs: 'dir',
 })
 export class Dir implements Directionality {
-  /** Layout direction of the element. */
   _dir: Direction = 'ltr';
 
   /** Whether the `value` has been set to its initial value. */
@@ -38,10 +38,7 @@ export class Dir implements Directionality {
 
   /** @docs-private */
   @Input('dir')
-  get dir(): Direction {
-    return this._dir;
-  }
-
+  get dir(): Direction { return this._dir; }
   set dir(v: Direction) {
     let old = this._dir;
     this._dir = v;
diff --git a/src/cdk/bidi/directionality.ts b/src/cdk/bidi/directionality.ts
index d3c9f4bcf2ff..17eb64bf07ab 100644
--- a/src/cdk/bidi/directionality.ts
+++ b/src/cdk/bidi/directionality.ts
@@ -37,7 +37,10 @@ export const DIR_DOCUMENT = new InjectionToken<Document>('mat-dir-doc');
  */
 @Injectable()
 export class Directionality {
+  /** The current 'ltr' or 'rtl' value. */
   readonly value: Direction = 'ltr';
+
+  /** Stream that emits whenever the 'ltr' / 'rtl' state changes. */
   readonly change = new EventEmitter<void>();
 
   constructor(@Optional() @Inject(DIR_DOCUMENT) _document?: any) {
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
index 7e919318556a..4af24b1f8a44 100644
--- a/src/cdk/layout/breakpoints-observer.ts
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -24,9 +24,7 @@ interface Query {
   mql: MediaQueryList;
 }
 
-/**
- * Utility for checking the matching state of @media queries.
- */
+/** Utility for checking the matching state of @media queries. */
 @Injectable()
 export class BreakpointObserver implements OnDestroy {
   /**  A map of all media queries currently being listened for. */
@@ -42,7 +40,11 @@ export class BreakpointObserver implements OnDestroy {
     this._destroySubject.complete();
   }
 
-  /** Whether the query currently is matched. */
+  /**
+   * Whether one or more media queries match the current viewport size.
+   * @param value One or more media queries to check.
+   * @returns Whether any of the media queries match.
+   */
   isMatched(value: string | string[]): boolean {
     let queries = coerceArray(value);
     return queries.some(mediaQuery => this._registerQuery(mediaQuery).mql.matches);
@@ -51,6 +53,7 @@ export class BreakpointObserver implements OnDestroy {
   /**
    * Gets an observable of results for the given queries that will emit new results for any changes
    * in matching of the given queries.
+   * @returns A stream of matches for the given queries.
    */
   observe(value: string | string[]): Observable<BreakpointState> {
     let queries = coerceArray(value);
diff --git a/src/cdk/layout/layout.md b/src/cdk/layout/layout.md
new file mode 100644
index 000000000000..7168d3d1ef37
--- /dev/null
+++ b/src/cdk/layout/layout.md
@@ -0,0 +1,77 @@
+The `layout` package provides utilities to build responsive UIs that react to screen-size changes. 
+
+### BreakpointObserver
+
+`BreakpointObserver` is a utility for evaluating media queries and reacting to their changing.
+
+#### Evaluate against the current viewport
+The `isMatched` method is used to evaluate one or more media queries against the current viewport
+size.
+```ts
+const isSmallScreen = breakpointObserver.isMatched('(max-width: 599px)');
+```
+
+#### React to changes to the viewport
+The `observe` method is used to get an observable stream that will emit whenever one of the given
+media queries would have a different result.
+```ts
+const layoutChanges = breakpointObserver.observe([
+  '(orientation: portrait)',
+  '(orientation: landscape)',
+]);
+
+layoutChanges.subscribe(result => {
+  updateMyLayoutForOrientationChange();
+});
+```
+
+#### Default breakpoints
+A set of default media queries are available corresponding to breakpoints for different device
+types.
+
+```ts
+import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
+
+@Component({...})
+class MyComponent {
+  constructor(breakpointObserver: BreakpointObserver) {
+    breakpointObserver.observe([
+      Breakpoints.HandsetLandscape,
+      Breakpoints.HandsetPortrait
+    ]).subscribe(result => {
+      if (result.matches) {
+        this.activateHandsetLayout();
+      }
+    });
+  }
+}
+```
+
+The built-in breakpoints based on [Google's Material Design
+specification](https://material.io/guidelines/layout/responsive-ui.html#responsive-ui-breakpoints).
+The available values are:
+* Handset
+* Tablet
+* Web
+* HandsetPortrait
+* TabletPortrait
+* WebPortrait
+* HandsetLandscape
+* TabletLandscape
+* WebLandscape
+
+
+### MediaMatcher
+`MediaMatcher` is a lower-level utility that wraps the native `matchMedia`. This service normalizes
+browser differences and serves as a convenient API that can be replaces with a fake in unit tests.
+The `matchMedia` method can be used to get a native
+[`MediaQueryList`](https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList).
+
+```ts
+@Component({...})
+class MyComponent {
+  constructor(mediaMatcher: MediaMatcher) {
+    const mediaQueryList = mediaMatcher.matchMedia('(min-width: 1px)');
+  }
+}
+```
diff --git a/src/cdk/layout/media-matcher.ts b/src/cdk/layout/media-matcher.ts
index 2b0aed2aac8c..2079aa1004f8 100644
--- a/src/cdk/layout/media-matcher.ts
+++ b/src/cdk/layout/media-matcher.ts
@@ -13,9 +13,7 @@ import {Platform} from '@angular/cdk/platform';
  */
 const styleElementForWebkitCompatibility: Map<string, HTMLStyleElement> = new Map();
 
-/**
- * A utility for calling matchMedia queries.
- */
+/** A utility for calling matchMedia queries. */
 @Injectable()
 export class MediaMatcher {
   /** The internal matchMedia method to return back a MediaQueryList like object. */
@@ -30,6 +28,8 @@ export class MediaMatcher {
   }
 
   /**
+   * Evaluates the given media query and returns the native MediaQueryList from which results
+   * can be retrieved.
    * Confirms the layout engine will trigger for the selector query provided and returns the
    * MediaQueryList for the query provided.
    */
diff --git a/src/cdk/observers/observers.md b/src/cdk/observers/observers.md
index b5d2495a11b2..4b622846169a 100644
--- a/src/cdk/observers/observers.md
+++ b/src/cdk/observers/observers.md
@@ -1,10 +1,12 @@
-### Observers
+The `observers` package provides convenience directives built on top of native web platform
+observers, such as MutationObserver.
+
+
+### cdkObserveContent
 
 A directive for observing when the content of the host element changes. An event is emitted when a
 mutation to the content is observed.
 
-#### Example
-
 ```html
 <div class="projected-content-wrapper" (cdkObserveContent)="projectContentChanged()">
   <ng-content></ng-content>
diff --git a/src/cdk/overlay/fullscreen-overlay-container.ts b/src/cdk/overlay/fullscreen-overlay-container.ts
index 5165f8ce97de..aa7c16d33f18 100644
--- a/src/cdk/overlay/fullscreen-overlay-container.ts
+++ b/src/cdk/overlay/fullscreen-overlay-container.ts
@@ -10,13 +10,11 @@ import {Injectable} from '@angular/core';
 import {OverlayContainer} from './overlay-container';
 
 /**
- * The FullscreenOverlayContainer is the alternative to OverlayContainer
- * that supports correct displaying of overlay elements in Fullscreen mode
+ * Alternative to OverlayContainer that supports correct displaying of overlay elements in
+ * Fullscreen mode
  * https://developer.mozilla.org/en-US/docs/Web/API/Element/requestFullScreen
- * It should be provided in the root component that way:
- * providers: [
- *   {provide: OverlayContainer, useClass: FullscreenOverlayContainer}
- * ],
+ *
+ * Should be provided in the root component.
  */
 @Injectable()
 export class FullscreenOverlayContainer extends OverlayContainer {
diff --git a/src/cdk/overlay/overlay-config.ts b/src/cdk/overlay/overlay-config.ts
index cd362ced3fe0..ed12730a7fff 100644
--- a/src/cdk/overlay/overlay-config.ts
+++ b/src/cdk/overlay/overlay-config.ts
@@ -12,7 +12,7 @@ import {ScrollStrategy} from './scroll/scroll-strategy';
 import {NoopScrollStrategy} from './scroll/noop-scroll-strategy';
 
 
-/** OverlayConfig captures the initial configuration used when opening an overlay. */
+/** Initial configuration used when creating an overlay. */
 export class OverlayConfig {
   /** Strategy with which to position the overlay. */
   positionStrategy?: PositionStrategy;
diff --git a/src/cdk/overlay/overlay-container.ts b/src/cdk/overlay/overlay-container.ts
index e932e75f4210..25aea7618478 100644
--- a/src/cdk/overlay/overlay-container.ts
+++ b/src/cdk/overlay/overlay-container.ts
@@ -9,10 +9,7 @@
 import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
 
 
-/**
- * The OverlayContainer is the container in which all overlays will load.
- * It should be provided in the root component to ensure it is properly shared.
- */
+/** Container inside which all overlays will render. */
 @Injectable()
 export class OverlayContainer implements OnDestroy {
   protected _containerElement: HTMLElement;
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 431addab3d90..7bc537629f5f 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -79,7 +79,9 @@ export const MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER = {
   exportAs: 'cdkOverlayOrigin',
 })
 export class OverlayOrigin {
-  constructor(public elementRef: ElementRef) { }
+  constructor(
+      /** Reference to the element on which the directive is applied. */
+      public elementRef: ElementRef) { }
 }
 
 
diff --git a/src/cdk/overlay/overlay.md b/src/cdk/overlay/overlay.md
index f37cce43fe7a..ca71948a8494 100644
--- a/src/cdk/overlay/overlay.md
+++ b/src/cdk/overlay/overlay.md
@@ -1,6 +1,4 @@
-### Overlay
-
-The `Overlay` service provides a way to open floating panels on the screen.
+The `overlay` package provides a way to open floating panels on the screen.
 
 ### Creating overlays
 Calling `overlay.create()` will return an `OverlayRef` instance. This instance is a handle for
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 2bfa74a58126..d1a3630410b3 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -38,7 +38,9 @@ let defaultConfig = new OverlayConfig();
  */
 @Injectable()
 export class Overlay {
-  constructor(public scrollStrategies: ScrollStrategyOptions,
+  constructor(
+              /** Scrolling strategies that can be used when creating an overlay. */
+              public scrollStrategies: ScrollStrategyOptions,
               private _overlayContainer: OverlayContainer,
               private _componentFactoryResolver: ComponentFactoryResolver,
               private _positionBuilder: OverlayPositionBuilder,
@@ -48,7 +50,7 @@ export class Overlay {
 
   /**
    * Creates an overlay.
-   * @param config Config to apply to the overlay.
+   * @param config Configuration applied to the overlay.
    * @returns Reference to the created overlay.
    */
   create(config: OverlayConfig = defaultConfig): OverlayRef {
@@ -58,8 +60,9 @@ export class Overlay {
   }
 
   /**
-   * Returns a position builder that can be used, via fluent API,
+   * Gets a position builder that can be used, via fluent API,
    * to construct and configure a position strategy.
+   * @returns An overlay position builder.
    */
   position(): OverlayPositionBuilder {
     return this._positionBuilder;
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 2d3269d0642a..eb08712ba797 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -90,6 +90,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
     return this._preferredPositions;
   }
 
+  /** Attach this position strategy to an overlay. */
   attach(overlayRef: OverlayRef): void {
     this._overlayRef = overlayRef;
     this._pane = overlayRef.overlayElement;
@@ -97,7 +98,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
     this._resizeSubscription = this._viewportRuler.change().subscribe(() => this.apply());
   }
 
-  /** Performs any cleanup after the element is destroyed. */
+  /** Disposes all resources used by the position strategy. */
   dispose() {
     this._resizeSubscription.unsubscribe();
   }
@@ -156,7 +157,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   }
 
   /**
-   * This re-aligns the overlay element with the trigger in its last calculated position,
+   * Re-positions the overlay element with the trigger in its last calculated position,
    * even if a position higher in the "preferred positions" list would now fit. This
    * allows one to re-align the panel without changing the orientation of the panel.
    */
diff --git a/src/cdk/overlay/position/connected-position.ts b/src/cdk/overlay/position/connected-position.ts
index ff9114fd8538..0b8d8a9c6173 100644
--- a/src/cdk/overlay/position/connected-position.ts
+++ b/src/cdk/overlay/position/connected-position.ts
@@ -28,9 +28,13 @@ export interface OverlayConnectionPosition {
 
 /** The points of the origin element and the overlay element to connect. */
 export class ConnectionPositionPair {
+  /** X-axis attachment point for connected overlay origin. Can be 'start', 'end', or 'center'. */
   originX: HorizontalConnectionPos;
+  /** Y-axis attachment point for connected overlay origin. Can be 'top', 'bottom', or 'center'. */
   originY: VerticalConnectionPos;
+  /** X-axis attachment point for connected overlay. Can be 'start', 'end', or 'center'. */
   overlayX: HorizontalConnectionPos;
+  /** Y-axis attachment point for connected overlay. Can be 'top', 'bottom', or 'center'. */
   overlayY: VerticalConnectionPos;
 
   constructor(
@@ -68,6 +72,8 @@ export class ConnectionPositionPair {
  *  |      Scrollable        |
  *  |                        |
  *  --------------------------
+ *
+ *  @docs-private
  */
 export class ScrollingVisibility {
   isOriginClipped: boolean;
@@ -78,6 +84,9 @@ export class ScrollingVisibility {
 
 /** The change event emitted by the strategy when a fallback position is used. */
 export class ConnectedOverlayPositionChange {
-  constructor(public connectionPair: ConnectionPositionPair,
-              @Optional() public scrollableViewProperties: ScrollingVisibility) {}
+  constructor(
+      /** The position used as a result of this change. */
+      public connectionPair: ConnectionPositionPair,
+      /** @docs-private */
+      @Optional() public scrollableViewProperties: ScrollingVisibility) {}
 }
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.ts b/src/cdk/overlay/scroll/block-scroll-strategy.ts
index a1701c5c0c9b..df517a41436b 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.ts
@@ -19,8 +19,10 @@ export class BlockScrollStrategy implements ScrollStrategy {
 
   constructor(private _viewportRuler: ViewportRuler) { }
 
+  /** Attaches this scroll strategy to an overlay. */
   attach() { }
 
+  /** Blocks page-level scroll while the attached overlay is open. */
   enable() {
     if (this._canBeEnabled()) {
       const root = document.documentElement;
@@ -40,6 +42,7 @@ export class BlockScrollStrategy implements ScrollStrategy {
     }
   }
 
+  /** Unblocks page-level scroll while the attached overlay is open. */
   disable() {
     if (this._isEnabled) {
       this._isEnabled = false;
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts
index 1f8a328b163e..e7defe7942da 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts
@@ -21,6 +21,7 @@ export class CloseScrollStrategy implements ScrollStrategy {
 
   constructor(private _scrollDispatcher: ScrollDispatcher) { }
 
+  /** Attaches this scroll strategy to an overlay. */
   attach(overlayRef: OverlayRef) {
     if (this._overlayRef) {
       throw getMatScrollStrategyAlreadyAttachedError();
@@ -29,6 +30,7 @@ export class CloseScrollStrategy implements ScrollStrategy {
     this._overlayRef = overlayRef;
   }
 
+  /** Enables the closing of the attached on scroll. */
   enable() {
     if (!this._scrollSubscription) {
       this._scrollSubscription = this._scrollDispatcher.scrolled(0).subscribe(() => {
@@ -41,6 +43,7 @@ export class CloseScrollStrategy implements ScrollStrategy {
     }
   }
 
+  /** Disables the closing the attached overlay on scroll. */
   disable() {
     if (this._scrollSubscription) {
       this._scrollSubscription.unsubscribe();
diff --git a/src/cdk/overlay/scroll/noop-scroll-strategy.ts b/src/cdk/overlay/scroll/noop-scroll-strategy.ts
index 1aa1eac9e0fa..ab9baf6bd633 100644
--- a/src/cdk/overlay/scroll/noop-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/noop-scroll-strategy.ts
@@ -8,11 +8,12 @@
 
 import {ScrollStrategy} from './scroll-strategy';
 
-/**
- * Scroll strategy that doesn't do anything.
- */
+/** Scroll strategy that doesn't do anything. */
 export class NoopScrollStrategy implements ScrollStrategy {
+  /** Does nothing, as this scroll strategy is a no-op. */
   enable() { }
+  /** Does nothing, as this scroll strategy is a no-op. */
   disable() { }
+  /** Does nothing, as this scroll strategy is a no-op. */
   attach() { }
 }
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
index f4d0468dcb66..716adec4c2c3 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
@@ -29,6 +29,7 @@ export class RepositionScrollStrategy implements ScrollStrategy {
     private _scrollDispatcher: ScrollDispatcher,
     private _config?: RepositionScrollStrategyConfig) { }
 
+  /** Attaches this scroll strategy to an overlay. */
   attach(overlayRef: OverlayRef) {
     if (this._overlayRef) {
       throw getMatScrollStrategyAlreadyAttachedError();
@@ -37,6 +38,7 @@ export class RepositionScrollStrategy implements ScrollStrategy {
     this._overlayRef = overlayRef;
   }
 
+  /** Enables repositioning of the attached overlay on scroll. */
   enable() {
     if (!this._scrollSubscription) {
       let throttle = this._config ? this._config.scrollThrottle : 0;
@@ -47,6 +49,7 @@ export class RepositionScrollStrategy implements ScrollStrategy {
     }
   }
 
+  /** Disables repositioning of the attached overlay on scroll. */
   disable() {
     if (this._scrollSubscription) {
       this._scrollSubscription.unsubscribe();
diff --git a/src/cdk/portal/dom-portal-host.ts b/src/cdk/portal/dom-portal-host.ts
index f39b09d7b824..19b475a17302 100644
--- a/src/cdk/portal/dom-portal-host.ts
+++ b/src/cdk/portal/dom-portal-host.ts
@@ -19,8 +19,6 @@ import {BasePortalHost, ComponentPortal, TemplatePortal} from './portal';
 /**
  * A PortalHost for attaching portals to an arbitrary DOM element outside of the Angular
  * application context.
- *
- * This is the only part of the portal core that directly touches the DOM.
  */
 export class DomPortalHost extends BasePortalHost {
   constructor(
@@ -34,6 +32,7 @@ export class DomPortalHost extends BasePortalHost {
   /**
    * Attach the given ComponentPortal to DOM element using the ComponentFactoryResolver.
    * @param portal Portal to be attached
+   * @returns Reference to the created component.
    */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
     let componentFactory = this._componentFactoryResolver.resolveComponentFactory(portal.component);
@@ -68,6 +67,7 @@ export class DomPortalHost extends BasePortalHost {
   /**
    * Attaches a template portal to the DOM as an embedded view.
    * @param portal Portal to be attached.
+   * @returns Reference to the created embedded view.
    */
   attachTemplatePortal<C>(portal: TemplatePortal<C>): EmbeddedViewRef<C> {
     let viewContainer = portal.viewContainerRef;
diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts
index 9f4b9e217067..f3da22329cb0 100644
--- a/src/cdk/portal/portal-directives.ts
+++ b/src/cdk/portal/portal-directives.ts
@@ -23,11 +23,6 @@ import {Portal, TemplatePortal, ComponentPortal, BasePortalHost} from './portal'
 /**
  * Directive version of a `TemplatePortal`. Because the directive *is* a TemplatePortal,
  * the directive instance itself can be attached to a host, enabling declarative use of portals.
- *
- * Usage:
- * <ng-template portal #greeting>
- *   <p> Hello {{name}} </p>
- * </ng-template>
  */
 @Directive({
   selector: '[cdk-portal], [cdkPortal], [portal]',
@@ -93,6 +88,7 @@ export class PortalHostDirective extends BasePortalHost implements OnDestroy {
    * Attach the given ComponentPortal to this PortalHost using the ComponentFactoryResolver.
    *
    * @param portal Portal to be attached to the portal host.
+   * @returns Reference to the created component.
    */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
     portal.setAttachedHost(this);
@@ -118,6 +114,7 @@ export class PortalHostDirective extends BasePortalHost implements OnDestroy {
   /**
    * Attach the given TemplatePortal to this PortlHost as an embedded View.
    * @param portal Portal to be attached.
+   * @returns Reference to the created embedded view.
    */
   attachTemplatePortal<C>(portal: TemplatePortal<C>): EmbeddedViewRef<C> {
     portal.setAttachedHost(this);
diff --git a/src/cdk/portal/portal.md b/src/cdk/portal/portal.md
index 79910d6c3371..cb7503b378fc 100644
--- a/src/cdk/portal/portal.md
+++ b/src/cdk/portal/portal.md
@@ -1,3 +1,5 @@
+The `portals` package provides a flexible system for rendering dynamic content into an application.
+
 ### Portals
 A `Portal `is a piece of UI that can be dynamically rendered to an open slot on the page.
 
@@ -30,7 +32,7 @@ Used to get a portal from an `<ng-template>`. `TemplatePortalDirectives` *is* a
 
 Usage:
 ```html
-<ng-template cdk-portal>
+<ng-template cdkPortal>
   <p>The content of this template is captured by the portal.</p>
 </ng-template>
 
diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts
index 8352e5b31586..e0b781a64e00 100644
--- a/src/cdk/portal/portal.ts
+++ b/src/cdk/portal/portal.ts
@@ -161,8 +161,8 @@ export interface PortalHost {
 
 
 /**
- * Partial implementation of PortalHost that only deals with attaching either a
- * ComponentPortal or a TemplatePortal.
+ * Partial implementation of PortalHost that handles attaching
+ * ComponentPortal and TemplatePortal.
  */
 export abstract class BasePortalHost implements PortalHost {
   /** The portal currently attached to the host. */
@@ -179,6 +179,7 @@ export abstract class BasePortalHost implements PortalHost {
     return !!this._attachedPortal;
   }
 
+  /** Attaches a portal. */
   attach(portal: Portal<any>): any {
     if (!portal) {
       throwNullPortalError();
@@ -207,6 +208,7 @@ export abstract class BasePortalHost implements PortalHost {
 
   abstract attachTemplatePortal<C>(portal: TemplatePortal<C>): EmbeddedViewRef<C>;
 
+  /** Detaches a previously attached portal. */
   detach(): void {
     if (this._attachedPortal) {
       this._attachedPortal.setAttachedHost(null);
@@ -216,7 +218,8 @@ export abstract class BasePortalHost implements PortalHost {
     this._invokeDisposeFn();
   }
 
-  dispose() {
+  /** Permanently dispose of this portal host. */
+  dispose(): void {
     if (this.hasAttached()) {
       this.detach();
     }
@@ -225,6 +228,7 @@ export abstract class BasePortalHost implements PortalHost {
     this._isDisposed = true;
   }
 
+  /** @docs-private */
   setDisposeFn(fn: () => void) {
     this._disposeFn = fn;
   }
diff --git a/src/cdk/scrolling/scrolling.md b/src/cdk/scrolling/scrolling.md
index 7db6c4e046aa..67adae01ec95 100644
--- a/src/cdk/scrolling/scrolling.md
+++ b/src/cdk/scrolling/scrolling.md
@@ -1,3 +1,10 @@
-### Scrolling
+The `scrolling` package provides helpers for directives that react to scroll events.
 
-Some things to help with scrollling.
\ No newline at end of file
+### cdkScrollable and ScrollDispatcher
+The `cdkScrollable` directive and the `ScrollDispatcher` service to together to allow components to
+react to scrolling in any of its ancestor scrolling containers.
+
+The `cdkScrollable` directive should be applied to any element that acts as a scrolling container.
+This marks the element as a `Scrollable` and registers it with the `ScrollDispatcher`. The
+dispatcher, then, allows components to share both event listeners and knowledge of all of the
+scrollable containers in the application.
diff --git a/src/cdk/stepper/step-label.ts b/src/cdk/stepper/step-label.ts
index 974c3800165b..a7f048239890 100644
--- a/src/cdk/stepper/step-label.ts
+++ b/src/cdk/stepper/step-label.ts
@@ -12,5 +12,5 @@ import {Directive, TemplateRef} from '@angular/core';
   selector: '[cdkStepLabel]',
 })
 export class CdkStepLabel {
-  constructor(public template: TemplateRef<any>) { }
+  constructor(/** @docs-private */ public template: TemplateRef<any>) { }
 }
diff --git a/src/cdk/stepper/stepper.md b/src/cdk/stepper/stepper.md
new file mode 100644
index 000000000000..6e5fe2f7f511
--- /dev/null
+++ b/src/cdk/stepper/stepper.md
@@ -0,0 +1,59 @@
+CDK stepper provides a foundation upon which more concrete stepper varities can be built. A
+stepper is a wizard-like workflow that divides content into logical steps
+
+### Behavior captured by CdkStepper
+The base CDK version of the stepper primarily manages which step is active. This includes handling
+keyboard interactions and exposing an API for advancing or rewinding through the workflow.
+
+#### Linear stepper
+A stepper marked as `linear` requires the user to complete previous steps before proceeding.
+For each step, the `stepControl` attribute can be set to the top level
+`AbstractControl` that is used to check the validity of the step.
+
+There are two possible approaches. One is using a single form for stepper, and the other is
+using a different form for each step.
+
+#### Using a single form for the entire stepper
+When using a single form for the stepper, any intermediate next/previous buttons within the steps
+must be set to `type="button"` in order to prevent submission of the form before all steps are
+complete.
+
+#### Using a form for each individual step
+When using a form for each step, the workflow is advanced whenever one of the forms is submitted.
+
+### Types of steps
+
+#### Optional step
+If completion of a step in linear stepper is not required, then the `optional` attribute can be set
+on `CdkStep` in a `linear` stepper.
+
+#### Editable step
+By default, steps are editable, which means users can return to previously completed steps and
+edit their responses. `editable="true"` can be set on `CdkStep` to change the default.
+
+#### Completed step
+By default, the `completed` attribute of a step returns `true` if the step is valid (in case of
+linear stepper) and the user has interacted with the step. The user, however, can also override
+this default `completed` behavior by setting the `completed` attribute as needed.
+
+### Stepper buttons
+There are two button directives to support navigation between different steps:
+`CdkStepperNext` and `CdkStepperPrevious`. When placed inside of a step, these will automatically
+add click handlers to advance or rewind the workflow, respectively.
+
+### Keyboard interaction
+- <kbd>LEFT_ARROW</kbd>: Focuses the previous step header
+- <kbd>RIGHT_ARROW</kbd>: Focuses the next step header
+- <kbd>ENTER</kbd>, <kbd>SPACE</kbd>: Selects the step that the focus is currently on
+- <kbd>TAB</kbd>: Focuses the next tabbable element
+- <kbd>TAB</kbd>+<kbd>SHIFT</kbd>: Focuses the previous tabbable element
+
+### Accessibility
+The CDK stepper is treated as a tabbed view for accessibility purposes, so it is given
+`role="tablist"` by default. The header of step that can be clicked to select the step
+is given `role="tab"`, and the content that can be expanded upon selection is given
+`role="tabpanel"`. `aria-selected` attribute of step header and `aria-expanded` attribute of
+step content is automatically set based on step selection change.
+
+The stepper and each step should be given a meaningful label via `aria-label` or `aria-labelledby`.
+ 
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 9ce5937309ca..08ac87e971ec 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -84,27 +84,28 @@ export class CdkStep implements OnChanges {
   /** Label of the step. */
   @Input() label: string;
 
+  /** Whether the user can return to this step once it has been marked as complted. */
   @Input()
-  get editable() { return this._editable; }
-  set editable(value: any) {
+  get editable(): boolean { return this._editable; }
+  set editable(value: boolean) {
     this._editable = coerceBooleanProperty(value);
   }
   private _editable = true;
 
-  /** Whether the completion of step is optional or not. */
+  /** Whether the completion of step is optional. */
   @Input()
-  get optional() { return this._optional; }
-  set optional(value: any) {
+  get optional(): boolean { return this._optional; }
+  set optional(value: boolean) {
     this._optional = coerceBooleanProperty(value);
   }
   private _optional = false;
 
-  /** Return whether step is completed or not. */
+  /** Whether step is marked as completed. */
   @Input()
-  get completed() {
+  get completed(): boolean {
     return this._customCompleted == null ? this._defaultCompleted : this._customCompleted;
   }
-  set completed(value: any) {
+  set completed(value: boolean) {
     this._customCompleted = coerceBooleanProperty(value);
   }
   private _customCompleted: boolean | null = null;
@@ -140,8 +141,8 @@ export class CdkStepper {
 
   /** Whether the validity of previous steps should be checked or not. */
   @Input()
-  get linear() { return this._linear; }
-  set linear(value: any) { this._linear = coerceBooleanProperty(value); }
+  get linear(): boolean { return this._linear; }
+  set linear(value: boolean) { this._linear = coerceBooleanProperty(value); }
   private _linear = false;
 
   /** The index of the selected step. */
diff --git a/src/cdk/table/cell.ts b/src/cdk/table/cell.ts
index fc677ead759b..d0d735e30176 100644
--- a/src/cdk/table/cell.ts
+++ b/src/cdk/table/cell.ts
@@ -14,7 +14,7 @@ import {ContentChild, Directive, ElementRef, Input, Renderer2, TemplateRef} from
  */
 @Directive({selector: '[cdkCellDef]'})
 export class CdkCellDef {
-  constructor(public template: TemplateRef<any>) { }
+  constructor(/** @docs-private */ public template: TemplateRef<any>) { }
 }
 
 /**
@@ -23,7 +23,7 @@ export class CdkCellDef {
  */
 @Directive({selector: '[cdkHeaderCellDef]'})
 export class CdkHeaderCellDef {
-  constructor(public template: TemplateRef<any>) { }
+  constructor(/** @docs-private */ public template: TemplateRef<any>) { }
 }
 
 /**
diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 56864ae274c0..3a148a775951 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -37,7 +37,7 @@ export abstract class BaseRowDef {
   /** Differ used to check if any changes were made to the columns. */
   protected _columnsDiffer: IterableDiffer<any>;
 
-  constructor(public template: TemplateRef<any>,
+  constructor(/** @docs-private */ public template: TemplateRef<any>,
               protected _differs: IterableDiffers) { }
 
   ngOnChanges(changes: SimpleChanges): void {
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 245501575bb3..56d7e0662fbc 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -117,6 +117,7 @@ export class CdkTable<T> implements CollectionViewer {
    * Accepts a function that takes two parameters, `index` and `item`.
    */
   @Input()
+  get trackBy(): TrackByFunction<T> { return this._trackByFn; }
   set trackBy(fn: TrackByFunction<T>) {
     if (isDevMode() &&
         fn != null && typeof fn !== 'function' &&
@@ -125,7 +126,6 @@ export class CdkTable<T> implements CollectionViewer {
     }
     this._trackByFn = fn;
   }
-  get trackBy(): TrackByFunction<T> { return this._trackByFn; }
   private _trackByFn: TrackByFunction<T>;
 
   /**
diff --git a/tools/dgeni/processors/component-grouper.ts b/tools/dgeni/processors/component-grouper.ts
index 2564ee3e9485..3e6d1ade69cf 100644
--- a/tools/dgeni/processors/component-grouper.ts
+++ b/tools/dgeni/processors/component-grouper.ts
@@ -8,6 +8,15 @@ export class ComponentGroup {
   /** Name of the component group. */
   name: string;
 
+  /** Display name of the component group */
+  displayName: string;
+
+  /** Name of the package, either material or cdk */
+  packageName: string;
+
+  /** Display name of the package. */
+  packageDisplayName: string;
+
   /** Unique id for the component group. */
   id: string;
 
@@ -60,7 +69,17 @@ export class ComponentGrouper implements Processor {
 
       // All of the component documentation is under either `src/lib` or `src/cdk`.
       // We group the docs up by the directory immediately under that root.
-      const groupName = path.relative(basePath, filePath).split(path.sep)[1];
+      let packageName, packageDisplayName;
+      if (filePath.includes('cdk')) {
+        packageName = 'cdk';
+        packageDisplayName = 'CDK';
+      } else {
+        packageName = 'material';
+        packageDisplayName = 'Material';
+      }
+
+      const displayName = path.relative(basePath, filePath).split(path.sep)[1];
+      const groupName = packageName + '-' + displayName;
 
       // Get the group for this doc, or, if one does not exist, create it.
       let group;
@@ -71,6 +90,10 @@ export class ComponentGrouper implements Processor {
         groups.set(groupName, group);
       }
 
+      group.packageName = packageName;
+      group.packageDisplayName = packageDisplayName;
+      group.displayName = displayName;
+
       // Put this doc into the appropriate list in this group.
       if (doc.isDirective) {
         group.directives.push(doc);
diff --git a/tools/dgeni/templates/componentGroup.template.html b/tools/dgeni/templates/componentGroup.template.html
index 287b980f0c7c..61532398bec8 100644
--- a/tools/dgeni/templates/componentGroup.template.html
+++ b/tools/dgeni/templates/componentGroup.template.html
@@ -21,12 +21,12 @@
 
 <div class="docs-api">
   <h2>
-    API reference for Angular Material {$ doc.name $}
+    API reference for Angular {$ doc.packageDisplayName $} {$ doc.displayName $}
   </h2>
 
   <p class="docs-api-module-import">
     <code>
-      import {{$ doc.ngModule.name $}} from '@angular/material';
+      import {{$ doc.ngModule.name $}} from '@angular/{$ doc.packageName $}';
     </code>
   </p>
 
diff --git a/tools/dgeni/templates/method.template.html b/tools/dgeni/templates/method.template.html
index 50b43d1223e6..8a79b1e18b4d 100644
--- a/tools/dgeni/templates/method.template.html
+++ b/tools/dgeni/templates/method.template.html
@@ -49,7 +49,7 @@
   </thead>
   <tr>
     <td class="docs-api-method-returns-type-cell">
-      <code class="docs-api-method-returns-type">{$ method.returnType $}</code>
+      <code class="docs-api-method-returns-type">{$ method.type $}</code>
     </td>
     <td class="docs-api-method-returns-description-cell">
       <p class="docs-api-method-returns-description">
diff --git a/tools/gulp/tasks/docs.ts b/tools/gulp/tasks/docs.ts
index c87425db2401..e17749077865 100644
--- a/tools/gulp/tasks/docs.ts
+++ b/tools/gulp/tasks/docs.ts
@@ -59,9 +59,23 @@ const htmlMinifierOptions = {
   removeAttributeQuotes: false
 };
 
+const markdownOptions = {
+  // Add syntax highlight using highlight.js
+  highlight: (code: string, language: string): string => {
+    if (language) {
+      // highlight.js expects "typescript" written out, while Github supports "ts".
+      let lang = language.toLowerCase() === 'ts' ? 'typescript' : language;
+      return hljs.highlight(lang, code).value;
+    }
+
+    return code;
+  }
+};
+
 /** Generate all docs content. */
 task('docs', [
   'markdown-docs',
+  'markdown-docs-cdk',
   'highlight-examples',
   'api-docs',
   'minified-api-docs',
@@ -69,7 +83,7 @@ task('docs', [
   'plunker-example-assets',
 ]);
 
-/** Generates html files from the markdown overviews and guides. */
+/** Generates html files from the markdown overviews and guides for material. */
 task('markdown-docs', () => {
   // Extend the renderer for custom heading anchor rendering
   markdown.marked.Renderer.prototype.heading = (text: string, level: number): string => {
@@ -86,19 +100,21 @@ task('markdown-docs', () => {
     }
   };
 
-  return src(['src/lib/**/*.md', 'src/cdk/**/*.md', 'guides/*.md'])
-      .pipe(markdown({
-        // Add syntax highlight using highlight.js
-        highlight: (code: string, language: string): string => {
-          if (language) {
-            // highlight.js expects "typescript" written out, while Github supports "ts".
-            let lang = language.toLowerCase() === 'ts' ? 'typescript' : language;
-            return hljs.highlight(lang, code).value;
-          }
-
-          return code;
-        }
-      }))
+  return src(['src/lib/**/*.md', 'guides/*.md'])
+      .pipe(rename({prefix: 'material-'}))
+      .pipe(markdown(markdownOptions))
+      .pipe(transform(transformMarkdownFiles))
+      .pipe(dom(createTagNameAliaser('docs-markdown')))
+      .pipe(dest('dist/docs/markdown'));
+});
+
+// TODO(jelbourn): figure out how to avoid duplicating this task w/ material while still
+// disambiguating the output.
+/** Generates html files from the markdown overviews and guides for the cdk. */
+task('markdown-docs-cdk', () => {
+  return src(['src/cdk/**/*.md'])
+      .pipe(rename({prefix: 'cdk-'}))
+      .pipe(markdown(markdownOptions))
       .pipe(transform(transformMarkdownFiles))
       .pipe(dom(createTagNameAliaser('docs-markdown')))
       .pipe(dest('dist/docs/markdown'));

From c663fadaf236685d1c3e12840dee48a1a3d3e984 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 27 Oct 2017 11:58:26 -0500
Subject: [PATCH 357/575] fix(focus-trap): update focus trap attrs to camel
 case #6799 (#6960)

* fix(focus-trap): update focus trap attrs to camel case #6799

* chore(nit): update to use lower case names

* chore(nit): fix typo

* chore(demo): update demos

* chore(nit): fix pr feedback
---
 src/cdk/a11y/focus-trap.spec.ts      |  6 +++---
 src/cdk/a11y/focus-trap.ts           | 15 +++++++++++++--
 src/demo-app/drawer/drawer-demo.html |  6 +++---
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/cdk/a11y/focus-trap.spec.ts b/src/cdk/a11y/focus-trap.spec.ts
index debc77a138f4..bb3657308f17 100644
--- a/src/cdk/a11y/focus-trap.spec.ts
+++ b/src/cdk/a11y/focus-trap.spec.ts
@@ -190,9 +190,9 @@ class FocusTrapWithBindings {
     <div cdkTrapFocus>
       <input>
       <button>before</button>
-      <button id="first" cdk-focus-region-start></button>
-      <button id="middle" cdk-focus-initial></button>
-      <button id="last" cdk-focus-region-end></button>
+      <button id="first" cdkFocusRegionStart></button>
+      <button id="middle" cdkFocusInitial></button>
+      <button id="last" cdkFocusRegionEnd></button>
       <button>after</button>
       <input>
     </div>
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index e32cf568d106..bc4fe8a91022 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -150,12 +150,16 @@ export class FocusTrap {
 
     // Contains the deprecated version of selector, for temporary backwards comparability.
     let markers = this._element.querySelectorAll(`[cdk-focus-region-${bound}], ` +
+                                                 `[cdkFocusRegion${bound}], ` +
                                                  `[cdk-focus-${bound}]`) as NodeListOf<HTMLElement>;
 
     for (let i = 0; i < markers.length; i++) {
       if (markers[i].hasAttribute(`cdk-focus-${bound}`)) {
         console.warn(`Found use of deprecated attribute 'cdk-focus-${bound}',` +
-                     ` use 'cdk-focus-region-${bound}' instead.`, markers[i]);
+                     ` use 'cdkFocusRegion${bound}' instead.`, markers[i]);
+      } else if (markers[i].hasAttribute(`cdk-focus-region-${bound}`)) {
+        console.warn(`Found use of deprecated attribute 'cdk-focus-region-${bound}',` +
+                     ` use 'cdkFocusRegion${bound}' instead.`, markers[i]);
       }
     }
 
@@ -175,7 +179,14 @@ export class FocusTrap {
       return false;
     }
 
-    const redirectToElement = this._element.querySelector('[cdk-focus-initial]') as HTMLElement;
+    // Contains the deprecated version of selector, for temporary backwards comparability.
+    const redirectToElement = this._element.querySelector(`[cdk-focus-initial], ` +
+                                                          `[cdkFocusInitial]`) as HTMLElement;
+
+    if (this._element.hasAttribute(`cdk-focus-initial`)) {
+      console.warn(`Found use of deprecated attribute 'cdk-focus-initial',` +
+                    ` use 'cdkFocusInitial' instead.`, this._element);
+    }
 
     if (redirectToElement) {
       redirectToElement.focus();
diff --git a/src/demo-app/drawer/drawer-demo.html b/src/demo-app/drawer/drawer-demo.html
index a7f54541bc12..58bbe94eb95b 100644
--- a/src/demo-app/drawer/drawer-demo.html
+++ b/src/demo-app/drawer/drawer-demo.html
@@ -68,10 +68,10 @@ <h2>Drawer with focus attributes</h2>
   <mat-drawer #focusDrawer>
     <mat-nav-list>
       <a mat-list-item routerLink>Link</a>
-      <a mat-list-item routerLink cdk-focus-region-start>Focus region start</a>
+      <a mat-list-item routerLink cdkFocusRegionStart>Focus region start</a>
       <a mat-list-item routerLink>Link</a>
-      <a mat-list-item routerLink cdk-focus-initial>Initially focused</a>
-      <a mat-list-item routerLink cdk-focus-region-end>Focus region end</a>
+      <a mat-list-item routerLink cdkFocusInitial>Initially focused</a>
+      <a mat-list-item routerLink cdkFocusRegionEnd>Focus region end</a>
       <a mat-list-item routerLink>Link</a>
     </mat-nav-list>
   </mat-drawer>

From a2ca4d6dbbe5eac311486c11463506aaafe8043b Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Fri, 27 Oct 2017 13:15:51 -0400
Subject: [PATCH 358/575] feat(overlay): add keyboard dispatcher for targeting
 correct overlay (#6682)

* feat(overlay): add keyboard dispatcher for targeting correct overlay

Fix typo and add comment

Address comments

Add keyboard tracking demo to overlay

Address comments

Revert no-longer-needed dispose changes

Address comments

Fix prerender error by lazily starting dispatcher

Address naming comment

* Update license

* Remove DOCUMENT token
---
 .../overlay-keyboard-dispatcher.spec.ts       | 97 +++++++++++++++++++
 .../keyboard/overlay-keyboard-dispatcher.ts   | 95 ++++++++++++++++++
 src/cdk/overlay/overlay-module.ts             |  2 +
 src/cdk/overlay/overlay-ref.ts                | 24 ++++-
 src/cdk/overlay/overlay.ts                    |  5 +-
 src/cdk/testing/dispatch-events.ts            |  5 +-
 src/demo-app/demo-app/demo-module.ts          |  9 +-
 src/demo-app/overlay/overlay-demo.html        |  2 +
 src/demo-app/overlay/overlay-demo.scss        |  8 ++
 src/demo-app/overlay/overlay-demo.ts          | 31 ++++++
 src/lib/dialog/dialog-ref.ts                  |  7 ++
 src/lib/dialog/dialog.spec.ts                 | 25 ++++-
 src/lib/dialog/dialog.ts                      | 26 ++---
 13 files changed, 304 insertions(+), 32 deletions(-)
 create mode 100644 src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
 create mode 100644 src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts

diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
new file mode 100644
index 000000000000..33fbcc3ef5fa
--- /dev/null
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
@@ -0,0 +1,97 @@
+import {TestBed, inject} from '@angular/core/testing';
+import {dispatchKeyboardEvent} from '@angular/cdk/testing';
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {Overlay} from '../overlay';
+import {OverlayContainer} from '../overlay-container';
+import {OverlayModule} from '../index';
+import {OverlayKeyboardDispatcher} from './overlay-keyboard-dispatcher';
+
+describe('OverlayKeyboardDispatcher', () => {
+  let keyboardDispatcher: OverlayKeyboardDispatcher;
+  let overlay: Overlay;
+  let overlayContainerElement: HTMLElement;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [OverlayModule],
+      providers: [
+        {provide: OverlayContainer, useFactory: () => {
+          overlayContainerElement = document.createElement('div');
+          return {getContainerElement: () => overlayContainerElement};
+        }}
+      ],
+    });
+  });
+
+  beforeEach(inject([OverlayKeyboardDispatcher, Overlay],
+        (kbd: OverlayKeyboardDispatcher, o: Overlay) => {
+    keyboardDispatcher = kbd;
+    overlay = o;
+  }));
+
+  it('should track overlays in order as they are attached and detached', () => {
+    const overlayOne = overlay.create();
+    const overlayTwo = overlay.create();
+
+    // Attach overlays
+    keyboardDispatcher.add(overlayOne);
+    keyboardDispatcher.add(overlayTwo);
+
+    expect(keyboardDispatcher._attachedOverlays.length)
+        .toBe(2, 'Expected both overlays to be tracked.');
+    expect(keyboardDispatcher._attachedOverlays[0]).toBe(overlayOne, 'Expected one to be first.');
+    expect(keyboardDispatcher._attachedOverlays[1]).toBe(overlayTwo, 'Expected two to be last.');
+
+    // Detach first one and re-attach it
+    keyboardDispatcher.remove(overlayOne);
+    keyboardDispatcher.add(overlayOne);
+
+    expect(keyboardDispatcher._attachedOverlays[0])
+        .toBe(overlayTwo, 'Expected two to now be first.');
+    expect(keyboardDispatcher._attachedOverlays[1])
+        .toBe(overlayOne, 'Expected one to now be last.');
+  });
+
+  it('should dispatch body keyboard events to the most recently attached overlay', () => {
+    const overlayOne = overlay.create();
+    const overlayTwo = overlay.create();
+    const overlayOneSpy = jasmine.createSpy('overlayOne keyboard event spy');
+    const overlayTwoSpy = jasmine.createSpy('overlayOne keyboard event spy');
+
+    overlayOne.keydownEvents().subscribe(overlayOneSpy);
+    overlayTwo.keydownEvents().subscribe(overlayTwoSpy);
+
+    // Attach overlays
+    keyboardDispatcher.add(overlayOne);
+    keyboardDispatcher.add(overlayTwo);
+
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
+
+    // Most recent overlay should receive event
+    expect(overlayOneSpy).not.toHaveBeenCalled();
+    expect(overlayTwoSpy).toHaveBeenCalled();
+  });
+
+  it('should dispatch targeted keyboard events to the overlay containing that target', () => {
+    const overlayOne = overlay.create();
+    const overlayTwo = overlay.create();
+    const overlayOneSpy = jasmine.createSpy('overlayOne keyboard event spy');
+    const overlayTwoSpy = jasmine.createSpy('overlayOne keyboard event spy');
+
+    overlayOne.keydownEvents().subscribe(overlayOneSpy);
+    overlayTwo.keydownEvents().subscribe(overlayTwoSpy);
+
+    // Attach overlays
+    keyboardDispatcher.add(overlayOne);
+    keyboardDispatcher.add(overlayTwo);
+
+    const overlayOnePane = overlayOne.overlayElement;
+
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE, overlayOnePane);
+
+    // Targeted overlay should receive event
+    expect(overlayOneSpy).toHaveBeenCalled();
+    expect(overlayTwoSpy).not.toHaveBeenCalled();
+  });
+
+});
diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
new file mode 100644
index 000000000000..e2b0b4854cf0
--- /dev/null
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
+import {OverlayRef} from '../overlay-ref';
+import {Subscription} from 'rxjs/Subscription';
+import {RxChain, filter} from '@angular/cdk/rxjs';
+import {fromEvent} from 'rxjs/observable/fromEvent';
+
+/**
+ * Service for dispatching keyboard events that land on the body to appropriate overlay ref,
+ * if any. It maintains a list of attached overlays to determine best suited overlay based
+ * on event target and order of overlay opens.
+ */
+@Injectable()
+export class OverlayKeyboardDispatcher implements OnDestroy {
+
+  /** Currently attached overlays in the order they were attached. */
+  _attachedOverlays: OverlayRef[] = [];
+
+  private _keydownEventSubscription: Subscription | null;
+
+  ngOnDestroy() {
+    if (this._keydownEventSubscription) {
+      this._keydownEventSubscription.unsubscribe();
+      this._keydownEventSubscription = null;
+    }
+  }
+
+  /** Add a new overlay to the list of attached overlay refs. */
+  add(overlayRef: OverlayRef): void {
+    // Lazily start dispatcher once first overlay is added
+    if (!this._keydownEventSubscription) {
+      this._subscribeToKeydownEvents();
+    }
+
+    this._attachedOverlays.push(overlayRef);
+  }
+
+  /** Remove an overlay from the list of attached overlay refs. */
+  remove(overlayRef: OverlayRef): void {
+    const index = this._attachedOverlays.indexOf(overlayRef);
+    if (index > -1) {
+      this._attachedOverlays.splice(index, 1);
+    }
+  }
+
+  /**
+   * Subscribe to keydown events that land on the body and dispatch those
+   * events to the appropriate overlay.
+   */
+  private _subscribeToKeydownEvents(): void {
+    const bodyKeydownEvents = fromEvent<KeyboardEvent>(document.body, 'keydown');
+
+    this._keydownEventSubscription = RxChain.from(bodyKeydownEvents)
+      .call(filter, () => !!this._attachedOverlays.length)
+      .subscribe(event => {
+        // Dispatch keydown event to correct overlay reference
+        this._selectOverlayFromEvent(event)._keydownEvents.next(event);
+      });
+  }
+
+  /** Select the appropriate overlay from a keydown event. */
+  private _selectOverlayFromEvent(event: KeyboardEvent): OverlayRef {
+    // Check if any overlays contain the event
+    const targetedOverlay = this._attachedOverlays.find(overlay => {
+      return overlay.overlayElement === event.target ||
+          overlay.overlayElement.contains(event.target as HTMLElement);
+    });
+
+    // Use that overlay if it exists, otherwise choose the most recently attached one
+    return targetedOverlay || this._attachedOverlays[this._attachedOverlays.length - 1];
+  }
+
+}
+
+/** @docs-private */
+export function OVERLAY_KEYBOARD_DISPATCHER_PROVIDER_FACTORY(
+    dispatcher: OverlayKeyboardDispatcher) {
+  return dispatcher || new OverlayKeyboardDispatcher();
+}
+
+/** @docs-private */
+export const OVERLAY_KEYBOARD_DISPATCHER_PROVIDER = {
+  // If there is already an OverlayKeyboardDispatcher available, use that.
+  // Otherwise, provide a new one.
+  provide: OverlayKeyboardDispatcher,
+  deps: [[new Optional(), new SkipSelf(), OverlayKeyboardDispatcher]],
+  useFactory: OVERLAY_KEYBOARD_DISPATCHER_PROVIDER_FACTORY
+};
diff --git a/src/cdk/overlay/overlay-module.ts b/src/cdk/overlay/overlay-module.ts
index cd45630228c1..9d056cfb80ac 100644
--- a/src/cdk/overlay/overlay-module.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -18,11 +18,13 @@ import {
   OverlayOrigin,
 } from './overlay-directives';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
+import {OVERLAY_KEYBOARD_DISPATCHER_PROVIDER} from './keyboard/overlay-keyboard-dispatcher';
 import {ScrollStrategyOptions} from './scroll/scroll-strategy-options';
 
 export const OVERLAY_PROVIDERS: Provider[] = [
   Overlay,
   OverlayPositionBuilder,
+  OVERLAY_KEYBOARD_DISPATCHER_PROVIDER,
   VIEWPORT_RULER_PROVIDER,
   OVERLAY_CONTAINER_PROVIDER,
   MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index d1bd5c4657b9..ba14fc01b57d 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -9,6 +9,7 @@
 import {NgZone} from '@angular/core';
 import {PortalHost, Portal} from '@angular/cdk/portal';
 import {OverlayConfig} from './overlay-config';
+import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {first} from 'rxjs/operator/first';
@@ -24,11 +25,15 @@ export class OverlayRef implements PortalHost {
   private _attachments = new Subject<void>();
   private _detachments = new Subject<void>();
 
+  /** Stream of keydown events dispatched to this overlay. */
+  _keydownEvents = new Subject<KeyboardEvent>();
+
   constructor(
       private _portalHost: PortalHost,
       private _pane: HTMLElement,
       private _config: OverlayConfig,
-      private _ngZone: NgZone) {
+      private _ngZone: NgZone,
+      private _keyboardDispatcher: OverlayKeyboardDispatcher) {
 
     if (_config.scrollStrategy) {
       _config.scrollStrategy.attach(this);
@@ -87,6 +92,9 @@ export class OverlayRef implements PortalHost {
     // Only emit the `attachments` event once all other setup is done.
     this._attachments.next();
 
+    // Track this overlay by the keyboard dispatcher
+    this._keyboardDispatcher.add(this);
+
     return attachResult;
   }
 
@@ -115,6 +123,9 @@ export class OverlayRef implements PortalHost {
     // Only emit after everything is detached.
     this._detachments.next();
 
+    // Remove this overlay from keyboard dispatcher tracking
+    this._keyboardDispatcher.remove(this);
+
     return detachmentResult;
   }
 
@@ -146,22 +157,27 @@ export class OverlayRef implements PortalHost {
   }
 
   /**
-   * Returns an observable that emits when the backdrop has been clicked.
+   * Gets an observable that emits when the backdrop has been clicked.
    */
   backdropClick(): Observable<void> {
     return this._backdropClick.asObservable();
   }
 
-  /** Returns an observable that emits when the overlay has been attached. */
+  /** Gets an observable that emits when the overlay has been attached. */
   attachments(): Observable<void> {
     return this._attachments.asObservable();
   }
 
-  /** Returns an observable that emits when the overlay has been detached. */
+  /** Gets an observable that emits when the overlay has been detached. */
   detachments(): Observable<void> {
     return this._detachments.asObservable();
   }
 
+  /** Gets an observable of keydown events targeted to this overlay. */
+  keydownEvents(): Observable<KeyboardEvent> {
+    return this._keydownEvents.asObservable();
+  }
+
   /**
    * Gets the current config of the overlay.
    */
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index d1a3630410b3..0c4ca58f0202 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -17,6 +17,7 @@ import {DomPortalHost} from '@angular/cdk/portal';
 import {OverlayConfig} from './overlay-config';
 import {OverlayRef} from './overlay-ref';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
+import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {OverlayContainer} from './overlay-container';
 import {ScrollStrategyOptions} from './scroll/index';
 
@@ -44,6 +45,7 @@ export class Overlay {
               private _overlayContainer: OverlayContainer,
               private _componentFactoryResolver: ComponentFactoryResolver,
               private _positionBuilder: OverlayPositionBuilder,
+              private _keyboardDispatcher: OverlayKeyboardDispatcher,
               private _appRef: ApplicationRef,
               private _injector: Injector,
               private _ngZone: NgZone) { }
@@ -56,7 +58,7 @@ export class Overlay {
   create(config: OverlayConfig = defaultConfig): OverlayRef {
     const pane = this._createPaneElement();
     const portalHost = this._createPortalHost(pane);
-    return new OverlayRef(portalHost, pane, config, this._ngZone);
+    return new OverlayRef(portalHost, pane, config, this._ngZone, this._keyboardDispatcher);
   }
 
   /**
@@ -90,4 +92,5 @@ export class Overlay {
   private _createPortalHost(pane: HTMLElement): DomPortalHost {
     return new DomPortalHost(pane, this._componentFactoryResolver, this._appRef, this._injector);
   }
+
 }
diff --git a/src/cdk/testing/dispatch-events.ts b/src/cdk/testing/dispatch-events.ts
index 28413dd74a89..d1970f344218 100644
--- a/src/cdk/testing/dispatch-events.ts
+++ b/src/cdk/testing/dispatch-events.ts
@@ -25,8 +25,9 @@ export function dispatchFakeEvent(node: Node | Window, type: string, canBubble?:
 }
 
 /** Shorthand to dispatch a keyboard event with a specified key code. */
-export function dispatchKeyboardEvent(node: Node, type: string, keyCode: number): KeyboardEvent {
-  return dispatchEvent(node, createKeyboardEvent(type, keyCode)) as KeyboardEvent;
+export function dispatchKeyboardEvent(node: Node, type: string, keyCode: number, target?: Element):
+    KeyboardEvent {
+  return dispatchEvent(node, createKeyboardEvent(type, keyCode, target)) as KeyboardEvent;
 }
 
 /** Shorthand to dispatch a mouse event on the specified coordinates. */
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index ed2841168317..edb4a5d06499 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -23,7 +23,12 @@ import {InputDemo} from '../input/input-demo';
 import {ListDemo} from '../list/list-demo';
 import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
 import {MenuDemo} from '../menu/menu-demo';
-import {OverlayDemo, RotiniPanel, SpagettiPanel} from '../overlay/overlay-demo';
+import {
+  OverlayDemo,
+  RotiniPanel,
+  SpagettiPanel,
+  KeyboardTrackingPanel
+} from '../overlay/overlay-demo';
 import {PlatformDemo} from '../platform/platform-demo';
 import {PortalDemo, ScienceJoke} from '../portal/portal-demo';
 import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
@@ -80,6 +85,7 @@ import {DEMO_APP_ROUTES} from './routes';
     IFrameDialog,
     InputDemo,
     JazzDialog,
+    KeyboardTrackingPanel,
     ListDemo,
     LiveAnnouncerDemo,
     MatCheckboxDemoNestedChecklist,
@@ -119,6 +125,7 @@ import {DEMO_APP_ROUTES} from './routes';
     DemoApp,
     IFrameDialog,
     JazzDialog,
+    KeyboardTrackingPanel,
     RotiniPanel,
     ScienceJoke,
     SpagettiPanel,
diff --git a/src/demo-app/overlay/overlay-demo.html b/src/demo-app/overlay/overlay-demo.html
index df048577ba7d..ff9dfeecd2cc 100644
--- a/src/demo-app/overlay/overlay-demo.html
+++ b/src/demo-app/overlay/overlay-demo.html
@@ -36,3 +36,5 @@
 </ng-template>
 
 <button (click)="openPanelWithBackdrop()">Backdrop panel</button>
+
+<button (click)="openKeyboardTracking()">Keyboard tracking</button>
diff --git a/src/demo-app/overlay/overlay-demo.scss b/src/demo-app/overlay/overlay-demo.scss
index 275b5161e5f5..fef2a71da69d 100644
--- a/src/demo-app/overlay/overlay-demo.scss
+++ b/src/demo-app/overlay/overlay-demo.scss
@@ -27,3 +27,11 @@
   background-color: orangered;
   opacity: 0.5;
 }
+
+.demo-keyboard {
+  margin: 0;
+  padding: 10px;
+  border: 1px solid black;
+  background-color: mediumturquoise;
+  opacity: 0.7;
+}
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index 88467b3242dc..1f354ae23834 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -15,6 +15,8 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
+import 'rxjs/add/operator/filter';
+import 'rxjs/add/operator/do';
 
 
 @Component({
@@ -104,6 +106,26 @@ export class OverlayDemo {
     overlayRef.backdropClick().subscribe(() => overlayRef.detach());
   }
 
+  openKeyboardTracking() {
+    let config = new OverlayConfig();
+
+    config.positionStrategy = this.overlay.position()
+      .global()
+      .centerHorizontally()
+      .top(`${this.nextPosition}px`);
+
+    this.nextPosition += 30;
+
+    let overlayRef = this.overlay.create(config);
+    const componentRef = overlayRef
+        .attach(new ComponentPortal(KeyboardTrackingPanel, this.viewContainerRef));
+
+    overlayRef.keydownEvents()
+      .do(e => componentRef.instance.lastKeydown = e.key)
+      .filter(e => e.key === 'Escape')
+      .subscribe(() => overlayRef.detach());
+  }
+
 }
 
 /** Simple component to load into an overlay */
@@ -124,3 +146,12 @@ export class RotiniPanel {
 export class SpagettiPanel {
   value: string = 'Omega';
 }
+
+/** Simple component to load into an overlay */
+@Component({
+  selector: 'keyboard-panel',
+  template: '<div class="demo-keyboard">Last Keydown: {{ lastKeydown }}</div>'
+})
+export class KeyboardTrackingPanel {
+  lastKeydown = '';
+}
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 8c8f29480eb1..38a95f7eeb89 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -115,6 +115,13 @@ export class MatDialogRef<T> {
     return this._overlayRef.backdropClick();
   }
 
+  /**
+   * Gets an observable that emits when keydown events are targeted on the overlay.
+   */
+  keydownEvents(): Observable<KeyboardEvent> {
+    return this._overlayRef.keydownEvents();
+  }
+
   /**
    * Updates the dialog's position.
    * @param position New dialog position.
diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 4d4b0fde7242..66f6a86004e2 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -25,7 +25,7 @@ import {SpyLocation} from '@angular/common/testing';
 import {Directionality} from '@angular/cdk/bidi';
 import {MatDialogContainer} from './dialog-container';
 import {OverlayContainer} from '@angular/cdk/overlay';
-import {ESCAPE} from '@angular/cdk/keycodes';
+import {A, ESCAPE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {MAT_DIALOG_DATA, MatDialog, MatDialogModule, MatDialogRef} from './index';
 
@@ -203,7 +203,7 @@ describe('MatDialog', () => {
       viewContainerRef: testViewContainerRef
     });
 
-    dispatchKeyboardEvent(document, 'keydown', ESCAPE);
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
     viewContainerFixture.detectChanges();
 
     viewContainerFixture.whenStable().then(() => {
@@ -277,6 +277,23 @@ describe('MatDialog', () => {
     });
   }));
 
+  it('should emit the keyboardEvent stream when key events target the overlay', async(() => {
+    const dialogRef = dialog.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
+
+    const spy = jasmine.createSpy('keyboardEvent spy');
+    dialogRef.keydownEvents().subscribe(spy);
+
+    viewContainerFixture.detectChanges();
+
+    let backdrop = overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+    let container = overlayContainerElement.querySelector('mat-dialog-container') as HTMLElement;
+    dispatchKeyboardEvent(document.body, 'keydown', A);
+    dispatchKeyboardEvent(document.body, 'keydown', A, backdrop);
+    dispatchKeyboardEvent(document.body, 'keydown', A, container);
+
+    expect(spy).toHaveBeenCalledTimes(3);
+  }));
+
   it('should notify the observers if a dialog has been opened', () => {
     dialog.afterOpen.subscribe(ref => {
       expect(dialog.open(PizzaMsg, {
@@ -665,7 +682,7 @@ describe('MatDialog', () => {
       });
 
       viewContainerFixture.detectChanges();
-      dispatchKeyboardEvent(document, 'keydown', ESCAPE);
+      dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
 
       expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeTruthy();
     });
@@ -986,7 +1003,7 @@ describe('MatDialog with a parent MatDialog', () => {
   it('should close the top dialog via the escape key', async(() => {
     childDialog.open(PizzaMsg);
 
-    dispatchKeyboardEvent(document, 'keydown', ESCAPE);
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
     fixture.detectChanges();
 
     fixture.whenStable().then(() => {
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index ce0b39d71c3f..c6dbacd7cb92 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -15,7 +15,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
-import {startWith} from '@angular/cdk/rxjs';
+import {RxChain, startWith, filter} from '@angular/cdk/rxjs';
 import {Location} from '@angular/common';
 import {
   ComponentRef,
@@ -67,7 +67,6 @@ export class MatDialog {
   private _openDialogsAtThisLevel: MatDialogRef<any>[] = [];
   private _afterAllClosedAtThisLevel = new Subject<void>();
   private _afterOpenAtThisLevel = new Subject<MatDialogRef<any>>();
-  private _boundKeydown = this._handleKeydown.bind(this);
 
   /** Keeps track of the currently-open dialogs. */
   get openDialogs(): MatDialogRef<any>[] {
@@ -135,10 +134,6 @@ export class MatDialog {
     const dialogRef =
         this._attachDialogContent(componentOrTemplateRef, dialogContainer, overlayRef, config);
 
-    if (!this.openDialogs.length) {
-      document.addEventListener('keydown', this._boundKeydown);
-    }
-
     this.openDialogs.push(dialogRef);
     dialogRef.afterClosed().subscribe(() => this._removeOpenDialog(dialogRef));
     this.afterOpen.next(dialogRef);
@@ -246,6 +241,11 @@ export class MatDialog {
       });
     }
 
+    // Close when escape keydown event occurs
+    RxChain.from(overlayRef.keydownEvents())
+      .call(filter, event => event.keyCode === ESCAPE && !dialogRef.disableClose)
+      .subscribe(() => dialogRef.close());
+
     if (componentOrTemplateRef instanceof TemplateRef) {
       dialogContainer.attachTemplatePortal(
         new TemplatePortal<T>(componentOrTemplateRef, null!,
@@ -304,23 +304,9 @@ export class MatDialog {
       // no open dialogs are left, call next on afterAllClosed Subject
       if (!this.openDialogs.length) {
         this._afterAllClosed.next();
-        document.removeEventListener('keydown', this._boundKeydown);
       }
     }
   }
-
-  /**
-   * Handles global key presses while there are open dialogs. Closes the
-   * top dialog when the user presses escape.
-   */
-  private _handleKeydown(event: KeyboardEvent): void {
-    const topDialog = this.openDialogs[this.openDialogs.length - 1];
-    const canClose = topDialog ? !topDialog.disableClose : false;
-
-    if (event.keyCode === ESCAPE && canClose) {
-      topDialog.close();
-    }
-  }
 }
 
 /**

From 8c389b4c26fe4f9316fb1f78f406d77b03817465 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 27 Oct 2017 19:16:39 +0200
Subject: [PATCH 359/575] docs: add note about web animations polyfill (#8069)

Adds a note that the WebAnimations polyfill is required for component animations to work in all browsers.
---
 guides/getting-started.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/guides/getting-started.md b/guides/getting-started.md
index 677b210b2355..767adc6e89be 100644
--- a/guides/getting-started.md
+++ b/guides/getting-started.md
@@ -28,6 +28,10 @@ install the `@angular/animations` module and include the `BrowserAnimationsModul
 npm install --save @angular/animations
 ```
 
+**Note:** `@angular/animations` uses the WebAnimation API that isn't supported by all browsers yet.
+If you want to support Material component animations in these browsers, you'll have to
+[include a polyfill](https://github.com/web-animations/web-animations-js).
+
 ```ts
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 
@@ -54,7 +58,7 @@ export class PizzaPartyAppModule { }
 
 ### Step 3: Import the component modules
 
-Import the NgModule for each component you want to use: 
+Import the NgModule for each component you want to use:
 
 ```ts
 import {MatButtonModule, MatCheckboxModule} from '@angular/material';
@@ -67,7 +71,7 @@ import {MatButtonModule, MatCheckboxModule} from '@angular/material';
 export class PizzaPartyAppModule { }
 ```
 
-Alternatively, you can create a separate NgModule that imports all of the 
+Alternatively, you can create a separate NgModule that imports all of the
 Angular Material components that you will use in your application. You can then
 include this module wherever you'd like to use the components.
 
@@ -81,7 +85,7 @@ import {MatButtonModule, MatCheckboxModule} from '@angular/material';
 export class MyOwnCustomMaterialModule { }
 ```
 
-Whichever approach you use, be sure to import the Angular Material modules _after_ Angular's 
+Whichever approach you use, be sure to import the Angular Material modules _after_ Angular's
 `BrowserModule`, as the import order matters for NgModules.
 
 ### Step 4: Include a theme
@@ -122,7 +126,7 @@ import 'hammerjs';
 
 ### Step 6 (Optional): Add Material Icons
 
-If you want to use the `mat-icon` component with the official 
+If you want to use the `mat-icon` component with the official
 [Material Design Icons](https://material.io/icons/), load the icon font in your `index.html`.
 
 ```html
@@ -140,10 +144,10 @@ Note that `mat-icon` supports any font or svg icons; using Material Icons is one
 If your project is using SystemJS for module loading, you will need to add `@angular/material` and
 `@angular/cdk` to the SystemJS configuration.
 
-The `@angular/cdk` package is organized of multiple entry-points. 
+The `@angular/cdk` package is organized of multiple entry-points.
 Each of these entry-points must be registered individually with SystemJS.
 
-Here is a example configuration where `@angular/material`, `@angular/cdk/platform` and 
+Here is a example configuration where `@angular/material`, `@angular/cdk/platform` and
 `@angular/cdk/a11y` are used:
 
 
@@ -153,7 +157,7 @@ System.config({
   map: {
     // ...
     '@angular/material': 'npm:@angular/material/bundles/material.umd.js',
-    
+
     // CDK individual packages
     '@angular/cdk/platform': 'npm:@angular/cdk/bundles/cdk-platform.umd.js',
     '@angular/cdk/a11y': 'npm:@angular/cdk/bundles/cdk-a11y.umd.js',

From 5f82278e3791b49feb07bf2997cd6d35203a3f38 Mon Sep 17 00:00:00 2001
From: barnesma <17455782+barnesma@users.noreply.github.com>
Date: Fri, 27 Oct 2017 12:17:44 -0500
Subject: [PATCH 360/575] Update card.md (#8043)

#7241 was a little heavy handed in removing all md prefixes.
---
 src/lib/card/card.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/card/card.md b/src/lib/card/card.md
index fe3a6b33b328..2168c874b508 100644
--- a/src/lib/card/card.md
+++ b/src/lib/card/card.md
@@ -40,7 +40,7 @@ This element can contain:
 * `<mat-card-subtitle>`
 * One of:
     * `<img mat-card-sm-image>`
-    * `<img mat-card-mat-image>`
+    * `<img mat-card-md-image>`
     * `<img mat-card-lg-image>`
 
 ### Accessibility

From 24984f5e44e49eae46c1571c29759c9f4256727e Mon Sep 17 00:00:00 2001
From: barnesma <17455782+barnesma@users.noreply.github.com>
Date: Fri, 27 Oct 2017 12:18:04 -0500
Subject: [PATCH 361/575] Update card-demo.html (#8042)

#7241 was a little heavy handed in removing all md prefixes.
---
 src/demo-app/card/card-demo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/demo-app/card/card-demo.html b/src/demo-app/card/card-demo.html
index 599e37891553..221c295e0d77 100644
--- a/src/demo-app/card/card-demo.html
+++ b/src/demo-app/card/card-demo.html
@@ -7,7 +7,7 @@
     <mat-card-title-group>
         <mat-card-title>Card with title</mat-card-title>
         <mat-card-subtitle>Subtitle</mat-card-subtitle>
-        <img mat-card-mat-image>
+        <img mat-card-md-image>
     </mat-card-title-group>
   </mat-card>
 

From 473b1dfafda8ee1e564e2e95852938dcb87776f2 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 27 Oct 2017 10:18:36 -0700
Subject: [PATCH 362/575] chore: create tslint rule to allow @HostListener and
 @HostBinding in abstract classes (#8036)

---
 .../noHostDecoratorInConcreteRule.ts          | 37 +++++++++++++++++++
 tslint.json                                   |  9 +++--
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 tools/tslint-rules/noHostDecoratorInConcreteRule.ts

diff --git a/tools/tslint-rules/noHostDecoratorInConcreteRule.ts b/tools/tslint-rules/noHostDecoratorInConcreteRule.ts
new file mode 100644
index 000000000000..e3e42fa6f045
--- /dev/null
+++ b/tools/tslint-rules/noHostDecoratorInConcreteRule.ts
@@ -0,0 +1,37 @@
+import * as ts from 'typescript';
+import * as Lint from 'tslint';
+
+export class Rule extends Lint.Rules.AbstractRule {
+  apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+    return this.applyWithWalker(new Walker(sourceFile, this.getOptions()));
+  }
+}
+
+class Walker extends Lint.RuleWalker {
+  visitClassDeclaration(node: ts.ClassDeclaration) {
+    if (!node.modifiers || !this.getOptions().length) { return; }
+
+    // Do not check the class if its abstract.
+    if (!!node.modifiers.find(modifier => modifier.kind === ts.SyntaxKind.AbstractKeyword)) {
+      return;
+    }
+
+    node.members
+        .filter(el => el.decorators)
+        .map(el => el.decorators!)
+        .forEach(decorators => {
+          decorators.forEach(decorator => {
+            const decoratorText: string = decorator.getChildAt(1).getText();
+            const matchedDecorator: string = this.getOptions().find(
+              (item: string) => decoratorText.startsWith(item));
+            if (!!matchedDecorator) {
+              this.addFailureFromStartToEnd(decorator.getChildAt(1).pos - 1, decorator.end,
+                  `The @${matchedDecorator} decorator may only be used in abstract classes. In ` +
+                  `concrete classes use \`host\` in the component definition instead.`);
+            }
+          });
+        });
+
+    super.visitClassDeclaration(node);
+  }
+}
diff --git a/tslint.json b/tslint.json
index 31beb1d556e9..e3fa8b441da8 100644
--- a/tslint.json
+++ b/tslint.json
@@ -75,9 +75,7 @@
       ["fit"],
       ["fdescribe"],
       ["xit"],
-      ["xdescribe"],
-      { "name": "HostBinding", "message": "Use `host` in the component definition instead." },
-      { "name": "HostListener", "message": "Use `host` in the component definition instead." }
+      ["xdescribe"]
     ],
     // Disallows importing the whole RxJS library. Submodules can be still imported.
     "import-blacklist": [true, "rxjs"],
@@ -87,6 +85,11 @@
     // Custom Rules
     "ts-loader": true,
     "no-exposed-todo": true,
+    "no-host-decorator-in-concrete": [
+      true,
+      "HostBinding",
+      "HostListener"
+    ],
     "validate-decorators": [true, {
       "Component": {
         "encapsulation": "\\.None$",

From dc1bf54e284e0644580f23cce30ed34a925db111 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 27 Oct 2017 19:19:25 +0200
Subject: [PATCH 363/575] chore: fix gulp-utils color issue (#8030)

With (DefinitelyTyped #21004) the typings for @gulp-utils are declaring `chalk` as dependency of the types. This causes a conflict with the types from chalk and gulp fails everywhere in the CI. (https://github.com/DefinitelyTyped/DefinitelyTyped/issues/21004)

A possible solution would be locking the version of the gulp-util types to the working version `3.0.31`.

As `gulp-utils` is only used in one place right now, we are just remove the `gulp-utils` import and just use `console.log` as everywhere else.
---
 package-lock.json        | 1035 ++++++++++++++++++++++++++------------
 package.json             |   21 +-
 tools/gulp/tasks/lint.ts |    3 +-
 3 files changed, 737 insertions(+), 322 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ca23cdd1c85..1565fa35fc87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,6 +59,7 @@
       "version": "4.4.4",
       "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.4.tgz",
       "integrity": "sha1-Zn+vYWu2JBaOr65u6S5euiOp0fI=",
+      "dev": true,
       "requires": {
         "tslib": "1.7.1"
       }
@@ -141,7 +142,7 @@
         "log-driver": "1.2.5",
         "methmeth": "1.1.0",
         "modelo": "4.2.0",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "retry-request": "2.0.5",
         "split-array-stream": "1.0.3",
         "stream-events": "1.0.2",
@@ -306,22 +307,22 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz",
-      "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.43"
+        "@types/node": "7.0.46"
       }
     },
     "@types/glob": {
-      "version": "5.0.32",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.32.tgz",
-      "integrity": "sha512-DMcj5b67Alb/e4KhpzyvphC5nVDHn1oCOGZao3oBddZVMH5vgI/cvdp+O/kcxZGZaPqs0ZLAsK4YrjbtZHO05g==",
+      "version": "5.0.33",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.33.tgz",
+      "integrity": "sha512-BcD4yyWz+qmCggaYMSFF0Xn7GkO6tgwm3Fh9Gxk/kQmEU3Z7flQTnVlMyKBUNvXXNTCCyjqK4XT4/2hLd1gQ2A==",
       "dev": true,
       "requires": {
         "@types/minimatch": "3.0.1",
-        "@types/node": "7.0.43"
+        "@types/node": "7.0.46"
       }
     },
     "@types/gulp": {
@@ -330,7 +331,7 @@
       "integrity": "sha1-g8WcaBzCM9Hsf4LSaVVVZvoTMVY=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.43",
+        "@types/node": "7.0.46",
         "@types/orchestrator": "0.3.0",
         "@types/vinyl": "2.0.1"
       }
@@ -353,7 +354,7 @@
       "integrity": "sha1-njnQT2/k82+nR3VmytH6+AsqZx8=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.43"
+        "@types/node": "7.0.46"
       }
     },
     "@types/minimatch": {
@@ -369,9 +370,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "7.0.43",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
-      "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==",
+      "version": "7.0.46",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz",
+      "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==",
       "dev": true
     },
     "@types/orchestrator": {
@@ -380,7 +381,7 @@
       "integrity": "sha1-v4ShaZyTMNT+ic2BJj6PwJ+zKXg=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.43",
+        "@types/node": "7.0.46",
         "@types/q": "0.0.37"
       }
     },
@@ -397,7 +398,7 @@
       "dev": true,
       "requires": {
         "@types/gulp": "3.8.32",
-        "@types/node": "7.0.43"
+        "@types/node": "7.0.46"
       }
     },
     "@types/selenium-webdriver": {
@@ -412,7 +413,17 @@
       "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.43"
+        "@types/node": "7.0.46"
+      }
+    },
+    "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"
       }
     },
     "a-sync-waterfall": {
@@ -928,6 +939,27 @@
         "chalk": "1.1.3",
         "esutils": "2.0.2",
         "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "babel-runtime": {
@@ -1130,6 +1162,27 @@
         "repeating": "2.0.1",
         "string-width": "1.0.2",
         "widest-line": "1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "brace-expansion": {
@@ -1613,6 +1666,19 @@
         "yargs": "1.3.3"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -1634,6 +1700,12 @@
             "postcss": "5.2.17"
           }
         },
+        "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
+        },
         "yargs": {
           "version": "1.3.3",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
@@ -2231,8 +2303,8 @@
       "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
-        "is-text-path": "1.0.1",
         "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.1.1",
@@ -2775,41 +2847,6 @@
       "integrity": "sha1-MC5YIY2FxRqXY4cw2/m32FKhlpM=",
       "dev": true
     },
-    "dependency-tree": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-5.8.0.tgz",
-      "integrity": "sha1-Cr1a7nibSb5RIaks9ml7t6EzLXA=",
-      "dev": true,
-      "requires": {
-        "commander": "2.6.0",
-        "debug": "2.2.0",
-        "filing-cabinet": "1.9.0",
-        "precinct": "3.8.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-          "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
-          "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
-        }
-      }
-    },
     "deprecated": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
@@ -3887,6 +3924,27 @@
       "requires": {
         "chalk": "1.1.3",
         "time-stamp": "1.1.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "fast-deep-equal": {
@@ -4478,14 +4536,12 @@
         "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
+          "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
         },
         "arrify": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-          "dev": true
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
         },
         "ascli": {
           "version": "1.0.1",
@@ -4499,8 +4555,7 @@
         "asn1": {
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-          "dev": true
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
         },
         "assert-plus": {
           "version": "0.2.0",
@@ -4511,7 +4566,6 @@
           "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"
           }
@@ -4519,8 +4573,7 @@
         "asynckit": {
           "version": "0.4.0",
           "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-          "dev": true
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
         },
         "aws-sign2": {
           "version": "0.6.0",
@@ -4530,8 +4583,7 @@
         "aws4": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-          "dev": true
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
         },
         "balanced-match": {
           "version": "1.0.0",
@@ -4541,14 +4593,12 @@
         "base64url": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
-          "dev": true
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
         },
         "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"
@@ -4580,8 +4630,7 @@
         "buffer-equal-constant-time": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
-          "dev": true
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
         },
         "bun": {
           "version": "0.0.12",
@@ -4630,14 +4679,12 @@
         "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
+          "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0="
         },
         "caseless": {
           "version": "0.12.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-          "dev": true
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
         },
         "cliui": {
           "version": "3.2.0",
@@ -4652,8 +4699,7 @@
         "co": {
           "version": "4.6.0",
           "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
         },
         "code-point-at": {
           "version": "1.1.0",
@@ -4669,7 +4715,6 @@
           "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"
           }
@@ -4683,7 +4728,6 @@
           "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",
@@ -4707,14 +4751,12 @@
         "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
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
         },
         "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"
           }
@@ -4747,7 +4789,6 @@
           "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"
           },
@@ -4755,8 +4796,7 @@
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
@@ -4768,8 +4808,7 @@
         "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
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
         },
         "dot-prop": {
           "version": "4.2.0",
@@ -4783,7 +4822,6 @@
           "version": "3.5.1",
           "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
           "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
-          "dev": true,
           "requires": {
             "end-of-stream": "1.4.0",
             "inherits": "2.0.3",
@@ -4795,7 +4833,6 @@
           "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"
@@ -4805,7 +4842,6 @@
           "version": "1.0.9",
           "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
           "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-          "dev": true,
           "requires": {
             "base64url": "2.0.0",
             "safe-buffer": "5.1.1"
@@ -4815,7 +4851,6 @@
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
           "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-          "dev": true,
           "requires": {
             "once": "1.4.0"
           }
@@ -4823,20 +4858,17 @@
         "ent": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-          "dev": true
+          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
         },
         "extend": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-          "dev": true
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
         },
         "extsprintf": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-          "dev": true
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
         },
         "fast-deep-equal": {
           "version": "1.0.0",
@@ -4855,8 +4887,7 @@
         "forever-agent": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-          "dev": true
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
         },
         "form-data": {
           "version": "2.1.4",
@@ -4906,7 +4937,6 @@
           "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"
           },
@@ -4914,8 +4944,7 @@
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
@@ -4948,7 +4977,6 @@
           "version": "0.10.0",
           "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
           "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-          "dev": true,
           "requires": {
             "gtoken": "1.2.2",
             "jws": "3.1.4",
@@ -5032,7 +5060,6 @@
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
           "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-          "dev": true,
           "requires": {
             "node-forge": "0.7.1"
           }
@@ -5745,14 +5772,6 @@
                 }
               }
             },
-            "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==",
-              "requires": {
-                "safe-buffer": "5.1.1"
-              }
-            },
             "string-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -5763,6 +5782,14 @@
                 "strip-ansi": "3.0.1"
               }
             },
+            "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==",
+              "requires": {
+                "safe-buffer": "5.1.1"
+              }
+            },
             "stringstream": {
               "version": "0.0.5",
               "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -5879,7 +5906,6 @@
           "version": "1.2.2",
           "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
           "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
-          "dev": true,
           "requires": {
             "google-p12-pem": "0.1.2",
             "jws": "3.1.4",
@@ -5959,8 +5985,7 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "invert-kv": {
           "version": "1.0.0",
@@ -5970,8 +5995,7 @@
         "is": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-          "dev": true
+          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
@@ -5984,26 +6008,22 @@
         "is-obj": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-          "dev": true
+          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
         },
         "is-stream-ended": {
           "version": "0.1.3",
           "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
-          "dev": true
+          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
         },
         "is-typedarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-          "dev": true
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "isemail": {
           "version": "1.2.0",
@@ -6014,8 +6034,7 @@
         "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
+          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
         },
         "joi": {
           "version": "6.10.1",
@@ -6033,14 +6052,12 @@
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
           "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-          "dev": true,
           "optional": 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
+          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
         },
         "json-schema-traverse": {
           "version": "0.3.1",
@@ -6051,7 +6068,6 @@
           "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"
           }
@@ -6059,14 +6075,12 @@
         "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
+          "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
         },
         "jsonify": {
           "version": "0.0.0",
           "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-          "dev": true
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
         },
         "jsonwebtoken": {
           "version": "7.1.9",
@@ -6085,7 +6099,6 @@
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
           "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-          "dev": true,
           "requires": {
             "assert-plus": "1.0.0",
             "extsprintf": "1.3.0",
@@ -6096,8 +6109,7 @@
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
@@ -6105,7 +6117,6 @@
           "version": "1.1.5",
           "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
           "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-          "dev": true,
           "requires": {
             "base64url": "2.0.0",
             "buffer-equal-constant-time": "1.0.1",
@@ -6117,7 +6128,6 @@
           "version": "3.1.4",
           "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
           "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-          "dev": true,
           "requires": {
             "base64url": "2.0.0",
             "jwa": "1.1.5",
@@ -6135,14 +6145,12 @@
         "lodash": {
           "version": "4.17.4",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
         },
         "lodash.noop": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
-          "dev": true
+          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
         },
         "lodash.once": {
           "version": "4.1.1",
@@ -6153,8 +6161,7 @@
         "log-driver": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
-          "dev": true
+          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
         },
         "long": {
           "version": "3.2.0",
@@ -6173,8 +6180,7 @@
         "methmeth": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
-          "dev": true
+          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
         },
         "mime": {
           "version": "1.3.6",
@@ -6205,8 +6211,7 @@
         "modelo": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
-          "dev": true
+          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
         },
         "moment": {
           "version": "2.18.1",
@@ -6228,8 +6233,7 @@
         "node-forge": {
           "version": "0.7.1",
           "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
-          "dev": true
+          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
         },
         "number-is-nan": {
           "version": "1.0.1",
@@ -6239,8 +6243,7 @@
         "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
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6251,7 +6254,6 @@
           "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"
           }
@@ -6282,8 +6284,7 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         },
         "pinkie": {
           "version": "2.0.4",
@@ -6301,8 +6302,7 @@
         "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
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
         },
         "protobufjs": {
           "version": "5.0.2",
@@ -6339,8 +6339,7 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         },
         "qs": {
           "version": "6.4.0",
@@ -6351,7 +6350,6 @@
           "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",
@@ -6403,8 +6401,7 @@
         "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
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
         },
         "signal-exit": {
           "version": "3.0.2",
@@ -6423,7 +6420,6 @@
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
           "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
-          "dev": true,
           "requires": {
             "async": "2.5.0",
             "is-stream-ended": "0.1.3"
@@ -6433,7 +6429,6 @@
           "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",
@@ -6448,8 +6443,7 @@
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
@@ -6457,7 +6451,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
           "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
-          "dev": true,
           "requires": {
             "stubs": "3.0.0"
           }
@@ -6465,23 +6458,12 @@
         "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
-        },
-        "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"
-          }
+          "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
         },
         "string-format-obj": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
-          "dev": true
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
         },
         "string-width": {
           "version": "1.0.2",
@@ -6493,11 +6475,18 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "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==",
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-          "dev": true
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
         },
         "strip-ansi": {
           "version": "3.0.1",
@@ -6510,14 +6499,12 @@
         "stubs": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
-          "dev": true
+          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
         },
         "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"
@@ -6544,7 +6531,6 @@
           "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"
           }
@@ -6553,14 +6539,12 @@
           "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
         },
         "typedarray": {
           "version": "0.0.6",
           "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-          "dev": true
+          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
         },
         "unique-string": {
           "version": "1.0.0",
@@ -6574,20 +6558,17 @@
         "util-deprecate": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-          "dev": true
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
         },
         "uuid": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-          "dev": true
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
         },
         "verror": {
           "version": "1.10.0",
           "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
           "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-          "dev": true,
           "requires": {
             "assert-plus": "1.0.0",
             "core-util-is": "1.0.2",
@@ -6597,8 +6578,7 @@
             "assert-plus": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
             }
           }
         },
@@ -6634,8 +6614,7 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "write-file-atomic": {
           "version": "2.1.0",
@@ -6657,8 +6636,7 @@
         "xtend": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
         },
         "y18n": {
           "version": "3.2.1",
@@ -6688,6 +6666,7 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.25",
+        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -6707,14 +6686,13 @@
         "google-auto-auth": "0.7.2",
         "inquirer": "0.12.0",
         "jsonschema": "1.2.0",
-        "JSONStream": "1.3.1",
         "jsonwebtoken": "7.4.3",
         "lodash": "4.17.4",
         "open": "0.0.5",
         "ora": "0.2.3",
         "portfinder": "0.4.0",
         "progress": "2.0.0",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "rsvp": "3.6.2",
         "semver": "5.4.1",
         "superstatic": "5.0.1",
@@ -6733,6 +6711,19 @@
           "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
           "dev": true
         },
+        "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"
+          }
+        },
         "configstore": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
@@ -6814,6 +6805,12 @@
           "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
           "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
+        },
         "winston": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
@@ -7099,7 +7096,7 @@
           "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
           "dev": true,
           "requires": {
-            "request": "2.82.0",
+            "request": "2.83.0",
             "through2": "2.0.3"
           }
         }
@@ -7115,7 +7112,7 @@
         "configstore": "3.1.1",
         "google-auto-auth": "0.7.2",
         "pumpify": "1.3.5",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "stream-events": "1.0.2",
         "through2": "2.0.3"
       }
@@ -7559,7 +7556,7 @@
         "gtoken": "1.2.2",
         "jws": "3.1.4",
         "lodash.noop": "3.0.1",
-        "request": "2.82.0"
+        "request": "2.83.0"
       }
     },
     "google-auto-auth": {
@@ -7571,7 +7568,7 @@
         "async": "2.5.0",
         "gcp-metadata": "0.3.0",
         "google-auth-library": "0.10.0",
-        "request": "2.82.0"
+        "request": "2.83.0"
       }
     },
     "google-closure-compiler": {
@@ -7583,6 +7580,27 @@
         "chalk": "1.1.3",
         "vinyl": "2.1.0",
         "vinyl-sourcemaps-apply": "0.2.1"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "google-p12-pem": {
@@ -8912,7 +8930,7 @@
         "google-p12-pem": "0.1.2",
         "jws": "3.1.4",
         "mime": "1.4.0",
-        "request": "2.82.0"
+        "request": "2.83.0"
       }
     },
     "gulp": {
@@ -8936,12 +8954,31 @@
         "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
-        }
+        "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"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "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
+        }
       }
     },
     "gulp-clean": {
@@ -9194,6 +9231,27 @@
         "v8flags": "2.1.1",
         "wreck": "6.3.0",
         "yargs": "3.32.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "gulp-connect": {
@@ -9529,6 +9587,19 @@
         "through2": "2.0.1"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "clone": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
@@ -9609,6 +9680,12 @@
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "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
+        },
         "through2": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
@@ -9753,6 +9830,19 @@
         "vinyl": "0.5.3"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "clone": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
@@ -9777,6 +9867,12 @@
           "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
           "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
+        },
         "vinyl": {
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
@@ -10251,6 +10347,27 @@
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1",
         "through": "2.3.8"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "interpret": {
@@ -10874,7 +10991,7 @@
         "iconv-lite": "0.4.15",
         "nwmatcher": "1.4.1",
         "parse5": "1.5.1",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "sax": "1.2.4",
         "symbol-tree": "3.2.2",
         "tough-cookie": "2.3.2",
@@ -10955,6 +11072,16 @@
         "through2": "0.6.5"
       },
       "dependencies": {
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -10967,16 +11094,6 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -11041,16 +11158,6 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
-      }
-    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -11815,6 +11922,27 @@
       "dev": true,
       "requires": {
         "chalk": "1.1.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "log4js": {
@@ -11914,25 +12042,38 @@
       }
     },
     "madge": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/madge/-/madge-1.6.0.tgz",
-      "integrity": "sha1-9dCkgCe+4uuSRbk0I/l0H4iK62U=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/madge/-/madge-2.2.0.tgz",
+      "integrity": "sha512-5UoX9n8od0UmKPcZo4KydgQch+oKvlywsee+60ochES6Uo1UDaHnt6yx+SOIZMt007R0F/ZNq03vhxlaJPep+g==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
-        "commander": "2.11.0",
+        "commander": "2.9.0",
         "commondir": "1.0.1",
-        "debug": "2.6.7",
-        "dependency-tree": "5.8.0",
+        "debug": "2.2.0",
+        "dependency-tree": "5.11.0",
         "graphviz": "0.0.8",
-        "mz": "2.7.0",
-        "ora": "1.1.0",
-        "pluralize": "3.1.0",
+        "mz": "2.4.0",
+        "ora": "1.2.0",
+        "pluralize": "4.0.0",
         "pretty-ms": "2.1.0",
-        "rc": "1.2.1",
+        "rc": "1.1.6",
         "walkdir": "0.0.11"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "cli-cursor": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -11943,11 +12084,58 @@
           }
         },
         "cli-spinners": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz",
-          "integrity": "sha1-75h+09SDkaw9q5GAtAanQhgNbmo=",
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
+          "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "dependency-tree": {
+          "version": "5.11.0",
+          "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-5.11.0.tgz",
+          "integrity": "sha1-koRk1vknNgfT9muaV+JZ5jVmd1U=",
+          "dev": true,
+          "requires": {
+            "commander": "2.9.0",
+            "debug": "2.2.0",
+            "filing-cabinet": "1.9.0",
+            "precinct": "3.8.0"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
           "dev": true
         },
+        "mz": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mz/-/mz-2.4.0.tgz",
+          "integrity": "sha1-mHupYk2JOVOIw3y0dB4sr03ROxo=",
+          "dev": true,
+          "requires": {
+            "any-promise": "1.3.0",
+            "object-assign": "4.1.1",
+            "thenify-all": "1.6.0"
+          }
+        },
         "onetime": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -11958,17 +12146,35 @@
           }
         },
         "ora": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ora/-/ora-1.1.0.tgz",
-          "integrity": "sha1-aaqkogljDkOxQsX3/0GCDah+L68=",
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-1.2.0.tgz",
+          "integrity": "sha1-Mvsxg1AO/oP16okQF4Xw7mBg/sk=",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "cli-cursor": "2.1.0",
-            "cli-spinners": "1.0.0",
+            "cli-spinners": "1.1.0",
             "log-symbols": "1.0.2"
           }
         },
+        "pluralize": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+          "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
+          "dev": true
+        },
+        "rc": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
+          "integrity": "sha1-Q2UbdrauU7XIAvEVH6P8OwWZack=",
+          "dev": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "1.0.4"
+          }
+        },
         "restore-cursor": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
@@ -11978,13 +12184,25 @@
             "onetime": "2.0.1",
             "signal-exit": "3.0.2"
           }
+        },
+        "strip-json-comments": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+          "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
         }
       }
     },
     "magic-string": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.21.3.tgz",
-      "integrity": "sha1-h+IBAJ6/3m9G3FdXMFpwr3HjFiQ=",
+      "version": "0.22.4",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.4.tgz",
+      "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==",
       "dev": true,
       "requires": {
         "vlq": "0.2.2"
@@ -12711,7 +12929,7 @@
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "rimraf": "2.6.1",
         "semver": "5.3.0",
         "tar": "2.2.1",
@@ -12770,11 +12988,24 @@
         "nan": "2.7.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "sass-graph": "2.2.4",
         "stdout-stream": "1.4.0"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "cross-spawn": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -12804,6 +13035,12 @@
             "lodash": "4.17.4",
             "minimatch": "3.0.4"
           }
+        },
+        "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
         }
       }
     },
@@ -13113,6 +13350,27 @@
         "cli-cursor": "1.0.2",
         "cli-spinners": "0.1.2",
         "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "orchestrator": {
@@ -13534,12 +13792,6 @@
       "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
       "dev": true
     },
-    "pluralize": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz",
-      "integrity": "sha1-hCE9ChI1YGnaqEBgxVkkJjMWE2g=",
-      "dev": true
-    },
     "portfinder": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz",
@@ -13568,6 +13820,29 @@
         "js-base64": "2.3.2",
         "source-map": "0.5.7",
         "supports-color": "3.2.3"
+      },
+      "dependencies": {
+        "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": {
+            "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
+            }
+          }
+        }
       }
     },
     "postcss-less": {
@@ -13595,6 +13870,27 @@
         "lodash": "4.17.4",
         "log-symbols": "1.0.2",
         "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "postcss-resolve-nested-selector": {
@@ -13806,12 +14102,12 @@
       "optional": true
     },
     "protractor": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz",
-      "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.2.0.tgz",
+      "integrity": "sha1-0/ObGV6F81Oa2djLZWCp0rYyl8Q=",
       "dev": true,
       "requires": {
-        "@types/node": "6.0.88",
+        "@types/node": "6.0.90",
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "2.53.42",
         "blocking-proxy": "0.0.5",
@@ -13822,16 +14118,16 @@
         "optimist": "0.6.1",
         "q": "1.4.1",
         "saucelabs": "1.3.0",
-        "selenium-webdriver": "3.0.1",
+        "selenium-webdriver": "3.6.0",
         "source-map-support": "0.4.18",
         "webdriver-js-extender": "1.0.0",
         "webdriver-manager": "12.0.6"
       },
       "dependencies": {
         "@types/node": {
-          "version": "6.0.88",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.88.tgz",
-          "integrity": "sha512-bYDPZTX0/s1aihdjLuAgogUAT5M+TpoWChEMea2p0yOcfn5bu3k6cJb9cp6nw268XeSNIGGr+4+/8V5K6BGzLQ==",
+          "version": "6.0.90",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz",
+          "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==",
           "dev": true
         },
         "@types/q": {
@@ -13840,6 +14136,19 @@
           "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
           "dev": true
         },
+        "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"
+          }
+        },
         "saucelabs": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
@@ -13849,26 +14158,11 @@
             "https-proxy-agent": "1.0.0"
           }
         },
-        "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.19"
-          }
-        },
-        "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"
-          }
+        "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
         },
         "webdriver-manager": {
           "version": "12.0.6",
@@ -13883,7 +14177,7 @@
             "ini": "1.3.4",
             "minimist": "1.2.0",
             "q": "1.4.1",
-            "request": "2.82.0",
+            "request": "2.83.0",
             "rimraf": "2.6.1",
             "semver": "5.4.1",
             "xml2js": "0.4.19"
@@ -14270,9 +14564,9 @@
       "dev": true
     },
     "request": {
-      "version": "2.82.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.82.0.tgz",
-      "integrity": "sha512-/QWqfmyTfQ4OYs6EhB1h2wQsX9ZxbuNePCvCm0Mdz/mxw73mjdg0D4QdIl0TQBFs35CZmMXLjk0iCGK395CUDg==",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
       "dev": true,
       "requires": {
         "aws-sign2": "0.7.0",
@@ -14294,9 +14588,20 @@
         "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        }
       }
     },
     "require-directory": {
@@ -14450,7 +14755,7 @@
       "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
       "dev": true,
       "requires": {
-        "request": "2.82.0",
+        "request": "2.83.0",
         "through2": "2.0.3"
       }
     },
@@ -14945,9 +15250,9 @@
       }
     },
     "selenium-webdriver": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.5.0.tgz",
-      "integrity": "sha512-1bCZYRfDy7vsu1dkLrclTLvWPxSo6rOIkxZXvB2wnzeWkEoiTKpw612EUGA3jRZxPzAzI9OlxuULJV8ge1vVXQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
+      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
         "jszip": "3.1.4",
@@ -15644,15 +15949,6 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -15686,6 +15982,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "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"
+      }
+    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -15772,6 +16077,19 @@
         "write-file-stdout": "0.0.2"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -15792,6 +16110,12 @@
             "log-symbols": "1.0.2",
             "postcss": "5.2.17"
           }
+        },
+        "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
         }
       }
     },
@@ -16025,6 +16349,19 @@
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
           "dev": true
         },
+        "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"
+          }
+        },
         "configstore": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
@@ -16079,6 +16416,12 @@
             "isarray": "0.0.1"
           }
         },
+        "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
+        },
         "update-notifier": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
@@ -16216,6 +16559,36 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "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-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "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"
+              }
+            }
+          }
+        },
         "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",
@@ -16240,6 +16613,12 @@
           "requires": {
             "ansi-regex": "3.0.0"
           }
+        },
+        "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
         }
       }
     },
@@ -16983,7 +17362,7 @@
       "requires": {
         "async": "0.2.10",
         "node-uuid": "1.4.8",
-        "request": "2.82.0",
+        "request": "2.83.0",
         "underscore": "1.6.0"
       },
       "dependencies": {
@@ -17095,6 +17474,19 @@
         "string-length": "1.0.1"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "configstore": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
@@ -17165,6 +17557,12 @@
             "is-finite": "1.0.2"
           }
         },
+        "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
+        },
         "timed-out": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
@@ -17576,6 +17974,19 @@
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
           "dev": true
         },
+        "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"
+          }
+        },
         "compress-commons": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz",
@@ -17714,6 +18125,12 @@
             "hoek": "2.16.3"
           }
         },
+        "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
+        },
         "tar-stream": {
           "version": "1.5.4",
           "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
diff --git a/package.json b/package.json
index 511c60e3aaea..3f2886747dff 100644
--- a/package.json
+++ b/package.json
@@ -40,18 +40,17 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "~4.4.4",
+    "@angular/http": "~4.4.4",
     "@angular/platform-browser-dynamic": "~4.4.4",
     "@angular/platform-server": "~4.4.4",
     "@angular/router": "~4.4.4",
     "@angular/tsc-wrapped": "~4.4.4",
-    "@angular/http": "~4.4.4",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
-    "@types/fs-extra": "^3.0.1",
-    "@types/glob": "^5.0.30",
+    "@types/fs-extra": "^4.0.3",
+    "@types/glob": "^5.0.33",
     "@types/gulp": "3.8.32",
-    "@types/gulp-util": "^3.0.31",
-    "@types/hammerjs": "^2.0.34",
+    "@types/hammerjs": "^2.0.35",
     "@types/jasmine": "2.5.45",
     "@types/merge2": "^0.3.30",
     "@types/minimist": "^1.2.0",
@@ -98,25 +97,25 @@
     "karma-jasmine": "^1.1.0",
     "karma-sauce-launcher": "^1.2.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "madge": "^1.6.0",
-    "magic-string": "^0.21.3",
+    "madge": "^2.2.0",
+    "magic-string": "^0.22.4",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "moment": "^2.18.1",
     "node-sass": "^4.5.3",
-    "protractor": "^5.1.2",
-    "request": "^2.81.0",
+    "protractor": "^5.2.0",
+    "request": "^2.83.0",
     "resolve-bin": "^0.4.0",
     "rollup": "^0.41.6",
     "rollup-plugin-alias": "^1.3.1",
     "rollup-plugin-node-resolve": "^3.0.0",
     "run-sequence": "^1.2.2",
     "scss-bundle": "^2.0.1-beta.7",
-    "selenium-webdriver": "^3.4.0",
+    "selenium-webdriver": "^3.6.0",
     "sorcery": "^0.10.0",
     "stylelint": "^7.12.0",
     "ts-node": "^3.0.4",
-    "tsconfig-paths": "^2.2.0",
+    "tsconfig-paths": "^2.3.0",
     "tslint": "^5.8.0",
     "tsutils": "^2.6.0",
     "typescript": "~2.4.2",
diff --git a/tools/gulp/tasks/lint.ts b/tools/gulp/tasks/lint.ts
index aca4854a0995..16084a25bfb4 100644
--- a/tools/gulp/tasks/lint.ts
+++ b/tools/gulp/tasks/lint.ts
@@ -1,7 +1,6 @@
 import {red} from 'chalk';
 import {readdirSync, readFileSync, statSync} from 'fs';
 import {task} from 'gulp';
-import {colors, log} from 'gulp-util';
 import {buildConfig} from 'material2-build-tools';
 import {IMinimatch, Minimatch} from 'minimatch';
 import {join} from 'path';
@@ -87,7 +86,7 @@ task('ownerslint', () => {
         // Report an error for any files that didn't match any owned paths.
         .filter(path => {
           if (statSync(path).isFile()) {
-            log(colors.red(`No code owner found for "${path}".`));
+            console.log(red(`No code owner found for "${path}".`));
             errors++;
             return false;
           }

From eb12317dc83aa3599874f62fad5c7e8d9f4b26b8 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 27 Oct 2017 10:19:53 -0700
Subject: [PATCH 364/575] chore(dialog): add comment for MatDialogContainer
 injection token (#8029)

---
 src/lib/dialog/dialog.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index c6dbacd7cb92..f3131d86bf90 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -281,6 +281,10 @@ export class MatDialog {
     const injectionTokens = new WeakMap();
 
     injectionTokens.set(MatDialogRef, dialogRef);
+    // The MatDialogContainer is injected in the portal as the MatDialogContainer and the dialog's
+    // content are created out of the same ViewContainerRef and as such, are siblings for injector
+    // purposes.  To allow the hierarchy that is expected, the MatDialogContainer is explicitly
+    // added to the injection tokens.
     injectionTokens.set(MatDialogContainer, dialogContainer);
     injectionTokens.set(MAT_DIALOG_DATA, config.data);
     injectionTokens.set(Directionality, {

From 4e9e75be6028016b380263f390576078b426b19d Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 27 Oct 2017 10:20:22 -0700
Subject: [PATCH 365/575] chore: always deploy every commit, not just when
 tests pass (#8009)

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3ec87189c175..73bf1c385627 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,6 @@ jobs:
     - env: "MODE=saucelabs_required"
     - env: "MODE=browserstack_required"
     - env: "MODE=travis_required"
-    - stage: Deploy
       env: "DEPLOY_MODE=build-artifacts"
     - env: "DEPLOY_MODE=docs-content"
     - env: "DEPLOY_MODE=screenshot-tool"

From e15fc0b06dee6ae4bfe7124e6085114404f5495c Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 27 Oct 2017 10:21:39 -0700
Subject: [PATCH 366/575] docs(table): change docs to use MatTableDataSource
 (#8007)

* chore(table): change docs to use MatTableDataSource

* review changes

* comments
---
 .../table-basic/table-basic-example.ts        |  23 +--
 .../table-filtering-example.css               |   7 +-
 .../table-filtering-example.html              |  37 ++--
 .../table-filtering-example.ts                | 135 ++++--------
 .../table-http/table-http-example.css         |  27 +--
 .../table-http/table-http-example.html        |  17 +-
 .../table-http/table-http-example.ts          | 112 ++++------
 .../table-overview/table-overview-example.css |  37 +---
 .../table-overview-example.html               |  53 +----
 .../table-overview/table-overview-example.ts  | 192 ++++--------------
 .../table-pagination-example.css              |   9 -
 .../table-pagination-example.html             |  42 ++--
 .../table-pagination-example.ts               | 121 ++++-------
 .../table-sorting/table-sorting-example.css   |  11 +-
 .../table-sorting/table-sorting-example.html  |  35 ++--
 .../table-sorting/table-sorting-example.ts    | 140 ++++---------
 16 files changed, 267 insertions(+), 731 deletions(-)

diff --git a/src/material-examples/table-basic/table-basic-example.ts b/src/material-examples/table-basic/table-basic-example.ts
index 41f41c7eacb3..c0c243c1d063 100644
--- a/src/material-examples/table-basic/table-basic-example.ts
+++ b/src/material-examples/table-basic/table-basic-example.ts
@@ -1,7 +1,5 @@
 import {Component} from '@angular/core';
-import {DataSource} from '@angular/cdk/collections';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/observable/of';
+import {MatTableDataSource} from '@angular/material';
 
 /**
  * @title Basic table
@@ -13,7 +11,7 @@ import 'rxjs/add/observable/of';
 })
 export class TableBasicExample {
   displayedColumns = ['position', 'name', 'weight', 'symbol'];
-  dataSource = new ExampleDataSource();
+  dataSource = new MatTableDataSource<Element>(ELEMENT_DATA);
 }
 
 export interface Element {
@@ -23,7 +21,7 @@ export interface Element {
   symbol: string;
 }
 
-const data: Element[] = [
+const ELEMENT_DATA: Element[] = [
   {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'},
   {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'},
   {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'},
@@ -45,18 +43,3 @@ const data: Element[] = [
   {position: 19, name: 'Potassium', weight: 39.0983, symbol: 'K'},
   {position: 20, name: 'Calcium', weight: 40.078, symbol: 'Ca'},
 ];
-
-/**
- * Data source to provide what data should be rendered in the table. The observable provided
- * in connect should emit exactly the data that should be rendered by the table. If the data is
- * altered, the observable should emit that new set of data on the stream. In our case here,
- * we return a stream that contains only one set of data that doesn't change.
- */
-export class ExampleDataSource extends DataSource<any> {
-  /** Connect function called by the table to retrieve one stream containing the data to render. */
-  connect(): Observable<Element[]> {
-    return Observable.of(data);
-  }
-
-  disconnect() {}
-}
diff --git a/src/material-examples/table-filtering/table-filtering-example.css b/src/material-examples/table-filtering/table-filtering-example.css
index 51287a0891d6..c0e9a5b54246 100644
--- a/src/material-examples/table-filtering/table-filtering-example.css
+++ b/src/material-examples/table-filtering/table-filtering-example.css
@@ -7,17 +7,12 @@
 
 .example-header {
   min-height: 64px;
-  display: flex;
-  align-items: baseline;
   padding: 8px 24px 0;
-  font-size: 20px;
-  justify-content: space-between;
 }
 
 .mat-form-field {
   font-size: 14px;
-  flex-grow: 1;
-  margin-left: 32px;
+  width: 100%;
 }
 
 .mat-table {
diff --git a/src/material-examples/table-filtering/table-filtering-example.html b/src/material-examples/table-filtering/table-filtering-example.html
index 0f1f6189d7c9..d9e3e8b46fb2 100644
--- a/src/material-examples/table-filtering/table-filtering-example.html
+++ b/src/material-examples/table-filtering/table-filtering-example.html
@@ -1,37 +1,34 @@
 <div class="example-container mat-elevation-z8">
   <div class="example-header">
-    <mat-form-field floatPlaceholder="never">
-      <input matInput #filter placeholder="Filter users">
+    <mat-form-field>
+      <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
     </mat-form-field>
   </div>
 
   <mat-table #table [dataSource]="dataSource">
 
-    <!--- Note that these columns can be defined in any order.
-          The actual rendered columns are set as a property on the row definition" -->
-
-    <!-- ID Column -->
-    <ng-container matColumnDef="userId">
-      <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
-    </ng-container>
-
-    <!-- Progress Column -->
-    <ng-container matColumnDef="progress">
-      <mat-header-cell *matHeaderCellDef> Progress </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
+    <!-- Position Column -->
+    <ng-container matColumnDef="position">
+      <mat-header-cell *matHeaderCellDef> No. </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.position}} </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container matColumnDef="userName">
+    <ng-container matColumnDef="name">
       <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{element.name}} </mat-cell>
+    </ng-container>
+
+    <!-- Weight Column -->
+    <ng-container matColumnDef="weight">
+      <mat-header-cell *matHeaderCellDef> Weight </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.weight}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container matColumnDef="color">
-      <mat-header-cell *matHeaderCellDef> Color </mat-header-cell>
-      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
+    <ng-container matColumnDef="symbol">
+      <mat-header-cell *matHeaderCellDef> Symbol </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.symbol}} </mat-cell>
     </ng-container>
 
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
diff --git a/src/material-examples/table-filtering/table-filtering-example.ts b/src/material-examples/table-filtering/table-filtering-example.ts
index 8404f0c1b988..3e9ccbb26fcd 100644
--- a/src/material-examples/table-filtering/table-filtering-example.ts
+++ b/src/material-examples/table-filtering/table-filtering-example.ts
@@ -1,13 +1,5 @@
-import {Component, ElementRef, ViewChild} from '@angular/core';
-import {DataSource} from '@angular/cdk/collections';
-import {BehaviorSubject} from 'rxjs/BehaviorSubject';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/debounceTime';
-import 'rxjs/add/operator/distinctUntilChanged';
-import 'rxjs/add/observable/fromEvent';
+import {Component} from '@angular/core';
+import {MatTableDataSource} from '@angular/material';
 
 /**
  * @title Table with filtering
@@ -18,101 +10,42 @@ import 'rxjs/add/observable/fromEvent';
   templateUrl: 'table-filtering-example.html',
 })
 export class TableFilteringExample {
-  displayedColumns = ['userId', 'userName', 'progress', 'color'];
-  exampleDatabase = new ExampleDatabase();
-  dataSource: ExampleDataSource | null;
+  displayedColumns = ['position', 'name', 'weight', 'symbol'];
+  dataSource = new MatTableDataSource(ELEMENT_DATA);
 
-  @ViewChild('filter') filter: ElementRef;
-
-  ngOnInit() {
-    this.dataSource = new ExampleDataSource(this.exampleDatabase);
-    Observable.fromEvent(this.filter.nativeElement, 'keyup')
-        .debounceTime(150)
-        .distinctUntilChanged()
-        .subscribe(() => {
-          if (!this.dataSource) { return; }
-          this.dataSource.filter = this.filter.nativeElement.value;
-        });
+  applyFilter(filterValue: string) {
+    filterValue = filterValue.trim(); // Remove whitespace
+    filterValue = filterValue.toLowerCase(); // MatTableDataSource defaults to lowercase matches
+    this.dataSource.filter = filterValue;
   }
 }
 
-/** Constants used to fill up our data base. */
-const COLORS = ['maroon', 'red', 'orange', 'yellow', 'olive', 'green', 'purple',
-  'fuchsia', 'lime', 'teal', 'aqua', 'blue', 'navy', 'black', 'gray'];
-const NAMES = ['Maia', 'Asher', 'Olivia', 'Atticus', 'Amelia', 'Jack',
-  'Charlotte', 'Theodore', 'Isla', 'Oliver', 'Isabella', 'Jasper',
-  'Cora', 'Levi', 'Violet', 'Arthur', 'Mia', 'Thomas', 'Elizabeth'];
-
-export interface UserData {
-  id: string;
+export interface Element {
   name: string;
-  progress: string;
-  color: string;
-}
-
-/** An example database that the data source uses to retrieve data for the table. */
-export class ExampleDatabase {
-  /** Stream that emits whenever the data has been modified. */
-  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
-  get data(): UserData[] { return this.dataChange.value; }
-
-  constructor() {
-    // Fill up the database with 100 users.
-    for (let i = 0; i < 100; i++) { this.addUser(); }
-  }
-
-  /** Adds a new user to the database. */
-  addUser() {
-    const copiedData = this.data.slice();
-    copiedData.push(this.createNewUser());
-    this.dataChange.next(copiedData);
-  }
-
-  /** Builds and returns a new User. */
-  private createNewUser() {
-    const name =
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))] + ' ' +
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))].charAt(0) + '.';
-
-    return {
-      id: (this.data.length + 1).toString(),
-      name: name,
-      progress: Math.round(Math.random() * 100).toString(),
-      color: COLORS[Math.round(Math.random() * (COLORS.length - 1))]
-    };
-  }
+  position: number;
+  weight: number;
+  symbol: string;
 }
 
-/**
- * Data source to provide what data should be rendered in the table. Note that the data source
- * can retrieve its data in any way. In this case, the data source is provided a reference
- * to a common data base, ExampleDatabase. It is not the data source's responsibility to manage
- * the underlying data. Instead, it only needs to take the data and send the table exactly what
- * should be rendered.
- */
-export class ExampleDataSource extends DataSource<any> {
-  _filterChange = new BehaviorSubject('');
-  get filter(): string { return this._filterChange.value; }
-  set filter(filter: string) { this._filterChange.next(filter); }
-
-  constructor(private _exampleDatabase: ExampleDatabase) {
-    super();
-  }
-
-  /** Connect function called by the table to retrieve one stream containing the data to render. */
-  connect(): Observable<UserData[]> {
-    const displayDataChanges = [
-      this._exampleDatabase.dataChange,
-      this._filterChange,
-    ];
-
-    return Observable.merge(...displayDataChanges).map(() => {
-      return this._exampleDatabase.data.slice().filter((item: UserData) => {
-        let searchStr = (item.name + item.color).toLowerCase();
-        return searchStr.indexOf(this.filter.toLowerCase()) != -1;
-      });
-    });
-  }
-
-  disconnect() {}
-}
+const ELEMENT_DATA: Element[] = [
+  {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'},
+  {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'},
+  {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'},
+  {position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be'},
+  {position: 5, name: 'Boron', weight: 10.811, symbol: 'B'},
+  {position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C'},
+  {position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N'},
+  {position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O'},
+  {position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F'},
+  {position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne'},
+  {position: 11, name: 'Sodium', weight: 22.9897, symbol: 'Na'},
+  {position: 12, name: 'Magnesium', weight: 24.305, symbol: 'Mg'},
+  {position: 13, name: 'Aluminum', weight: 26.9815, symbol: 'Al'},
+  {position: 14, name: 'Silicon', weight: 28.0855, symbol: 'Si'},
+  {position: 15, name: 'Phosphorus', weight: 30.9738, symbol: 'P'},
+  {position: 16, name: 'Sulfur', weight: 32.065, symbol: 'S'},
+  {position: 17, name: 'Chlorine', weight: 35.453, symbol: 'Cl'},
+  {position: 18, name: 'Argon', weight: 39.948, symbol: 'Ar'},
+  {position: 19, name: 'Potassium', weight: 39.0983, symbol: 'K'},
+  {position: 20, name: 'Calcium', weight: 40.078, symbol: 'Ca'},
+];
diff --git a/src/material-examples/table-http/table-http-example.css b/src/material-examples/table-http/table-http-example.css
index 185ff44b7ad0..4b3734dbecf0 100644
--- a/src/material-examples/table-http/table-http-example.css
+++ b/src/material-examples/table-http/table-http-example.css
@@ -20,23 +20,6 @@
   min-height: 300px;
 }
 
-.mat-column-title {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  flex: 1;
-  overflow: hidden;
-}
-
-/* Column Widths */
-.mat-column-number,
-.mat-column-state {
-  max-width: 64px;
-}
-
-.mat-column-created {
-  max-width: 124px;
-}
-
 .example-loading-shade {
   position: absolute;
   top: 0;
@@ -55,3 +38,13 @@
   max-width: 360px;
   text-align: center;
 }
+
+/* Column Widths */
+.mat-column-number,
+.mat-column-state {
+  max-width: 64px;
+}
+
+.mat-column-created {
+  max-width: 124px;
+}
diff --git a/src/material-examples/table-http/table-http-example.html b/src/material-examples/table-http/table-http-example.html
index a176f2f624f3..1d8fedec25e1 100644
--- a/src/material-examples/table-http/table-http-example.html
+++ b/src/material-examples/table-http/table-http-example.html
@@ -1,14 +1,14 @@
 <div class="example-container mat-elevation-z8">
   <div class="example-loading-shade"
-       *ngIf="dataSource.isLoadingResults || dataSource.isRateLimitReached">
-    <mat-spinner *ngIf="dataSource.isLoadingResults"></mat-spinner>
-    <div class="example-rate-limit-reached" *ngIf="dataSource.isRateLimitReached">
+       *ngIf="isLoadingResults || isRateLimitReached">
+    <mat-spinner *ngIf="isLoadingResults"></mat-spinner>
+    <div class="example-rate-limit-reached" *ngIf="isRateLimitReached">
       GitHub's API rate limit has been reached. It will be reset in one minute.
     </div>
   </div>
 
   <mat-table #table [dataSource]="dataSource" class="example-table"
-            matSort matSortActive="created_at" matSortDisableClear matSortDirection="asc">
+             matSort matSortActive="created" matSortDisableClear matSortDirection="asc">
 
     <!--- Note that these columns can be defined in any order.
           The actual rendered columns are set as a property on the row definition" -->
@@ -32,10 +32,10 @@
     </ng-container>
 
     <!-- Created Column -->
-    <ng-container matColumnDef="created_at">
+    <ng-container matColumnDef="created">
       <mat-header-cell *matHeaderCellDef
-                      mat-sort-header
-                      disableClear="true">
+                       mat-sort-header
+                       disableClear="true">
         Created
       </mat-header-cell>
       <mat-cell *matCellDef="let row">{{ row.created_at | date }}</mat-cell>
@@ -45,7 +45,6 @@
     <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
   </mat-table>
 
-  <mat-paginator [length]="dataSource.resultsLength"
-                [pageSize]="30">
+  <mat-paginator [length]="resultsLength" [pageSize]="30">
   </mat-paginator>
 </div>
diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index 8dd5f2d36265..93c5f38dea97 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -1,7 +1,6 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
-import {DataSource} from '@angular/cdk/collections';
-import {MatPaginator, MatSort} from '@angular/material';
+import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 import {Observable} from 'rxjs/Observable';
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/observable/of';
@@ -18,20 +17,48 @@ import 'rxjs/add/operator/switchMap';
   styleUrls: ['table-http-example.css'],
   templateUrl: 'table-http-example.html',
 })
-export class TableHttpExample implements OnInit {
-  displayedColumns = ['created_at', 'state', 'number', 'title'];
-  exampleDatabase: ExampleHttpDataSource | null;
-  dataSource: ExampleDataSource | null;
+export class TableHttpExample {
+  displayedColumns = ['created', 'state', 'number', 'title'];
+  exampleDatabase: ExampleHttpDao | null;
+  dataSource = new MatTableDataSource();
+
+  resultsLength = 0;
+  isLoadingResults = false;
+  isRateLimitReached = false;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  constructor(private _httpClient: HttpClient) {}
+  constructor(private http: HttpClient) {}
 
-  ngOnInit() {
-    this.exampleDatabase = new ExampleHttpDataSource(this._httpClient);
-    this.dataSource = new ExampleDataSource(
-      this.exampleDatabase!, this.paginator, this.sort);
+  ngAfterViewInit() {
+    this.exampleDatabase = new ExampleHttpDao(this.http);
+
+    // If the user changes the sort order, reset back to the first page.
+    this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
+
+    Observable.merge(this.sort.sortChange, this.paginator.page)
+        .startWith(null)
+        .switchMap(() => {
+          this.isLoadingResults = true;
+          return this.exampleDatabase!.getRepoIssues(
+              this.sort.active, this.sort.direction, this.paginator.pageIndex);
+        })
+        .map(data => {
+          // Flip flag to show that loading has finished.
+          this.isLoadingResults = false;
+          this.isRateLimitReached = false;
+          this.resultsLength = data.total_count;
+
+          return data.items;
+        })
+        .catch(() => {
+          this.isLoadingResults = false;
+          // Catch if the GitHub API has reached its rate limit. Return empty data.
+          this.isRateLimitReached = true;
+          return Observable.of([]);
+        })
+        .subscribe(data => this.dataSource.data = data);
   }
 }
 
@@ -48,69 +75,14 @@ export interface GithubIssue {
 }
 
 /** An example database that the data source uses to retrieve data for the table. */
-export class ExampleHttpDataSource {
-  constructor(private _httpClient: HttpClient) {}
+export class ExampleHttpDao {
+  constructor(private http: HttpClient) {}
 
   getRepoIssues(sort: string, order: string, page: number): Observable<GithubApi> {
     const href = 'https://api.github.com/search/issues';
     const requestUrl =
-      `${href}?q=repo:angular/material2&sort=${sort}&order=${order}&page=${page + 1}`;
+        `${href}?q=repo:angular/material2&sort=${sort}&order=${order}&page=${page + 1}`;
 
-    return this._httpClient.get<GithubApi>(requestUrl);
+    return this.http.get<GithubApi>(requestUrl);
   }
 }
-
-/**
- * Data source to provide what data should be rendered in the table. Note that the data source
- * can retrieve its data in any way. In this case, the data source is provided a reference
- * to a common data base, ExampleHttpDao. It is not the data source's responsibility to manage
- * the underlying data. Instead, it only needs to take the data and send the table exactly what
- * should be rendered.
- */
-export class ExampleDataSource extends DataSource<GithubIssue> {
-  // The number of issues returned by github matching the query.
-  resultsLength = 0;
-  isLoadingResults = false;
-  isRateLimitReached = false;
-
-  constructor(private exampleDatabase: ExampleHttpDataSource,
-              private paginator: MatPaginator,
-              private sort: MatSort) {
-    super();
-  }
-
-  /** Connect function called by the table to retrieve one stream containing the data to render. */
-  connect(): Observable<GithubIssue[]> {
-    const displayDataChanges = [
-      this.sort.sortChange,
-      this.paginator.page
-    ];
-
-    // If the user changes the sort order, reset back to the first page.
-    this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
-
-    return Observable.merge(...displayDataChanges)
-      .startWith(null)
-      .switchMap(() => {
-        this.isLoadingResults = true;
-        return this.exampleDatabase.getRepoIssues(
-          this.sort.active, this.sort.direction, this.paginator.pageIndex);
-      })
-      .map(data => {
-        // Flip flag to show that loading has finished.
-        this.isLoadingResults = false;
-        this.isRateLimitReached = false;
-        this.resultsLength = data.total_count;
-
-        return data.items;
-      })
-      .catch(() => {
-        this.isLoadingResults = false;
-        // Catch if the GitHub API has reached its rate limit. Return empty data.
-        this.isRateLimitReached = true;
-        return Observable.of([]);
-      });
-  }
-
-  disconnect() {}
-}
diff --git a/src/material-examples/table-overview/table-overview-example.css b/src/material-examples/table-overview/table-overview-example.css
index c5c27f6fa424..0a4bfa776468 100644
--- a/src/material-examples/table-overview/table-overview-example.css
+++ b/src/material-examples/table-overview/table-overview-example.css
@@ -1,4 +1,3 @@
-/* Structure */
 .example-container {
   display: flex;
   flex-direction: column;
@@ -6,45 +5,13 @@
 }
 
 .example-header {
-  min-height: 56px;
-  max-height: 56px;
-  display: flex;
-  align-items: center;
+  min-height: 64px;
   padding: 8px 24px 0;
-  font-size: 20px;
-  justify-content: space-between;
-  border-bottom: 1px solid transparent;
 }
 
 .mat-form-field {
   font-size: 14px;
-  flex-grow: 1;
-  margin-top: 8px;
-}
-
-.example-no-results {
-  display: flex;
-  justify-content: center;
-  padding: 24px;
-  font-size: 12px;
-  font-style: italic;
-}
-
-/** Selection styles */
-.example-selection-header {
-  font-size: 18px;
-}
-
-.mat-column-select {
-  max-width: 54px;
-}
-
-.mat-row:hover, .example-selected-row {
-  background: #f5f5f5;
-}
-
-.mat-row:active, .mat-row.example-selected-row {
-  background: #eaeaea;
+  width: 100%;
 }
 
 .mat-table {
diff --git a/src/material-examples/table-overview/table-overview-example.html b/src/material-examples/table-overview/table-overview-example.html
index 847ec261256a..d1fd84fafff6 100644
--- a/src/material-examples/table-overview/table-overview-example.html
+++ b/src/material-examples/table-overview/table-overview-example.html
@@ -1,40 +1,15 @@
-<div class="example-header" [style.display]="selection.isEmpty() ? '' : 'none'">
-  <mat-form-field floatPlaceholder="never">
-    <input matInput #filter placeholder="Filter users">
+<div class="example-header">
+  <mat-form-field>
+    <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
   </mat-form-field>
 </div>
-<div class="example-header example-selection-header"
-     *ngIf="!selection.isEmpty()">
-  {{selection.selected.length}}
-  {{selection.selected.length == 1 ? 'user' : 'users'}}
-  selected
-</div>
 
 <div class="example-container mat-elevation-z8">
 
-  <mat-table #table [dataSource]="dataSource" matSort>
-
-    <!--- Note that these columns can be defined in any order.
-          The actual rendered columns are set as a property on the row definition" -->
-
-    <!-- Checkbox Column -->
-    <ng-container matColumnDef="select">
-      <mat-header-cell *matHeaderCellDef>
-        <mat-checkbox (change)="$event ? masterToggle() : null"
-                     [checked]="isAllSelected()"
-                     [indeterminate]="selection.hasValue() && !isAllSelected()">
-        </mat-checkbox>
-      </mat-header-cell>
-      <mat-cell *matCellDef="let row">
-        <mat-checkbox (click)="$event.stopPropagation()"
-                     (change)="$event ? selection.toggle(row.id) : null"
-                     [checked]="selection.isSelected(row.id)">
-        </mat-checkbox>
-      </mat-cell>
-    </ng-container>
+  <mat-table [dataSource]="dataSource" matSort>
 
     <!-- ID Column -->
-    <ng-container matColumnDef="userId">
+    <ng-container matColumnDef="id">
       <mat-header-cell *matHeaderCellDef mat-sort-header> ID </mat-header-cell>
       <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
     </ng-container>
@@ -46,7 +21,7 @@
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container matColumnDef="userName">
+    <ng-container matColumnDef="name">
       <mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
       <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
     </ng-container>
@@ -58,21 +33,9 @@
     </ng-container>
 
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
-    <mat-row *matRowDef="let row; columns: displayedColumns;"
-            [class.example-selected-row]="selection.isSelected(row.id)"
-            (click)="selection.toggle(row.id)">
+    <mat-row *matRowDef="let row; columns: displayedColumns;">
     </mat-row>
   </mat-table>
 
-  <div class="example-no-results"
-       [style.display]="dataSource.renderedData.length == 0 ? '' : 'none'">
-    No users found matching filter.
-  </div>
-
-  <mat-paginator #paginator
-                [length]="dataSource.filteredData.length"
-                [pageIndex]="0"
-                [pageSize]="25"
-                [pageSizeOptions]="[5, 10, 25, 100]">
-  </mat-paginator>
+  <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
 </div>
diff --git a/src/material-examples/table-overview/table-overview-example.ts b/src/material-examples/table-overview/table-overview-example.ts
index b9a3e0f30400..88ef1ff5c67d 100644
--- a/src/material-examples/table-overview/table-overview-example.ts
+++ b/src/material-examples/table-overview/table-overview-example.ts
@@ -1,18 +1,8 @@
-import {Component, ElementRef, ViewChild} from '@angular/core';
-import {DataSource} from '@angular/cdk/collections';
-import {MatPaginator, MatSort} from '@angular/material';
-import {SelectionModel} from '@angular/cdk/collections';
-import {BehaviorSubject} from 'rxjs/BehaviorSubject';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/observable/fromEvent';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/distinctUntilChanged';
-import 'rxjs/add/operator/debounceTime';
+import {Component, ViewChild} from '@angular/core';
+import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 
 /**
- * @title Feature-rich data table
+ * @title Data table with sorting, pagination, and filtering.
  */
 @Component({
   selector: 'table-overview-example',
@@ -20,50 +10,51 @@ import 'rxjs/add/operator/debounceTime';
   templateUrl: 'table-overview-example.html',
 })
 export class TableOverviewExample {
-  displayedColumns = ['select', 'userId', 'userName', 'progress', 'color'];
-  exampleDatabase = new ExampleDatabase();
-  selection = new SelectionModel<string>(true, []);
-  dataSource: ExampleDataSource | null;
+  displayedColumns = ['id', 'name', 'progress', 'color'];
+  dataSource: MatTableDataSource<UserData>;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
-  @ViewChild('filter') filter: ElementRef;
 
-  ngOnInit() {
-    this.dataSource = new ExampleDataSource(this.exampleDatabase, this.paginator, this.sort);
-    Observable.fromEvent(this.filter.nativeElement, 'keyup')
-        .debounceTime(150)
-        .distinctUntilChanged()
-        .subscribe(() => {
-          if (!this.dataSource) { return; }
-          this.dataSource.filter = this.filter.nativeElement.value;
-        });
-  }
-
-  isAllSelected(): boolean {
-    if (!this.dataSource) { return false; }
-    if (this.selection.isEmpty()) { return false; }
+  constructor() {
+    // Create 100 users
+    const users: UserData[] = [];
+    for (let i = 1; i <= 100; i++) { users.push(createNewUser(i)); }
 
-    if (this.filter.nativeElement.value) {
-      return this.selection.selected.length == this.dataSource.renderedData.length;
-    } else {
-      return this.selection.selected.length == this.exampleDatabase.data.length;
-    }
+    // Assign the data to the data source for the table to render
+    this.dataSource = new MatTableDataSource(users);
   }
 
-  masterToggle() {
-    if (!this.dataSource) { return; }
+  /**
+   * Set the paginator and sort after the view init since this component will
+   * be able to query its view for the initialized paginator and sort.
+   */
+  ngAfterViewInit() {
+    this.dataSource.paginator = this.paginator;
+    this.dataSource.sort = this.sort;
+  }
 
-    if (this.isAllSelected()) {
-      this.selection.clear();
-    } else if (this.filter.nativeElement.value) {
-      this.dataSource.renderedData.forEach(data => this.selection.select(data.id));
-    } else {
-      this.exampleDatabase.data.forEach(data => this.selection.select(data.id));
-    }
+  applyFilter(filterValue: string) {
+    filterValue = filterValue.trim(); // Remove whitespace
+    filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches
+    this.dataSource.filter = filterValue;
   }
 }
 
+/** Builds and returns a new User. */
+function createNewUser(id: number): UserData {
+  const name =
+      NAMES[Math.round(Math.random() * (NAMES.length - 1))] + ' ' +
+      NAMES[Math.round(Math.random() * (NAMES.length - 1))].charAt(0) + '.';
+
+  return {
+    id: id.toString(),
+    name: name,
+    progress: Math.round(Math.random() * 100).toString(),
+    color: COLORS[Math.round(Math.random() * (COLORS.length - 1))]
+  };
+}
+
 /** Constants used to fill up our data base. */
 const COLORS = ['maroon', 'red', 'orange', 'yellow', 'olive', 'green', 'purple',
   'fuchsia', 'lime', 'teal', 'aqua', 'blue', 'navy', 'black', 'gray'];
@@ -77,112 +68,3 @@ export interface UserData {
   progress: string;
   color: string;
 }
-
-/** An example database that the data source uses to retrieve data for the table. */
-export class ExampleDatabase {
-  /** Stream that emits whenever the data has been modified. */
-  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
-  get data(): UserData[] { return this.dataChange.value; }
-
-  constructor() {
-    // Fill up the database with 100 users.
-    for (let i = 0; i < 100; i++) { this.addUser(); }
-  }
-
-  /** Adds a new user to the database. */
-  addUser() {
-    const copiedData = this.data.slice();
-    copiedData.push(this.createNewUser());
-    this.dataChange.next(copiedData);
-  }
-
-  /** Builds and returns a new User. */
-  private createNewUser() {
-    const name =
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))] + ' ' +
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))].charAt(0) + '.';
-
-    return {
-      id: (this.data.length + 1).toString(),
-      name: name,
-      progress: Math.round(Math.random() * 100).toString(),
-      color: COLORS[Math.round(Math.random() * (COLORS.length - 1))]
-    };
-  }
-}
-
-/**
- * Data source to provide what data should be rendered in the table. Note that the data source
- * can retrieve its data in any way. In this case, the data source is provided a reference
- * to a common data base, ExampleDatabase. It is not the data source's responsibility to manage
- * the underlying data. Instead, it only needs to take the data and send the table exactly what
- * should be rendered.
- */
-export class ExampleDataSource extends DataSource<any> {
-  _filterChange = new BehaviorSubject('');
-  get filter(): string { return this._filterChange.value; }
-  set filter(filter: string) { this._filterChange.next(filter); }
-
-  filteredData: UserData[] = [];
-  renderedData: UserData[] = [];
-
-  constructor(private _exampleDatabase: ExampleDatabase,
-              private _paginator: MatPaginator,
-              private _sort: MatSort) {
-    super();
-
-    // Reset to the first page when the user changes the filter.
-    this._filterChange.subscribe(() => this._paginator.pageIndex = 0);
-  }
-
-  /** Connect function called by the table to retrieve one stream containing the data to render. */
-  connect(): Observable<UserData[]> {
-    // Listen for any changes in the base data, sorting, filtering, or pagination
-    const displayDataChanges = [
-      this._exampleDatabase.dataChange,
-      this._sort.sortChange,
-      this._filterChange,
-      this._paginator.page,
-    ];
-
-    return Observable.merge(...displayDataChanges).map(() => {
-      // Filter data
-      this.filteredData = this._exampleDatabase.data.slice().filter((item: UserData) => {
-        let searchStr = (item.name + item.color).toLowerCase();
-        return searchStr.indexOf(this.filter.toLowerCase()) != -1;
-      });
-
-      // Sort filtered data
-      const sortedData = this.sortData(this.filteredData.slice());
-
-      // Grab the page's slice of the filtered sorted data.
-      const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
-      this.renderedData = sortedData.splice(startIndex, this._paginator.pageSize);
-      return this.renderedData;
-    });
-  }
-
-  disconnect() {}
-
-  /** Returns a sorted copy of the database data. */
-  sortData(data: UserData[]): UserData[] {
-    if (!this._sort.active || this._sort.direction == '') { return data; }
-
-    return data.sort((a, b) => {
-      let propertyA: number|string = '';
-      let propertyB: number|string = '';
-
-      switch (this._sort.active) {
-        case 'userId': [propertyA, propertyB] = [a.id, b.id]; break;
-        case 'userName': [propertyA, propertyB] = [a.name, b.name]; break;
-        case 'progress': [propertyA, propertyB] = [a.progress, b.progress]; break;
-        case 'color': [propertyA, propertyB] = [a.color, b.color]; break;
-      }
-
-      let valueA = isNaN(+propertyA) ? propertyA : +propertyA;
-      let valueB = isNaN(+propertyB) ? propertyB : +propertyB;
-
-      return (valueA < valueB ? -1 : 1) * (this._sort.direction == 'asc' ? 1 : -1);
-    });
-  }
-}
diff --git a/src/material-examples/table-pagination/table-pagination-example.css b/src/material-examples/table-pagination/table-pagination-example.css
index 5b9032d196b3..6872a38f9642 100644
--- a/src/material-examples/table-pagination/table-pagination-example.css
+++ b/src/material-examples/table-pagination/table-pagination-example.css
@@ -1,18 +1,9 @@
-/* Structure */
 .example-container {
   display: flex;
   flex-direction: column;
   min-width: 300px;
 }
 
-.example-header {
-  min-height: 64px;
-  display: flex;
-  align-items: center;
-  padding-left: 24px;
-  font-size: 20px;
-}
-
 .mat-table {
   overflow: auto;
   max-height: 500px;
diff --git a/src/material-examples/table-pagination/table-pagination-example.html b/src/material-examples/table-pagination/table-pagination-example.html
index 97f7d4ac8c17..4a9a50191094 100644
--- a/src/material-examples/table-pagination/table-pagination-example.html
+++ b/src/material-examples/table-pagination/table-pagination-example.html
@@ -1,32 +1,28 @@
 <div class="example-container mat-elevation-z8">
-
   <mat-table #table [dataSource]="dataSource">
 
-    <!--- Note that these columns can be defined in any order.
-          The actual rendered columns are set as a property on the row definition" -->
-
-    <!-- ID Column -->
-    <ng-container matColumnDef="userId">
-      <mat-header-cell *matHeaderCellDef> ID </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
-    </ng-container>
-
-    <!-- Progress Column -->
-    <ng-container matColumnDef="progress">
-      <mat-header-cell *matHeaderCellDef> Progress </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
+    <!-- Position Column -->
+    <ng-container matColumnDef="position">
+      <mat-header-cell *matHeaderCellDef> No. </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.position}} </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container matColumnDef="userName">
+    <ng-container matColumnDef="name">
       <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{element.name}} </mat-cell>
+    </ng-container>
+
+    <!-- Weight Column -->
+    <ng-container matColumnDef="weight">
+      <mat-header-cell *matHeaderCellDef> Weight </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.weight}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container matColumnDef="color">
-      <mat-header-cell *matHeaderCellDef> Color </mat-header-cell>
-      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
+    <ng-container matColumnDef="symbol">
+      <mat-header-cell *matHeaderCellDef> Symbol </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.symbol}} </mat-cell>
     </ng-container>
 
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
@@ -34,9 +30,7 @@
   </mat-table>
 
   <mat-paginator #paginator
-                [length]="exampleDatabase.data.length"
-                [pageIndex]="0"
-                [pageSize]="25"
-                [pageSizeOptions]="[5, 10, 25, 100]">
+                 [pageSize]="10"
+                 [pageSizeOptions]="[5, 10, 20]">
   </mat-paginator>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/material-examples/table-pagination/table-pagination-example.ts b/src/material-examples/table-pagination/table-pagination-example.ts
index 3040bfec59d8..bca8dac8093d 100644
--- a/src/material-examples/table-pagination/table-pagination-example.ts
+++ b/src/material-examples/table-pagination/table-pagination-example.ts
@@ -1,11 +1,5 @@
 import {Component, ViewChild} from '@angular/core';
-import {DataSource} from '@angular/cdk/collections';
-import {MatPaginator} from '@angular/material';
-import {BehaviorSubject} from 'rxjs/BehaviorSubject';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/operator/map';
+import {MatPaginator, MatTableDataSource} from '@angular/material';
 
 /**
  * @title Table with pagination
@@ -16,91 +10,46 @@ import 'rxjs/add/operator/map';
   templateUrl: 'table-pagination-example.html',
 })
 export class TablePaginationExample {
-  displayedColumns = ['userId', 'userName', 'progress', 'color'];
-  exampleDatabase = new ExampleDatabase();
-  dataSource: ExampleDataSource | null;
+  displayedColumns = ['position', 'name', 'weight', 'symbol'];
+  dataSource = new MatTableDataSource<Element>(ELEMENT_DATA);
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
 
-  ngOnInit() {
-    this.dataSource = new ExampleDataSource(this.exampleDatabase, this.paginator);
+  /**
+   * Set the paginator after the view init since this component will
+   * be able to query its view for the initialized paginator.
+   */
+  ngAfterViewInit() {
+    this.dataSource.paginator = this.paginator;
   }
 }
 
-/** Constants used to fill up our data base. */
-const COLORS = ['maroon', 'red', 'orange', 'yellow', 'olive', 'green', 'purple',
-  'fuchsia', 'lime', 'teal', 'aqua', 'blue', 'navy', 'black', 'gray'];
-const NAMES = ['Maia', 'Asher', 'Olivia', 'Atticus', 'Amelia', 'Jack',
-  'Charlotte', 'Theodore', 'Isla', 'Oliver', 'Isabella', 'Jasper',
-  'Cora', 'Levi', 'Violet', 'Arthur', 'Mia', 'Thomas', 'Elizabeth'];
-
-export interface UserData {
-  id: string;
+export interface Element {
   name: string;
-  progress: string;
-  color: string;
-}
-
-/** An example database that the data source uses to retrieve data for the table. */
-export class ExampleDatabase {
-  /** Stream that emits whenever the data has been modified. */
-  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
-  get data(): UserData[] { return this.dataChange.value; }
-
-  constructor() {
-    // Fill up the database with 100 users.
-    for (let i = 0; i < 100; i++) { this.addUser(); }
-  }
-
-  /** Adds a new user to the database. */
-  addUser() {
-    const copiedData = this.data.slice();
-    copiedData.push(this.createNewUser());
-    this.dataChange.next(copiedData);
-  }
-
-  /** Builds and returns a new User. */
-  private createNewUser() {
-    const name =
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))] + ' ' +
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))].charAt(0) + '.';
-
-    return {
-      id: (this.data.length + 1).toString(),
-      name: name,
-      progress: Math.round(Math.random() * 100).toString(),
-      color: COLORS[Math.round(Math.random() * (COLORS.length - 1))]
-    };
-  }
+  position: number;
+  weight: number;
+  symbol: string;
 }
 
-/**
- * Data source to provide what data should be rendered in the table. Note that the data source
- * can retrieve its data in any way. In this case, the data source is provided a reference
- * to a common data base, ExampleDatabase. It is not the data source's responsibility to manage
- * the underlying data. Instead, it only needs to take the data and send the table exactly what
- * should be rendered.
- */
-export class ExampleDataSource extends DataSource<any> {
-  constructor(private _exampleDatabase: ExampleDatabase, private _paginator: MatPaginator) {
-    super();
-  }
-
-  /** Connect function called by the table to retrieve one stream containing the data to render. */
-  connect(): Observable<UserData[]> {
-    const displayDataChanges = [
-      this._exampleDatabase.dataChange,
-      this._paginator.page,
-    ];
-
-    return Observable.merge(...displayDataChanges).map(() => {
-      const data = this._exampleDatabase.data.slice();
-
-      // Grab the page's slice of data.
-      const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
-      return data.splice(startIndex, this._paginator.pageSize);
-    });
-  }
-
-  disconnect() {}
-}
+const ELEMENT_DATA: Element[] = [
+  {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'},
+  {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'},
+  {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'},
+  {position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be'},
+  {position: 5, name: 'Boron', weight: 10.811, symbol: 'B'},
+  {position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C'},
+  {position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N'},
+  {position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O'},
+  {position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F'},
+  {position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne'},
+  {position: 11, name: 'Sodium', weight: 22.9897, symbol: 'Na'},
+  {position: 12, name: 'Magnesium', weight: 24.305, symbol: 'Mg'},
+  {position: 13, name: 'Aluminum', weight: 26.9815, symbol: 'Al'},
+  {position: 14, name: 'Silicon', weight: 28.0855, symbol: 'Si'},
+  {position: 15, name: 'Phosphorus', weight: 30.9738, symbol: 'P'},
+  {position: 16, name: 'Sulfur', weight: 32.065, symbol: 'S'},
+  {position: 17, name: 'Chlorine', weight: 35.453, symbol: 'Cl'},
+  {position: 18, name: 'Argon', weight: 39.948, symbol: 'Ar'},
+  {position: 19, name: 'Potassium', weight: 39.0983, symbol: 'K'},
+  {position: 20, name: 'Calcium', weight: 40.078, symbol: 'Ca'},
+];
diff --git a/src/material-examples/table-sorting/table-sorting-example.css b/src/material-examples/table-sorting/table-sorting-example.css
index 0ff9559b763b..c5f30cac2a1c 100644
--- a/src/material-examples/table-sorting/table-sorting-example.css
+++ b/src/material-examples/table-sorting/table-sorting-example.css
@@ -1,23 +1,14 @@
-/* Structure */
 .example-container {
   display: flex;
   flex-direction: column;
   min-width: 300px;
 }
 
-.example-header {
-  min-height: 64px;
-  display: flex;
-  align-items: center;
-  padding-left: 24px;
-  font-size: 20px;
-}
-
 .mat-table {
   overflow: auto;
   max-height: 500px;
 }
 
-.mat-header-cell .mat-sort-header-sorted {
+.mat-header-cell.mat-sort-header-sorted {
   color: black;
 }
diff --git a/src/material-examples/table-sorting/table-sorting-example.html b/src/material-examples/table-sorting/table-sorting-example.html
index ec3ed853501a..16c77d2b4e59 100644
--- a/src/material-examples/table-sorting/table-sorting-example.html
+++ b/src/material-examples/table-sorting/table-sorting-example.html
@@ -1,34 +1,31 @@
 <div class="example-container mat-elevation-z8">
   <mat-table #table [dataSource]="dataSource" matSort>
 
-    <!--- Note that these columns can be defined in any order.
-          The actual rendered columns are set as a property on the row definition" -->
-
-    <!-- ID Column -->
-    <ng-container matColumnDef="userId">
-      <mat-header-cell *matHeaderCellDef mat-sort-header> ID </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.id}} </mat-cell>
-    </ng-container>
-
-    <!-- Progress Column -->
-    <ng-container matColumnDef="progress">
-      <mat-header-cell *matHeaderCellDef mat-sort-header> Progress </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.progress}}% </mat-cell>
+    <!-- Position Column -->
+    <ng-container matColumnDef="position">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> No. </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.position}} </mat-cell>
     </ng-container>
 
     <!-- Name Column -->
-    <ng-container matColumnDef="userName">
+    <ng-container matColumnDef="name">
       <mat-header-cell *matHeaderCellDef mat-sort-header> Name </mat-header-cell>
-      <mat-cell *matCellDef="let row"> {{row.name}} </mat-cell>
+      <mat-cell *matCellDef="let element"> {{element.name}} </mat-cell>
+    </ng-container>
+
+    <!-- Weight Column -->
+    <ng-container matColumnDef="weight">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Weight </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.weight}} </mat-cell>
     </ng-container>
 
     <!-- Color Column -->
-    <ng-container matColumnDef="color">
-      <mat-header-cell *matHeaderCellDef mat-sort-header> Color </mat-header-cell>
-      <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
+    <ng-container matColumnDef="symbol">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Symbol </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.symbol}} </mat-cell>
     </ng-container>
 
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
     <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
   </mat-table>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/material-examples/table-sorting/table-sorting-example.ts b/src/material-examples/table-sorting/table-sorting-example.ts
index 36c6eea972a6..f52722c9c99c 100644
--- a/src/material-examples/table-sorting/table-sorting-example.ts
+++ b/src/material-examples/table-sorting/table-sorting-example.ts
@@ -1,11 +1,5 @@
 import {Component, ViewChild} from '@angular/core';
-import {DataSource} from '@angular/cdk/collections';
-import {MatSort} from '@angular/material';
-import {BehaviorSubject} from 'rxjs/BehaviorSubject';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/operator/map';
+import {MatTableDataSource, MatSort} from '@angular/material';
 
 /**
  * @title Table with sorting
@@ -16,110 +10,46 @@ import 'rxjs/add/operator/map';
   templateUrl: 'table-sorting-example.html',
 })
 export class TableSortingExample {
-  displayedColumns = ['userId', 'userName', 'progress', 'color'];
-  exampleDatabase = new ExampleDatabase();
-  dataSource: ExampleDataSource | null;
+  displayedColumns = ['position', 'name', 'weight', 'symbol'];
+  dataSource = new MatTableDataSource(ELEMENT_DATA);
 
   @ViewChild(MatSort) sort: MatSort;
 
-  ngOnInit() {
-    this.dataSource = new ExampleDataSource(this.exampleDatabase, this.sort);
+  /**
+   * Set the sort after the view init since this component will
+   * be able to query its view for the initialized sort.
+   */
+  ngAfterViewInit() {
+    this.dataSource.sort = this.sort;
   }
 }
 
-/** Constants used to fill up our data base. */
-const COLORS = ['maroon', 'red', 'orange', 'yellow', 'olive', 'green', 'purple',
-  'fuchsia', 'lime', 'teal', 'aqua', 'blue', 'navy', 'black', 'gray'];
-const NAMES = ['Maia', 'Asher', 'Olivia', 'Atticus', 'Amelia', 'Jack',
-  'Charlotte', 'Theodore', 'Isla', 'Oliver', 'Isabella', 'Jasper',
-  'Cora', 'Levi', 'Violet', 'Arthur', 'Mia', 'Thomas', 'Elizabeth'];
-
-export interface UserData {
-  id: string;
+export interface Element {
   name: string;
-  progress: string;
-  color: string;
-}
-
-/** An example database that the data source uses to retrieve data for the table. */
-export class ExampleDatabase {
-  /** Stream that emits whenever the data has been modified. */
-  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
-  get data(): UserData[] { return this.dataChange.value; }
-
-  constructor() {
-    // Fill up the database with 100 users.
-    for (let i = 0; i < 100; i++) { this.addUser(); }
-  }
-
-  /** Adds a new user to the database. */
-  addUser() {
-    const copiedData = this.data.slice();
-    copiedData.push(this.createNewUser());
-    this.dataChange.next(copiedData);
-  }
-
-  /** Builds and returns a new User. */
-  private createNewUser() {
-    const name =
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))] + ' ' +
-        NAMES[Math.round(Math.random() * (NAMES.length - 1))].charAt(0) + '.';
-
-    return {
-      id: (this.data.length + 1).toString(),
-      name: name,
-      progress: Math.round(Math.random() * 100).toString(),
-      color: COLORS[Math.round(Math.random() * (COLORS.length - 1))]
-    };
-  }
+  position: number;
+  weight: number;
+  symbol: string;
 }
 
-/**
- * Data source to provide what data should be rendered in the table. Note that the data source
- * can retrieve its data in any way. In this case, the data source is provided a reference
- * to a common data base, ExampleDatabase. It is not the data source's responsibility to manage
- * the underlying data. Instead, it only needs to take the data and send the table exactly what
- * should be rendered.
- */
-export class ExampleDataSource extends DataSource<any> {
-  constructor(private _exampleDatabase: ExampleDatabase, private _sort: MatSort) {
-    super();
-  }
-
-  /** Connect function called by the table to retrieve one stream containing the data to render. */
-  connect(): Observable<UserData[]> {
-    const displayDataChanges = [
-      this._exampleDatabase.dataChange,
-      this._sort.sortChange,
-    ];
-
-    return Observable.merge(...displayDataChanges).map(() => {
-      return this.getSortedData();
-    });
-  }
-
-  disconnect() {}
-
-  /** Returns a sorted copy of the database data. */
-  getSortedData(): UserData[] {
-    const data = this._exampleDatabase.data.slice();
-    if (!this._sort.active || this._sort.direction == '') { return data; }
-
-    return data.sort((a, b) => {
-      let propertyA: number|string = '';
-      let propertyB: number|string = '';
-
-      switch (this._sort.active) {
-        case 'userId': [propertyA, propertyB] = [a.id, b.id]; break;
-        case 'userName': [propertyA, propertyB] = [a.name, b.name]; break;
-        case 'progress': [propertyA, propertyB] = [a.progress, b.progress]; break;
-        case 'color': [propertyA, propertyB] = [a.color, b.color]; break;
-      }
-
-      let valueA = isNaN(+propertyA) ? propertyA : +propertyA;
-      let valueB = isNaN(+propertyB) ? propertyB : +propertyB;
-
-      return (valueA < valueB ? -1 : 1) * (this._sort.direction == 'asc' ? 1 : -1);
-    });
-  }
-}
+const ELEMENT_DATA: Element[] = [
+  {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'},
+  {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'},
+  {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'},
+  {position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be'},
+  {position: 5, name: 'Boron', weight: 10.811, symbol: 'B'},
+  {position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C'},
+  {position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N'},
+  {position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O'},
+  {position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F'},
+  {position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne'},
+  {position: 11, name: 'Sodium', weight: 22.9897, symbol: 'Na'},
+  {position: 12, name: 'Magnesium', weight: 24.305, symbol: 'Mg'},
+  {position: 13, name: 'Aluminum', weight: 26.9815, symbol: 'Al'},
+  {position: 14, name: 'Silicon', weight: 28.0855, symbol: 'Si'},
+  {position: 15, name: 'Phosphorus', weight: 30.9738, symbol: 'P'},
+  {position: 16, name: 'Sulfur', weight: 32.065, symbol: 'S'},
+  {position: 17, name: 'Chlorine', weight: 35.453, symbol: 'Cl'},
+  {position: 18, name: 'Argon', weight: 39.948, symbol: 'Ar'},
+  {position: 19, name: 'Potassium', weight: 39.0983, symbol: 'K'},
+  {position: 20, name: 'Calcium', weight: 40.078, symbol: 'Ca'},
+];

From 305dccfd52ec966158e4d1194d9405135501da7e Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 27 Oct 2017 19:21:57 +0200
Subject: [PATCH 367/575] chore: fix plunker link in readme (#7991)

* The current Plunker link is referring to an anonymous Plunker that nobody can't change.
* Changes the Plunker and StackBlitz links in the Readme to the `goo.gl` shorthand links from the issue template.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 636aed8330b2..c47b855ea67c 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ This is the home for the Angular team's Material Design components built for and
 [Documentation, demos, and guides][aio] |
 [Google group](https://groups.google.com/forum/#!forum/angular-material2) |
 [Contributing](https://github.com/angular/material2/blob/master/CONTRIBUTING.md) |
-[Plunker Template](http://plnkr.co/edit/LSgU9X5sYVhx4bc3LBWm?p=preview) |
-[StackBlitz Template](https://stackblitz.com/edit/angular-material2-issue?file=app%2Fapp.component.ts)
+[Plunker Template](https://goo.gl/DlHd6U) |
+[StackBlitz Template](https://goo.gl/wwnhMV)
 
 ### Getting started
 

From f6a9b1ade76c06fd01201ebf0469feeef2e18eba Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 27 Oct 2017 19:22:20 +0200
Subject: [PATCH 368/575] docs(dialog): add note about focus trapping (#7945)

Adds a note about the dialog's focus trapping behavior to the docs.

Fixes #7935.
---
 src/lib/dialog/dialog.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/lib/dialog/dialog.md b/src/lib/dialog/dialog.md
index c20447c35b56..e817549982de 100644
--- a/src/lib/dialog/dialog.md
+++ b/src/lib/dialog/dialog.md
@@ -1,9 +1,9 @@
-The `MatDialog` service can be used to open modal dialogs with Material Design styling and 
+The `MatDialog` service can be used to open modal dialogs with Material Design styling and
 animations.
 
 <!-- example(dialog-overview) -->
 
-A dialog is opened by calling the `open` method with a component to be loaded and an optional 
+A dialog is opened by calling the `open` method with a component to be loaded and an optional
 config object. The `open` method will return an instance of `MatDialogRef`:
 
 ```ts
@@ -26,13 +26,13 @@ dialogRef.close('Pizza!');
 
 Components created via `MatDialog` can _inject_ `MatDialogRef` and use it to close the dialog
 in which they are contained. When closing, an optional result value can be provided. This result
-value is forwarded as the result of the `afterClosed` promise. 
+value is forwarded as the result of the `afterClosed` promise.
 
 ```ts
 @Component({/* ... */})
 export class YourDialog {
   constructor(public dialogRef: MatDialogRef<YourDialog>) { }
-  
+
   closeDialog() {
     this.dialogRef.close('Pizza!');
   }
@@ -135,6 +135,12 @@ The `aria-label`, `aria-labelledby`, and `aria-describedby` attributes can all b
 dialog element via the `MatDialogConfig` as well. Each dialog should typically have a label
 set via `aria-label` or `aria-labelledby`.
 
+When a dialog is opened, it will move focus to the first focusable element that it can find. In
+order to prevent users from tabbing into elements in the background, the Material dialog uses
+a [focus trap](https://material.angular.io/cdk/a11y/overview#focustrap) to contain focus
+within itself. Once a dialog is closed, it will return focus to the element that was focused
+before the dialog was opened.
+
 #### Focus management
 By default, the first tabbable element within the dialog will receive focus upon open.
 

From c707007d65157e9ee84da9d1b75dd7c5e4f6f057 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 27 Oct 2017 19:22:54 +0200
Subject: [PATCH 369/575] docs(ripple): update documentation (#7941)

* docs(ripple): update documentation

* Improves the documentation of the `matRipple` attribute directive.

References #7543.

* Address feedback

* Omit matRipple header
---
 src/lib/core/ripple/README.md | 48 ------------------
 src/lib/core/ripple/ripple.md | 93 +++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 48 deletions(-)
 delete mode 100644 src/lib/core/ripple/README.md
 create mode 100644 src/lib/core/ripple/ripple.md

diff --git a/src/lib/core/ripple/README.md b/src/lib/core/ripple/README.md
deleted file mode 100644
index 2cbcbe44a147..000000000000
--- a/src/lib/core/ripple/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# mat-ripple
-
-`mat-ripple` defines an area in which a ripple animates, usually in response to user action. It is used as an attribute directive, for example `<div mat-ripple [matRippleColor]="rippleColor">...</div>`.
-
-By default, a ripple is activated when the host element of the `mat-ripple` directive receives mouse or touch events. On a mousedown or touch start, the ripple background fades in. When the click event completes, a circular foreground ripple fades in and expands from the event location to cover the host element bounds.
-
-Ripples can also be triggered programmatically by getting a reference to the MatRipple directive and calling its `start` and `end` methods.
-
-### Global options
-
-Developers are able to specify options for all ripples inside of their application.
-
-The speed of the ripples can be adjusted and the ripples can be disabled globally as well.
-
-Global ripple options can be specified by setting the `MAT_RIPPLE_GLOBAL_OPTIONS` provider.
-
-```ts
-const globalRippleConfig: RippleGlobalOptions = {
-  disabled: true,
-  baseSpeedFactor: 1.5 // Ripples will animate 50% faster than before.
-}
-
-@NgModule({
-  providers: [
-    {provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: globalRippleConfig} 
-  ]
-})
-```
-
-Here are all available global options listed:
-
-| Name            | Type    | Description                               |
-| --------------- | ------- | ----------------------------------------- |
-| disabled        | boolean | Whether ripples should show or not.       |
-| baseSpeedFactor | number  | Factor to adjust ripple speed.            |
-
-### API Summary
-
-Properties:
-
-| Name | Type | Description |
-| --- | --- | --- |
-| `matRippleTrigger` | Element | The DOM element that triggers the ripple when clicked. Defaults to the parent of the `mat-ripple`.
-| `matRippleColor` | string | Custom color for foreground ripples
-| `matRippleCentered` | boolean | If true, the ripple animation originates from the center of the `mat-ripple` bounds rather than from the location of the click event.
-| `matRippleRadius` | number | Optional fixed radius of foreground ripples when fully expanded. Mainly used in conjunction with `unbounded` attribute. If not set, ripples will expand from their origin to the most distant corner of the component's bounding rectangle.
-| `matRippleUnbounded` | boolean | If true, foreground ripples will be visible outside the component's bounds.
-| `matRippleDisabled` | boolean | If true, click events on the trigger element will not activate ripples. The `start` and `end` methods can still be called to programmatically create ripples.
diff --git a/src/lib/core/ripple/ripple.md b/src/lib/core/ripple/ripple.md
new file mode 100644
index 000000000000..9338ab4b2418
--- /dev/null
+++ b/src/lib/core/ripple/ripple.md
@@ -0,0 +1,93 @@
+Connect user input to screen reactions by using ripples to both indicate the point of touch, and to
+confirm that touch input was received. For touch or mouse, this occurs at the point of contact.
+
+The `matRipple` attribute directive defines an area in which a ripple animates on user interaction.
+
+```html
+<div matRipple [matRippleColor]="myColor">
+  <ng-content></ng-content>
+</div>
+```
+
+By default, a ripple is activated when the host element of the `matRipple` directive receives
+mouse or touch events. Upon being pressed, a ripple will begin fading in from the point of contact,
+radiating to cover the host element. Each ripple will fade out only upon release of the mouse or touch.
+
+Ripples can also be triggered programmatically by getting a reference to the MatRipple directive
+and calling its `launch` method.
+
+
+### Ripple trigger
+
+By default ripples will fade in on interaction with the directive's host element.
+In some situations, developers may want to show ripples on interaction with *some other* element, 
+but still want to have the ripples placed in another location. This can be done by specifying
+the `matRippleTrigger` option that expects a reference to an `HTMLElement`.
+
+```html
+<div>
+  <div matRipple [matRippleTrigger]="trigger" class="my-ripple-container">
+    <!-- This is the ripple container, but not the trigger element for ripples. -->
+  </div>
+  
+  <div #trigger></div>
+</div>
+```
+
+### Manual ripples
+
+Ripples can be shown programmatically by getting a reference to the `MatRipple` directive.
+
+```ts
+class MyComponent {
+
+  /** Reference to the directive instance of the ripple. */
+  @ViewChild(MatRipple) ripple: MatRipple;
+  
+  /** Shows a centered and persistent ripple. */
+  launchRipple() {
+    const rippleRef = this.ripple.launch(0, 0, {
+      persistent: true,
+      centered: true
+    });
+    
+    // Fade out the ripple later.
+    rippleRef.fadeOut();
+  }
+}
+```
+
+In the example above, the `x` and `y` parameters will be ignored, because the `centered`
+ripple option has been set to `true`.
+
+Ripples that are being dispatched programmatically can be launched with the `persistent` option.
+This means that the ripples will not fade out automatically, and need to be faded out using
+the `RippleRef` (*useful for focus indicators*).
+
+### Global options
+
+Developers are able to specify options for all ripples inside of their application.
+
+The speed of the ripples can be adjusted and the ripples can be disabled globally as well.
+
+Global ripple options can be specified by setting the `MAT_RIPPLE_GLOBAL_OPTIONS` provider.
+
+```ts
+const globalRippleConfig: RippleGlobalOptions = {
+  disabled: true,
+  baseSpeedFactor: 1.5 // Ripples will animate 50% faster than before.
+}
+
+@NgModule({
+  providers: [
+    {provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: globalRippleConfig} 
+  ]
+})
+```
+
+All currently available global options are shown here:
+
+| Name            | Type    | Description                               |
+| --------------- | ------- | ----------------------------------------- |
+| disabled        | boolean | Whether ripples should show or not.       |
+| baseSpeedFactor | number  | Factor to adjust ripple speed.            |

From 94981eaad500f5f1d225be8bfc21f59cb2efd38e Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 27 Oct 2017 12:23:12 -0500
Subject: [PATCH 370/575] docs(menu): move nested to section (#7884)

---
 src/lib/menu/menu.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/menu/menu.md b/src/lib/menu/menu.md
index f202c21ce9c5..2c1b04fbaae0 100644
--- a/src/lib/menu/menu.md
+++ b/src/lib/menu/menu.md
@@ -1,7 +1,6 @@
 `<mat-menu>` is a floating panel containing list of options.
 
 <!-- example(menu-overview) -->
-<!-- example(nested-menu) -->
 
 By itself, the `<mat-menu>` element does not render anything. The menu is attached to and opened
 via application of the `matMenuTriggerFor` directive:
@@ -92,6 +91,7 @@ that should trigger the sub-menu:
 </button>
 ```
 
+<!-- example(nested-menu) -->
 
 ### Keyboard interaction
 - <kbd>DOWN_ARROW</kbd>: Focuses the next menu item

From 38d1ec29cad86a886a9f09ed9e949283212ca8ac Mon Sep 17 00:00:00 2001
From: Gabriel <32056062+TheRedD0t@users.noreply.github.com>
Date: Fri, 27 Oct 2017 19:23:47 +0200
Subject: [PATCH 371/575] chore: switch stepper from the list of planned
 features to the list of available features (#7732)

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c47b855ea67c..d05d66edb2ef 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ High level stuff planned for Q4 2017 (October - December):
 | slider           |                                                        |   [Docs][16] |
 | snackbar / toast |                                                        |   [Docs][21] |
 | sort-header      |                                                        |   [Docs][30] |
+| stepper          |                                                        |   [Docs][33] |
 | tabs             |                                                        |   [Docs][13] |
 | textarea         |                                                        |   [Docs][5]  |
 | toolbar          |                                                        |   [Docs][7]  |
@@ -88,7 +89,6 @@ High level stuff planned for Q4 2017 (October - December):
 | Feature          | Status                              | Docs         | Issue          |
 |------------------|-------------------------------------|--------------|----------------|
 | tree             |      In-progress ([sneak peek][31]) |           -  |  [#3175][3175] |
-| stepper          |        In-progress, planned Q3 2017 |           -  |   [#508][0508] |
 | sticky-header    |        In-progress, planned Q3 2017 |           -  |   [#474][0474] |
 | virtual-repeat   |        Not started, planned Q4 2017 |           -  |   [#823][0823] |
 | fab speed-dial   |            Not started, not planned |           -  |   [#860][0860] |
@@ -129,6 +129,7 @@ High level stuff planned for Q4 2017 (October - December):
 [30]: https://material.angular.io/components/component/sort
 [31]: https://tina-material-tree.firebaseapp.com/simple-tree
 [32]: https://material.angular.io/components/expansion/overview
+[33]: https://material.angular.io/components/stepper/overview
 
 [0107]: https://github.com/angular/material2/issues/107
 [0119]: https://github.com/angular/material2/issues/119

From 8993451007d16edefa5979e7bfefa54242a7fc20 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 27 Oct 2017 12:25:23 -0500
Subject: [PATCH 372/575] chore(docs): adds types column and null checks for
 description (#7713)

* chore(docs): adds types column and null checks for description

* chore(nit): update per pr feedback
---
 tools/dgeni/templates/method.template.html   | 2 ++
 tools/dgeni/templates/property.template.html | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/dgeni/templates/method.template.html b/tools/dgeni/templates/method.template.html
index 8a79b1e18b4d..4d6ed2f81ec3 100644
--- a/tools/dgeni/templates/method.template.html
+++ b/tools/dgeni/templates/method.template.html
@@ -9,11 +9,13 @@
       </th>
     </tr>
   </thead>
+  {%- if method.description -%}
   <tr class="docs-api-method-description-row">
     <td colspan="2" class="docs-api-method-description-cell">
       {$ method.description | marked | safe $}
     </td>
   </tr>
+  {%- endif -%}
 
   {%- if method.params.length -%}
   <thead>
diff --git a/tools/dgeni/templates/property.template.html b/tools/dgeni/templates/property.template.html
index fd539e9ea11a..9244bb306423 100644
--- a/tools/dgeni/templates/property.template.html
+++ b/tools/dgeni/templates/property.template.html
@@ -25,7 +25,11 @@
     <p class="docs-api-property-name">
       {$ property.name $}
     </p>
-    <code class="docs-api-property-type">{$ property.type $}</code>
   </td>
-  <td class="docs-api-property-description">{$ property.description | marked | safe $}</td>
+  <td class="docs-api-property-description">
+    <div class="docs-api-property-type">
+      Type: <code>{$ property.type $}</code>
+    </div>
+    {$ property.description | marked | safe $}
+  </td>
 </tr>

From 4efb70cc9fd8f99c1af3e1df575c486f826ed8df Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 27 Oct 2017 10:30:00 -0700
Subject: [PATCH 373/575] Revert "chore(docs): adds types column and null
 checks for description (#7713)" (#8083)

This reverts commit 8993451007d16edefa5979e7bfefa54242a7fc20.
---
 tools/dgeni/templates/method.template.html   | 2 --
 tools/dgeni/templates/property.template.html | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/tools/dgeni/templates/method.template.html b/tools/dgeni/templates/method.template.html
index 4d6ed2f81ec3..8a79b1e18b4d 100644
--- a/tools/dgeni/templates/method.template.html
+++ b/tools/dgeni/templates/method.template.html
@@ -9,13 +9,11 @@
       </th>
     </tr>
   </thead>
-  {%- if method.description -%}
   <tr class="docs-api-method-description-row">
     <td colspan="2" class="docs-api-method-description-cell">
       {$ method.description | marked | safe $}
     </td>
   </tr>
-  {%- endif -%}
 
   {%- if method.params.length -%}
   <thead>
diff --git a/tools/dgeni/templates/property.template.html b/tools/dgeni/templates/property.template.html
index 9244bb306423..fd539e9ea11a 100644
--- a/tools/dgeni/templates/property.template.html
+++ b/tools/dgeni/templates/property.template.html
@@ -25,11 +25,7 @@
     <p class="docs-api-property-name">
       {$ property.name $}
     </p>
+    <code class="docs-api-property-type">{$ property.type $}</code>
   </td>
-  <td class="docs-api-property-description">
-    <div class="docs-api-property-type">
-      Type: <code>{$ property.type $}</code>
-    </div>
-    {$ property.description | marked | safe $}
-  </td>
+  <td class="docs-api-property-description">{$ property.description | marked | safe $}</td>
 </tr>

From b3a493c5840ce7f7fce10d869a2c60ee3d94d809 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Sat, 28 Oct 2017 00:40:38 +0200
Subject: [PATCH 374/575] build(docs): exclude readme files (#8087)

* No longer copies and prefixes `README.md` files for the docs. Those are just in the repository for a better overview, but don't really have any use for the docs. Also they are conflicting with the `fetch` script on the material.angular.io repository.

```
cp: will not overwrite just-created './src/assets/documents/overview/material-README.html' with '../material2/dist/docs/markdown/slide-toggle/material-README.html'
cp: will not overwrite just-created './src/assets/documents/overview/material-README.html' with '../material2/dist/docs/markdown/slider/material-README.html'
cp: will not overwrite just-created './src/assets/documents/overview/material-README.html' with '../material2/dist/docs/markdown/snack-bar/material-README.html'
cp: will not overwrite just-created './src/assets/documents/overview/material-README.html' with '../material2/dist/docs/markdown/tabs/material-README.html'
cp: will not overwrite just-created './src/assets/documents/overview/material-README.html' with '../material2/dist/docs/markdown/toolbar/material-README.html'
cp: will not overwrite just-created './src/assets/documents/overview/material-README.html' with '../material2/dist/docs/markdown/tooltip/material-README.html'
`
* Also updates the `example-module.ts` file to the current state of the material-examples.
---
 src/material-examples/example-module.ts | 2 +-
 tools/gulp/tasks/docs.ts                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index ed950aa52cfc..23a4d39a2bdb 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -697,7 +697,7 @@ export const EXAMPLE_COMPONENTS = {
     selectorName: null
   },
   'table-overview': {
-    title: 'Feature-rich data table',
+    title: 'Data table with sorting, pagination, and filtering.',
     component: TableOverviewExample,
     additionalFiles: null,
     selectorName: null
diff --git a/tools/gulp/tasks/docs.ts b/tools/gulp/tasks/docs.ts
index e17749077865..76897af88225 100644
--- a/tools/gulp/tasks/docs.ts
+++ b/tools/gulp/tasks/docs.ts
@@ -100,7 +100,7 @@ task('markdown-docs', () => {
     }
   };
 
-  return src(['src/lib/**/*.md', 'guides/*.md'])
+  return src(['src/lib/**/!(README).md', 'guides/*.md'])
       .pipe(rename({prefix: 'material-'}))
       .pipe(markdown(markdownOptions))
       .pipe(transform(transformMarkdownFiles))
@@ -112,7 +112,7 @@ task('markdown-docs', () => {
 // disambiguating the output.
 /** Generates html files from the markdown overviews and guides for the cdk. */
 task('markdown-docs-cdk', () => {
-  return src(['src/cdk/**/*.md'])
+  return src(['src/cdk/**/!(README).md'])
       .pipe(rename({prefix: 'cdk-'}))
       .pipe(markdown(markdownOptions))
       .pipe(transform(transformMarkdownFiles))

From 97447f93498c0aafb746cfa5208c84b2d9fc648a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Sat, 28 Oct 2017 00:40:55 +0200
Subject: [PATCH 375/575] chore: lint error (#8086)

Fixes a linting error in the docs
---
 src/material-examples/table-http/table-http-example.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index 93c5f38dea97..de864fce1d73 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, ViewChild} from '@angular/core';
+import {Component, AfterViewInit, ViewChild} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 import {Observable} from 'rxjs/Observable';
@@ -17,7 +17,7 @@ import 'rxjs/add/operator/switchMap';
   styleUrls: ['table-http-example.css'],
   templateUrl: 'table-http-example.html',
 })
-export class TableHttpExample {
+export class TableHttpExample implements AfterViewInit {
   displayedColumns = ['created', 'state', 'number', 'title'];
   exampleDatabase: ExampleHttpDao | null;
   dataSource = new MatTableDataSource();

From 4c811d443227f642918c59c1b3504f9751709725 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 27 Oct 2017 17:41:21 -0500
Subject: [PATCH 376/575] chore(docs): adds toc to api docs (#7827)

---
 tools/dgeni/templates/class.template.html         |  5 +++--
 .../dgeni/templates/componentGroup.template.html  | 15 ++++++++++++---
 tools/gulp/tasks/docs.ts                          |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/dgeni/templates/class.template.html b/tools/dgeni/templates/class.template.html
index 791ffa9f0924..797c053aacc4 100644
--- a/tools/dgeni/templates/class.template.html
+++ b/tools/dgeni/templates/class.template.html
@@ -1,4 +1,5 @@
-<h4 class="docs-api-h4 docs-api-class-name">
+<h4 id="{$ class.name $}" class="docs-header-link docs-api-h4 docs-api-class-name">
+  <span header-link="{$ class.name $}"></span>
   <code>{$ class.name $}</code>
 </h4>
 
@@ -16,7 +17,7 @@ <h4 class="docs-api-h4 docs-api-class-name">
 {%- endif -%}
 
 {%- if class.directiveExportAs -%}
-<span class="docs-api-h4 docs-api-class-export-label">Exported as:</span>
+<span class="docs-api-class-export-label">Exported as:</span>
 <span class="docs-api-class-export-name">{$ class.directiveExportAs $}</span>
 {%- endif -%}
 
diff --git a/tools/dgeni/templates/componentGroup.template.html b/tools/dgeni/templates/componentGroup.template.html
index 61532398bec8..45905c7ec99a 100644
--- a/tools/dgeni/templates/componentGroup.template.html
+++ b/tools/dgeni/templates/componentGroup.template.html
@@ -31,7 +31,10 @@ <h2>
   </p>
 
   {%- if doc.services.length -%}
-    <h3 class="docs-api-h3">Services</h3>
+    <h3 id="services" class="docs-header-link docs-api-h3">
+      <span header-link="services"></span>
+      Services
+    </h3>
     {% for service in doc.services %}
       {$ class(service) $}
     {% endfor %}
@@ -39,14 +42,20 @@ <h3 class="docs-api-h3">Services</h3>
 
 
   {%- if doc.directives.length -%}
-    <h3 class="docs-api-h3">Directives</h3>
+    <h3 id="directives" class="docs-header-link docs-api-h3">
+      <span header-link="directives"></span>
+      Directives
+    </h3>
     {% for directive in doc.directives %}
       {$ class(directive) $}
     {% endfor %}
   {%- endif -%}
 
   {%- if doc.additionalClasses.length -%}
-    <h3 class="docs-api-h3">Additional classes</h3>
+    <h3 id="additional_classes" class="docs-header-link docs-api-h3">
+      <span header-link="additional_classes"></span>
+      Additional classes
+    </h3>
     {% for other in doc.additionalClasses %}
       {$ class(other) $}
     {% endfor %}
diff --git a/tools/gulp/tasks/docs.ts b/tools/gulp/tasks/docs.ts
index 76897af88225..0e381c95bb80 100644
--- a/tools/gulp/tasks/docs.ts
+++ b/tools/gulp/tasks/docs.ts
@@ -91,7 +91,7 @@ task('markdown-docs', () => {
       const escapedText = text.toLowerCase().replace(/[^\w]+/g, '-');
       return `
         <h${level} id="${escapedText}" class="docs-header-link">
-          <div header-link="${escapedText}"></div>
+          <span header-link="${escapedText}"></span>
           ${text}
         </h${level}>
       `;

From 62b149f3ce74bef55b9ee22be5a644cafe107aaa Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Sat, 28 Oct 2017 08:46:28 +0200
Subject: [PATCH 377/575] chore: fix prerender failure (#8091)

Fixes the prerender check failing due to a faulty rebase in an earlier PR.
---
 src/universal-app/kitchen-sink/kitchen-sink.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index 2945be19d4eb..63f16c1ada0e 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -35,8 +35,6 @@ import {
   MatToolbarModule,
   MatTooltipModule,
   MatStepperModule,
-  MatButtonToggleModule,
-  MatCheckboxModule,
 } from '@angular/material';
 import {
   CdkTableModule,

From f29da63583e19909ae6b34d080fae1b7e74c458d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Sat, 28 Oct 2017 18:37:43 +0200
Subject: [PATCH 378/575] feat: update to rxjs 5.5.0 and switch to lettable
 operators (#7276)

Bumps the required RxJS version to 5.5.0 and gets rid of our RxChain in favor of using the lettable Rx operators. Refactors all the usages and updates the configs.

Fixes #7275.
---
 .github/CODEOWNERS                            |     1 -
 CODING_STANDARDS.md                           |    23 +-
 package-lock.json                             | 15283 +++++++++-------
 package.json                                  |     2 +-
 src/cdk/a11y/focus-trap.ts                    |     4 +-
 src/cdk/a11y/list-key-manager.spec.ts         |     4 +-
 src/cdk/a11y/list-key-manager.ts              |    42 +-
 src/cdk/layout/breakpoints-observer.ts        |    15 +-
 src/cdk/observers/observe-content.ts          |     7 +-
 .../keyboard/overlay-keyboard-dispatcher.ts   |    14 +-
 src/cdk/overlay/overlay-ref.ts                |     4 +-
 src/cdk/rxjs/index.ts                         |    11 -
 src/cdk/rxjs/public-api.ts                    |    10 -
 src/cdk/rxjs/rx-chain.spec.ts                 |    41 -
 src/cdk/rxjs/rx-chain.ts                      |    55 -
 src/cdk/rxjs/rx-operators.ts                  |   143 -
 src/cdk/rxjs/rxjs.md                          |    27 -
 src/cdk/rxjs/tsconfig-build.json              |    13 -
 src/cdk/rxjs/tsconfig-es5.json                |    13 -
 src/cdk/scrolling/scroll-dispatcher.ts        |    12 +-
 src/cdk/scrolling/viewport-ruler.ts           |     6 +-
 src/cdk/table/table.spec.ts                   |     7 +-
 src/cdk/table/table.ts                        |     4 +-
 src/demo-app/system-config.ts                 |     2 +-
 src/e2e-app/system-config.ts                  |     5 +-
 src/lib/autocomplete/autocomplete-trigger.ts  |    48 +-
 src/lib/autocomplete/autocomplete.spec.ts     |    24 +-
 src/lib/chips/chip-list.ts                    |     4 +-
 src/lib/datepicker/calendar.ts                |     4 +-
 src/lib/datepicker/datepicker.ts              |     4 +-
 src/lib/dialog/dialog-ref.ts                  |    53 +-
 src/lib/dialog/dialog.ts                      |    10 +-
 src/lib/expansion/expansion-panel-header.ts   |     4 +-
 src/lib/form-field/form-field.ts              |    10 +-
 src/lib/icon/icon-registry.ts                 |    49 +-
 src/lib/icon/icon.ts                          |     9 +-
 src/lib/menu/menu-directive.ts                |    17 +-
 src/lib/menu/menu-trigger.ts                  |    14 +-
 src/lib/select/select.spec.ts                 |     4 +-
 src/lib/select/select.ts                      |    49 +-
 src/lib/sidenav/drawer.ts                     |    58 +-
 src/lib/snack-bar/snack-bar-container.ts      |     4 +-
 src/lib/snack-bar/snack-bar.ts                |    20 +-
 src/lib/sort/sort.spec.ts                     |     4 +-
 src/lib/table/table-data-source.ts            |    30 +-
 src/lib/tabs/tab-header.ts                    |     4 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts       |     5 +-
 src/lib/tooltip/tooltip.ts                    |     4 +-
 test/karma-test-shim.js                       |     2 +-
 tools/package-tools/rollup-globals.ts         |    23 +-
 50 files changed, 8913 insertions(+), 7292 deletions(-)
 delete mode 100644 src/cdk/rxjs/index.ts
 delete mode 100644 src/cdk/rxjs/public-api.ts
 delete mode 100644 src/cdk/rxjs/rx-chain.spec.ts
 delete mode 100644 src/cdk/rxjs/rx-chain.ts
 delete mode 100644 src/cdk/rxjs/rx-operators.ts
 delete mode 100644 src/cdk/rxjs/rxjs.md
 delete mode 100644 src/cdk/rxjs/tsconfig-build.json
 delete mode 100644 src/cdk/rxjs/tsconfig-es5.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9096acabe297..246d1b5a4fe6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -63,7 +63,6 @@
 /src/cdk/overlay/**                                @jelbourn @crisbeto
 /src/cdk/platform/**                               @jelbourn @devversion
 /src/cdk/portal/**                                 @jelbourn
-/src/cdk/rxjs/**                                   @jelbourn
 /src/cdk/scrolling/**                              @andrewseguin @crisbeto
 /src/cdk/stepper/**                                @mmalerba
 /src/cdk/table/**                                  @andrewseguin
diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
index b9cde2891ae0..e176eb4878b4 100644
--- a/CODING_STANDARDS.md
+++ b/CODING_STANDARDS.md
@@ -127,9 +127,9 @@ class ConfigBuilder {
 ```
 
 #### RxJS
-When dealing with RxJS operators, import the operator functions directly (e.g.
-`import "rxjs/operator/map"`), as opposed to using the "patch" imports which pollute the user's
-global Observable object (e.g. `import "rxjs/add/operator/map"`):
+When dealing with RxJS operators, import the lettable operator (e.g.
+`import {map} from 'rxjs/operators'`), as opposed to using the "patch" imports which pollute the
+user's global Observable object (e.g. `import 'rxjs/add/operator/map'`):
 
 ```ts
 // NO
@@ -137,23 +137,10 @@ import 'rxjs/add/operator/map';
 someObservable.map(...).subscribe(...);
 
 // YES
-import {map} from 'rxjs/operator/map';
-map.call(someObservable, ...).subscribe(...);
+import {map} from 'rxjs/operators';
+someObservable.pipe(map(...)).subscribe(...);
 ```
 
-Note that this approach can be inflexible when dealing with long chains of operators. You can use
-the `RxChain` class to help with it:
-
-```ts
-// Before
-someObservable.filter(...).map(...).do(...);
-
-// After
-RxChain.from(someObservable).call(filter, ...).call(map, ...).call(do, ...).subscribe(...);
-```
-Note that not all operators are available via the `RxChain`. If the operator that you need isn't
-declared, you can add it to `/core/rxjs/rx-operators.ts`.
-
 #### Access modifiers
 * Omit the `public` keyword as it is the default behavior.
 * Use `private` when appropriate and possible, prefixing the name with an underscore.
diff --git a/package-lock.json b/package-lock.json
index 1565fa35fc87..6f56bc6d815b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,106 +5,106 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.4.tgz",
-      "integrity": "sha1-ovk1NgQ0er4V35gpIFiEL1Lwi8I=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.6.tgz",
+      "integrity": "sha1-+mYYmaik44y3xYPHpcl85l1ZKjU=",
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/common": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.4.tgz",
-      "integrity": "sha1-rgqBiqoMaj8JAee4C9lOHCLrk2U=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.6.tgz",
+      "integrity": "sha1-S4FCByTggooOg5uVpV6xp+g5GPI=",
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/compiler": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz",
-      "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.6.tgz",
+      "integrity": "sha1-LuH68lt1fh0SiXkHS+f65SmzvCA=",
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.4.tgz",
-      "integrity": "sha1-BjCApJfZF1OWglBQIixxfaGE9s8=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.6.tgz",
+      "integrity": "sha1-uv09HiYOmQh+uajPdTLb1gOrubE=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.4.4",
+        "@angular/tsc-wrapped": "4.4.6",
         "minimist": "1.2.0",
         "reflect-metadata": "0.1.10"
       }
     },
     "@angular/core": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz",
-      "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.6.tgz",
+      "integrity": "sha1-EwMf0Q3P5DiHVBmzjyESCVi8I1Q=",
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/forms": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.4.tgz",
-      "integrity": "sha1-TbN5BQm2sQ8duKfBt/Uhh89kz9Q=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.6.tgz",
+      "integrity": "sha1-/mSs5CQ1wbgPSQNLfEHOjK8UpEo=",
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/http": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.4.tgz",
-      "integrity": "sha1-Zn+vYWu2JBaOr65u6S5euiOp0fI=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.6.tgz",
+      "integrity": "sha1-CvaAxnEL3AJtlA4iXP0PalwAXQw=",
       "dev": true,
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.4.tgz",
-      "integrity": "sha1-o4mOLnup2E/6DUcUTGlxF5x1ruY=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.6.tgz",
+      "integrity": "sha1-qYOcVH4bZU+h0kqJeAyLpquNzOA=",
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.4.tgz",
-      "integrity": "sha1-w8nrhUpShVagcFQSeTLlJ/qTLhQ=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.6.tgz",
+      "integrity": "sha1-TT2aanvyzz3kBYphWuBZ7/ZB+jY=",
       "dev": true,
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/platform-server": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.4.tgz",
-      "integrity": "sha1-c+5B+hzshij8wDF0cnsnywAxsio=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.6.tgz",
+      "integrity": "sha1-QxJI9IkaY1x2rRWhfQPpyH4aODc=",
       "dev": true,
       "requires": {
         "parse5": "3.0.2",
-        "tslib": "1.7.1",
+        "tslib": "1.8.0",
         "xhr2": "0.1.4"
       }
     },
     "@angular/router": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.4.tgz",
-      "integrity": "sha1-e+ORCW6EPLPgT58F0dZaiN+bx88=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.6.tgz",
+      "integrity": "sha1-D2rSmuD/jSyeo3m9MgRHIXt+yGY=",
       "dev": true,
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "@angular/tsc-wrapped": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.4.tgz",
-      "integrity": "sha1-mEGCHlVha4JsoWAlD+heFfx0/8M=",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.6.tgz",
+      "integrity": "sha1-Fnh8u/UL3H5zgSOxnDJSfyROF40=",
       "dev": true,
       "requires": {
         "tsickle": "0.21.6"
@@ -124,4961 +124,1092 @@
         }
       }
     },
-    "@google-cloud/common": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
-      "integrity": "sha1-uQWZ8pzpV7NmreqNfAw/NZPZgco=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "1.0.3",
-        "arrify": "1.0.1",
-        "concat-stream": "1.6.0",
-        "create-error-class": "3.0.2",
-        "duplexify": "3.5.1",
-        "ent": "2.2.0",
-        "extend": "3.0.1",
-        "google-auto-auth": "0.7.2",
-        "is": "3.2.1",
-        "log-driver": "1.2.5",
-        "methmeth": "1.1.0",
-        "modelo": "4.2.0",
-        "request": "2.83.0",
-        "retry-request": "2.0.5",
-        "split-array-stream": "1.0.3",
-        "stream-events": "1.0.2",
-        "string-format-obj": "1.1.0",
-        "through2": "2.0.3"
-      }
-    },
-    "@google-cloud/functions-emulator": {
-      "version": "1.0.0-alpha.25",
-      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
-      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@google-cloud/storage": "1.2.1",
-        "adm-zip": "0.4.7",
-        "ajv": "5.2.2",
-        "body-parser": "1.17.2",
-        "cli-table2": "0.2.0",
-        "colors": "1.1.2",
-        "configstore": "3.1.1",
-        "express": "4.15.4",
-        "google-proto-files": "0.12.1",
-        "googleapis": "20.1.0",
-        "got": "7.1.0",
-        "grpc": "1.4.1",
-        "http-proxy": "1.16.2",
-        "lodash": "4.17.4",
-        "prompt": "1.0.0",
-        "rimraf": "2.6.1",
-        "semver": "5.4.1",
-        "serializerr": "1.0.3",
-        "tmp": "0.0.33",
-        "uuid": "3.1.0",
-        "winston": "2.3.1",
-        "yargs": "8.0.2"
-      },
-      "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,
-          "optional": 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,
-          "optional": true
-        },
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true,
-          "optional": 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,
-          "optional": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "optional": 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,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
-          }
-        }
-      }
-    },
-    "@google-cloud/storage": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
-      "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
+    "@firebase/app": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.1.tgz",
+      "integrity": "sha512-LoZj/Igo1PbfSorPRCozTlBhrFvOyxZsiMo2fLyDa2w/gdPbMucpWUi0vIBronR6T/yNJRWdZyyHOMieLtnjcw==",
       "dev": true,
       "requires": {
-        "@google-cloud/common": "0.13.5",
-        "arrify": "1.0.1",
-        "async": "2.5.0",
-        "concat-stream": "1.6.0",
-        "create-error-class": "3.0.2",
-        "duplexify": "3.5.1",
-        "extend": "3.0.1",
-        "gcs-resumable-upload": "0.8.2",
-        "hash-stream-validation": "0.2.1",
-        "is": "3.2.1",
-        "mime-types": "2.1.17",
-        "once": "1.4.0",
-        "pumpify": "1.3.5",
-        "stream-events": "1.0.2",
-        "string-format-obj": "1.1.0",
-        "through2": "2.0.3"
+        "@firebase/util": "0.1.1"
       }
     },
-    "@types/chalk": {
-      "version": "0.4.31",
-      "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz",
-      "integrity": "sha1-ox10JBprHtu5c8822XooloNKUfk=",
+    "@firebase/auth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.2.0.tgz",
+      "integrity": "sha512-02tAnE1KcorVJRjs+xf0AngsRyYRpdZ9yDVHX+J5x2Z9v4qNpp1FPkx3A8hmqznCAgqc4C0EbaxHg0BcUlQsWw==",
       "dev": true
     },
-    "@types/fs-extra": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
-      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
+    "@firebase/database": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.1.2.tgz",
+      "integrity": "sha512-60D08yaQJ6RVegxriC/VNpHE2+/4itTtxBbo15P8WkFfnsjjJVK8AkkFiCjOxj6TccpjzoAz69Xe2/p8po2fEg==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46"
+        "@firebase/util": "0.1.1",
+        "faye-websocket": "0.9.3"
       }
     },
-    "@types/glob": {
-      "version": "5.0.33",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.33.tgz",
-      "integrity": "sha512-BcD4yyWz+qmCggaYMSFF0Xn7GkO6tgwm3Fh9Gxk/kQmEU3Z7flQTnVlMyKBUNvXXNTCCyjqK4XT4/2hLd1gQ2A==",
+    "@firebase/firestore": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.1.2.tgz",
+      "integrity": "sha512-VqPLPKiSy0EzsQfA4w0qYT93KgkiL/NAIS6Ibajuuts2wbz2CBgsZM1nPvgJnaQCN8LPAT/Vvn2th7nMozFHag==",
       "dev": true,
       "requires": {
-        "@types/minimatch": "3.0.1",
-        "@types/node": "7.0.46"
+        "@firebase/webchannel-wrapper": "0.2.3"
       }
     },
-    "@types/gulp": {
-      "version": "3.8.32",
-      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.32.tgz",
-      "integrity": "sha1-g8WcaBzCM9Hsf4LSaVVVZvoTMVY=",
+    "@firebase/messaging": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.1.2.tgz",
+      "integrity": "sha512-fZHhO1FO2RHOVg8A0BhwF+Ay0A34AtMEyjo9csht+TQNEaG924Jkf2tUG13nqRda63tmjT5REeWnGv6qAZU4Jw==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46",
-        "@types/orchestrator": "0.3.0",
-        "@types/vinyl": "2.0.1"
+        "@firebase/util": "0.1.1"
       }
     },
-    "@types/hammerjs": {
-      "version": "2.0.35",
-      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.35.tgz",
-      "integrity": "sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==",
-      "dev": true
-    },
-    "@types/jasmine": {
-      "version": "2.5.45",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.45.tgz",
-      "integrity": "sha1-WJKKYh0BTOarWcWpxBBx9zKLDKk=",
-      "dev": true
-    },
-    "@types/merge2": {
-      "version": "0.3.30",
-      "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-0.3.30.tgz",
-      "integrity": "sha1-njnQT2/k82+nR3VmytH6+AsqZx8=",
+    "@firebase/polyfill": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.1.1.tgz",
+      "integrity": "sha512-XvZzppOmu5NZvWkvxZuWpD5VeMhyhhlrMvyFAwlOeYrJKcBFkIbmSX46Pe5ttuXYp6EjrVia/Bh1h2h0NYgE7g==",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46"
+        "promise-polyfill": "6.0.2"
       }
     },
-    "@types/minimatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz",
-      "integrity": "sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
+    "@firebase/storage": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.1.tgz",
+      "integrity": "sha512-ccnANSW/Sun8/pFssCdOsVQrdyDb/ReKU/P0rbDdU0LvnWkYEckegJrYSoDliHuht19qHSl5C062q82ZxReVRQ==",
       "dev": true
     },
-    "@types/minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
+    "@firebase/util": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.1.tgz",
+      "integrity": "sha512-HtJ3UEecoy2qjoTXwtp0tN4pVR+zH6+pSMtxLHSxgkAAExKsPJUp5W91O6LivjRdiakRwjMZEE9bVPFUCHDhlQ==",
       "dev": true
     },
-    "@types/node": {
-      "version": "7.0.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz",
-      "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==",
+    "@firebase/webchannel-wrapper": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.3.tgz",
+      "integrity": "sha512-EWSvoDVXmUwP1nP65ob1gEGiJi38Pv1e9dmL1DHBcupmYdST1cbYper6N2EVnCkzMIm2/EfZiGSL1nf8V4uiKg==",
       "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=",
+    "@google-cloud/common": {
+      "version": "0.13.6",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+      "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46",
-        "@types/q": "0.0.37"
+        "array-uniq": "1.0.3",
+        "arrify": "1.0.1",
+        "concat-stream": "1.6.0",
+        "create-error-class": "3.0.2",
+        "duplexify": "3.5.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "google-auto-auth": "0.7.2",
+        "is": "3.2.1",
+        "log-driver": "1.2.5",
+        "methmeth": "1.1.0",
+        "modelo": "4.2.0",
+        "request": "2.83.0",
+        "retry-request": "3.1.0",
+        "split-array-stream": "1.0.3",
+        "stream-events": "1.0.2",
+        "string-format-obj": "1.1.0",
+        "through2": "2.0.3"
       }
     },
-    "@types/q": {
-      "version": "0.0.37",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
-      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
-      "dev": true
-    },
-    "@types/run-sequence": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.29.tgz",
-      "integrity": "sha1-atD3ODE24TklMi5p/EHbd7MLIHU=",
-      "dev": true,
-      "requires": {
-        "@types/gulp": "3.8.32",
-        "@types/node": "7.0.46"
-      }
-    },
-    "@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/vinyl": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz",
-      "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
-      "dev": true,
-      "requires": {
-        "@types/node": "7.0.46"
-      }
-    },
-    "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"
-      }
-    },
-    "a-sync-waterfall": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
-      "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=",
-      "dev": true
-    },
-    "abab": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
-      "dev": true
-    },
-    "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
-      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
-      "dev": true,
-      "requires": {
-        "mime-types": "2.1.17",
-        "negotiator": "0.6.1"
-      }
-    },
-    "acorn": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-      "dev": true
-    },
-    "acorn-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
-      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
-      "dev": true,
-      "requires": {
-        "acorn": "2.7.0"
-      }
-    },
-    "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.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "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=",
+    "@google-cloud/common-grpc": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.2.tgz",
+      "integrity": "sha1-jPb7vkGZdueOtuD+aoGXTEYfMaw=",
       "dev": true,
       "requires": {
+        "@google-cloud/common": "0.13.6",
+        "dot-prop": "2.4.0",
+        "duplexify": "3.5.1",
         "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": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-      "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
-      "dev": true,
-      "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "json-schema-traverse": "0.3.1",
-        "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": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
-      "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
-      "dev": true,
-      "requires": {
-        "string-width": "1.0.2"
-      }
-    },
-    "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": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
-      }
-    },
-    "app-module-path": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-1.1.0.tgz",
-      "integrity": "sha1-pqxTaEUPIJufW4bpo+Smq2/nUxw=",
-      "dev": true
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "archiver": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz",
-      "integrity": "sha1-u1cDRomdCGXrd+1mcnqzxjT8GlA=",
-      "dev": true,
-      "requires": {
-        "async": "1.4.2",
-        "buffer-crc32": "0.2.13",
-        "glob": "5.0.15",
-        "lazystream": "0.1.0",
-        "lodash": "3.10.1",
-        "readable-stream": "1.0.34",
-        "tar-stream": "1.2.2",
-        "zip-stream": "0.6.0"
+        "grpc": "1.6.6",
+        "is": "3.2.1",
+        "modelo": "4.2.0",
+        "retry-request": "3.1.0",
+        "through2": "2.0.3"
       },
       "dependencies": {
-        "async": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
-          "integrity": "sha1-bJ7csRztTw3S8tQNsNSaEJwIiqs=",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+        "dot-prop": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
+          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
           "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"
+            "is-obj": "1.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
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "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=",
+        "grpc": {
+          "version": "1.6.6",
+          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
+          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
           "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
-        }
-      }
-    },
-    "archiver-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "lazystream": "1.0.0",
-        "lodash": "4.17.4",
-        "normalize-path": "2.1.1",
-        "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "arguejs": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
-      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
-      "dev": true,
-      "optional": true
-    },
-    "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
-    },
-    "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-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "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-parallel": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
-      "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=",
-      "dev": true
-    },
-    "array-series": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
-      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8=",
-      "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
-    },
-    "as-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz",
-      "integrity": "sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc=",
-      "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
-    },
-    "ascli": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "colour": "0.7.1",
-        "optjs": "3.2.2"
-      }
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "ast-module-types": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.3.2.tgz",
-      "integrity": "sha1-S7HeLXKWeIJEKeIqYo0D6H30rRE=",
-      "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-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": "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.30000733",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "5.2.17",
-        "postcss-value-parser": "3.3.0"
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-      "dev": true
-    },
-    "axe-core": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.1.tgz",
-      "integrity": "sha512-5Pmy37rmZxRqEfQxCs6HMbqKTZx7FI0hKb2vbMgjhHfyobu4jFUhXkL2miB/eujn5kNdgKepWSruq+MAS77yGA==",
-      "dev": true
-    },
-    "axe-webdriverjs": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/axe-webdriverjs/-/axe-webdriverjs-1.1.5.tgz",
-      "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
-      "dev": true,
-      "requires": {
-        "axe-core": "2.4.1"
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "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.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "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": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-      "dev": true
-    },
-    "base64url": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
-      "dev": true
-    },
-    "basic-auth": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
-      "integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
-      "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
-    },
-    "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"
-      }
-    },
-    "binary": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-      "dev": true,
-      "requires": {
-        "buffers": "0.1.1",
-        "chainsaw": "0.1.0"
-      }
-    },
-    "binary-extensions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
-      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
-      "dev": true
-    },
-    "bl": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "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
-    },
-    "body-parser": {
-      "version": "1.17.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
-      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
-      "dev": true,
-      "requires": {
-        "bytes": "2.4.0",
-        "content-type": "1.0.4",
-        "debug": "2.6.7",
-        "depd": "1.1.1",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.15",
-        "on-finished": "2.3.0",
-        "qs": "6.4.0",
-        "raw-body": "2.2.0",
-        "type-is": "1.6.15"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true
-        }
-      }
-    },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "dev": true,
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "boxen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
-      "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
-      "dev": true,
-      "requires": {
-        "ansi-align": "1.1.0",
-        "camelcase": "2.1.1",
-        "chalk": "1.1.3",
-        "cli-boxes": "1.0.0",
-        "filled-array": "1.1.0",
-        "object-assign": "4.1.1",
-        "repeating": "2.0.1",
-        "string-width": "1.0.2",
-        "widest-line": "1.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "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
-        }
-      }
-    },
-    "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.30000733",
-        "electron-to-chromium": "1.3.21"
-      }
-    },
-    "browserstack": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.0.tgz",
-      "integrity": "sha1-tWVCWtYu1ywQgqHrl51TE8fUdU8=",
-      "dev": true,
-      "requires": {
-        "https-proxy-agent": "1.0.0"
-      }
-    },
-    "browserstacktunnel-wrapper": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.1.tgz",
-      "integrity": "sha1-/+GRDW45/oZhgYPoJmkAQa9T7a4=",
-      "dev": true,
-      "requires": {
-        "https-proxy-agent": "1.0.0",
-        "unzip": "0.1.11"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
-      "dev": true
-    },
-    "buffered-spawn": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-1.1.2.tgz",
-      "integrity": "sha1-Ia2XNd+/ZXZ0W+DXSiPvJXvzxY0=",
-      "dev": true,
-      "requires": {
-        "cross-spawn-async": "1.0.1",
-        "err-code": "0.1.2",
-        "q": "1.4.1"
-      }
-    },
-    "buffers": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-      "dev": true
-    },
-    "bufferstreams": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz",
-      "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "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
-    },
-    "bytebuffer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
-      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "long": "3.2.0"
-      }
-    },
-    "bytes": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
-      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
-      "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.2",
-        "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.30000733",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000733.tgz",
-      "integrity": "sha1-OmJbxBx6n5nVnWRVKFfdGvDt2dQ=",
-      "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.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "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"
-      }
-    },
-    "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"
-      }
-    },
-    "chainsaw": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-      "dev": true,
-      "requires": {
-        "traverse": "0.3.9"
-      }
-    },
-    "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": {
-        "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.2",
-        "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"
-      }
-    },
-    "char-spinner": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz",
-      "integrity": "sha1-5upnvSR+EHESmDt6sEee02KAAIE=",
-      "dev": true
-    },
-    "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.2",
-        "async-each": "1.0.1",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
-      }
-    },
-    "chownr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
-      "dev": true
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
-    "cjson": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.3.3.tgz",
-      "integrity": "sha1-qS2ceG5b+bkwgGMp7gXV0yYbSvo=",
-      "dev": true,
-      "requires": {
-        "json-parse-helpfulerror": "1.0.3"
-      }
-    },
-    "clean-css": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
-      "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.7"
-      }
-    },
-    "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": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "1.0.1"
-      }
-    },
-    "cli-spinners": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
-      "dev": true
-    },
-    "cli-table": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-      "dev": true,
-      "requires": {
-        "colors": "1.0.3"
-      }
-    },
-    "cli-table2": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz",
-      "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "colors": "1.1.2",
-        "lodash": "3.10.1",
-        "string-width": "1.0.2"
-      },
-      "dependencies": {
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true,
-          "optional": true
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "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": "2.1.1",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
-      "dev": true
-    },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
-    },
-    "clone-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
-      "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
-      "dev": true,
-      "requires": {
-        "is-regexp": "1.0.0",
-        "is-supported-regexp-flag": "1.0.0"
-      }
-    },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "process-nextick-args": "1.0.7",
-        "through2": "2.0.3"
-      }
-    },
-    "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
-    },
-    "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.3"
-      }
-    },
-    "color-diff": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
-      "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
-      "dev": true
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "colorguard": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
-      "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "color-diff": "0.1.7",
-        "log-symbols": "1.0.2",
-        "object-assign": "4.1.1",
-        "pipetteur": "2.0.3",
-        "plur": "2.1.2",
-        "postcss": "5.2.17",
-        "postcss-reporter": "1.4.1",
-        "text-table": "0.2.0",
-        "yargs": "1.3.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "plur": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-          "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-          "dev": true,
-          "requires": {
-            "irregular-plurals": "1.3.0"
-          }
-        },
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.4",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.17"
-          }
-        },
-        "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
-        },
-        "yargs": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-          "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
-          "dev": true
-        }
-      }
-    },
-    "colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "dev": true
-    },
-    "colour": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
-      "dev": true,
-      "optional": 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
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "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"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
-    "compare-semver": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz",
-      "integrity": "sha1-fAp5onu4C2xplERfgpWCWdPQIVM=",
-      "dev": true,
-      "requires": {
-        "semver": "5.4.1"
-      }
-    },
-    "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
-    },
-    "compress-commons": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz",
-      "integrity": "sha1-lwk+Lhk/dWf6EyA9S43vzVlxpRk=",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "crc32-stream": "0.3.4",
-        "node-int64": "0.4.0",
-        "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
-        }
-      }
-    },
-    "compressible": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz",
-      "integrity": "sha1-FnGKdd4oPtjmBAQWJaIGRYZ5fYo=",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.30.0"
-      }
-    },
-    "compression": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz",
-      "integrity": "sha1-AwyfGY8WQ6BX13anOOki2kNzAS0=",
-      "dev": true,
-      "requires": {
-        "accepts": "1.3.4",
-        "bytes": "2.5.0",
-        "compressible": "2.0.11",
-        "debug": "2.6.8",
-        "on-headers": "1.0.1",
-        "safe-buffer": "5.1.1",
-        "vary": "1.1.1"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz",
-          "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=",
-          "dev": true
-        },
-        "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"
-          }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "configstore": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "4.2.0",
-        "graceful-fs": "4.1.11",
-        "make-dir": "1.0.0",
-        "unique-string": "1.0.0",
-        "write-file-atomic": "2.3.0",
-        "xdg-basedir": "3.0.0"
-      }
-    },
-    "connect": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.4.tgz",
-      "integrity": "sha1-UuoZw4YHMYeEJpKXsCGO0HSgFoc=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.8",
-        "finalhandler": "1.0.5",
-        "parseurl": "1.3.2",
-        "utils-merge": "1.0.1"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "utils-merge": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-          "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-query": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-1.0.0.tgz",
-      "integrity": "sha1-3kT1dyCdokBNH8BGktGkEY5YIRk=",
-      "dev": true,
-      "requires": {
-        "qs": "6.4.0"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "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-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"
-      }
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true,
-      "optional": true
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "content-type-parser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
-      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
-      "dev": true
-    },
-    "conventional-changelog": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.5.tgz",
-      "integrity": "sha512-DUM0iXhgE11uRCoEQnFuYQA5zJcxfvKn940ZFyXziFl0y05yBCoy5ci2fcQYFWQ+OyyxgE2H02EdgYpuz9XG4w==",
-      "dev": true,
-      "requires": {
-        "conventional-changelog-angular": "1.5.0",
-        "conventional-changelog-atom": "0.1.1",
-        "conventional-changelog-codemirror": "0.2.0",
-        "conventional-changelog-core": "1.9.1",
-        "conventional-changelog-ember": "0.2.7",
-        "conventional-changelog-eslint": "0.2.0",
-        "conventional-changelog-express": "0.2.0",
-        "conventional-changelog-jquery": "0.1.0",
-        "conventional-changelog-jscs": "0.1.0",
-        "conventional-changelog-jshint": "0.2.0"
-      }
-    },
-    "conventional-changelog-angular": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz",
-      "integrity": "sha512-Gt0qSf5wdFmLabgdSlqjguDAmPyYTXtUl4WH5W3SlpElHhnU/UiCY3M7xcIkZxrNQfVA1UxUBgu65eBbaJnZVA==",
-      "dev": true,
-      "requires": {
-        "compare-func": "1.3.2",
-        "q": "1.4.1"
-      }
-    },
-    "conventional-changelog-atom": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
-      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
-      "dev": true,
-      "requires": {
-        "q": "1.4.1"
-      }
-    },
-    "conventional-changelog-codemirror": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
-      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
-      "dev": true,
-      "requires": {
-        "q": "1.4.1"
-      }
-    },
-    "conventional-changelog-core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz",
-      "integrity": "sha512-Fo0bSeO+NsO6GtuQXts0xQeRpLrxaABTPU8NK4Zij9sJB3zFkU4BObSefJS4F4+EkKujaKCWtfS6Uih+9NpXrQ==",
-      "dev": true,
-      "requires": {
-        "conventional-changelog-writer": "2.0.1",
-        "conventional-commits-parser": "2.0.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.1",
-        "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.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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-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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        }
-      }
-    },
-    "conventional-changelog-ember": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz",
-      "integrity": "sha512-Xj1v9uVcKM8N798hMr7e6yiw8IFyvI6Ik+TdjdmG54uGupqvEEWW37xAbPPbdKvgoitbyZkqUTancj055actEg==",
-      "dev": true,
-      "requires": {
-        "q": "1.4.1"
-      }
-    },
-    "conventional-changelog-eslint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
-      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
-      "dev": true,
-      "requires": {
-        "q": "1.4.1"
-      }
-    },
-    "conventional-changelog-express": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
-      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
-      "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.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
-      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
-      "dev": true,
-      "requires": {
-        "compare-func": "1.3.2",
-        "q": "1.4.1"
-      }
-    },
-    "conventional-changelog-writer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
-      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
-      "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.4.1",
-        "split": "1.0.1",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "split": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-          "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-          "dev": true,
-          "requires": {
-            "through": "2.3.8"
-          }
-        }
-      }
-    },
-    "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": "2.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
-      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "is-text-path": "1.0.1",
-        "lodash": "4.17.4",
-        "meow": "3.7.0",
-        "split2": "2.1.1",
-        "through2": "2.0.3",
-        "trim-off-newlines": "1.0.1"
-      }
-    },
-    "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
-    },
-    "copy-props": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-1.6.0.tgz",
-      "integrity": "sha1-8DJLvumXcRAeezraES8xPDk9uO0=",
-      "dev": true,
-      "requires": {
-        "each-props": "1.3.1",
-        "is-plain-object": "2.0.4"
-      }
-    },
-    "core-js": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
-    },
-    "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
-    },
-    "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-      "dev": true,
-      "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.10.0",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
-      }
-    },
-    "crc": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
-      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
-      "dev": true
-    },
-    "crc32-stream": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
-      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "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
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.1",
-        "which": "1.3.0"
-      }
-    },
-    "cross-spawn-async": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-1.0.1.tgz",
-      "integrity": "sha1-u1JcHkINmUJVLgR5Gj6y2Yh6EF8=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "2.7.3",
-        "which": "1.3.0"
-      },
-      "dependencies": {
-        "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
-        }
-      }
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "dev": true,
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "dev": true,
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
-      "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
-      "dev": true
-    },
-    "css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-      "dev": true,
-      "requires": {
-        "css-tokenize": "1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "1.2.1",
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "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"
-          },
-          "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"
-              }
-            }
-          }
-        }
-      }
-    },
-    "css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "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
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "dev": true,
-      "requires": {
-        "cssom": "0.3.2"
-      }
-    },
-    "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"
-          }
-        }
-      }
-    },
-    "csv-streamify": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/csv-streamify/-/csv-streamify-3.0.4.tgz",
-      "integrity": "sha1-TLYUxX4/KZzKF7Y/3LStFnd39Ho=",
-      "dev": true,
-      "requires": {
-        "through2": "2.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": {
-          "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"
-          }
-        }
-      }
-    },
-    "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
-    },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "0.10.30"
-      }
-    },
-    "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"
-      }
-    },
-    "dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
-    },
-    "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"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-response": "1.0.0"
-      }
-    },
-    "deep-equal": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
-      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
-      "dev": true,
-      "optional": 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
-        }
-      }
-    },
-    "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.1",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-      "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
-    },
-    "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"
-      }
-    },
-    "detective-amd": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-2.4.0.tgz",
-      "integrity": "sha1-XrDfTvXBipQDOwfa8TbbzV/HXNU=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "escodegen": "1.9.0",
-        "get-amd-module-type": "2.0.5",
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "detective-cjs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-2.0.0.tgz",
-      "integrity": "sha1-3OTJMCzcpS5ri/04d8qT9ixczAM=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "detective-es6": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-1.2.0.tgz",
-      "integrity": "sha1-a5s71Uf9jyH4lQL2JuRe0qMnb9w=",
-      "dev": true,
-      "requires": {
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "detective-less": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.0.tgz",
-      "integrity": "sha1-Qmx4yatuMnW/ZsyRq6wAU7tFLX0=",
-      "dev": true,
-      "requires": {
-        "debug": "2.2.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.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
-        }
-      }
-    },
-    "detective-sass": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-2.0.0.tgz",
-      "integrity": "sha1-CvGKxjnIw26dN9sadOK/hJ8KVI4=",
-      "dev": true,
-      "requires": {
-        "debug": "2.2.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.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
-        }
-      }
-    },
-    "detective-scss": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-1.0.0.tgz",
-      "integrity": "sha1-owEFIV5fy8JhMuPGuVyNgpkYWJE=",
-      "dev": true,
-      "requires": {
-        "debug": "2.2.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.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
-        }
-      }
-    },
-    "detective-stylus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz",
-      "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
-      "dev": true
-    },
-    "detective-typescript": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-1.0.1.tgz",
-      "integrity": "sha512-4DZpsap+dVzQblcL/ffVXtaXtA7byrP14XQnvyAvwo8+z7/C0OrwLNQhyiC6cLZlzy2T8QuPc+mDsYsa4lAxHw==",
-      "dev": true,
-      "requires": {
-        "node-source-walk": "3.2.0",
-        "typescript": "2.0.10",
-        "typescript-eslint-parser": "1.0.2"
-      },
-      "dependencies": {
-        "babylon": {
-          "version": "6.8.4",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.4.tgz",
-          "integrity": "sha1-CXMGuNq66VFZIlzymz6lWRIFMYA=",
-          "dev": true,
-          "requires": {
-            "babel-runtime": "6.26.0"
-          }
-        },
-        "node-source-walk": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.2.0.tgz",
-          "integrity": "sha1-PGBcxTq97ktFq2XpR9+x23yQ8OM=",
-          "dev": true,
-          "requires": {
-            "babylon": "6.8.4"
-          }
-        },
-        "typescript": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz",
-          "integrity": "sha1-zN1O2G/VVQpAcQGggUAS4bP6w90=",
-          "dev": true
-        }
-      }
-    },
-    "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.22.0",
-      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.22.0.tgz",
-      "integrity": "sha1-ftB6+QdPZUeEclbBpltIiloXrQM=",
-      "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.1.2",
-        "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": "3.0.1",
-        "semver": "5.4.1",
-        "shelljs": "0.7.8",
-        "source-map-support": "0.4.18",
-        "spdx-license-list": "2.1.0",
-        "stringmap": "0.2.2",
-        "typescript": "2.4.2"
-      }
-    },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "didyoumean": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
-      "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=",
-      "dev": true
-    },
-    "diff": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
-      "dev": true
-    },
-    "doiuse": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
-      "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000733",
-        "css-rule-stream": "1.1.0",
-        "duplexer2": "0.0.2",
-        "jsonfilter": "1.1.2",
-        "ldjson-stream": "1.2.1",
-        "lodash": "4.17.4",
-        "multimatch": "2.1.0",
-        "postcss": "5.2.17",
-        "source-map": "0.4.4",
-        "through2": "0.6.5",
-        "yargs": "3.32.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          },
-          "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"
-              }
-            }
-          }
-        }
-      }
-    },
-    "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
-        }
-      }
-    },
-    "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.2"
-      }
-    },
-    "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-      "dev": true,
-      "requires": {
-        "is-obj": "1.0.1"
-      }
-    },
-    "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.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"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true,
-      "optional": true
-    },
-    "duplexify": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "1.4.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "stream-shift": "1.0.0"
-      }
-    },
-    "each-props": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.1.tgz",
-      "integrity": "sha1-/BOPUeOid0KG1IWOAtbn3kYt4Vg=",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "2.0.4",
-        "object.defaults": "1.1.0"
-      }
-    },
-    "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"
-      }
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-      "dev": true,
-      "requires": {
-        "base64url": "2.0.0",
-        "safe-buffer": "5.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.21",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz",
-      "integrity": "sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI=",
-      "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": "1.4.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "engine.io": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
-      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
-      "dev": true,
-      "requires": {
-        "accepts": "1.3.3",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "ws": "1.1.2"
-      },
-      "dependencies": {
-        "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.17",
-            "negotiator": "0.6.1"
-          }
-        },
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
-      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parsejson": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "1.1.2",
-        "xmlhttprequest-ssl": "1.5.3",
-        "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
-      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
-      "dev": true,
-      "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "0.0.6",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.4",
-        "has-binary": "0.1.7",
-        "wtf-8": "1.0.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz",
-      "integrity": "sha1-3xTAa1/F7sreEJTJxaErSz7cC2I=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.4.1",
-        "object-assign": "4.1.1",
-        "tapable": "0.2.8"
-      }
-    },
-    "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
-    },
-    "err-code": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-0.1.2.tgz",
-      "integrity": "sha1-EiqSszQrmJnaArWsmU0w+V1HY+4=",
-      "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-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.4",
-        "escape-html": "1.0.3"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.30",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz",
-      "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
-      "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.30",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
-      "dev": true
-    },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.30",
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.30"
-      }
-    },
-    "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.9.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
-      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
-      "dev": true,
-      "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        }
-      }
-    },
-    "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
-    },
-    "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.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.30"
-      }
-    },
-    "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"
-      }
-    },
-    "eventemitter3": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
-      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
-      "dev": true
-    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "optional": 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"
-      },
-      "dependencies": {
-        "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,
-          "optional": true,
-          "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
-          }
-        }
-      }
-    },
-    "execall": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
-      "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
-      "dev": true,
-      "requires": {
-        "clone-regexp": "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
-    },
-    "exit-code": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/exit-code/-/exit-code-1.0.2.tgz",
-      "integrity": "sha1-zhZYEcnxF69qX4gpQLlq5/muzDQ=",
-      "dev": true
-    },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "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.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
-      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "accepts": "1.3.4",
-        "array-flatten": "1.1.1",
-        "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.8",
-        "depd": "1.1.1",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "finalhandler": "1.0.5",
-        "fresh": "0.5.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "1.1.5",
-        "qs": "6.5.0",
-        "range-parser": "1.2.0",
-        "send": "0.15.4",
-        "serve-static": "1.12.4",
-        "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.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "qs": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
-          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "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.2",
-        "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
-    },
-    "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.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "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"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-      "dev": true
-    },
-    "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
-    },
-    "fast-url-parser": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
-      "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "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.7.0"
-      }
-    },
-    "figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "1.0.5",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "1.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-exists": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-1.0.0.tgz",
-      "integrity": "sha1-5tJptWVnuJIlgTmOmQ3XB49y1hY=",
-      "dev": true
-    },
-    "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
-    },
-    "filesize": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz",
-      "integrity": "sha1-/I+iPdtO+eXgq24eZPZ5okpWdh8=",
-      "dev": true
-    },
-    "filing-cabinet": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-1.9.0.tgz",
-      "integrity": "sha1-BDyvGSXjVbA6jVCW9AhNP0AwCLY=",
-      "dev": true,
-      "requires": {
-        "app-module-path": "1.1.0",
-        "commander": "2.11.0",
-        "debug": "2.6.7",
-        "enhanced-resolve": "3.0.3",
-        "is-relative-path": "1.0.2",
-        "module-definition": "2.2.4",
-        "module-lookup-amd": "4.0.4",
-        "object-assign": "4.1.1",
-        "resolve": "1.4.0",
-        "resolve-dependency-path": "1.0.2",
-        "sass-lookup": "1.1.0",
-        "stylus-lookup": "1.0.1",
-        "typescript": "2.4.2"
-      }
-    },
-    "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"
-      }
-    },
-    "filled-array": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
-      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
-      "dev": true
-    },
-    "finalhandler": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.5.tgz",
-      "integrity": "sha1-pwEwPSV6G8gv6lR6M+WuiVMXI98=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.8",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
-    "find": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/find/-/find-0.2.6.tgz",
-      "integrity": "sha1-DSGLXUjDQkGT9kzqWdOJ+NqnHQE=",
-      "dev": true,
-      "requires": {
-        "traverse-chain": "0.1.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": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "locate-path": "2.0.0"
-      }
-    },
-    "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"
-      }
-    },
-    "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.3.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"
-          }
-        }
-      }
-    },
-    "firebase": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.3.1.tgz",
-      "integrity": "sha1-DmEy7iKvMjs1DQO26xaAuxpvnuY=",
-      "dev": true,
-      "requires": {
-        "dom-storage": "2.0.2",
-        "faye-websocket": "0.9.3",
-        "jsonwebtoken": "7.4.3",
-        "promise-polyfill": "6.0.2",
-        "xmlhttprequest": "1.8.0"
-      },
-      "dependencies": {
-        "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
-          "dev": true
-        },
-        "buffer-equal-constant-time": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
-          "dev": true
-        },
-        "dom-storage": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
-          "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
-          "dev": true
-        },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-          "dev": true,
-          "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "faye-websocket": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-          "dev": true,
-          "requires": {
-            "websocket-driver": "0.6.5"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-          "dev": true
-        },
-        "http-parser-js": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.6.tgz",
-          "integrity": "sha1-GVJz9YcExFLWcQdr4gEyndNB3FU="
-        },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
-          "dev": true
-        },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
-          }
-        },
-        "jsonwebtoken": {
-          "version": "7.4.3",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
-          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
-          "dev": true,
-          "requires": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "2.0.0",
-            "xtend": "4.0.1"
-          }
-        },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-          "dev": true,
-          "requires": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-          "dev": true,
-          "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
-          "dev": true
-        },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "promise-polyfill": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
-          "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=",
-          "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
-        },
-        "topo": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "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
-        },
-        "xmlhttprequest": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-          "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
-          "dev": true
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
-      }
-    },
-    "firebase-admin": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.2.1.tgz",
-      "integrity": "sha1-HHMt3cjBzo4C12xoLOosVQ7WWkc=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/storage": "1.2.1",
-        "@types/jsonwebtoken": "7.2.3",
-        "faye-websocket": "0.9.3",
-        "jsonwebtoken": "7.1.9",
-        "node-forge": "0.7.1"
-      },
-      "dependencies": {
-        "@google-cloud/common": {
-          "version": "0.13.4",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.4.tgz",
-          "integrity": "sha1-dbt/YJMc/J2U2gtdQIlQ0Lvw6Xk=",
-          "requires": {
-            "array-uniq": "1.0.3",
-            "arrify": "1.0.1",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "ent": "2.2.0",
-            "extend": "3.0.1",
-            "google-auto-auth": "0.7.1",
-            "is": "3.2.1",
-            "log-driver": "1.2.5",
-            "methmeth": "1.1.0",
-            "modelo": "4.2.0",
-            "request": "2.81.0",
-            "retry-request": "2.0.5",
-            "split-array-stream": "1.0.3",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
-          }
-        },
-        "@google-cloud/common-grpc": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.1.tgz",
-          "integrity": "sha1-CSZGB++4k0MJr/1jhJmG+7gPkhg=",
-          "requires": {
-            "@google-cloud/common": "0.13.4",
-            "dot-prop": "4.2.0",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "grpc": "1.6.6",
-            "is": "3.2.1",
-            "modelo": "4.2.0",
-            "retry-request": "2.0.5",
-            "through2": "2.0.3"
-          }
-        },
-        "@google-cloud/firestore": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
-          "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
-          "requires": {
-            "@google-cloud/common": "0.13.4",
-            "@google-cloud/common-grpc": "0.4.1",
-            "bun": "0.0.12",
-            "extend": "3.0.1",
-            "functional-red-black-tree": "1.0.1",
-            "google-gax": "0.14.1",
-            "grpc": "1.6.6",
-            "is": "3.2.1",
-            "through2": "2.0.3"
-          }
-        },
-        "@google-cloud/storage": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
-          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
-          "dev": true,
-          "requires": {
-            "@google-cloud/common": "0.13.4",
-            "arrify": "1.0.1",
-            "async": "2.5.0",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "gcs-resumable-upload": "0.8.1",
-            "hash-stream-validation": "0.2.1",
-            "is": "3.2.1",
-            "mime-types": "2.1.16",
-            "once": "1.4.0",
-            "pumpify": "1.3.5",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
-          }
-        },
-        "@protobufjs/aspromise": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-          "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
-        },
-        "@protobufjs/base64": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-          "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
-        },
-        "@protobufjs/codegen": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-          "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-        },
-        "@protobufjs/eventemitter": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-          "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
-        },
-        "@protobufjs/fetch": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-          "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
-          "requires": {
-            "@protobufjs/aspromise": "1.1.2",
-            "@protobufjs/inquire": "1.1.0"
-          }
-        },
-        "@protobufjs/float": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-          "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
-        },
-        "@protobufjs/inquire": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-          "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
-        },
-        "@protobufjs/path": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-          "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
-        },
-        "@protobufjs/pool": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-          "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
-        },
-        "@protobufjs/utf8": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-          "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
-        },
-        "@types/google-cloud__storage": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
-          "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
-          "requires": {
-            "@types/node": "8.0.22"
-          }
-        },
-        "@types/jsonwebtoken": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
-          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
-          "dev": true,
-          "requires": {
-            "@types/node": "8.0.22"
-          }
-        },
-        "@types/long": {
-          "version": "3.0.32",
-          "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
-          "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA=="
-        },
-        "@types/node": {
-          "version": "8.0.22",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.22.tgz",
-          "integrity": "sha512-+YQ5JLlvLP24teVUdUDep83mAWIFoAnOMosrH/2+xDeU9YMUpmMJtYOqVtbivs37h2PL9svz0R3r/MfVuEvEIA=="
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "arguejs": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
-          "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc="
-        },
-        "array-union": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-          "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="
-        },
-        "arrify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-        },
-        "ascli": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-          "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
-          "requires": {
-            "colour": "0.7.1",
-            "optjs": "3.2.2"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-        },
-        "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="
-        },
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-          "requires": {
-            "lodash": "4.17.4"
-          }
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
-        "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-          "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-          "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-equal": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-          "dev": true
-        },
-        "buffer-equal-constant-time": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-        },
-        "bun": {
-          "version": "0.0.12",
-          "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
-          "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
-          "requires": {
-            "readable-stream": "1.0.34"
+            "arguejs": "0.2.3",
+            "lodash": "4.17.4",
+            "nan": "2.7.0",
+            "node-pre-gyp": "0.6.38",
+            "protobufjs": "5.0.2"
           },
           "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+              "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"
+              }
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+              "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"
+              }
+            },
+            "asn1": {
+              "version": "0.2.3",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+              "dev": true
+            },
+            "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
+            },
+            "asynckit": {
+              "version": "0.4.0",
+              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+              "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
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+              "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "caseless": {
+              "version": "0.12.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+              "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
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "extend": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+              "dev": true
+            },
+            "extsprintf": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+              "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
+            },
+            "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.17"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+              "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.2"
+              }
+            },
+            "fstream-ignore": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+              "dev": true,
+              "requires": {
+                "fstream": "1.0.11",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4"
+              }
+            },
+            "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.2.0",
+                "console-control-strings": "1.1.0",
+                "has-unicode": "2.0.1",
+                "object-assign": "4.1.1",
+                "signal-exit": "3.0.2",
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wide-align": "1.1.2"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "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"
+              }
+            },
+            "graceful-fs": {
+              "version": "4.1.11",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+              "dev": true
+            },
+            "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": "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"
+              }
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            },
+            "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.1",
+                "sshpk": "1.13.1"
+              }
+            },
+            "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
+            },
+            "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-typedarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+              "dev": true
+            },
             "isarray": {
-              "version": "0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-              "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+              "dev": true
+            },
+            "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
+            },
+            "jsbn": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+              "dev": true,
+              "optional": 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
+            },
+            "jsonify": {
+              "version": "0.0.0",
+              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+              "dev": true
+            },
+            "jsprim": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+              "dev": true,
+              "requires": {
+                "assert-plus": "1.0.0",
+                "extsprintf": "1.3.0",
+                "json-schema": "0.2.3",
+                "verror": "1.10.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
+                }
+              }
+            },
+            "mime-db": {
+              "version": "1.30.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+              "dev": true
+            },
+            "mime-types": {
+              "version": "2.1.17",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+              "dev": true,
+              "requires": {
+                "mime-db": "1.30.0"
+              }
+            },
+            "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=",
+              "dev": true
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "dev": true,
+              "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=",
+                  "dev": true
+                }
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            },
+            "node-pre-gyp": {
+              "version": "0.6.38",
+              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
+              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
+              "dev": true,
+              "requires": {
+                "hawk": "3.1.3",
+                "mkdirp": "0.5.1",
+                "nopt": "4.0.1",
+                "npmlog": "4.1.2",
+                "rc": "1.2.1",
+                "request": "2.81.0",
+                "rimraf": "2.6.2",
+                "semver": "5.4.1",
+                "tar": "2.2.1",
+                "tar-pack": "3.4.0"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "dev": true,
+              "requires": {
+                "abbrev": "1.1.1",
+                "osenv": "0.1.4"
+              }
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "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-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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "punycode": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+              "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
+            },
+            "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"
+              }
             },
             "readable-stream": {
-              "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "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": "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="
-            }
-          }
-        },
-        "bytebuffer": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
-          "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
-          "requires": {
-            "long": "3.2.0"
-          }
-        },
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
-        },
-        "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="
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wrap-ansi": "2.1.0"
-          }
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-        },
-        "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="
-        },
-        "colour": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-          "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
-        "concat-stream": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-          "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-          "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.3",
-            "typedarray": "0.0.6"
-          }
-        },
-        "configstore": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "4.2.0",
-            "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"
-          }
-        },
-        "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="
-        },
-        "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=",
-          "requires": {
-            "capture-stack-trace": "1.0.0"
-          }
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-          "requires": {
-            "boom": "2.10.1"
-          },
-          "dependencies": {
-            "boom": {
-              "version": "2.10.1",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-              "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+                "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"
+              }
+            },
+            "request": {
+              "version": "2.81.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+              "dev": true,
               "requires": {
-                "hoek": "2.16.3"
+                "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.17",
+                "oauth-sign": "0.8.2",
+                "performance-now": "0.2.0",
+                "qs": "6.4.0",
+                "safe-buffer": "5.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.3",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+              "dev": true,
+              "requires": {
+                "glob": "7.1.2"
+              }
+            },
+            "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
+            },
+            "semver": {
+              "version": "5.4.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+              "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
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+              "dev": true
+            },
+            "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"
               }
-            }
-          }
-        },
-        "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
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-          "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="
-            }
-          }
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-        },
-        "dot-prop": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-          "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-          "requires": {
-            "is-obj": "1.0.1"
-          }
-        },
-        "duplexify": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
-          "requires": {
-            "end-of-stream": "1.4.0",
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.3",
-            "stream-shift": "1.0.0"
-          }
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-          "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-          "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "end-of-stream": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-          "requires": {
-            "once": "1.4.0"
-          }
-        },
-        "ent": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
-        },
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-        },
-        "extsprintf": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-        },
-        "fast-deep-equal": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
-        },
-        "faye-websocket": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-          "dev": true,
-          "requires": {
-            "websocket-driver": "0.6.5"
-          }
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-          "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.16"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "functional-red-black-tree": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-        },
-        "gcp-metadata": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.2.0.tgz",
-          "integrity": "sha1-Ytr8pl86YxvIzi7Dt3Zh9fk4ego=",
-          "requires": {
-            "extend": "3.0.1",
-            "retry-request": "2.0.5"
-          }
-        },
-        "gcs-resumable-upload": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.1.tgz",
-          "integrity": "sha512-Ps/yvSzdNL41oiRzSE8UgjcW8hdNQNyMqdsDSmCAn+fwWG8Sg5TR2CqSPchkMiYQQDqN7WWkheTEd0w1hfn/dw==",
-          "dev": true,
-          "requires": {
-            "buffer-equal": "1.0.0",
-            "configstore": "3.1.1",
-            "google-auto-auth": "0.7.1",
-            "pumpify": "1.3.5",
-            "request": "2.81.0",
-            "stream-events": "1.0.2",
-            "through2": "2.0.3"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-          "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="
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "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"
-          }
-        },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "google-auth-library": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-          "requires": {
-            "gtoken": "1.2.2",
-            "jws": "3.1.4",
-            "lodash.noop": "3.0.1",
-            "request": "2.81.0"
-          }
-        },
-        "google-auto-auth": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.1.tgz",
-          "integrity": "sha1-yCYERJEt2M7szYOHYdVvRik3vQI=",
-          "requires": {
-            "async": "2.5.0",
-            "gcp-metadata": "0.2.0",
-            "google-auth-library": "0.10.0",
-            "request": "2.81.0"
-          }
-        },
-        "google-gax": {
-          "version": "0.14.1",
-          "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.1.tgz",
-          "integrity": "sha1-/oj7nVAw0mJ3xjUIp5r3s3F54Tk=",
-          "requires": {
-            "extend": "3.0.1",
-            "globby": "6.1.0",
-            "google-auto-auth": "0.5.4",
-            "google-proto-files": "0.13.1",
-            "grpc": "1.6.6",
-            "is-stream-ended": "0.1.3",
-            "lodash": "4.17.4",
-            "process-nextick-args": "1.0.7",
-            "protobufjs": "6.8.0",
-            "readable-stream": "2.3.3",
-            "through2": "2.0.3"
-          },
-          "dependencies": {
-            "@types/node": {
-              "version": "7.0.43",
-              "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
-              "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ=="
             },
-            "google-auto-auth": {
-              "version": "0.5.4",
-              "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.5.4.tgz",
-              "integrity": "sha1-HYbHko1jPnWpwasDSlJ+/M5KQLE=",
+            "sshpk": {
+              "version": "1.13.1",
+              "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+              "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+              "dev": true,
               "requires": {
-                "async": "2.5.0",
-                "google-auth-library": "0.10.0",
-                "object-assign": "3.0.0",
-                "request": "2.81.0"
+                "asn1": "0.2.3",
+                "assert-plus": "1.0.0",
+                "bcrypt-pbkdf": "1.0.1",
+                "dashdash": "1.14.1",
+                "ecc-jsbn": "0.1.1",
+                "getpass": "0.1.7",
+                "jsbn": "0.1.1",
+                "tweetnacl": "0.14.5"
+              },
+              "dependencies": {
+                "assert-plus": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                  "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="
+            "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-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"
+              }
+            },
+            "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-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
+            },
+            "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"
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "dev": true,
+              "requires": {
+                "debug": "2.6.9",
+                "fstream": "1.0.11",
+                "fstream-ignore": "1.0.5",
+                "once": "1.4.0",
+                "readable-stream": "2.3.3",
+                "rimraf": "2.6.2",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              }
+            },
+            "tough-cookie": {
+              "version": "2.3.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+              "dev": true,
+              "requires": {
+                "punycode": "1.4.1"
+              }
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "uid-number": {
+              "version": "0.0.6",
+              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+              "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
+            },
+            "uuid": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+              "dev": true
+            },
+            "verror": {
+              "version": "1.10.0",
+              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+              "dev": true,
+              "requires": {
+                "assert-plus": "1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "1.3.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
+                }
+              }
             },
-            "protobufjs": {
-              "version": "6.8.0",
-              "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
-              "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+            "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": {
-                "@protobufjs/aspromise": "1.1.2",
-                "@protobufjs/base64": "1.1.2",
-                "@protobufjs/codegen": "2.0.4",
-                "@protobufjs/eventemitter": "1.1.0",
-                "@protobufjs/fetch": "1.1.0",
-                "@protobufjs/float": "1.0.2",
-                "@protobufjs/inquire": "1.1.0",
-                "@protobufjs/path": "1.1.2",
-                "@protobufjs/pool": "1.1.0",
-                "@protobufjs/utf8": "1.1.0",
-                "@types/long": "3.0.32",
-                "@types/node": "7.0.43",
-                "long": "3.2.0"
+                "string-width": "1.0.2"
               }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+              "dev": true
             }
           }
-        },
-        "google-p12-pem": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-          "requires": {
-            "node-forge": "0.7.1"
-          }
-        },
-        "google-proto-files": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
-          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g=="
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        },
+        }
+      }
+    },
+    "@google-cloud/firestore": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
+      "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
+      "dev": true,
+      "requires": {
+        "@google-cloud/common": "0.13.6",
+        "@google-cloud/common-grpc": "0.4.2",
+        "bun": "0.0.12",
+        "extend": "3.0.1",
+        "functional-red-black-tree": "1.0.1",
+        "google-gax": "0.14.2",
+        "grpc": "1.6.6",
+        "is": "3.2.1",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
         "grpc": {
           "version": "1.6.6",
           "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
           "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
+          "dev": true,
           "requires": {
             "arguejs": "0.2.3",
             "lodash": "4.17.4",
@@ -5090,12 +1221,14 @@
             "abbrev": {
               "version": "1.1.1",
               "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+              "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"
@@ -5104,17 +1237,20 @@
             "ansi-regex": {
               "version": "2.1.1",
               "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
               "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+              "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"
@@ -5123,37 +1259,44 @@
             "asn1": {
               "version": "0.2.3",
               "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+              "dev": true
             },
             "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="
+              "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+              "dev": true
             },
             "asynckit": {
               "version": "0.4.0",
               "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+              "dev": true
             },
             "aws-sign2": {
               "version": "0.6.0",
               "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-              "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+              "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="
+              "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+              "dev": true
             },
             "balanced-match": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+              "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"
@@ -5163,6 +1306,7 @@
               "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"
               }
@@ -5171,6 +1315,7 @@
               "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"
               }
@@ -5179,6 +1324,7 @@
               "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"
@@ -5187,22 +1333,26 @@
             "caseless": {
               "version": "0.12.0",
               "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+              "dev": true
             },
             "co": {
               "version": "4.6.0",
               "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-              "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+              "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="
+              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+              "dev": true
             },
             "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"
               }
@@ -5210,22 +1360,26 @@
             "concat-map": {
               "version": "0.0.1",
               "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-              "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+              "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+              "dev": true
             },
             "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="
+              "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+              "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="
+              "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+              "dev": true
             },
             "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"
               }
@@ -5234,6 +1388,7 @@
               "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"
               },
@@ -5241,7 +1396,8 @@
                 "assert-plus": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                  "dev": true
                 }
               }
             },
@@ -5249,6 +1405,7 @@
               "version": "2.6.9",
               "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
               "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
               "requires": {
                 "ms": "2.0.0"
               }
@@ -5256,22 +1413,26 @@
             "deep-extend": {
               "version": "0.4.2",
               "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-              "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+              "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+              "dev": true
             },
             "delayed-stream": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-              "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+              "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="
+              "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+              "dev": true
             },
             "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"
@@ -5280,22 +1441,26 @@
             "extend": {
               "version": "3.0.1",
               "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+              "dev": true
             },
             "extsprintf": {
               "version": "1.3.0",
               "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+              "dev": true
             },
             "forever-agent": {
               "version": "0.6.1",
               "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-              "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+              "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+              "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",
@@ -5305,12 +1470,14 @@
             "fs.realpath": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+              "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",
@@ -5322,6 +1489,7 @@
               "version": "1.0.5",
               "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
               "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+              "dev": true,
               "requires": {
                 "fstream": "1.0.11",
                 "inherits": "2.0.3",
@@ -5332,6 +1500,7 @@
               "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.2.0",
                 "console-control-strings": "1.1.0",
@@ -5347,6 +1516,7 @@
               "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"
               },
@@ -5354,7 +1524,8 @@
                 "assert-plus": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                  "dev": true
                 }
               }
             },
@@ -5362,6 +1533,7 @@
               "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",
@@ -5374,17 +1546,20 @@
             "graceful-fs": {
               "version": "4.1.11",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+              "dev": true
             },
             "har-schema": {
               "version": "1.0.5",
               "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-              "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
+              "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+              "dev": true
             },
             "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"
@@ -5393,12 +1568,14 @@
             "has-unicode": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-              "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+              "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+              "dev": true
             },
             "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",
@@ -5409,12 +1586,14 @@
             "hoek": {
               "version": "2.16.3",
               "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
             },
             "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.1",
@@ -5425,6 +1604,7 @@
               "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"
@@ -5433,17 +1613,20 @@
             "inherits": {
               "version": "2.0.3",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-              "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+              "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="
+              "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+              "dev": true
             },
             "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"
               }
@@ -5451,33 +1634,39 @@
             "is-typedarray": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+              "dev": true
             },
             "isarray": {
               "version": "1.0.0",
               "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+              "dev": true
             },
             "isstream": {
               "version": "0.1.2",
               "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-              "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+              "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+              "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
             },
             "json-schema": {
               "version": "0.2.3",
               "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-              "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+              "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"
               }
@@ -5485,17 +1674,20 @@
             "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="
+              "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+              "dev": true
             },
             "jsonify": {
               "version": "0.0.0",
               "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+              "dev": true
             },
             "jsprim": {
               "version": "1.4.1",
               "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
               "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+              "dev": true,
               "requires": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
@@ -5506,19 +1698,22 @@
                 "assert-plus": {
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                  "dev": true
                 }
               }
             },
             "mime-db": {
               "version": "1.30.0",
               "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+              "dev": true
             },
             "mime-types": {
               "version": "2.1.17",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
               "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+              "dev": true,
               "requires": {
                 "mime-db": "1.30.0"
               }
@@ -5527,6 +1722,7 @@
               "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"
               }
@@ -5534,12 +1730,14 @@
             "minimist": {
               "version": "1.2.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "dev": true
             },
             "mkdirp": {
               "version": "0.5.1",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "dev": true,
               "requires": {
                 "minimist": "0.0.8"
               },
@@ -5547,19 +1745,22 @@
                 "minimist": {
                   "version": "0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                  "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+                  "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+                  "dev": true
                 }
               }
             },
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
             },
             "node-pre-gyp": {
               "version": "0.6.38",
               "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
               "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
+              "dev": true,
               "requires": {
                 "hawk": "3.1.3",
                 "mkdirp": "0.5.1",
@@ -5577,6 +1778,7 @@
               "version": "4.0.1",
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
               "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "dev": true,
               "requires": {
                 "abbrev": "1.1.1",
                 "osenv": "0.1.4"
@@ -5586,6 +1788,7 @@
               "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",
@@ -5596,1435 +1799,7241 @@
             "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="
+              "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+              "dev": true
             },
             "oauth-sign": {
               "version": "0.8.2",
               "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-              "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+              "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="
+              "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+              "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"
+              }
+            },
+            "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-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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "punycode": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+              "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
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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.17",
+                "oauth-sign": "0.8.2",
+                "performance-now": "0.2.0",
+                "qs": "6.4.0",
+                "safe-buffer": "5.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.3",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+              "dev": true,
+              "requires": {
+                "glob": "7.1.2"
+              }
+            },
+            "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
+            },
+            "semver": {
+              "version": "5.4.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+              "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
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+              "dev": true
+            },
+            "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"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "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-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"
+              }
+            },
+            "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-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
+            },
+            "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"
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "dev": true,
+              "requires": {
+                "debug": "2.6.9",
+                "fstream": "1.0.11",
+                "fstream-ignore": "1.0.5",
+                "once": "1.4.0",
+                "readable-stream": "2.3.3",
+                "rimraf": "2.6.2",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              }
+            },
+            "tough-cookie": {
+              "version": "2.3.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+              "dev": true,
+              "requires": {
+                "punycode": "1.4.1"
+              }
+            },
+            "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": {
-                "wrappy": "1.0.2"
+                "safe-buffer": "5.1.1"
               }
             },
-            "os-homedir": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-              "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+            "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
             },
-            "os-tmpdir": {
+            "uid-number": {
+              "version": "0.0.6",
+              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+              "dev": true
+            },
+            "util-deprecate": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-              "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+              "dev": true
             },
-            "osenv": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-              "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+            "uuid": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+              "dev": true
+            },
+            "verror": {
+              "version": "1.10.0",
+              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+              "dev": true,
               "requires": {
-                "os-homedir": "1.0.2",
-                "os-tmpdir": "1.0.2"
+                "assert-plus": "1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "1.3.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
+                }
               }
             },
-            "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="
-            },
-            "performance-now": {
-              "version": "0.2.0",
-              "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-              "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
-            },
-            "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="
-            },
-            "punycode": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+            "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"
+              }
             },
-            "qs": {
-              "version": "6.4.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-              "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+            "wrappy": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "@google-cloud/functions-emulator": {
+      "version": "1.0.0-alpha.25",
+      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
+      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@google-cloud/storage": "1.2.1",
+        "adm-zip": "0.4.7",
+        "ajv": "5.2.2",
+        "body-parser": "1.17.2",
+        "cli-table2": "0.2.0",
+        "colors": "1.1.2",
+        "configstore": "3.1.1",
+        "express": "4.15.4",
+        "google-proto-files": "0.12.1",
+        "googleapis": "20.1.0",
+        "got": "7.1.0",
+        "grpc": "1.4.1",
+        "http-proxy": "1.16.2",
+        "lodash": "4.17.4",
+        "prompt": "1.0.0",
+        "rimraf": "2.6.1",
+        "semver": "5.4.1",
+        "serializerr": "1.0.3",
+        "tmp": "0.0.33",
+        "uuid": "3.1.0",
+        "winston": "2.3.1",
+        "yargs": "8.0.2"
+      },
+      "dependencies": {
+        "@google-cloud/storage": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@google-cloud/common": "0.13.6",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
+        "ajv": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "optional": 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,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "winston": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
+          "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
+          "dev": true,
+          "optional": 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,
+              "optional": true
             },
-            "rc": {
-              "version": "1.2.1",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-              "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+            "colors": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
+          }
+        }
+      }
+    },
+    "@google-cloud/storage": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
+      "integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
+      "dev": true,
+      "requires": {
+        "@google-cloud/common": "0.13.6",
+        "arrify": "1.0.1",
+        "async": "2.5.0",
+        "concat-stream": "1.6.0",
+        "create-error-class": "3.0.2",
+        "duplexify": "3.5.1",
+        "extend": "3.0.1",
+        "gcs-resumable-upload": "0.8.2",
+        "hash-stream-validation": "0.2.1",
+        "is": "3.2.1",
+        "mime-types": "2.1.17",
+        "once": "1.4.0",
+        "pumpify": "1.3.5",
+        "safe-buffer": "5.1.1",
+        "snakeize": "0.1.0",
+        "stream-events": "1.0.2",
+        "string-format-obj": "1.1.0",
+        "through2": "2.0.3"
+      }
+    },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
+      "dev": true
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "dev": true
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+      "dev": true
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
+      "dev": true
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+      "dev": true,
+      "requires": {
+        "@protobufjs/aspromise": "1.1.2",
+        "@protobufjs/inquire": "1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
+      "dev": true
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
+      "dev": true
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
+      "dev": true
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
+      "dev": true
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
+      "dev": true
+    },
+    "@types/chalk": {
+      "version": "0.4.31",
+      "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz",
+      "integrity": "sha1-ox10JBprHtu5c8822XooloNKUfk=",
+      "dev": true
+    },
+    "@types/fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "@types/glob": {
+      "version": "5.0.33",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.33.tgz",
+      "integrity": "sha512-BcD4yyWz+qmCggaYMSFF0Xn7GkO6tgwm3Fh9Gxk/kQmEU3Z7flQTnVlMyKBUNvXXNTCCyjqK4XT4/2hLd1gQ2A==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "3.0.1",
+        "@types/node": "7.0.46"
+      }
+    },
+    "@types/google-cloud__storage": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
+      "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "@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": "7.0.46",
+        "@types/orchestrator": "0.3.0",
+        "@types/vinyl": "2.0.1"
+      }
+    },
+    "@types/hammerjs": {
+      "version": "2.0.35",
+      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.35.tgz",
+      "integrity": "sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==",
+      "dev": true
+    },
+    "@types/jasmine": {
+      "version": "2.5.45",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.45.tgz",
+      "integrity": "sha1-WJKKYh0BTOarWcWpxBBx9zKLDKk=",
+      "dev": true
+    },
+    "@types/long": {
+      "version": "3.0.32",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
+      "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
+      "dev": true
+    },
+    "@types/merge2": {
+      "version": "0.3.30",
+      "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-0.3.30.tgz",
+      "integrity": "sha1-njnQT2/k82+nR3VmytH6+AsqZx8=",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz",
+      "integrity": "sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
+      "dev": true
+    },
+    "@types/minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "7.0.46",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz",
+      "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==",
+      "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": "7.0.46",
+        "@types/q": "0.0.37"
+      }
+    },
+    "@types/q": {
+      "version": "0.0.37",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
+      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
+      "dev": true
+    },
+    "@types/run-sequence": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.29.tgz",
+      "integrity": "sha1-atD3ODE24TklMi5p/EHbd7MLIHU=",
+      "dev": true,
+      "requires": {
+        "@types/gulp": "3.8.32",
+        "@types/node": "7.0.46"
+      }
+    },
+    "@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/vinyl": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz",
+      "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "a-sync-waterfall": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
+      "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=",
+      "dev": true
+    },
+    "abab": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.17",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
+      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
+      "dev": true
+    },
+    "acorn-globals": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
+      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
+      "dev": true,
+      "requires": {
+        "acorn": "2.7.0"
+      }
+    },
+    "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.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "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": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "json-schema-traverse": "0.3.1",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+      "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": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
+      "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "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": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "app-module-path": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-1.1.0.tgz",
+      "integrity": "sha1-pqxTaEUPIJufW4bpo+Smq2/nUxw=",
+      "dev": true
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "archiver": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz",
+      "integrity": "sha1-u1cDRomdCGXrd+1mcnqzxjT8GlA=",
+      "dev": true,
+      "requires": {
+        "async": "1.4.2",
+        "buffer-crc32": "0.2.13",
+        "glob": "5.0.15",
+        "lazystream": "0.1.0",
+        "lodash": "3.10.1",
+        "readable-stream": "1.0.34",
+        "tar-stream": "1.2.2",
+        "zip-stream": "0.6.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
+          "integrity": "sha1-bJ7csRztTw3S8tQNsNSaEJwIiqs=",
+          "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"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "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
+        }
+      }
+    },
+    "archiver-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lazystream": "1.0.0",
+        "lodash": "4.17.4",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "arguejs": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
+      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
+      "dev": true
+    },
+    "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
+    },
+    "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-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+      "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-parallel": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
+      "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=",
+      "dev": true
+    },
+    "array-series": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
+      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8=",
+      "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
+    },
+    "as-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz",
+      "integrity": "sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc=",
+      "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
+    },
+    "ascli": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+      "dev": true,
+      "requires": {
+        "colour": "0.7.1",
+        "optjs": "3.2.2"
+      }
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "ast-module-types": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.3.2.tgz",
+      "integrity": "sha1-S7HeLXKWeIJEKeIqYo0D6H30rRE=",
+      "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-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": "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.30000748",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "axe-core": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
+      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
+      "dev": true
+    },
+    "axe-webdriverjs": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/axe-webdriverjs/-/axe-webdriverjs-1.1.5.tgz",
+      "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
+      "dev": true,
+      "requires": {
+        "axe-core": "2.4.2"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "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.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "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": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "base64url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+      "dev": true
+    },
+    "basic-auth": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
+      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "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
+    },
+    "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"
+      }
+    },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "dev": true,
+      "requires": {
+        "buffers": "0.1.1",
+        "chainsaw": "0.1.0"
+      }
+    },
+    "binary-extensions": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+      "dev": true
+    },
+    "bl": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
+      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
+      "dev": true,
+      "requires": {
+        "bytes": "2.4.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.7",
+        "depd": "1.1.1",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.15",
+        "on-finished": "2.3.0",
+        "qs": "6.4.0",
+        "raw-body": "2.2.0",
+        "type-is": "1.6.15"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        }
+      }
+    },
+    "boom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+      "dev": true,
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "boxen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
+      "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
+      "dev": true,
+      "requires": {
+        "ansi-align": "1.1.0",
+        "camelcase": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-boxes": "1.0.0",
+        "filled-array": "1.1.0",
+        "object-assign": "4.1.1",
+        "repeating": "2.0.1",
+        "string-width": "1.0.2",
+        "widest-line": "1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "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
+        }
+      }
+    },
+    "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.30000748",
+        "electron-to-chromium": "1.3.27"
+      }
+    },
+    "browserstack": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.0.tgz",
+      "integrity": "sha1-tWVCWtYu1ywQgqHrl51TE8fUdU8=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0"
+      }
+    },
+    "browserstacktunnel-wrapper": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.1.tgz",
+      "integrity": "sha1-/+GRDW45/oZhgYPoJmkAQa9T7a4=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0",
+        "unzip": "0.1.11"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+      "dev": true
+    },
+    "buffered-spawn": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-1.1.2.tgz",
+      "integrity": "sha1-Ia2XNd+/ZXZ0W+DXSiPvJXvzxY0=",
+      "dev": true,
+      "requires": {
+        "cross-spawn-async": "1.0.1",
+        "err-code": "0.1.2",
+        "q": "1.4.1"
+      }
+    },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+      "dev": true
+    },
+    "bufferstreams": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz",
+      "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "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
+    },
+    "bun": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
+      "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
+      "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
+        }
+      }
+    },
+    "bytebuffer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+      "dev": true,
+      "requires": {
+        "long": "3.2.0"
+      }
+    },
+    "bytes": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
+      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
+      "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.2",
+        "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.30000748",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz",
+      "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=",
+      "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.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "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"
+      }
+    },
+    "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"
+      }
+    },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "dev": true,
+      "requires": {
+        "traverse": "0.3.9"
+      }
+    },
+    "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": {
+        "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.2",
+        "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"
+      }
+    },
+    "char-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz",
+      "integrity": "sha1-5upnvSR+EHESmDt6sEee02KAAIE=",
+      "dev": true
+    },
+    "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.2",
+        "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"
+      }
+    },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "cjson": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.3.3.tgz",
+      "integrity": "sha1-qS2ceG5b+bkwgGMp7gXV0yYbSvo=",
+      "dev": true,
+      "requires": {
+        "json-parse-helpfulerror": "1.0.3"
+      }
+    },
+    "clean-css": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
+      "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
+    "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": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "1.0.1"
+      }
+    },
+    "cli-spinners": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+      "dev": true
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+      "dev": true,
+      "requires": {
+        "colors": "1.0.3"
+      }
+    },
+    "cli-table2": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz",
+      "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "colors": "1.1.2",
+        "lodash": "3.10.1",
+        "string-width": "1.0.2"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true,
+          "optional": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "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": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
+    },
+    "clone-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
+      "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
+      "dev": true,
+      "requires": {
+        "is-regexp": "1.0.0",
+        "is-supported-regexp-flag": "1.0.0"
+      }
+    },
+    "clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
+      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "process-nextick-args": "1.0.7",
+        "through2": "2.0.3"
+      }
+    },
+    "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
+    },
+    "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.3"
+      }
+    },
+    "color-diff": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
+      "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
+      "dev": true
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "colorguard": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
+      "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "color-diff": "0.1.7",
+        "log-symbols": "1.0.2",
+        "object-assign": "4.1.1",
+        "pipetteur": "2.0.3",
+        "plur": "2.1.2",
+        "postcss": "5.2.18",
+        "postcss-reporter": "1.4.1",
+        "text-table": "0.2.0",
+        "yargs": "1.3.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "plur": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
+          "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
+          "dev": true,
+          "requires": {
+            "irregular-plurals": "1.4.0"
+          }
+        },
+        "postcss-reporter": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
+          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "lodash": "4.17.4",
+            "log-symbols": "1.0.2",
+            "postcss": "5.2.18"
+          }
+        },
+        "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
+        },
+        "yargs": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
+          "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
+          "dev": true
+        }
+      }
+    },
+    "colors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+      "dev": true
+    },
+    "colour": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
+      "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
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "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"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
+    },
+    "compare-semver": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz",
+      "integrity": "sha1-fAp5onu4C2xplERfgpWCWdPQIVM=",
+      "dev": true,
+      "requires": {
+        "semver": "5.4.1"
+      }
+    },
+    "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
+    },
+    "compress-commons": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz",
+      "integrity": "sha1-lwk+Lhk/dWf6EyA9S43vzVlxpRk=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "0.3.4",
+        "node-int64": "0.4.0",
+        "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
+        }
+      }
+    },
+    "compressible": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
+      "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "compression": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
+      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "bytes": "3.0.0",
+        "compressible": "2.0.12",
+        "debug": "2.6.9",
+        "on-headers": "1.0.1",
+        "safe-buffer": "5.1.1",
+        "vary": "1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "configstore": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+      "dev": true,
+      "requires": {
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.0.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.3.0",
+        "xdg-basedir": "3.0.0"
+      }
+    },
+    "connect": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
+      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.0.6",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "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-query": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-1.0.0.tgz",
+      "integrity": "sha1-3kT1dyCdokBNH8BGktGkEY5YIRk=",
+      "dev": true,
+      "requires": {
+        "qs": "6.4.0"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "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.4.0"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true,
+      "optional": true
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "content-type-parser": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
+      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
+      "dev": true
+    },
+    "conventional-changelog": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
+      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "1.5.1",
+        "conventional-changelog-atom": "0.1.1",
+        "conventional-changelog-codemirror": "0.2.0",
+        "conventional-changelog-core": "1.9.2",
+        "conventional-changelog-ember": "0.2.8",
+        "conventional-changelog-eslint": "0.2.0",
+        "conventional-changelog-express": "0.2.0",
+        "conventional-changelog-jquery": "0.1.0",
+        "conventional-changelog-jscs": "0.1.0",
+        "conventional-changelog-jshint": "0.2.0"
+      }
+    },
+    "conventional-changelog-angular": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
+      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-atom": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
+      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-codemirror": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
+      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-core": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
+      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-writer": "2.0.1",
+        "conventional-commits-parser": "2.0.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.2",
+        "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.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "conventional-changelog-ember": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
+      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-eslint": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
+      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-express": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
+      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+      "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.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
+      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-writer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
+      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "conventional-commits-filter": "1.0.0",
+        "dateformat": "1.0.12",
+        "handlebars": "4.0.11",
+        "json-stringify-safe": "5.0.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "semver": "5.4.1",
+        "split": "1.0.1",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "split": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+          "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+          "dev": true,
+          "requires": {
+            "through": "2.3.8"
+          }
+        }
+      }
+    },
+    "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": "2.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
+      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
+      "dev": true,
+      "requires": {
+        "is-text-path": "1.0.1",
+        "JSONStream": "1.3.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3",
+        "trim-off-newlines": "1.0.1"
+      }
+    },
+    "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
+    },
+    "copy-props": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-1.6.0.tgz",
+      "integrity": "sha1-8DJLvumXcRAeezraES8xPDk9uO0=",
+      "dev": true,
+      "requires": {
+        "each-props": "1.3.1",
+        "is-plain-object": "2.0.4"
+      }
+    },
+    "core-js": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+    },
+    "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
+    },
+    "cosmiconfig": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "dev": true,
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.10.0",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
+      }
+    },
+    "crc": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
+      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
+      "dev": true
+    },
+    "crc32-stream": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
+      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "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
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "cross-spawn": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "which": "1.3.0"
+      }
+    },
+    "cross-spawn-async": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-1.0.1.tgz",
+      "integrity": "sha1-u1JcHkINmUJVLgR5Gj6y2Yh6EF8=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.7.3",
+        "which": "1.3.0"
+      },
+      "dependencies": {
+        "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
+        }
+      }
+    },
+    "cryptiles": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "dev": true,
+      "requires": {
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
+      "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
+      "dev": true
+    },
+    "css-rule-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
+      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
+      "dev": true,
+      "requires": {
+        "css-tokenize": "1.0.1",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "1.2.1",
+        "through2": "0.6.5"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        },
+        "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"
+          },
+          "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": {
-                "deep-extend": "0.4.2",
-                "ini": "1.3.4",
-                "minimist": "1.2.0",
-                "strip-json-comments": "2.0.1"
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
               }
-            },
+            }
+          }
+        }
+      }
+    },
+    "css-tokenize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
+      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "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
+        }
+      }
+    },
+    "cssom": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
+      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
+      "dev": true
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "dev": true,
+      "requires": {
+        "cssom": "0.3.2"
+      }
+    },
+    "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.4.0"
+          }
+        }
+      }
+    },
+    "csv-streamify": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/csv-streamify/-/csv-streamify-3.0.4.tgz",
+      "integrity": "sha1-TLYUxX4/KZzKF7Y/3LStFnd39Ho=",
+      "dev": true,
+      "requires": {
+        "through2": "2.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": {
+          "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"
+          }
+        }
+      }
+    },
+    "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
+    },
+    "d": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.35"
+      }
+    },
+    "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"
+      }
+    },
+    "dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "mimic-response": "1.0.0"
+      }
+    },
+    "deep-equal": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
+      "dev": true,
+      "optional": 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
+        }
+      }
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+      "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
+    },
+    "dependency-tree": {
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-5.11.0.tgz",
+      "integrity": "sha1-koRk1vknNgfT9muaV+JZ5jVmd1U=",
+      "dev": true,
+      "requires": {
+        "commander": "2.11.0",
+        "debug": "2.6.7",
+        "filing-cabinet": "1.12.0",
+        "precinct": "3.8.0"
+      }
+    },
+    "deprecated": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
+      "dev": true
+    },
+    "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"
+      }
+    },
+    "detective-amd": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-2.4.0.tgz",
+      "integrity": "sha1-XrDfTvXBipQDOwfa8TbbzV/HXNU=",
+      "dev": true,
+      "requires": {
+        "ast-module-types": "2.3.2",
+        "escodegen": "1.9.0",
+        "get-amd-module-type": "2.0.5",
+        "node-source-walk": "3.3.0"
+      }
+    },
+    "detective-cjs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-2.0.0.tgz",
+      "integrity": "sha1-3OTJMCzcpS5ri/04d8qT9ixczAM=",
+      "dev": true,
+      "requires": {
+        "ast-module-types": "2.3.2",
+        "node-source-walk": "3.3.0"
+      }
+    },
+    "detective-es6": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-1.2.0.tgz",
+      "integrity": "sha1-a5s71Uf9jyH4lQL2JuRe0qMnb9w=",
+      "dev": true,
+      "requires": {
+        "node-source-walk": "3.3.0"
+      }
+    },
+    "detective-less": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.0.tgz",
+      "integrity": "sha1-Qmx4yatuMnW/ZsyRq6wAU7tFLX0=",
+      "dev": true,
+      "requires": {
+        "debug": "2.2.0",
+        "gonzales-pe": "3.4.7",
+        "node-source-walk": "3.3.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
+        }
+      }
+    },
+    "detective-sass": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-2.0.1.tgz",
+      "integrity": "sha1-BWYKoblc/Yf1dGQ7+s4+iiaBEqE=",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0",
+        "gonzales-pe": "3.4.7",
+        "node-source-walk": "3.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "detective-scss": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-1.0.1.tgz",
+      "integrity": "sha1-dDJGoN01jZ2R/0ElQX9qd/vPJw8=",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0",
+        "gonzales-pe": "3.4.7",
+        "node-source-walk": "3.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "detective-stylus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz",
+      "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
+      "dev": true
+    },
+    "detective-typescript": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-1.0.1.tgz",
+      "integrity": "sha512-4DZpsap+dVzQblcL/ffVXtaXtA7byrP14XQnvyAvwo8+z7/C0OrwLNQhyiC6cLZlzy2T8QuPc+mDsYsa4lAxHw==",
+      "dev": true,
+      "requires": {
+        "node-source-walk": "3.2.0",
+        "typescript": "2.0.10",
+        "typescript-eslint-parser": "1.0.2"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.8.4",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.4.tgz",
+          "integrity": "sha1-CXMGuNq66VFZIlzymz6lWRIFMYA=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.26.0"
+          }
+        },
+        "node-source-walk": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.2.0.tgz",
+          "integrity": "sha1-PGBcxTq97ktFq2XpR9+x23yQ8OM=",
+          "dev": true,
+          "requires": {
+            "babylon": "6.8.4"
+          }
+        },
+        "typescript": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz",
+          "integrity": "sha1-zN1O2G/VVQpAcQGggUAS4bP6w90=",
+          "dev": true
+        }
+      }
+    },
+    "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.4.0"
+      },
+      "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.22.0",
+      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.22.0.tgz",
+      "integrity": "sha1-ftB6+QdPZUeEclbBpltIiloXrQM=",
+      "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.1.2",
+        "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": "3.0.1",
+        "semver": "5.4.1",
+        "shelljs": "0.7.8",
+        "source-map-support": "0.4.18",
+        "spdx-license-list": "2.1.0",
+        "stringmap": "0.2.2",
+        "typescript": "2.4.2"
+      }
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "didyoumean": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
+      "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
+      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
+      "dev": true
+    },
+    "doiuse": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
+      "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000748",
+        "css-rule-stream": "1.1.0",
+        "duplexer2": "0.0.2",
+        "jsonfilter": "1.1.2",
+        "ldjson-stream": "1.2.1",
+        "lodash": "4.17.4",
+        "multimatch": "2.1.0",
+        "postcss": "5.2.18",
+        "source-map": "0.4.4",
+        "through2": "0.6.5",
+        "yargs": "3.32.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          },
+          "dependencies": {
             "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==",
+              "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": "1.0.0",
-                "process-nextick-args": "1.0.7",
-                "safe-buffer": "5.1.1",
-                "string_decoder": "1.0.3",
-                "util-deprecate": "1.0.2"
-              }
-            },
-            "request": {
-              "version": "2.81.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-              "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.17",
-                "oauth-sign": "0.8.2",
-                "performance-now": "0.2.0",
-                "qs": "6.4.0",
-                "safe-buffer": "5.1.1",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.3",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.1.0"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-              "requires": {
-                "glob": "7.1.2"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.1",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-              "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-            },
-            "semver": {
-              "version": "5.4.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-              "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-            },
-            "sntp": {
-              "version": "1.0.9",
-              "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-              "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-              "requires": {
-                "hoek": "2.16.3"
-              }
-            },
-            "sshpk": {
-              "version": "1.13.1",
-              "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-              "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-              "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="
-                }
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
-              }
-            },
-            "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==",
-              "requires": {
-                "safe-buffer": "5.1.1"
-              }
-            },
-            "stringstream": {
-              "version": "0.0.5",
-              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-              "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "requires": {
-                "ansi-regex": "2.1.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="
-            },
-            "tar": {
-              "version": "2.2.1",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-              "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-              "requires": {
-                "block-stream": "0.0.9",
-                "fstream": "1.0.11",
-                "inherits": "2.0.3"
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-              "requires": {
-                "debug": "2.6.9",
-                "fstream": "1.0.11",
-                "fstream-ignore": "1.0.5",
-                "once": "1.4.0",
-                "readable-stream": "2.3.3",
-                "rimraf": "2.6.2",
-                "tar": "2.2.1",
-                "uid-number": "0.0.6"
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
               }
-            },
-            "tough-cookie": {
-              "version": "2.3.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+            }
+          }
+        }
+      }
+    },
+    "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
+        }
+      }
+    },
+    "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.2"
+      }
+    },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "dev": true,
+      "requires": {
+        "is-obj": "1.0.1"
+      }
+    },
+    "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.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"
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true,
+      "optional": true
+    },
+    "duplexify": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "stream-shift": "1.0.0"
+      }
+    },
+    "each-props": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.1.tgz",
+      "integrity": "sha1-/BOPUeOid0KG1IWOAtbn3kYt4Vg=",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
+      }
+    },
+    "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"
+      }
+    },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+      "dev": true,
+      "requires": {
+        "base64url": "2.0.0",
+        "safe-buffer": "5.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.27",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "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": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "engine.io": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
+      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "ws": "1.1.2"
+      },
+      "dependencies": {
+        "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.17",
+            "negotiator": "0.6.1"
+          }
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
+      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parsejson": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "1.1.2",
+        "xmlhttprequest-ssl": "1.5.3",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
+      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "0.0.6",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.4",
+        "has-binary": "0.1.7",
+        "wtf-8": "1.0.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz",
+      "integrity": "sha1-3xTAa1/F7sreEJTJxaErSz7cC2I=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "object-assign": "4.1.1",
+        "tapable": "0.2.8"
+      }
+    },
+    "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
+    },
+    "err-code": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-0.1.2.tgz",
+      "integrity": "sha1-EiqSszQrmJnaArWsmU0w+V1HY+4=",
+      "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-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.4",
+        "escape-html": "1.0.3"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.35",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
+      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-promise": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
+      "dev": true
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
+      }
+    },
+    "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.9.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
+      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
+      "dev": true,
+      "requires": {
+        "esprima": "3.1.3",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        }
+      }
+    },
+    "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
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
+      }
+    },
+    "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"
+      }
+    },
+    "eventemitter3": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
+      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+      "dev": true
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "optional": 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"
+      },
+      "dependencies": {
+        "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,
+          "optional": true,
+          "requires": {
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
+        }
+      }
+    },
+    "execall": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
+      "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
+      "dev": true,
+      "requires": {
+        "clone-regexp": "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
+    },
+    "exit-code": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/exit-code/-/exit-code-1.0.2.tgz",
+      "integrity": "sha1-zhZYEcnxF69qX4gpQLlq5/muzDQ=",
+      "dev": true
+    },
+    "exit-hook": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
+      "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.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
+      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "array-flatten": "1.1.1",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.8",
+        "depd": "1.1.1",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "finalhandler": "1.0.6",
+        "fresh": "0.5.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "1.1.5",
+        "qs": "6.5.0",
+        "range-parser": "1.2.0",
+        "send": "0.15.4",
+        "serve-static": "1.12.4",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1",
+        "type-is": "1.6.15",
+        "utils-merge": "1.0.0",
+        "vary": "1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "qs": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
+          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
+          "dev": true,
+          "optional": true
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "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.2",
+        "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
+    },
+    "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.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "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"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+      "dev": true
+    },
+    "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
+    },
+    "fast-url-parser": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
+      "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "faye-websocket": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+      "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.7.0"
+      }
+    },
+    "figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-exists": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-1.0.0.tgz",
+      "integrity": "sha1-5tJptWVnuJIlgTmOmQ3XB49y1hY=",
+      "dev": true
+    },
+    "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
+    },
+    "filesize": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
+      "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==",
+      "dev": true
+    },
+    "filing-cabinet": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-1.12.0.tgz",
+      "integrity": "sha1-b7k/2WjoO+3xtCmPKCNqiq/ffXg=",
+      "dev": true,
+      "requires": {
+        "app-module-path": "1.1.0",
+        "commander": "2.11.0",
+        "debug": "2.6.7",
+        "enhanced-resolve": "3.0.3",
+        "is-relative-path": "1.0.2",
+        "module-definition": "2.2.4",
+        "module-lookup-amd": "4.0.5",
+        "object-assign": "4.1.1",
+        "resolve": "1.4.0",
+        "resolve-dependency-path": "1.0.2",
+        "sass-lookup": "1.1.0",
+        "stylus-lookup": "1.0.2",
+        "typescript": "2.4.2"
+      }
+    },
+    "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"
+      }
+    },
+    "filled-array": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
+      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
+      "dev": true
+    },
+    "finalhandler": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true
+        }
+      }
+    },
+    "find": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/find/-/find-0.2.6.tgz",
+      "integrity": "sha1-DSGLXUjDQkGT9kzqWdOJ+NqnHQE=",
+      "dev": true,
+      "requires": {
+        "traverse-chain": "0.1.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": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "locate-path": "2.0.0"
+      }
+    },
+    "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"
+      }
+    },
+    "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.3.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"
+          }
+        }
+      }
+    },
+    "firebase": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.0.tgz",
+      "integrity": "sha512-lfVXLQiCNcNsmG7ZxQapQRdE/kZOjheBZVZ1MNK80GTsuK9RO7DYO5Qdf4K9Om8r7OBZ4nRp438kGkf24x7sOg==",
+      "dev": true,
+      "requires": {
+        "@firebase/app": "0.1.1",
+        "@firebase/auth": "0.2.0",
+        "@firebase/database": "0.1.2",
+        "@firebase/firestore": "0.1.2",
+        "@firebase/messaging": "0.1.2",
+        "@firebase/polyfill": "0.1.1",
+        "@firebase/storage": "0.1.1",
+        "dom-storage": "2.0.2",
+        "xmlhttprequest": "1.8.0"
+      },
+      "dependencies": {
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
+        },
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+        },
+        "dom-storage": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
+          "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
+          "dev": true
+        },
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+          "requires": {
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+          "requires": {
+            "websocket-driver": "0.6.5"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+        },
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo="
+        },
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+          "requires": {
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          }
+        },
+        "jsonwebtoken": {
+          "version": "7.4.3",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
+          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
+          "requires": {
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "2.0.0",
+            "xtend": "4.0.1"
+          }
+        },
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+          "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "promise-polyfill": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
+          "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "websocket-driver": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+          "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="
+        },
+        "xmlhttprequest": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+          "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+          "dev": true
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+        }
+      }
+    },
+    "firebase-admin": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.4.2.tgz",
+      "integrity": "sha1-AC9YvirYkBIp5SXsVfpybRL5BOs=",
+      "dev": true,
+      "requires": {
+        "@google-cloud/firestore": "0.8.2",
+        "@google-cloud/storage": "1.3.1",
+        "@types/google-cloud__storage": "1.1.5",
+        "@types/jsonwebtoken": "7.2.3",
+        "@types/node": "8.0.33",
+        "faye-websocket": "0.9.3",
+        "google-auth-library": "0.10.0",
+        "jsonwebtoken": "7.1.9",
+        "lodash": "4.17.4",
+        "node-forge": "0.7.1"
+      },
+      "dependencies": {
+        "@google-cloud/common": {
+          "version": "0.13.6",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+          "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
+          "dev": true,
+          "requires": {
+            "array-uniq": "1.0.3",
+            "arrify": "1.0.1",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "ent": "2.2.0",
+            "extend": "3.0.1",
+            "google-auto-auth": "0.7.2",
+            "is": "3.2.1",
+            "log-driver": "1.2.5",
+            "methmeth": "1.1.0",
+            "modelo": "4.2.0",
+            "request": "2.83.0",
+            "retry-request": "3.0.0",
+            "split-array-stream": "1.0.3",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
+        "@google-cloud/storage": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
+          "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
+          "dev": true,
+          "requires": {
+            "@google-cloud/common": "0.13.6",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "safe-buffer": "5.1.1",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
+        "@types/jsonwebtoken": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
+          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "8.0.33"
+          }
+        },
+        "@types/node": {
+          "version": "8.0.33",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.33.tgz",
+          "integrity": "sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "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
+        },
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+          "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
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "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"
+          }
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+          "dev": true
+        },
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+          "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"
+          }
+        },
+        "boom": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "buffer-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+          "dev": true
+        },
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+          "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.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+          "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
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "configstore": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "4.2.0",
+            "graceful-fs": "4.1.11",
+            "make-dir": "1.0.0",
+            "unique-string": "1.0.0",
+            "write-file-atomic": "2.3.0",
+            "xdg-basedir": "3.0.0"
+          },
+          "dependencies": {
+            "dot-prop": {
+              "version": "4.2.0",
+              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+              "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+              "dev": true,
               "requires": {
-                "punycode": "1.4.1"
+                "is-obj": "1.0.1"
               }
-            },
-            "tunnel-agent": {
-              "version": "0.6.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-              "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+            }
+          }
+        },
+        "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
+        },
+        "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"
+          }
+        },
+        "cryptiles": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+          "dev": true,
+          "requires": {
+            "boom": "5.2.0"
+          },
+          "dependencies": {
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+              "dev": true,
               "requires": {
-                "safe-buffer": "5.1.1"
+                "hoek": "4.2.0"
               }
-            },
-            "tweetnacl": {
-              "version": "0.14.5",
-              "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-              "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-              "optional": true
-            },
-            "uid-number": {
-              "version": "0.0.6",
-              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-              "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-            },
+            }
+          }
+        },
+        "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
+        },
+        "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
+            }
+          }
+        },
+        "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
+        },
+        "dot-prop": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
+          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
+          "requires": {
+            "is-obj": "1.0.1"
+          }
+        },
+        "duplexify": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "1.4.0",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.3",
+            "stream-shift": "1.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "end-of-stream": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+          "dev": true,
+          "requires": {
+            "once": "1.4.0"
+          }
+        },
+        "ent": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+          "dev": true
+        },
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+          "dev": true
+        },
+        "extsprintf": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+          "dev": true
+        },
+        "faye-websocket": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": "0.7.0"
+          }
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
+          }
+        },
+        "gcp-metadata": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+          "dev": true,
+          "requires": {
+            "extend": "3.0.1",
+            "retry-request": "3.0.0"
+          }
+        },
+        "gcs-resumable-upload": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+          "dev": true,
+          "requires": {
+            "buffer-equal": "1.0.0",
+            "configstore": "3.1.1",
+            "google-auto-auth": "0.7.2",
+            "pumpify": "1.3.5",
+            "request": "2.83.0",
+            "stream-events": "1.0.2",
+            "through2": "2.0.3"
+          }
+        },
+        "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
+            }
+          }
+        },
+        "google-auth-library": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+          "dev": true,
+          "requires": {
+            "gtoken": "1.2.2",
+            "jws": "3.1.4",
+            "lodash.noop": "3.0.1",
+            "request": "2.83.0"
+          }
+        },
+        "google-auto-auth": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+          "dev": true,
+          "requires": {
+            "async": "2.5.0",
+            "gcp-metadata": "0.3.1",
+            "google-auth-library": "0.10.0",
+            "request": "2.83.0"
+          }
+        },
+        "google-p12-pem": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+          "dev": true,
+          "requires": {
+            "node-forge": "0.7.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+          "dev": true
+        },
+        "gtoken": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
+          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
+          "dev": true,
+          "requires": {
+            "google-p12-pem": "0.1.2",
+            "jws": "3.1.4",
+            "mime": "1.4.1",
+            "request": "2.83.0"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.2.3",
+            "har-schema": "2.0.0"
+          }
+        },
+        "hash-stream-validation": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+          "dev": true,
+          "requires": {
+            "through2": "2.0.3"
+          }
+        },
+        "hawk": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+          "dev": true,
+          "requires": {
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.0",
+            "sntp": "2.0.2"
+          }
+        },
+        "hoek": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
+          }
+        },
+        "imurmurhash": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "is": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
+          "dev": true
+        },
+        "is-obj": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+        },
+        "is-stream-ended": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
+          "dev": true
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
+          "dev": true
+        },
+        "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
+        },
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "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
+        },
+        "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
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+          "dev": true
+        },
+        "jsonwebtoken": {
+          "version": "7.1.9",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
+          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
+          "dev": true,
+          "requires": {
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "0.7.3",
+            "xtend": "4.0.1"
+          }
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.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
+            }
+          }
+        },
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+          "dev": true
+        },
+        "lodash.noop": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
+          "dev": true
+        },
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
+          "dev": true
+        },
+        "log-driver": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "methmeth": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.30.0"
+          }
+        },
+        "modelo": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
+          "dev": true
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
+          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
+          "dev": true
+        },
+        "node-forge": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
+          "dev": true
+        },
+        "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
+        },
+        "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"
+          }
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "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
+        },
+        "pump": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "1.4.0",
+            "once": "1.4.0"
+          }
+        },
+        "pumpify": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+          "dev": true,
+          "requires": {
+            "duplexify": "3.5.1",
+            "inherits": "2.0.3",
+            "pump": "1.0.2"
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "request": {
+          "version": "2.83.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.1",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.1",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "retry-request": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
+          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
+          "dev": true,
+          "requires": {
+            "request": "2.83.0",
+            "through2": "2.0.3"
+          }
+        },
+        "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
+        },
+        "slide": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+          "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
+        },
+        "sntp": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "split-array-stream": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+          "dev": true,
+          "requires": {
+            "async": "2.5.0",
+            "is-stream-ended": "0.1.3"
+          }
+        },
+        "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
+            }
+          }
+        },
+        "stream-events": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+          "dev": true,
+          "requires": {
+            "stubs": "3.0.0"
+          }
+        },
+        "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
+        },
+        "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-format-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+          "dev": true
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+          "dev": true
+        },
+        "stubs": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            }
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "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"
+          }
+        },
+        "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
+        },
+        "typedarray": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+          "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"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        },
+        "verror": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "1.3.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
+            }
+          }
+        },
+        "websocket-driver": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+          "dev": true,
+          "requires": {
+            "http-parser-js": "0.4.9",
+            "websocket-extensions": "0.1.2"
+          }
+        },
+        "websocket-extensions": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+          "dev": true
+        },
+        "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.3.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "signal-exit": "3.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
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
+    "firebase-tools": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.13.1.tgz",
+      "integrity": "sha1-LKgqXN1eiHxf6WHNgBnkqYdiX1o=",
+      "dev": true,
+      "requires": {
+        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
+        "archiver": "0.16.0",
+        "chalk": "1.1.3",
+        "cjson": "0.3.3",
+        "cli-table": "0.3.1",
+        "commander": "2.11.0",
+        "configstore": "1.4.0",
+        "cross-spawn": "4.0.2",
+        "csv-streamify": "3.0.4",
+        "didyoumean": "1.2.1",
+        "es6-set": "0.1.5",
+        "exit-code": "1.0.2",
+        "filesize": "3.5.11",
+        "firebase": "2.4.2",
+        "fs-extra": "0.23.1",
+        "fstream-ignore": "1.0.5",
+        "glob": "7.1.2",
+        "google-auto-auth": "0.7.2",
+        "inquirer": "0.12.0",
+        "jsonschema": "1.2.0",
+        "JSONStream": "1.3.1",
+        "jsonwebtoken": "7.4.3",
+        "lodash": "4.17.4",
+        "open": "0.0.5",
+        "ora": "0.2.3",
+        "portfinder": "0.4.0",
+        "progress": "2.0.0",
+        "request": "2.83.0",
+        "rsvp": "3.6.2",
+        "semver": "5.4.1",
+        "superstatic": "5.0.1",
+        "tar": "3.2.1",
+        "tmp": "0.0.27",
+        "universal-analytics": "0.3.11",
+        "update-notifier": "0.5.0",
+        "user-home": "2.0.0",
+        "uuid": "3.1.0",
+        "winston": "1.1.2"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "configstore": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
+          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "os-tmpdir": "1.0.2",
+            "osenv": "0.1.4",
+            "uuid": "2.0.3",
+            "write-file-atomic": "1.3.4",
+            "xdg-basedir": "2.0.0"
+          },
+          "dependencies": {
             "uuid": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
-            },
-            "verror": {
-              "version": "1.10.0",
-              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+              "dev": true
+            }
+          }
+        },
+        "firebase": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
+          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+          "dev": true,
+          "requires": {
+            "faye-websocket": "0.9.3"
+          },
+          "dependencies": {
+            "faye-websocket": {
+              "version": "0.9.3",
+              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+              "dev": true,
               "requires": {
-                "assert-plus": "1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "1.3.0"
+                "websocket-driver": "0.5.2"
               },
               "dependencies": {
-                "assert-plus": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                  "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+                "websocket-driver": {
+                  "version": "0.5.2",
+                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
+                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
+                  "dev": true,
+                  "requires": {
+                    "websocket-extensions": "0.1.1"
+                  },
+                  "dependencies": {
+                    "websocket-extensions": {
+                      "version": "0.1.1",
+                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+                      "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==",
-              "requires": {
-                "string-width": "1.0.2"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
             }
           }
         },
-        "gtoken": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
+        "fs-extra": {
+          "version": "0.23.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
+          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
+          "dev": true,
           "requires": {
-            "google-p12-pem": "0.1.2",
-            "jws": "3.1.4",
-            "mime": "1.3.6",
-            "request": "2.81.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.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="
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+          "dev": true
         },
-        "har-validator": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+        "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
+        },
+        "winston": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
+          "dev": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
           }
         },
-        "hash-stream-validation": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+        "write-file-atomic": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
+          }
+        },
+        "xdg-basedir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+          "dev": true,
+          "requires": {
+            "os-homedir": "1.0.2"
+          }
+        }
+      }
+    },
+    "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
+    },
+    "flat-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
+      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "1.1.1",
+        "as-array": "1.0.0",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isobject": "3.0.2"
+      },
+      "dependencies": {
+        "as-array": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
+          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
           "dev": true,
           "requires": {
-            "through2": "2.0.3"
-          }
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-        },
-        "http-parser-js": {
-          "version": "0.4.8",
-          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.8.tgz",
-          "integrity": "sha512-jmHp99g6/fLx0pRNJqzsQgjsclCHAY7NhIeA3/U+bsGNvgbvUCQFQY9m5AYpqpAxY/2VcikfbKpjQozSTiz0jA=="
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.13.1"
+            "lodash.isarguments": "2.4.1",
+            "lodash.isobject": "2.4.1",
+            "lodash.values": "2.4.1"
+          },
+          "dependencies": {
+            "lodash.isarguments": {
+              "version": "2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
+              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
+              "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"
+              }
+            }
           }
         },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+        "lodash.isobject": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
           "dev": true
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "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"
+      }
+    },
+    "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.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": 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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "graceful-fs": "4.1.11"
           }
+        }
+      }
+    },
+    "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.7.0",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+          "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+          "dev": true,
+          "optional": true
         },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "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="
-        },
-        "is": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
-        },
-        "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=",
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
-        "is-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-        },
-        "is-stream-ended": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw="
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
-        "isstream": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+        "aproba": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
+          "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
+          "dev": true,
+          "optional": true
         },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+        "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,
+          "optional": true,
           "requires": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
           }
         },
-        "jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+        "asn1": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+          "dev": true,
           "optional": true
         },
-        "json-schema": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+        "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,
+          "optional": true
         },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+          "dev": true,
+          "optional": 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=",
-          "requires": {
-            "jsonify": "0.0.0"
-          }
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true,
+          "optional": true
         },
-        "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="
+        "aws4": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+          "dev": true,
+          "optional": true
         },
-        "jsonify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+        "balanced-match": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+          "dev": true
         },
-        "jsonwebtoken": {
-          "version": "7.1.9",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
-          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
+        "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": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "0.7.3",
-            "xtend": "4.0.1"
+            "tweetnacl": "0.14.5"
           }
         },
-        "jsprim": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+        "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": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-            }
+            "inherits": "2.0.3"
           }
         },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+        "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": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.1"
+            "hoek": "2.16.3"
           }
         },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+        "brace-expansion": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
+          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
+          "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.1.1"
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
           }
         },
-        "lcid": {
+        "buffer-shims": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-          "requires": {
-            "invert-kv": "1.0.0"
-          }
+          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+          "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
+          "dev": true
         },
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+        "caseless": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+          "dev": true,
+          "optional": true
         },
-        "lodash.noop": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw="
+        "co": {
+          "version": "4.6.0",
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+          "dev": true,
+          "optional": true
         },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
+        "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
         },
-        "log-driver": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY="
-        },
-        "long": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-          "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
-        },
-        "make-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-          "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+        "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": {
-            "pify": "2.3.0"
+            "delayed-stream": "1.0.0"
           }
         },
-        "methmeth": {
+        "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
+        },
+        "console-control-strings": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk="
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "dev": true
         },
-        "mime": {
-          "version": "1.3.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-          "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA="
+        "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
         },
-        "mime-db": {
-          "version": "1.29.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-          "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
+        "cryptiles": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
         },
-        "mime-types": {
-          "version": "2.1.16",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
-          "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
+        "dashdash": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "mime-db": "1.29.0"
+            "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,
+              "optional": true
+            }
           }
         },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "brace-expansion": "1.1.8"
+            "ms": "2.0.0"
           }
         },
-        "modelo": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws="
+        "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,
+          "optional": true
         },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+        "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
         },
-        "ms": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
-          "dev": true
+        "delegates": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+          "dev": true,
+          "optional": true
         },
-        "nan": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-          "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY="
+        "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"
+          }
         },
-        "node-forge": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA="
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+          "dev": true,
+          "optional": 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="
+        "extsprintf": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+          "dev": true
         },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+        "forever-agent": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+          "dev": true,
+          "optional": true
         },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+        "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,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
         },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+        "fs.realpath": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+          "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": {
-            "wrappy": "1.0.2"
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
           }
         },
-        "optjs": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
-          "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4="
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+          "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
         },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+        "gauge": {
+          "version": "2.7.4",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "lcid": "1.0.0"
+            "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"
           }
         },
-        "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="
+        "getpass": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+          "dev": true,
+          "optional": 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,
+              "optional": true
+            }
+          }
         },
-        "performance-now": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+        "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"
+          }
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+          "dev": true
         },
-        "pinkie": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-          "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+        "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,
+          "optional": true
         },
-        "pinkie-promise": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-          "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+        "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,
+          "optional": true,
           "requires": {
-            "pinkie": "2.0.4"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
-        "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="
+        "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,
+          "optional": true
         },
-        "protobufjs": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
-          "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
+        "hawk": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "ascli": "1.0.1",
-            "bytebuffer": "5.0.1",
-            "glob": "7.1.2",
-            "yargs": "3.32.0"
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
           }
         },
-        "pump": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "dev": true
+        },
+        "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,
+          "optional": true,
           "requires": {
-            "end-of-stream": "1.4.0",
-            "once": "1.4.0"
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
           }
         },
-        "pumpify": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+        "inflight": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "requires": {
-            "duplexify": "3.5.1",
-            "inherits": "2.0.3",
-            "pump": "1.0.2"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
         },
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
+        "ini": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+          "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+          "dev": true,
+          "optional": true
         },
-        "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==",
+        "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": {
-            "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"
+            "number-is-nan": "1.0.1"
           }
         },
-        "request": {
-          "version": "2.81.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-          "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.16",
-            "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"
-          }
+        "is-typedarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+          "dev": true,
+          "optional": true
         },
-        "retry-request": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
-          "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+          "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "request": "2.81.0",
-            "through2": "2.0.3"
+            "jsbn": "0.1.1"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+          "dev": true,
+          "optional": true
         },
-        "signal-exit": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+        "json-schema": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+          "dev": true,
+          "optional": true
         },
-        "sntp": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+        "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,
+          "optional": true,
           "requires": {
-            "hoek": "2.16.3"
+            "jsonify": "0.0.0"
           }
         },
-        "split-array-stream": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
-          "requires": {
-            "async": "2.5.0",
-            "is-stream-ended": "0.1.3"
-          }
+        "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,
+          "optional": true
         },
-        "sshpk": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-          "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+        "jsonify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+          "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+          "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",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
+            "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="
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "stream-events": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
-          "requires": {
-            "stubs": "3.0.0"
-          }
-        },
-        "stream-shift": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-          "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
-        },
-        "string-format-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg="
+        "mime-db": {
+          "version": "1.27.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+          "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+          "dev": true
         },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+        "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": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "mime-db": "1.27.0"
           }
         },
-        "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==",
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "brace-expansion": "1.1.7"
           }
         },
-        "stringstream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "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=",
+        "mkdirp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "minimist": "0.0.8"
           }
         },
-        "stubs": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls="
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true,
+          "optional": true
         },
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
+            "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"
           }
         },
-        "topo": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "hoek": "2.16.3"
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
           }
         },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-          "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+        "npmlog": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
+          "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "punycode": "1.4.1"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+        "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
+        },
+        "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,
+          "optional": 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,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "wrappy": "1.0.2"
           }
         },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+        "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,
           "optional": true
         },
-        "typedarray": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+        "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,
+          "optional": true
         },
-        "unique-string": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-          "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+        "osenv": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "crypto-random-string": "1.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+        "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
         },
-        "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+        "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,
+          "optional": true
         },
-        "verror": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+        "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
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "1.3.0"
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+            "minimist": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "dev": true,
+              "optional": true
             }
           }
-        },
-        "websocket-driver": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
+          "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
           "dev": true,
           "requires": {
-            "websocket-extensions": "0.1.1"
+            "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"
           }
         },
-        "websocket-extensions": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-          "dev": true
-        },
-        "window-size": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+        "request": {
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+          "dev": true,
+          "optional": true,
           "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1"
+            "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"
           }
         },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
-        "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==",
+        "rimraf": {
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
+            "glob": "7.1.2"
           }
         },
-        "xdg-basedir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-          "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
+        "safe-buffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
           "dev": true
         },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true,
+          "optional": true
         },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+        "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,
+          "optional": true
         },
-        "yargs": {
-          "version": "3.32.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
-          "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"
-          }
-        }
-      }
-    },
-    "firebase-tools": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.12.0.tgz",
-      "integrity": "sha1-uIquvtjTE+tZ3qiRcbZoeaRlKJg=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
-        "JSONStream": "1.3.1",
-        "archiver": "0.16.0",
-        "chalk": "1.1.3",
-        "cjson": "0.3.3",
-        "cli-table": "0.3.1",
-        "commander": "2.11.0",
-        "configstore": "1.4.0",
-        "cross-spawn": "4.0.2",
-        "csv-streamify": "3.0.4",
-        "didyoumean": "1.2.1",
-        "es6-set": "0.1.5",
-        "exit-code": "1.0.2",
-        "filesize": "3.5.10",
-        "firebase": "2.4.2",
-        "fs-extra": "0.23.1",
-        "fstream-ignore": "1.0.5",
-        "glob": "7.1.2",
-        "google-auto-auth": "0.7.2",
-        "inquirer": "0.12.0",
-        "jsonschema": "1.2.0",
-        "jsonwebtoken": "7.4.3",
-        "lodash": "4.17.4",
-        "open": "0.0.5",
-        "ora": "0.2.3",
-        "portfinder": "0.4.0",
-        "progress": "2.0.0",
-        "request": "2.83.0",
-        "rsvp": "3.6.2",
-        "semver": "5.4.1",
-        "superstatic": "5.0.1",
-        "tar": "3.2.1",
-        "tmp": "0.0.27",
-        "universal-analytics": "0.3.11",
-        "update-notifier": "0.5.0",
-        "user-home": "2.0.0",
-        "uuid": "3.1.0",
-        "winston": "1.1.2"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
-          "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,
+          "optional": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "sntp": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
           "dev": true,
+          "optional": 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"
+            "hoek": "2.16.3"
           }
         },
-        "configstore": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
-          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+        "sshpk": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
+          "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "mkdirp": "0.5.1",
-            "object-assign": "4.1.1",
-            "os-tmpdir": "1.0.2",
-            "osenv": "0.1.4",
-            "uuid": "2.0.3",
-            "write-file-atomic": "1.3.4",
-            "xdg-basedir": "2.0.0"
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
           },
           "dependencies": {
-            "uuid": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-              "dev": true
+            "assert-plus": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "firebase": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
-          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+        "string_decoder": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
           "dev": true,
           "requires": {
-            "faye-websocket": "0.9.3"
-          },
-          "dependencies": {
-            "faye-websocket": {
-              "version": "0.9.3",
-              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-              "dev": true,
-              "requires": {
-                "websocket-driver": "0.5.2"
-              },
-              "dependencies": {
-                "websocket-driver": {
-                  "version": "0.5.2",
-                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
-                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
-                  "dev": true,
-                  "requires": {
-                    "websocket-extensions": "0.1.1"
-                  },
-                  "dependencies": {
-                    "websocket-extensions": {
-                      "version": "0.1.1",
-                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            }
+            "safe-buffer": "5.0.1"
           }
         },
-        "fs-extra": {
-          "version": "0.23.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
-          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
+        "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": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.1"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
-        "pkginfo": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
-          "dev": true
+        "stringstream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+          "dev": true,
+          "optional": 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
+        "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"
+          }
         },
-        "winston": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
+        "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,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+          "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
           "dev": true,
           "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
           }
         },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+        "tar-pack": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+          "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
+            "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"
           }
         },
-        "xdg-basedir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+        "tough-cookie": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "os-homedir": "1.0.2"
+            "punycode": "1.4.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
-    },
-    "flat-arguments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "1.1.1",
-        "as-array": "1.0.0",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isobject": "3.0.2"
-      },
-      "dependencies": {
-        "as-array": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "lodash.isarguments": "2.4.1",
-            "lodash.isobject": "2.4.1",
-            "lodash.values": "2.4.1"
-          },
-          "dependencies": {
-            "lodash.isarguments": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
-              "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"
-              }
-            }
+            "safe-buffer": "5.0.1"
           }
         },
-        "lodash.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+        "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
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+          "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+          "dev": true,
+          "optional": 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
-        }
-      }
-    },
-    "flat-cache": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "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"
-      }
-    },
-    "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.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "dev": true,
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true,
-      "optional": 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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
-      },
-      "dependencies": {
-        "jsonfile": {
+        },
+        "uuid": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
+          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
+          "dev": true,
+          "optional": 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,
+          "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "extsprintf": "1.0.2"
           }
-        }
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "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,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "dev": true
+        }
+      }
     },
     "fstream": {
       "version": "1.0.11",
@@ -7049,6 +9058,12 @@
         "minimatch": "3.0.4"
       }
     },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
     "gather-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
@@ -7081,25 +9096,13 @@
       }
     },
     "gcp-metadata": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.0.tgz",
-      "integrity": "sha512-puqMtZV/eukdfsafq0tir21+/k9hPbN9FRhgeN7NwtvEJQaviJoZOOlh1+dBeWgsRSYwAqcEVh63grU7a6bJyw==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
       "dev": true,
       "requires": {
         "extend": "3.0.1",
-        "retry-request": "3.0.0"
-      },
-      "dependencies": {
-        "retry-request": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
-          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
-          "dev": true,
-          "requires": {
-            "request": "2.83.0",
-            "through2": "2.0.3"
-          }
-        }
+        "retry-request": "3.1.0"
       }
     },
     "gcs-resumable-upload": {
@@ -7191,7 +9194,7 @@
         "dargs": "4.1.0",
         "lodash.template": "4.4.0",
         "meow": "3.7.0",
-        "split2": "2.1.1",
+        "split2": "2.2.0",
         "through2": "2.0.3"
       },
       "dependencies": {
@@ -7227,9 +9230,9 @@
       }
     },
     "git-semver-tags": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz",
-      "integrity": "sha512-fFyxtzTHCTQKwB4clA2AInVrlflBbVbbJD4NWwmxKXHUgsU/K9kmHNlkPLqFiuy9xu9q3lNopghR4VXeQwZbTQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
+      "integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
       "dev": true,
       "requires": {
         "meow": "3.7.0",
@@ -7248,7 +9251,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -7566,7 +9569,7 @@
       "dev": true,
       "requires": {
         "async": "2.5.0",
-        "gcp-metadata": "0.3.0",
+        "gcp-metadata": "0.3.1",
         "google-auth-library": "0.10.0",
         "request": "2.83.0"
       }
@@ -7603,6 +9606,67 @@
         }
       }
     },
+    "google-gax": {
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.2.tgz",
+      "integrity": "sha1-Kx8rhui+mKYgBBzucQ5PTOYbbis=",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "globby": "6.1.0",
+        "google-auto-auth": "0.7.2",
+        "google-proto-files": "0.13.1",
+        "grpc": "1.4.1",
+        "is-stream-ended": "0.1.3",
+        "lodash": "4.17.4",
+        "process-nextick-args": "1.0.7",
+        "protobufjs": "6.8.0",
+        "readable-stream": "2.3.3",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "google-proto-files": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
+          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
+          "dev": true
+        },
+        "protobufjs": {
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+          "dev": true,
+          "requires": {
+            "@protobufjs/aspromise": "1.1.2",
+            "@protobufjs/base64": "1.1.2",
+            "@protobufjs/codegen": "2.0.4",
+            "@protobufjs/eventemitter": "1.1.0",
+            "@protobufjs/fetch": "1.1.0",
+            "@protobufjs/float": "1.0.2",
+            "@protobufjs/inquire": "1.1.0",
+            "@protobufjs/path": "1.1.2",
+            "@protobufjs/pool": "1.1.0",
+            "@protobufjs/utf8": "1.1.0",
+            "@types/long": "3.0.32",
+            "@types/node": "7.0.46",
+            "long": "3.2.0"
+          }
+        }
+      }
+    },
     "google-p12-pem": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
@@ -7692,7 +9756,6 @@
       "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.4.1.tgz",
       "integrity": "sha1-PuSoNGphPygjkoyfj5kIG2No7Hw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "arguejs": "0.2.3",
         "lodash": "4.17.4",
@@ -7706,7 +9769,6 @@
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
           "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
           "dev": true,
-          "optional": true,
           "requires": {
             "mkdirp": "0.5.1",
             "nopt": "4.0.1",
@@ -7741,7 +9803,6 @@
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
               "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "abbrev": "1.1.0",
                 "osenv": "0.1.4"
@@ -7751,15 +9812,13 @@
                   "version": "1.1.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
                   "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "osenv": {
                   "version": "0.1.4",
                   "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
                   "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "os-homedir": "1.0.2",
                     "os-tmpdir": "1.0.2"
@@ -7769,15 +9828,13 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
                       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     },
                     "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,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 }
@@ -7788,7 +9845,6 @@
               "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
               "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "are-we-there-yet": "1.1.4",
                 "console-control-strings": "1.1.0",
@@ -7801,7 +9857,6 @@
                   "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
                   "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "delegates": "1.0.0",
                     "readable-stream": "2.3.2"
@@ -7811,15 +9866,13 @@
                       "version": "1.0.0",
                       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
                       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     },
                     "readable-stream": {
                       "version": "2.3.2",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
                       "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "core-util-is": "1.0.2",
                         "inherits": "2.0.3",
@@ -7834,29 +9887,25 @@
                           "version": "1.0.2",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-                          "dev": true,
-                          "optional": true
+                          "dev": true
                         },
                         "inherits": {
                           "version": "2.0.3",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                          "dev": true,
-                          "optional": true
+                          "dev": true
                         },
                         "isarray": {
                           "version": "1.0.0",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
                           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                          "dev": true,
-                          "optional": true
+                          "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,
-                          "optional": true
+                          "dev": true
                         },
                         "safe-buffer": {
                           "version": "5.1.1",
@@ -7869,7 +9918,6 @@
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
                           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
                           "dev": true,
-                          "optional": true,
                           "requires": {
                             "safe-buffer": "5.1.1"
                           }
@@ -7878,8 +9926,7 @@
                           "version": "1.0.2",
                           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
                           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                          "dev": true,
-                          "optional": true
+                          "dev": true
                         }
                       }
                     }
@@ -7896,7 +9943,6 @@
                   "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
                   "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "aproba": "1.1.2",
                     "console-control-strings": "1.1.0",
@@ -7912,29 +9958,25 @@
                       "version": "1.1.2",
                       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
                       "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     },
                     "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,
-                      "optional": true
+                      "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,
-                      "optional": true
+                      "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,
-                      "optional": true
+                      "dev": true
                     },
                     "string-width": {
                       "version": "1.0.2",
@@ -7994,7 +10036,6 @@
                       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
                       "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "string-width": "1.0.2"
                       }
@@ -8005,8 +10046,7 @@
                   "version": "2.0.0",
                   "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
                   "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 }
               }
             },
@@ -8015,7 +10055,6 @@
               "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
               "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "deep-extend": "0.4.2",
                 "ini": "1.3.4",
@@ -8027,29 +10066,25 @@
                   "version": "0.4.2",
                   "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
                   "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "ini": {
                   "version": "1.3.4",
                   "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
                   "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "minimist": {
                   "version": "1.2.0",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
                   "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "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,
-                  "optional": true
+                  "dev": true
                 }
               }
             },
@@ -8058,7 +10093,6 @@
               "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
               "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "aws-sign2": "0.6.0",
                 "aws4": "1.6.0",
@@ -8088,22 +10122,19 @@
                   "version": "0.6.0",
                   "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
                   "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "aws4": {
                   "version": "1.6.0",
                   "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
                   "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "caseless": {
                   "version": "0.12.0",
                   "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
                   "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "combined-stream": {
                   "version": "1.0.5",
@@ -8126,22 +10157,19 @@
                   "version": "3.0.1",
                   "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
                   "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-                  "dev": true,
-                  "optional": true
+                  "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,
-                  "optional": true
+                  "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,
-                  "optional": true,
                   "requires": {
                     "asynckit": "0.4.0",
                     "combined-stream": "1.0.5",
@@ -8152,8 +10180,7 @@
                       "version": "0.4.0",
                       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
                       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 },
@@ -8162,7 +10189,6 @@
                   "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
                   "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "ajv": "4.11.8",
                     "har-schema": "1.0.5"
@@ -8173,7 +10199,6 @@
                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
                       "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "co": "4.6.0",
                         "json-stable-stringify": "1.0.1"
@@ -8183,15 +10208,13 @@
                           "version": "4.6.0",
                           "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
                           "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-                          "dev": true,
-                          "optional": true
+                          "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,
-                          "optional": true,
                           "requires": {
                             "jsonify": "0.0.0"
                           },
@@ -8200,8 +10223,7 @@
                               "version": "0.0.0",
                               "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
                               "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-                              "dev": true,
-                              "optional": true
+                              "dev": true
                             }
                           }
                         }
@@ -8211,8 +10233,7 @@
                       "version": "1.0.5",
                       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
                       "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 },
@@ -8221,7 +10242,6 @@
                   "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
                   "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "boom": "2.10.1",
                     "cryptiles": "2.0.5",
@@ -8243,7 +10263,6 @@
                       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
                       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "boom": "2.10.1"
                       }
@@ -8259,7 +10278,6 @@
                       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
                       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "hoek": "2.16.3"
                       }
@@ -8271,7 +10289,6 @@
                   "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
                   "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "assert-plus": "0.2.0",
                     "jsprim": "1.4.0",
@@ -8282,15 +10299,13 @@
                       "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,
-                      "optional": true
+                      "dev": true
                     },
                     "jsprim": {
                       "version": "1.4.0",
                       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
                       "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "assert-plus": "1.0.0",
                         "extsprintf": "1.0.2",
@@ -8302,8 +10317,7 @@
                           "version": "1.0.0",
                           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
                           "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                          "dev": true,
-                          "optional": true
+                          "dev": true
                         },
                         "extsprintf": {
                           "version": "1.0.2",
@@ -8315,15 +10329,13 @@
                           "version": "0.2.3",
                           "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
                           "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-                          "dev": true,
-                          "optional": true
+                          "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,
-                          "optional": true,
                           "requires": {
                             "extsprintf": "1.0.2"
                           }
@@ -8335,7 +10347,6 @@
                       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
                       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "asn1": "0.2.3",
                         "assert-plus": "1.0.0",
@@ -8351,8 +10362,7 @@
                           "version": "0.2.3",
                           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
                           "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-                          "dev": true,
-                          "optional": true
+                          "dev": true
                         },
                         "assert-plus": {
                           "version": "1.0.0",
@@ -8375,7 +10385,6 @@
                           "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
                           "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
                           "dev": true,
-                          "optional": true,
                           "requires": {
                             "assert-plus": "1.0.0"
                           }
@@ -8395,7 +10404,6 @@
                           "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
                           "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
                           "dev": true,
-                          "optional": true,
                           "requires": {
                             "assert-plus": "1.0.0"
                           }
@@ -8422,22 +10430,19 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
                   "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "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,
-                  "optional": true
+                  "dev": true
                 },
                 "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,
-                  "optional": true
+                  "dev": true
                 },
                 "mime-types": {
                   "version": "2.1.15",
@@ -8460,22 +10465,19 @@
                   "version": "0.8.2",
                   "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
                   "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-                  "dev": true,
-                  "optional": true
+                  "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,
-                  "optional": true
+                  "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,
-                  "optional": true
+                  "dev": true
                 },
                 "safe-buffer": {
                   "version": "5.1.1",
@@ -8487,15 +10489,13 @@
                   "version": "0.0.5",
                   "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
                   "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 },
                 "tough-cookie": {
                   "version": "2.3.2",
                   "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
                   "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "punycode": "1.4.1"
                   },
@@ -8504,8 +10504,7 @@
                       "version": "1.4.1",
                       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
                       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 },
@@ -8514,7 +10513,6 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
                   "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "safe-buffer": "5.1.1"
                   }
@@ -8523,8 +10521,7 @@
                   "version": "3.1.0",
                   "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
                   "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 }
               }
             },
@@ -8647,8 +10644,7 @@
               "version": "5.3.0",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
               "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "tar": {
               "version": "2.2.1",
@@ -8703,7 +10699,6 @@
               "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
               "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
               "dev": true,
-              "optional": true,
               "requires": {
                 "debug": "2.6.8",
                 "fstream": "1.0.11",
@@ -8720,7 +10715,6 @@
                   "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
                   "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "ms": "2.0.0"
                   },
@@ -8729,8 +10723,7 @@
                       "version": "2.0.0",
                       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
                       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 },
@@ -8765,7 +10758,6 @@
                   "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
                   "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "fstream": "1.0.11",
                     "inherits": "2.0.3",
@@ -8776,15 +10768,13 @@
                       "version": "2.0.3",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     },
                     "minimatch": {
                       "version": "3.0.4",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
                       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "brace-expansion": "1.1.8"
                       },
@@ -8794,7 +10784,6 @@
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
                           "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
                           "dev": true,
-                          "optional": true,
                           "requires": {
                             "balanced-match": "1.0.0",
                             "concat-map": "0.0.1"
@@ -8804,15 +10793,13 @@
                               "version": "1.0.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
                               "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-                              "dev": true,
-                              "optional": true
+                              "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,
-                              "optional": true
+                              "dev": true
                             }
                           }
                         }
@@ -8825,7 +10812,6 @@
                   "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
                   "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "wrappy": "1.0.2"
                   },
@@ -8834,8 +10820,7 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 },
@@ -8844,7 +10829,6 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
                   "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
                   "dev": true,
-                  "optional": true,
                   "requires": {
                     "core-util-is": "1.0.2",
                     "inherits": "2.0.3",
@@ -8859,29 +10843,25 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     },
                     "inherits": {
                       "version": "2.0.3",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     },
                     "isarray": {
                       "version": "1.0.0",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
                       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                      "dev": true,
-                      "optional": true
+                      "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,
-                      "optional": true
+                      "dev": true
                     },
                     "safe-buffer": {
                       "version": "5.1.1",
@@ -8894,7 +10874,6 @@
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
                       "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
                       "dev": true,
-                      "optional": true,
                       "requires": {
                         "safe-buffer": "5.1.1"
                       }
@@ -8903,8 +10882,7 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
                       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                      "dev": true,
-                      "optional": true
+                      "dev": true
                     }
                   }
                 },
@@ -8912,8 +10890,7 @@
                   "version": "0.0.6",
                   "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
                   "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-                  "dev": true,
-                  "optional": true
+                  "dev": true
                 }
               }
             }
@@ -8929,7 +10906,7 @@
       "requires": {
         "google-p12-pem": "0.1.2",
         "jws": "3.1.4",
-        "mime": "1.4.0",
+        "mime": "1.4.1",
         "request": "2.83.0"
       }
     },
@@ -9315,7 +11292,7 @@
           "requires": {
             "accepts": "1.2.13",
             "bytes": "2.1.0",
-            "compressible": "2.0.11",
+            "compressible": "2.0.12",
             "debug": "2.2.0",
             "on-headers": "1.0.1",
             "vary": "1.0.1"
@@ -9344,7 +11321,7 @@
             "finalhandler": "0.4.0",
             "fresh": "0.3.0",
             "http-errors": "1.3.1",
-            "method-override": "2.3.9",
+            "method-override": "2.3.10",
             "morgan": "1.6.1",
             "multiparty": "3.3.2",
             "on-headers": "1.0.1",
@@ -9418,7 +11395,7 @@
           "dev": true,
           "requires": {
             "inherits": "2.0.3",
-            "statuses": "1.3.1"
+            "statuses": "1.4.0"
           }
         },
         "iconv-lite": {
@@ -9563,14 +11540,14 @@
       }
     },
     "gulp-conventional-changelog": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.5.tgz",
-      "integrity": "sha512-BDY1JuryLGVpp1E8djSxVpv/shNmlkFgCDx3qhfFM5PRpkMFSunDrtQ7l3CokttreExC+X/EvxHKXL3GqWTs/Q==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.6.tgz",
+      "integrity": "sha512-zJ3ZfEukUqzLmFTWA5r8k9D4UAsymq+zsgINJmTRhw+H6Q1O9iCgREeye0gxicmusm6z6jI0fz5wLvlS66cmFg==",
       "dev": true,
       "requires": {
         "add-stream": "1.0.0",
         "concat-stream": "1.6.0",
-        "conventional-changelog": "1.1.5",
+        "conventional-changelog": "1.1.6",
         "gulp-util": "3.0.8",
         "object-assign": "4.1.1",
         "through2": "2.0.3"
@@ -9738,7 +11715,7 @@
       "requires": {
         "bufferstreams": "1.1.1",
         "gulp-util": "3.0.8",
-        "html-minifier": "3.5.5",
+        "html-minifier": "3.5.6",
         "object-assign": "4.1.1",
         "readable-stream": "2.3.3",
         "tryit": "1.0.3"
@@ -9902,9 +11879,9 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
-      "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
+      "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
       "dev": true,
       "requires": {
         "async": "1.5.2",
@@ -9942,7 +11919,7 @@
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "5.2.2",
+        "ajv": "5.2.3",
         "har-schema": "2.0.0"
       }
     },
@@ -10096,9 +12073,9 @@
       }
     },
     "html-minifier": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.5.tgz",
-      "integrity": "sha512-g+1+NBycQI0fGnggd52JM8TRUweG7+9W2wrtjGitMAqc4G7maweAHvVAAjz9veHseIH3tYKE2lk2USGSoewIrQ==",
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.6.tgz",
+      "integrity": "sha512-88FjtKrlak2XjczhxrBomgzV4jmGzM3UnHRBScRkJcmcRum0kb+IwhVAETJ8AVp7j0p3xugjSaw9L+RmI5/QOA==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
@@ -10108,17 +12085,23 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.1.1"
+        "uglify-js": "3.1.4"
       },
       "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
         "uglify-js": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.1.tgz",
-          "integrity": "sha512-f7DpmEgt/RYAKzQzcfahn3JYZHobDwTZCa8oixC7pweVGEIizTX2kTYdNWcdk00xsMJqUhI8RDAa9HXHXGhNxA==",
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.4.tgz",
+          "integrity": "sha512-DcbkPg11Lw2lAWpwCmQDX+qoR4JiII6ypsQmF6tscZtlxGPFAmSRUGuMoVT3/0EHqypVik/TpkH4ITiMJeQqQA==",
           "dev": true,
           "requires": {
             "commander": "2.11.0",
-            "source-map": "0.5.7"
+            "source-map": "0.6.1"
           }
         }
       }
@@ -10152,13 +12135,13 @@
         "depd": "1.1.1",
         "inherits": "2.0.3",
         "setprototypeof": "1.0.3",
-        "statuses": "1.3.1"
+        "statuses": "1.4.0"
       }
     },
     "http-parser-js": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.7.tgz",
-      "integrity": "sha1-HOzJxM6EXAKIIk2IRIVMHvCMmtc=",
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+      "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
       "dev": true
     },
     "http-proxy": {
@@ -10200,9 +12183,9 @@
       }
     },
     "i": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz",
-      "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz",
+      "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0=",
       "dev": true,
       "optional": true
     },
@@ -10390,9 +12373,9 @@
       "optional": true
     },
     "irregular-plurals": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz",
-      "integrity": "sha512-njf5A+Mxb3kojuHd1DzISjjIl+XhyzovXEOyPPSzdQozq/Lf2tN27mOrAAsxEPZxpn6I4MGzs1oo9TxXxPFpaA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz",
+      "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=",
       "dev": true
     },
     "is": {
@@ -10685,7 +12668,7 @@
       "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
       "dev": true,
       "requires": {
-        "text-extensions": "1.6.0"
+        "text-extensions": "1.7.0"
       }
     },
     "is-typedarray": {
@@ -10780,7 +12763,7 @@
         "escodegen": "1.8.1",
         "esprima": "2.7.3",
         "glob": "5.0.15",
-        "handlebars": "4.0.10",
+        "handlebars": "4.0.11",
         "js-yaml": "3.10.0",
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
@@ -10894,9 +12877,9 @@
       "dev": true
     },
     "jasminewd2": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.1.0.tgz",
-      "integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
       "dev": true
     },
     "jju": {
@@ -10913,7 +12896,7 @@
       "requires": {
         "hoek": "2.16.3",
         "isemail": "1.2.0",
-        "moment": "2.18.1",
+        "moment": "2.19.1",
         "topo": "1.1.0"
       },
       "dependencies": {
@@ -10989,12 +12972,12 @@
         "escodegen": "1.9.0",
         "html-encoding-sniffer": "1.0.1",
         "iconv-lite": "0.4.15",
-        "nwmatcher": "1.4.1",
+        "nwmatcher": "1.4.3",
         "parse5": "1.5.1",
         "request": "2.83.0",
         "sax": "1.2.4",
         "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "webidl-conversions": "3.0.1",
         "whatwg-encoding": "1.0.1",
         "whatwg-url": "3.1.0",
@@ -11072,16 +13055,6 @@
         "through2": "0.6.5"
       },
       "dependencies": {
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -11094,6 +13067,16 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -11158,6 +13141,16 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
+      }
+    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -11253,12 +13246,12 @@
       "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.0",
+        "bluebird": "3.5.1",
         "body-parser": "1.17.2",
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
-        "connect": "3.6.4",
+        "connect": "3.6.5",
         "core-js": "2.5.1",
         "di": "0.0.1",
         "dom-serialize": "2.2.1",
@@ -11269,7 +13262,7 @@
         "isbinaryfile": "3.0.2",
         "lodash": "3.10.1",
         "log4js": "0.6.38",
-        "mime": "1.4.0",
+        "mime": "1.4.1",
         "minimatch": "3.0.4",
         "optimist": "0.6.1",
         "qjobs": "1.1.5",
@@ -11313,13 +13306,13 @@
       "requires": {
         "browserstack": "1.5.0",
         "browserstacktunnel-wrapper": "2.0.1",
-        "q": "1.5.0"
+        "q": "1.5.1"
       },
       "dependencies": {
         "q": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-          "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
           "dev": true
         }
       }
@@ -11383,16 +13376,16 @@
       "integrity": "sha512-lEhtGRGS+3Yw6JSx/vJY9iQyHNtTjcojrSwNzqNUOaDceKDu9dPZqA/kr69bUO9G2T6GKbu8AZgXqy94qo31Jg==",
       "dev": true,
       "requires": {
-        "q": "1.5.0",
+        "q": "1.5.1",
         "sauce-connect-launcher": "1.2.2",
         "saucelabs": "1.4.0",
         "wd": "1.4.1"
       },
       "dependencies": {
         "q": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-          "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
           "dev": true
         }
       }
@@ -11991,8 +13984,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
       "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "longest": {
       "version": "1.0.1",
@@ -12107,18 +14099,6 @@
             "ms": "0.7.1"
           }
         },
-        "dependency-tree": {
-          "version": "5.11.0",
-          "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-5.11.0.tgz",
-          "integrity": "sha1-koRk1vknNgfT9muaV+JZ5jVmd1U=",
-          "dev": true,
-          "requires": {
-            "commander": "2.9.0",
-            "debug": "2.2.0",
-            "filing-cabinet": "1.9.0",
-            "precinct": "3.8.0"
-          }
-        },
         "ms": {
           "version": "0.7.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
@@ -12205,7 +14185,7 @@
       "integrity": "sha512-kxBL06p6iO2qPBHsqGK2b3cRwiRGpnmSuVWNhwHcMX7qJOUr1HvricYP1LZOCdkQBUp0jiWg2d6WJwR3vYgByw==",
       "dev": true,
       "requires": {
-        "vlq": "0.2.2"
+        "vlq": "0.2.3"
       }
     },
     "make-dir": {
@@ -12479,21 +14459,21 @@
       "dev": true
     },
     "method-override": {
-      "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz",
-      "integrity": "sha1-vRUfLONM8Bp2ykAKuVwBKxAtj3E=",
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz",
+      "integrity": "sha1-49r41d7hDdLc59SuiNYrvud0drQ=",
       "dev": true,
       "requires": {
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "methods": "1.1.2",
         "parseurl": "1.3.2",
-        "vary": "1.1.1"
+        "vary": "1.1.2"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -12529,9 +14509,9 @@
       }
     },
     "mime": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.0.tgz",
-      "integrity": "sha512-n9ChLv77+QQEapYz8lV+rIZAW3HhAPW2CXnzb1GN5uMkuczshwvkW7XPsbzU0ZQN3sP47Er2KVkp2p3KyqZKSQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
       "dev": true
     },
     "mime-db": {
@@ -12594,9 +14574,9 @@
       }
     },
     "minizlib": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz",
-      "integrity": "sha1-1cGr93vhVGGZUuJTM27Mq5sqMvU=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.4.tgz",
+      "integrity": "sha512-sN4U9tIJtBRwKbwgFh9qJfrPIQ/GGTRr1MGqkgOeMTLy8/lM0FcWU//FqlnZ3Vb7gJ+Mxh3FOg1EklibdajbaQ==",
       "dev": true,
       "requires": {
         "minipass": "2.2.1"
@@ -12649,59 +14629,53 @@
       }
     },
     "module-lookup-amd": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-4.0.4.tgz",
-      "integrity": "sha1-aSldvumGFjLGULY25qSQzHigp5k=",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-4.0.5.tgz",
+      "integrity": "sha1-WONT+dwB7OwFexzN0A7QWUhKzKU=",
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "debug": "2.2.0",
+        "debug": "3.1.0",
         "file-exists": "1.0.0",
         "find": "0.2.6",
         "requirejs": "2.2.0",
         "requirejs-config-file": "2.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "ms": "2.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
         }
       }
     },
     "moment": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-      "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
+      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=",
       "dev": true
     },
     "morgan": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz",
-      "integrity": "sha1-eErHc05KRTqcbm6GgKkyknXItoc=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
+      "integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
       "dev": true,
       "requires": {
-        "basic-auth": "1.1.0",
-        "debug": "2.6.8",
+        "basic-auth": "2.0.0",
+        "debug": "2.6.9",
         "depd": "1.1.1",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -13065,7 +15039,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.1.0"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
@@ -13154,9 +15128,9 @@
       }
     },
     "nwmatcher": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
-      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz",
+      "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==",
       "dev": true
     },
     "oauth-sign": {
@@ -13337,8 +15311,7 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
       "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "ora": {
       "version": "0.2.3",
@@ -13601,13 +15574,13 @@
       "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=",
       "dev": true,
       "requires": {
-        "@types/node": "6.0.89"
+        "@types/node": "6.0.90"
       },
       "dependencies": {
         "@types/node": {
-          "version": "6.0.89",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.89.tgz",
-          "integrity": "sha512-Z/67L97+6H1qJiEEHSN1SQapkWjDss1D90rAnFcQ6UxKkah9juzotK5UNEP1bDv/0lJ3NAQTnVfc/JWdgCGruA==",
+          "version": "6.0.90",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz",
+          "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==",
           "dev": true
         }
       }
@@ -13811,9 +15784,9 @@
       }
     },
     "postcss": {
-      "version": "5.2.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+      "version": "5.2.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+      "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
@@ -13851,7 +15824,7 @@
       "integrity": "sha1-xjGwicbM5CK5oQ86lY0r7dOBkyQ=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-media-query-parser": {
@@ -13869,28 +15842,7 @@
         "chalk": "1.1.3",
         "lodash": "4.17.4",
         "log-symbols": "1.0.2",
-        "postcss": "5.2.17"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
+        "postcss": "5.2.18"
       }
     },
     "postcss-resolve-nested-selector": {
@@ -13905,7 +15857,7 @@
       "integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "postcss-selector-parser": {
@@ -13932,13 +15884,13 @@
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "debug": "3.0.1",
+        "debug": "3.1.0",
         "detective-amd": "2.4.0",
         "detective-cjs": "2.0.0",
         "detective-es6": "1.2.0",
         "detective-less": "1.0.0",
-        "detective-sass": "2.0.0",
-        "detective-scss": "1.0.0",
+        "detective-sass": "2.0.1",
+        "detective-scss": "1.0.1",
         "detective-stylus": "1.0.0",
         "detective-typescript": "1.0.1",
         "module-definition": "2.2.4",
@@ -13946,9 +15898,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz",
-          "integrity": "sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14018,6 +15970,12 @@
         "asap": "2.0.6"
       }
     },
+    "promise-polyfill": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
+      "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=",
+      "dev": true
+    },
     "prompt": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz",
@@ -14086,7 +16044,6 @@
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
       "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "ascli": "1.0.1",
         "bytebuffer": "5.0.1",
@@ -14114,7 +16071,7 @@
         "chalk": "1.1.3",
         "glob": "7.1.2",
         "jasmine": "2.8.0",
-        "jasminewd2": "2.1.0",
+        "jasminewd2": "2.2.0",
         "optimist": "0.6.1",
         "q": "1.4.1",
         "saucelabs": "1.3.0",
@@ -14356,9 +16313,9 @@
       }
     },
     "rc": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-      "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
+      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
       "dev": true,
       "requires": {
         "deep-extend": "0.4.2",
@@ -14511,7 +16468,7 @@
       "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
       "dev": true,
       "requires": {
-        "rc": "1.2.1",
+        "rc": "1.2.2",
         "safe-buffer": "5.1.1"
       }
     },
@@ -14521,7 +16478,7 @@
       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
       "dev": true,
       "requires": {
-        "rc": "1.2.1"
+        "rc": "1.2.2"
       }
     },
     "relateurl": {
@@ -14750,9 +16707,9 @@
       }
     },
     "retry-request": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-2.0.5.tgz",
-      "integrity": "sha1-0ImhShXbntYGhbhgK0D03MDT+zw=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
+      "integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg==",
       "dev": true,
       "requires": {
         "request": "2.83.0",
@@ -14800,9 +16757,9 @@
       }
     },
     "rollup-plugin-alias": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.3.1.tgz",
-      "integrity": "sha1-qRUv7EtqZRDa6TmJUXynhTwypvo=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.4.0.tgz",
+      "integrity": "sha512-lB094zdi19FS+1bVarVp9kBN0Zk41PdTGoCk0z8xesKO7RGjOo18cp1hUzEqrOQ4bM9+KLD9nbnu/XUxQm9pbg==",
       "dev": true,
       "requires": {
         "slash": "1.0.0"
@@ -14821,18 +16778,18 @@
       }
     },
     "router": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/router/-/router-1.3.1.tgz",
-      "integrity": "sha1-5Z72T6/CIZShlphoNNiHBY12r0c=",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/router/-/router-1.3.2.tgz",
+      "integrity": "sha1-v6oWiIpSg9XuQNmZ2nqfoVKWpgw=",
       "dev": true,
       "requires": {
         "array-flatten": "2.1.1",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "methods": "1.1.2",
         "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "setprototypeof": "1.0.3",
-        "utils-merge": "1.0.0"
+        "setprototypeof": "1.1.0",
+        "utils-merge": "1.0.1"
       },
       "dependencies": {
         "array-flatten": {
@@ -14842,13 +16799,25 @@
           "dev": true
         },
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "dev": true
         }
       }
     },
@@ -14884,9 +16853,9 @@
       "dev": true
     },
     "rxjs": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
-      "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.0.tgz",
+      "integrity": "sha512-vmvP5y/oJIJmXKHY36PIjVeI/46Sny6BMBa7/ou2zsNz1PiqU/Gtcz1GujnHz5Qlxncv+J9VlWmttnshqFj3Kg==",
       "requires": {
         "symbol-observable": "1.0.4"
       }
@@ -15331,6 +17300,12 @@
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
           "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
           "dev": true
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true
         }
       }
     },
@@ -15433,7 +17408,7 @@
           "dev": true,
           "requires": {
             "inherits": "2.0.3",
-            "statuses": "1.3.1"
+            "statuses": "1.4.0"
           }
         },
         "ms": {
@@ -15534,10 +17509,21 @@
       "dev": true
     },
     "slice-ansi": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0"
+      },
+      "dependencies": {
+        "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
+        }
+      }
     },
     "slice-stream": {
       "version": "1.0.0",
@@ -15589,6 +17575,12 @@
         "no-case": "2.3.2"
       }
     },
+    "snakeize": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/snakeize/-/snakeize-0.1.0.tgz",
+      "integrity": "sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=",
+      "dev": true
+    },
     "sntp": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
@@ -15771,7 +17763,7 @@
       "integrity": "sha1-mtb5vb1pGTEBbjCTnbyGhnMyMUY=",
       "dev": true,
       "requires": {
-        "vlq": "0.2.2"
+        "vlq": "0.2.3"
       }
     },
     "sparkles": {
@@ -15808,9 +17800,9 @@
       "dev": true
     },
     "specificity": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.1.tgz",
-      "integrity": "sha1-8bBoQkzjF64HR42V3jwhz4Xo1Wc=",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz",
+      "integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==",
       "dev": true
     },
     "split": {
@@ -15833,9 +17825,9 @@
       }
     },
     "split2": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-2.1.1.tgz",
-      "integrity": "sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
       "dev": true,
       "requires": {
         "through2": "2.0.3"
@@ -15870,9 +17862,9 @@
       "dev": true
     },
     "statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
       "dev": true
     },
     "stdout-stream": {
@@ -15949,6 +17941,15 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -15982,15 +17983,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "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"
-      }
-    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -16069,7 +18061,7 @@
         "log-symbols": "1.0.2",
         "minimist": "1.2.0",
         "plur": "2.1.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-reporter": "1.4.1",
         "postcss-selector-parser": "2.2.3",
         "read-file-stdin": "0.2.1",
@@ -16096,7 +18088,7 @@
           "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
           "dev": true,
           "requires": {
-            "irregular-plurals": "1.3.0"
+            "irregular-plurals": "1.4.0"
           }
         },
         "postcss-reporter": {
@@ -16108,7 +18100,7 @@
             "chalk": "1.1.3",
             "lodash": "4.17.4",
             "log-symbols": "1.0.2",
-            "postcss": "5.2.17"
+            "postcss": "5.2.18"
           }
         },
         "supports-color": {
@@ -16127,7 +18119,7 @@
       "requires": {
         "autoprefixer": "6.7.7",
         "balanced-match": "0.4.2",
-        "chalk": "2.1.0",
+        "chalk": "2.2.0",
         "colorguard": "1.2.0",
         "cosmiconfig": "2.2.2",
         "debug": "2.6.7",
@@ -16148,7 +18140,7 @@
         "micromatch": "2.3.11",
         "normalize-selector": "0.2.0",
         "pify": "2.3.0",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-less": "0.14.0",
         "postcss-media-query-parser": "0.2.3",
         "postcss-reporter": "3.0.0",
@@ -16157,13 +18149,13 @@
         "postcss-selector-parser": "2.2.3",
         "postcss-value-parser": "3.3.0",
         "resolve-from": "3.0.0",
-        "specificity": "0.3.1",
+        "specificity": "0.3.2",
         "string-width": "2.1.1",
         "style-search": "0.1.0",
         "stylehacks": "2.3.2",
         "sugarss": "0.2.0",
         "svg-tags": "1.0.0",
-        "table": "4.0.1"
+        "table": "4.0.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -16188,14 +18180,14 @@
           "dev": true
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
         "get-stdin": {
@@ -16249,9 +18241,9 @@
           }
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
@@ -16260,13 +18252,13 @@
       }
     },
     "stylus-lookup": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-1.0.1.tgz",
-      "integrity": "sha1-qMvC4NLYcVdMN/Dim0axjcmfHWk=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-1.0.2.tgz",
+      "integrity": "sha1-eVm+rAu1V+vROvO8Osvu/7J2YNQ=",
       "dev": true,
       "requires": {
         "commander": "2.8.1",
-        "debug": "2.2.0",
+        "debug": "3.1.0",
         "is-relative-path": "1.0.2"
       },
       "dependencies": {
@@ -16280,19 +18272,13 @@
           }
         },
         "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "ms": "2.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
         }
       }
     },
@@ -16302,7 +18288,7 @@
       "integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       }
     },
     "superstatic": {
@@ -16317,8 +18303,8 @@
         "chalk": "1.1.3",
         "char-spinner": "1.0.1",
         "compare-semver": "1.1.0",
-        "compression": "1.7.0",
-        "connect": "3.6.4",
+        "compression": "1.7.1",
+        "connect": "3.6.5",
         "connect-query": "1.0.0",
         "destroy": "1.0.4",
         "fast-url-parser": "1.1.3",
@@ -16331,12 +18317,12 @@
         "lodash": "4.17.4",
         "mime-types": "2.1.17",
         "minimatch": "3.0.4",
-        "morgan": "1.8.2",
+        "morgan": "1.9.0",
         "nash": "2.0.4",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1",
         "path-to-regexp": "1.7.0",
-        "router": "1.3.1",
+        "router": "1.3.2",
         "rsvp": "3.6.2",
         "string-length": "1.0.1",
         "try-require": "1.2.1",
@@ -16481,7 +18467,7 @@
       "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.1",
+        "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1"
       }
     },
@@ -16530,65 +18516,51 @@
       }
     },
     "table": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz",
-      "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "chalk": "1.1.3",
+        "ajv": "5.2.3",
+        "ajv-keywords": "2.1.0",
+        "chalk": "2.2.0",
         "lodash": "4.17.4",
-        "slice-ansi": "0.0.4",
+        "slice-ansi": "1.0.0",
         "string-width": "2.1.1"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
         "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
-            "ansi-styles": "2.2.1",
+            "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "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"
-              }
-            }
+            "supports-color": "4.5.0"
           }
         },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "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",
@@ -16615,10 +18587,13 @@
           }
         },
         "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
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
         }
       }
     },
@@ -16636,7 +18611,7 @@
       "requires": {
         "chownr": "1.0.1",
         "minipass": "2.2.1",
-        "minizlib": "1.0.3",
+        "minizlib": "1.0.4",
         "mkdirp": "0.5.1",
         "yallist": "3.0.2"
       },
@@ -16680,9 +18655,9 @@
       }
     },
     "text-extensions": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.6.0.tgz",
-      "integrity": "sha512-U2M04F2rbuYYCNioiTD14cImLTae4ys1rC57tllzKg3dt5DPR2JXs5yFdC017yOBrW6wM6s5gtAlFJ7yye04rA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz",
+      "integrity": "sha512-AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==",
       "dev": true
     },
     "text-table": {
@@ -16802,6 +18777,15 @@
             "ms": "0.7.1"
           }
         },
+        "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.7.0"
+          }
+        },
         "http-errors": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
@@ -16809,7 +18793,7 @@
           "dev": true,
           "requires": {
             "inherits": "2.0.3",
-            "statuses": "1.3.1"
+            "statuses": "1.4.0"
           }
         },
         "iconv-lite": {
@@ -16894,9 +18878,9 @@
       }
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "dev": true,
       "requires": {
         "punycode": "1.4.1"
@@ -16968,14 +18952,14 @@
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
-        "chalk": "2.1.0",
-        "diff": "3.3.1",
+        "chalk": "2.2.0",
+        "diff": "3.4.0",
         "make-error": "1.3.0",
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18",
         "tsconfig": "6.0.0",
-        "v8flags": "3.0.0",
+        "v8flags": "3.0.1",
         "yn": "2.0.0"
       },
       "dependencies": {
@@ -16989,14 +18973,14 @@
           }
         },
         "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "4.5.0"
           }
         },
         "has-flag": {
@@ -17006,27 +18990,21 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
             "has-flag": "2.0.0"
           }
         },
-        "user-home": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-          "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-          "dev": true
-        },
         "v8flags": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.0.tgz",
-          "integrity": "sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA==",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.1.tgz",
+          "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=",
           "dev": true,
           "requires": {
-            "user-home": "1.1.1"
+            "homedir-polyfill": "1.0.1"
           }
         }
       }
@@ -17085,9 +19063,9 @@
       }
     },
     "tslib": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",
-      "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz",
+      "integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg=="
     },
     "tslint": {
       "version": "5.8.0",
@@ -17099,12 +19077,12 @@
         "builtin-modules": "1.1.1",
         "chalk": "2.2.0",
         "commander": "2.11.0",
-        "diff": "3.3.1",
+        "diff": "3.4.0",
         "glob": "7.1.2",
         "minimatch": "3.0.4",
         "resolve": "1.4.0",
         "semver": "5.4.1",
-        "tslib": "1.7.1",
+        "tslib": "1.8.0",
         "tsutils": "2.12.1"
       },
       "dependencies": {
@@ -17142,15 +19120,6 @@
           "requires": {
             "has-flag": "2.0.0"
           }
-        },
-        "tsutils": {
-          "version": "2.12.1",
-          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.1.tgz",
-          "integrity": "sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ=",
-          "dev": true,
-          "requires": {
-            "tslib": "1.7.1"
-          }
         }
       }
     },
@@ -17161,12 +19130,12 @@
       "dev": true
     },
     "tsutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.2.tgz",
-      "integrity": "sha1-LBSGukMSYIRbCsb5Aq/Z1wio6mo=",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.1.tgz",
+      "integrity": "sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ=",
       "dev": true,
       "requires": {
-        "tslib": "1.7.1"
+        "tslib": "1.8.0"
       }
     },
     "tunnel-agent": {
@@ -17676,7 +19645,7 @@
       "requires": {
         "async": "0.9.2",
         "deep-equal": "0.2.2",
-        "i": "0.3.5",
+        "i": "0.3.6",
         "mkdirp": "0.5.1",
         "ncp": "1.0.1",
         "rimraf": "2.6.1"
@@ -17749,9 +19718,9 @@
       "dev": true
     },
     "vary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
-      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
     "verror": {
@@ -17888,9 +19857,9 @@
       }
     },
     "vlq": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.2.tgz",
-      "integrity": "sha1-4xbVJXtAuGu0PLjV/qXX9U1rDKE=",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
+      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
       "dev": true
     },
     "void-elements": {
@@ -17988,9 +19957,9 @@
           }
         },
         "compress-commons": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.0.tgz",
-          "integrity": "sha1-WFhwku8g03y1i68AARLJJ4/3O58=",
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+          "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
           "dev": true,
           "requires": {
             "buffer-crc32": "0.2.13",
@@ -18000,9 +19969,9 @@
           }
         },
         "crc": {
-          "version": "3.4.4",
-          "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
-          "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+          "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
           "dev": true
         },
         "crc32-stream": {
@@ -18011,7 +19980,7 @@
           "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
           "dev": true,
           "requires": {
-            "crc": "3.4.4",
+            "crc": "3.5.0",
             "readable-stream": "2.3.3"
           }
         },
@@ -18111,7 +20080,7 @@
             "oauth-sign": "0.8.2",
             "qs": "6.3.2",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
+            "tough-cookie": "2.3.3",
             "tunnel-agent": "0.4.3",
             "uuid": "3.1.0"
           }
@@ -18156,7 +20125,7 @@
           "dev": true,
           "requires": {
             "archiver-utils": "1.3.0",
-            "compress-commons": "1.2.0",
+            "compress-commons": "1.2.2",
             "lodash": "4.16.2",
             "readable-stream": "2.3.3"
           }
@@ -18234,7 +20203,7 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": "0.4.7",
+        "http-parser-js": "0.4.9",
         "websocket-extensions": "0.1.2"
       }
     },
@@ -18317,9 +20286,9 @@
       "dev": true
     },
     "winston": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
-      "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz",
+      "integrity": "sha1-gIBQuT1SZh7Z+2wms/DIJnCLCu4=",
       "dev": true,
       "requires": {
         "async": "1.0.0",
@@ -18583,9 +20552,9 @@
       }
     },
     "zone.js": {
-      "version": "0.8.17",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.17.tgz",
-      "integrity": "sha1-TF5RhahX2o2nk9rzkZNxxaNrKgs="
+      "version": "0.8.18",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
+      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q=="
     }
   }
 }
diff --git a/package.json b/package.json
index 3f2886747dff..9d0fd48fcd56 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "@angular/forms": "~4.4.4",
     "@angular/platform-browser": "~4.4.4",
     "core-js": "^2.4.1",
-    "rxjs": "^5.0.1",
+    "rxjs": "^5.5.0",
     "systemjs": "0.19.43",
     "tsickle": "^0.23.5",
     "tslib": "^1.7.1",
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index bc4fe8a91022..41a4a19dcb0e 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -17,7 +17,7 @@ import {
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Platform} from '@angular/cdk/platform';
-import {first} from '@angular/cdk/rxjs';
+import {first} from 'rxjs/operators';
 import {InteractivityChecker} from './interactivity-checker';
 
 
@@ -283,7 +283,7 @@ export class FocusTrap {
     if (this._ngZone.isStable) {
       fn();
     } else {
-      first.call(this._ngZone.onStable.asObservable()).subscribe(fn);
+      this._ngZone.onStable.asObservable().pipe(first()).subscribe(fn);
     }
   }
 }
diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index 167ea52ba792..f4f50f4e9f7a 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -1,5 +1,5 @@
 import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
-import {first} from '@angular/cdk/rxjs';
+import {first} from 'rxjs/operators';
 import {QueryList} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
 import {createKeyboardEvent} from '../testing/event-objects';
@@ -196,7 +196,7 @@ describe('Key managers', () => {
 
       it('should emit tabOut when the tab key is pressed', () => {
         let spy = jasmine.createSpy('tabOut spy');
-        first.call(keyManager.tabOut).subscribe(spy);
+        keyManager.tabOut.pipe(first()).subscribe(spy);
         keyManager.onKeydown(fakeKeyEvents.tab);
 
         expect(spy).toHaveBeenCalled();
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index 79299ed9731e..2f26b51f9a6e 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -10,7 +10,7 @@ import {QueryList} from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {UP_ARROW, DOWN_ARROW, TAB, A, Z, ZERO, NINE} from '@angular/cdk/keycodes';
-import {RxChain, debounceTime, filter, map, doOperator} from '@angular/cdk/rxjs';
+import {debounceTime, filter, map, tap} from 'rxjs/operators';
 
 /** This interface is for items that can be passed to a ListKeyManager. */
 export interface ListKeyManagerOption {
@@ -66,28 +66,28 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
     // Debounce the presses of non-navigational keys, collect the ones that correspond to letters
     // and convert those letters back into a string. Afterwards find the first item that starts
     // with that string and select it.
-    this._typeaheadSubscription = RxChain.from(this._letterKeyStream)
-      .call(doOperator, keyCode => this._pressedLetters.push(keyCode))
-      .call(debounceTime, debounceInterval)
-      .call(filter, () => this._pressedLetters.length > 0)
-      .call(map, () => this._pressedLetters.join(''))
-      .subscribe(inputString => {
-        const items = this._items.toArray();
-
-        // Start at 1 because we want to start searching at the item immediately
-        // following the current active item.
-        for (let i = 1; i < items.length + 1; i++) {
-          const index = (this._activeItemIndex + i) % items.length;
-          const item = items[index];
-
-          if (!item.disabled && item.getLabel!().toUpperCase().trim().indexOf(inputString) === 0) {
-            this.setActiveItem(index);
-            break;
-          }
+    this._typeaheadSubscription = this._letterKeyStream.pipe(
+      tap(keyCode => this._pressedLetters.push(keyCode)),
+      debounceTime(debounceInterval),
+      filter(() => this._pressedLetters.length > 0),
+      map(() => this._pressedLetters.join(''))
+    ).subscribe(inputString => {
+      const items = this._items.toArray();
+
+      // Start at 1 because we want to start searching at the item immediately
+      // following the current active item.
+      for (let i = 1; i < items.length + 1; i++) {
+        const index = (this._activeItemIndex + i) % items.length;
+        const item = items[index];
+
+        if (!item.disabled && item.getLabel!().toUpperCase().trim().indexOf(inputString) === 0) {
+          this.setActiveItem(index);
+          break;
         }
+      }
 
-        this._pressedLetters = [];
-      });
+      this._pressedLetters = [];
+    });
 
     return this;
   }
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
index 4af24b1f8a44..1db547fd4117 100644
--- a/src/cdk/layout/breakpoints-observer.ts
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -9,7 +9,7 @@ import {Injectable, NgZone, OnDestroy} from '@angular/core';
 import {MediaMatcher} from './media-matcher';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {RxChain, map, startWith, takeUntil} from '@angular/cdk/rxjs';
+import {map, startWith, takeUntil} from 'rxjs/operators';
 import {coerceArray} from '@angular/cdk/coercion';
 import {combineLatest} from 'rxjs/observable/combineLatest';
 import {fromEventPattern} from 'rxjs/observable/fromEventPattern';
@@ -75,7 +75,7 @@ export class BreakpointObserver implements OnDestroy {
 
     let mql: MediaQueryList = this.mediaMatcher.matchMedia(query);
     // Create callback for match changes and add it is as a listener.
-    let queryObservable = RxChain.from(fromEventPattern(
+    let queryObservable = fromEventPattern(
       // Listener callback methods are wrapped to be placed back in ngZone. Callbacks must be placed
       // back into the zone because matchMedia is only included in Zone.js by loading the
       // webapis-media-query.js file alongside the zone.js file.  Additionally, some browsers do not
@@ -86,11 +86,12 @@ export class BreakpointObserver implements OnDestroy {
       },
       (listener: MediaQueryListListener) => {
         mql.removeListener((e: MediaQueryList) => this.zone.run(() => listener(e)));
-      }))
-      .call(takeUntil, this._destroySubject)
-      .call(startWith, mql)
-      .call(map, (nextMql: MediaQueryList) => ({matches: nextMql.matches}))
-      .result();
+      })
+      .pipe(
+        takeUntil(this._destroySubject),
+        startWith(mql),
+        map((nextMql: MediaQueryList) => ({matches: nextMql.matches}))
+      );
 
     // Add the MediaQueryList to the set of queries.
     let output = {observable: queryObservable, mql: mql};
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index f4775f04f33a..9c0ab8528f67 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -19,7 +19,7 @@ import {
   NgZone,
 } from '@angular/core';
 import {Subject} from 'rxjs/Subject';
-import {RxChain, debounceTime} from '@angular/cdk/rxjs';
+import {debounceTime} from 'rxjs/operators';
 
 /**
  * Factory that creates a new MutationObserver and allows us to stub it out in unit tests.
@@ -60,9 +60,8 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
   ngAfterContentInit() {
     if (this.debounce > 0) {
       this._ngZone.runOutsideAngular(() => {
-        RxChain.from(this._debouncer)
-          .call(debounceTime, this.debounce)
-          .subscribe((mutations: MutationRecord[]) => this.event.emit(mutations));
+        this._debouncer.pipe(debounceTime(this.debounce))
+            .subscribe((mutations: MutationRecord[]) => this.event.emit(mutations));
       });
     } else {
       this._debouncer.subscribe(mutations => this.event.emit(mutations));
diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
index e2b0b4854cf0..3eee62dc56a4 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
@@ -9,7 +9,7 @@
 import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
 import {OverlayRef} from '../overlay-ref';
 import {Subscription} from 'rxjs/Subscription';
-import {RxChain, filter} from '@angular/cdk/rxjs';
+import {filter} from 'rxjs/operators';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 
 /**
@@ -57,12 +57,12 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
   private _subscribeToKeydownEvents(): void {
     const bodyKeydownEvents = fromEvent<KeyboardEvent>(document.body, 'keydown');
 
-    this._keydownEventSubscription = RxChain.from(bodyKeydownEvents)
-      .call(filter, () => !!this._attachedOverlays.length)
-      .subscribe(event => {
-        // Dispatch keydown event to correct overlay reference
-        this._selectOverlayFromEvent(event)._keydownEvents.next(event);
-      });
+    this._keydownEventSubscription = bodyKeydownEvents.pipe(
+      filter(() => !!this._attachedOverlays.length)
+    ).subscribe(event => {
+      // Dispatch keydown event to correct overlay reference
+      this._selectOverlayFromEvent(event)._keydownEvents.next(event);
+    });
   }
 
   /** Select the appropriate overlay from a keydown event. */
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index ba14fc01b57d..7b68d4e73af0 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -12,7 +12,7 @@ import {OverlayConfig} from './overlay-config';
 import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {first} from 'rxjs/operator/first';
+import {first} from 'rxjs/operators';
 
 
 /**
@@ -69,7 +69,7 @@ export class OverlayRef implements PortalHost {
     // Update the position once the zone is stable so that the overlay will be fully rendered
     // before attempting to position it, as the position may depend on the size of the rendered
     // content.
-    first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+    this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
       this.updatePosition();
     });
 
diff --git a/src/cdk/rxjs/index.ts b/src/cdk/rxjs/index.ts
deleted file mode 100644
index 96b6b70a6230..000000000000
--- a/src/cdk/rxjs/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-
-
-export * from './public-api';
diff --git a/src/cdk/rxjs/public-api.ts b/src/cdk/rxjs/public-api.ts
deleted file mode 100644
index 6e857f015fab..000000000000
--- a/src/cdk/rxjs/public-api.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-export * from './rx-chain';
-export * from './rx-operators';
diff --git a/src/cdk/rxjs/rx-chain.spec.ts b/src/cdk/rxjs/rx-chain.spec.ts
deleted file mode 100644
index e9bc10ec5401..000000000000
--- a/src/cdk/rxjs/rx-chain.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {Observable} from 'rxjs/Observable';
-import {of as observableOf} from 'rxjs/observable/of';
-import {RxChain, map, filter, first} from './index';
-
-describe('RxChain', () => {
-  it('should call all of the operators in the chain', () => {
-    let operators = { map, filter, first };
-
-    spyOn(operators, 'map');
-    spyOn(operators, 'filter');
-    spyOn(operators, 'first');
-
-    RxChain.from(observableOf(1, 2, 3))
-      .call(operators.map, i => i * 2)
-      .call(operators.filter, i => i % 2 === 0)
-      .call(operators.first);
-
-    expect(operators.map).toHaveBeenCalled();
-    expect(operators.filter).toHaveBeenCalled();
-    expect(operators.first).toHaveBeenCalled();
-  });
-
-  it('should be able to subscribe', () => {
-    const spy = jasmine.createSpy('subscription spy');
-
-    RxChain.from(observableOf(1, 2))
-      .call(map, i => i * 2)
-      .call(first)
-      .subscribe(spy);
-
-    expect(spy).toHaveBeenCalledWith(2);
-  });
-
-  it('should be able to return the result observable', () => {
-    const chain = RxChain.from(observableOf(1, 2))
-      .call(map, i => i * 2)
-      .call(first);
-
-    expect(chain.result() instanceof Observable).toBe(true);
-  });
-});
diff --git a/src/cdk/rxjs/rx-chain.ts b/src/cdk/rxjs/rx-chain.ts
deleted file mode 100644
index e6d61b9e68c3..000000000000
--- a/src/cdk/rxjs/rx-chain.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {Observable} from 'rxjs/Observable';
-import {Subscription} from 'rxjs/Subscription';
-import {StrictRxChain} from './rx-operators';
-
-/**
- * Utility class used to chain RxJS operators.
- *
- * This class is the concrete implementation, but the type used by the user when chaining
- * is StrictRxChain. The strict chain enforces types on the operators to the same level as
- * the prototype-added equivalents.
- */
-export class RxChain<T> {
-  private constructor(private _context: Observable<T>) { }
-
-  /**
-   * Starts a new chain and specifies the initial `this` value.
-   * @param context Initial `this` value for the chain.
-   */
-  static from<O>(context: Observable<O>): StrictRxChain<O> {
-    return new RxChain(context);
-  }
-
-  /**
-   * Invokes an RxJS operator as a part of the chain.
-   * @param operator Operator to be invoked.
-   * @param args Arguments to be passed to the operator.
-   */
-  call(operator: Function, ...args: any[]): RxChain<any> {
-    this._context = operator.call(this._context, ...args);
-    return this;
-  }
-
-  /**
-   * Subscribes to the result of the chain.
-   * @param fn Callback to be invoked when the result emits a value.
-   */
-  subscribe(fn: (t: T) => void): Subscription {
-    return this._context.subscribe(fn);
-  }
-
-  /**
-   * Returns the result of the chain.
-   */
-  result(): Observable<T> {
-    return this._context;
-  }
-}
diff --git a/src/cdk/rxjs/rx-operators.ts b/src/cdk/rxjs/rx-operators.ts
deleted file mode 100644
index fe5c6d32a407..000000000000
--- a/src/cdk/rxjs/rx-operators.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-// Subscribable needs to be imported because combineLatest has or is using it, but it does not need
-// to be used in any of the explicit typings in this file.
-// tslint:disable-next-line:no-unused-variable
-import {Observable, ObservableInput, Subscribable} from 'rxjs/Observable';
-import {PartialObserver} from 'rxjs/Observer';
-import {Subscription} from 'rxjs/Subscription';
-import {IScheduler} from 'rxjs/Scheduler';
-import {_finally as _finallyOperator} from 'rxjs/operator/finally';
-import {_catch as _catchOperator} from 'rxjs/operator/catch';
-import {_do as _doOperator} from 'rxjs/operator/do';
-import {map as mapOperator} from 'rxjs/operator/map';
-import {filter as filterOperator} from 'rxjs/operator/filter';
-import {share as shareOperator} from 'rxjs/operator/share';
-import {first as firstOperator} from 'rxjs/operator/first';
-import {switchMap as switchMapOperator} from 'rxjs/operator/switchMap';
-import {startWith as startWithOperator} from 'rxjs/operator/startWith';
-import {debounceTime as debounceTimeOperator} from 'rxjs/operator/debounceTime';
-import {auditTime as auditTimeOperator} from 'rxjs/operator/auditTime';
-import {takeUntil as takeUntilOperator} from 'rxjs/operator/takeUntil';
-import {combineLatest as combineLatestOperator} from 'rxjs/operator/combineLatest';
-import {delay as delayOperator} from 'rxjs/operator/delay';
-
-/**
- * Represents a strongly-typed chain of RxJS operators.
- *
- * We achieve strict type enforcement on the chained operators by creating types that
- * *unambiguously* match specific rxjs operators. These unambiguous types are created by
- * intersecting a "brand" to the `typeof` the existing operator. The brand (a class with a private
- * member) effectively forces nominal typing for the operators. This allows typescript to understand
- * that, for example, `filter` is *`filter`* and not, say, a map of T => boolean.
- *
- * The downside to this approach is that operators must be imported in their type-coerced form
- * rather than from the normal rxjs location.
- */
-export interface StrictRxChain<T> {
-  call<R>(operator: mapOperatorType<T, R>,
-          project: (value: T, index: number) => R, thisArg?: any): StrictRxChain<R>;
-
-  call<R>(operator: switchMapOperatorType<T, R>,
-          project: (value: T, index: number) => ObservableInput<R>): StrictRxChain<R>;
-
-  call<R>(operator: catchOperatorType<T, R>,
-          selector: (err: any, caught: Observable<T>) => ObservableInput<R>): StrictRxChain<T | R>;
-
-  call(operator: filterOperatorType<T>,
-       predicate: (value: T, index: number) => boolean, thisArg?: any): StrictRxChain<T>;
-
-  call(operator: shareOperatorType<T>): StrictRxChain<T>;
-
-  call(operator: finallyOperatorType<T>, action: () => void): StrictRxChain<T>;
-
-  call(operator: doOperatorType<T>, next: (x: T) => void, error?:
-      (e: any) => void, complete?: () => void): StrictRxChain<T>;
-
-  call(operator: doOperatorType<T>, observer: PartialObserver<T>): StrictRxChain<T>;
-
-  call(operator: firstOperatorType<T>, thisArg?: any, defaultValue?: any): StrictRxChain<T>;
-
-  call(operator: firstOperatorType<T>, predicate: (value: T) => boolean): StrictRxChain<T>;
-
-  call(operator: startWithOperatorType<T>, ...args: any[]): StrictRxChain<T>;
-
-  call(operator: debounceTimeOperatorType<T>, dueTime: number,
-       scheduler?: IScheduler): StrictRxChain<T>;
-
-  call(operator: auditTimeOperatorType<T>, duration: number,
-       scheduler?: IScheduler): StrictRxChain<T>;
-
-  call(operator: takeUntilOperatorType<T>, notifier: Observable<any>): StrictRxChain<T>;
-
-  call<T2>(operator: combineLatestOperatorType<T, T2>,
-           v2: ObservableInput<T2>): StrictRxChain<[T, T2]>;
-
-  call(operator: delayOperatorType<T>, delay: number | Date, scheduler?: IScheduler):
-      StrictRxChain<T>;
-
-  subscribe(fn: (t: T) => void): Subscription;
-
-  result(): Observable<T>;
-}
-
-/* tslint:disable:no-unused-variable */
-export class FinallyBrand { private _; }
-export class CatchBrand { private _; }
-export class DoBrand { private _; }
-export class MapBrand { private _; }
-export class FilterBrand { private _; }
-export class ShareBrand { private _; }
-export class FirstBrand { private _; }
-export class SwitchMapBrand { private _; }
-export class StartWithBrand { private _; }
-export class DebounceTimeBrand { private _; }
-export class AuditTimeBrand { private _; }
-export class TakeUntilBrand { private _; }
-export class CombineLatestBrand { private _; }
-export class DelayBrand { private _; }
-/* tslint:enable:no-unused-variable */
-
-
-export type finallyOperatorType<T> = typeof _finallyOperator & FinallyBrand;
-export type catchOperatorType<T, R> = typeof _catchOperator & CatchBrand;
-export type doOperatorType<T> = typeof _doOperator & DoBrand;
-export type mapOperatorType<T, R> = typeof mapOperator & MapBrand;
-export type filterOperatorType<T> = typeof filterOperator & FilterBrand;
-export type shareOperatorType<T> = typeof shareOperator & ShareBrand;
-export type firstOperatorType<T> = typeof firstOperator & FirstBrand;
-export type switchMapOperatorType<T, R> = typeof switchMapOperator & SwitchMapBrand;
-export type startWithOperatorType<T> = typeof startWithOperator & StartWithBrand;
-export type debounceTimeOperatorType<T> = typeof debounceTimeOperator & DebounceTimeBrand;
-export type auditTimeOperatorType<T> = typeof auditTimeOperator & AuditTimeBrand;
-export type takeUntilOperatorType<T> = typeof takeUntilOperator & TakeUntilBrand;
-export type combineLatestOperatorType<T, R> = typeof combineLatestOperator & CombineLatestBrand;
-export type delayOperatorType<T> = typeof delayOperator & DelayBrand;
-
-// We add `Function` to the type intersection to make this nominally different from
-// `finallyOperatorType` while still being structurally the same. Without this, TypeScript tries to
-// reduce `typeof _finallyOperator & FinallyBrand` to `finallyOperatorType<T>` and then fails
-// because `T` isn't known.
-export const finallyOperator =
-    _finallyOperator as typeof _finallyOperator & FinallyBrand & Function;
-export const catchOperator = _catchOperator as typeof _catchOperator & CatchBrand & Function;
-export const doOperator = _doOperator as typeof _doOperator & DoBrand & Function;
-export const map = mapOperator as typeof mapOperator & MapBrand & Function;
-export const filter = filterOperator as typeof filterOperator & FilterBrand & Function;
-export const share = shareOperator as typeof shareOperator & ShareBrand & Function;
-export const first = firstOperator as typeof firstOperator & FirstBrand & Function;
-export const switchMap = switchMapOperator as typeof switchMapOperator & SwitchMapBrand & Function;
-export const startWith = startWithOperator as typeof startWithOperator & StartWithBrand & Function;
-export const debounceTime =
-    debounceTimeOperator as typeof debounceTimeOperator & DebounceTimeBrand & Function;
-export const auditTime = auditTimeOperator as typeof auditTimeOperator & AuditTimeBrand & Function;
-export const takeUntil = takeUntilOperator as typeof takeUntilOperator & TakeUntilBrand & Function;
-export const combineLatest =
-    combineLatestOperator as typeof combineLatestOperator & CombineLatestBrand & Function;
-export const delay = delayOperator as typeof delayOperator & DelayBrand & Function;
diff --git a/src/cdk/rxjs/rxjs.md b/src/cdk/rxjs/rxjs.md
deleted file mode 100644
index c4c1718e238c..000000000000
--- a/src/cdk/rxjs/rxjs.md
+++ /dev/null
@@ -1,27 +0,0 @@
-### RxJS Usage
-When dealing with RxJS operators it is important to be aware that using the "patch" imports will
-pollute the global Observable object (e.g. `import "rxjs/add/operator/map"`).  When creating a
-component library, it is highly recommended to import the operator functions directly (e.g.
-`import "rxjs/operator/map"`):
-
-```ts
-// NO
-import 'rxjs/add/operator/map';
-someObservable.map(...).subscribe(...);
-
-// YES
-import {map} from 'rxjs/operator/map';
-map.call(someObservable, ...).subscribe(...);
-```
-
-#### RxChain
-Because this approach can be inflexible when dealing with long chains of operators. You should use
-the `RxChain` class to help with it:
-
-```ts
-// Before
-someObservable.filter(...).map(...).do(...);
-
-// After
-RxChain.from(someObservable).call(filter, ...).call(map, ...).subscribe(...);
-```
diff --git a/src/cdk/rxjs/tsconfig-build.json b/src/cdk/rxjs/tsconfig-build.json
deleted file mode 100644
index a03294444966..000000000000
--- a/src/cdk/rxjs/tsconfig-build.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-build",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/rxjs",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/rxjs/tsconfig-es5.json b/src/cdk/rxjs/tsconfig-es5.json
deleted file mode 100644
index 8c164ebef3de..000000000000
--- a/src/cdk/rxjs/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/rxjs",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 7b05738feb3a..c83da9888768 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -11,9 +11,9 @@ import {Platform} from '@angular/cdk/platform';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {Observable} from 'rxjs/Observable';
-import {fromEvent} from 'rxjs/observable/fromEvent';
 import {of as observableOf} from 'rxjs/observable/of';
-import {auditTime, filter} from '@angular/cdk/rxjs';
+import {fromEvent} from 'rxjs/observable/fromEvent';
+import {auditTime, filter} from 'rxjs/operators';
 import {CdkScrollable} from './scrollable';
 
 
@@ -82,7 +82,7 @@ export class ScrollDispatcher {
       // In the case of a 0ms delay, use an observable without auditTime
       // since it does add a perceptible delay in processing overhead.
       const subscription = auditTimeInMs > 0 ?
-        auditTime.call(this._scrolled, auditTimeInMs).subscribe(observer) :
+        this._scrolled.pipe(auditTime(auditTimeInMs)).subscribe(observer) :
         this._scrolled.subscribe(observer);
 
       this._scrolledCount++;
@@ -105,12 +105,12 @@ export class ScrollDispatcher {
    * @param elementRef Element whose ancestors to listen for.
    * @param auditTimeInMs Time to throttle the scroll events.
    */
-  ancestorScrolled(elementRef: ElementRef, auditTimeInMs?: number): Observable<CdkScrollable> {
+  ancestorScrolled(elementRef: ElementRef, auditTimeInMs?: number): Observable<CdkScrollable|void> {
     const ancestors = this.getAncestorScrollContainers(elementRef);
 
-    return filter.call(this.scrolled(auditTimeInMs), target => {
+    return this.scrolled(auditTimeInMs).pipe(filter(target => {
       return !target || ancestors.indexOf(target) > -1;
-    });
+    }));
   }
 
   /** Returns all registered Scrollables that contain the provided element. */
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index f042899a86e6..6e4e7cba2d67 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -11,7 +11,7 @@ import {Platform} from '@angular/cdk/platform';
 import {Observable} from 'rxjs/Observable';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
-import {auditTime} from 'rxjs/operator/auditTime';
+import {auditTime} from 'rxjs/operators';
 import {Subscription} from 'rxjs/Subscription';
 import {of as observableOf} from 'rxjs/observable/of';
 
@@ -107,8 +107,8 @@ export class ViewportRuler implements OnDestroy {
    * Returns a stream that emits whenever the size of the viewport changes.
    * @param throttle Time in milliseconds to throttle the stream.
    */
-  change(throttleTime: number = DEFAULT_RESIZE_TIME): Observable<string> {
-    return throttleTime > 0 ? auditTime.call(this._change, throttleTime) : this._change;
+  change(throttleTime: number = DEFAULT_RESIZE_TIME): Observable<Event> {
+    return throttleTime > 0 ? this._change.pipe(auditTime(throttleTime)) : this._change;
   }
 
   /** Caches the latest client rectangle of the document element. */
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index 6c4bbbd6dd47..c230023c675f 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -3,10 +3,9 @@ import {Component, ViewChild} from '@angular/core';
 import {CdkTable} from './table';
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
-import {Observable} from 'rxjs/Observable';
 import {combineLatest} from 'rxjs/observable/combineLatest';
 import {CdkTableModule} from './index';
-import {map} from 'rxjs/operator/map';
+import {map} from 'rxjs/operators';
 import {
   getTableDuplicateColumnNameError,
   getTableMissingMatchingRowDefError,
@@ -613,10 +612,10 @@ class FakeDataSource extends DataSource<TestData> {
     for (let i = 0; i < 3; i++) { this.addData(); }
   }
 
-  connect(collectionViewer: CollectionViewer): Observable<TestData[]> {
+  connect(collectionViewer: CollectionViewer) {
     this.isConnected = true;
     const streams = [this._dataChange, collectionViewer.viewChange];
-    return map.call(combineLatest(streams), ([data]) => data);
+    return combineLatest<TestData[]>(streams).pipe(map(([data]) => data));
   }
 
   disconnect() {
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 56d7e0662fbc..e19152df7497 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -31,7 +31,7 @@ import {
 } from '@angular/core';
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
 import {CdkCellOutlet, CdkCellOutletRowContext, CdkHeaderRowDef, CdkRowDef} from './row';
-import {takeUntil} from 'rxjs/operator/takeUntil';
+import {takeUntil} from 'rxjs/operators';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Subscription} from 'rxjs/Subscription';
 import {Subject} from 'rxjs/Subject';
@@ -272,7 +272,7 @@ export class CdkTable<T> implements CollectionViewer {
 
   /** Set up a subscription for the data provided by the data source. */
   private _observeRenderChanges() {
-    this._renderChangeSubscription = takeUntil.call(this.dataSource.connect(this), this._onDestroy)
+    this._renderChangeSubscription = this.dataSource.connect(this).pipe(takeUntil(this._onDestroy))
       .subscribe(data => {
         this._data = data;
         this._renderRowChanges();
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index bd6c644d9bb7..45452b17bfc5 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -43,7 +43,6 @@ System.config({
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
     '@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
-    '@angular/cdk/rxjs': 'dist/packages/cdk/rxjs/index.js',
     '@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
     '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
     '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
@@ -83,6 +82,7 @@ System.config({
   packages: {
     // Thirdparty barrels.
     'rxjs': {main: 'index'},
+    'rxjs/operators': {main: 'index'},
 
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 4a6d5613faa2..712bb231b4d9 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -41,7 +41,6 @@ System.config({
     '@angular/cdk/overlay': 'dist/bundles/cdk-overlay.umd.js',
     '@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
     '@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
-    '@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',
     '@angular/cdk/scrolling': 'dist/bundles/cdk-scrolling.umd.js',
     '@angular/cdk/stepper': 'dist/bundles/cdk-stepper.umd.js',
     '@angular/cdk/table': 'dist/bundles/cdk-table.umd.js',
@@ -82,7 +81,9 @@ System.config({
   },
   packages: {
     // Thirdparty barrels.
-    'rxjs': { main: 'index' },
+    'rxjs': {main: 'index'},
+    'rxjs/operators': {main: 'index'},
+
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
     '.': {
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index a7811a83b11c..1b9443b48a76 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -5,7 +5,6 @@
  * 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 {Directionality} from '@angular/cdk/bidi';
 import {DOWN_ARROW, ENTER, ESCAPE, UP_ARROW, TAB} from '@angular/cdk/keycodes';
 import {
@@ -18,7 +17,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
-import {filter, first, RxChain, switchMap, doOperator, delay} from '@angular/cdk/rxjs';
+import {filter, first, switchMap, tap, delay} from 'rxjs/operators';
 import {
   ChangeDetectorRef,
   Directive,
@@ -216,19 +215,20 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
       return observableOf(null);
     }
 
-    return RxChain.from(merge(
+    return merge(
       fromEvent(this._document, 'click'),
       fromEvent(this._document, 'touchend')
-    )).call(filter, (event: MouseEvent | TouchEvent) => {
+    )
+    .pipe(filter((event: MouseEvent | TouchEvent) => {
       const clickTarget = event.target as HTMLElement;
       const formField = this._formField ?
           this._formField._elementRef.nativeElement : null;
 
       return this._panelOpen &&
-             clickTarget !== this._element.nativeElement &&
-             (!formField || !formField.contains(clickTarget)) &&
-             (!!this._overlayRef && !this._overlayRef.overlayElement.contains(clickTarget));
-    }).result();
+              clickTarget !== this._element.nativeElement &&
+              (!formField || !formField.contains(clickTarget)) &&
+              (!!this._overlayRef && !this._overlayRef.overlayElement.contains(clickTarget));
+    }));
   }
 
   /**
@@ -364,25 +364,27 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    * stream every time the option list changes.
    */
   private _subscribeToClosingActions(): Subscription {
-    const firstStable = first.call(this._zone.onStable.asObservable());
-    const optionChanges = RxChain.from(this.autocomplete.options.changes)
-      .call(doOperator, () => this._positionStrategy.recalculateLastPosition())
+    const firstStable = this._zone.onStable.asObservable().pipe(first());
+    const optionChanges = this.autocomplete.options.changes.pipe(
+      tap(() => this._positionStrategy.recalculateLastPosition()),
       // Defer emitting to the stream until the next tick, because changing
       // bindings in here will cause "changed after checked" errors.
-      .call(delay, 0)
-      .result();
+      delay(0)
+    );
 
     // When the zone is stable initially, and when the option list changes...
-    return RxChain.from(merge(firstStable, optionChanges))
-      // create a new stream of panelClosingActions, replacing any previous streams
-      // that were created, and flatten it so our stream only emits closing events...
-      .call(switchMap, () => {
-        this._resetActiveItem();
-        this.autocomplete._setVisibility();
-        return this.panelClosingActions;
-      })
-      // when the first closing event occurs...
-      .call(first)
+    return merge(firstStable, optionChanges)
+      .pipe(
+        // create a new stream of panelClosingActions, replacing any previous streams
+        // that were created, and flatten it so our stream only emits closing events...
+        switchMap(() => {
+          this._resetActiveItem();
+          this.autocomplete._setVisibility();
+          return this.panelClosingActions;
+        }),
+        // when the first closing event occurs...
+        first()
+      )
       // set the value, close the panel, and complete.
       .subscribe(event => this._setValueAndClose(event));
   }
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 7a9698b8fbde..fd64301d34f9 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1,7 +1,7 @@
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW, TAB} from '@angular/cdk/keycodes';
 import {OverlayContainer} from '@angular/cdk/overlay';
-import {map, RxChain, startWith} from '@angular/cdk/rxjs';
+import {map, startWith} from 'rxjs/operators';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   createKeyboardEvent,
@@ -1737,13 +1737,12 @@ class NgIfAutocomplete {
   @ViewChildren(MatOption) matOptions: QueryList<MatOption>;
 
   constructor() {
-    this.filteredOptions = RxChain.from(this.optionCtrl.valueChanges)
-      .call(startWith, null)
-      .call(map, (val: string) => {
+    this.filteredOptions = this.optionCtrl.valueChanges.pipe(
+      startWith(null),
+      map((val: string) => {
         return val ? this.options.filter(option => new RegExp(val, 'gi').test(option))
-                   : this.options.slice();
-      })
-      .result();
+                    : this.options.slice();
+      }));
   }
 }
 
@@ -1864,13 +1863,12 @@ class AutocompleteWithNativeInput {
   @ViewChildren(MatOption) matOptions: QueryList<MatOption>;
 
   constructor() {
-    this.filteredOptions = RxChain.from(this.optionCtrl.valueChanges)
-      .call(startWith, null)
-      .call(map, (val: string) => {
+    this.filteredOptions = this.optionCtrl.valueChanges.pipe(
+      startWith(null),
+      map((val: string) => {
         return val ? this.options.filter(option => new RegExp(val, 'gi').test(option))
-                   : this.options.slice();
-      })
-      .result();
+                    : this.options.slice();
+      }));
   }
 }
 
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 040f862dabba..c38a31b462d1 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -11,7 +11,7 @@ import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
 import {BACKSPACE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
-import {startWith} from '@angular/cdk/rxjs';
+import {startWith} from 'rxjs/operators';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -335,7 +335,7 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
     });
 
     // When the list changes, re-subscribe
-    this._changeSubscription = startWith.call(this.chips.changes, null).subscribe(() => {
+    this._changeSubscription = this.chips.changes.pipe(startWith(null)).subscribe(() => {
       this._resetChips();
 
       // Reset chips selected/deselected status
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index fec74a95466e..b3e56927927c 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -36,7 +36,7 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
-import {first} from 'rxjs/operator/first';
+import {first} from 'rxjs/operators';
 import {Subscription} from 'rxjs/Subscription';
 import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
@@ -253,7 +253,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   /** Focuses the active cell after the microtask queue is empty. */
   _focusActiveCell() {
     this._ngZone.runOutsideAngular(() => {
-      first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+      this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
         this._elementRef.nativeElement.querySelector('.mat-calendar-body-active').focus();
       });
     });
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 5663e0526202..7b02a9e7993e 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal} from '@angular/cdk/portal';
-import {first} from '@angular/cdk/rxjs';
+import {first} from 'rxjs/operators';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -325,7 +325,7 @@ export class MatDatepicker<D> implements OnDestroy {
       componentRef.instance.datepicker = this;
 
       // Update the position once the calendar has rendered.
-      first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+      this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
         this._popupRef.updatePosition();
       });
     }
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 38a95f7eeb89..791613b681fa 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -7,7 +7,7 @@
  */
 
 import {OverlayRef, GlobalPositionStrategy} from '@angular/cdk/overlay';
-import {filter, first, RxChain} from '@angular/cdk/rxjs';
+import {filter, first} from 'rxjs/operators';
 import {DialogPosition} from './dialog-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
@@ -47,24 +47,26 @@ export class MatDialogRef<T> {
     readonly id: string = `mat-dialog-${uniqueId++}`) {
 
     // Emit when opening animation completes
-    RxChain.from(_containerInstance._animationStateChanged)
-      .call(filter, event => event.phaseName === 'done' && event.toState === 'enter')
-      .call(first)
-      .subscribe(() => {
-        this._afterOpen.next();
-        this._afterOpen.complete();
-      });
+    _containerInstance._animationStateChanged.pipe(
+      filter(event => event.phaseName === 'done' && event.toState === 'enter'),
+      first()
+    )
+    .subscribe(() => {
+      this._afterOpen.next();
+      this._afterOpen.complete();
+    });
 
     // Dispose overlay when closing animation is complete
-    RxChain.from(_containerInstance._animationStateChanged)
-      .call(filter, event => event.phaseName === 'done' && event.toState === 'exit')
-      .call(first)
-      .subscribe(() => {
-        this._overlayRef.dispose();
-        this._afterClosed.next(this._result);
-        this._afterClosed.complete();
-        this.componentInstance = null!;
-      });
+    _containerInstance._animationStateChanged.pipe(
+      filter(event => event.phaseName === 'done' && event.toState === 'exit'),
+      first()
+    )
+    .subscribe(() => {
+      this._overlayRef.dispose();
+      this._afterClosed.next(this._result);
+      this._afterClosed.complete();
+      this.componentInstance = null!;
+    });
   }
 
   /**
@@ -75,14 +77,15 @@ export class MatDialogRef<T> {
     this._result = dialogResult;
 
     // Transition the backdrop in parallel to the dialog.
-    RxChain.from(this._containerInstance._animationStateChanged)
-      .call(filter, event => event.phaseName === 'start')
-      .call(first)
-      .subscribe(() => {
-        this._beforeClose.next(dialogResult);
-        this._beforeClose.complete();
-        this._overlayRef.detachBackdrop();
-      });
+    this._containerInstance._animationStateChanged.pipe(
+      filter(event => event.phaseName === 'start'),
+      first()
+    )
+    .subscribe(() => {
+      this._beforeClose.next(dialogResult);
+      this._beforeClose.complete();
+      this._overlayRef.detachBackdrop();
+    });
 
     this._containerInstance._startExitAnimation();
   }
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index f3131d86bf90..e530771c43bb 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -15,7 +15,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
-import {RxChain, startWith, filter} from '@angular/cdk/rxjs';
+import {startWith, filter} from 'rxjs/operators';
 import {Location} from '@angular/common';
 import {
   ComponentRef,
@@ -89,7 +89,7 @@ export class MatDialog {
    */
   afterAllClosed: Observable<void> = defer<void>(() => this.openDialogs.length ?
       this._afterAllClosed :
-      startWith.call(this._afterAllClosed, undefined));
+      this._afterAllClosed.pipe(startWith(undefined)));
 
   constructor(
       private _overlay: Overlay,
@@ -242,9 +242,9 @@ export class MatDialog {
     }
 
     // Close when escape keydown event occurs
-    RxChain.from(overlayRef.keydownEvents())
-      .call(filter, event => event.keyCode === ESCAPE && !dialogRef.disableClose)
-      .subscribe(() => dialogRef.close());
+    overlayRef.keydownEvents().pipe(
+      filter(event => event.keyCode === ESCAPE && !dialogRef.disableClose)
+    ).subscribe(() => dialogRef.close());
 
     if (componentOrTemplateRef instanceof TemplateRef) {
       dialogContainer.attachTemplatePortal(
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index c2f5369fb93b..7722eb97dc68 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -9,7 +9,7 @@
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {ENTER, SPACE} from '@angular/cdk/keycodes';
-import {filter} from '@angular/cdk/rxjs';
+import {filter} from 'rxjs/operators';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -96,7 +96,7 @@ export class MatExpansionPanelHeader implements OnDestroy {
     this._parentChangeSubscription = merge(
       panel.opened,
       panel.closed,
-      filter.call(panel._inputChanges, changes => !!(changes.hideToggle || changes.disabled))
+      panel._inputChanges.pipe(filter(changes => !!(changes.hideToggle || changes.disabled)))
     )
     .subscribe(() => this._changeDetectorRef.markForCheck());
 
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 92e8ffa4e808..2ea2394981a7 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -8,7 +8,7 @@
 
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {first, startWith} from '@angular/cdk/rxjs';
+import {first, startWith} from 'rxjs/operators';
 import {
   AfterContentChecked,
   AfterContentInit,
@@ -177,7 +177,7 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
     }
 
     // Subscribe to changes in the child control state in order to update the form field UI.
-    startWith.call(this._control.stateChanges, null).subscribe(() => {
+    this._control.stateChanges.pipe(startWith(null!)).subscribe(() => {
       this._validatePlaceholders();
       this._syncDescribedByIds();
       this._changeDetectorRef.markForCheck();
@@ -191,13 +191,13 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
     }
 
     // Re-validate when the number of hints changes.
-    startWith.call(this._hintChildren.changes, null).subscribe(() => {
+    this._hintChildren.changes.pipe(startWith(null)).subscribe(() => {
       this._processHints();
       this._changeDetectorRef.markForCheck();
     });
 
     // Update the aria-described by when the number of errors changes.
-    startWith.call(this._errorChildren.changes, null).subscribe(() => {
+    this._errorChildren.changes.pipe(startWith(null)).subscribe(() => {
       this._syncDescribedByIds();
       this._changeDetectorRef.markForCheck();
     });
@@ -236,7 +236,7 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
       this._showAlwaysAnimate = true;
       this._floatPlaceholder = 'always';
 
-      first.call(fromEvent(this._placeholder.nativeElement, 'transitionend')).subscribe(() => {
+      fromEvent(this._placeholder.nativeElement, 'transitionend').pipe(first()).subscribe(() => {
         this._showAlwaysAnimate = false;
       });
 
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 5b7ae760bb2e..1d45680a75b6 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {catchOperator, doOperator, finallyOperator, map, RxChain, share} from '@angular/cdk/rxjs';
+import {catchError, tap, finalize, map, share} from 'rxjs/operators';
 import {Injectable, Optional, SecurityContext, SkipSelf} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
@@ -202,10 +202,10 @@ export class MatIconRegistry {
       return observableOf(cloneSvg(cachedIcon));
     }
 
-    return RxChain.from(this._loadSvgIconFromConfig(new SvgIconConfig(safeUrl)))
-      .call(doOperator, svg => this._cachedIconsByUrl.set(url!, svg))
-      .call(map, svg => cloneSvg(svg))
-      .result();
+    return this._loadSvgIconFromConfig(new SvgIconConfig(safeUrl)).pipe(
+      tap(svg => this._cachedIconsByUrl.set(url!, svg)),
+      map(svg => cloneSvg(svg))
+    );
   }
 
   /**
@@ -244,10 +244,10 @@ export class MatIconRegistry {
       return observableOf(cloneSvg(config.svgElement));
     } else {
       // Fetch the icon from the config's URL, cache it, and return a copy.
-      return RxChain.from(this._loadSvgIconFromConfig(config))
-          .call(doOperator, svg => config.svgElement = svg)
-          .call(map, svg => cloneSvg(svg))
-          .result();
+      return this._loadSvgIconFromConfig(config).pipe(
+        tap(svg => config.svgElement = svg),
+        map(svg => cloneSvg(svg))
+      );
     }
   }
 
@@ -277,27 +277,27 @@ export class MatIconRegistry {
     const iconSetFetchRequests: Observable<SVGElement | null>[] = iconSetConfigs
       .filter(iconSetConfig => !iconSetConfig.svgElement)
       .map(iconSetConfig => {
-        return RxChain.from(this._loadSvgIconSetFromConfig(iconSetConfig))
-          .call(catchOperator, (err: any): Observable<SVGElement | null> => {
+        return this._loadSvgIconSetFromConfig(iconSetConfig).pipe(
+          catchError((err: any): Observable<SVGElement | null> => {
             let url = this._sanitizer.sanitize(SecurityContext.RESOURCE_URL, iconSetConfig.url);
 
             // Swallow errors fetching individual URLs so the combined Observable won't
             // necessarily fail.
             console.log(`Loading icon set URL: ${url} failed: ${err}`);
             return observableOf(null);
-          })
-          .call(doOperator, svg => {
+          }),
+          tap(svg => {
             // Cache the SVG element.
             if (svg) {
               iconSetConfig.svgElement = svg;
             }
           })
-          .result();
+        );
       });
 
     // Fetch all the icon set URLs. When the requests complete, every IconSet should have a
     // cached SVG element (unless the request failed), and we can check again for the icon.
-    return map.call(forkJoin.call(Observable, iconSetFetchRequests), () => {
+    return forkJoin(iconSetFetchRequests).pipe(map(() => {
       const foundIcon = this._extractIconWithNameFromAnySet(name, iconSetConfigs);
 
       if (!foundIcon) {
@@ -305,7 +305,7 @@ export class MatIconRegistry {
       }
 
       return foundIcon;
-    });
+    }));
   }
 
   /**
@@ -333,8 +333,8 @@ export class MatIconRegistry {
    * from it.
    */
   private _loadSvgIconFromConfig(config: SvgIconConfig): Observable<SVGElement> {
-    return map.call(this._fetchUrl(config.url),
-        svgText => this._createSvgElementForSingleIcon(svgText));
+    return this._fetchUrl(config.url)
+        .pipe(map(svgText => this._createSvgElementForSingleIcon(svgText)));
   }
 
   /**
@@ -342,9 +342,8 @@ export class MatIconRegistry {
    * from it.
    */
   private _loadSvgIconSetFromConfig(config: SvgIconConfig): Observable<SVGElement> {
-      // TODO: Document that icons should only be loaded from trusted sources.
-    return map.call(this._fetchUrl(config.url),
-        svgText => this._svgElementFromString(svgText));
+    // TODO: Document that icons should only be loaded from trusted sources.
+    return this._fetchUrl(config.url).pipe(map(svgText => this._svgElementFromString(svgText)));
   }
 
   /**
@@ -464,10 +463,10 @@ export class MatIconRegistry {
 
     // TODO(jelbourn): for some reason, the `finally` operator "loses" the generic type on the
     // Observable. Figure out why and fix it.
-    const req = RxChain.from(this._httpClient.get(url, { responseType: 'text' }))
-      .call(finallyOperator, () => this._inProgressUrlFetches.delete(url))
-      .call(share)
-      .result();
+    const req = this._httpClient.get(url, {responseType: 'text'}).pipe(
+      finalize(() => this._inProgressUrlFetches.delete(url)),
+      share()
+    );
 
     this._inProgressUrlFetches.set(url, req);
     return req;
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index b7e474a065dd..88e20abb706e 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {first} from '@angular/cdk/rxjs';
+import {first} from 'rxjs/operators';
 import {
   Attribute,
   ChangeDetectionStrategy,
@@ -132,9 +132,10 @@ export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, Can
       if (this.svgIcon) {
         const [namespace, iconName] = this._splitIconName(this.svgIcon);
 
-        first.call(this._iconRegistry.getNamedSvgIcon(iconName, namespace)).subscribe(
-            svg => this._setSvgElement(svg),
-            (err: Error) => console.log(`Error retrieving icon: ${err.message}`));
+        this._iconRegistry.getNamedSvgIcon(iconName, namespace).pipe(first()).subscribe(
+          svg => this._setSvgElement(svg),
+          (err: Error) => console.log(`Error retrieving icon: ${err.message}`)
+        );
       } else {
         this._clearSvgElement();
       }
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index b7d2fbd29b65..742023b39340 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -10,7 +10,7 @@ import {AnimationEvent} from '@angular/animations';
 import {FocusKeyManager} from '@angular/cdk/a11y';
 import {Direction} from '@angular/cdk/bidi';
 import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
-import {RxChain, startWith, switchMap, first} from '@angular/cdk/rxjs';
+import {startWith, switchMap, first} from 'rxjs/operators';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -163,16 +163,15 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
   /** Stream that emits whenever the hovered menu item changes. */
   hover(): Observable<MatMenuItem> {
     if (this.items) {
-      return RxChain.from(this.items.changes)
-        .call(startWith, this.items)
-        .call(switchMap, (items: MatMenuItem[]) => merge(...items.map(item => item.hover)))
-        .result();
+      return this.items.changes.pipe(
+        startWith(this.items),
+        switchMap(items => merge(...items.map(item => item.hover)))
+      );
     }
 
-    return RxChain.from(this._ngZone.onStable.asObservable())
-      .call(first)
-      .call(switchMap, () => this.hover())
-      .result();
+    return this._ngZone.onStable
+      .asObservable()
+      .pipe(first(), switchMap(() => this.hover()));
   }
 
   /** Handle a keyboard event from the menu, delegating to the appropriate action. */
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index abc1a1a11998..1f0dd4861e2d 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -20,7 +20,7 @@ import {
   VerticalConnectionPos,
 } from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
-import {filter, RxChain} from '@angular/cdk/rxjs';
+import {filter} from 'rxjs/operators';
 import {
   AfterContentInit,
   Directive,
@@ -139,8 +139,8 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
 
     if (this.triggersSubmenu()) {
       // Subscribe to changes in the hovered item in order to toggle the panel.
-      this._hoverSubscription = filter
-          .call(this._parentMenu.hover(), active => active === this._menuItemInstance)
+      this._hoverSubscription = this._parentMenu.hover()
+          .pipe(filter(active => active === this._menuItemInstance))
           .subscribe(() => {
             this._openedByMouse = true;
             this.openMenu();
@@ -388,10 +388,10 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
   private _menuClosingActions() {
     const backdrop = this._overlayRef!.backdropClick();
     const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
-    const hover = this._parentMenu ? RxChain.from(this._parentMenu.hover())
-        .call(filter, active => active !== this._menuItemInstance)
-        .call(filter, () => this._menuOpen)
-        .result() : observableOf();
+    const hover = this._parentMenu ? this._parentMenu.hover().pipe(
+      filter(active => active !== this._menuItemInstance),
+      filter(() => this._menuOpen)
+    ) : observableOf();
 
     return merge(backdrop, parentClose, hover);
   }
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index d840b3198d46..f1fbe1ef28dd 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -40,7 +40,7 @@ import {
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {map} from 'rxjs/operator/map';
+import {map} from 'rxjs/operators';
 import {Subject} from 'rxjs/Subject';
 import {MatSelectModule} from './index';
 import {MatSelect} from './select';
@@ -2185,7 +2185,7 @@ describe('MatSelect', () => {
       it('should consider the selection a result of a user action when closed', fakeAsync(() => {
         const option = fixture.componentInstance.options.first;
         const spy = jasmine.createSpy('option selection spy');
-        const subscription = map.call(option.onSelectionChange, e => e.isUserInput).subscribe(spy);
+        const subscription = option.onSelectionChange.pipe(map(e => e.isUserInput)).subscribe(spy);
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
         expect(spy).toHaveBeenCalledWith(true);
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8ad70fc9d2dd..9ca633252822 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
   ViewportRuler,
 } from '@angular/cdk/overlay';
-import {filter, first, RxChain, startWith, takeUntil} from '@angular/cdk/rxjs';
+import {filter, first, startWith, takeUntil} from 'rxjs/operators';
 import {
   AfterContentInit,
   Attribute,
@@ -452,13 +452,10 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   ngAfterContentInit() {
     this._initKeyManager();
 
-    RxChain.from(this.options.changes)
-      .call(startWith, null)
-      .call(takeUntil, this._destroy)
-      .subscribe(() => {
-        this._resetOptions();
-        this._initializeSelection();
-      });
+    this.options.changes.pipe(startWith(null), takeUntil(this._destroy)).subscribe(() => {
+      this._resetOptions();
+      this._initializeSelection();
+    });
   }
 
   ngDoCheck() {
@@ -502,7 +499,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._changeDetectorRef.markForCheck();
 
     // Set the font size on the panel element once it exists.
-    first.call(this._ngZone.onStable.asObservable()).subscribe(() => {
+    this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
       if (this._triggerFontSize && this.overlayDir.overlayRef &&
           this.overlayDir.overlayRef.overlayElement) {
         this.overlayDir.overlayRef.overlayElement.style.fontSize = `${this._triggerFontSize}px`;
@@ -682,7 +679,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * Callback that is invoked when the overlay panel has been attached.
    */
   _onAttached(): void {
-    first.call(this.overlayDir.positionChange).subscribe(() => {
+    this.overlayDir.positionChange.pipe(first()).subscribe(() => {
       this._changeDetectorRef.detectChanges();
       this._calculateOverlayOffsetX();
       this.panel.nativeElement.scrollTop = this._scrollTop;
@@ -783,28 +780,26 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   /** Sets up a key manager to listen to keyboard events on the overlay panel. */
   private _initKeyManager() {
     this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withTypeAhead();
+    this._keyManager.tabOut.pipe(takeUntil(this._destroy)).subscribe(() => this.close());
 
-    takeUntil.call(this._keyManager.tabOut, this._destroy)
-      .subscribe(() => this.close());
-
-    RxChain.from(this._keyManager.change)
-      .call(takeUntil, this._destroy)
-      .call(filter, () => this._panelOpen && !!this.panel)
-      .subscribe(() => this._scrollActiveOptionIntoView());
+    this._keyManager.change.pipe(
+      takeUntil(this._destroy),
+      filter(() => this._panelOpen && !!this.panel)
+    ).subscribe(() => this._scrollActiveOptionIntoView());
   }
 
   /** Drops current option subscriptions and IDs and resets from scratch. */
   private _resetOptions(): void {
-    RxChain.from(this.optionSelectionChanges)
-      .call(takeUntil, merge(this._destroy, this.options.changes))
-      .call(filter, event => event.isUserInput)
-      .subscribe(event => {
-        this._onSelect(event.source);
-
-        if (!this.multiple) {
-          this.close();
-        }
-      });
+    this.optionSelectionChanges.pipe(
+      takeUntil(merge(this._destroy, this.options.changes)),
+      filter(event => event.isUserInput)
+    ).subscribe(event => {
+      this._onSelect(event.source);
+
+      if (!this.multiple) {
+        this.close();
+      }
+    });
 
     this._setOptionIds();
   }
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 464afbe4254c..710d17a1e2bb 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -5,7 +5,6 @@
  * 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 {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
 import {FocusTrap, FocusTrapFactory, FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
@@ -33,9 +32,9 @@ import {
 } from '@angular/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
+import {filter, first, startWith, takeUntil, map} from 'rxjs/operators';
 import {Subject} from 'rxjs/Subject';
 import {Observable} from 'rxjs/Observable';
-import {RxChain, filter, map, first, startWith, takeUntil} from '@angular/cdk/rxjs';
 
 
 /** Throws an exception when two MatDrawer are matching the same position. */
@@ -187,19 +186,13 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   /** Event emitted when the drawer has been opened. */
   @Output('opened')
   get _openedStream(): Observable<void> {
-    return RxChain.from(this.openedChange)
-        .call(filter, o => o)
-        .call(map, () => {})
-        .result();
+    return this.openedChange.pipe(filter(o => o), map(() => {}));
   }
 
   /** Event emitted when the drawer has been closed. */
   @Output('closed')
   get _closedStream(): Observable<void> {
-    return RxChain.from(this.openedChange)
-        .call(filter, o => !o)
-        .call(map, () => {})
-        .result();
+    return this.openedChange.pipe(filter(o => !o), map(() => {}));
   }
 
   /**
@@ -296,12 +289,12 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
    * @param openedVia Whether the drawer was opened by a key press, mouse click or programmatically.
    * Used for focus management after the sidenav is closed.
    */
-  open(openedVia?: FocusOrigin): Promise<MatDrawerToggleResult> {
+  open(openedVia?: FocusOrigin): Promise<void> {
     return this.toggle(true, openedVia);
   }
 
   /** Close the drawer. */
-  close(): Promise<MatDrawerToggleResult> {
+  close(): Promise<void> {
     return this.toggle(false);
   }
 
@@ -312,7 +305,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
    * Used for focus management after the sidenav is closed.
    */
   toggle(isOpen: boolean = !this.opened, openedVia: FocusOrigin = 'program'):
-    Promise<MatDrawerToggleResult> {
+    Promise<void> {
 
     this._opened = isOpen;
 
@@ -331,7 +324,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     // TODO(crisbeto): This promise is here for backwards-compatibility.
     // It should be removed next time we do breaking changes in the drawer.
     return new Promise(resolve => {
-      first.call(isOpen ? this.onOpen : this.onClose).subscribe(resolve);
+      (isOpen ? this.onOpen : this.onClose).pipe(first()).subscribe(resolve);
     });
   }
 
@@ -423,12 +416,12 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
     // If a `Dir` directive exists up the tree, listen direction changes and update the left/right
     // properties to point to the proper start/end.
     if (_dir != null) {
-      takeUntil.call(_dir.change, this._destroyed).subscribe(() => this._validateDrawers());
+      _dir.change.pipe(takeUntil(this._destroyed)).subscribe(() => this._validateDrawers());
     }
   }
 
   ngAfterContentInit() {
-    startWith.call(this._drawers.changes, null).subscribe(() => {
+    this._drawers.changes.pipe(startWith(null)).subscribe(() => {
       this._validateDrawers();
 
       this._drawers.forEach((drawer: MatDrawer) => {
@@ -468,22 +461,23 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
    * is properly hidden.
    */
   private _watchDrawerToggle(drawer: MatDrawer): void {
-    RxChain.from(drawer._animationStarted)
-      .call(takeUntil, this._drawers.changes)
-      .call(filter, (event: AnimationEvent) => event.fromState !== event.toState)
-      .subscribe((event: AnimationEvent) => {
-        // Set the transition class on the container so that the animations occur. This should not
-        // be set initially because animations should only be triggered via a change in state.
-        if (event.toState !== 'open-instant') {
-          this._renderer.addClass(this._element.nativeElement, 'mat-drawer-transition');
-        }
+    drawer._animationStarted.pipe(
+      takeUntil(this._drawers.changes),
+      filter((event: AnimationEvent) => event.fromState !== event.toState)
+    )
+    .subscribe((event: AnimationEvent) => {
+      // Set the transition class on the container so that the animations occur. This should not
+      // be set initially because animations should only be triggered via a change in state.
+      if (event.toState !== 'open-instant') {
+        this._renderer.addClass(this._element.nativeElement, 'mat-drawer-transition');
+      }
 
-        this._updateContentMargins();
-        this._changeDetectorRef.markForCheck();
-      });
+      this._updateContentMargins();
+      this._changeDetectorRef.markForCheck();
+    });
 
     if (drawer.mode !== 'side') {
-      takeUntil.call(drawer.openedChange, this._drawers.changes).subscribe(() =>
+      drawer.openedChange.pipe(takeUntil(this._drawers.changes)).subscribe(() =>
           this._setContainerClass(drawer.opened));
     }
   }
@@ -498,8 +492,8 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
     }
     // NOTE: We need to wait for the microtask queue to be empty before validating,
     // since both drawers may be swapping positions at the same time.
-    takeUntil.call(drawer.onPositionChanged, this._drawers.changes).subscribe(() => {
-      first.call(this._ngZone.onMicrotaskEmpty.asObservable()).subscribe(() => {
+    drawer.onPositionChanged.pipe(takeUntil(this._drawers.changes)).subscribe(() => {
+      this._ngZone.onMicrotaskEmpty.asObservable().pipe(first()).subscribe(() => {
         this._validateDrawers();
       });
     });
@@ -508,7 +502,7 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   /** Subscribes to changes in drawer mode so we can run change detection. */
   private _watchDrawerMode(drawer: MatDrawer): void {
     if (drawer) {
-      takeUntil.call(drawer._modeChanged, merge(this._drawers.changes, this._destroyed))
+      drawer._modeChanged.pipe(takeUntil(merge(this._drawers.changes, this._destroyed)))
         .subscribe(() => {
           this._updateContentMargins();
           this._changeDetectorRef.markForCheck();
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 0e355b3887e2..1ee4bd576da8 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -32,7 +32,7 @@ import {
   ComponentPortal,
   PortalHostDirective,
 } from '@angular/cdk/portal';
-import {first} from '@angular/cdk/rxjs';
+import {first} from 'rxjs/operators';
 import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
@@ -173,7 +173,7 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
    * errors where we end up removing an element which is in the middle of an animation.
    */
   private _completeExit() {
-    first.call(this._ngZone.onMicrotaskEmpty.asObservable()).subscribe(() => {
+    this._ngZone.onMicrotaskEmpty.asObservable().pipe(first()).subscribe(() => {
       this._onExit.next();
       this._onExit.complete();
     });
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 44f19625f5ea..bd7fb0fce94e 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -16,7 +16,7 @@ import {MAT_SNACK_BAR_DATA, MatSnackBarConfig} from './snack-bar-config';
 import {MatSnackBarContainer} from './snack-bar-container';
 import {MatSnackBarRef} from './snack-bar-ref';
 import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
-import {RxChain, takeUntil, first} from '@angular/cdk/rxjs';
+import {takeUntil, first} from 'rxjs/operators';
 
 
 /**
@@ -151,15 +151,15 @@ export class MatSnackBar {
     // Subscribe to the breakpoint observer and attach the mat-snack-bar-handset class as
     // appropriate. This class is applied to the overlay element because the overlay must expand to
     // fill the width of the screen for full width snackbars.
-    RxChain.from(this._breakpointObserver.observe(Breakpoints.Handset))
-      .call(takeUntil, first.call(overlayRef.detachments()))
-      .subscribe(state => {
-        if (state.matches) {
-          overlayRef.overlayElement.classList.add('mat-snack-bar-handset');
-        } else {
-          overlayRef.overlayElement.classList.remove('mat-snack-bar-handset');
-        }
-      });
+    this._breakpointObserver.observe(Breakpoints.Handset).pipe(
+      takeUntil(overlayRef.detachments().pipe(first()))
+    ).subscribe(state => {
+      if (state.matches) {
+        overlayRef.overlayElement.classList.add('mat-snack-bar-handset');
+      } else {
+        overlayRef.overlayElement.classList.remove('mat-snack-bar-handset');
+      }
+    });
 
     return snackBarRef;
   }
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index 59d3f8df9c8a..c24ae31ffbbc 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -6,7 +6,7 @@ import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Observable} from 'rxjs/Observable';
-import {map} from 'rxjs/operator/map';
+import {map} from 'rxjs/operators';
 import {MatTableModule} from '../table/index';
 import {
   MatSort,
@@ -249,7 +249,7 @@ class SimpleMatSortApp {
 
 class FakeDataSource extends DataSource<any> {
   connect(collectionViewer: CollectionViewer): Observable<any[]> {
-    return map.call(collectionViewer.viewChange, () => []);
+    return collectionViewer.viewChange.pipe(map(() => []));
   }
   disconnect() {}
 }
diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
index 14852a5f570f..1ff3903f224a 100644
--- a/src/lib/table/table-data-source.ts
+++ b/src/lib/table/table-data-source.ts
@@ -11,7 +11,7 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 import {Subscription} from 'rxjs/Subscription';
-import {combineLatest, map, RxChain, startWith} from '@angular/cdk/rxjs';
+import {combineLatest, map, startWith} from 'rxjs/operators';
 import {empty} from 'rxjs/observable/empty';
 
 /**
@@ -117,19 +117,23 @@ export class MatTableDataSource<T> implements DataSource<T> {
     const sortChange = this._sort ? this._sort.sortChange : empty();
     const pageChange = this._paginator ? this._paginator.page : empty();
 
-    if (this._renderChangesSubscription) { this._renderChangesSubscription.unsubscribe(); }
-    this._renderChangesSubscription = RxChain.from(this._data)
+    if (this._renderChangesSubscription) {
+      this._renderChangesSubscription.unsubscribe();
+    }
+
     // Watch for base data or filter changes to provide a filtered set of data.
-        .call(combineLatest, this._filter)
-        .call(map, ([data]) => this._filterData(data))
-        // Watch for filtered data or sort changes to provide an ordered set of data.
-        .call(combineLatest, startWith.call(sortChange, null))
-        .call(map, ([data]) => this._orderData(data))
-        // Watch for ordered data or page changes to provide a paged set of data.
-        .call(combineLatest, startWith.call(pageChange, null))
-        .call(map, ([data]) => this._pageData(data))
-        // Watched for paged data changes and send the result to the table to render.
-        .subscribe(data => this._renderData.next(data));
+    this._renderChangesSubscription = this._data.pipe(
+      combineLatest(this._filter),
+      map(([data]) => this._filterData(data)),
+      // Watch for filtered data or sort changes to provide an ordered set of data.
+      combineLatest(sortChange.pipe(startWith(null!))),
+      map(([data]) => this._orderData(data)),
+      // Watch for ordered data or page changes to provide a paged set of data.
+      combineLatest(pageChange.pipe(startWith(null!))),
+      map(([data]) => this._pageData(data))
+    )
+    // Watched for paged data changes and send the result to the table to render.
+    .subscribe(data => this._renderData.next(data));
   }
 
   /**
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 20b9b133ef50..831db37c3719 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -8,7 +8,7 @@
 
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
-import {startWith} from '@angular/cdk/rxjs';
+import {startWith} from 'rxjs/operators';
 import {
   AfterContentChecked,
   AfterContentInit,
@@ -189,7 +189,7 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
     const dirChange = this._dir ? this._dir.change : observableOf(null);
     const resize = this._viewportRuler.change(150);
 
-    this._realignInkBar = startWith.call(merge(dirChange, resize), null).subscribe(() => {
+    this._realignInkBar = merge(dirChange, resize).pipe(startWith(null)).subscribe(() => {
       this._updatePagination();
       this._alignInkBarToSelectedTab();
     });
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index fec6c8abdf86..c9bd6b51441f 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -5,11 +5,10 @@
  * 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 {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Platform} from '@angular/cdk/platform';
-import {takeUntil} from '@angular/cdk/rxjs';
+import {takeUntil} from 'rxjs/operators';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {
   AfterContentInit,
@@ -133,7 +132,7 @@ export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit,
     this._ngZone.runOutsideAngular(() => {
       const dirChange = this._dir ? this._dir.change : observableOf(null);
 
-      return takeUntil.call(merge(dirChange, this._viewportRuler.change(10)), this._onDestroy)
+      return merge(dirChange, this._viewportRuler.change(10)).pipe(takeUntil(this._onDestroy))
           .subscribe(() => this._alignInkBar());
     });
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 8e2aabc5367e..243faee270b0 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -24,7 +24,7 @@ import {
 } from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {ComponentPortal} from '@angular/cdk/portal';
-import {first} from '@angular/cdk/rxjs';
+import {first} from 'rxjs/operators';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   ChangeDetectionStrategy,
@@ -387,7 +387,7 @@ export class MatTooltip implements OnDestroy {
       this._tooltipInstance.message = this.message;
       this._tooltipInstance._markForCheck();
 
-      first.call(this._ngZone.onMicrotaskEmpty.asObservable()).subscribe(() => {
+      this._ngZone.onMicrotaskEmpty.asObservable().pipe(first()).subscribe(() => {
         if (this._tooltipInstance) {
           this._overlayRef!.updatePosition();
         }
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 55335ad0e3a4..dea9a9ac33ae 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -62,7 +62,6 @@ System.config({
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
     '@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
-    '@angular/cdk/rxjs': 'dist/packages/cdk/rxjs/index.js',
     '@angular/cdk/scrolling': 'dist/packages/cdk/scrolling/index.js',
     '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js',
     '@angular/cdk/table': 'dist/packages/cdk/table/index.js',
@@ -103,6 +102,7 @@ System.config({
   packages: {
     // Thirdparty barrels.
     'rxjs': {main: 'index'},
+    'rxjs/operators': {main: 'index'},
 
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 2748e7c5f209..3f1b688fd1ac 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -62,34 +62,19 @@ export const rollupGlobals = {
   'rxjs/observable/combineLatest': 'Rx.Observable',
   'rxjs/observable/forkJoin': 'Rx.Observable',
   'rxjs/observable/fromEvent': 'Rx.Observable',
-  'rxjs/observable/fromEventPattern': 'Rx.Observable',
   'rxjs/observable/merge': 'Rx.Observable',
   'rxjs/observable/of': 'Rx.Observable',
-  'rxjs/observable/empty': 'Rx.Observable',
   'rxjs/observable/throw': 'Rx.Observable',
   'rxjs/observable/defer': 'Rx.Observable',
-  'rxjs/operator/auditTime': 'Rx.Observable.prototype',
-  'rxjs/operator/catch': 'Rx.Observable.prototype',
-  'rxjs/operator/combineLatest': 'Rx.Observable.prototype',
-  'rxjs/operator/debounceTime': 'Rx.Observable.prototype',
-  'rxjs/operator/do': 'Rx.Observable.prototype',
-  'rxjs/operator/filter': 'Rx.Observable.prototype',
-  'rxjs/operator/finally': 'Rx.Observable.prototype',
-  'rxjs/operator/first': 'Rx.Observable.prototype',
-  'rxjs/operator/let': 'Rx.Observable.prototype',
-  'rxjs/operator/map': 'Rx.Observable.prototype',
-  'rxjs/operator/share': 'Rx.Observable.prototype',
-  'rxjs/operator/startWith': 'Rx.Observable.prototype',
-  'rxjs/operator/switchMap': 'Rx.Observable.prototype',
-  'rxjs/operator/takeUntil': 'Rx.Observable.prototype',
-  'rxjs/operator/toPromise': 'Rx.Observable.prototype',
-  'rxjs/operator/delay': 'Rx.Observable.prototype',
+  'rxjs/observable/fromEventPattern': 'Rx.Observable',
+  'rxjs/observable/empty': 'Rx.Observable',
+  'rxjs/operators': 'Rx.Observable',
+  'rxjs/operators/index': 'Rx.Observable',
 
   'rxjs/add/observable/merge': 'Rx.Observable',
   'rxjs/add/observable/fromEvent': 'Rx.Observable',
   'rxjs/add/observable/of': 'Rx.Observable',
   'rxjs/add/observable/interval': 'Rx.Observable',
-  'rxjs/add/observable/combineLatest': 'Rx.Observable',
   'rxjs/add/operator/startWith': 'Rx.Observable.prototype',
   'rxjs/add/operator/map': 'Rx.Observable.prototype',
   'rxjs/add/operator/debounceTime': 'Rx.Observable.prototype',

From 520d83bb618a128fe54e377a04e574cf164f4d48 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Sat, 28 Oct 2017 18:38:29 +0200
Subject: [PATCH 379/575] chore(docs): show extends clauses for classes (#8078)

* chore(docs): show extends clauses for classes

Classes like `MatAnchor` in the button docs should indicate that those are extending the `MatButton` class. Clauses without any related Dgeni doc can be ignored, because no information for this is available (right now; e.g. `MatSlideToggleBase` with mixins)

* Address feedback
---
 tools/dgeni/processors/categorizer.ts     | 7 +++++++
 tools/dgeni/templates/class.template.html | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/tools/dgeni/processors/categorizer.ts b/tools/dgeni/processors/categorizer.ts
index d9e824630499..c6c2b85aa706 100644
--- a/tools/dgeni/processors/categorizer.ts
+++ b/tools/dgeni/processors/categorizer.ts
@@ -19,6 +19,7 @@ import {
   isProperty,
   isService
 } from '../common/decorators';
+import {ClassLikeExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassLikeExportDoc';
 import {MethodMemberDoc} from 'dgeni-packages/typescript/api-doc-types/MethodMemberDoc';
 import {sortCategorizedMembers} from '../common/sort-members';
 
@@ -31,6 +32,7 @@ export interface CategorizedClassDoc extends ClassExportDoc {
   isDeprecated: boolean;
   directiveExportAs?: string | null;
   directiveSelectors?: string[];
+  extendedDoc: ClassLikeExportDoc | null;
 }
 
 export interface CategorizedPropertyMemberDoc extends PropertyMemberDoc {
@@ -88,6 +90,11 @@ export class Categorizer implements Processor {
     classDoc.methods.sort(sortCategorizedMembers);
     classDoc.properties.sort(sortCategorizedMembers);
 
+    // Classes can only extend a single class. This means that there can't be multiple extend
+    // clauses for the Dgeni document. To make the template syntax simpler and more readable,
+    // store the extended class in a variable.
+    classDoc.extendedDoc = classDoc.extendsClauses[0] ? classDoc.extendsClauses[0].doc! : null;
+
     // Categorize the current visited classDoc into its Angular type.
     if (isDirective(classDoc)) {
       classDoc.isDirective = true;
diff --git a/tools/dgeni/templates/class.template.html b/tools/dgeni/templates/class.template.html
index 797c053aacc4..7948a18fda4a 100644
--- a/tools/dgeni/templates/class.template.html
+++ b/tools/dgeni/templates/class.template.html
@@ -1,6 +1,12 @@
 <h4 id="{$ class.name $}" class="docs-header-link docs-api-h4 docs-api-class-name">
   <span header-link="{$ class.name $}"></span>
   <code>{$ class.name $}</code>
+  {% if class.extendedDoc %}
+  <span class="docs-api-class-extends-clauses">
+    <span class="docs-api-class-extends-label">extends</span>
+    <span class="docs-api-class-extends-type">{$ class.extendedDoc.name $}</span>
+  </span>
+  {% endif %}
 </h4>
 
 {%- if class.description -%}

From f601e8335f7b5a6a0d550bd5b3626748c86fdd11 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 30 Oct 2017 14:03:57 -0700
Subject: [PATCH 380/575] fix(table): render cells even if data is falsy
 (#7914)

* fix(table): render cells even if data is falsy

* add test

* test naming

* fix all usages of evensimpler
---
 src/cdk/table/table.spec.ts | 45 ++++++++++++++++++++++++++++++++++++-
 src/cdk/table/table.ts      |  5 +----
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index c230023c675f..a4039547fc46 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -37,7 +37,8 @@ describe('CdkTable', () => {
         UndefinedColumnsCdkTableApp,
         WhenRowCdkTableApp,
         WhenRowWithoutDefaultCdkTableApp,
-        WhenRowMultipleDefaultsCdkTableApp
+        WhenRowMultipleDefaultsCdkTableApp,
+        BooleanRowCdkTableApp
       ],
     }).compileComponents();
   }));
@@ -106,6 +107,21 @@ describe('CdkTable', () => {
     });
   });
 
+  it('should render cells even if row data is falsy', () => {
+    const booleanRowCdkTableAppFixture = TestBed.createComponent(BooleanRowCdkTableApp);
+    const booleanRowCdkTableElement =
+        booleanRowCdkTableAppFixture.nativeElement.querySelector('cdk-table');
+    booleanRowCdkTableAppFixture.detectChanges();
+
+    expectTableToMatchContent(booleanRowCdkTableElement, [
+      [''], // Header row
+      ['false'], // Data rows
+      ['true'],
+      ['false'],
+      ['true'],
+    ]);
+  });
+
   it('should be able to apply class-friendly css class names for the column cells', () => {
     const crazyColumnNameAppFixture = TestBed.createComponent(CrazyColumnNameCdkTableApp);
     const crazyColumnNameTableElement =
@@ -636,6 +652,16 @@ class FakeDataSource extends DataSource<TestData> {
   }
 }
 
+class BooleanDataSource extends DataSource<boolean> {
+  _dataChange = new BehaviorSubject<boolean[]>([false, true, false, true]);
+
+  connect(): Observable<boolean[]> {
+    return this._dataChange;
+  }
+
+  disconnect() { }
+}
+
 @Component({
   template: `
     <cdk-table [dataSource]="dataSource">
@@ -668,6 +694,23 @@ class SimpleCdkTableApp {
   @ViewChild(CdkTable) table: CdkTable<TestData>;
 }
 
+@Component({
+  template: `
+    <cdk-table [dataSource]="dataSource">
+      <ng-container cdkColumnDef="column_a">
+        <cdk-header-cell *cdkHeaderCellDef></cdk-header-cell>
+        <cdk-cell *cdkCellDef="let data"> {{data}} </cdk-cell>
+      </ng-container>
+
+      <cdk-header-row *cdkHeaderRowDef="['column_a']"></cdk-header-row>
+      <cdk-row *cdkRowDef="let row; columns: ['column_a']"></cdk-row>
+    </cdk-table>
+  `
+})
+class BooleanRowCdkTableApp {
+  dataSource = new BooleanDataSource();
+}
+
 @Component({
   template: `
     <cdk-table [dataSource]="dataSource">
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index e19152df7497..b2df1ea5ccaf 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -360,10 +360,7 @@ export class CdkTable<T> implements CollectionViewer {
     //   CdkCellOutlet was instantiated as a result  of `createEmbeddedView`.
     this._rowPlaceholder.viewContainer.createEmbeddedView(row.template, context, index);
 
-    // Insert empty cells if there is no data to improve rendering time.
-    const cells = rowData ? this._getCellTemplatesForRow(row) : [];
-
-    cells.forEach(cell => {
+    this._getCellTemplatesForRow(row).forEach(cell => {
       CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, context);
     });
 

From 00de3f650900481ac3a147a83713e82d35cece6d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 30 Oct 2017 22:04:36 +0100
Subject: [PATCH 381/575] refactor(portal): rename PortalHost to PortalOutlet
 (#7546)

Renames the `PortalHost` and related symbols to `PortalOutlet` for consistency with core.

Fixes #7544.
---
 src/cdk/overlay/overlay-ref.ts                | 14 +++---
 src/cdk/overlay/overlay.md                    |  2 +-
 src/cdk/overlay/overlay.ts                    | 18 +++----
 ...om-portal-host.ts => dom-portal-outlet.ts} | 11 +++--
 src/cdk/portal/portal-directives.ts           | 31 +++++++-----
 src/cdk/portal/portal-errors.ts               | 12 ++---
 src/cdk/portal/portal.md                      | 16 +++----
 src/cdk/portal/portal.spec.ts                 | 48 +++++++++----------
 src/cdk/portal/portal.ts                      | 34 ++++++-------
 src/cdk/portal/public-api.ts                  |  6 ++-
 src/demo-app/portal/portal-demo.html          |  6 +--
 src/demo-app/portal/portal-demo.scss          |  2 +-
 src/lib/dialog/dialog-container.html          |  2 +-
 src/lib/dialog/dialog-container.ts            | 20 ++++----
 src/lib/snack-bar/snack-bar-container.html    |  2 +-
 src/lib/snack-bar/snack-bar-container.ts      | 14 +++---
 src/lib/tabs/tab-body.html                    |  2 +-
 src/lib/tabs/tab-body.spec.ts                 |  6 +--
 src/lib/tabs/tab-body.ts                      | 12 ++---
 src/lib/tabs/tab-group.html                   |  2 +-
 20 files changed, 135 insertions(+), 125 deletions(-)
 rename src/cdk/portal/{dom-portal-host.ts => dom-portal-outlet.ts} (88%)

diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 7b68d4e73af0..5d887ffd3e62 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgZone} from '@angular/core';
-import {PortalHost, Portal} from '@angular/cdk/portal';
+import {PortalOutlet, Portal} from '@angular/cdk/portal';
 import {OverlayConfig} from './overlay-config';
 import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {Observable} from 'rxjs/Observable';
@@ -19,7 +19,7 @@ import {first} from 'rxjs/operators';
  * Reference to an overlay that has been created with the Overlay service.
  * Used to manipulate or dispose of said overlay.
  */
-export class OverlayRef implements PortalHost {
+export class OverlayRef implements PortalOutlet {
   private _backdropElement: HTMLElement | null = null;
   private _backdropClick: Subject<any> = new Subject();
   private _attachments = new Subject<void>();
@@ -29,7 +29,7 @@ export class OverlayRef implements PortalHost {
   _keydownEvents = new Subject<KeyboardEvent>();
 
   constructor(
-      private _portalHost: PortalHost,
+      private _portalOutlet: PortalOutlet,
       private _pane: HTMLElement,
       private _config: OverlayConfig,
       private _ngZone: NgZone,
@@ -51,7 +51,7 @@ export class OverlayRef implements PortalHost {
    * @returns The portal attachment result.
    */
   attach(portal: Portal<any>): any {
-    let attachResult = this._portalHost.attach(portal);
+    let attachResult = this._portalOutlet.attach(portal);
 
     if (this._config.positionStrategy) {
       this._config.positionStrategy.attach(this);
@@ -118,7 +118,7 @@ export class OverlayRef implements PortalHost {
       this._config.scrollStrategy.disable();
     }
 
-    const detachmentResult = this._portalHost.detach();
+    const detachmentResult = this._portalOutlet.detach();
 
     // Only emit after everything is detached.
     this._detachments.next();
@@ -142,7 +142,7 @@ export class OverlayRef implements PortalHost {
     }
 
     this.detachBackdrop();
-    this._portalHost.dispose();
+    this._portalOutlet.dispose();
     this._attachments.complete();
     this._backdropClick.complete();
     this._detachments.next();
@@ -153,7 +153,7 @@ export class OverlayRef implements PortalHost {
    * Checks whether the overlay has been attached.
    */
   hasAttached(): boolean {
-    return this._portalHost.hasAttached();
+    return this._portalOutlet.hasAttached();
   }
 
   /**
diff --git a/src/cdk/overlay/overlay.md b/src/cdk/overlay/overlay.md
index ca71948a8494..756ff1f0e26e 100644
--- a/src/cdk/overlay/overlay.md
+++ b/src/cdk/overlay/overlay.md
@@ -4,7 +4,7 @@ The `overlay` package provides a way to open floating panels on the screen.
 Calling `overlay.create()` will return an `OverlayRef` instance. This instance is a handle for
 managing that specific overlay.
 
-The `OverlayRef` _is_ a `PortalHost`- once created, content can be added by attaching a `Portal`.
+The `OverlayRef` _is_ a `PortalOutlet`- once created, content can be added by attaching a `Portal`.
 See the documentation on portals for further information.
 ```ts
 const overlayRef = overlay.create();
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 0c4ca58f0202..8b3e1601bb76 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -13,7 +13,7 @@ import {
   Injector,
   NgZone,
 } from '@angular/core';
-import {DomPortalHost} from '@angular/cdk/portal';
+import {DomPortalOutlet} from '@angular/cdk/portal';
 import {OverlayConfig} from './overlay-config';
 import {OverlayRef} from './overlay-ref';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
@@ -35,7 +35,7 @@ let defaultConfig = new OverlayConfig();
  * selects, etc. can all be built using overlays. The service should primarily be used by authors
  * of re-usable components rather than developers building end-user applications.
  *
- * An overlay *is* a PortalHost, so any kind of Portal can be loaded into one.
+ * An overlay *is* a PortalOutlet, so any kind of Portal can be loaded into one.
  */
 @Injectable()
 export class Overlay {
@@ -57,8 +57,8 @@ export class Overlay {
    */
   create(config: OverlayConfig = defaultConfig): OverlayRef {
     const pane = this._createPaneElement();
-    const portalHost = this._createPortalHost(pane);
-    return new OverlayRef(portalHost, pane, config, this._ngZone, this._keyboardDispatcher);
+    const portalOutlet = this._createPortalOutlet(pane);
+    return new OverlayRef(portalOutlet, pane, config, this._ngZone, this._keyboardDispatcher);
   }
 
   /**
@@ -85,12 +85,12 @@ export class Overlay {
   }
 
   /**
-   * Create a DomPortalHost into which the overlay content can be loaded.
-   * @param pane The DOM element to turn into a portal host.
-   * @returns A portal host for the given DOM element.
+   * Create a DomPortalOutlet into which the overlay content can be loaded.
+   * @param pane The DOM element to turn into a portal outlet.
+   * @returns A portal outlet for the given DOM element.
    */
-  private _createPortalHost(pane: HTMLElement): DomPortalHost {
-    return new DomPortalHost(pane, this._componentFactoryResolver, this._appRef, this._injector);
+  private _createPortalOutlet(pane: HTMLElement): DomPortalOutlet {
+    return new DomPortalOutlet(pane, this._componentFactoryResolver, this._appRef, this._injector);
   }
 
 }
diff --git a/src/cdk/portal/dom-portal-host.ts b/src/cdk/portal/dom-portal-outlet.ts
similarity index 88%
rename from src/cdk/portal/dom-portal-host.ts
rename to src/cdk/portal/dom-portal-outlet.ts
index 19b475a17302..47e155f17e40 100644
--- a/src/cdk/portal/dom-portal-host.ts
+++ b/src/cdk/portal/dom-portal-outlet.ts
@@ -13,14 +13,14 @@ import {
   ApplicationRef,
   Injector,
 } from '@angular/core';
-import {BasePortalHost, ComponentPortal, TemplatePortal} from './portal';
+import {BasePortalOutlet, ComponentPortal, TemplatePortal} from './portal';
 
 
 /**
- * A PortalHost for attaching portals to an arbitrary DOM element outside of the Angular
+ * A PortalOutlet for attaching portals to an arbitrary DOM element outside of the Angular
  * application context.
  */
-export class DomPortalHost extends BasePortalHost {
+export class DomPortalOutlet extends BasePortalOutlet {
   constructor(
       private _hostDomElement: Element,
       private _componentFactoryResolver: ComponentFactoryResolver,
@@ -75,8 +75,9 @@ export class DomPortalHost extends BasePortalHost {
     viewRef.detectChanges();
 
     // The method `createEmbeddedView` will add the view as a child of the viewContainer.
-    // But for the DomPortalHost the view can be added everywhere in the DOM (e.g Overlay Container)
-    // To move the view to the specified host element. We just re-append the existing root nodes.
+    // But for the DomPortalOutlet the view can be added everywhere in the DOM
+    // (e.g Overlay Container) To move the view to the specified host element. We just
+    // re-append the existing root nodes.
     viewRef.rootNodes.forEach(rootNode => this._hostDomElement.appendChild(rootNode));
 
     this.setDisposeFn((() => {
diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts
index f3da22329cb0..09279614ef45 100644
--- a/src/cdk/portal/portal-directives.ts
+++ b/src/cdk/portal/portal-directives.ts
@@ -17,7 +17,7 @@ import {
     OnDestroy,
     Input,
 } from '@angular/core';
-import {Portal, TemplatePortal, ComponentPortal, BasePortalHost} from './portal';
+import {Portal, TemplatePortal, ComponentPortal, BasePortalOutlet} from './portal';
 
 
 /**
@@ -36,18 +36,18 @@ export class TemplatePortalDirective extends TemplatePortal<any> {
 
 
 /**
- * Directive version of a PortalHost. Because the directive *is* a PortalHost, portals can be
+ * Directive version of a PortalOutlet. Because the directive *is* a PortalOutlet, portals can be
  * directly attached to it, enabling declarative use.
  *
  * Usage:
- * <ng-template [cdkPortalHost]="greeting"></ng-template>
+ * <ng-template [cdkPortalOutlet]="greeting"></ng-template>
  */
 @Directive({
-  selector: '[cdkPortalHost], [portalHost]',
-  exportAs: 'cdkPortalHost',
-  inputs: ['portal: cdkPortalHost']
+  selector: '[cdkPortalOutlet], [cdkPortalHost], [portalHost]',
+  exportAs: 'cdkPortalOutlet, cdkPortalHost',
+  inputs: ['portal: cdkPortalOutlet']
 })
-export class PortalHostDirective extends BasePortalHost implements OnDestroy {
+export class PortalOutletDirective extends BasePortalOutlet implements OnDestroy {
   /** The attached portal. */
   private _portal: Portal<any> | null = null;
 
@@ -62,7 +62,12 @@ export class PortalHostDirective extends BasePortalHost implements OnDestroy {
   get _deprecatedPortal() { return this.portal; }
   set _deprecatedPortal(v) { this.portal = v; }
 
-  /** Portal associated with the Portal host. */
+  /** @deprecated */
+  @Input('cdkPortalHost')
+  get _deprecatedPortalHost() { return this.portal; }
+  set _deprecatedPortalHost(v) { this.portal = v; }
+
+  /** Portal associated with the Portal outlet. */
   get portal(): Portal<any> | null {
     return this._portal;
   }
@@ -85,16 +90,16 @@ export class PortalHostDirective extends BasePortalHost implements OnDestroy {
   }
 
   /**
-   * Attach the given ComponentPortal to this PortalHost using the ComponentFactoryResolver.
+   * Attach the given ComponentPortal to this PortalOutlet using the ComponentFactoryResolver.
    *
-   * @param portal Portal to be attached to the portal host.
+   * @param portal Portal to be attached to the portal outlet.
    * @returns Reference to the created component.
    */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
     portal.setAttachedHost(this);
 
     // If the portal specifies an origin, use that as the logical location of the component
-    // in the application tree. Otherwise use the location of this PortalHost.
+    // in the application tree. Otherwise use the location of this PortalOutlet.
     let viewContainerRef = portal.viewContainerRef != null ?
         portal.viewContainerRef :
         this._viewContainerRef;
@@ -129,7 +134,7 @@ export class PortalHostDirective extends BasePortalHost implements OnDestroy {
 
 
 @NgModule({
-  exports: [TemplatePortalDirective, PortalHostDirective],
-  declarations: [TemplatePortalDirective, PortalHostDirective],
+  exports: [TemplatePortalDirective, PortalOutletDirective],
+  declarations: [TemplatePortalDirective, PortalOutletDirective],
 })
 export class PortalModule {}
diff --git a/src/cdk/portal/portal-errors.ts b/src/cdk/portal/portal-errors.ts
index aa9063e05f5b..45d0c06b95e3 100644
--- a/src/cdk/portal/portal-errors.ts
+++ b/src/cdk/portal/portal-errors.ts
@@ -26,8 +26,8 @@ export function throwPortalAlreadyAttachedError() {
  * Throws an exception when attempting to attach a portal to an already-disposed host.
  * @docs-private
  */
-export function throwPortalHostAlreadyDisposedError() {
-  throw Error('This PortalHost has already been disposed');
+export function throwPortalOutletAlreadyDisposedError() {
+  throw Error('This PortalOutlet has already been disposed');
 }
 
 /**
@@ -35,16 +35,16 @@ export function throwPortalHostAlreadyDisposedError() {
  * @docs-private
  */
 export function throwUnknownPortalTypeError() {
-  throw Error('Attempting to attach an unknown Portal type. BasePortalHost accepts either ' +
-                  'a ComponentPortal or a TemplatePortal.');
+  throw Error('Attempting to attach an unknown Portal type. BasePortalOutlet accepts either ' +
+              'a ComponentPortal or a TemplatePortal.');
 }
 
 /**
  * Throws an exception when attempting to attach a portal to a null host.
  * @docs-private
  */
-export function throwNullPortalHostError() {
-  throw Error('Attempting to attach a portal to a null PortalHost');
+export function throwNullPortalOutletError() {
+  throw Error('Attempting to attach a portal to a null PortalOutlet');
 }
 
 /**
diff --git a/src/cdk/portal/portal.md b/src/cdk/portal/portal.md
index cb7503b378fc..4093bc73e82b 100644
--- a/src/cdk/portal/portal.md
+++ b/src/cdk/portal/portal.md
@@ -3,20 +3,20 @@ The `portals` package provides a flexible system for rendering dynamic content i
 ### Portals
 A `Portal `is a piece of UI that can be dynamically rendered to an open slot on the page.
 
-The "piece of UI" can be either a `Component` or a `TemplateRef` and the "open slot" is 
-a `PortalHost`.
+The "piece of UI" can be either a `Component` or a `TemplateRef` and the "open slot" is
+a `PortalOutlet`.
 
-Portals and PortalHosts are low-level building blocks that other concepts, such as overlays, are
+Portals and PortalOutlets are low-level building blocks that other concepts, such as overlays, are
 built upon.
 
 ##### `Portal<T>`
 | Method | Description |
 | --- | --- |
-| `attach(PortalHost): Promise<T>` | Attaches the portal to a host. |
+| `attach(PortalOutlet): Promise<T>` | Attaches the portal to a host. |
 | `detach(): Promise<void>` | Detaches the portal from its host. |
 | `isAttached: boolean` | Whether the portal is attached. |
 
-##### `PortalHost`
+##### `PortalOutlet`
 | Method | Description |
 | --- | --- |
 | `attach(Portal): Promise<void>` | Attaches a portal to the host. |
@@ -57,11 +57,11 @@ this.userSettingsPortal = new ComponentPortal(UserSettingsComponent);
 ```
 
 
-##### `PortalHostDirective`
-Used to add a portal host to a template. `PortalHostDirective` *is* a `PortalHost`.
+##### `PortalOutletDirective`
+Used to add a portal outlet to a template. `PortalOutletDirective` *is* a `PortalOutlet`.
 
 Usage:
 ```html
 <!-- Attaches the `userSettingsPortal` from the previous example. -->
-<ng-template [cdkPortalHost]="userSettingsPortal"></ng-template>
+<ng-template [cdkPortalOutlet]="userSettingsPortal"></ng-template>
 ```
diff --git a/src/cdk/portal/portal.spec.ts b/src/cdk/portal/portal.spec.ts
index 61496f5ba45c..12afa9028bda 100644
--- a/src/cdk/portal/portal.spec.ts
+++ b/src/cdk/portal/portal.spec.ts
@@ -13,9 +13,9 @@ import {
   TemplateRef
 } from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {TemplatePortalDirective, PortalHostDirective, PortalModule} from './portal-directives';
+import {TemplatePortalDirective, PortalOutletDirective, PortalModule} from './portal-directives';
 import {Portal, ComponentPortal, TemplatePortal} from './portal';
-import {DomPortalHost} from './dom-portal-host';
+import {DomPortalOutlet} from './dom-portal-outlet';
 
 
 describe('Portals', () => {
@@ -28,7 +28,7 @@ describe('Portals', () => {
     TestBed.compileComponents();
   }));
 
-  describe('PortalHostDirective', () => {
+  describe('PortalOutletDirective', () => {
     let fixture: ComponentFixture<PortalTestApp>;
 
     beforeEach(() => {
@@ -71,7 +71,7 @@ describe('Portals', () => {
       // using TemplatePortal.attach method to set context
       testAppComponent.selectedPortal = undefined;
       fixture.detectChanges();
-      templatePortal.attach(testAppComponent.portalHost, {$implicit: {status: 'rotten'}});
+      templatePortal.attach(testAppComponent.portalOutlet, {$implicit: {status: 'rotten'}});
       fixture.detectChanges();
       // Expect that the content of the attached portal is present and context given via the
       // attach method is projected
@@ -90,7 +90,7 @@ describe('Portals', () => {
       // context, the latter should take precedence:
       testAppComponent.selectedPortal = undefined;
       fixture.detectChanges();
-      templatePortal.attach(testAppComponent.portalHost, {$implicit: {status: 'rotten'}});
+      templatePortal.attach(testAppComponent.portalOutlet, {$implicit: {status: 'rotten'}});
       fixture.detectChanges();
       // Expect that the content of the attached portal is present and and context given via the
       // attach method is projected and get precedence over constructor context
@@ -223,32 +223,32 @@ describe('Portals', () => {
       testAppComponent.selectedPortal = new ComponentPortal(PizzaMsg);
 
       fixture.detectChanges();
-      expect(testAppComponent.portalHost.hasAttached()).toBe(true);
-      expect(testAppComponent.portalHost.portal).toBe(testAppComponent.selectedPortal);
+      expect(testAppComponent.portalOutlet.hasAttached()).toBe(true);
+      expect(testAppComponent.portalOutlet.portal).toBe(testAppComponent.selectedPortal);
 
       testAppComponent.selectedPortal = null;
       fixture.detectChanges();
 
-      expect(testAppComponent.portalHost.hasAttached()).toBe(false);
-      expect(testAppComponent.portalHost.portal).toBeNull();
+      expect(testAppComponent.portalOutlet.hasAttached()).toBe(false);
+      expect(testAppComponent.portalOutlet.portal).toBeNull();
     });
 
     it('should set the `portal` when attaching a component portal programmatically', () => {
       let testAppComponent = fixture.debugElement.componentInstance;
       let portal = new ComponentPortal(PizzaMsg);
 
-      testAppComponent.portalHost.attachComponentPortal(portal);
+      testAppComponent.portalOutlet.attachComponentPortal(portal);
 
-      expect(testAppComponent.portalHost.portal).toBe(portal);
+      expect(testAppComponent.portalOutlet.portal).toBe(portal);
     });
 
     it('should set the `portal` when attaching a template portal programmatically', () => {
       let testAppComponent = fixture.debugElement.componentInstance;
       fixture.detectChanges();
 
-      testAppComponent.portalHost.attachTemplatePortal(testAppComponent.cakePortal);
+      testAppComponent.portalOutlet.attachTemplatePortal(testAppComponent.cakePortal);
 
-      expect(testAppComponent.portalHost.portal).toBe(testAppComponent.cakePortal);
+      expect(testAppComponent.portalOutlet.portal).toBe(testAppComponent.cakePortal);
     });
 
     it('should clear the portal reference on destroy', () => {
@@ -257,21 +257,21 @@ describe('Portals', () => {
       testAppComponent.selectedPortal = new ComponentPortal(PizzaMsg);
       fixture.detectChanges();
 
-      expect(testAppComponent.portalHost.portal).toBeTruthy();
+      expect(testAppComponent.portalOutlet.portal).toBeTruthy();
 
       fixture.destroy();
 
-      expect(testAppComponent.portalHost.portal).toBeNull();
+      expect(testAppComponent.portalOutlet.portal).toBeNull();
     });
   });
 
-  describe('DomPortalHost', () => {
+  describe('DomPortalOutlet', () => {
     let componentFactoryResolver: ComponentFactoryResolver;
     let someViewContainerRef: ViewContainerRef;
     let someInjector: Injector;
     let someFixture: ComponentFixture<any>;
     let someDomElement: HTMLElement;
-    let host: DomPortalHost;
+    let host: DomPortalOutlet;
     let injector: Injector;
     let appRef: ApplicationRef;
 
@@ -284,7 +284,7 @@ describe('Portals', () => {
 
     beforeEach(() => {
       someDomElement = document.createElement('div');
-      host = new DomPortalHost(someDomElement, componentFactoryResolver, appRef, injector);
+      host = new DomPortalOutlet(someDomElement, componentFactoryResolver, appRef, injector);
 
       someFixture = TestBed.createComponent(ArbitraryViewContainerRefComponent);
       someViewContainerRef = someFixture.componentInstance.viewContainerRef;
@@ -397,17 +397,17 @@ describe('Portals', () => {
       expect(componentInstance instanceof PizzaMsg)
           .toBe(true, 'Expected a PizzaMsg component to be created');
       expect(someDomElement.textContent)
-          .toContain('Pizza', 'Expected the static string "Pizza" in the DomPortalHost.');
+          .toContain('Pizza', 'Expected the static string "Pizza" in the DomPortalOutlet.');
 
       componentInstance.snack = new Chocolate();
       someFixture.detectChanges();
       expect(someDomElement.textContent)
-          .toContain('Chocolate', 'Expected the bound string "Chocolate" in the DomPortalHost');
+          .toContain('Chocolate', 'Expected the bound string "Chocolate" in the DomPortalOutlet');
 
       host.detach();
 
       expect(someDomElement.innerHTML)
-          .toBe('', 'Expected the DomPortalHost to be empty after detach');
+          .toBe('', 'Expected the DomPortalOutlet to be empty after detach');
     });
 
     it('should call the dispose function even if the host has no attached content', () => {
@@ -457,12 +457,12 @@ class ArbitraryViewContainerRefComponent {
 }
 
 
-/** Test-bed component that contains a portal host and a couple of template portals. */
+/** Test-bed component that contains a portal outlet and a couple of template portals. */
 @Component({
   selector: 'portal-test',
   template: `
   <div class="portal-container">
-    <ng-template [cdkPortalHost]="selectedPortal"></ng-template>
+    <ng-template [cdkPortalOutlet]="selectedPortal"></ng-template>
   </div>
 
   <ng-template cdk-portal>Cake</ng-template>
@@ -481,7 +481,7 @@ class ArbitraryViewContainerRefComponent {
 })
 class PortalTestApp {
   @ViewChildren(TemplatePortalDirective) portals: QueryList<TemplatePortalDirective>;
-  @ViewChild(PortalHostDirective) portalHost: PortalHostDirective;
+  @ViewChild(PortalOutletDirective) portalOutlet: PortalOutletDirective;
   @ViewChild('templateRef', { read: TemplateRef }) templateRef: TemplateRef<any>;
 
   selectedPortal: Portal<any>;
diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts
index e0b781a64e00..ebec03010f3f 100644
--- a/src/cdk/portal/portal.ts
+++ b/src/cdk/portal/portal.ts
@@ -15,11 +15,11 @@ import {
     Injector
 } from '@angular/core';
 import {
-    throwNullPortalHostError,
+    throwNullPortalOutletError,
     throwPortalAlreadyAttachedError,
     throwNoPortalAttachedError,
     throwNullPortalError,
-    throwPortalHostAlreadyDisposedError,
+    throwPortalOutletAlreadyDisposedError,
     throwUnknownPortalTypeError
 } from './portal-errors';
 
@@ -30,15 +30,15 @@ export interface ComponentType<T> {
 
 /**
  * A `Portal` is something that you want to render somewhere else.
- * It can be attach to / detached from a `PortalHost`.
+ * It can be attach to / detached from a `PortalOutlet`.
  */
 export abstract class Portal<T> {
-  private _attachedHost: PortalHost | null;
+  private _attachedHost: PortalOutlet | null;
 
   /** Attach this portal to a host. */
-  attach(host: PortalHost): T {
+  attach(host: PortalOutlet): T {
     if (host == null) {
-      throwNullPortalHostError();
+      throwNullPortalOutletError();
     }
 
     if (host.hasAttached()) {
@@ -67,10 +67,10 @@ export abstract class Portal<T> {
   }
 
   /**
-   * Sets the PortalHost reference without performing `attach()`. This is used directly by
-   * the PortalHost when it is performing an `attach()` or `detach()`.
+   * Sets the PortalOutlet reference without performing `attach()`. This is used directly by
+   * the PortalOutlet when it is performing an `attach()` or `detach()`.
    */
-  setAttachedHost(host: PortalHost | null) {
+  setAttachedHost(host: PortalOutlet | null) {
     this._attachedHost = host;
   }
 }
@@ -85,7 +85,7 @@ export class ComponentPortal<T> extends Portal<ComponentRef<T>> {
 
   /**
    * [Optional] Where the attached component should live in Angular's *logical* component tree.
-   * This is different from where the component *renders*, which is determined by the PortalHost.
+   * This is different from where the component *renders*, which is determined by the PortalOutlet.
    * The origin is necessary when the host is outside of the Angular application context.
    */
   viewContainerRef?: ViewContainerRef | null;
@@ -130,11 +130,11 @@ export class TemplatePortal<C> extends Portal<C> {
   }
 
   /**
-   * Attach the the portal to the provided `PortalHost`.
+   * Attach the the portal to the provided `PortalOutlet`.
    * When a context is provided it will override the `context` property of the `TemplatePortal`
    * instance.
    */
-  attach(host: PortalHost, context: C | undefined = this.context): C {
+  attach(host: PortalOutlet, context: C | undefined = this.context): C {
     this.context = context;
     return super.attach(host);
   }
@@ -147,9 +147,9 @@ export class TemplatePortal<C> extends Portal<C> {
 
 
 /**
- * A `PortalHost` is an space that can contain a single `Portal`.
+ * A `PortalOutlet` is an space that can contain a single `Portal`.
  */
-export interface PortalHost {
+export interface PortalOutlet {
   attach(portal: Portal<any>): any;
 
   detach(): any;
@@ -161,10 +161,10 @@ export interface PortalHost {
 
 
 /**
- * Partial implementation of PortalHost that handles attaching
+ * Partial implementation of PortalOutlet that handles attaching
  * ComponentPortal and TemplatePortal.
  */
-export abstract class BasePortalHost implements PortalHost {
+export abstract class BasePortalOutlet implements PortalOutlet {
   /** The portal currently attached to the host. */
   private _attachedPortal: Portal<any> | null;
 
@@ -190,7 +190,7 @@ export abstract class BasePortalHost implements PortalHost {
     }
 
     if (this._isDisposed) {
-      throwPortalHostAlreadyDisposedError();
+      throwPortalOutletAlreadyDisposedError();
     }
 
     if (portal instanceof ComponentPortal) {
diff --git a/src/cdk/portal/public-api.ts b/src/cdk/portal/public-api.ts
index ff3db2670fd8..cad046f323ea 100644
--- a/src/cdk/portal/public-api.ts
+++ b/src/cdk/portal/public-api.ts
@@ -7,6 +7,10 @@
  */
 
 export * from './portal';
-export * from './dom-portal-host';
+export * from './dom-portal-outlet';
 export * from './portal-directives';
 export * from './portal-injector';
+
+export {DomPortalOutlet as DomPortalHost} from './dom-portal-outlet';
+export {PortalOutletDirective as PortalHostDirective} from './portal-directives';
+export {PortalOutlet as PortalHost, BasePortalOutlet as BasePortalHost} from './portal';
diff --git a/src/demo-app/portal/portal-demo.html b/src/demo-app/portal/portal-demo.html
index ee17457ba788..1a19fe9bc91d 100644
--- a/src/demo-app/portal/portal-demo.html
+++ b/src/demo-app/portal/portal-demo.html
@@ -1,6 +1,6 @@
-<h2> The portal host is here: </h2>
-<div class="demo-portal-host">
-  <ng-template [cdkPortalHost]="selectedPortal"></ng-template>
+<h2> The portal outlet is here: </h2>
+<div class="demo-portal-outlet">
+  <ng-template [cdkPortalOutlet]="selectedPortal"></ng-template>
 </div>
 
 <button type="button" (click)="selectedPortal = programmingJoke">
diff --git a/src/demo-app/portal/portal-demo.scss b/src/demo-app/portal/portal-demo.scss
index 06a7f64855cc..812fce20bc2b 100644
--- a/src/demo-app/portal/portal-demo.scss
+++ b/src/demo-app/portal/portal-demo.scss
@@ -1,4 +1,4 @@
-.demo-portal-host {
+.demo-portal-outlet {
   margin-bottom: 10px;
   padding: 10px;
   border: 1px dashed black;
diff --git a/src/lib/dialog/dialog-container.html b/src/lib/dialog/dialog-container.html
index 5b263ad218a4..215f0d9c55b3 100644
--- a/src/lib/dialog/dialog-container.html
+++ b/src/lib/dialog/dialog-container.html
@@ -1 +1 @@
-<ng-template cdkPortalHost></ng-template>
+<ng-template cdkPortalOutlet></ng-template>
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 91d0c9ba96db..8826063cd1f0 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -22,9 +22,9 @@ import {
 import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
 import {DOCUMENT} from '@angular/platform-browser';
 import {
-  BasePortalHost,
+  BasePortalOutlet,
   ComponentPortal,
-  PortalHostDirective,
+  PortalOutletDirective,
   TemplatePortal
 } from '@angular/cdk/portal';
 import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
@@ -33,7 +33,7 @@ import {MatDialogConfig} from './dialog-config';
 
 /**
  * Throws an exception for the case when a ComponentPortal is
- * attached to a DomPortalHost without an origin.
+ * attached to a DomPortalOutlet without an origin.
  * @docs-private
  */
 export function throwMatDialogContentAlreadyAttachedError() {
@@ -78,9 +78,9 @@ export function throwMatDialogContentAlreadyAttachedError() {
     '(@slideDialog.done)': '_onAnimationDone($event)',
   },
 })
-export class MatDialogContainer extends BasePortalHost {
-  /** The portal host inside of this container into which the dialog content will be loaded. */
-  @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
+export class MatDialogContainer extends BasePortalOutlet {
+  /** The portal outlet inside of this container into which the dialog content will be loaded. */
+  @ViewChild(PortalOutletDirective) _portalOutlet: PortalOutletDirective;
 
   /** The class that traps and manages focus within the dialog. */
   private _focusTrap: FocusTrap;
@@ -117,12 +117,12 @@ export class MatDialogContainer extends BasePortalHost {
    * @param portal Portal to be attached as the dialog content.
    */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
-    if (this._portalHost.hasAttached()) {
+    if (this._portalOutlet.hasAttached()) {
       throwMatDialogContentAlreadyAttachedError();
     }
 
     this._savePreviouslyFocusedElement();
-    return this._portalHost.attachComponentPortal(portal);
+    return this._portalOutlet.attachComponentPortal(portal);
   }
 
   /**
@@ -130,12 +130,12 @@ export class MatDialogContainer extends BasePortalHost {
    * @param portal Portal to be attached as the dialog content.
    */
   attachTemplatePortal<C>(portal: TemplatePortal<C>): EmbeddedViewRef<C> {
-    if (this._portalHost.hasAttached()) {
+    if (this._portalOutlet.hasAttached()) {
       throwMatDialogContentAlreadyAttachedError();
     }
 
     this._savePreviouslyFocusedElement();
-    return this._portalHost.attachTemplatePortal(portal);
+    return this._portalOutlet.attachTemplatePortal(portal);
   }
 
   /** Moves the focus inside the focus trap. */
diff --git a/src/lib/snack-bar/snack-bar-container.html b/src/lib/snack-bar/snack-bar-container.html
index 5b263ad218a4..215f0d9c55b3 100644
--- a/src/lib/snack-bar/snack-bar-container.html
+++ b/src/lib/snack-bar/snack-bar-container.html
@@ -1 +1 @@
-<ng-template cdkPortalHost></ng-template>
+<ng-template cdkPortalOutlet></ng-template>
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 1ee4bd576da8..d88b3debd247 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -28,9 +28,9 @@ import {
   AnimationEvent,
 } from '@angular/animations';
 import {
-  BasePortalHost,
+  BasePortalOutlet,
   ComponentPortal,
-  PortalHostDirective,
+  PortalOutletDirective,
 } from '@angular/cdk/portal';
 import {first} from 'rxjs/operators';
 import {AnimationCurves, AnimationDurations} from '@angular/material/core';
@@ -71,12 +71,12 @@ export const HIDE_ANIMATION =
     ])
   ],
 })
-export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
+export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy {
   /** Whether the component has been destroyed. */
   private _destroyed = false;
 
-  /** The portal host inside of this container into which the snack bar content will be loaded. */
-  @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
+  /** The portal outlet inside of this container into which the snack bar content will be loaded. */
+  @ViewChild(PortalOutletDirective) _portalOutlet: PortalOutletDirective;
 
   /** Subject for notifying that the snack bar has exited from view. */
   _onExit: Subject<any> = new Subject();
@@ -100,7 +100,7 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
 
   /** Attach a component portal as content to this snack bar container. */
   attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T> {
-    if (this._portalHost.hasAttached()) {
+    if (this._portalOutlet.hasAttached()) {
       throw Error('Attempting to attach snack bar content after content is already attached');
     }
 
@@ -120,7 +120,7 @@ export class MatSnackBarContainer extends BasePortalHost implements OnDestroy {
       this._renderer.addClass(this._elementRef.nativeElement, 'mat-snack-bar-top');
     }
 
-    return this._portalHost.attachComponentPortal(portal);
+    return this._portalOutlet.attachComponentPortal(portal);
   }
 
   /** Attach a template portal as content to this snack bar container. */
diff --git a/src/lib/tabs/tab-body.html b/src/lib/tabs/tab-body.html
index c6e7a4cdd526..0650b3fdc08d 100644
--- a/src/lib/tabs/tab-body.html
+++ b/src/lib/tabs/tab-body.html
@@ -2,5 +2,5 @@
      [@translateTab]="_position"
      (@translateTab.start)="_onTranslateTabStarted($event)"
      (@translateTab.done)="_onTranslateTabComplete($event)">
-  <ng-template cdkPortalHost></ng-template>
+  <ng-template cdkPortalOutlet></ng-template>
 </div>
diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts
index 83cf647816a4..4572e9f756fe 100644
--- a/src/lib/tabs/tab-body.spec.ts
+++ b/src/lib/tabs/tab-body.spec.ts
@@ -156,16 +156,16 @@ describe('MatTabBody', () => {
     it('should attach the content when centered and detach when not', fakeAsync(() => {
       fixture.componentInstance.position = 1;
       fixture.detectChanges();
-      expect(fixture.componentInstance.tabBody._portalHost.hasAttached()).toBe(false);
+      expect(fixture.componentInstance.tabBody._portalOutlet.hasAttached()).toBe(false);
 
       fixture.componentInstance.position = 0;
       fixture.detectChanges();
-      expect(fixture.componentInstance.tabBody._portalHost.hasAttached()).toBe(true);
+      expect(fixture.componentInstance.tabBody._portalOutlet.hasAttached()).toBe(true);
 
       fixture.componentInstance.position = 1;
       fixture.detectChanges();
       flushMicrotasks(); // Finish animation and let it detach in animation done handler
-      expect(fixture.componentInstance.tabBody._portalHost.hasAttached()).toBe(false);
+      expect(fixture.componentInstance.tabBody._portalOutlet.hasAttached()).toBe(false);
     }));
   });
 
diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index 9eb53f5f7316..d2e14bcfd0dc 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -27,7 +27,7 @@ import {
   transition,
   AnimationEvent,
 } from '@angular/animations';
-import {TemplatePortal, PortalHostDirective} from '@angular/cdk/portal';
+import {TemplatePortal, PortalOutletDirective} from '@angular/cdk/portal';
 import {Directionality, Direction} from '@angular/cdk/bidi';
 
 
@@ -87,8 +87,8 @@ export type MatTabBodyOriginState = 'left' | 'right';
   ]
 })
 export class MatTabBody implements OnInit, AfterViewChecked {
-  /** The portal host inside of this container into which the tab body content will be loaded. */
-  @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective;
+  /** The portal outlet inside of this container into which the tab body content will be loaded. */
+  @ViewChild(PortalOutletDirective) _portalOutlet: PortalOutletDirective;
 
   /** Event emitted when the tab begins to animate towards the center as the active tab. */
   @Output() _onCentering: EventEmitter<number> = new EventEmitter<number>();
@@ -144,8 +144,8 @@ export class MatTabBody implements OnInit, AfterViewChecked {
    * content if it is not already attached.
    */
   ngAfterViewChecked() {
-    if (this._isCenterPosition(this._position) && !this._portalHost.hasAttached()) {
-      this._portalHost.attach(this._content);
+    if (this._isCenterPosition(this._position) && !this._portalOutlet.hasAttached()) {
+      this._portalOutlet.attach(this._content);
     }
   }
 
@@ -158,7 +158,7 @@ export class MatTabBody implements OnInit, AfterViewChecked {
   _onTranslateTabComplete(e: AnimationEvent) {
     // If the end state is that the tab is not centered, then detach the content.
     if (!this._isCenterPosition(e.toState) && !this._isCenterPosition(this._position)) {
-      this._portalHost.detach();
+      this._portalOutlet.detach();
     }
 
     // If the transition to the center is complete, emit an event.
diff --git a/src/lib/tabs/tab-group.html b/src/lib/tabs/tab-group.html
index c0c05d8eac9b..91a99a581016 100644
--- a/src/lib/tabs/tab-group.html
+++ b/src/lib/tabs/tab-group.html
@@ -16,7 +16,7 @@
 
        <!-- If there is a label template, use it. -->
     <ng-template [ngIf]="tab.templateLabel">
-      <ng-template [cdkPortalHost]="tab.templateLabel"></ng-template>
+      <ng-template [cdkPortalOutlet]="tab.templateLabel"></ng-template>
     </ng-template>
 
     <!-- If there is not a label template, fall back to the text label. -->

From 9fa075e001188f1a346dbc260606e871bc653e1a Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 30 Oct 2017 14:05:09 -0700
Subject: [PATCH 382/575] =?UTF-8?q?fix(datepicker):=20allow=20`DateAdapter?=
 =?UTF-8?q?`=20authors=20to=20have=20more=20control=20ove=E2=80=A6=20(#734?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(datepicker): allow `DateAdapter` authors to have more control over what can/can't be coerced to a date

BREAKING CHANGES:
- `fromIso8601` method on `DateAdapter` removed in favor of `coerceToDate`

* address comments

* more comments addressed

* return invalid date instead of throwing
---
 src/lib/core/datetime/date-adapter.ts         | 48 +++++++++++++----
 .../core/datetime/native-date-adapter.spec.ts | 34 ++++++++----
 src/lib/core/datetime/native-date-adapter.ts  | 33 ++++++++----
 src/lib/datepicker/calendar.ts                | 25 +++++++--
 .../datepicker/coerce-date-property.spec.ts   | 54 -------------------
 src/lib/datepicker/coerce-date-property.ts    | 35 ------------
 src/lib/datepicker/datepicker-input.ts        | 14 +++--
 src/lib/datepicker/datepicker.spec.ts         |  8 +--
 src/lib/datepicker/datepicker.ts              | 13 ++++-
 src/lib/datepicker/month-view.ts              | 14 +++--
 src/lib/datepicker/public-api.ts              |  1 -
 src/lib/datepicker/year-view.ts               | 14 +++--
 .../adapter/moment-date-adapter.spec.ts       | 42 ++++++++++-----
 .../adapter/moment-date-adapter.ts            | 31 +++++++++--
 14 files changed, 202 insertions(+), 164 deletions(-)
 delete mode 100644 src/lib/datepicker/coerce-date-property.spec.ts
 delete mode 100644 src/lib/datepicker/coerce-date-property.ts

diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index 4c3dc8572a52..c6f9da34969e 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -118,7 +118,7 @@ export abstract class DateAdapter<D> {
   abstract today(): D;
 
   /**
-   * Parses a date from a value.
+   * Parses a date from a user-provided value.
    * @param value The value to parse.
    * @param parseFormat The expected format of the value being parsed
    *     (type is implementation-dependent).
@@ -127,7 +127,7 @@ export abstract class DateAdapter<D> {
   abstract parse(value: any, parseFormat: any): D | null;
 
   /**
-   * Formats a date as a string.
+   * Formats a date as a string according to the given format.
    * @param date The value to format.
    * @param displayFormat The format to use to display the date as a string.
    * @returns The formatted date string.
@@ -165,18 +165,13 @@ export abstract class DateAdapter<D> {
 
   /**
    * Gets the RFC 3339 compatible string (https://tools.ietf.org/html/rfc3339) for the given date.
+   * This method is used to generate date strings that are compatible with native HTML attributes
+   * such as the `min` or `max` attribute of an `<input>`.
    * @param date The date to get the ISO date string for.
    * @returns The ISO date string date string.
    */
   abstract toIso8601(date: D): string;
 
-  /**
-   * Creates a date from an RFC 3339 compatible string (https://tools.ietf.org/html/rfc3339).
-   * @param iso8601String The ISO date string to create a date from
-   * @returns The date created from the ISO date string.
-   */
-  abstract fromIso8601(iso8601String: string): D | null;
-
   /**
    * Checks whether the given object is considered a date instance by this DateAdapter.
    * @param obj The object to check
@@ -191,6 +186,31 @@ export abstract class DateAdapter<D> {
    */
   abstract isValid(date: D): boolean;
 
+  /**
+   * Gets date instance that is not valid.
+   * @returns An invalid date.
+   */
+  abstract invalid(): D;
+
+  /**
+   * Attempts to deserialize a value to a valid date object. This is different from parsing in that
+   * deserialize should only accept non-ambiguous, locale-independent formats (e.g. a ISO 8601
+   * string). The default implementation does not allow any deserialization, it simply checks that
+   * the given value is already a valid date object or null. The `<mat-datepicker>` will call this
+   * method on all of it's `@Input()` properties that accept dates. It is therefore possible to
+   * support passing values from your backend directly to these properties by overriding this method
+   * to also deserialize the format used by your backend.
+   * @param value The value to be deserialized into a date object.
+   * @returns The deserialized date object, either a valid date, null if the value can be
+   *     deserialized into a null date (e.g. the empty string), or an invalid date.
+   */
+  deserialize(value: any): D | null {
+    if (value == null || this.isDateInstance(value) && this.isValid(value)) {
+      return value;
+    }
+    return this.invalid();
+  }
+
   /**
    * Sets the locale used for all dates.
    * @param locale The new locale.
@@ -221,7 +241,15 @@ export abstract class DateAdapter<D> {
    *     Null dates are considered equal to other null dates.
    */
   sameDate(first: D | null, second: D | null): boolean {
-    return first && second ? !this.compareDate(first, second) : first == second;
+    if (first && second) {
+      let firstValid = this.isValid(first);
+      let secondValid = this.isValid(second);
+      if (firstValid && secondValid) {
+        return !this.compareDate(first, second)
+      }
+      return firstValid == secondValid;
+    }
+    return first == second;
   }
 
   /**
diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index 92371ee0742f..a745026d2798 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -6,9 +6,11 @@ import {DateAdapter, MAT_DATE_LOCALE, NativeDateAdapter, NativeDateModule} from
 
 const SUPPORTS_INTL = typeof Intl != 'undefined';
 
+
 describe('NativeDateAdapter', () => {
   const platform = new Platform();
   let adapter: NativeDateAdapter;
+  let assertValidDate: (d: Date | null, valid: boolean) => void;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -18,6 +20,13 @@ describe('NativeDateAdapter', () => {
 
   beforeEach(inject([DateAdapter], (d: NativeDateAdapter) => {
     adapter = d;
+
+    assertValidDate = (d: Date | null, valid: boolean) => {
+      expect(adapter.isDateInstance(d)).not.toBeNull(`Expected ${d} to be a date instance`);
+      expect(adapter.isValid(d!)).toBe(valid,
+          `Expected ${d} to be ${valid ? 'valid' : 'invalid'},` +
+          ` but was ${valid ? 'invalid' : 'valid'}`);
+    }
   }));
 
   it('should get year', () => {
@@ -333,14 +342,22 @@ describe('NativeDateAdapter', () => {
   });
 
   it('should create dates from valid ISO strings', () => {
-    expect(adapter.fromIso8601('1985-04-12T23:20:50.52Z')).not.toBeNull();
-    expect(adapter.fromIso8601('1996-12-19T16:39:57-08:00')).not.toBeNull();
-    expect(adapter.fromIso8601('1937-01-01T12:00:27.87+00:20')).not.toBeNull();
-    expect(adapter.fromIso8601('2017-01-01')).not.toBeNull();
-    expect(adapter.fromIso8601('2017-01-01T00:00:00')).not.toBeNull();
-    expect(adapter.fromIso8601('1990-13-31T23:59:00Z')).toBeNull();
-    expect(adapter.fromIso8601('1/1/2017')).toBeNull();
-    expect(adapter.fromIso8601('2017-01-01T')).toBeNull();
+    assertValidDate(adapter.deserialize('1985-04-12T23:20:50.52Z'), true);
+    assertValidDate(adapter.deserialize('1996-12-19T16:39:57-08:00'), true);
+    assertValidDate(adapter.deserialize('1937-01-01T12:00:27.87+00:20'), true);
+    assertValidDate(adapter.deserialize('2017-01-01'), true);
+    assertValidDate(adapter.deserialize('2017-01-01T00:00:00'), true);
+    assertValidDate(adapter.deserialize('1990-13-31T23:59:00Z'), false);
+    assertValidDate(adapter.deserialize('1/1/2017'), false);
+    assertValidDate(adapter.deserialize('2017-01-01T'), false);
+    expect(adapter.deserialize('')).toBeNull();
+    expect(adapter.deserialize(null)).toBeNull();
+    assertValidDate(adapter.deserialize(new Date()), true);
+    assertValidDate(adapter.deserialize(new Date(NaN)), false);
+  });
+
+  it('should create an invalid date', () => {
+    assertValidDate(adapter.invalid(), false);
   });
 });
 
@@ -390,5 +407,4 @@ describe('NativeDateAdapter with LOCALE_ID override', () => {
 
     expect(adapter.getDayOfWeekNames('long')).toEqual(expectedValue);
   });
-
 });
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index 216f17d35cfb..22fd954693b2 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -7,8 +7,9 @@
  */
 
 import {Inject, Injectable, Optional} from '@angular/core';
-import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
 import {extendObject} from '../util/object-extend';
+import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
+
 
 // TODO(mmalerba): Remove when we no longer support safari 9.
 /** Whether the browser supports the Intl API. */
@@ -219,16 +220,26 @@ export class NativeDateAdapter extends DateAdapter<Date> {
     ].join('-');
   }
 
-  fromIso8601(iso8601String: string): Date | null {
-    // The `Date` constructor accepts formats other than ISO 8601, so we need to make sure the
-    // string is the right format first.
-    if (ISO_8601_REGEX.test(iso8601String)) {
-      let d = new Date(iso8601String);
-      if (this.isValid(d)) {
-        return d;
+  /**
+   * Returns the given value if given a valid Date or null. Deserializes valid ISO 8601 strings
+   * (https://www.ietf.org/rfc/rfc3339.txt) into valid Dates and empty string into null. Returns an
+   * invalid date for all other values.
+   */
+  deserialize(value: any): Date | null {
+    if (typeof value === 'string') {
+      if (!value) {
+        return null;
+      }
+      // The `Date` constructor accepts formats other than ISO 8601, so we need to make sure the
+      // string is the right format first.
+      if (ISO_8601_REGEX.test(value)) {
+        let date = new Date(value);
+        if (this.isValid(date)) {
+          return date;
+        }
       }
     }
-    return null;
+    return super.deserialize(value);
   }
 
   isDateInstance(obj: any) {
@@ -239,6 +250,10 @@ export class NativeDateAdapter extends DateAdapter<Date> {
     return !isNaN(date.getTime());
   }
 
+  invalid(): Date {
+    return new Date(NaN);
+  }
+
   /** Creates a date but allows the month and date to overflow. */
   private _createDateWithOverflow(year: number, month: number, date: number) {
     let result = new Date(year, month, date);
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index b3e56927927c..4be8b54ba03f 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -38,7 +38,6 @@ import {
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {first} from 'rxjs/operators';
 import {Subscription} from 'rxjs/Subscription';
-import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MatDatepickerIntl} from './datepicker-intl';
 import {MatMonthView} from './month-view';
@@ -67,7 +66,9 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   /** A date representing the period (month or year) to start the calendar in. */
   @Input()
   get startAt(): D | null { return this._startAt; }
-  set startAt(value: D | null) { this._startAt = coerceDateProperty(this._dateAdapter, value); }
+  set startAt(value: D | null) {
+    this._startAt = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
+  }
   private _startAt: D | null;
 
   /** Whether the calendar should be started in month or year view. */
@@ -76,19 +77,25 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   /** The currently selected date. */
   @Input()
   get selected(): D | null { return this._selected; }
-  set selected(value: D | null) { this._selected = coerceDateProperty(this._dateAdapter, value); }
+  set selected(value: D | null) {
+    this._selected = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
+  }
   private _selected: D | null;
 
   /** The minimum selectable date. */
   @Input()
   get minDate(): D | null { return this._minDate; }
-  set minDate(value: D | null) { this._minDate = coerceDateProperty(this._dateAdapter, value); }
+  set minDate(value: D | null) {
+    this._minDate = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
+  }
   private _minDate: D | null;
 
   /** The maximum selectable date. */
   @Input()
   get maxDate(): D | null { return this._maxDate; }
-  set maxDate(value: D | null) { this._maxDate = coerceDateProperty(this._dateAdapter, value); }
+  set maxDate(value: D | null) {
+    this._maxDate = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
+  }
   private _maxDate: D | null;
 
   /** A function used to filter which dates are selectable. */
@@ -385,4 +392,12 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
         (this._dateAdapter.getMonth(date) >= 7 ? 5 : 12);
     return this._dateAdapter.addCalendarMonths(date, increment);
   }
+
+  /**
+   * @param obj The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  private _getValidDateOrNull(obj: any): D | null {
+    return (this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj)) ? obj : null;
+  }
 }
diff --git a/src/lib/datepicker/coerce-date-property.spec.ts b/src/lib/datepicker/coerce-date-property.spec.ts
deleted file mode 100644
index cad4486f843c..000000000000
--- a/src/lib/datepicker/coerce-date-property.spec.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {async, inject, TestBed} from '@angular/core/testing';
-import {DateAdapter, JAN, MatNativeDateModule} from '@angular/material/core';
-import {coerceDateProperty} from './index';
-
-
-describe('coerceDateProperty', () => {
-  let adapter: DateAdapter<Date>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [MatNativeDateModule],
-    });
-
-    TestBed.compileComponents();
-  }));
-
-  beforeEach(inject([DateAdapter], (dateAdapter: DateAdapter<Date>) => {
-    adapter = dateAdapter;
-  }));
-
-  it('should pass through existing date', () => {
-    const d = new Date(2017, JAN, 1);
-    expect(coerceDateProperty(adapter, d)).toBe(d);
-  });
-
-  it('should pass through invalid date', () => {
-    const d = new Date(NaN);
-    expect(coerceDateProperty(adapter, d)).toBe(d);
-  });
-
-  it('should pass through null and undefined', () => {
-    expect(coerceDateProperty(adapter, null)).toBeNull();
-    expect(coerceDateProperty(adapter, undefined)).toBeUndefined();
-  });
-
-  it('should coerce empty string to null', () => {
-    expect(coerceDateProperty(adapter, '')).toBe(null);
-  });
-
-  it('should coerce ISO 8601 string to date', () => {
-    let isoString = '2017-01-01T00:00:00Z';
-    expect(coerceDateProperty(adapter, isoString)).toEqual(new Date(isoString));
-  });
-
-  it('should throw when given a number', () => {
-    expect(() => coerceDateProperty(adapter, 5)).toThrow();
-    expect(() => coerceDateProperty(adapter, 0)).toThrow();
-  });
-
-  it('should throw when given a string with incorrect format', () => {
-    expect(() => coerceDateProperty(adapter, '1/1/2017')).toThrow();
-    expect(() => coerceDateProperty(adapter, 'hello')).toThrow();
-  });
-});
diff --git a/src/lib/datepicker/coerce-date-property.ts b/src/lib/datepicker/coerce-date-property.ts
deleted file mode 100644
index d85a54f06021..000000000000
--- a/src/lib/datepicker/coerce-date-property.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 {DateAdapter} from '@angular/material/core';
-
-
-/**
- * Function that attempts to coerce a value to a date using a DateAdapter. Date instances, null,
- * and undefined will be passed through. Empty strings will be coerced to null. Valid ISO 8601
- * strings (https://www.ietf.org/rfc/rfc3339.txt) will be coerced to dates. All other values will
- * result in an error being thrown.
- * @param adapter The date adapter to use for coercion
- * @param value The value to coerce.
- * @return A date object coerced from the value.
- * @throws Throws when the value cannot be coerced.
- */
-export function coerceDateProperty<D>(adapter: DateAdapter<D>, value: any): D | null {
-  if (typeof value === 'string') {
-    if (value == '') {
-      value = null;
-    } else {
-      value = adapter.fromIso8601(value) || value;
-    }
-  }
-  if (value == null || adapter.isDateInstance(value)) {
-    return value;
-  }
-  throw Error(`Datepicker: Value must be either a date object recognized by the DateAdapter or ` +
-              `an ISO 8601 string. Instead got: ${value}`);
-}
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index d1ee19ad40bd..45b847adc845 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -34,7 +34,6 @@ import {
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {MatFormField} from '@angular/material/form-field';
 import {Subscription} from 'rxjs/Subscription';
-import {coerceDateProperty} from './coerce-date-property';
 import {MatDatepicker} from './datepicker';
 import {createMissingDateImplError} from './datepicker-errors';
 
@@ -113,10 +112,9 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
     return this._value;
   }
   set value(value: D | null) {
-    value = coerceDateProperty(this._dateAdapter, value);
+    value = this._dateAdapter.deserialize(value);
     this._lastValueValid = !value || this._dateAdapter.isValid(value);
     value = this._getValidDateOrNull(value);
-
     let oldDate = this.value;
     this._value = value;
     this._renderer.setProperty(this._elementRef.nativeElement, 'value',
@@ -131,7 +129,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
   @Input()
   get min(): D | null { return this._min; }
   set min(value: D | null) {
-    this._min = coerceDateProperty(this._dateAdapter, value);
+    this._min = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
     this._validatorOnChange();
   }
   private _min: D | null;
@@ -140,7 +138,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
   @Input()
   get max(): D | null { return this._max; }
   set max(value: D | null) {
-    this._max = coerceDateProperty(this._dateAdapter, value);
+    this._max = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
     this._validatorOnChange();
   }
   private _max: D | null;
@@ -188,7 +186,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
 
   /** The form control validator for the min date. */
   private _minValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    const controlValue = coerceDateProperty(this._dateAdapter, control.value);
+    const controlValue = this._getValidDateOrNull(this._dateAdapter.deserialize(control.value));
     return (!this.min || !controlValue ||
         this._dateAdapter.compareDate(this.min, controlValue) <= 0) ?
         null : {'matDatepickerMin': {'min': this.min, 'actual': controlValue}};
@@ -196,7 +194,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
 
   /** The form control validator for the max date. */
   private _maxValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    const controlValue = coerceDateProperty(this._dateAdapter, control.value);
+    const controlValue = this._getValidDateOrNull(this._dateAdapter.deserialize(control.value));
     return (!this.max || !controlValue ||
         this._dateAdapter.compareDate(this.max, controlValue) >= 0) ?
         null : {'matDatepickerMax': {'max': this.max, 'actual': controlValue}};
@@ -204,7 +202,7 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
 
   /** The form control validator for the date filter. */
   private _filterValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-    const controlValue = coerceDateProperty(this._dateAdapter, control.value);
+    const controlValue = this._getValidDateOrNull(this._dateAdapter.deserialize(control.value));
     return !this._dateFilter || !controlValue || this._dateFilter(controlValue) ?
         null : {'matDatepickerFilter': true};
   }
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 919539a44db3..4df9754f2284 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -272,14 +272,10 @@ describe('MatDatepicker', () => {
         expect((ownedElement as Element).tagName.toLowerCase()).toBe('mat-calendar');
       });
 
-      it('should throw when given wrong data type', () => {
+      it('should not throw when given wrong data type', () => {
         testComponent.date = '1/1/2017' as any;
 
-        expect(() => fixture.detectChanges()).toThrowError(
-            'Datepicker: Value must be either a date object recognized by the DateAdapter or an ' +
-            'ISO 8601 string. Instead got: 1/1/2017');
-
-        testComponent.date = null;
+        expect(() => fixture.detectChanges()).not.toThrow();
       });
     });
 
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index 7b02a9e7993e..cbeb722d0d0f 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -42,7 +42,6 @@ import {DOCUMENT} from '@angular/platform-browser';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {MatCalendar} from './calendar';
-import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MatDatepickerInput} from './datepicker-input';
 
@@ -133,7 +132,9 @@ export class MatDatepicker<D> implements OnDestroy {
     // selected value is.
     return this._startAt || (this._datepickerInput ? this._datepickerInput.value : null);
   }
-  set startAt(date: D | null) { this._startAt = coerceDateProperty(this._dateAdapter, date); }
+  set startAt(date: D | null) {
+    this._startAt = this._getValidDateOrNull(this._dateAdapter.deserialize(date));
+  }
   private _startAt: D | null;
 
   /** The view that the calendar should start in. */
@@ -367,4 +368,12 @@ export class MatDatepicker<D> implements OnDestroy {
         { overlayX: 'end', overlayY: 'bottom' }
       );
   }
+
+  /**
+   * @param obj The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  private _getValidDateOrNull(obj: any): D | null {
+    return (this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj)) ? obj : null;
+  }
 }
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index afbdec8177dc..c8d9fc0ae926 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -20,7 +20,6 @@ import {
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {MatCalendarCell} from './calendar-body';
-import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 
 
@@ -47,7 +46,8 @@ export class MatMonthView<D> implements AfterContentInit {
   get activeDate(): D { return this._activeDate; }
   set activeDate(value: D) {
     let oldActiveDate = this._activeDate;
-    this._activeDate = coerceDateProperty(this._dateAdapter, value) || this._dateAdapter.today();
+    this._activeDate =
+        this._getValidDateOrNull(this._dateAdapter.deserialize(value)) || this._dateAdapter.today();
     if (!this._hasSameMonthAndYear(oldActiveDate, this._activeDate)) {
       this._init();
     }
@@ -58,7 +58,7 @@ export class MatMonthView<D> implements AfterContentInit {
   @Input()
   get selected(): D | null { return this._selected; }
   set selected(value: D | null) {
-    this._selected = coerceDateProperty(this._dateAdapter, value);
+    this._selected = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
     this._selectedDate = this._getDateInCurrentMonth(this._selected);
   }
   private _selected: D | null;
@@ -186,4 +186,12 @@ export class MatMonthView<D> implements AfterContentInit {
     return !!(d1 && d2 && this._dateAdapter.getMonth(d1) == this._dateAdapter.getMonth(d2) &&
               this._dateAdapter.getYear(d1) == this._dateAdapter.getYear(d2));
   }
+
+  /**
+   * @param obj The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  private _getValidDateOrNull(obj: any): D | null {
+    return (this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj)) ? obj : null;
+  }
 }
diff --git a/src/lib/datepicker/public-api.ts b/src/lib/datepicker/public-api.ts
index ca079144a7fd..eb79de80b7ce 100644
--- a/src/lib/datepicker/public-api.ts
+++ b/src/lib/datepicker/public-api.ts
@@ -9,7 +9,6 @@
 export * from './datepicker-module';
 export * from './calendar';
 export * from './calendar-body';
-export * from './coerce-date-property';
 export * from './datepicker';
 export * from './datepicker-input';
 export * from './datepicker-intl';
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index 2e999a6eff02..3e60fdf190e9 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -20,7 +20,6 @@ import {
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {MatCalendarCell} from './calendar-body';
-import {coerceDateProperty} from './coerce-date-property';
 import {createMissingDateImplError} from './datepicker-errors';
 
 
@@ -42,7 +41,8 @@ export class MatYearView<D> implements AfterContentInit {
   get activeDate(): D { return this._activeDate; }
   set activeDate(value: D) {
     let oldActiveDate = this._activeDate;
-    this._activeDate = coerceDateProperty(this._dateAdapter, value) || this._dateAdapter.today();
+    this._activeDate =
+        this._getValidDateOrNull(this._dateAdapter.deserialize(value)) || this._dateAdapter.today();
     if (this._dateAdapter.getYear(oldActiveDate) != this._dateAdapter.getYear(this._activeDate)) {
       this._init();
     }
@@ -53,7 +53,7 @@ export class MatYearView<D> implements AfterContentInit {
   @Input()
   get selected(): D | null { return this._selected; }
   set selected(value: D | null) {
-    this._selected = coerceDateProperty(this._dateAdapter, value);
+    this._selected = this._getValidDateOrNull(this._dateAdapter.deserialize(value));
     this._selectedMonth = this._getMonthInCurrentYear(this._selected);
   }
   private _selected: D | null;
@@ -155,4 +155,12 @@ export class MatYearView<D> implements AfterContentInit {
 
     return false;
   }
+
+  /**
+   * @param obj The object to check.
+   * @returns The given object if it is both a date instance and valid, otherwise null.
+   */
+  private _getValidDateOrNull(obj: any): D | null {
+    return (this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj)) ? obj : null;
+  }
 }
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
index f9bf51316851..547f8db2ba26 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
@@ -6,20 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {MomentDateAdapter} from './moment-date-adapter';
-import {async, inject, TestBed} from '@angular/core/testing';
-import {MomentDateModule} from './index';
-import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material';
 import {LOCALE_ID} from '@angular/core';
+import {async, inject, TestBed} from '@angular/core/testing';
+import {DateAdapter, DEC, FEB, JAN, MAR, MAT_DATE_LOCALE} from '@angular/material/core';
 import * as moment from 'moment';
-
-
-// Month constants for more readable tests.
-const JAN = 0, FEB = 1, MAR = 2, DEC = 11;
+import {MomentDateModule} from './index';
+import {MomentDateAdapter} from './moment-date-adapter';
 
 
 describe('MomentDateAdapter', () => {
   let adapter: MomentDateAdapter;
+  let assertValidDate: (d: moment.Moment | null, valid: boolean) => void;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -31,6 +28,13 @@ describe('MomentDateAdapter', () => {
     moment.locale('en');
     adapter = d;
     adapter.setLocale('en');
+
+    assertValidDate = (d: moment.Moment | null, valid: boolean) => {
+      expect(adapter.isDateInstance(d)).not.toBeNull(`Expected ${d} to be a date instance`);
+      expect(adapter.isValid(d!)).toBe(valid,
+          `Expected ${d} to be ${valid ? 'valid' : 'invalid'},` +
+          ` but was ${valid ? 'invalid' : 'valid'}`);
+    }
   }));
 
   it('should get year', () => {
@@ -309,12 +313,18 @@ describe('MomentDateAdapter', () => {
     expect(adapter.isDateInstance(d)).toBe(false);
   });
 
-  it('should create dates from valid ISO strings', () => {
-    expect(adapter.fromIso8601('1985-04-12T23:20:50.52Z')).not.toBeNull();
-    expect(adapter.fromIso8601('1996-12-19T16:39:57-08:00')).not.toBeNull();
-    expect(adapter.fromIso8601('1937-01-01T12:00:27.87+00:20')).not.toBeNull();
-    expect(adapter.fromIso8601('1990-13-31T23:59:00Z')).toBeNull();
-    expect(adapter.fromIso8601('1/1/2017')).toBeNull();
+  it('should create valid dates from valid ISO strings', () => {
+    assertValidDate(adapter.deserialize('1985-04-12T23:20:50.52Z'), true);
+    assertValidDate(adapter.deserialize('1996-12-19T16:39:57-08:00'), true);
+    assertValidDate(adapter.deserialize('1937-01-01T12:00:27.87+00:20'), true);
+    assertValidDate(adapter.deserialize('1990-13-31T23:59:00Z'), false);
+    assertValidDate(adapter.deserialize('1/1/2017'), false);
+    expect(adapter.deserialize('')).toBeNull();
+    expect(adapter.deserialize(null)).toBeNull();
+    assertValidDate(adapter.deserialize(new Date()), true);
+    assertValidDate(adapter.deserialize(new Date(NaN)), false);
+    assertValidDate(adapter.deserialize(moment()), true);
+    assertValidDate(adapter.deserialize(moment.invalid()), false);
   });
 
   it('setLocale should not modify global moment locale', () => {
@@ -355,6 +365,10 @@ describe('MomentDateAdapter', () => {
     adapter.isValid(date);
     expect(date.locale()).toBe('en');
   });
+
+  it('should create invalid date', () => {
+    assertValidDate(adapter.invalid(), false);
+  });
 });
 
 describe('MomentDateAdapter with MAT_DATE_LOCALE override', () => {
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.ts b/src/material-moment-adapter/adapter/moment-date-adapter.ts
index fbba8886cce5..ec56d812881b 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.ts
@@ -8,14 +8,14 @@
 
 import {Inject, Injectable, Optional} from '@angular/core';
 import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material';
-
 // Depending on whether rollup is used, moment needs to be imported differently.
 // Since Moment.js doesn't have a default export, we normally need to import using the `* as`
 // syntax. However, rollup creates a synthetic default module and we thus need to import it using
 // the `default as` syntax.
 // TODO(mmalerba): See if we can clean this up at some point.
-import {default as _rollupMoment, Moment} from 'moment';
 import * as _moment from 'moment';
+import {default as _rollupMoment, Moment} from 'moment';
+
 const moment = _rollupMoment || _moment;
 
 
@@ -174,9 +174,26 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
     return this.clone(date).format();
   }
 
-  fromIso8601(iso8601String: string): Moment | null {
-    let d = moment(iso8601String, moment.ISO_8601).locale(this.locale);
-    return this.isValid(d) ? d : null;
+  /**
+   * Returns the given value if given a valid Moment or null. Deserializes valid ISO 8601 strings
+   * (https://www.ietf.org/rfc/rfc3339.txt) and valid Date objects into valid Moments and empty
+   * string into null. Returns an invalid date for all other values.
+   */
+  deserialize(value: any): Moment | null {
+    let date;
+    if (value instanceof Date) {
+      date = moment(value);
+    }
+    if (typeof value === 'string') {
+      if (!value) {
+        return null;
+      }
+      date = moment(value, moment.ISO_8601).locale(this.locale);
+    }
+    if (date && this.isValid(date)) {
+      return date;
+    }
+    return super.deserialize(value);
   }
 
   isDateInstance(obj: any): boolean {
@@ -186,4 +203,8 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
   isValid(date: Moment): boolean {
     return this.clone(date).isValid();
   }
+
+  invalid(): Moment {
+    return moment.invalid();
+  }
 }

From b2dd17ad095b616cfd33e0d43a4f94feeb0c94f5 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 30 Oct 2017 16:07:43 -0500
Subject: [PATCH 383/575] fix(menu): make @Output names consistent #6677
 (#8053)

* fix(menu): make @Output names consistent #6677

* chore(nit): pr feedback updates

* chore(merge): fix bad merge
---
 src/lib/menu/menu-directive.ts | 24 +++++++++++++++---------
 src/lib/menu/menu-item.ts      |  6 +++---
 src/lib/menu/menu-trigger.ts   | 24 ++++++++++++++++++------
 src/lib/menu/menu.html         |  2 +-
 src/lib/menu/menu.spec.ts      |  6 +++---
 5 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 742023b39340..50453939a2dd 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -142,7 +142,13 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
   }
 
   /** Event emitted when the menu is closed. */
-  @Output() close = new EventEmitter<void | 'click' | 'keydown'>();
+  @Output() closed = new EventEmitter<void | 'click' | 'keydown'>();
+
+  /**
+   * Event emitted when the menu is closed.
+   * @deprecated Switch to `closed` instead
+   */
+  @Output() close = this.closed;
 
   constructor(
     private _elementRef: ElementRef,
@@ -156,39 +162,39 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
 
   ngOnDestroy() {
     this._tabSubscription.unsubscribe();
-    this.close.emit();
-    this.close.complete();
+    this.closed.emit();
+    this.closed.complete();
   }
 
   /** Stream that emits whenever the hovered menu item changes. */
-  hover(): Observable<MatMenuItem> {
+  _hovered(): Observable<MatMenuItem> {
     if (this.items) {
       return this.items.changes.pipe(
         startWith(this.items),
-        switchMap(items => merge(...items.map(item => item.hover)))
+        switchMap(items => merge(...items.map(item => item._hovered)))
       );
     }
 
     return this._ngZone.onStable
       .asObservable()
-      .pipe(first(), switchMap(() => this.hover()));
+      .pipe(first(), switchMap(() => this._hovered()));
   }
 
   /** Handle a keyboard event from the menu, delegating to the appropriate action. */
   _handleKeydown(event: KeyboardEvent) {
     switch (event.keyCode) {
       case ESCAPE:
-        this.close.emit('keydown');
+        this.closed.emit('keydown');
         event.stopPropagation();
       break;
       case LEFT_ARROW:
         if (this.parentMenu && this.direction === 'ltr') {
-          this.close.emit('keydown');
+          this.closed.emit('keydown');
         }
       break;
       case RIGHT_ARROW:
         if (this.parentMenu && this.direction === 'rtl') {
-          this.close.emit('keydown');
+          this.closed.emit('keydown');
         }
       break;
       default:
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index 96c04201310e..e985c43dabd2 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -51,7 +51,7 @@ export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOptio
   OnDestroy {
 
   /** Stream that emits when the menu item is hovered. */
-  hover: Subject<MatMenuItem> = new Subject();
+  _hovered: Subject<MatMenuItem> = new Subject();
 
   /** Whether the menu item is highlighted. */
   _highlighted: boolean = false;
@@ -69,7 +69,7 @@ export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOptio
   }
 
   ngOnDestroy() {
-    this.hover.complete();
+    this._hovered.complete();
   }
 
   /** Used to set the `tabindex`. */
@@ -93,7 +93,7 @@ export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOptio
   /** Emits to the hover stream. */
   _emitHoverEvent() {
     if (!this.disabled) {
-      this.hover.next(this);
+      this._hovered.next(this);
     }
   }
 
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 1f0dd4861e2d..9e58c410fd51 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -107,10 +107,22 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
   @Input('matMenuTriggerFor') menu: MatMenuPanel;
 
   /** Event emitted when the associated menu is opened. */
-  @Output() onMenuOpen = new EventEmitter<void>();
+  @Output() menuOpened = new EventEmitter<void>();
+
+  /**
+   * Event emitted when the associated menu is opened.
+   * @deprecated Switch to `menuOpened` instead
+   */
+  @Output() onMenuOpen = this.menuOpened;
 
   /** Event emitted when the associated menu is closed. */
-  @Output() onMenuClose = new EventEmitter<void>();
+  @Output() menuClosed = new EventEmitter<void>();
+
+  /**
+   * Event emitted when the associated menu is closed.
+   * @deprecated Switch to `menuClosed` instead
+   */
+  @Output() onMenuClose = this.menuClosed;
 
   constructor(private _overlay: Overlay,
               private _element: ElementRef,
@@ -133,13 +145,13 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
 
       // If a click closed the menu, we should close the entire chain of nested menus.
       if (reason === 'click' && this._parentMenu) {
-        this._parentMenu.close.emit(reason);
+        this._parentMenu.closed.emit(reason);
       }
     });
 
     if (this.triggersSubmenu()) {
       // Subscribe to changes in the hovered item in order to toggle the panel.
-      this._hoverSubscription = this._parentMenu.hover()
+      this._hoverSubscription = this._parentMenu._hovered()
           .pipe(filter(active => active === this._menuItemInstance))
           .subscribe(() => {
             this._openedByMouse = true;
@@ -273,7 +285,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
   // set state rather than toggle to support triggers sharing a menu
   private _setIsMenuOpen(isOpen: boolean): void {
     this._menuOpen = isOpen;
-    this._menuOpen ? this.onMenuOpen.emit() : this.onMenuClose.emit();
+    this._menuOpen ? this.menuOpened.emit() : this.menuClosed.emit();
 
     if (this.triggersSubmenu()) {
       this._menuItemInstance._highlighted = isOpen;
@@ -388,7 +400,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
   private _menuClosingActions() {
     const backdrop = this._overlayRef!.backdropClick();
     const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
-    const hover = this._parentMenu ? this._parentMenu.hover().pipe(
+    const hover = this._parentMenu ? this._parentMenu._hovered().pipe(
       filter(active => active !== this._menuItemInstance),
       filter(() => this._menuOpen)
     ) : observableOf();
diff --git a/src/lib/menu/menu.html b/src/lib/menu/menu.html
index ddbad3894152..6c3450a52fcf 100644
--- a/src/lib/menu/menu.html
+++ b/src/lib/menu/menu.html
@@ -3,7 +3,7 @@
     class="mat-menu-panel"
     [ngClass]="_classList"
     (keydown)="_handleKeydown($event)"
-    (click)="close.emit('click')"
+    (click)="closed.emit('click')"
     [@transformMenu]="_panelAnimationState"
     (@transformMenu.done)="_onAnimationDone($event)"
     tabindex="-1"
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 7eae9d1bae64..082257508200 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -559,7 +559,7 @@ describe('MatMenu', () => {
       const emitCallback = jasmine.createSpy('emit callback');
       const completeCallback = jasmine.createSpy('complete callback');
 
-      fixture.componentInstance.menu.close.subscribe(emitCallback, null, completeCallback);
+      fixture.componentInstance.menu.closed.subscribe(emitCallback, null, completeCallback);
       fixture.destroy();
 
       expect(emitCallback).toHaveBeenCalledWith(undefined);
@@ -625,7 +625,7 @@ describe('MatMenu', () => {
       fixture.detectChanges();
 
       const spy = jasmine.createSpy('hover spy');
-      const subscription = instance.rootMenu.hover().subscribe(spy);
+      const subscription = instance.rootMenu._hovered().subscribe(spy);
       const menuItems = overlay.querySelectorAll('[mat-menu-item]');
 
       dispatchMouseEvent(menuItems[0], 'mouseenter');
@@ -1112,7 +1112,7 @@ describe('MatMenu default overrides', () => {
 @Component({
   template: `
     <button [matMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
-    <mat-menu class="custom-one custom-two" #menu="matMenu" (close)="closeCallback($event)">
+    <mat-menu class="custom-one custom-two" #menu="matMenu" (closed)="closeCallback($event)">
       <button mat-menu-item> Item </button>
       <button mat-menu-item disabled> Disabled </button>
       <button mat-menu-item>

From d47b37a7e48112f1a2fba044fa5e4302936a1a0e Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 30 Oct 2017 14:08:29 -0700
Subject: [PATCH 384/575] fix(table): broaden abstraction for filtering (#8059)

* fix(table): broaden abstraction for filtering

* cleanup

* rename filter function

* fix wording
---
 src/demo-app/table/table-demo.ts   |  3 ++-
 src/lib/table/table-data-source.ts | 29 +++++++++++++++++++----------
 src/lib/table/table.spec.ts        | 19 +++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index efecfc9e6995..691190cb73dc 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -60,7 +60,8 @@ export class TableDemo {
         default: return '';
       }
     };
-    this.matTableDataSource.filterTermAccessor = (data: UserData) => data.name;
+    this.matTableDataSource.filterPredicate =
+        (data: UserData, filter: string) => data.name.indexOf(filter) != -1;
     this.filter.valueChanges.subscribe(filter => this.matTableDataSource!.filter = filter);
   }
 
diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
index 1ff3903f224a..3f9d46efcdae 100644
--- a/src/lib/table/table-data-source.ts
+++ b/src/lib/table/table-data-source.ts
@@ -44,7 +44,7 @@ export class MatTableDataSource<T> implements DataSource<T> {
 
   /**
    * Filter term that should be used to filter out objects from the data array. To override how
-   * the filter matches data objects, provide a custom function on filterTermAccessor.
+   * data objects match to this filter string, provide a custom function for filterPredicate.
    */
   set filter(filter: string) { this._filter.next(filter); }
   get filter(): string { return this._filter.value; }
@@ -91,14 +91,24 @@ export class MatTableDataSource<T> implements DataSource<T> {
   }
 
   /**
-   * Transforms data objects into a filter term that will be used to check against the filter if
-   * a filter is set. By default, the function will iterate over the values of the data object
-   * and convert them to a lowercase string.
-   * @param data Data object to convert to a string that checked for containing the filter term.
+   * Checks if a data object matches the data source's filter string. By default, each data object
+   * is converted to a string of its properties and returns true if the filter has
+   * at least one occurrence in that string. By default, the filter string has its whitespace
+   * trimmed and the match is case-insensitive. May be overriden for a custom implementation of
+   * filter matching.
+   * @param data Data object used to check against the filter.
+   * @param filter Filter string that has been set on the data source.
+   * @returns Whether the filter matches against the data
    */
-  filterTermAccessor: ((data: T) => string) = (data: T): string => {
+  filterPredicate: ((data: T, filter: string) => boolean) = (data: T, filter: string): boolean => {
+    // Transform the data into a lowercase string of all property values.
     const accumulator = (currentTerm, key) => currentTerm + data[key];
-    return Object.keys(data).reduce(accumulator, '').toLowerCase();
+    const dataStr = Object.keys(data).reduce(accumulator, '').toLowerCase();
+
+    // Transform the filter by converting it to lowercase and removing whitespace.
+    const transformedFilter = filter.trim().toLowerCase();
+
+    return dataStr.indexOf(transformedFilter) != -1;
   }
 
   constructor(initialData: T[] = []) {
@@ -145,9 +155,8 @@ export class MatTableDataSource<T> implements DataSource<T> {
     // If there is a filter string, filter out data that does not contain it.
     // Each data object is converted to a string using the function defined by filterTermAccessor.
     // May be overriden for customization.
-    const filteredData = !this.filter ? data : data.filter(obj => {
-      return this.filterTermAccessor(obj).indexOf(this.filter) != -1;
-    });
+    const filteredData =
+        !this.filter ? data : data.filter(obj => this.filterPredicate(obj, this.filter));
 
     if (this.paginator) { this._updatePaginator(filteredData.length); }
 
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index 39949cf92b19..eac0a880fff9 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -109,8 +109,8 @@ describe('MatTable', () => {
       flushMicrotasks();  // Resolve promise that updates paginator's length
       expect(dataSource.paginator!.length).toBe(1);
 
-      // Change filter to a_2, should match one row
-      dataSource.filter = 'a_2';
+      // Change filter to '  A_2  ', should match one row (ignores case and whitespace)
+      dataSource.filter = '  A_2  ';
       fixture.detectChanges();
       expectTableToMatchContent(tableElement, [
         ['Column A', 'Column B', 'Column C'],
@@ -127,14 +127,17 @@ describe('MatTable', () => {
         ['a_3', 'b_3', 'c_3'],
       ]);
 
-      // Change filter function and filter, should match to rows.
-      dataSource.filterTermAccessor = data => {
+      // Change filter function and filter, should match to rows with zebra.
+      dataSource.filterPredicate = (data, filter) => {
+        let dataStr;
         switch (data.a) {
-          case 'a_1': return 'elephant';
-          case 'a_2': return 'zebra';
-          case 'a_3': return 'monkey';
-          default: return '';
+          case 'a_1': dataStr = 'elephant'; break;
+          case 'a_2': dataStr = 'zebra'; break;
+          case 'a_3': dataStr = 'monkey'; break;
+          default: dataStr = '';
         }
+
+        return dataStr.indexOf(filter) != -1;
       };
       dataSource.filter = 'zebra';
       fixture.detectChanges();

From f59abdb3d5a62d1199a4a2b4bba92e33e38d5e19 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 30 Oct 2017 16:31:44 -0500
Subject: [PATCH 385/575] fix(select): make @Output names consistent #6677
 (#8052)

---
 src/lib/select/select.spec.ts |  2 +-
 src/lib/select/select.ts      | 45 ++++++++++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index f1fbe1ef28dd..6eaa22e7ff63 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -3390,7 +3390,7 @@ class NgIfSelect {
   selector: 'select-with-change-event',
   template: `
     <mat-form-field>
-      <mat-select (change)="changeListener($event)">
+      <mat-select (selectionChange)="changeListener($event)">
         <mat-option *ngFor="let food of foods" [value]="food">{{ food }}</mat-option>
       </mat-select>
     </mat-form-field>
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 9ca633252822..739afb49756c 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
   ViewportRuler,
 } from '@angular/cdk/overlay';
-import {filter, first, startWith, takeUntil} from 'rxjs/operators';
+import {filter, first, map, startWith, takeUntil} from 'rxjs/operators';
 import {
   AfterContentInit,
   Attribute,
@@ -401,14 +401,41 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return merge(...this.options.map(option => option.onSelectionChange));
   }
 
-  /** Event emitted when the select has been opened. */
-  @Output() onOpen: EventEmitter<void> = new EventEmitter<void>();
+   /** Event emitted when the select has been opened. */
+   @Output() openedChange: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+   /** Event emitted when the select has been opened. */
+   @Output('opened')
+   get _openedStream(): Observable<void> {
+    return this.openedChange.pipe(filter(o => o), map(() => {}));
+  }
 
   /** Event emitted when the select has been closed. */
-  @Output() onClose: EventEmitter<void> = new EventEmitter<void>();
+  @Output('closed')
+  get _closedStream(): Observable<void> {
+    return this.openedChange.pipe(filter(o => !o), map(() => {}));
+  }
+
+  /**
+   * Event emitted when the select has been opened.
+   * @deprecated Use `openedChange` instead.
+   */
+  @Output() onOpen: Observable<void> = this._openedStream;
 
-  /** Event emitted when the selected value has been changed by the user. */
-  @Output() change: EventEmitter<MatSelectChange> = new EventEmitter<MatSelectChange>();
+  /**
+   * Event emitted when the select has been closed.
+   * @deprecated Use `openedChange` instead.
+   */
+  @Output() onClose: Observable<void> = this._closedStream;
+
+   /** Event emitted when the selected value has been changed by the user. */
+  @Output() selectionChange: EventEmitter<MatSelectChange> = new EventEmitter<MatSelectChange>();
+
+  /**
+   * Event emitted when the selected value has been changed by the user.
+   * @deprecated Use `selectionChange` instead.
+   */
+  @Output() change: EventEmitter<MatSelectChange> = this.selectionChange;
 
   /**
    * Event that emits whenever the raw value of the select changes. This is here primarily
@@ -637,9 +664,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   _onPanelDone(): void {
     if (this.panelOpen) {
       this._scrollTop = 0;
-      this.onOpen.emit();
+      this.openedChange.emit(true);
     } else {
-      this.onClose.emit();
+      this.openedChange.emit(false);
       this._panelDoneAnimating = false;
       this.overlayDir.offsetX = 0;
       this._changeDetectorRef.markForCheck();
@@ -859,7 +886,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
     this._value = valueToEmit;
     this._onChange(valueToEmit);
-    this.change.emit(new MatSelectChange(this, valueToEmit));
+    this.selectionChange.emit(new MatSelectChange(this, valueToEmit));
     this.valueChange.emit(valueToEmit);
     this._changeDetectorRef.markForCheck();
   }

From 34306ad0f9b827fe6c6517f49494057cb660a44f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 30 Oct 2017 22:33:13 +0100
Subject: [PATCH 386/575] ci: skip more tasks if only markdown files changed
 (#8096)

* No longer just skips the unit test and e2e tasks if only markdown files changed. Now everything will be skipped, since there is nothing that tests against the `.md` files.
* Prints messages for the deploy tasks that run inside of Pull Requests but end up in a NOOP.
---
 scripts/ci/travis-deploy.sh  | 13 +++++++------
 scripts/ci/travis-testing.sh |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/ci/travis-deploy.sh b/scripts/ci/travis-deploy.sh
index 7350356143bd..544e7878c97c 100755
--- a/scripts/ci/travis-deploy.sh
+++ b/scripts/ci/travis-deploy.sh
@@ -33,19 +33,20 @@ echo ""
 if [[ "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then
   if [[ "${DEPLOY_MODE}" == "screenshot-tool" ]]; then
     retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-screenshot-tool.sh
-  fi
-
-  if [[ "${DEPLOY_MODE}" == "dashboard" ]]; then
+  elif [[ "${DEPLOY_MODE}" == "dashboard" ]]; then
     retryCall ${DEPLOY_RETRIES} ./scripts/deploy/deploy-dashboard.sh
+  else
+    echo "Docs content and build artifacts won't be published in Travis cronjobs."
   fi
+
 # Deployment of the build artifacts and docs-content should only happen on a per-commit base.
 # The target is to provide build artifacts in the GitHub repository for every commit.
 else
   if [[ "${DEPLOY_MODE}" == "build-artifacts" ]]; then
     retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-build-artifacts.sh
-  fi
-
-  if [[ "${DEPLOY_MODE}" == "docs-content" ]]; then
+  elif [[ "${DEPLOY_MODE}" == "docs-content" ]]; then
     retryCall ${DEPLOY_RETRIES} ./scripts/deploy/publish-docs-content.sh
+  else
+    echo "The dashboard and screenshot-tool will only be deployed in Travis cronjobs."
   fi
 fi
diff --git a/scripts/ci/travis-testing.sh b/scripts/ci/travis-testing.sh
index e790d41f3cbb..2aca6151f8c3 100755
--- a/scripts/ci/travis-testing.sh
+++ b/scripts/ci/travis-testing.sh
@@ -25,8 +25,8 @@ else
 fi
 
 # Check if tests can be skipped
-if [[ ${fileDiff} =~ ^(.*\.md\s*)*$ ]] && (is_e2e || is_unit); then
-  echo "Skipping e2e and unit tests since only markdown files changed"
+if [[ ${fileDiff} =~ ^(.*\.md\s*)*$ ]]; then
+  echo "Skipping tests since only markdown files changed."
   exit 0
 fi
 

From 8d74d6798a856fddefe58d846e9cd6ffe2bd2c7d Mon Sep 17 00:00:00 2001
From: Michael Prentice <splaktar@gmail.com>
Date: Mon, 30 Oct 2017 17:33:40 -0400
Subject: [PATCH 387/575] docs(readme): cleanup (#8103)

* docs(readme): cleanup

fix broken ripples link
use aio for getting started
nested menus are here, remove coming Q3 message

* docs(readme): add link to cdk docs
---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d05d66edb2ef..c1a10376c420 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ High level stuff planned for Q4 2017 (October - December):
 | icon             |                                                        |   [Docs][10] |
 | input            |                                                        |   [Docs][5]  |
 | list             |                   Selection and action list planned Q3 |   [Docs][8]  |
-| menu             |                                 Nested menu planned Q3 |   [Docs][17] |
+| menu             |                                                        |   [Docs][17] |
 | paginator        |                                                        |   [Docs][29] |
 | progress-bar     |                                                        |   [Docs][12] |
 | progress-spinner |                                                        |   [Docs][11] |
@@ -81,7 +81,7 @@ High level stuff planned for Q4 2017 (October - December):
 | theming          |                                                        |  [Guide][20] |
 | typography       |                                                        |  [Guide][27] |
 | layout           |                      See [angular/flex-layout][lay_rp] |  [Wiki][0]   |
-| cdk              |                    Launched, documentation in-progress |              |
+| cdk              |                                                        |   [Docs][34] |
 
 
 #### In progress, planned, and non-planned features
@@ -115,7 +115,7 @@ High level stuff planned for Q4 2017 (October - December):
 [16]: https://material.angular.io/components/component/slider
 [17]: https://material.angular.io/components/component/menu
 [18]: https://material.angular.io/components/component/tooltip
-[19]: https://github.com/angular/material2/blob/master/src/lib/core/ripple/README.md
+[19]: https://github.com/angular/material2/blob/master/src/lib/core/ripple/ripple.md
 [20]: https://material.angular.io/guide/theming
 [21]: https://material.angular.io/components/component/snack-bar
 [22]: https://material.angular.io/components/component/dialog
@@ -130,6 +130,7 @@ High level stuff planned for Q4 2017 (October - December):
 [31]: https://tina-material-tree.firebaseapp.com/simple-tree
 [32]: https://material.angular.io/components/expansion/overview
 [33]: https://material.angular.io/components/stepper/overview
+[34]: https://material.angular.io/cdk/categories
 
 [0107]: https://github.com/angular/material2/issues/107
 [0119]: https://github.com/angular/material2/issues/119
@@ -153,9 +154,8 @@ High level stuff planned for Q4 2017 (October - December):
 [0474]: https://github.com/angular/material2/pull/474
 
 [aio]: https://material.angular.io
-[getting-started]: https://github.com/angular/material2/blob/master/guides/getting-started.md
+[getting-started]: https://material.angular.io/guide/getting-started
 [lay_rp]:  https://github.com/angular/flex-layout
-[theming]: https://github.com/angular/material2/blob/master/guides/theming.md
 
 
 ## The goal of Angular Material

From bffe5f52c42da9820d808ffd05067de81e0557d9 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 30 Oct 2017 22:34:35 +0100
Subject: [PATCH 388/575] docs: proper module import name (#8105)

* No longer shows import paths for the CDK without the secondary-entry point. Those imports are not valid and for the CDK its required to specify a secondary-entry point.
---
 tools/dgeni/processors/component-grouper.ts        | 12 +++++++++---
 tools/dgeni/templates/componentGroup.template.html |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/dgeni/processors/component-grouper.ts b/tools/dgeni/processors/component-grouper.ts
index 3e6d1ade69cf..625af6ce9c25 100644
--- a/tools/dgeni/processors/component-grouper.ts
+++ b/tools/dgeni/processors/component-grouper.ts
@@ -11,6 +11,9 @@ export class ComponentGroup {
   /** Display name of the component group */
   displayName: string;
 
+  /** Module import path for the component group. */
+  moduleImportPath: string;
+
   /** Name of the package, either material or cdk */
   packageName: string;
 
@@ -60,7 +63,7 @@ export class ComponentGrouper implements Processor {
 
   $process(docs: DocCollection) {
     // Map of group name to group instance.
-    const groups = new Map();
+    const groups = new Map<string, ComponentGroup>();
 
     docs.forEach(doc => {
       // Full path to the file for this doc.
@@ -79,20 +82,23 @@ export class ComponentGrouper implements Processor {
       }
 
       const displayName = path.relative(basePath, filePath).split(path.sep)[1];
+      const moduleImportPath = `@angular/${packageName}/${displayName}`;
       const groupName = packageName + '-' + displayName;
 
       // Get the group for this doc, or, if one does not exist, create it.
       let group;
       if (groups.has(groupName)) {
-        group = groups.get(groupName);
+        group = groups.get(groupName)!;
       } else {
         group = new ComponentGroup(groupName);
         groups.set(groupName, group);
       }
 
+      group.displayName = displayName;
+      group.moduleImportPath = moduleImportPath;
+
       group.packageName = packageName;
       group.packageDisplayName = packageDisplayName;
-      group.displayName = displayName;
 
       // Put this doc into the appropriate list in this group.
       if (doc.isDirective) {
diff --git a/tools/dgeni/templates/componentGroup.template.html b/tools/dgeni/templates/componentGroup.template.html
index 45905c7ec99a..c6d703cf367d 100644
--- a/tools/dgeni/templates/componentGroup.template.html
+++ b/tools/dgeni/templates/componentGroup.template.html
@@ -26,7 +26,7 @@ <h2>
 
   <p class="docs-api-module-import">
     <code>
-      import {{$ doc.ngModule.name $}} from '@angular/{$ doc.packageName $}';
+      import {{$ doc.ngModule.name $}} from '{$ doc.moduleImportPath $}';
     </code>
   </p>
 

From fd527821cfd8c12a25775c1ca772274ddc8534dd Mon Sep 17 00:00:00 2001
From: Gabriel <32056062+TheRedD0t@users.noreply.github.com>
Date: Mon, 30 Oct 2017 22:34:52 +0100
Subject: [PATCH 389/575] chore: add link to tracking issue for bottom-sheet
 component (#8119)

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c1a10376c420..1ed27771f4e5 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ High level stuff planned for Q4 2017 (October - December):
 | virtual-repeat   |        Not started, planned Q4 2017 |           -  |   [#823][0823] |
 | fab speed-dial   |            Not started, not planned |           -  |   [#860][0860] |
 | fab toolbar      |            Not started, not planned |           -  |              - |
-| bottom-sheet     |            Not started, not planned |           -  |              - |
+| bottom-sheet     |            Not started, not planned |           -  |  [#8113][8113] |
 | bottom-nav       |            Not started, not planned |           -  |   [#408][0408] |
 
  [0]: https://github.com/angular/flex-layout/wiki
@@ -152,6 +152,7 @@ High level stuff planned for Q4 2017 (October - December):
 [4191]: https://github.com/angular/material2/pull/4191
 [0995]: https://github.com/angular/material2/pull/995
 [0474]: https://github.com/angular/material2/pull/474
+[8113]: https://github.com/angular/material2/issues/8113
 
 [aio]: https://material.angular.io
 [getting-started]: https://material.angular.io/guide/getting-started

From e703b3edd3fc2a6892eff33ce9475340e6209174 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 30 Oct 2017 16:35:11 -0500
Subject: [PATCH 390/575] docs(types): null chk descriptions, type placement
 updates (#8125)

---
 tools/dgeni/templates/method.template.html   | 2 ++
 tools/dgeni/templates/property.template.html | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/dgeni/templates/method.template.html b/tools/dgeni/templates/method.template.html
index 8a79b1e18b4d..4d6ed2f81ec3 100644
--- a/tools/dgeni/templates/method.template.html
+++ b/tools/dgeni/templates/method.template.html
@@ -9,11 +9,13 @@
       </th>
     </tr>
   </thead>
+  {%- if method.description -%}
   <tr class="docs-api-method-description-row">
     <td colspan="2" class="docs-api-method-description-cell">
       {$ method.description | marked | safe $}
     </td>
   </tr>
+  {%- endif -%}
 
   {%- if method.params.length -%}
   <thead>
diff --git a/tools/dgeni/templates/property.template.html b/tools/dgeni/templates/property.template.html
index fd539e9ea11a..1b8adf131e7b 100644
--- a/tools/dgeni/templates/property.template.html
+++ b/tools/dgeni/templates/property.template.html
@@ -23,9 +23,8 @@
     {%- endif -%}   
 
     <p class="docs-api-property-name">
-      {$ property.name $}
+      <code>{$ property.name $}: {$ property.type $}</code>
     </p>
-    <code class="docs-api-property-type">{$ property.type $}</code>
   </td>
   <td class="docs-api-property-description">{$ property.description | marked | safe $}</td>
 </tr>

From 804f925d92cb77890a9ed2b176bbe3eae6ee6d9c Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 30 Oct 2017 16:35:32 -0500
Subject: [PATCH 391/575] docs(focus): Add docs for regions #8082 (#8128)

* docs(focus): Add docs for regions #8082

* docs(a11y): add more desc for focus trap
---
 src/cdk/a11y/a11y.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/cdk/a11y/a11y.md b/src/cdk/a11y/a11y.md
index c42198d5cba3..548326f0bcc7 100644
--- a/src/cdk/a11y/a11y.md
+++ b/src/cdk/a11y/a11y.md
@@ -68,6 +68,22 @@ This directive is declared in `A11yModule`.
 This directive will not prevent focus from moving out of the trapped region due to mouse
 interaction.
 
+#### Regions
+Regions can be declared explicitly with an initial focus element by using 
+the `cdkFocusRegionStart`, `cdkFocusRegionEnd` and `cdkFocusInitial` DOM attributes. 
+`cdkFocusInitial` specifies the element that will receive focus upon initialization of the region. 
+`cdkFocusRegionStart` and `cdkFocusRegionEnd` define the region within which focus will be 
+trapped. When using the tab key, focus will move through this region and wrap around on either end.
+
+For example:
+
+```html
+<a mat-list-item routerLink cdkFocusRegionStart>Focus region start</a>
+<a mat-list-item routerLink>Link</a>
+<a mat-list-item routerLink cdkFocusInitial>Initially focused</a>
+<a mat-list-item routerLink cdkFocusRegionEnd>Focus region end</a>
+```
+
 
 ### InteractivityChecker
 `InteractivityChecker` is used to check the interactivity of an element, capturing disabled,

From 10c1c0617d52c705f6857dec993416c6003de85c Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 30 Oct 2017 14:35:47 -0700
Subject: [PATCH 392/575] docs(dialog): don't say that entryComponents is for
 AOT only (#8133)

Fixes #8102
---
 src/lib/dialog/dialog.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/dialog/dialog.md b/src/lib/dialog/dialog.md
index e817549982de..5bbcabdc6ef6 100644
--- a/src/lib/dialog/dialog.md
+++ b/src/lib/dialog/dialog.md
@@ -96,14 +96,14 @@ You can control which elements are tab stops with the `tabindex` attribute
 
 <!-- example(dialog-content) -->
 
-### AOT Compilation
+### Configuring dialog content via `entryComponents`
 
-Due to the dynamic nature of the `MatDialog`, and its usage of `ViewContainerRef#createComponent()`
-to create the component on the fly, the AOT compiler will not know to create the proper
-`ComponentFactory` for your dialog component by default.
+Because `MatDialog` instantiates components at run-time, the Angular compiler needs extra
+information to create the necessary `ComponentFactory` for your dialog content component.
 
-You must include your dialog class in the list of `entryComponents` in your module definition so
-that the AOT compiler knows to create the `ComponentFactory` for it.
+For any component loaded into a dialog, you must include your component class in the list of
+`entryComponents` in your NgModule definition so that the Angular compiler knows to create
+the `ComponentFactory` for it.
 
 ```ts
 @NgModule({

From c5cbe18f51777cc4de228ccbac4461a0820e3c4d Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 30 Oct 2017 16:36:45 -0500
Subject: [PATCH 393/575] a11y(table): add basic, sort, pager demos for a11y
 #6498 (#6653)

* a11y(table): add basic, sort, pager demos for a11y #6498

* chore(nit): few tweaks

* a11y(table): add readonly flag

* chore(nit): export interface

* chore(tests): fix old prefixes

* chore(build): update comp names from md to mat
---
 src/demo-app/a11y/a11y-module.ts        |   3 +-
 src/demo-app/a11y/a11y.ts               |   1 +
 src/demo-app/a11y/routes.ts             |   2 +
 src/demo-app/a11y/table/table-a11y.html |  78 ++++++++++++++++
 src/demo-app/a11y/table/table-a11y.scss |   0
 src/demo-app/a11y/table/table-a11y.ts   | 114 ++++++++++++++++++++++++
 6 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 src/demo-app/a11y/table/table-a11y.html
 create mode 100644 src/demo-app/a11y/table/table-a11y.scss
 create mode 100644 src/demo-app/a11y/table/table-a11y.ts

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index bbb138ab9e7d..7b3e86775222 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -33,6 +33,7 @@ import {SliderAccessibilityDemo} from './slider/slider-a11y';
 import {SlideToggleAccessibilityDemo} from './slide-toggle/slide-toggle-a11y';
 import {SnackBarAccessibilityDemo} from './snack-bar/snack-bar-a11y';
 import {SelectAccessibilityDemo} from './select/select-a11y';
+import {TableAccessibilityDemo} from './table/table-a11y';
 import {
   TabsAccessibilityDemo,
   SunnyTabContent,
@@ -45,7 +46,6 @@ import {SidenavBasicAccessibilityDemo} from './sidenav/basic-sidenav-a11y';
 import {SidenavDualAccessibilityDemo} from './sidenav/dual-sidenav-a11y';
 import {SidenavMobileAccessibilityDemo} from './sidenav/mobile-sidenav-a11y';
 
-
 @NgModule({
   imports: [
     RouterModule.forChild(ACCESSIBILITY_DEMO_ROUTES)
@@ -98,6 +98,7 @@ export class AccessibilityRoutingModule {}
     SliderAccessibilityDemo,
     SlideToggleAccessibilityDemo,
     SnackBarAccessibilityDemo,
+    TableAccessibilityDemo,
     SunnyTabContent,
     TabsAccessibilityDemo,
     ToolbarAccessibilityDemo,
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 527c548d1eb1..907e2458932a 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -50,6 +50,7 @@ export class AccessibilityDemo implements OnDestroy {
     {name: 'Slide toggle', route: 'slide-toggle'},
     {name: 'Slider', route: 'slider'},
     {name: 'Snack bar', route: 'snack-bar'},
+    {name: 'Table', route: 'table'},
     {name: 'Tabs', route: 'tabs'},
     {name: 'Toolbar', route: 'toolbar'},
     {name: 'Tooltip', route: 'tooltip'},
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index e075dd4acf25..081d2f4dd03f 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -21,6 +21,7 @@ import {SliderAccessibilityDemo} from './slider/slider-a11y';
 import {SlideToggleAccessibilityDemo} from './slide-toggle/slide-toggle-a11y';
 import {SnackBarAccessibilityDemo} from './snack-bar/snack-bar-a11y';
 import {SelectAccessibilityDemo} from './select/select-a11y';
+import {TableAccessibilityDemo} from './table/table-a11y';
 import {TabsAccessibilityDemo} from './tabs/tabs-a11y';
 import {TABS_DEMO_ROUTES} from './tabs/routes';
 import {TooltipAccessibilityDemo} from './tooltip/tooltip-a11y';
@@ -57,5 +58,6 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'snack-bar', component: SnackBarAccessibilityDemo},
   {path: 'tabs', component: TabsAccessibilityDemo, children: TABS_DEMO_ROUTES},
   {path: 'toolbar', component: ToolbarAccessibilityDemo},
+  {path: 'table', component: TableAccessibilityDemo},
   {path: 'tooltip', component: TooltipAccessibilityDemo},
 ];
diff --git a/src/demo-app/a11y/table/table-a11y.html b/src/demo-app/a11y/table/table-a11y.html
new file mode 100644
index 000000000000..ed2166548046
--- /dev/null
+++ b/src/demo-app/a11y/table/table-a11y.html
@@ -0,0 +1,78 @@
+<div>
+  <section>
+    <h2>Basic Table</h2>
+    <p>Shows name, color and age data.</p>
+    <mat-table aria-readonly="true"
+              [dataSource]="basicDataSource"
+              aria-label="Users favorite colors and age">
+      <ng-container cdkColumnDef="name">
+        <mat-header-cell *cdkHeaderCellDef>Name</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.name}}</mat-cell>
+      </ng-container>
+      <ng-container cdkColumnDef="color">
+        <mat-header-cell *cdkHeaderCellDef>Color</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.color}}</mat-cell>
+      </ng-container>
+      <ng-container cdkColumnDef="age">
+        <mat-header-cell *cdkHeaderCellDef>Age</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.age}}</mat-cell>
+      </ng-container>
+      <mat-header-row *cdkHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *cdkRowDef="let row; columns: displayedColumns;"></mat-row>
+    </mat-table>
+  </section>
+
+  <section>
+    <h2>Sortable Table</h2>
+    <p>Shows name, color and age data. Sorted ascending by age.</p>
+    <mat-table [dataSource]="sortDataSource"
+              aria-label="Users favorite colors and age"
+              aria-readonly="true"
+              mdSort mdSortActive="age"
+              mdSortDirection="asc">
+      <ng-container cdkColumnDef="name">
+        <mat-header-cell *cdkHeaderCellDef>Name</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.name}}</mat-cell>
+      </ng-container>
+      <ng-container cdkColumnDef="color">
+        <mat-header-cell *cdkHeaderCellDef>Color</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.color}}</mat-cell>
+      </ng-container>
+      <ng-container cdkColumnDef="age">
+        <mat-header-cell *cdkHeaderCellDef mat-sort-header>Age</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.age}}</mat-cell>
+      </ng-container>
+      <mat-header-row *cdkHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *cdkRowDef="let row; columns: displayedColumns;"></mat-row>
+    </mat-table>
+  </section>
+
+  <section>
+    <h2>Paginated Table</h2>
+    <p>Shows name, color and age data. Shows only first 5 until paginated.</p>
+    <mat-table [dataSource]="paginatedDataSource"
+              aria-readonly="true"
+              aria-label="Users favorite colors and age">
+      <ng-container cdkColumnDef="name">
+        <mat-header-cell *cdkHeaderCellDef>Name</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.name}}</mat-cell>
+      </ng-container>
+      <ng-container cdkColumnDef="color">
+        <mat-header-cell *cdkHeaderCellDef>Color</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.color}}</mat-cell>
+      </ng-container>
+      <ng-container cdkColumnDef="age">
+        <mat-header-cell *cdkHeaderCellDef>Age</mat-header-cell>
+        <mat-cell *cdkCellDef="let row">{{row.age}}</mat-cell>
+      </ng-container>
+      <mat-header-row *cdkHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *cdkRowDef="let row; columns: displayedColumns;"></mat-row>
+    </mat-table>
+    <mat-paginator #paginator
+      [length]="6"
+      [pageIndex]="0"
+      [pageSize]="3"
+      [pageSizeOptions]="[1, 3, 5]">
+    </mat-paginator>
+  </section>
+</div>
diff --git a/src/demo-app/a11y/table/table-a11y.scss b/src/demo-app/a11y/table/table-a11y.scss
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/demo-app/a11y/table/table-a11y.ts b/src/demo-app/a11y/table/table-a11y.ts
new file mode 100644
index 000000000000..1db8734f5d7e
--- /dev/null
+++ b/src/demo-app/a11y/table/table-a11y.ts
@@ -0,0 +1,114 @@
+import {Component, ViewChild} from '@angular/core';
+import {DataSource} from '@angular/cdk/table';
+import {BehaviorSubject} from 'rxjs/BehaviorSubject';
+import {Observable} from 'rxjs/Observable';
+import {MatSort, MatPaginator} from '@angular/material';
+
+export interface UserData {
+  name: string;
+  color: string;
+  age: number;
+}
+
+const exampleData = [
+  {name: 'Austin', color: 'blue', age: 30},
+  {name: 'Jeremy', color: 'green', age: 33},
+  {name: 'Kara', color: 'purple', age: 29},
+  {name: 'Tina', color: 'yellow', age: 35},
+  {name: 'Brad', color: 'pink', age: 40},
+  {name: 'Jules', color: 'red', age: 21},
+];
+
+@Component({
+  moduleId: module.id,
+  selector: 'table-a11y',
+  templateUrl: 'table-a11y.html',
+  styleUrls: ['table-a11y.css'],
+})
+export class TableAccessibilityDemo {
+  @ViewChild(MatSort) sort: MatSort;
+  @ViewChild(MatPaginator) pager: MatPaginator;
+
+  displayedColumns = ['name', 'color', 'age'];
+  basicDataSource: BasicDataSource;
+  sortDataSource: SortDataSource;
+  paginatedDataSource: PaginatedDataSource;
+
+  ngOnInit(): void {
+    this.basicDataSource = new BasicDataSource();
+    this.sortDataSource = new SortDataSource(this.sort);
+    this.paginatedDataSource = new PaginatedDataSource(this.pager);
+  }
+}
+
+export class BasicDataSource extends DataSource<UserData> {
+  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
+
+  constructor() {
+    super();
+    this.dataChange.next(exampleData);
+  }
+
+  connect(): Observable<UserData[]> {
+    return this.dataChange;
+  }
+
+  disconnect() {}
+}
+
+export class SortDataSource extends DataSource<UserData> {
+  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
+
+  constructor(private _sort: MatSort) {
+    super();
+    this.dataChange.next(exampleData);
+  }
+
+  connect(): Observable<UserData[]> {
+    const displayDataChanges = [
+      this.dataChange,
+      this._sort.sortChange,
+    ];
+
+    return Observable.merge(...displayDataChanges).map(() => {
+      return this.getSortedData();
+    });
+  }
+
+  disconnect() {}
+
+  getSortedData(): UserData[] {
+    const data = [...exampleData];
+    if (!this._sort.active || this._sort.direction == '') {
+      return data;
+    }
+
+    return data.sort((a: UserData, b: UserData) => {
+      return (a.age < b.age ? -1 : 1) * (this._sort.direction == 'asc' ? 1 : -1);
+    });
+  }
+}
+
+export class PaginatedDataSource extends DataSource<UserData> {
+  dataChange: BehaviorSubject<UserData[]> = new BehaviorSubject<UserData[]>([]);
+
+  constructor(private _paginator: MatPaginator) {
+    super();
+    this.dataChange.next(exampleData);
+  }
+
+  connect(): Observable<UserData[]> {
+    const displayDataChanges = [
+      this.dataChange,
+      this._paginator.page,
+    ];
+
+    return Observable.merge(...displayDataChanges).map(() => {
+      const data = [...exampleData];
+      const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
+      return data.splice(startIndex, this._paginator.pageSize);
+    });
+  }
+
+  disconnect() {}
+}

From 1e6762926e5dc9a0604b29776b246693c3a8ace5 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 30 Oct 2017 14:52:34 -0700
Subject: [PATCH 394/575] chore(table): fix missing import in tests (#8135)

---
 package-lock.json           | 1537 ++++++-----------------------------
 src/cdk/table/table.spec.ts |    1 +
 2 files changed, 258 insertions(+), 1280 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f56bc6d815b..de60b2dea588 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1039,15 +1039,6 @@
                 }
               }
             },
-            "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-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -1059,6 +1050,15 @@
                 "strip-ansi": "3.0.1"
               }
             },
+            "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"
+              }
+            },
             "stringstream": {
               "version": "0.0.5",
               "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -1998,15 +1998,6 @@
                 }
               }
             },
-            "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-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -2018,6 +2009,15 @@
                 "strip-ansi": "3.0.1"
               }
             },
+            "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"
+              }
+            },
             "stringstream": {
               "version": "0.0.5",
               "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -2563,6 +2563,16 @@
         "@types/node": "7.0.46"
       }
     },
+    "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"
+      }
+    },
     "a-sync-waterfall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
@@ -3635,7 +3645,6 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -4475,8 +4484,8 @@
       "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
-        "is-text-path": "1.0.1",
         "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.2.0",
@@ -6764,18 +6773,7 @@
           "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
           "dev": true,
           "requires": {
-            "boom": "5.2.0"
-          },
-          "dependencies": {
-            "boom": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-              "dev": true,
-              "requires": {
-                "hoek": "4.2.0"
-              }
-            }
+            "boom": "4.3.1"
           }
         },
         "crypto-random-string": {
@@ -6811,6 +6809,7 @@
           "version": "2.4.0",
           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
           "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
+          "dev": true,
           "requires": {
             "is-obj": "1.0.1"
           }
@@ -7484,6 +7483,12 @@
           "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
           "dev": true
         },
+        "string-format-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+          "dev": true
+        },
         "string_decoder": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -7493,12 +7498,6 @@
             "safe-buffer": "5.1.1"
           }
         },
-        "string-format-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
-          "dev": true
-        },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -7663,6 +7662,7 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.25",
+        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -7682,7 +7682,6 @@
         "google-auto-auth": "0.7.2",
         "inquirer": "0.12.0",
         "jsonschema": "1.2.0",
-        "JSONStream": "1.3.1",
         "jsonwebtoken": "7.4.3",
         "lodash": "4.17.4",
         "open": "0.0.5",
@@ -7810,1231 +7809,219 @@
         },
         "winston": {
           "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
-          "dev": true,
-          "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
-          }
-        },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
-          }
-        },
-        "xdg-basedir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
-          "dev": true,
-          "requires": {
-            "os-homedir": "1.0.2"
-          }
-        }
-      }
-    },
-    "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
-    },
-    "flat-arguments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "1.1.1",
-        "as-array": "1.0.0",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isobject": "3.0.2"
-      },
-      "dependencies": {
-        "as-array": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
-          "dev": true,
-          "requires": {
-            "lodash.isarguments": "2.4.1",
-            "lodash.isobject": "2.4.1",
-            "lodash.values": "2.4.1"
-          },
-          "dependencies": {
-            "lodash.isarguments": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
-              "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.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
-          "dev": true
-        }
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "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"
-      }
-    },
-    "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.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "dev": true,
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true,
-      "optional": 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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
-      },
-      "dependencies": {
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11"
-          }
-        }
-      }
-    },
-    "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.7.0",
-        "node-pre-gyp": "0.6.36"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-          "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
-          "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
-          "dev": true,
-          "optional": 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,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-          "dev": true,
-          "optional": true
-        },
-        "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,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-          "dev": true,
-          "optional": 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,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-          "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true,
-          "optional": 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
-        },
-        "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"
-          }
-        },
-        "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
-        },
-        "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
-        },
-        "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
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-          "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-          "dev": true,
-          "optional": 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,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "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,
-          "optional": true
-        },
-        "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,
-          "optional": true
-        },
-        "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"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-          "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,
-          "optional": 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,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-          "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"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-          "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-          "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",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-          "dev": true,
-          "optional": 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,
-              "optional": true
-            }
-          }
-        },
-        "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"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
-        },
-        "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,
-          "optional": true
-        },
-        "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,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "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,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-          "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-          "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",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-          "dev": true
-        },
-        "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,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "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,
-          "optional": true
-        },
-        "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-typedarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "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,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-          "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-          "dev": true,
-          "optional": 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,
-          "optional": 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,
-          "optional": 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,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-          "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-          "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",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true,
-              "optional": 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"
-          }
-        },
-        "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.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
-          "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",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-          "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
-          "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",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
-        },
-        "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,
-          "optional": 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,
-          "optional": 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"
-          }
-        },
-        "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,
-          "optional": true
-        },
-        "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,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "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
-        },
-        "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,
-          "optional": 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
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true,
-          "optional": 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,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-          "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",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-          "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
-          "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",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-          "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",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true,
-          "optional": 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,
-          "optional": 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,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-          "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
-          "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
-          "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",
-              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-              "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "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"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-          "dev": true,
-          "optional": 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-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,
-          "optional": 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"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-          "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-          "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",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-          "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "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
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-          "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-          "dev": true,
-          "optional": 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
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-          "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
+          }
         },
-        "verror": {
-          "version": "1.3.6",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-          "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
+        "write-file-atomic": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "extsprintf": "1.0.2"
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
           }
         },
-        "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==",
+        "xdg-basedir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+          "dev": true,
+          "requires": {
+            "os-homedir": "1.0.2"
+          }
+        }
+      }
+    },
+    "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
+    },
+    "flat-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
+      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "1.1.1",
+        "as-array": "1.0.0",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isobject": "3.0.2"
+      },
+      "dependencies": {
+        "as-array": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
+          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "lodash.isarguments": "2.4.1",
+            "lodash.isobject": "2.4.1",
+            "lodash.values": "2.4.1"
+          },
+          "dependencies": {
+            "lodash.isarguments": {
+              "version": "2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
+              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
+              "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"
+              }
+            }
           }
         },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+        "lodash.isobject": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
           "dev": true
         }
       }
     },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "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"
+      }
+    },
+    "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.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": 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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -9251,7 +8238,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -13055,6 +12042,16 @@
         "through2": "0.6.5"
       },
       "dependencies": {
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -13067,16 +12064,6 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -13141,16 +12128,6 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
-      }
-    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -17941,15 +16918,6 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -17983,6 +16951,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "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"
+      }
+    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index a4039547fc46..da27d0300ca6 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -5,6 +5,7 @@ import {CollectionViewer, DataSource} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {combineLatest} from 'rxjs/observable/combineLatest';
 import {CdkTableModule} from './index';
+import {Observable} from 'rxjs/Observable';
 import {map} from 'rxjs/operators';
 import {
   getTableDuplicateColumnNameError,

From cd05b54e376077be69c2aec96f10a61b486321d7 Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Mon, 30 Oct 2017 17:06:59 -0500
Subject: [PATCH 395/575] fix(overlay): overlay class audits #6372 (#8056)

* fix(overlay): overlay class audits #6372

* chore(nit): pr feedback

* chore(nit): remove param
---
 src/demo-app/snack-bar/snack-bar-demo.ts   |  2 +-
 src/lib/datepicker/datepicker-content.html |  1 +
 src/lib/datepicker/datepicker.ts           |  3 +++
 src/lib/menu/menu-directive.ts             | 12 +++++++++++-
 src/lib/snack-bar/snack-bar-config.ts      |  8 +++++++-
 src/lib/snack-bar/snack-bar-container.ts   | 20 ++++++++++++++++++--
 src/lib/snack-bar/snack-bar.spec.ts        |  2 +-
 7 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 91bc1aae67da..6b1160720fc2 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -34,7 +34,7 @@ export class SnackBarDemo {
     config.verticalPosition = this.verticalPosition;
     config.horizontalPosition = this.horizontalPosition;
     config.duration = this.setAutoHide ? this.autoHide : 0;
-    config.extraClasses = this.addExtraClass ? ['party'] : undefined;
+    config.panelClass = this.addExtraClass ? ['party'] : undefined;
     config.direction = this.dir.value;
     this.snackBar.open(this.message, this.action ? this.actionButtonLabel : undefined, config);
   }
diff --git a/src/lib/datepicker/datepicker-content.html b/src/lib/datepicker/datepicker-content.html
index ec6461ce7484..60c0cc747809 100644
--- a/src/lib/datepicker/datepicker-content.html
+++ b/src/lib/datepicker/datepicker-content.html
@@ -1,5 +1,6 @@
 <mat-calendar cdkTrapFocus
     [id]="datepicker.id"
+    [ngClass]="datepicker.panelClass"
     [startAt]="datepicker.startAt"
     [startView]="datepicker.startView"
     [minDate]="datepicker._minDate"
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index cbeb722d0d0f..ab355ca41089 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -168,6 +168,9 @@ export class MatDatepicker<D> implements OnDestroy {
    */
   @Output() selectedChanged = new EventEmitter<D>();
 
+  /** Classes to be passed to the date picker panel. Supports the same syntax as `ngClass`. */
+  @Input() panelClass: string | string[];
+
   /** Whether the calendar is open. */
   opened = false;
 
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 50453939a2dd..40b6e36b2de7 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -129,7 +129,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
    * @param classes list of class names
    */
   @Input('class')
-  set classList(classes: string) {
+  set panelClass(classes: string) {
     if (classes && classes.length) {
       this._classList = classes.split(' ').reduce((obj: any, className: string) => {
         obj[className] = true;
@@ -141,6 +141,16 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
     }
   }
 
+  /**
+   * This method takes classes set on the host mat-menu element and applies them on the
+   * menu template that displays in the overlay container.  Otherwise, it's difficult
+   * to style the containing menu from outside the component.
+   * @deprecated Use `panelClass` instead.
+   */
+  @Input()
+  set classList(classes: string) { this.panelClass = classes; }
+  get classList(): string { return this.panelClass; }
+
   /** Event emitted when the menu is closed. */
   @Output() closed = new EventEmitter<void | 'click' | 'keydown'>();
 
diff --git a/src/lib/snack-bar/snack-bar-config.ts b/src/lib/snack-bar/snack-bar-config.ts
index 67eabd078b51..c4d1df694a9a 100644
--- a/src/lib/snack-bar/snack-bar-config.ts
+++ b/src/lib/snack-bar/snack-bar-config.ts
@@ -35,7 +35,13 @@ export class MatSnackBarConfig {
   duration?: number = 0;
 
   /** Extra CSS classes to be added to the snack bar container. */
-  extraClasses?: string[];
+  panelClass?: string | string[];
+
+  /**
+   * Extra CSS classes to be added to the snack bar container.
+   * @deprecated Use `panelClass` instead.
+   */
+ extraClasses?: string | string[];
 
   /** Text layout direction for the snack bar. */
   direction?: Direction = 'ltr';
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index d88b3debd247..ab0806635d37 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -104,10 +104,14 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
       throw Error('Attempting to attach snack bar content after content is already attached');
     }
 
-    if (this.snackBarConfig.extraClasses) {
+    if (this.snackBarConfig.panelClass || this.snackBarConfig.extraClasses) {
+      const classes = [
+        ...this._getCssClasses(this.snackBarConfig.panelClass),
+        ...this._getCssClasses(this.snackBarConfig.extraClasses)
+      ];
       // Not the most efficient way of adding classes, but the renderer doesn't allow us
       // to pass in an array or a space-separated list.
-      for (let cssClass of this.snackBarConfig.extraClasses) {
+      for (let cssClass of classes) {
         this._renderer.addClass(this._elementRef.nativeElement, cssClass);
       }
     }
@@ -178,4 +182,16 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
       this._onExit.complete();
     });
   }
+
+  /** Convert the class list to a array of classes it can apply to the dom */
+  private _getCssClasses(classList: undefined | string | string[]) {
+    if (classList) {
+      if (Array.isArray(classList)) {
+        return classList;
+      } else {
+        return [classList];
+      }
+    }
+    return [];
+  }
 }
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 6041b9c28ea5..8459ee0c46f2 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -363,7 +363,7 @@ describe('MatSnackBar', () => {
   }));
 
   it('should add extra classes to the container', () => {
-    snackBar.open(simpleMessage, simpleActionLabel, { extraClasses: ['one', 'two'] });
+    snackBar.open(simpleMessage, simpleActionLabel, { panelClass: ['one', 'two'] });
     viewContainerFixture.detectChanges();
 
     let containerClasses = overlayContainerElement.querySelector('snack-bar-container')!.classList;

From f08b3f0e1e97bc6d6e37b0def116bddd7796bce7 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 30 Oct 2017 15:07:18 -0700
Subject: [PATCH 396/575] fix: consistent names for all cdk directives (#8088)

Renames:
`OverlayOrigin` -> `CdkOverlayOrigin`
`ConnectedOverlayDirective` -> `CdkConnectedOverlay`
`PortalDirective` -> `CdkPortal`
`PortalHostDirective` -> `CdkPortalOutlet`
`ObserveContent` -> `CdkObserveContent`

Also stop using "mat" completely in the cdk.

BREAKING CHANGE:
`MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY` is renamed to
`CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY`
---
 src/cdk/bidi/directionality.ts             |  2 +-
 src/cdk/observers/observe-content.spec.ts  |  4 ++--
 src/cdk/observers/observe-content.ts       | 12 +++++-----
 src/cdk/observers/public-api.ts            |  3 +++
 src/cdk/overlay/overlay-container.spec.ts  |  4 ++--
 src/cdk/overlay/overlay-directives.spec.ts |  8 +++----
 src/cdk/overlay/overlay-directives.ts      | 26 ++++++++++------------
 src/cdk/overlay/overlay-module.ts          | 12 +++++-----
 src/cdk/overlay/overlay.spec.ts            |  4 ++--
 src/cdk/overlay/public-api.ts              | 15 ++++++++-----
 src/cdk/portal/portal-directives.ts        |  8 +++----
 src/cdk/portal/portal.md                   | 10 ++++-----
 src/cdk/portal/portal.spec.ts              |  8 +++----
 src/cdk/portal/public-api.ts               |  5 ++++-
 src/cdk/stepper/stepper.ts                 |  4 ++--
 src/demo-app/overlay/overlay-demo.ts       | 12 +++++-----
 src/demo-app/portal/portal-demo.ts         |  4 ++--
 src/lib/dialog/dialog-container.ts         |  4 ++--
 src/lib/select/select.ts                   |  4 ++--
 src/lib/snack-bar/snack-bar-container.ts   |  4 ++--
 src/lib/tabs/tab-body.ts                   |  4 ++--
 src/lib/tabs/tab-label.ts                  |  4 ++--
 22 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/src/cdk/bidi/directionality.ts b/src/cdk/bidi/directionality.ts
index 17eb64bf07ab..45d208df22ff 100644
--- a/src/cdk/bidi/directionality.ts
+++ b/src/cdk/bidi/directionality.ts
@@ -29,7 +29,7 @@ export type Direction = 'ltr' | 'rtl';
  * We also can't re-provide the DOCUMENT token from platform-brower because the unit tests
  * themselves use things like `querySelector` in test code.
  */
-export const DIR_DOCUMENT = new InjectionToken<Document>('mat-dir-doc');
+export const DIR_DOCUMENT = new InjectionToken<Document>('cdk-dir-doc');
 
 /**
  * The directionality (LTR / RTL) context for the application (or a subtree of it).
diff --git a/src/cdk/observers/observe-content.spec.ts b/src/cdk/observers/observe-content.spec.ts
index 99e655470843..7cb175245d80 100644
--- a/src/cdk/observers/observe-content.spec.ts
+++ b/src/cdk/observers/observe-content.spec.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {async, TestBed, ComponentFixture, fakeAsync, tick} from '@angular/core/testing';
-import {ObserversModule, MatMutationObserverFactory} from './observe-content';
+import {ObserversModule, MutationObserverFactory} from './observe-content';
 
 // TODO(elad): `ProxyZone` doesn't seem to capture the events raised by
 // `MutationObserver` and needs to be investigated
@@ -61,7 +61,7 @@ describe('Observe content', () => {
         imports: [ObserversModule],
         declarations: [ComponentWithDebouncedListener],
         providers: [{
-          provide: MatMutationObserverFactory,
+          provide: MutationObserverFactory,
           useValue: {
             create: function(callback: Function) {
               callbacks.push(callback);
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index 9c0ab8528f67..88e8603e9949 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -26,7 +26,7 @@ import {debounceTime} from 'rxjs/operators';
  * @docs-private
  */
 @Injectable()
-export class MatMutationObserverFactory {
+export class MutationObserverFactory {
   create(callback: MutationCallback): MutationObserver | null {
     return typeof MutationObserver === 'undefined' ? null : new MutationObserver(callback);
   }
@@ -40,7 +40,7 @@ export class MatMutationObserverFactory {
   selector: '[cdkObserveContent]',
   exportAs: 'cdkObserveContent',
 })
-export class ObserveContent implements AfterContentInit, OnDestroy {
+export class CdkObserveContent implements AfterContentInit, OnDestroy {
   private _observer: MutationObserver | null;
 
   /** Event emitted for each change in the element's content. */
@@ -53,7 +53,7 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
   @Input() debounce: number;
 
   constructor(
-    private _mutationObserverFactory: MatMutationObserverFactory,
+    private _mutationObserverFactory: MutationObserverFactory,
     private _elementRef: ElementRef,
     private _ngZone: NgZone) { }
 
@@ -93,8 +93,8 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
 
 
 @NgModule({
-  exports: [ObserveContent],
-  declarations: [ObserveContent],
-  providers: [MatMutationObserverFactory]
+  exports: [CdkObserveContent],
+  declarations: [CdkObserveContent],
+  providers: [MutationObserverFactory]
 })
 export class ObserversModule {}
diff --git a/src/cdk/observers/public-api.ts b/src/cdk/observers/public-api.ts
index de8a4a9fea9e..03579f42eb88 100644
--- a/src/cdk/observers/public-api.ts
+++ b/src/cdk/observers/public-api.ts
@@ -7,3 +7,6 @@
  */
 
 export * from './observe-content';
+
+/** @deprecated Use CdkObserveContent */
+export {CdkObserveContent as ObserveContent} from './observe-content';
diff --git a/src/cdk/overlay/overlay-container.spec.ts b/src/cdk/overlay/overlay-container.spec.ts
index e2b8648c4376..f1a6fa063aba 100644
--- a/src/cdk/overlay/overlay-container.spec.ts
+++ b/src/cdk/overlay/overlay-container.spec.ts
@@ -1,6 +1,6 @@
 import {async, inject, TestBed} from '@angular/core/testing';
 import {Component, NgModule, ViewChild, ViewContainerRef} from '@angular/core';
-import {PortalModule, TemplatePortalDirective} from '@angular/cdk/portal';
+import {PortalModule, CdkPortal} from '@angular/cdk/portal';
 import {Overlay, OverlayContainer, OverlayModule} from './index';
 
 describe('OverlayContainer', () => {
@@ -68,7 +68,7 @@ describe('OverlayContainer', () => {
   providers: [Overlay],
 })
 class TestComponentWithTemplatePortals {
-  @ViewChild(TemplatePortalDirective) templatePortal: TemplatePortalDirective;
+  @ViewChild(CdkPortal) templatePortal: CdkPortal;
 
   constructor(public viewContainerRef: ViewContainerRef) { }
 }
diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index 89404d4d210b..02c5c010d6d4 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -4,7 +4,7 @@ import {ComponentFixture, TestBed, async, inject} from '@angular/core/testing';
 import {Directionality} from '@angular/cdk/bidi';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ESCAPE} from '@angular/cdk/keycodes';
-import {ConnectedOverlayDirective, OverlayModule, OverlayOrigin} from './index';
+import {CdkConnectedOverlay, OverlayModule, CdkOverlayOrigin} from './index';
 import {OverlayContainer} from './overlay-container';
 import {ConnectedPositionStrategy} from './position/connected-position-strategy';
 import {ConnectedOverlayPositionChange} from './position/connected-position';
@@ -330,7 +330,7 @@ class ConnectedOverlayDirectiveTest {
   detachHandler = jasmine.createSpy('detachHandler');
   attachResult: HTMLElement;
 
-  @ViewChild(ConnectedOverlayDirective) connectedOverlayDirective: ConnectedOverlayDirective;
+  @ViewChild(CdkConnectedOverlay) connectedOverlayDirective: CdkConnectedOverlay;
 }
 
 @Component({
@@ -339,7 +339,7 @@ class ConnectedOverlayDirectiveTest {
   <ng-template cdk-connected-overlay>Menu content</ng-template>`,
 })
 class ConnectedOverlayPropertyInitOrder {
-  @ViewChild(ConnectedOverlayDirective) connectedOverlayDirective: ConnectedOverlayDirective;
-  @ViewChild('trigger') trigger: OverlayOrigin;
+  @ViewChild(CdkConnectedOverlay) connectedOverlayDirective: CdkConnectedOverlay;
+  @ViewChild('trigger') trigger: CdkOverlayOrigin;
 }
 
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 7bc537629f5f..ae6e5a1b1ad9 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -52,24 +52,23 @@ const defaultPositionList = [
 ];
 
 /** Injection token that determines the scroll handling while the connected overlay is open. */
-export const MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY =
-    new InjectionToken<() => ScrollStrategy>('mat-connected-overlay-scroll-strategy');
+export const CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY =
+    new InjectionToken<() => ScrollStrategy>('cdk-connected-overlay-scroll-strategy');
 
 /** @docs-private */
-export function MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
+export function CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay):
     () => RepositionScrollStrategy {
   return () => overlay.scrollStrategies.reposition();
 }
 
 /** @docs-private */
-export const MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER = {
-  provide: MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY,
+export const CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER = {
+  provide: CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY,
   deps: [Overlay],
-  useFactory: MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY,
+  useFactory: CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER_FACTORY,
 };
 
 
-
 /**
  * Directive applied to an element to make it usable as an origin for an Overlay using a
  * ConnectedPositionStrategy.
@@ -78,14 +77,13 @@ export const MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER = {
   selector: '[cdk-overlay-origin], [overlay-origin], [cdkOverlayOrigin]',
   exportAs: 'cdkOverlayOrigin',
 })
-export class OverlayOrigin {
+export class CdkOverlayOrigin {
   constructor(
       /** Reference to the element on which the directive is applied. */
       public elementRef: ElementRef) { }
 }
 
 
-
 /**
  * Directive to facilitate declarative creation of an Overlay using a ConnectedPositionStrategy.
  */
@@ -93,7 +91,7 @@ export class OverlayOrigin {
   selector: '[cdk-connected-overlay], [connected-overlay], [cdkConnectedOverlay]',
   exportAs: 'cdkConnectedOverlay'
 })
-export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
+export class CdkConnectedOverlay implements OnDestroy, OnChanges {
   private _overlayRef: OverlayRef;
   private _templatePortal: TemplatePortal<any>;
   private _hasBackdrop = false;
@@ -105,7 +103,7 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
   private _escapeListener = () => {};
 
   /** Origin for the connected overlay. */
-  @Input('cdkConnectedOverlayOrigin') origin: OverlayOrigin;
+  @Input('cdkConnectedOverlayOrigin') origin: CdkOverlayOrigin;
 
   /** Registered connected position pairs. */
   @Input('cdkConnectedOverlayPositions') positions: ConnectionPositionPair[];
@@ -159,8 +157,8 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
 
   /** @deprecated */
   @Input('origin')
-  get _deprecatedOrigin(): OverlayOrigin { return this.origin; }
-  set _deprecatedOrigin(_origin: OverlayOrigin) { this.origin = _origin; }
+  get _deprecatedOrigin(): CdkOverlayOrigin { return this.origin; }
+  set _deprecatedOrigin(_origin: CdkOverlayOrigin) { this.origin = _origin; }
 
   /** @deprecated */
   @Input('positions')
@@ -238,7 +236,7 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
       private _renderer: Renderer2,
       templateRef: TemplateRef<any>,
       viewContainerRef: ViewContainerRef,
-      @Inject(MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY) private _scrollStrategy,
+      @Inject(CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY) private _scrollStrategy,
       @Optional() private _dir: Directionality) {
     this._templatePortal = new TemplatePortal(templateRef, viewContainerRef);
   }
diff --git a/src/cdk/overlay/overlay-module.ts b/src/cdk/overlay/overlay-module.ts
index 9d056cfb80ac..ada0dbe2437b 100644
--- a/src/cdk/overlay/overlay-module.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -13,9 +13,9 @@ import {NgModule, Provider} from '@angular/core';
 import {Overlay} from './overlay';
 import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
 import {
-  ConnectedOverlayDirective,
-  MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
-  OverlayOrigin,
+  CdkConnectedOverlay,
+  CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
+  CdkOverlayOrigin,
 } from './overlay-directives';
 import {OverlayPositionBuilder} from './position/overlay-position-builder';
 import {OVERLAY_KEYBOARD_DISPATCHER_PROVIDER} from './keyboard/overlay-keyboard-dispatcher';
@@ -27,13 +27,13 @@ export const OVERLAY_PROVIDERS: Provider[] = [
   OVERLAY_KEYBOARD_DISPATCHER_PROVIDER,
   VIEWPORT_RULER_PROVIDER,
   OVERLAY_CONTAINER_PROVIDER,
-  MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
+  CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY_PROVIDER,
 ];
 
 @NgModule({
   imports: [BidiModule, PortalModule, ScrollDispatchModule],
-  exports: [ConnectedOverlayDirective, OverlayOrigin, ScrollDispatchModule],
-  declarations: [ConnectedOverlayDirective, OverlayOrigin],
+  exports: [CdkConnectedOverlay, CdkOverlayOrigin, ScrollDispatchModule],
+  declarations: [CdkConnectedOverlay, CdkOverlayOrigin],
   providers: [OVERLAY_PROVIDERS, ScrollStrategyOptions],
 })
 export class OverlayModule {}
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index b5b35cc15ba9..d15dd68c5e5f 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -4,7 +4,7 @@ import {
   ComponentPortal,
   PortalModule,
   TemplatePortal,
-  TemplatePortalDirective
+  CdkPortal
 } from '@angular/cdk/portal';
 import {
   Overlay,
@@ -482,7 +482,7 @@ class PizzaMsg { }
 /** Test-bed component that contains a TempatePortal and an ElementRef. */
 @Component({template: `<ng-template cdk-portal>Cake</ng-template>`})
 class TestComponentWithTemplatePortals {
-  @ViewChild(TemplatePortalDirective) templatePortal: TemplatePortalDirective;
+  @ViewChild(CdkPortal) templatePortal: CdkPortal;
 
   constructor(public viewContainerRef: ViewContainerRef) { }
 }
diff --git a/src/cdk/overlay/public-api.ts b/src/cdk/overlay/public-api.ts
index e60adb6f4586..59a51335a37a 100644
--- a/src/cdk/overlay/public-api.ts
+++ b/src/cdk/overlay/public-api.ts
@@ -7,20 +7,25 @@
  */
 
 export * from './overlay-config';
+export * from './position/connected-position';
+export * from './scroll/index';
+export * from './overlay-module';
 export {Overlay} from './overlay';
 export {OverlayContainer} from './overlay-container';
+export {CdkOverlayOrigin, CdkConnectedOverlay} from './overlay-directives';
 export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
 export {OverlayRef} from './overlay-ref';
-export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
 export {ViewportRuler} from '@angular/cdk/scrolling';
 export {ComponentType} from '@angular/cdk/portal';
 
-export * from './position/connected-position';
-export * from './scroll/index';
-export * from './overlay-module';
-
 // Export pre-defined position strategies and interface to build custom ones.
 export {PositionStrategy} from './position/position-strategy';
 export {GlobalPositionStrategy} from './position/global-position-strategy';
 export {ConnectedPositionStrategy} from './position/connected-position-strategy';
 export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
+
+/** @deprecated Use CdkConnectedOverlay */
+export {CdkConnectedOverlay as ConnectedOverlayDirective} from './overlay-directives';
+
+/** @deprecated Use CdkOverlayOrigin */
+export {CdkOverlayOrigin as OverlayOrigin} from './overlay-directives';
diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts
index 09279614ef45..935d6e680983 100644
--- a/src/cdk/portal/portal-directives.ts
+++ b/src/cdk/portal/portal-directives.ts
@@ -28,7 +28,7 @@ import {Portal, TemplatePortal, ComponentPortal, BasePortalOutlet} from './porta
   selector: '[cdk-portal], [cdkPortal], [portal]',
   exportAs: 'cdkPortal',
 })
-export class TemplatePortalDirective extends TemplatePortal<any> {
+export class CdkPortal extends TemplatePortal<any> {
   constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef) {
     super(templateRef, viewContainerRef);
   }
@@ -47,7 +47,7 @@ export class TemplatePortalDirective extends TemplatePortal<any> {
   exportAs: 'cdkPortalOutlet, cdkPortalHost',
   inputs: ['portal: cdkPortalOutlet']
 })
-export class PortalOutletDirective extends BasePortalOutlet implements OnDestroy {
+export class CdkPortalOutlet extends BasePortalOutlet implements OnDestroy {
   /** The attached portal. */
   private _portal: Portal<any> | null = null;
 
@@ -134,7 +134,7 @@ export class PortalOutletDirective extends BasePortalOutlet implements OnDestroy
 
 
 @NgModule({
-  exports: [TemplatePortalDirective, PortalOutletDirective],
-  declarations: [TemplatePortalDirective, PortalOutletDirective],
+  exports: [CdkPortal, CdkPortalOutlet],
+  declarations: [CdkPortal, CdkPortalOutlet],
 })
 export class PortalModule {}
diff --git a/src/cdk/portal/portal.md b/src/cdk/portal/portal.md
index 4093bc73e82b..584fafe47219 100644
--- a/src/cdk/portal/portal.md
+++ b/src/cdk/portal/portal.md
@@ -27,8 +27,8 @@ built upon.
 
 #### Portals in practice
 
-##### `TemplatePortalDirective`
-Used to get a portal from an `<ng-template>`. `TemplatePortalDirectives` *is* a `Portal`.
+##### `CdkPortal`
+Used to get a portal from an `<ng-template>`. `CdkPortal` *is* a `Portal`.
 
 Usage:
 ```html
@@ -45,7 +45,7 @@ Usage:
 ```
 
 A component can use `@ViewChild` or `@ViewChildren` to get a reference to a
-`TemplatePortalDirective`.
+`CdkPortal`.
 
 ##### `ComponentPortal`
 Used to create a portal from a component type. When a component is dynamically created using
@@ -57,8 +57,8 @@ this.userSettingsPortal = new ComponentPortal(UserSettingsComponent);
 ```
 
 
-##### `PortalOutletDirective`
-Used to add a portal outlet to a template. `PortalOutletDirective` *is* a `PortalOutlet`.
+##### `CdkPortalOutlet`
+Used to add a portal outlet to a template. `CdkPortalOutlet` *is* a `PortalOutlet`.
 
 Usage:
 ```html
diff --git a/src/cdk/portal/portal.spec.ts b/src/cdk/portal/portal.spec.ts
index 12afa9028bda..69659237f095 100644
--- a/src/cdk/portal/portal.spec.ts
+++ b/src/cdk/portal/portal.spec.ts
@@ -13,7 +13,7 @@ import {
   TemplateRef
 } from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {TemplatePortalDirective, PortalOutletDirective, PortalModule} from './portal-directives';
+import {CdkPortal, CdkPortalOutlet, PortalModule} from './portal-directives';
 import {Portal, ComponentPortal, TemplatePortal} from './portal';
 import {DomPortalOutlet} from './dom-portal-outlet';
 
@@ -28,7 +28,7 @@ describe('Portals', () => {
     TestBed.compileComponents();
   }));
 
-  describe('PortalOutletDirective', () => {
+  describe('CdkPortalOutlet', () => {
     let fixture: ComponentFixture<PortalTestApp>;
 
     beforeEach(() => {
@@ -480,8 +480,8 @@ class ArbitraryViewContainerRefComponent {
   `,
 })
 class PortalTestApp {
-  @ViewChildren(TemplatePortalDirective) portals: QueryList<TemplatePortalDirective>;
-  @ViewChild(PortalOutletDirective) portalOutlet: PortalOutletDirective;
+  @ViewChildren(CdkPortal) portals: QueryList<CdkPortal>;
+  @ViewChild(CdkPortalOutlet) portalOutlet: CdkPortalOutlet;
   @ViewChild('templateRef', { read: TemplateRef }) templateRef: TemplateRef<any>;
 
   selectedPortal: Portal<any>;
diff --git a/src/cdk/portal/public-api.ts b/src/cdk/portal/public-api.ts
index cad046f323ea..fd47ee6ebf5e 100644
--- a/src/cdk/portal/public-api.ts
+++ b/src/cdk/portal/public-api.ts
@@ -12,5 +12,8 @@ export * from './portal-directives';
 export * from './portal-injector';
 
 export {DomPortalOutlet as DomPortalHost} from './dom-portal-outlet';
-export {PortalOutletDirective as PortalHostDirective} from './portal-directives';
+export {
+  CdkPortalOutlet as PortalHostDirective,
+  CdkPortal as TemplatePortalDirective,
+} from './portal-directives';
 export {PortalOutlet as PortalHost, BasePortalOutlet as BasePortalHost} from './portal';
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 08ac87e971ec..9cd5a2a7d673 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -194,12 +194,12 @@ export class CdkStepper {
 
   /** Returns a unique id for each step label element. */
   _getStepLabelId(i: number): string {
-    return `mat-step-label-${this._groupId}-${i}`;
+    return `cdk-step-label-${this._groupId}-${i}`;
   }
 
   /** Returns unique id for each step content element. */
   _getStepContentId(i: number): string {
-    return `mat-step-content-${this._groupId}-${i}`;
+    return `cdk-step-content-${this._groupId}-${i}`;
   }
 
   /** Marks the component to be change detected. */
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index 1f354ae23834..f0142a383732 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -1,11 +1,11 @@
-import {Overlay, OverlayOrigin, OverlayConfig} from '@angular/cdk/overlay';
+import {Overlay, CdkOverlayOrigin, OverlayConfig} from '@angular/cdk/overlay';
 import {
   ComponentPortal,
   // This import is only used to define a generic type. The current TypeScript version incorrectly
   // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
   // tslint:disable-next-line:no-unused-variable
   Portal,
-  TemplatePortalDirective
+  CdkPortal
 } from '@angular/cdk/portal';
 import {
   Component,
@@ -32,10 +32,10 @@ export class OverlayDemo {
   isMenuOpen: boolean = false;
   tortelliniFillings = ['cheese and spinach', 'mushroom and broccoli'];
 
-  @ViewChildren(TemplatePortalDirective) templatePortals: QueryList<Portal<any>>;
-  @ViewChild(OverlayOrigin) _overlayOrigin: OverlayOrigin;
-  @ViewChild('tortelliniOrigin') tortelliniOrigin: OverlayOrigin;
-  @ViewChild('tortelliniTemplate') tortelliniTemplate: TemplatePortalDirective;
+  @ViewChildren(CdkPortal) templatePortals: QueryList<Portal<any>>;
+  @ViewChild(CdkOverlayOrigin) _overlayOrigin: CdkOverlayOrigin;
+  @ViewChild('tortelliniOrigin') tortelliniOrigin: CdkOverlayOrigin;
+  @ViewChild('tortelliniTemplate') tortelliniTemplate: CdkPortal;
 
   constructor(public overlay: Overlay, public viewContainerRef: ViewContainerRef) { }
 
diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts
index f780d2f71a6c..8dd85a005c43 100644
--- a/src/demo-app/portal/portal-demo.ts
+++ b/src/demo-app/portal/portal-demo.ts
@@ -1,4 +1,4 @@
-import {ComponentPortal, Portal, TemplatePortalDirective} from '@angular/cdk/portal';
+import {ComponentPortal, Portal, CdkPortal} from '@angular/cdk/portal';
 import {Component, QueryList, ViewChildren} from '@angular/core';
 
 
@@ -9,7 +9,7 @@ import {Component, QueryList, ViewChildren} from '@angular/core';
   styleUrls: ['portal-demo.css'],
 })
 export class PortalDemo {
-  @ViewChildren(TemplatePortalDirective) templatePortals: QueryList<Portal<any>>;
+  @ViewChildren(CdkPortal) templatePortals: QueryList<Portal<any>>;
 
   selectedPortal: Portal<any>;
 
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 8826063cd1f0..cca487d49a94 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -24,7 +24,7 @@ import {DOCUMENT} from '@angular/platform-browser';
 import {
   BasePortalOutlet,
   ComponentPortal,
-  PortalOutletDirective,
+  CdkPortalOutlet,
   TemplatePortal
 } from '@angular/cdk/portal';
 import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
@@ -80,7 +80,7 @@ export function throwMatDialogContentAlreadyAttachedError() {
 })
 export class MatDialogContainer extends BasePortalOutlet {
   /** The portal outlet inside of this container into which the dialog content will be loaded. */
-  @ViewChild(PortalOutletDirective) _portalOutlet: PortalOutletDirective;
+  @ViewChild(CdkPortalOutlet) _portalOutlet: CdkPortalOutlet;
 
   /** The class that traps and manages focus within the dialog. */
   private _focusTrap: FocusTrap;
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 739afb49756c..8f736ff75e8d 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -12,7 +12,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
 import {DOWN_ARROW, END, ENTER, HOME, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
 import {
-  ConnectedOverlayDirective,
+  CdkConnectedOverlay,
   Overlay,
   RepositionScrollStrategy,
   ScrollStrategy,
@@ -300,7 +300,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   @ViewChild('panel') panel: ElementRef;
 
   /** Overlay pane containing the options. */
-  @ViewChild(ConnectedOverlayDirective) overlayDir: ConnectedOverlayDirective;
+  @ViewChild(CdkConnectedOverlay) overlayDir: CdkConnectedOverlay;
 
   /** All of the defined select options. */
   @ContentChildren(MatOption, { descendants: true }) options: QueryList<MatOption>;
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index ab0806635d37..256f2d2266cc 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -30,7 +30,7 @@ import {
 import {
   BasePortalOutlet,
   ComponentPortal,
-  PortalOutletDirective,
+  CdkPortalOutlet,
 } from '@angular/cdk/portal';
 import {first} from 'rxjs/operators';
 import {AnimationCurves, AnimationDurations} from '@angular/material/core';
@@ -76,7 +76,7 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
   private _destroyed = false;
 
   /** The portal outlet inside of this container into which the snack bar content will be loaded. */
-  @ViewChild(PortalOutletDirective) _portalOutlet: PortalOutletDirective;
+  @ViewChild(CdkPortalOutlet) _portalOutlet: CdkPortalOutlet;
 
   /** Subject for notifying that the snack bar has exited from view. */
   _onExit: Subject<any> = new Subject();
diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index d2e14bcfd0dc..a0519883e437 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -27,7 +27,7 @@ import {
   transition,
   AnimationEvent,
 } from '@angular/animations';
-import {TemplatePortal, PortalOutletDirective} from '@angular/cdk/portal';
+import {TemplatePortal, CdkPortalOutlet} from '@angular/cdk/portal';
 import {Directionality, Direction} from '@angular/cdk/bidi';
 
 
@@ -88,7 +88,7 @@ export type MatTabBodyOriginState = 'left' | 'right';
 })
 export class MatTabBody implements OnInit, AfterViewChecked {
   /** The portal outlet inside of this container into which the tab body content will be loaded. */
-  @ViewChild(PortalOutletDirective) _portalOutlet: PortalOutletDirective;
+  @ViewChild(CdkPortalOutlet) _portalOutlet: CdkPortalOutlet;
 
   /** Event emitted when the tab begins to animate towards the center as the active tab. */
   @Output() _onCentering: EventEmitter<number> = new EventEmitter<number>();
diff --git a/src/lib/tabs/tab-label.ts b/src/lib/tabs/tab-label.ts
index 66f73f86a290..d9f24bd63391 100644
--- a/src/lib/tabs/tab-label.ts
+++ b/src/lib/tabs/tab-label.ts
@@ -7,10 +7,10 @@
  */
 
 import {Directive, TemplateRef, ViewContainerRef} from '@angular/core';
-import {TemplatePortalDirective} from '@angular/cdk/portal';
+import {CdkPortal} from '@angular/cdk/portal';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
-export const _MatTabLabelBaseClass = TemplatePortalDirective;
+export const _MatTabLabelBaseClass = CdkPortal;
 
 /** Used to flag tab labels for use with the portal directive */
 @Directive({

From f6b80f4358859c01f4fa792dd44bfa6304bf32bc Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Mon, 30 Oct 2017 15:08:57 -0700
Subject: [PATCH 397/575] chore: update plunker short link (#8137)

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 README.md                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 29524ffc3f7a..09cdd38d3b85 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -9,7 +9,7 @@
 
 #### What are the steps to reproduce?
 Providing a StackBlitz/Plunker (or similar) is the *best* way to get the team to see your issue. <br/>
-Plunker starter (using on `@master`): https://goo.gl/DlHd6U<br/>
+Plunker starter (using on `@master`): https://goo.gl/uDmqyY<br/>
 StackBlitz starter (using latest `npm` release): https://goo.gl/wwnhMV<br/>
 
 
diff --git a/README.md b/README.md
index 1ed27771f4e5..945d40bfe869 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This is the home for the Angular team's Material Design components built for and
 [Documentation, demos, and guides][aio] |
 [Google group](https://groups.google.com/forum/#!forum/angular-material2) |
 [Contributing](https://github.com/angular/material2/blob/master/CONTRIBUTING.md) |
-[Plunker Template](https://goo.gl/DlHd6U) |
+[Plunker Template](https://goo.gl/uDmqyY) |
 [StackBlitz Template](https://goo.gl/wwnhMV)
 
 ### Getting started

From b39202ff3fb6c509460a42f04aaa291c44490273 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 30 Oct 2017 23:12:50 +0100
Subject: [PATCH 398/575] chore: fix lint error (#8136)

Fixes a few linting errors
---
 src/lib/core/datetime/date-adapter.ts                       | 2 +-
 src/lib/core/datetime/native-date-adapter.spec.ts           | 6 +++---
 .../adapter/moment-date-adapter.spec.ts                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index c6f9da34969e..ef841808c7a8 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -245,7 +245,7 @@ export abstract class DateAdapter<D> {
       let firstValid = this.isValid(first);
       let secondValid = this.isValid(second);
       if (firstValid && secondValid) {
-        return !this.compareDate(first, second)
+        return !this.compareDate(first, second);
       }
       return firstValid == secondValid;
     }
diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index a745026d2798..3cff4f476ab6 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -18,15 +18,15 @@ describe('NativeDateAdapter', () => {
     }).compileComponents();
   }));
 
-  beforeEach(inject([DateAdapter], (d: NativeDateAdapter) => {
-    adapter = d;
+  beforeEach(inject([DateAdapter], (dateAdapter: NativeDateAdapter) => {
+    adapter = dateAdapter;
 
     assertValidDate = (d: Date | null, valid: boolean) => {
       expect(adapter.isDateInstance(d)).not.toBeNull(`Expected ${d} to be a date instance`);
       expect(adapter.isValid(d!)).toBe(valid,
           `Expected ${d} to be ${valid ? 'valid' : 'invalid'},` +
           ` but was ${valid ? 'invalid' : 'valid'}`);
-    }
+    };
   }));
 
   it('should get year', () => {
diff --git a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
index 547f8db2ba26..feba4da338a9 100644
--- a/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
+++ b/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts
@@ -24,9 +24,9 @@ describe('MomentDateAdapter', () => {
     }).compileComponents();
   }));
 
-  beforeEach(inject([DateAdapter], (d: MomentDateAdapter) => {
+  beforeEach(inject([DateAdapter], (dateAdapter: MomentDateAdapter) => {
     moment.locale('en');
-    adapter = d;
+    adapter = dateAdapter;
     adapter.setLocale('en');
 
     assertValidDate = (d: moment.Moment | null, valid: boolean) => {
@@ -34,7 +34,7 @@ describe('MomentDateAdapter', () => {
       expect(adapter.isValid(d!)).toBe(valid,
           `Expected ${d} to be ${valid ? 'valid' : 'invalid'},` +
           ` but was ${valid ? 'invalid' : 'valid'}`);
-    }
+    };
   }));
 
   it('should get year', () => {

From c3405aad52a90d5c5b58b0e3a35d9c5af7e1de58 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 1 Nov 2017 00:04:34 +0100
Subject: [PATCH 399/575] fix(toolbar): no longer auto-generate toolbar rows
 (#6661)

Currently the toolbar always generates the first `<md-toolbar-row>`. This means that developers have no opportunity to set directives/attributes/classes on the first toolbar row (e.g with flex-layout).

With this change, the toolbar won't auto-generate any `<md-toolbar-row>` element.

The toolbar will have two different row modes:

_Single row toolbar_

```html
<md-toolbar>
  First Tow
</md-toolbar>
```

_Multiple rows toolbar_

```html
<md-toolbar>
  <md-toolbar-row>First Row</md-toolbar-row>
  <md-toolbar-row>Second Row</md-toolbar-row>
</md-toolbar>
```

This means that mixing those two row modes is no longer possible and allowed

```html
<md-toolbar>
  <span>First Row</span>
  <md-toolbar-row>Second Row</md-toolbar-row>
</md-toolbar>
```

BREAKING CHANGE: `<md-toolbar-row>` elements will be no longer auto-generated for the first row. Meaning that custom styling for the first `<md-toolbar-row>` is no longer working as before. Since no toolbar-row is auto-generated anymore, there are two different modes for the toolbar now. Either place content directly inside of the `<md-toolbar>` or place multiple `<md-toolbar-row>` elements.

Fixes #6004. Fixes #1718.
---
 src/demo-app/toolbar/toolbar-demo.html        |  17 ++-
 src/lib/toolbar/toolbar-module.ts             |   4 +-
 src/lib/toolbar/toolbar.html                  |   8 +-
 src/lib/toolbar/toolbar.md                    |  29 +++--
 src/lib/toolbar/toolbar.scss                  |  36 +++---
 src/lib/toolbar/toolbar.spec.ts               | 114 +++++++++++++-----
 src/lib/toolbar/toolbar.ts                    |  69 +++++++++--
 .../toolbar-multirow-example.html             |   4 +-
 8 files changed, 198 insertions(+), 83 deletions(-)

diff --git a/src/demo-app/toolbar/toolbar-demo.html b/src/demo-app/toolbar/toolbar-demo.html
index a7a434c97ded..fa7f900c945d 100644
--- a/src/demo-app/toolbar/toolbar-demo.html
+++ b/src/demo-app/toolbar/toolbar-demo.html
@@ -35,19 +35,19 @@
 
   <p>
     <mat-toolbar color="accent">
-      <span>Custom Toolbar</span>
-      <mat-toolbar-row>
-        <span>Second Line</span>
-      </mat-toolbar-row>
+      <mat-toolbar-row>First Row</mat-toolbar-row>
+      <mat-toolbar-row>Second Row</mat-toolbar-row>
     </mat-toolbar>
   </p>
 
   <p>
     <mat-toolbar color="primary">
-      <span>Custom Toolbar</span>
+      <mat-toolbar-row>
+        <span>First Row</span>
+      </mat-toolbar-row>
 
       <mat-toolbar-row>
-        <span>Second Line</span>
+        <span>Second Row</span>
 
         <span class="demo-fill-remaining"></span>
 
@@ -55,7 +55,7 @@
       </mat-toolbar-row>
 
       <mat-toolbar-row>
-        <span>Third Line</span>
+        <span>Third Row</span>
 
         <span class="demo-fill-remaining"></span>
 
@@ -64,5 +64,4 @@
       </mat-toolbar-row>
     </mat-toolbar>
   </p>
-
-</div>
\ No newline at end of file
+</div>
diff --git a/src/lib/toolbar/toolbar-module.ts b/src/lib/toolbar/toolbar-module.ts
index d91a5993ae60..b2e5438176ab 100644
--- a/src/lib/toolbar/toolbar-module.ts
+++ b/src/lib/toolbar/toolbar-module.ts
@@ -8,11 +8,11 @@
 
 import {NgModule} from '@angular/core';
 import {MatCommonModule} from '@angular/material/core';
+import {PlatformModule} from '@angular/cdk/platform';
 import {MatToolbar, MatToolbarRow} from './toolbar';
 
-
 @NgModule({
-  imports: [MatCommonModule],
+  imports: [MatCommonModule, PlatformModule],
   exports: [MatToolbar, MatToolbarRow, MatCommonModule],
   declarations: [MatToolbar, MatToolbarRow],
 })
diff --git a/src/lib/toolbar/toolbar.html b/src/lib/toolbar/toolbar.html
index a9f577369010..f01ae835ce04 100644
--- a/src/lib/toolbar/toolbar.html
+++ b/src/lib/toolbar/toolbar.html
@@ -1,6 +1,2 @@
-<div class="mat-toolbar-layout">
-  <mat-toolbar-row>
-    <ng-content></ng-content>
-  </mat-toolbar-row>
-  <ng-content select="mat-toolbar-row"></ng-content>
-</div>
+<ng-content></ng-content>
+<ng-content select="mat-toolbar-row"></ng-content>
diff --git a/src/lib/toolbar/toolbar.md b/src/lib/toolbar/toolbar.md
index c6bebe838470..3cab5742722c 100644
--- a/src/lib/toolbar/toolbar.md
+++ b/src/lib/toolbar/toolbar.md
@@ -2,25 +2,38 @@
 
 <!-- example(toolbar-overview) -->
 
-### Multiple rows
-Toolbars can have multiple rows using `<mat-toolbar-row>` elements. Any content outside of an 
-`<mat-toolbar-row>` element are automatically placed inside of one at the beginning of the toolbar.
-Each toolbar row is a `display: flex` container.
+### Single row
+
+In the most situations, a toolbar will be placed at the top of your application and will only 
+have a single row that includes the title of your application.
 
 ```html
 <mat-toolbar>
-  <span>First Row</span>
-  
+  <span>My Application</span>
+</mat-toolbar>
+```
+
+### Multiple rows
+
+The Material Design specifications describe that toolbars can also have multiple rows. Creating
+toolbars with multiple rows in Angular Material can be done by placing `<mat-toolbar-row>` elements
+inside of a `<mat-toolbar>`.
+
+```html
+<mat-toolbar>  
   <mat-toolbar-row>
-    <span>Second Row</span>
+    <span>First Row</span>
   </mat-toolbar-row>
   
   <mat-toolbar-row>
-    <span>Third Row</span>
+    <span>Second Row</span>
   </mat-toolbar-row>
 </mat-toolbar>
 ```
 
+**Note**: Placing content outside of a `<mat-toolbar-row>` when multiple rows are specified is not
+supported.
+
 ### Positioning toolbar content
 The toolbar does not perform any positioning of its content. This gives the user full power to 
 position the content as it suits their application.
diff --git a/src/lib/toolbar/toolbar.scss b/src/lib/toolbar/toolbar.scss
index 87becbfa16e3..e6b4cb21650b 100644
--- a/src/lib/toolbar/toolbar.scss
+++ b/src/lib/toolbar/toolbar.scss
@@ -4,39 +4,39 @@ $mat-toolbar-height-desktop: 64px !default;
 $mat-toolbar-height-mobile-portrait: 56px !default;
 $mat-toolbar-height-mobile-landscape: 48px !default;
 
-$mat-toolbar-padding: 16px !default;
+$mat-toolbar-row-padding: 16px !default;
 
 
 @mixin mat-toolbar-height($height) {
-  .mat-toolbar {
+  .mat-toolbar-multiple-rows {
     min-height: $height;
   }
-  .mat-toolbar-row {
+  .mat-toolbar-row, .mat-toolbar-single-row {
     height: $height;
   }
 }
 
-.mat-toolbar {
+.mat-toolbar-row, .mat-toolbar-single-row {
   display: flex;
   box-sizing: border-box;
-  width: 100%;
-  padding: 0 $mat-toolbar-padding;
-  flex-direction: column;
 
-  .mat-toolbar-row {
-    display: flex;
-    box-sizing: border-box;
+  padding: 0 $mat-toolbar-row-padding;
+  width: 100%;
 
-    width: 100%;
+  // Flexbox Vertical Alignment
+  flex-direction: row;
+  align-items: center;
 
-    // Flexbox Vertical Alignment
-    flex-direction: row;
-    align-items: center;
+  // Per Material specs a toolbar cannot have multiple lines inside of a single row.
+  // Disable text wrapping inside of the toolbar. Developers are still able to overwrite it.
+  white-space: nowrap;
+}
 
-    // Per Material specs a toolbar cannot have multiple lines inside of a single row.
-    // Disable text wrapping inside of the toolbar. Developers are still able to overwrite it.
-    white-space: nowrap;
-  }
+.mat-toolbar-multiple-rows {
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: column;
+  width: 100%;
 }
 
 // Set the default height for the toolbar.
diff --git a/src/lib/toolbar/toolbar.spec.ts b/src/lib/toolbar/toolbar.spec.ts
index bfe43e7d0c2c..86faca6832e3 100644
--- a/src/lib/toolbar/toolbar.spec.ts
+++ b/src/lib/toolbar/toolbar.spec.ts
@@ -3,55 +3,115 @@ import {TestBed, async, ComponentFixture} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {MatToolbarModule} from './index';
 
-
 describe('MatToolbar', () => {
 
-  let fixture: ComponentFixture<TestApp>;
-  let testComponent: TestApp;
-  let toolbarElement: HTMLElement;
-
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [MatToolbarModule],
-      declarations: [TestApp],
+      declarations: [ToolbarSingleRow, ToolbarMultipleRows, ToolbarMixedRowModes],
     });
 
     TestBed.compileComponents();
   }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TestApp);
-    testComponent = fixture.debugElement.componentInstance;
-    toolbarElement = fixture.debugElement.query(By.css('mat-toolbar')).nativeElement;
-  });
+  describe('with single row', () => {
+    let fixture: ComponentFixture<ToolbarSingleRow>;
+    let testComponent: ToolbarSingleRow;
+    let toolbarElement: HTMLElement;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ToolbarSingleRow);
+      testComponent = fixture.debugElement.componentInstance;
+      toolbarElement = fixture.debugElement.query(By.css('.mat-toolbar')).nativeElement;
+    });
 
-  it('should apply class based on color attribute', () => {
-    testComponent.toolbarColor = 'primary';
-    fixture.detectChanges();
+    it('should apply class based on color attribute', () => {
+      testComponent.toolbarColor = 'primary';
+      fixture.detectChanges();
 
-    expect(toolbarElement.classList.contains('mat-primary')).toBe(true);
+      expect(toolbarElement.classList.contains('mat-primary')).toBe(true);
 
-    testComponent.toolbarColor = 'accent';
-    fixture.detectChanges();
+      testComponent.toolbarColor = 'accent';
+      fixture.detectChanges();
 
-    expect(toolbarElement.classList.contains('mat-primary')).toBe(false);
-    expect(toolbarElement.classList.contains('mat-accent')).toBe(true);
+      expect(toolbarElement.classList.contains('mat-primary')).toBe(false);
+      expect(toolbarElement.classList.contains('mat-accent')).toBe(true);
 
-    testComponent.toolbarColor = 'warn';
-    fixture.detectChanges();
+      testComponent.toolbarColor = 'warn';
+      fixture.detectChanges();
 
-    expect(toolbarElement.classList.contains('mat-accent')).toBe(false);
-    expect(toolbarElement.classList.contains('mat-warn')).toBe(true);
+      expect(toolbarElement.classList.contains('mat-accent')).toBe(false);
+      expect(toolbarElement.classList.contains('mat-warn')).toBe(true);
+    });
+
+    it('should not wrap the first row contents inside of a generated element', () => {
+      expect(toolbarElement.firstElementChild!.tagName).toBe('SPAN',
+          'Expected the <span> element of the first row to be a direct child of the toolbar');
+    });
   });
 
-  it('should set the toolbar role on the host', () => {
-    expect(toolbarElement.getAttribute('role')).toBe('toolbar');
+  describe('with multiple rows', () => {
+
+    it('should project each toolbar-row element inside of the toolbar', () => {
+      const fixture = TestBed.createComponent(ToolbarMultipleRows);
+      fixture.detectChanges();
+
+      expect(fixture.debugElement.queryAll(By.css('.mat-toolbar > .mat-toolbar-row')).length)
+        .toBe(2, 'Expected one toolbar row to be present while no content is projected.');
+    });
+
+    it('should throw an error if different toolbar modes are mixed', () => {
+      expect(() => {
+        const fixture = TestBed.createComponent(ToolbarMixedRowModes);
+        fixture.detectChanges();
+      }).toThrowError(/attempting to combine different/i);
+    });
+
+    it('should throw an error if a toolbar-row is added later', () => {
+      const fixture = TestBed.createComponent(ToolbarMixedRowModes);
+
+      fixture.componentInstance.showToolbarRow = false;
+      fixture.detectChanges();
+
+      expect(() => {
+        fixture.componentInstance.showToolbarRow = true;
+        fixture.detectChanges();
+      }).toThrowError(/attempting to combine different/i);
+    });
   });
 
 });
 
 
-@Component({template: `<mat-toolbar [color]="toolbarColor">Test Toolbar</mat-toolbar>`})
-class TestApp {
+@Component({
+  template: `
+    <mat-toolbar [color]="toolbarColor">
+      <span>First Row</span>
+    </mat-toolbar>
+  `
+})
+class ToolbarSingleRow {
   toolbarColor: string;
 }
+
+@Component({
+  template: `
+    <mat-toolbar>
+      <mat-toolbar-row>First Row</mat-toolbar-row>
+      <mat-toolbar-row>Second Row</mat-toolbar-row>
+    </mat-toolbar>
+  `
+})
+class ToolbarMultipleRows {}
+
+@Component({
+  template: `
+    <mat-toolbar>
+      First Row
+      <mat-toolbar-row *ngIf="showToolbarRow">Second Row</mat-toolbar-row>
+    </mat-toolbar>
+  `
+})
+class ToolbarMixedRowModes {
+  showToolbarRow: boolean = true;
+}
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index 919b28ee87da..e9781cedf324 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -7,22 +7,19 @@
  */
 
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   Component,
+  ContentChildren,
   Directive,
   ElementRef,
+  isDevMode,
+  QueryList,
   Renderer2,
-  ViewEncapsulation,
+  ViewEncapsulation
 } from '@angular/core';
 import {CanColor, mixinColor} from '@angular/material/core';
-
-
-@Directive({
-  selector: 'mat-toolbar-row',
-  exportAs: 'matToolbarRow',
-  host: {'class': 'mat-toolbar-row'},
-})
-export class MatToolbarRow {}
+import {Platform} from '@angular/cdk/platform';
 
 // Boilerplate for applying mixins to MatToolbar.
 /** @docs-private */
@@ -31,6 +28,12 @@ export class MatToolbarBase {
 }
 export const _MatToolbarMixinBase = mixinColor(MatToolbarBase);
 
+@Directive({
+  selector: 'mat-toolbar-row',
+  exportAs: 'matToolbarRow',
+  host: {'class': 'mat-toolbar-row'},
+})
+export class MatToolbarRow {}
 
 @Component({
   moduleId: module.id,
@@ -41,16 +44,58 @@ export const _MatToolbarMixinBase = mixinColor(MatToolbarBase);
   inputs: ['color'],
   host: {
     'class': 'mat-toolbar',
-    'role': 'toolbar'
+    '[class.mat-toolbar-multiple-rows]': 'this._toolbarRows.length',
+    '[class.mat-toolbar-single-row]': '!this._toolbarRows.length'
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
 })
-export class MatToolbar extends _MatToolbarMixinBase implements CanColor {
+export class MatToolbar extends _MatToolbarMixinBase implements CanColor, AfterViewInit {
+
+  /** Reference to all toolbar row elements that have been projected. */
+  @ContentChildren(MatToolbarRow) _toolbarRows: QueryList<MatToolbarRow>;
 
-  constructor(renderer: Renderer2, elementRef: ElementRef) {
+  constructor(renderer: Renderer2, elementRef: ElementRef, private _platform: Platform) {
     super(renderer, elementRef);
   }
 
+  ngAfterViewInit() {
+    if (!isDevMode() || !this._platform.isBrowser) {
+      return;
+    }
+
+    this._checkToolbarMixedModes();
+    this._toolbarRows.changes.subscribe(() => this._checkToolbarMixedModes());
+  }
+
+  /**
+   * Throws an exception when developers are attempting to combine the different toolbar row modes.
+   */
+  private _checkToolbarMixedModes() {
+    if (!this._toolbarRows.length) {
+      return;
+    }
+
+    // Check if there are any other DOM nodes that can display content but aren't inside of
+    // a <mat-toolbar-row> element.
+    const isCombinedUsage = [].slice.call(this._elementRef.nativeElement.childNodes)
+      .filter(node => !(node.classList && node.classList.contains('mat-toolbar-row')))
+      .filter(node => node.nodeType !== Node.COMMENT_NODE)
+      .some(node => node.textContent.trim());
+
+    if (isCombinedUsage) {
+      throwToolbarMixedModesError();
+    }
+  }
+}
+
+/**
+ * Throws an exception when attempting to combine the different toolbar row modes.
+ * @docs-private
+ */
+export function throwToolbarMixedModesError() {
+  throw Error('MatToolbar: Attempting to combine different toolbar modes. ' +
+    'Either specify multiple `<mat-toolbar-row>` elements explicitly or just place content ' +
+    'inside of a `<mat-toolbar>` for a single row.');
 }
diff --git a/src/material-examples/toolbar-multirow/toolbar-multirow-example.html b/src/material-examples/toolbar-multirow/toolbar-multirow-example.html
index a0c0e9cfde84..c1731969a509 100644
--- a/src/material-examples/toolbar-multirow/toolbar-multirow-example.html
+++ b/src/material-examples/toolbar-multirow/toolbar-multirow-example.html
@@ -1,5 +1,7 @@
 <mat-toolbar color="primary">
-  <span>Custom Toolbar</span>
+  <mat-toolbar-row>
+    <span>Custom Toolbar</span>
+  </mat-toolbar-row>
 
   <mat-toolbar-row>
     <span>Second Line</span>

From e0eda5a9ceb533deae96a9f7cc789763c3c10b4d Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Tue, 31 Oct 2017 16:04:43 -0700
Subject: [PATCH 400/575] use camelCase for cdkAccordion selector. (#7862)

---
 src/cdk/accordion/accordion.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cdk/accordion/accordion.ts b/src/cdk/accordion/accordion.ts
index cc8e4e2a899b..9a6e3d62b20f 100644
--- a/src/cdk/accordion/accordion.ts
+++ b/src/cdk/accordion/accordion.ts
@@ -16,7 +16,7 @@ let nextId = 0;
  * Directive whose purpose is to manage the expanded state of CdkAccordionItem children.
  */
 @Directive({
-  selector: 'cdk-accordion, [cdk-accordion]',
+  selector: 'cdk-accordion, [cdkAccordion]',
   exportAs: 'cdkAccordion',
 })
 export class CdkAccordion {

From de8c6e28811bf6a05cd0ceff2cb49b50378e1c35 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 1 Nov 2017 00:05:10 +0100
Subject: [PATCH 401/575] fix: import individual rx operators (#8160)

After the switch to lettable operators, we had started importing all operators via `rxjs/operators`. These changes switch us back to only importing the individual ones and add some linting so it doesn't happen in the future.
---
 CODING_STANDARDS.md                            |  4 ++--
 src/cdk/a11y/focus-trap.ts                     |  2 +-
 src/cdk/a11y/list-key-manager.spec.ts          |  2 +-
 src/cdk/a11y/list-key-manager.ts               |  5 ++++-
 src/cdk/layout/breakpoints-observer.ts         |  4 +++-
 src/cdk/observers/observe-content.ts           |  2 +-
 .../keyboard/overlay-keyboard-dispatcher.ts    |  2 +-
 src/cdk/overlay/overlay-ref.ts                 |  2 +-
 src/cdk/scrolling/scroll-dispatcher.ts         |  3 ++-
 src/cdk/scrolling/viewport-ruler.ts            |  2 +-
 src/cdk/table/table.spec.ts                    |  2 +-
 src/cdk/table/table.ts                         |  2 +-
 src/demo-app/system-config.ts                  |  1 -
 src/e2e-app/system-config.ts                   |  1 -
 src/lib/autocomplete/autocomplete-trigger.ts   |  6 +++++-
 src/lib/autocomplete/autocomplete.spec.ts      |  3 ++-
 src/lib/chips/chip-list.ts                     |  2 +-
 src/lib/datepicker/calendar.ts                 |  2 +-
 src/lib/datepicker/datepicker.ts               |  2 +-
 src/lib/dialog/dialog-ref.ts                   |  3 ++-
 src/lib/dialog/dialog.ts                       |  3 ++-
 src/lib/expansion/expansion-panel-header.ts    |  2 +-
 src/lib/form-field/form-field.ts               |  3 ++-
 src/lib/icon/icon-registry.ts                  |  6 +++++-
 src/lib/icon/icon.ts                           |  2 +-
 src/lib/menu/menu-directive.ts                 |  4 +++-
 src/lib/menu/menu-trigger.ts                   |  2 +-
 src/lib/select/select.spec.ts                  |  2 +-
 src/lib/select/select.ts                       |  6 +++++-
 src/lib/sidenav/drawer.ts                      |  6 +++++-
 src/lib/snack-bar/snack-bar-container.ts       |  2 +-
 src/lib/snack-bar/snack-bar.ts                 |  3 ++-
 src/lib/sort/sort.spec.ts                      |  2 +-
 src/lib/table/table-data-source.ts             |  4 +++-
 src/lib/tabs/tab-header.ts                     |  2 +-
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts        |  2 +-
 src/lib/tooltip/tooltip.ts                     |  2 +-
 test/karma-test-shim.js                        |  1 -
 tools/package-tools/rollup-globals.ts          | 18 ++++++++++++++++--
 tslint.json                                    |  2 +-
 40 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
index e176eb4878b4..46a16b6b31c7 100644
--- a/CODING_STANDARDS.md
+++ b/CODING_STANDARDS.md
@@ -128,7 +128,7 @@ class ConfigBuilder {
 
 #### RxJS
 When dealing with RxJS operators, import the lettable operator (e.g.
-`import {map} from 'rxjs/operators'`), as opposed to using the "patch" imports which pollute the
+`import {map} from 'rxjs/operators/map'`), as opposed to using the "patch" imports which pollute the
 user's global Observable object (e.g. `import 'rxjs/add/operator/map'`):
 
 ```ts
@@ -137,7 +137,7 @@ import 'rxjs/add/operator/map';
 someObservable.map(...).subscribe(...);
 
 // YES
-import {map} from 'rxjs/operators';
+import {map} from 'rxjs/operators/map';
 someObservable.pipe(map(...)).subscribe(...);
 ```
 
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index 41a4a19dcb0e..a89b8cdd0fdc 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -17,7 +17,7 @@ import {
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Platform} from '@angular/cdk/platform';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {InteractivityChecker} from './interactivity-checker';
 
 
diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index f4f50f4e9f7a..26b5975d8106 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -1,5 +1,5 @@
 import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {QueryList} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
 import {createKeyboardEvent} from '../testing/event-objects';
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index 2f26b51f9a6e..fca032b3dccb 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -10,7 +10,10 @@ import {QueryList} from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {UP_ARROW, DOWN_ARROW, TAB, A, Z, ZERO, NINE} from '@angular/cdk/keycodes';
-import {debounceTime, filter, map, tap} from 'rxjs/operators';
+import {debounceTime} from 'rxjs/operators/debounceTime';
+import {filter} from 'rxjs/operators/filter';
+import {map} from 'rxjs/operators/map';
+import {tap} from 'rxjs/operators/tap';
 
 /** This interface is for items that can be passed to a ListKeyManager. */
 export interface ListKeyManagerOption {
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
index 1db547fd4117..b5d2c2c9a277 100644
--- a/src/cdk/layout/breakpoints-observer.ts
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -9,7 +9,9 @@ import {Injectable, NgZone, OnDestroy} from '@angular/core';
 import {MediaMatcher} from './media-matcher';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {map, startWith, takeUntil} from 'rxjs/operators';
+import {map} from 'rxjs/operators/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {takeUntil} from 'rxjs/operators/takeUntil';
 import {coerceArray} from '@angular/cdk/coercion';
 import {combineLatest} from 'rxjs/observable/combineLatest';
 import {fromEventPattern} from 'rxjs/observable/fromEventPattern';
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index 88e8603e9949..9d71aba87d17 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -19,7 +19,7 @@ import {
   NgZone,
 } from '@angular/core';
 import {Subject} from 'rxjs/Subject';
-import {debounceTime} from 'rxjs/operators';
+import {debounceTime} from 'rxjs/operators/debounceTime';
 
 /**
  * Factory that creates a new MutationObserver and allows us to stub it out in unit tests.
diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
index 3eee62dc56a4..55c1f2c87d91 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
@@ -9,7 +9,7 @@
 import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
 import {OverlayRef} from '../overlay-ref';
 import {Subscription} from 'rxjs/Subscription';
-import {filter} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 
 /**
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 5d887ffd3e62..0f36b2a0ae72 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -12,7 +12,7 @@ import {OverlayConfig} from './overlay-config';
 import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 
 
 /**
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index c83da9888768..4301730314c8 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -13,7 +13,8 @@ import {Subscription} from 'rxjs/Subscription';
 import {Observable} from 'rxjs/Observable';
 import {of as observableOf} from 'rxjs/observable/of';
 import {fromEvent} from 'rxjs/observable/fromEvent';
-import {auditTime, filter} from 'rxjs/operators';
+import {auditTime} from 'rxjs/operators/auditTime';
+import {filter} from 'rxjs/operators/filter';
 import {CdkScrollable} from './scrollable';
 
 
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index 6e4e7cba2d67..a2e90e75ff2b 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -11,7 +11,7 @@ import {Platform} from '@angular/cdk/platform';
 import {Observable} from 'rxjs/Observable';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {merge} from 'rxjs/observable/merge';
-import {auditTime} from 'rxjs/operators';
+import {auditTime} from 'rxjs/operators/auditTime';
 import {Subscription} from 'rxjs/Subscription';
 import {of as observableOf} from 'rxjs/observable/of';
 
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index da27d0300ca6..ec9f85ae40fb 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -6,7 +6,7 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {combineLatest} from 'rxjs/observable/combineLatest';
 import {CdkTableModule} from './index';
 import {Observable} from 'rxjs/Observable';
-import {map} from 'rxjs/operators';
+import {map} from 'rxjs/operators/map';
 import {
   getTableDuplicateColumnNameError,
   getTableMissingMatchingRowDefError,
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index b2df1ea5ccaf..6f0301decf5e 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -31,7 +31,7 @@ import {
 } from '@angular/core';
 import {CollectionViewer, DataSource} from '@angular/cdk/collections';
 import {CdkCellOutlet, CdkCellOutletRowContext, CdkHeaderRowDef, CdkRowDef} from './row';
-import {takeUntil} from 'rxjs/operators';
+import {takeUntil} from 'rxjs/operators/takeUntil';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Subscription} from 'rxjs/Subscription';
 import {Subject} from 'rxjs/Subject';
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 45452b17bfc5..816b61771a32 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -82,7 +82,6 @@ System.config({
   packages: {
     // Thirdparty barrels.
     'rxjs': {main: 'index'},
-    'rxjs/operators': {main: 'index'},
 
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 712bb231b4d9..987755b1e8fe 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -82,7 +82,6 @@ System.config({
   packages: {
     // Thirdparty barrels.
     'rxjs': {main: 'index'},
-    'rxjs/operators': {main: 'index'},
 
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 1b9443b48a76..e92e2dd44143 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -17,7 +17,11 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
-import {filter, first, switchMap, tap, delay} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
+import {first} from 'rxjs/operators/first';
+import {switchMap} from 'rxjs/operators/switchMap';
+import {tap} from 'rxjs/operators/tap';
+import {delay} from 'rxjs/operators/delay';
 import {
   ChangeDetectorRef,
   Directive,
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index fd64301d34f9..ef03944435da 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1,7 +1,8 @@
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW, TAB} from '@angular/cdk/keycodes';
 import {OverlayContainer} from '@angular/cdk/overlay';
-import {map, startWith} from 'rxjs/operators';
+import {map} from 'rxjs/operators/map';
+import {startWith} from 'rxjs/operators/startWith';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   createKeyboardEvent,
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index c38a31b462d1..e8a4d67c8e7f 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -11,7 +11,7 @@ import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
 import {BACKSPACE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
-import {startWith} from 'rxjs/operators';
+import {startWith} from 'rxjs/operators/startWith';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index 4be8b54ba03f..321e177a74c2 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -36,7 +36,7 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {Subscription} from 'rxjs/Subscription';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MatDatepickerIntl} from './datepicker-intl';
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index ab355ca41089..f7b67becb270 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal} from '@angular/cdk/portal';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 791613b681fa..c169de0f8fca 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -7,7 +7,8 @@
  */
 
 import {OverlayRef, GlobalPositionStrategy} from '@angular/cdk/overlay';
-import {filter, first} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
+import {first} from 'rxjs/operators/first';
 import {DialogPosition} from './dialog-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index e530771c43bb..8c3047a0146d 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -15,7 +15,8 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
-import {startWith, filter} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
+import {startWith} from 'rxjs/operators/startWith';
 import {Location} from '@angular/common';
 import {
   ComponentRef,
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 7722eb97dc68..05baf2b90e93 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -9,7 +9,7 @@
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {ENTER, SPACE} from '@angular/cdk/keycodes';
-import {filter} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 2ea2394981a7..1397b95c4d6c 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -8,7 +8,8 @@
 
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {first, startWith} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
+import {startWith} from 'rxjs/operators/startWith';
 import {
   AfterContentChecked,
   AfterContentInit,
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 1d45680a75b6..6d054db8a7f7 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -6,7 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {catchError, tap, finalize, map, share} from 'rxjs/operators';
+import {catchError} from 'rxjs/operators/catchError';
+import {tap} from 'rxjs/operators/tap';
+import {finalize} from 'rxjs/operators/finalize';
+import {map} from 'rxjs/operators/map';
+import {share} from 'rxjs/operators/share';
 import {Injectable, Optional, SecurityContext, SkipSelf} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index 88e20abb706e..2781befbdba6 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {
   Attribute,
   ChangeDetectionStrategy,
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 40b6e36b2de7..3c8b777aa08f 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -10,7 +10,9 @@ import {AnimationEvent} from '@angular/animations';
 import {FocusKeyManager} from '@angular/cdk/a11y';
 import {Direction} from '@angular/cdk/bidi';
 import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
-import {startWith, switchMap, first} from 'rxjs/operators';
+import {startWith} from 'rxjs/operators/startWith';
+import {switchMap} from 'rxjs/operators/switchMap';
+import {first} from 'rxjs/operators/first';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 9e58c410fd51..cb2e4fc85b2b 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -20,7 +20,7 @@ import {
   VerticalConnectionPos,
 } from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
-import {filter} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
 import {
   AfterContentInit,
   Directive,
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 6eaa22e7ff63..37e0ca689886 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -40,7 +40,7 @@ import {
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {map} from 'rxjs/operators';
+import {map} from 'rxjs/operators/map';
 import {Subject} from 'rxjs/Subject';
 import {MatSelectModule} from './index';
 import {MatSelect} from './select';
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 8f736ff75e8d..e42a660550d9 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -18,7 +18,11 @@ import {
   ScrollStrategy,
   ViewportRuler,
 } from '@angular/cdk/overlay';
-import {filter, first, map, startWith, takeUntil} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
+import {first} from 'rxjs/operators/first';
+import {map} from 'rxjs/operators/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {takeUntil} from 'rxjs/operators/takeUntil';
 import {
   AfterContentInit,
   Attribute,
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 710d17a1e2bb..8497f8e5d5e4 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -32,7 +32,11 @@ import {
 } from '@angular/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
-import {filter, first, startWith, takeUntil, map} from 'rxjs/operators';
+import {filter} from 'rxjs/operators/filter';
+import {first} from 'rxjs/operators/first';
+import {startWith} from 'rxjs/operators/startWith';
+import {takeUntil} from 'rxjs/operators/takeUntil';
+import {map} from 'rxjs/operators/map';
 import {Subject} from 'rxjs/Subject';
 import {Observable} from 'rxjs/Observable';
 
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 256f2d2266cc..cf544a10d2bd 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -32,7 +32,7 @@ import {
   ComponentPortal,
   CdkPortalOutlet,
 } from '@angular/cdk/portal';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index bd7fb0fce94e..f321d5026c89 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -16,7 +16,8 @@ import {MAT_SNACK_BAR_DATA, MatSnackBarConfig} from './snack-bar-config';
 import {MatSnackBarContainer} from './snack-bar-container';
 import {MatSnackBarRef} from './snack-bar-ref';
 import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
-import {takeUntil, first} from 'rxjs/operators';
+import {takeUntil} from 'rxjs/operators/takeUntil';
+import {first} from 'rxjs/operators/first';
 
 
 /**
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index c24ae31ffbbc..ca214c4ae735 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -6,7 +6,7 @@ import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Observable} from 'rxjs/Observable';
-import {map} from 'rxjs/operators';
+import {map} from 'rxjs/operators/map';
 import {MatTableModule} from '../table/index';
 import {
   MatSort,
diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
index 3f9d46efcdae..5f60b06444ad 100644
--- a/src/lib/table/table-data-source.ts
+++ b/src/lib/table/table-data-source.ts
@@ -11,7 +11,9 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
 import {Subscription} from 'rxjs/Subscription';
-import {combineLatest, map, startWith} from 'rxjs/operators';
+import {combineLatest} from 'rxjs/operators/combineLatest';
+import {map} from 'rxjs/operators/map';
+import {startWith} from 'rxjs/operators/startWith';
 import {empty} from 'rxjs/observable/empty';
 
 /**
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 831db37c3719..e7b3f26e391e 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -8,7 +8,7 @@
 
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
-import {startWith} from 'rxjs/operators';
+import {startWith} from 'rxjs/operators/startWith';
 import {
   AfterContentChecked,
   AfterContentInit,
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index c9bd6b51441f..c9eca0bda256 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -8,7 +8,7 @@
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {Platform} from '@angular/cdk/platform';
-import {takeUntil} from 'rxjs/operators';
+import {takeUntil} from 'rxjs/operators/takeUntil';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {
   AfterContentInit,
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 243faee270b0..8975731045c5 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -24,7 +24,7 @@ import {
 } from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {ComponentPortal} from '@angular/cdk/portal';
-import {first} from 'rxjs/operators';
+import {first} from 'rxjs/operators/first';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   ChangeDetectionStrategy,
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index dea9a9ac33ae..7b5c0c471e5c 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -102,7 +102,6 @@ System.config({
   packages: {
     // Thirdparty barrels.
     'rxjs': {main: 'index'},
-    'rxjs/operators': {main: 'index'},
 
     // Set the default extension for the root package, because otherwise the demo-app can't
     // be built within the production mode. Due to missing file extensions.
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 3f1b688fd1ac..c9222cbe77fd 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -59,6 +59,7 @@ export const rollupGlobals = {
   'rxjs/Observer': 'Rx',
   'rxjs/Subscriber': 'Rx',
   'rxjs/Scheduler': 'Rx',
+
   'rxjs/observable/combineLatest': 'Rx.Observable',
   'rxjs/observable/forkJoin': 'Rx.Observable',
   'rxjs/observable/fromEvent': 'Rx.Observable',
@@ -68,8 +69,21 @@ export const rollupGlobals = {
   'rxjs/observable/defer': 'Rx.Observable',
   'rxjs/observable/fromEventPattern': 'Rx.Observable',
   'rxjs/observable/empty': 'Rx.Observable',
-  'rxjs/operators': 'Rx.Observable',
-  'rxjs/operators/index': 'Rx.Observable',
+
+  'rxjs/operators/debounceTime': 'Rx.Observable',
+  'rxjs/operators/takeUntil': 'Rx.Observable',
+  'rxjs/operators/first': 'Rx.Observable',
+  'rxjs/operators/filter': 'Rx.Observable',
+  'rxjs/operators/map': 'Rx.Observable',
+  'rxjs/operators/tap': 'Rx.Observable',
+  'rxjs/operators/startWith': 'Rx.Observable',
+  'rxjs/operators/auditTime': 'Rx.Observable',
+  'rxjs/operators/switchMap': 'Rx.Observable',
+  'rxjs/operators/finalize': 'Rx.Observable',
+  'rxjs/operators/catchError': 'Rx.Observable',
+  'rxjs/operators/share': 'Rx.Observable',
+  'rxjs/operators/delay': 'Rx.Observable',
+  'rxjs/operators/combineLatest': 'Rx.Observable',
 
   'rxjs/add/observable/merge': 'Rx.Observable',
   'rxjs/add/observable/fromEvent': 'Rx.Observable',
diff --git a/tslint.json b/tslint.json
index e3fa8b441da8..ee1512bb2f7d 100644
--- a/tslint.json
+++ b/tslint.json
@@ -78,7 +78,7 @@
       ["xdescribe"]
     ],
     // Disallows importing the whole RxJS library. Submodules can be still imported.
-    "import-blacklist": [true, "rxjs"],
+    "import-blacklist": [true, "rxjs", "rxjs/operators"],
     // Avoids inconsistent linebreak styles in source files. Forces developers to use LF linebreaks.
     "linebreak-style": [true, "LF"],
 

From a2129fc7e7e2f20c93b387f5045d3a285e4e6ee0 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Tue, 31 Oct 2017 16:05:55 -0700
Subject: [PATCH 402/575] fix(table): switch when arguments (#7516)

---
 src/cdk/table/row.ts             |  8 ++++----
 src/cdk/table/table.spec.ts      | 11 +++++------
 src/cdk/table/table.ts           |  2 +-
 src/demo-app/table/table-demo.ts |  2 +-
 src/lib/table/table.spec.ts      |  4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 3a148a775951..615354624bb5 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -84,12 +84,12 @@ export class CdkHeaderRowDef extends BaseRowDef {
 })
 export class CdkRowDef<T> extends BaseRowDef {
   /**
-   * Function that should return true if this row template should be used for the provided row data
-   * and index. If left undefined, this row will be considered the default row template to use when
-   * no other when functions return true for the data.
+   * Function that should return true if this row template should be used for the provided index
+   * and row data. If left undefined, this row will be considered the default row template to use
+   * when no other when functions return true for the data.
    * For every row, there must be at least one when function that passes or an undefined to default.
    */
-  when: (rowData: T, index: number) => boolean;
+  when: (index: number, rowData: T) => boolean;
 
   // TODO(andrewseguin): Add an input for providing a switch function to determine
   //   if this template should be used.
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index ec9f85ae40fb..b659fefaac15 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -750,8 +750,8 @@ class BooleanRowCdkTableApp {
 class WhenRowCdkTableApp {
   dataSource: FakeDataSource = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
-  isIndex1 = (_rowData: TestData, index: number) => index == 1;
-  hasC3 = (rowData: TestData) => rowData.c == 'c_3';
+  isIndex1 = (index: number, _rowData: TestData) => index == 1;
+  hasC3 = (_index: number, rowData: TestData) => rowData.c == 'c_3';
 
   constructor() { this.dataSource.addData(); }
 
@@ -795,8 +795,8 @@ class WhenRowCdkTableApp {
 class WhenRowWithoutDefaultCdkTableApp {
   dataSource: FakeDataSource = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
-  isIndex1 = (_rowData: TestData, index: number) => index == 1;
-  hasC3 = (rowData: TestData) => rowData.c == 'c_3';
+  isIndex1 = (index: number, _rowData: TestData) => index == 1;
+  hasC3 = (_index: number, rowData: TestData) => rowData.c == 'c_3';
 
   @ViewChild(CdkTable) table: CdkTable<TestData>;
 }
@@ -839,8 +839,7 @@ class WhenRowWithoutDefaultCdkTableApp {
 class WhenRowMultipleDefaultsCdkTableApp {
   dataSource: FakeDataSource = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
-  isIndex1 = (_rowData: TestData, index: number) => index == 1;
-  hasC3 = (rowData: TestData) => rowData.c == 'c_3';
+  hasC3 = (_index: number, rowData: TestData) => rowData.c == 'c_3';
 
   @ViewChild(CdkTable) table: CdkTable<TestData>;
 }
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 6f0301decf5e..a21a3c2552a0 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -340,7 +340,7 @@ export class CdkTable<T> implements CollectionViewer {
   _getRowDef(data: T, i: number): CdkRowDef<T> {
     if (this._rowDefs.length == 1) { return this._rowDefs.first; }
 
-    let rowDef = this._rowDefs.find(def => def.when && def.when(data, i)) || this._defaultRowDef;
+    let rowDef = this._rowDefs.find(def => def.when && def.when(i, data)) || this._defaultRowDef;
     if (!rowDef) { throw getTableMissingMatchingRowDefError(); }
 
     return rowDef;
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index 691190cb73dc..c10015145426 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -45,7 +45,7 @@ export class TableDemo {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  isDetailRow = (row: DetailRow|UserData) => row.hasOwnProperty('detailRow');
+  isDetailRow = (_index: number, row: DetailRow|UserData) => row.hasOwnProperty('detailRow');
 
   @ViewChild('paginatorForDataSource') paginatorForDataSource: MatPaginator;
   @ViewChild('sortForDataSource') sortForDataSource: MatSort;
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index eac0a880fff9..4296127c80b2 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -285,7 +285,7 @@ class FakeDataSource extends DataSource<TestData> {
 class MatTableApp {
   dataSource: FakeDataSource | null = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
-  isFourthRow = (_rowData: TestData, i: number) => i == 3;
+  isFourthRow = (i: number, _rowData: TestData) => i == 3;
 
   @ViewChild(MatTable) table: MatTable<TestData>;
 }
@@ -311,7 +311,7 @@ class MatTableApp {
 })
 class MatTableWithWhenRowApp {
   dataSource: FakeDataSource | null = new FakeDataSource();
-  isFourthRow = (_rowData: TestData, i: number) => i == 3;
+  isFourthRow = (i: number, _rowData: TestData) => i == 3;
 
   @ViewChild(MatTable) table: MatTable<TestData>;
 }

From dfe8091d959f1bb54cc33a8d942cbe7ea4e3fe56 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 1 Nov 2017 19:03:57 +0100
Subject: [PATCH 403/575] feat: angular 5 support (#6018)

---
 .travis.yml                                   |   2 +-
 package-lock.json                             | 249 ++++++++----------
 package.json                                  |  26 +-
 .../closure-compiler/build-devapp-bundle.sh   |  23 +-
 src/cdk/scrolling/scroll-dispatcher.spec.ts   |  15 +-
 src/cdk/table/row.ts                          |   2 +-
 src/cdk/table/table.ts                        |   9 +-
 src/cdk/tsconfig-build.json                   |   2 +-
 src/cdk/tsconfig-es5.json                     |   2 +-
 src/cdk/tsconfig-tests.json                   |   5 +
 src/e2e-app/e2e-app-module.ts                 |   2 +-
 src/e2e-app/fullscreen/fullscreen-e2e.ts      |   8 +-
 src/lib/checkbox/checkbox.html                |   1 -
 src/lib/chips/chip.ts                         |   4 +-
 src/lib/core/datetime/date-adapter.ts         |   2 +-
 src/lib/core/option/option.spec.ts            |   2 +-
 src/lib/datepicker/datepicker-toggle.html     |   4 +-
 src/lib/expansion/expansion-panel.ts          |   6 +-
 src/lib/grid-list/public-api.ts               |   2 +-
 src/lib/progress-spinner/progress-spinner.ts  |   9 +-
 src/lib/select/select.spec.ts                 |   2 +-
 src/lib/tsconfig-build.json                   |   8 +-
 src/lib/tsconfig-es5.json                     |   8 +-
 src/lib/tsconfig-tests.json                   |   5 +
 .../form-field-theming-example.html           |   2 +-
 src/material-examples/tsconfig-build.json     |   6 +-
 src/material-examples/tsconfig-es5.json       |   6 +-
 .../tsconfig-build.json                       |   4 +-
 src/material-moment-adapter/tsconfig-es5.json |   6 +-
 .../tsconfig-tests.json                       |   5 +
 src/universal-app/tsconfig-build.json         |   3 +-
 tools/dashboard/package.json                  |  20 +-
 tools/gulp/tasks/payload.ts                   |   8 +-
 tools/gulp/tasks/screenshots.ts               |   2 +-
 tools/gulp/util/firebase.ts                   |   4 +-
 tools/package-tools/build-package.ts          |  23 +-
 tools/package-tools/compile-entry-point.ts    |   5 +-
 tools/package-tools/gulp/build-tasks-gulp.ts  |   3 +-
 tools/screenshot-test/package.json            |  22 +-
 39 files changed, 267 insertions(+), 250 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73bf1c385627..ccfabb5dd866 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 dist: trusty
 
 node_js:
-  - '8'
+  - '7'
 
 addons:
   jwt:
diff --git a/package-lock.json b/package-lock.json
index de60b2dea588..9da2988b2f90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,125 +5,103 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.6.tgz",
-      "integrity": "sha1-+mYYmaik44y3xYPHpcl85l1ZKjU=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0-rc.9.tgz",
+      "integrity": "sha1-ajq5oxdVZa9JQqELHvEriIcNxsA=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/common": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.6.tgz",
-      "integrity": "sha1-S4FCByTggooOg5uVpV6xp+g5GPI=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0-rc.9.tgz",
+      "integrity": "sha1-CG0gKXNozXkgGeEJARRaPbaCiNI=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.6.tgz",
-      "integrity": "sha1-LuH68lt1fh0SiXkHS+f65SmzvCA=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0-rc.9.tgz",
+      "integrity": "sha1-JcFyoz/H7/GAJnNUhKKCNjePAz4=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.6.tgz",
-      "integrity": "sha1-uv09HiYOmQh+uajPdTLb1gOrubE=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0-rc.9.tgz",
+      "integrity": "sha1-iUXkUcJjRHAGeotAqL1baMEX4UU=",
       "dev": true,
       "requires": {
-        "@angular/tsc-wrapped": "4.4.6",
+        "chokidar": "1.7.0",
         "minimist": "1.2.0",
-        "reflect-metadata": "0.1.10"
+        "reflect-metadata": "0.1.10",
+        "tsickle": "0.24.1"
       }
     },
     "@angular/core": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.6.tgz",
-      "integrity": "sha1-EwMf0Q3P5DiHVBmzjyESCVi8I1Q=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0-rc.9.tgz",
+      "integrity": "sha1-CqtdLZsx6lMKQbseMAlQTRvWRnM=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/forms": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.6.tgz",
-      "integrity": "sha1-/mSs5CQ1wbgPSQNLfEHOjK8UpEo=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0-rc.9.tgz",
+      "integrity": "sha1-p14YlbchMRmQ4lMTFDybNn5L41o=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/http": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.6.tgz",
-      "integrity": "sha1-CvaAxnEL3AJtlA4iXP0PalwAXQw=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0-rc.9.tgz",
+      "integrity": "sha1-myZFw4T9bYIsL7G0x9JkxhsbK9E=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.6.tgz",
-      "integrity": "sha1-qYOcVH4bZU+h0kqJeAyLpquNzOA=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0-rc.9.tgz",
+      "integrity": "sha1-raeVDmEEsBWavC2E0T7fG4JIPyA=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.6.tgz",
-      "integrity": "sha1-TT2aanvyzz3kBYphWuBZ7/ZB+jY=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0-rc.9.tgz",
+      "integrity": "sha1-krwRUe9IXNzML09qa3Obnka27LI=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-server": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.6.tgz",
-      "integrity": "sha1-QxJI9IkaY1x2rRWhfQPpyH4aODc=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.0-rc.9.tgz",
+      "integrity": "sha1-TucPcj002WAI9p0c2a37D5NMxNQ=",
       "dev": true,
       "requires": {
-        "parse5": "3.0.2",
+        "domino": "1.0.30",
         "tslib": "1.8.0",
         "xhr2": "0.1.4"
       }
     },
     "@angular/router": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.6.tgz",
-      "integrity": "sha1-D2rSmuD/jSyeo3m9MgRHIXt+yGY=",
+      "version": "5.0.0-rc.9",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0-rc.9.tgz",
+      "integrity": "sha1-LSrEKt/R8UfoGc8oc31Hxsm+8s0=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
-    "@angular/tsc-wrapped": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.6.tgz",
-      "integrity": "sha1-Fnh8u/UL3H5zgSOxnDJSfyROF40=",
-      "dev": true,
-      "requires": {
-        "tsickle": "0.21.6"
-      },
-      "dependencies": {
-        "tsickle": {
-          "version": "0.21.6",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz",
-          "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=",
-          "dev": true,
-          "requires": {
-            "minimist": "1.2.0",
-            "mkdirp": "0.5.1",
-            "source-map": "0.5.7",
-            "source-map-support": "0.4.18"
-          }
-        }
-      }
-    },
     "@firebase/app": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.1.tgz",
@@ -1039,6 +1017,15 @@
                 }
               }
             },
+            "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-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -1050,15 +1037,6 @@
                 "strip-ansi": "3.0.1"
               }
             },
-            "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"
-              }
-            },
             "stringstream": {
               "version": "0.0.5",
               "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -1998,6 +1976,15 @@
                 }
               }
             },
+            "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-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -2009,15 +1996,6 @@
                 "strip-ansi": "3.0.1"
               }
             },
-            "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"
-              }
-            },
             "stringstream": {
               "version": "0.0.5",
               "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -2563,16 +2541,6 @@
         "@types/node": "7.0.46"
       }
     },
-    "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"
-      }
-    },
     "a-sync-waterfall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
@@ -4484,8 +4452,8 @@
       "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
         "is-text-path": "1.0.1",
+        "JSONStream": "1.3.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.2.0",
@@ -5412,6 +5380,12 @@
         "domelementtype": "1.3.0"
       }
     },
+    "domino": {
+      "version": "1.0.30",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz",
+      "integrity": "sha512-ikq8WiDSkICdkElud317F2Sigc6A3EDpWsxWBwIZqOl95km4p/Vc9Rj98id7qKgsjDmExj0AVM7JOd4bb647Xg==",
+      "dev": true
+    },
     "domutils": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
@@ -6773,7 +6747,18 @@
           "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
           "dev": true,
           "requires": {
-            "boom": "4.3.1"
+            "boom": "5.2.0"
+          },
+          "dependencies": {
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+              "dev": true,
+              "requires": {
+                "hoek": "4.2.0"
+              }
+            }
           }
         },
         "crypto-random-string": {
@@ -6809,7 +6794,6 @@
           "version": "2.4.0",
           "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
           "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
-          "dev": true,
           "requires": {
             "is-obj": "1.0.1"
           }
@@ -7483,12 +7467,6 @@
           "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
           "dev": true
         },
-        "string-format-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
-          "dev": true
-        },
         "string_decoder": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -7498,6 +7476,12 @@
             "safe-buffer": "5.1.1"
           }
         },
+        "string-format-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+          "dev": true
+        },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -7662,7 +7646,6 @@
       "dev": true,
       "requires": {
         "@google-cloud/functions-emulator": "1.0.0-alpha.25",
-        "JSONStream": "1.3.1",
         "archiver": "0.16.0",
         "chalk": "1.1.3",
         "cjson": "0.3.3",
@@ -7682,6 +7665,7 @@
         "google-auto-auth": "0.7.2",
         "inquirer": "0.12.0",
         "jsonschema": "1.2.0",
+        "JSONStream": "1.3.1",
         "jsonwebtoken": "7.4.3",
         "lodash": "4.17.4",
         "open": "0.0.5",
@@ -12042,16 +12026,6 @@
         "through2": "0.6.5"
       },
       "dependencies": {
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -12064,6 +12038,16 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -12128,6 +12112,16 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
+      }
+    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -14545,23 +14539,6 @@
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
-    "parse5": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz",
-      "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=",
-      "dev": true,
-      "requires": {
-        "@types/node": "6.0.90"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "6.0.90",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz",
-          "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==",
-          "dev": true
-        }
-      }
-    },
     "parsejson": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
@@ -16918,6 +16895,15 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -16951,15 +16937,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "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"
-      }
-    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -18029,9 +18006,9 @@
       }
     },
     "tsickle": {
-      "version": "0.23.6",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.6.tgz",
-      "integrity": "sha1-/O5Xpct/kqjDqeV47gooZCfc+s0=",
+      "version": "0.24.1",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.24.1.tgz",
+      "integrity": "sha512-XloFQZhVhgjpQsi3u2ORNRJvuID5sflOg6HfP093IqAbhE1+fIUXznULpdDwHgG4p+v8w78KdHruQtkWUKx5AQ==",
       "requires": {
         "minimist": "1.2.0",
         "mkdirp": "0.5.1",
diff --git a/package.json b/package.json
index 9d0fd48fcd56..f5954c6ac0d2 100644
--- a/package.json
+++ b/package.json
@@ -25,26 +25,25 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": "~4.4.4",
-    "@angular/common": "~4.4.4",
-    "@angular/compiler": "~4.4.4",
-    "@angular/core": "~4.4.4",
-    "@angular/forms": "~4.4.4",
-    "@angular/platform-browser": "~4.4.4",
+    "@angular/animations": "~5.0.0-rc.9",
+    "@angular/common": "~5.0.0-rc.9",
+    "@angular/compiler": "~5.0.0-rc.9",
+    "@angular/core": "~5.0.0-rc.9",
+    "@angular/forms": "~5.0.0-rc.9",
+    "@angular/platform-browser": "~5.0.0-rc.9",
     "core-js": "^2.4.1",
     "rxjs": "^5.5.0",
     "systemjs": "0.19.43",
-    "tsickle": "^0.23.5",
+    "tsickle": "^0.24.x",
     "tslib": "^1.7.1",
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.4.4",
-    "@angular/http": "~4.4.4",
-    "@angular/platform-browser-dynamic": "~4.4.4",
-    "@angular/platform-server": "~4.4.4",
-    "@angular/router": "~4.4.4",
-    "@angular/tsc-wrapped": "~4.4.4",
+    "@angular/compiler-cli": "~5.0.0-rc.9",
+    "@angular/http": "~5.0.0-rc.9",
+    "@angular/platform-browser-dynamic": "~5.0.0-rc.9",
+    "@angular/platform-server": "~5.0.0-rc.9",
+    "@angular/router": "~5.0.0-rc.9",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
@@ -83,6 +82,7 @@
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^3.1.0",
     "gulp-transform": "^2.0.0",
+    "gulp-util": "^3.0.8",
     "hammerjs": "^2.0.8",
     "highlight.js": "^9.11.0",
     "http-rewrite-middleware": "^0.1.6",
diff --git a/scripts/closure-compiler/build-devapp-bundle.sh b/scripts/closure-compiler/build-devapp-bundle.sh
index 0ef948ca2e8a..1f1bd5363168 100755
--- a/scripts/closure-compiler/build-devapp-bundle.sh
+++ b/scripts/closure-compiler/build-devapp-bundle.sh
@@ -63,17 +63,18 @@ OPTS=(
   dist/releases/material-moment-adapter/esm2015/material-moment-adapter.js
 
   # Include all Angular FESM bundles.
-  node_modules/@angular/core/@angular/core.js
-  node_modules/@angular/common/@angular/common.js
-  node_modules/@angular/common/@angular/common/http.js
-  node_modules/@angular/compiler/@angular/compiler.js
-  node_modules/@angular/forms/@angular/forms.js
-  node_modules/@angular/router/@angular/router.js
-  node_modules/@angular/platform-browser/@angular/platform-browser.js
-  node_modules/@angular/platform-browser/@angular/platform-browser/animations.js
-  node_modules/@angular/platform-browser-dynamic/@angular/platform-browser-dynamic.js
-  node_modules/@angular/animations/@angular/animations.js
-  node_modules/@angular/animations/@angular/animations/browser.js
+  node_modules/@angular/core/esm5/index.js
+  node_modules/@angular/common/esm5/index.js
+  node_modules/@angular/common/esm5/http.js
+  node_modules/@angular/compiler/esm5/index.js
+  node_modules/@angular/forms/esm5/index.js
+  node_modules/@angular/http/esm5/index.js
+  node_modules/@angular/router/esm5/index.js
+  node_modules/@angular/platform-browser/esm5/index.js
+  node_modules/@angular/platform-browser/esm5/animations/index.js
+  node_modules/@angular/platform-browser-dynamic/esm5/index.js
+  node_modules/@angular/animations/esm5/index.js
+  node_modules/@angular/animations/esm5/browser/index.js
 
   # Include other dependencies like Zone.js, Moment.js, and RxJS
   node_modules/zone.js/dist/zone.js
diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index bd63a5f9b1bb..b4c249f4e556 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -67,24 +67,15 @@ describe('Scroll Dispatcher', () => {
     }));
 
     it('should not execute the global events in the Angular zone', () => {
-      const spy = jasmine.createSpy('zone unstable callback');
-      const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
-
       scroll.scrolled(0).subscribe(() => {});
       dispatchFakeEvent(document, 'scroll', false);
 
-      expect(spy).not.toHaveBeenCalled();
-      subscription.unsubscribe();
+      expect(fixture.ngZone!.isStable).toBe(true);
     });
 
     it('should not execute the scrollable events in the Angular zone', () => {
-      const spy = jasmine.createSpy('zone unstable callback');
-      const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
-
-      dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll', false);
-
-      expect(spy).not.toHaveBeenCalled();
-      subscription.unsubscribe();
+      dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll');
+      expect(fixture.ngZone!.isStable).toBe(true);
     });
 
     it('should be able to unsubscribe from the global scrollable', () => {
diff --git a/src/cdk/table/row.ts b/src/cdk/table/row.ts
index 615354624bb5..76bb6c377eb5 100644
--- a/src/cdk/table/row.ts
+++ b/src/cdk/table/row.ts
@@ -141,7 +141,7 @@ export class CdkCellOutlet {
    * a handle to provide that component's cells and context. After init, the CdkCellOutlet will
    * construct the cells with the provided context.
    */
-  static mostRecentCellOutlet: CdkCellOutlet;
+  static mostRecentCellOutlet: CdkCellOutlet | null = null;
 
   constructor(public _viewContainer: ViewContainerRef) {
     CdkCellOutlet.mostRecentCellOutlet = this;
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index a21a3c2552a0..cb0aa60128bf 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -293,7 +293,9 @@ export class CdkTable<T> implements CollectionViewer {
         .createEmbeddedView(this._headerDef.template, {cells});
 
     cells.forEach(cell => {
-      CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
+      if (CdkCellOutlet.mostRecentCellOutlet) {
+        CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
+      }
     });
 
     this._changeDetectorRef.markForCheck();
@@ -361,7 +363,10 @@ export class CdkTable<T> implements CollectionViewer {
     this._rowPlaceholder.viewContainer.createEmbeddedView(row.template, context, index);
 
     this._getCellTemplatesForRow(row).forEach(cell => {
-      CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, context);
+      if (CdkCellOutlet.mostRecentCellOutlet) {
+        CdkCellOutlet.mostRecentCellOutlet._viewContainer
+            .createEmbeddedView(cell.template, context);
+      }
     });
 
     this._changeDetectorRef.markForCheck();
diff --git a/src/cdk/tsconfig-build.json b/src/cdk/tsconfig-build.json
index cbae6367a2b8..4a62901bfd86 100644
--- a/src/cdk/tsconfig-build.json
+++ b/src/cdk/tsconfig-build.json
@@ -20,7 +20,7 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
     }
   },
   "files": [
diff --git a/src/cdk/tsconfig-es5.json b/src/cdk/tsconfig-es5.json
index e85105f31cfd..eeb6d924c00c 100644
--- a/src/cdk/tsconfig-es5.json
+++ b/src/cdk/tsconfig-es5.json
@@ -21,7 +21,7 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
     }
   },
   "files": [
diff --git a/src/cdk/tsconfig-tests.json b/src/cdk/tsconfig-tests.json
index 2b24877a7677..86b715415315 100644
--- a/src/cdk/tsconfig-tests.json
+++ b/src/cdk/tsconfig-tests.json
@@ -17,6 +17,11 @@
     "./testing/index.ts",
     "typings.d.ts"
   ],
+  "angularCompilerOptions": {
+    "strictMetadataEmit": true,
+    "skipTemplateCodegen": true,
+    "emitDecoratorMetadata": true
+  },
   "include": [
     // Include the index.ts for each secondary entry-point
     "./*/index.ts",
diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts
index a9fd3f395e7c..c1e98b503981 100644
--- a/src/e2e-app/e2e-app-module.ts
+++ b/src/e2e-app/e2e-app-module.ts
@@ -13,7 +13,7 @@ import {DialogE2E, TestDialog} from './dialog/dialog-e2e';
 import {GridListE2E} from './grid-list/grid-list-e2e';
 import {ProgressBarE2E} from './progress-bar/progress-bar-e2e';
 import {ProgressSpinnerE2E} from './progress-spinner/progress-spinner-e2e';
-import {FullscreenE2E, TestDialog as TestDialogFullScreen} from './fullscreen/fullscreen-e2e';
+import {FullscreenE2E, TestDialogFullScreen} from './fullscreen/fullscreen-e2e';
 import {E2E_APP_ROUTES} from './e2e-app/routes';
 import {SlideToggleE2E} from './slide-toggle/slide-toggle-e2e';
 import {InputE2E} from './input/input-e2e';
diff --git a/src/e2e-app/fullscreen/fullscreen-e2e.ts b/src/e2e-app/fullscreen/fullscreen-e2e.ts
index 3bf543d9c965..a74d5fdc385f 100644
--- a/src/e2e-app/fullscreen/fullscreen-e2e.ts
+++ b/src/e2e-app/fullscreen/fullscreen-e2e.ts
@@ -8,12 +8,12 @@ import {MatDialog, MatDialogRef} from '@angular/material';
 })
 export class FullscreenE2E {
 
-  dialogRef: MatDialogRef<TestDialog> | null;
+  dialogRef: MatDialogRef<TestDialogFullScreen> | null;
 
   constructor (private _element: ElementRef, private _dialog: MatDialog) { }
 
   openDialog() {
-    this.dialogRef = this._dialog.open(TestDialog);
+    this.dialogRef = this._dialog.open(TestDialogFullScreen);
 
     this.dialogRef.componentInstance.openFullscreen.subscribe(() => this.openFullscreen());
     this.dialogRef.componentInstance.exitFullscreen.subscribe(() => this.exitFullscreen());
@@ -54,9 +54,9 @@ export class FullscreenE2E {
     <button (click)="dialogRef.close()" id="close">Close Dialog</button>
   `
 })
-export class TestDialog {
+export class TestDialogFullScreen {
   @Output() openFullscreen = new EventEmitter<void>();
   @Output() exitFullscreen = new EventEmitter<void>();
 
-  constructor(public dialogRef: MatDialogRef<TestDialog>) {}
+  constructor(public dialogRef: MatDialogRef<TestDialogFullScreen>) {}
 }
diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index 3174c6804464..e706b5c2940f 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -24,7 +24,6 @@
       <svg version="1.1"
            focusable="false"
            class="mat-checkbox-checkmark"
-           xmlns="http://www.w3.org/2000/svg"
            viewBox="0 0 24 24"
            xml:space="preserve">
         <path class="mat-checkbox-checkmark-path"
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index ab41a1572eaf..03d99ff0f8bc 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -302,8 +302,8 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
   selector: '[matChipRemove]',
   host: {
     'class': 'mat-chip-remove',
-    '(click)': '_handleClick($event)',
-  },
+    '(click)': '_handleClick()',
+  }
 })
 export class MatChipRemove {
   constructor(protected _parentChip: MatChip) {
diff --git a/src/lib/core/datetime/date-adapter.ts b/src/lib/core/datetime/date-adapter.ts
index ef841808c7a8..b72a98dd15c8 100644
--- a/src/lib/core/datetime/date-adapter.ts
+++ b/src/lib/core/datetime/date-adapter.ts
@@ -237,7 +237,7 @@ export abstract class DateAdapter<D> {
    * Checks if two dates are equal.
    * @param first The first date to check.
    * @param second The second date to check.
-   * @returns {boolean} Whether the two dates are equal.
+   * @returns Whether the two dates are equal.
    *     Null dates are considered equal to other null dates.
    */
   sameDate(first: D | null, second: D | null): boolean {
diff --git a/src/lib/core/option/option.spec.ts b/src/lib/core/option/option.spec.ts
index aa13e8b911a1..6e963b81b767 100644
--- a/src/lib/core/option/option.spec.ts
+++ b/src/lib/core/option/option.spec.ts
@@ -61,6 +61,6 @@ describe('MatOption component', () => {
 @Component({
   template: `<mat-option [disabled]="disabled"></mat-option>`
 })
-export class OptionWithDisable {
+class OptionWithDisable {
   disabled: boolean;
 }
diff --git a/src/lib/datepicker/datepicker-toggle.html b/src/lib/datepicker/datepicker-toggle.html
index 57546536b130..18c2b17f19e8 100644
--- a/src/lib/datepicker/datepicker-toggle.html
+++ b/src/lib/datepicker/datepicker-toggle.html
@@ -1,8 +1,8 @@
 <button mat-icon-button type="button" [attr.aria-label]="_intl.openCalendarLabel"
         [disabled]="disabled" (click)="_open($event)">
   <mat-icon>
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="100%" height="100%"
-         fill="currentColor" style="vertical-align: top" focusable="false">
+    <svg viewBox="0 0 24 24" width="100%" height="100%" fill="currentColor"
+        style="vertical-align: top" focusable="false">
       <path d="M0 0h24v24H0z" fill="none"/>
       <path d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z"/>
     </svg>
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 87684803b50b..4ab23c55a50f 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -30,6 +30,9 @@ import {MatAccordion} from './accordion';
 /** Workaround for https://github.com/angular/angular/issues/17849 */
 export const _CdkAccordionItem = CdkAccordionItem;
 
+/** Time and timing curve for expansion panel animations. */
+export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,1)';
+
 // Boilerplate for applying mixins to MatExpansionPanel.
 /** @docs-private */
 @Component({
@@ -51,9 +54,6 @@ export const _MatExpansionPanelMixinBase = mixinDisabled(MatExpansionPanelBase);
 /** MatExpansionPanel's states. */
 export type MatExpansionPanelState = 'expanded' | 'collapsed';
 
-/** Time and timing curve for expansion panel animations. */
-export const EXPANSION_PANEL_ANIMATION_TIMING = '225ms cubic-bezier(0.4,0.0,0.2,1)';
-
 /**
  * <mat-expansion-panel> component.
  *
diff --git a/src/lib/grid-list/public-api.ts b/src/lib/grid-list/public-api.ts
index 0bcd7ada32b8..2360f7283514 100644
--- a/src/lib/grid-list/public-api.ts
+++ b/src/lib/grid-list/public-api.ts
@@ -8,5 +8,5 @@
 
 export * from './grid-list-module';
 export * from './grid-list';
-export {MatGridTile} from './grid-tile';
+export * from './grid-tile';
 
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 18e298ea8865..5c0973f325ae 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -94,8 +94,11 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   /** Tracks diameters of existing instances to de-dupe generated styles (default d = 100) */
   private static diameters = new Set<number>([100]);
 
-  /** Used for storing all of the generated keyframe animations. */
-  private static styleTag: HTMLStyleElement;
+  /**
+   * Used for storing all of the generated keyframe animations.
+   * @dynamic
+   */
+  private static styleTag: HTMLStyleElement|null = null;
 
   /** The diameter of the progress spinner (will set width and height of svg). */
   @Input()
@@ -199,7 +202,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
       MatProgressSpinner.styleTag = styleTag;
     }
 
-    if (styleTag.sheet) {
+    if (styleTag && styleTag.sheet) {
       (styleTag.sheet as CSSStyleSheet).insertRule(this._getAnimationText());
     }
 
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 37e0ca689886..ccc0b7f3ef67 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -3487,7 +3487,7 @@ class SelectWithErrorSibling {
   selector: 'throws-error-on-init',
   template: ''
 })
-export class ThrowsErrorOnInit implements OnInit {
+class ThrowsErrorOnInit implements OnInit {
   ngOnInit() {
     throw Error('Oh no!');
   }
diff --git a/src/lib/tsconfig-build.json b/src/lib/tsconfig-build.json
index c161db414d67..a5d7d6c13381 100644
--- a/src/lib/tsconfig-build.json
+++ b/src/lib/tsconfig-build.json
@@ -12,6 +12,10 @@
     "moduleResolution": "node",
     "outDir": "../../dist/packages/material",
     "rootDir": ".",
+    "rootDirs": [
+      ".",
+      "../../dist/packages/material"
+    ],
     "sourceMap": true,
     "inlineSources": true,
     "target": "es2015",
@@ -20,8 +24,8 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
-      "@angular/material/*": ["../../dist/packages/material/*/public-api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"],
+      "@angular/material/*": ["../../dist/packages/material/*"]
     }
   },
   "files": [
diff --git a/src/lib/tsconfig-es5.json b/src/lib/tsconfig-es5.json
index 20e6026d3e17..49aed8849f99 100644
--- a/src/lib/tsconfig-es5.json
+++ b/src/lib/tsconfig-es5.json
@@ -13,6 +13,10 @@
     "moduleResolution": "node",
     "outDir": "../../dist/packages/material/esm5",
     "rootDir": ".",
+    "rootDirs": [
+      ".",
+      "../../dist/packages/material"
+    ],
     "sourceMap": true,
     "inlineSources": true,
     "target": "es5",
@@ -21,8 +25,8 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
-      "@angular/material/*": ["../../dist/packages/material/*/public-api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"],
+      "@angular/material/*": ["../../dist/packages/material/*"]
     }
   },
   "files": [
diff --git a/src/lib/tsconfig-tests.json b/src/lib/tsconfig-tests.json
index a3e422e45be2..1bf25dd6a88a 100644
--- a/src/lib/tsconfig-tests.json
+++ b/src/lib/tsconfig-tests.json
@@ -13,6 +13,11 @@
       "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
+  "angularCompilerOptions": {
+    "strictMetadataEmit": true,
+    "skipTemplateCodegen": true,
+    "emitDecoratorMetadata": true
+  },
   "include": [
     "**/*.spec.ts",
     "index.ts"
diff --git a/src/material-examples/form-field-theming/form-field-theming-example.html b/src/material-examples/form-field-theming/form-field-theming-example.html
index 8545ebefd2a6..5c614184e1a1 100644
--- a/src/material-examples/form-field-theming/form-field-theming-example.html
+++ b/src/material-examples/form-field-theming/form-field-theming-example.html
@@ -9,6 +9,6 @@
 
   <mat-form-field [color]="options.value.color">
     <input matInput type="number" placeholder="Font size (px)" formControlName="fontSize" min="10">
-    <mat-error *ngIf="options.get('fontSize').invalid">Min size: 10px</mat-error>
+    <mat-error *ngIf="options.get('fontSize')?.invalid">Min size: 10px</mat-error>
   </mat-form-field>
 </form>
diff --git a/src/material-examples/tsconfig-build.json b/src/material-examples/tsconfig-build.json
index d96880b2124f..5c2eaebfda6f 100644
--- a/src/material-examples/tsconfig-build.json
+++ b/src/material-examples/tsconfig-build.json
@@ -22,10 +22,10 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material": ["../../dist/packages/material/public-api"],
-      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter/public-api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
     }
   },
   "files": [
diff --git a/src/material-examples/tsconfig-es5.json b/src/material-examples/tsconfig-es5.json
index 3c4a52e343b1..736e14fbb28f 100644
--- a/src/material-examples/tsconfig-es5.json
+++ b/src/material-examples/tsconfig-es5.json
@@ -22,10 +22,10 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material": ["../../dist/packages/material/public-api"],
-      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter/public-api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
     }
   },
   "files": [
diff --git a/src/material-moment-adapter/tsconfig-build.json b/src/material-moment-adapter/tsconfig-build.json
index d1cc7b1e9d54..f6c63c371ee9 100644
--- a/src/material-moment-adapter/tsconfig-build.json
+++ b/src/material-moment-adapter/tsconfig-build.json
@@ -22,9 +22,9 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material": ["../../dist/packages/material/public-api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
     }
   },
   "files": [
diff --git a/src/material-moment-adapter/tsconfig-es5.json b/src/material-moment-adapter/tsconfig-es5.json
index 2e98923ce36b..d291171d03d4 100644
--- a/src/material-moment-adapter/tsconfig-es5.json
+++ b/src/material-moment-adapter/tsconfig-es5.json
@@ -23,9 +23,9 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
-      "@angular/material": ["../../dist/packages/material/public-api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+      "@angular/material/*": ["../../dist/packages/material/*"],
+      "@angular/material": ["../../dist/packages/material"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
     }
   },
   "files": [
diff --git a/src/material-moment-adapter/tsconfig-tests.json b/src/material-moment-adapter/tsconfig-tests.json
index 4369cb530a23..c73edb683399 100644
--- a/src/material-moment-adapter/tsconfig-tests.json
+++ b/src/material-moment-adapter/tsconfig-tests.json
@@ -9,6 +9,11 @@
     "target": "es5",
     "types": ["jasmine"]
   },
+  "angularCompilerOptions": {
+    "strictMetadataEmit": true,
+    "skipTemplateCodegen": true,
+    "emitDecoratorMetadata": true
+  },
   "include": [
     "**/*.spec.ts",
     "index.ts"
diff --git a/src/universal-app/tsconfig-build.json b/src/universal-app/tsconfig-build.json
index adf897b7aba4..d18f63191f01 100644
--- a/src/universal-app/tsconfig-build.json
+++ b/src/universal-app/tsconfig-build.json
@@ -5,7 +5,8 @@
     "declaration": true,
     "stripInternal": false,
     "experimentalDecorators": true,
-    "noUnusedParameters": true,
+    // TODO(crisbeto): disabled due to https://github.com/angular/angular/issues/17131
+    "noUnusedParameters": false,
     "strictNullChecks": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index 50efa57f3891..5519962c96ec 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -10,16 +10,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.4.4",
+    "@angular/animations": "~5.0.0-rc.9",
     "@angular/cdk": "github:angular/cdk-builds",
-    "@angular/common": "^4.4.4",
-    "@angular/compiler": "^4.4.4",
-    "@angular/core": "^4.4.4",
-    "@angular/forms": "^4.4.4",
+    "@angular/common": "~5.0.0-rc.9",
+    "@angular/compiler": "~5.0.0-rc.9",
+    "@angular/core": "~5.0.0-rc.9",
+    "@angular/forms": "~5.0.0-rc.9",
     "@angular/material": "github:angular/material2-builds",
-    "@angular/platform-browser": "^4.4.4",
-    "@angular/platform-browser-dynamic": "^4.4.4",
-    "@angular/router": "^4.4.4",
+    "@angular/platform-browser": "~5.0.0-rc.9",
+    "@angular/platform-browser-dynamic": "~5.0.0-rc.9",
+    "@angular/router": "~5.0.0-rc.9",
     "@swimlane/ngx-charts": "^6.0.0",
     "angularfire2": "^5.0.0-rc.2",
     "core-js": "^2.4.1",
@@ -30,8 +30,8 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.2.0",
-    "@angular/compiler-cli": "^4.4.4",
-    "@angular/language-service": "^4.4.4",
+    "@angular/compiler-cli": "~5.0.0-rc.9",
+    "@angular/language-service": "~5.0.0-rc.9",
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "ts-node": "~3.0.4",
diff --git a/tools/gulp/tasks/payload.ts b/tools/gulp/tasks/payload.ts
index 70fd69962067..becbc1966444 100644
--- a/tools/gulp/tasks/payload.ts
+++ b/tools/gulp/tasks/payload.ts
@@ -41,7 +41,7 @@ task('payload', ['material:clean-build'], async () => {
         openFirebaseDashboardApp() :
         openFirebaseDashboardAppAsGuest();
     const database = firebaseApp.database();
-    const currentSha = process.env['TRAVIS_PULL_REQUEST_SHA'] || process.env['TRAVIS_COMMIT'];
+    const currentSha = process.env['TRAVIS_PULL_REQUEST_SHA']! || process.env['TRAVIS_COMMIT']!;
 
     // Upload the payload results and calculate the payload diff in parallel. Otherwise the
     // payload task will take much more time inside of Travis builds.
@@ -72,7 +72,7 @@ function getFilesize(filePath: string) {
  */
 async function calculatePayloadDiff(database: firebaseAdmin.database.Database, currentSha: string,
                                     currentPayload: any) {
-  const authToken = process.env['FIREBASE_ACCESS_TOKEN'];
+  const authToken = process.env['FIREBASE_ACCESS_TOKEN']!;
 
   if (!authToken) {
     console.error('Cannot calculate Payload diff because there is no "FIREBASE_ACCESS_TOKEN" ' +
@@ -157,7 +157,7 @@ async function getPayloadResults(database: firebaseAdmin.database.Database, comm
 /** Gets the SHA of the commit where the payload was uploaded before this Travis Job started. */
 function getCommitFromPreviousPayloadUpload(): string {
   if (isTravisMasterBuild()) {
-    const commitRange = process.env['TRAVIS_COMMIT_RANGE'];
+    const commitRange = process.env['TRAVIS_COMMIT_RANGE']!;
     // In some situations, Travis will include multiple commits in a single Travis Job. This means
     // that we can't just resolve the previous commit by using the parent commit of HEAD.
     // By resolving the amount of commits inside of the current Travis Job, we can figure out
@@ -171,7 +171,7 @@ function getCommitFromPreviousPayloadUpload(): string {
     // Travis applies the changes of Pull Requests in new branches. This means that resolving
     // the commit that previously ran on the target branch (mostly "master") can be done
     // by just loading the SHA of the most recent commit in the target branch.
-    return spawnSync('git', ['rev-parse', process.env['TRAVIS_BRANCH']]).stdout.toString().trim();
+    return spawnSync('git', ['rev-parse', process.env['TRAVIS_BRANCH']!]).stdout.toString().trim();
   }
 }
 
diff --git a/tools/gulp/tasks/screenshots.ts b/tools/gulp/tasks/screenshots.ts
index 4d5d65ae6668..8d2f53d56b79 100644
--- a/tools/gulp/tasks/screenshots.ts
+++ b/tools/gulp/tasks/screenshots.ts
@@ -36,7 +36,7 @@ const FIREBASE_STORAGE_GOLDENS = 'goldens';
 
 /** Task which upload screenshots generated from e2e test. */
 task('screenshots', () => {
-  const prNumber = process.env['TRAVIS_PULL_REQUEST'];
+  const prNumber = process.env['TRAVIS_PULL_REQUEST']!;
 
   if (isTravisMasterBuild()) {
     // Only update goldens for master build
diff --git a/tools/gulp/util/firebase.ts b/tools/gulp/util/firebase.ts
index 3675aee4ad1a..f8f771351a76 100644
--- a/tools/gulp/util/firebase.ts
+++ b/tools/gulp/util/firebase.ts
@@ -19,7 +19,7 @@ export function openFirebaseDashboardApp() {
       client_email: 'material2-board@appspot.gserviceaccount.com',
       // In Travis CI the private key will be incorrect because the line-breaks are escaped.
       // The line-breaks need to persist in the service account private key.
-      private_key: decode(process.env['MATERIAL2_BOARD_FIREBASE_SERVICE_KEY'])
+      private_key: decode(process.env['MATERIAL2_BOARD_FIREBASE_SERVICE_KEY']!)
     }),
   });
 }
@@ -38,7 +38,7 @@ export function openScreenshotsBucket() {
     projectId: 'material2-screenshots',
     credentials: {
       client_email: 'firebase-adminsdk-t4209@material2-screenshots.iam.gserviceaccount.com',
-      private_key: decode(process.env['MATERIAL2_SCREENSHOT_FIREBASE_KEY'])
+      private_key: decode(process.env['MATERIAL2_SCREENSHOT_FIREBASE_KEY']!)
     },
   });
 
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index c1f9144b82a8..3d8227e9d7d6 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -1,5 +1,6 @@
-import {join} from 'path';
-import {main as ngc} from '@angular/tsc-wrapped';
+import {join, resolve as resolvePath} from 'path';
+import {spawn} from 'child_process';
+import {red} from 'chalk';
 import {PackageBundler} from './build-bundles';
 import {buildConfig} from './build-config';
 import {getSecondaryEntryPointsForPackage} from './secondary-entry-points';
@@ -102,12 +103,24 @@ export class BuildPackage {
   }
 
   /** Compiles the TypeScript sources of a primary or secondary entry point. */
-  private async _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
+  private _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = ''): Promise<any> {
     const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
     const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
 
-    await ngc(entryPointTsconfigPath, {basePath: entryPointPath});
-    renamePrivateReExportsToBeUnique(this, secondaryEntryPoint);
+    return new Promise((resolve, reject) => {
+      const ngcPath = resolvePath('./node_modules/.bin/ngc');
+      const childProcess = spawn(ngcPath, ['-p', entryPointTsconfigPath], {shell: true});
+
+      // Pipe stdout and stderr from the child process.
+      childProcess.stdout.on('data', (data: any) => console.log(`${data}`));
+      childProcess.stderr.on('data', (data: any) => console.error(red(`${data}`)));
+
+      childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
+    })
+    .catch(() => {
+      const error = red(`Failed to compile ${secondaryEntryPoint} using ${entryPointTsconfigPath}`);
+      console.error(error);
+    });
   }
 
   /** Stores the secondary entry-points for this package if they haven't been computed already. */
diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts
index db7176adbc5e..9f211e15d621 100644
--- a/tools/package-tools/compile-entry-point.ts
+++ b/tools/package-tools/compile-entry-point.ts
@@ -24,7 +24,10 @@ export async function compileEntryPoint(buildPackage: BuildPackage, tsconfigName
 
     childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
   })
-    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)));
+  .catch(() => {
+    const error = red(`Failed to compile ${secondaryEntryPoint} using ${entryPointTsconfigPath}`);
+    console.error(error);
+  });
 }
 
 /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
diff --git a/tools/package-tools/gulp/build-tasks-gulp.ts b/tools/package-tools/gulp/build-tasks-gulp.ts
index 675306ee73f6..2e541ee4ba6c 100644
--- a/tools/package-tools/gulp/build-tasks-gulp.ts
+++ b/tools/package-tools/gulp/build-tasks-gulp.ts
@@ -45,7 +45,8 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
     // Build all required packages before building.
     ...dependencyNames.map(pkgName => `${pkgName}:build`),
     // Build ESM and assets output.
-    [`${taskName}:build:esm`, `${taskName}:assets`],
+    `${taskName}:assets`,
+    `${taskName}:build:esm`,
     // Inline assets into ESM output.
     `${taskName}:assets:inline`,
     // Build bundles on top of inlined ESM output.
diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index 13f79650e3a5..553549a55885 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -9,26 +9,26 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.4.4",
+    "@angular/animations": "~5.0.0-rc.9",
     "@angular/cdk": "angular/cdk-builds",
-    "@angular/common": "^4.4.4",
-    "@angular/compiler": "^4.4.4",
-    "@angular/compiler-cli": "^4.4.4",
-    "@angular/core": "^4.4.4",
-    "@angular/forms": "^4.4.4",
+    "@angular/common": "~5.0.0-rc.9",
+    "@angular/compiler": "~5.0.0-rc.9",
+    "@angular/compiler-cli": "~5.0.0-rc.9",
+    "@angular/core": "~5.0.0-rc.9",
+    "@angular/forms": "~5.0.0-rc.9",
     "@angular/material": "angular/material2-builds",
-    "@angular/platform-browser": "^4.4.4",
-    "@angular/platform-browser-dynamic": "^4.4.4",
-    "@angular/router": "^4.4.4",
+    "@angular/platform-browser": "~5.0.0-rc.9",
+    "@angular/platform-browser-dynamic": "~5.0.0-rc.9",
+    "@angular/router": "~5.0.0-rc.9",
     "core-js": "^2.4.1",
     "firebase": "^3.7.6",
     "rxjs": "^5.0.1",
     "ts-helpers": "^1.1.1",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.12"
   },
   "devDependencies": {
     "@angular/cli": "^1.0.0",
-    "@angular/compiler-cli": "^4.4.4",
+    "@angular/compiler-cli": "~5.0.0-rc.9",
     "@types/node": "^6.0.42",
     "ts-node": "1.2.1",
     "typescript": "~2.2.1"

From 5cef1dc13d39fea1a34f87226f41acc9ca1c2249 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 01:14:02 +0100
Subject: [PATCH 404/575] chore: bump to Angular 5 final (#8177)

Currently the Angular 5 dependency is set to rc.9. Bumps it to the final version.
---
 package-lock.json                  | 66 +++++++++++++++---------------
 package.json                       | 22 +++++-----
 tools/dashboard/package.json       | 20 ++++-----
 tools/screenshot-test/package.json | 20 ++++-----
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9da2988b2f90..c8c521b987f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,33 +5,33 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0-rc.9.tgz",
-      "integrity": "sha1-ajq5oxdVZa9JQqELHvEriIcNxsA=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+      "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/common": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0-rc.9.tgz",
-      "integrity": "sha1-CG0gKXNozXkgGeEJARRaPbaCiNI=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+      "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0-rc.9.tgz",
-      "integrity": "sha1-JcFyoz/H7/GAJnNUhKKCNjePAz4=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+      "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0-rc.9.tgz",
-      "integrity": "sha1-iUXkUcJjRHAGeotAqL1baMEX4UU=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz",
+      "integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=",
       "dev": true,
       "requires": {
         "chokidar": "1.7.0",
@@ -41,51 +41,51 @@
       }
     },
     "@angular/core": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0-rc.9.tgz",
-      "integrity": "sha1-CqtdLZsx6lMKQbseMAlQTRvWRnM=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+      "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/forms": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0-rc.9.tgz",
-      "integrity": "sha1-p14YlbchMRmQ4lMTFDybNn5L41o=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+      "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/http": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0-rc.9.tgz",
-      "integrity": "sha1-myZFw4T9bYIsL7G0x9JkxhsbK9E=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+      "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0-rc.9.tgz",
-      "integrity": "sha1-raeVDmEEsBWavC2E0T7fG4JIPyA=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+      "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0-rc.9.tgz",
-      "integrity": "sha1-krwRUe9IXNzML09qa3Obnka27LI=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+      "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-server": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.0-rc.9.tgz",
-      "integrity": "sha1-TucPcj002WAI9p0c2a37D5NMxNQ=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.0.tgz",
+      "integrity": "sha1-h30l74FK+S//x7C1I7lxpv8iIBg=",
       "dev": true,
       "requires": {
         "domino": "1.0.30",
@@ -94,9 +94,9 @@
       }
     },
     "@angular/router": {
-      "version": "5.0.0-rc.9",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0-rc.9.tgz",
-      "integrity": "sha1-LSrEKt/R8UfoGc8oc31Hxsm+8s0=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+      "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
diff --git a/package.json b/package.json
index f5954c6ac0d2..4884cbe36bfb 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,12 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": "~5.0.0-rc.9",
-    "@angular/common": "~5.0.0-rc.9",
-    "@angular/compiler": "~5.0.0-rc.9",
-    "@angular/core": "~5.0.0-rc.9",
-    "@angular/forms": "~5.0.0-rc.9",
-    "@angular/platform-browser": "~5.0.0-rc.9",
+    "@angular/animations": "^5.0.0",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/forms": "^5.0.0",
+    "@angular/platform-browser": "^5.0.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.5.0",
     "systemjs": "0.19.43",
@@ -39,11 +39,11 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~5.0.0-rc.9",
-    "@angular/http": "~5.0.0-rc.9",
-    "@angular/platform-browser-dynamic": "~5.0.0-rc.9",
-    "@angular/platform-server": "~5.0.0-rc.9",
-    "@angular/router": "~5.0.0-rc.9",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/http": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/platform-server": "^5.0.0",
+    "@angular/router": "^5.0.0",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index 5519962c96ec..65352373271d 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -10,16 +10,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~5.0.0-rc.9",
+    "@angular/animations": "^5.0.0",
     "@angular/cdk": "github:angular/cdk-builds",
-    "@angular/common": "~5.0.0-rc.9",
-    "@angular/compiler": "~5.0.0-rc.9",
-    "@angular/core": "~5.0.0-rc.9",
-    "@angular/forms": "~5.0.0-rc.9",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/forms": "^5.0.0",
     "@angular/material": "github:angular/material2-builds",
-    "@angular/platform-browser": "~5.0.0-rc.9",
-    "@angular/platform-browser-dynamic": "~5.0.0-rc.9",
-    "@angular/router": "~5.0.0-rc.9",
+    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/router": "^5.0.0",
     "@swimlane/ngx-charts": "^6.0.0",
     "angularfire2": "^5.0.0-rc.2",
     "core-js": "^2.4.1",
@@ -30,8 +30,8 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.2.0",
-    "@angular/compiler-cli": "~5.0.0-rc.9",
-    "@angular/language-service": "~5.0.0-rc.9",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/language-service": "^5.0.0",
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "ts-node": "~3.0.4",
diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index 553549a55885..7e70981adbd1 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -9,17 +9,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~5.0.0-rc.9",
+    "@angular/animations": "^5.0.0",
     "@angular/cdk": "angular/cdk-builds",
-    "@angular/common": "~5.0.0-rc.9",
-    "@angular/compiler": "~5.0.0-rc.9",
-    "@angular/compiler-cli": "~5.0.0-rc.9",
-    "@angular/core": "~5.0.0-rc.9",
-    "@angular/forms": "~5.0.0-rc.9",
+    "@angular/common": "^5.0.0",
+    "@angular/compiler": "^5.0.0",
+    "@angular/compiler-cli": "^5.0.0",
+    "@angular/core": "^5.0.0",
+    "@angular/forms": "^5.0.0",
     "@angular/material": "angular/material2-builds",
-    "@angular/platform-browser": "~5.0.0-rc.9",
-    "@angular/platform-browser-dynamic": "~5.0.0-rc.9",
-    "@angular/router": "~5.0.0-rc.9",
+    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/router": "^5.0.0",
     "core-js": "^2.4.1",
     "firebase": "^3.7.6",
     "rxjs": "^5.0.1",
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.0.0",
-    "@angular/compiler-cli": "~5.0.0-rc.9",
+    "@angular/compiler-cli": "^5.0.0",
     "@types/node": "^6.0.42",
     "ts-node": "1.2.1",
     "typescript": "~2.2.1"

From 9e4c636821e574b822fbd0ed33a90d9f3697d7ed Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Wed, 1 Nov 2017 20:20:48 -0700
Subject: [PATCH 405/575] fix(spinner): set initial value for spinner to 0.
 (#8139)

---
 src/lib/progress-spinner/progress-spinner.spec.ts | 4 ++--
 src/lib/progress-spinner/progress-spinner.ts      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index a1d655d765d4..03c6a9358bc7 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -37,12 +37,12 @@ describe('MatProgressSpinner', () => {
     expect(progressElement.componentInstance.mode).toBe('indeterminate');
   });
 
-  it('should define a default value of undefined for the value attribute', () => {
+  it('should define a default value of zero for the value attribute', () => {
     let fixture = TestBed.createComponent(BasicProgressSpinner);
     fixture.detectChanges();
 
     let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
-    expect(progressElement.componentInstance.value).toBeUndefined();
+    expect(progressElement.componentInstance.value).toBe(0);
   });
 
   it('should set the value to 0 when the mode is set to indeterminate', () => {
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index 5c0973f325ae..e3923167e3d8 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -83,7 +83,7 @@ const INDETERMINATE_ANIMATION_TEMPLATE = `
 export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements CanColor,
   OnChanges {
 
-  private _value: number;
+  private _value: number = 0;
   private readonly _baseSize = 100;
   private readonly _baseStrokeWidth = 10;
   private _fallbackAnimation = false;
@@ -119,7 +119,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
 
   /** Value of the progress circle. */
   @Input()
-  get value() {
+  get value(): number {
     return this.mode === 'determinate' ? this._value : 0;
   }
   set value(newValue: number) {

From 75bccde3747fbd7d8a39367923d6d3e89765798e Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:21:02 +0100
Subject: [PATCH 406/575] fix(block-scroll-strategy): disable smooth scrolling
 before restoring scroll position (#8132)

Disables user-defined `scroll-behavior: smooth` before restoring the scroll position when disabling the `BlockScrollStrategy`, which prevents browsers from animating the scroll position change.

Fixes #7139.
---
 .../scroll/block-scroll-strategy.spec.ts      | 21 +++++++++++++++++++
 .../overlay/scroll/block-scroll-strategy.ts   | 20 +++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
index ef2d9e131f8b..6126e3a3b8f2 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
@@ -136,6 +136,27 @@ describe('BlockScrollStrategy', () => {
     expect(document.documentElement.getBoundingClientRect().width).toBe(previousContentWidth);
   });
 
+  it('should not clobber user-defined scroll-behavior', skipIOS(() => {
+    const root = document.documentElement;
+    const body = document.body;
+
+    root.style['scrollBehavior'] = body.style['scrollBehavior'] = 'smooth';
+
+    // Get the value via the style declaration in order to
+    // handle browsers that don't support the property yet.
+    const initialRootValue = root.style['scrollBehavior'];
+    const initialBodyValue = root.style['scrollBehavior'];
+
+    overlayRef.attach(componentPortal);
+    overlayRef.detach();
+
+    expect(root.style['scrollBehavior']).toBe(initialRootValue);
+    expect(body.style['scrollBehavior']).toBe(initialBodyValue);
+
+    // Avoid bleeding styles into other tests.
+    root.style['scrollBehavior'] = body.style['scrollBehavior'] = '';
+  }));
+
   /**
    * Skips the specified test, if it is being executed on iOS. This is necessary, because
    * programmatic scrolling inside the Karma iframe doesn't work on iOS, which renders these
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.ts b/src/cdk/overlay/scroll/block-scroll-strategy.ts
index df517a41436b..b828a96b97b4 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.ts
@@ -45,11 +45,25 @@ export class BlockScrollStrategy implements ScrollStrategy {
   /** Unblocks page-level scroll while the attached overlay is open. */
   disable() {
     if (this._isEnabled) {
+      const html = document.documentElement;
+      const body = document.body;
+      const previousHtmlScrollBehavior = html.style['scrollBehavior'] || '';
+      const previousBodyScrollBehavior = body.style['scrollBehavior'] || '';
+
       this._isEnabled = false;
-      document.documentElement.style.left = this._previousHTMLStyles.left;
-      document.documentElement.style.top = this._previousHTMLStyles.top;
-      document.documentElement.classList.remove('cdk-global-scrollblock');
+
+      html.style.left = this._previousHTMLStyles.left;
+      html.style.top = this._previousHTMLStyles.top;
+      html.classList.remove('cdk-global-scrollblock');
+
+      // Disable user-defined smooth scrolling temporarily while we restore the scroll position.
+      // See https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-behavior
+      html.style['scrollBehavior'] = body.style['scrollBehavior'] = 'auto';
+
       window.scroll(this._previousScrollPosition.left, this._previousScrollPosition.top);
+
+      html.style['scrollBehavior'] = previousHtmlScrollBehavior;
+      body.style['scrollBehavior'] = previousBodyScrollBehavior;
     }
   }
 

From 02d3eb6c30e58d60929778c509658bf782d270ff Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 2 Nov 2017 04:21:35 +0100
Subject: [PATCH 407/575] fix(tabs): incorrect ripple color for tabs with
 background (#8123)

* Tabs with a background color need to set the ripple colors to be the contrast color. Otherwise the ripples might be too dark/or light, depending on the color palette that is being used.
---
 src/lib/tabs/_tabs-theme.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/lib/tabs/_tabs-theme.scss b/src/lib/tabs/_tabs-theme.scss
index a0874b1c3c7d..a887e1acee86 100644
--- a/src/lib/tabs/_tabs-theme.scss
+++ b/src/lib/tabs/_tabs-theme.scss
@@ -111,6 +111,12 @@
   .mat-tab-header-pagination-disabled .mat-tab-header-pagination-chevron {
     border-color: mat-color($background-color, default-contrast, 0.4);
   }
+
+  // Set ripples color to be the contrast color of the new background. Otherwise the ripple
+  // color will be based on the app background color.
+  .mat-ripple-element {
+    background-color: mat-color($background-color, default-contrast, 0.12);
+  }
 }
 
 @mixin mat-tabs-typography($config) {

From c4e12b5b6576246a9fc045c543a2fae08354f80d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 2 Nov 2017 04:21:51 +0100
Subject: [PATCH 408/575] refactor(list): easier overriding of list-item height
 (#8120)

* Makes it easier for developers to override the height of a list-item.

Fixes #8067
---
 src/lib/list/list.scss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
index 314c70fb556b..056bdda78c55 100644
--- a/src/lib/list/list.scss
+++ b/src/lib/list/list.scss
@@ -33,15 +33,16 @@ $mat-dense-list-icon-size: 20px;
   // Prevents the wrapper `mat-list-item-content` from collapsing due to it
   // being `inline` by default.
   display: block;
+  height: $base-height;
 
   .mat-list-item-content {
     display: flex;
     flex-direction: row;
     align-items: center;
     box-sizing: border-box;
-    height: $base-height;
     padding: 0 $mat-list-side-padding;
     position: relative;
+    height: inherit;
   }
 
   .mat-list-item-content-reverse {
@@ -61,22 +62,22 @@ $mat-dense-list-icon-size: 20px;
     pointer-events: none;
   }
 
-  &.mat-list-item-avatar .mat-list-item-content {
+  &.mat-list-item-avatar {
     height: $avatar-height;
   }
 
-  &.mat-2-line .mat-list-item-content {
+  &.mat-2-line {
     height: $two-line-height;
   }
 
 
-  &.mat-3-line .mat-list-item-content {
+  &.mat-3-line {
     height: $three-line-height;
   }
 
   // list items with more than 3 lines should expand to match
   // the height of its contained text
-  &.mat-multi-line .mat-list-item-content {
+  &.mat-multi-line {
     height: 100%;
     padding: 8px $mat-list-side-padding;
   }

From 2fa679bb00aff35b6a2bbd1534514e7c28216a32 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:24:50 +0100
Subject: [PATCH 409/575] fix(input): remove IE clear icon (#8095)

Removes IE's native clear icon from inputs, because it makes them inconsistent between browsers.

Fixes #8076.
---
 src/lib/input/input.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lib/input/input.scss b/src/lib/input/input.scss
index d357326b973b..6fe27e42aee2 100644
--- a/src/lib/input/input.scss
+++ b/src/lib/input/input.scss
@@ -32,6 +32,11 @@
     box-shadow: none;
   }
 
+  // Remove IE's default clear icon.
+  &::-ms-clear {
+    display: none;
+  }
+
   // Note that we can't use something like visibility: hidden or
   // display: none, because IE ends up preventing the user from
   // focusing the input altogether.

From d17f9d22abe1c066b78dd84a9fcdec9254ff95d8 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 1 Nov 2017 20:26:36 -0700
Subject: [PATCH 410/575] fix: don't show sanity check messages in tests
 (#8080)

---
 .../core/common-behaviors/common-module.ts    | 34 +++++++++++++++----
 src/lib/core/gestures/gesture-config.ts       | 15 ++++----
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/lib/core/common-behaviors/common-module.ts b/src/lib/core/common-behaviors/common-module.ts
index 991ee6594fa8..48a77e4da9da 100644
--- a/src/lib/core/common-behaviors/common-module.ts
+++ b/src/lib/core/common-behaviors/common-module.ts
@@ -31,18 +31,31 @@ export class MatCommonModule {
   /** Whether we've done the global sanity checks (e.g. a theme is loaded, there is a doctype). */
   private _hasDoneGlobalChecks = false;
 
+  /** Whether we've already checked for HammerJs availability. */
+  private _hasCheckedHammer = false;
+
   /** Reference to the global `document` object. */
   private _document = typeof document === 'object' && document ? document : null;
 
-  constructor(@Optional() @Inject(MATERIAL_SANITY_CHECKS) sanityChecksEnabled: boolean) {
-    if (sanityChecksEnabled && !this._hasDoneGlobalChecks && isDevMode()) {
-      this._checkDoctype();
-      this._checkTheme();
+  constructor(@Optional() @Inject(MATERIAL_SANITY_CHECKS) private _sanityChecksEnabled: boolean) {
+    if (this._areChecksEnabled() && !this._hasDoneGlobalChecks) {
+      this._checkDoctypeIsDefined();
+      this._checkThemeIsPresent();
       this._hasDoneGlobalChecks = true;
     }
   }
 
-  private _checkDoctype(): void {
+  /** Whether any sanity checks are enabled */
+  private _areChecksEnabled(): boolean {
+    return this._sanityChecksEnabled && isDevMode() && !this._isTestEnv();
+  }
+
+  /** Whether the code is running in tests. */
+  private _isTestEnv() {
+    return window['__karma__'] || window['jasmine'];
+  }
+
+  private _checkDoctypeIsDefined(): void {
     if (this._document && !this._document.doctype) {
       console.warn(
         'Current document does not have a doctype. This may cause ' +
@@ -51,7 +64,7 @@ export class MatCommonModule {
     }
   }
 
-  private _checkTheme(): void {
+  private _checkThemeIsPresent(): void {
     if (this._document && typeof getComputedStyle === 'function') {
       const testElement = this._document.createElement('div');
 
@@ -74,4 +87,13 @@ export class MatCommonModule {
       this._document.body.removeChild(testElement);
     }
   }
+
+  /** Checks whether HammerJS is available. */
+  _checkHammerIsAvailable(): void {
+    if (this._areChecksEnabled() && !this._hasCheckedHammer && !window['Hammer']) {
+      console.warn(
+        'Could not find HammerJS. Certain Angular Material components may not work correctly.');
+    }
+    this._hasCheckedHammer = true;
+  }
 }
diff --git a/src/lib/core/gestures/gesture-config.ts b/src/lib/core/gestures/gesture-config.ts
index 3172f71d835f..2299daede94f 100644
--- a/src/lib/core/gestures/gesture-config.ts
+++ b/src/lib/core/gestures/gesture-config.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, isDevMode} from '@angular/core';
+import {Injectable, Optional} from '@angular/core';
 import {HammerGestureConfig} from '@angular/platform-browser';
-import {HammerStatic, HammerInstance, Recognizer, RecognizerStatic} from './gesture-annotations';
+import {MatCommonModule} from '../common-behaviors/common-module';
+import {HammerInstance, HammerStatic, Recognizer, RecognizerStatic} from './gesture-annotations';
 
 /* Adjusts configuration of our gesture library, Hammer. */
 @Injectable()
@@ -25,14 +26,10 @@ export class GestureConfig extends HammerGestureConfig {
     'slideleft'
   ] : [];
 
-  constructor() {
+  constructor(@Optional() commonModule?: MatCommonModule) {
     super();
-
-    if (!this._hammer && isDevMode()) {
-      console.warn(
-        'Could not find HammerJS. Certain Angular Material ' +
-        'components may not work correctly.'
-      );
+    if (commonModule) {
+      commonModule._checkHammerIsAvailable();
     }
   }
 

From cc4fc11071aea71958a974e635441440b7e8c8cc Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:27:21 +0100
Subject: [PATCH 411/575] fix(dialog): don't block other dialogs from opening
 while animating (#8051)

The behavior where we don't allow new dialogs to be opened while a dialog is animating was introduced initially in #5769 to avoid issues where the user might open multiple dialogs by accident if they press enter one too many times. This is problematic because it also means that the consumer is blocked from opening dialogs for certain 300ms intervals. These changes approach the issue differently by moving focus onto the dialog container immediately while it's animating.

Fixes #6560.
---
 src/lib/dialog/dialog-container.ts | 18 ++++++------------
 src/lib/dialog/dialog-ref.ts       |  5 -----
 src/lib/dialog/dialog.ts           | 11 ++---------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index cca487d49a94..5753f2d57169 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -100,9 +100,6 @@ export class MatDialogContainer extends BasePortalOutlet {
   /** ID of the element that should be considered as the dialog's label. */
   _ariaLabelledBy: string | null = null;
 
-  /** Whether the container is currently mid-animation. */
-  _isAnimating = false;
-
   constructor(
     private _elementRef: ElementRef,
     private _focusTrapFactory: FocusTrapFactory,
@@ -147,13 +144,7 @@ export class MatDialogContainer extends BasePortalOutlet {
     // If were to attempt to focus immediately, then the content of the dialog would not yet be
     // ready in instances where change detection has to run first. To deal with this, we simply
     // wait for the microtask queue to be empty.
-    this._focusTrap.focusInitialElementWhenReady().then(hasMovedFocus => {
-      // If we didn't find any focusable elements inside the dialog, focus the
-      // container so the user can't tab into other elements behind it.
-      if (!hasMovedFocus) {
-        this._elementRef.nativeElement.focus();
-      }
-    });
+    this._focusTrap.focusInitialElementWhenReady();
   }
 
   /** Restores focus to the element that was focused before the dialog opened. */
@@ -174,6 +165,11 @@ export class MatDialogContainer extends BasePortalOutlet {
   private _savePreviouslyFocusedElement() {
     if (this._document) {
       this._elementFocusedBeforeDialogWasOpened = this._document.activeElement as HTMLElement;
+
+      // Move focus onto the dialog immediately in order to prevent the user from accidentally
+      // opening multiple dialogs at the same time. Needs to be async, because the element
+      // may not be focusable immediately.
+      Promise.resolve().then(() => this._elementRef.nativeElement.focus());
     }
   }
 
@@ -186,12 +182,10 @@ export class MatDialogContainer extends BasePortalOutlet {
     }
 
     this._animationStateChanged.emit(event);
-    this._isAnimating = false;
   }
 
   /** Callback, invoked when an animation on the host starts. */
   _onAnimationStart(event: AnimationEvent) {
-    this._isAnimating = true;
     this._animationStateChanged.emit(event);
   }
 
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index c169de0f8fca..76e22a0e8ae2 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -161,11 +161,6 @@ export class MatDialogRef<T> {
     return this;
   }
 
-  /** Returns whether the dialog is animating. */
-  _isAnimating(): boolean {
-    return this._containerInstance._isAnimating;
-  }
-
   /** Fetches the position strategy object from the overlay ref. */
   private _getPositionStrategy(): GlobalPositionStrategy {
     return this._overlayRef.getConfig().positionStrategy as GlobalPositionStrategy;
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 8c3047a0146d..1dc4cbd9b484 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -117,13 +117,6 @@ export class MatDialog {
   open<T, D = any>(componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
           config?: MatDialogConfig<D>): MatDialogRef<T> {
 
-    const inProgressDialog = this.openDialogs.find(dialog => dialog._isAnimating());
-
-    // If there's a dialog that is in the process of being opened, return it instead.
-    if (inProgressDialog) {
-      return inProgressDialog;
-    }
-
     config = _applyConfigDefaults(config);
 
     if (config.id && this.getDialogById(config.id)) {
@@ -133,7 +126,7 @@ export class MatDialog {
     const overlayRef = this._createOverlay(config);
     const dialogContainer = this._attachDialogContainer(overlayRef, config);
     const dialogRef =
-        this._attachDialogContent(componentOrTemplateRef, dialogContainer, overlayRef, config);
+        this._attachDialogContent<T>(componentOrTemplateRef, dialogContainer, overlayRef, config);
 
     this.openDialogs.push(dialogRef);
     dialogRef.afterClosed().subscribe(() => this._removeOpenDialog(dialogRef));
@@ -253,7 +246,7 @@ export class MatDialog {
           <any>{ $implicit: config.data, dialogRef }));
     } else {
       const injector = this._createInjector<T>(config, dialogRef, dialogContainer);
-      const contentRef = dialogContainer.attachComponentPortal(
+      const contentRef = dialogContainer.attachComponentPortal<T>(
           new ComponentPortal(componentOrTemplateRef, undefined, injector));
       dialogRef.componentInstance = contentRef.instance;
     }

From 58627c48283113669ba933436525f718f1d4f781 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 1 Nov 2017 20:29:19 -0700
Subject: [PATCH 412/575] fix(table): empty string should be sorted right
 (#8011)

* fix(table): empty string should be sorted right

* newline
---
 src/lib/table/table-data-source.ts |  9 ++++++++-
 src/lib/table/table.spec.ts        | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
index 5f60b06444ad..98fbd4b82baa 100644
--- a/src/lib/table/table-data-source.ts
+++ b/src/lib/table/table-data-source.ts
@@ -88,7 +88,14 @@ export class MatTableDataSource<T> implements DataSource<T> {
    * @param sortHeaderId The name of the column that represents the data.
    */
   sortingDataAccessor = (data: T, sortHeaderId: string): string|number => {
-    const value: number|string = data[sortHeaderId];
+    const value: any = data[sortHeaderId];
+
+    // If the value is a string and only whitespace, return the value.
+    // Otherwise +value will convert it to 0.
+    if (typeof value === 'string' && !value.trim()) {
+      return value;
+    }
+
     return isNaN(+value) ? value : +value;
   }
 
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index 4296127c80b2..b4b398f3230e 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -187,6 +187,21 @@ describe('MatTable', () => {
       ]);
     });
 
+    it('should by default correctly sort an empty string', () => {
+      // Activate column A sort
+      dataSource.data[0].a = ' ';
+      component.sort.sort(component.sortHeader);
+      fixture.detectChanges();
+
+      // Expect that empty string row comes before the other values
+      expectTableToMatchContent(tableElement, [
+        ['Column A\xa0Sorted by a ascending', 'Column B', 'Column C'],
+        ['', 'b_1', 'c_1'],
+        ['a_2', 'b_2', 'c_2'],
+        ['a_3', 'b_3', 'c_3'],
+      ]);
+    });
+
     it('should be able to page the table contents', fakeAsync(() => {
       // Add 100 rows, should only display first 5 since page length is 5
       for (let i = 0; i < 100; i++) {

From 1547a7739780379cf761555e7c4be508e66e921f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:29:48 +0100
Subject: [PATCH 413/575] chore: remove unused directionality provider (#7998)

Removes the `DIRECTIONALITY_PROVIDER` since it isn't being used anywhere. This seems to be a remnant of the old approach to dealing with directionality.
---
 src/cdk/bidi/directionality.ts | 15 ---------------
 src/cdk/bidi/public-api.ts     |  8 +-------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/cdk/bidi/directionality.ts b/src/cdk/bidi/directionality.ts
index 45d208df22ff..8bb96ed61337 100644
--- a/src/cdk/bidi/directionality.ts
+++ b/src/cdk/bidi/directionality.ts
@@ -10,11 +10,9 @@ import {
   EventEmitter,
   Injectable,
   Optional,
-  SkipSelf,
   Inject,
   InjectionToken,
 } from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
 
 
 export type Direction = 'ltr' | 'rtl';
@@ -55,16 +53,3 @@ export class Directionality {
     }
   }
 }
-
-/** @docs-private */
-export function DIRECTIONALITY_PROVIDER_FACTORY(parentDirectionality, _document) {
-  return parentDirectionality || new Directionality(_document);
-}
-
-/** @docs-private */
-export const DIRECTIONALITY_PROVIDER = {
-  // If there is already a Directionality available, use that. Otherwise, provide a new one.
-  provide: Directionality,
-  deps: [[new Optional(), new SkipSelf(), Directionality], [new Optional(), DOCUMENT]],
-  useFactory: DIRECTIONALITY_PROVIDER_FACTORY
-};
diff --git a/src/cdk/bidi/public-api.ts b/src/cdk/bidi/public-api.ts
index a26b28a4e190..b3da3c0b0b67 100644
--- a/src/cdk/bidi/public-api.ts
+++ b/src/cdk/bidi/public-api.ts
@@ -6,13 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {
-  Directionality,
-  DIRECTIONALITY_PROVIDER_FACTORY,
-  DIRECTIONALITY_PROVIDER,
-  DIR_DOCUMENT,
-  Direction,
-} from './directionality';
+export {Directionality, DIR_DOCUMENT, Direction} from './directionality';
 export {Dir} from './dir';
 export * from './bidi-module';
 

From eaa4a3666849affe04d912620b35f07be32b0f19 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 2 Nov 2017 04:30:17 +0100
Subject: [PATCH 414/575] fix: user-select mixin ignores value (#7992)

* Fixes that the `$value` parameter for the `user-select` mixin from core is ignored.
---
 src/lib/core/style/_vendor-prefixes.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/core/style/_vendor-prefixes.scss b/src/lib/core/style/_vendor-prefixes.scss
index 0eaf254033ec..196e99ce40f0 100644
--- a/src/lib/core/style/_vendor-prefixes.scss
+++ b/src/lib/core/style/_vendor-prefixes.scss
@@ -1,9 +1,9 @@
 /* stylelint-disable material/no-prefixes */
 @mixin user-select($value) {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
+  -webkit-user-select: $value;
+  -moz-user-select: $value;
+  -ms-user-select: $value;
+  user-select: $value;
 }
 
 @mixin input-placeholder {

From c8df2c16d724637a5040cb779c83f5bc09142af3 Mon Sep 17 00:00:00 2001
From: Jeffrey Bosch <Jefiozie@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:30:45 +0100
Subject: [PATCH 415/575] feat(sort): if provider exists provider one,
 otherwise new one (#7988)

* feat(sort): if provider exists provider one, otherwise new one

* fix(sort): added provider in module
---
 src/lib/sort/sort-header-intl.ts | 15 ++++++++++++++-
 src/lib/sort/sort-module.ts      |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/lib/sort/sort-header-intl.ts b/src/lib/sort/sort-header-intl.ts
index 38be337a1373..8dee33142340 100644
--- a/src/lib/sort/sort-header-intl.ts
+++ b/src/lib/sort/sort-header-intl.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
+import {Injectable, SkipSelf, Optional} from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 import {SortDirection} from './sort-direction';
 
@@ -32,3 +32,16 @@ export class MatSortHeaderIntl {
     return `Sorted by ${id} ${direction == 'asc' ? 'ascending' : 'descending'}`;
   }
 }
+/** @docs-private */
+export function MAT_SORT_HEADER_INTL_PROVIDER_FACTORY(parentIntl: MatSortHeaderIntl) {
+  return parentIntl || new MatSortHeaderIntl();
+}
+
+/** @docs-private */
+export const MAT_SORT_HEADER_INTL_PROVIDER = {
+  // If there is already an MatSortHeaderIntl available, use that. Otherwise, provide a new one.
+  provide: MatSortHeaderIntl,
+  deps: [[new Optional(), new SkipSelf(), MatSortHeaderIntl]],
+  useFactory: MAT_SORT_HEADER_INTL_PROVIDER_FACTORY
+};
+
diff --git a/src/lib/sort/sort-module.ts b/src/lib/sort/sort-module.ts
index 0d3941a33a9b..dc8151dda729 100644
--- a/src/lib/sort/sort-module.ts
+++ b/src/lib/sort/sort-module.ts
@@ -9,7 +9,7 @@
 import {NgModule} from '@angular/core';
 import {MatSortHeader} from './sort-header';
 import {MatSort} from './sort';
-import {MatSortHeaderIntl} from './sort-header-intl';
+import {MAT_SORT_HEADER_INTL_PROVIDER} from './sort-header-intl';
 import {CommonModule} from '@angular/common';
 
 
@@ -17,6 +17,6 @@ import {CommonModule} from '@angular/common';
   imports: [CommonModule],
   exports: [MatSort, MatSortHeader],
   declarations: [MatSort, MatSortHeader],
-  providers: [MatSortHeaderIntl]
+  providers: [MAT_SORT_HEADER_INTL_PROVIDER]
 })
 export class MatSortModule {}

From 816866738a460c32de0fecef2f140507b66bb86f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:31:14 +0100
Subject: [PATCH 416/575] fix(chips): programmatically selected chip stealing
 focus (#7978)

Currently chips that are selected programmatically (e.g. by setting the of `ngModel`) will moves focus to themselves, causing the page the scroll down. This can be observed in the demo app where the bottom chip instances have a preselected value which shifts focus to the bottom. These changes fix the issue by only moving focus if the selection was a result of a user interaction.
---
 src/lib/chips/chip-list.spec.ts | 11 +++++++++++
 src/lib/chips/chip-list.ts      | 10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 2ac30feb9287..5f006e427acc 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -577,6 +577,17 @@ describe('MatChipList', () => {
         expect(falsyFixture.componentInstance.chips.first.selected)
           .toBe(true, 'Expected first option to be selected');
       });
+
+      it('should not focus the active chip when the value is set programmatically', () => {
+        const chipArray = fixture.componentInstance.chips.toArray();
+
+        spyOn(chipArray[4], 'focus').and.callThrough();
+
+        fixture.componentInstance.control.setValue('chips-4');
+        fixture.detectChanges();
+
+        expect(chipArray[4].focus).not.toHaveBeenCalled();
+      });
     });
 
     describe('multiple selection', () => {
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index e8a4d67c8e7f..a0a94d46164b 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -527,7 +527,6 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   private _isInputEmpty(element: HTMLElement): boolean {
     if (element && element.nodeName.toLowerCase() === 'input') {
       let input = element as HTMLInputElement;
-
       return !input.value;
     }
 
@@ -547,7 +546,14 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
       // Shift focus to the active item. Note that we shouldn't do this in multiple
       // mode, because we don't know what chip the user interacted with last.
       if (correspondingChip) {
-        this._keyManager.setActiveItem(this.chips.toArray().indexOf(correspondingChip));
+        const correspondingChipIndex = this.chips.toArray().indexOf(correspondingChip);
+
+        if (isUserInput) {
+          this._keyManager.setActiveItem(correspondingChipIndex);
+        } else {
+          this._keyManager.updateActiveItemIndex(correspondingChipIndex);
+        }
+
       }
     }
   }

From ff7a13b053bf7b6d6d404eb6064f34eee7b7a7e5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:31:40 +0100
Subject: [PATCH 417/575] perf(focus-monitor): use passive touch listener
 (#7957)

The `FocusMonitor` works by binding a `touchstart` (as well as some other events) listener to the `document` in order to keep track of focus. These changes make the `touchstart` listener `passive`, which means that on supported browsers it won't block rendering and should make scrolling smoother.
---
 src/cdk/a11y/focus-monitor.spec.ts            |  4 ++--
 src/cdk/a11y/focus-monitor.ts                 |  9 +++++---
 src/cdk/platform/features.ts                  | 21 +++++++++++++++++++
 .../focus-origin/focus-origin-demo.scss       |  4 ++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts
index 41370ab208ce..693ca9e958c6 100644
--- a/src/cdk/a11y/focus-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor.spec.ts
@@ -80,7 +80,7 @@ describe('FocusMonitor', () => {
 
   it('should detect focus via touch', fakeAsync(() => {
     // Simulate focus via touch.
-    dispatchMouseEvent(buttonElement, 'touchstart');
+    dispatchFakeEvent(buttonElement, 'touchstart');
     buttonElement.focus();
     fixture.detectChanges();
     tick(TOUCH_BUFFER_MS);
@@ -262,7 +262,7 @@ describe('cdkMonitorFocus', () => {
 
     it('should detect focus via touch', fakeAsync(() => {
       // Simulate focus via touch.
-      dispatchMouseEvent(buttonElement, 'touchstart');
+      dispatchFakeEvent(buttonElement, 'touchstart');
       buttonElement.focus();
       fixture.detectChanges();
       tick(TOUCH_BUFFER_MS);
diff --git a/src/cdk/a11y/focus-monitor.ts b/src/cdk/a11y/focus-monitor.ts
index 8d63982b67cc..a1d34a7ff988 100644
--- a/src/cdk/a11y/focus-monitor.ts
+++ b/src/cdk/a11y/focus-monitor.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Platform} from '@angular/cdk/platform';
+import {Platform, supportsPassiveEventListeners} from '@angular/cdk/platform';
 import {
   Directive,
   ElementRef,
@@ -168,13 +168,16 @@ export class FocusMonitor {
     // When the touchstart event fires the focus event is not yet in the event queue. This means
     // we can't rely on the trick used above (setting timeout of 0ms). Instead we wait 650ms to
     // see if a focus happens.
-    document.addEventListener('touchstart', (event: Event) => {
+    document.addEventListener('touchstart', (event: TouchEvent) => {
       if (this._touchTimeout != null) {
         clearTimeout(this._touchTimeout);
       }
       this._lastTouchTarget = event.target;
       this._touchTimeout = setTimeout(() => this._lastTouchTarget = null, TOUCH_BUFFER_MS);
-    }, true);
+
+      // Note that we need to cast the event options to `any`, because at the time of writing
+      // (TypeScript 2.5), the built-in types don't support the `addEventListener` options param.
+    }, supportsPassiveEventListeners() ? ({passive: true, capture: true} as any) : true);
 
     // Make a note of when the window regains focus, so we can restore the origin info for the
     // focused element.
diff --git a/src/cdk/platform/features.ts b/src/cdk/platform/features.ts
index b6b82c3636b4..3ea2dad061d7 100644
--- a/src/cdk/platform/features.ts
+++ b/src/cdk/platform/features.ts
@@ -6,6 +6,27 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+/** Cached result of whether the user's browser supports passive event listeners. */
+let supportsPassiveEvents: boolean;
+
+/**
+ * Checks whether the user's browser supports passive event listeners.
+ * See: https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md
+ */
+export function supportsPassiveEventListeners(): boolean {
+  if (supportsPassiveEvents == null) {
+    try {
+      window.addEventListener('test', null!, Object.defineProperty({}, 'passive', {
+        get: () => supportsPassiveEvents = true
+      }));
+    } finally {
+      supportsPassiveEvents = supportsPassiveEvents || false;
+    }
+  }
+
+  return supportsPassiveEvents;
+}
+
 /** Cached result Set of input types support by the current browser. */
 let supportedInputTypes: Set<string>;
 
diff --git a/src/demo-app/focus-origin/focus-origin-demo.scss b/src/demo-app/focus-origin/focus-origin-demo.scss
index ddfd64de6bb3..f972dda6e39a 100644
--- a/src/demo-app/focus-origin/focus-origin-demo.scss
+++ b/src/demo-app/focus-origin/focus-origin-demo.scss
@@ -1,3 +1,7 @@
+.demo-focusable {
+  border: 2px solid transparent;
+}
+
 .demo-focusable.cdk-focused {
   border: 2px solid red;
 }

From 0d6d9cceb01f07edb1f4a686ca9d750bb08acb5b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:31:53 +0100
Subject: [PATCH 418/575] fix(viewport-ruler): incorrectly caching viewport
 size (#7951)

* Currently the `ViewportRuler` caches the `ClientRect` of the `document.documentElement` which is only used for determining the scroll position and is being updated on demand anyway. These changes switch to caching the `innerWidth` and `innerHeight` which was the original intent.
* Adds a `getViewportSize` method that returns the cached viewport width and height. The reasoning is that for all of the cases where we were using `getViewportRect`, we were only taking the `width` and `height`. `getViewportSize` helps us avoid the overhead from determining the `top`, `bottom`, `left` and `right` via the scroll position.
---
 .../position/connected-position-strategy.ts   | 16 +++---
 .../scroll/block-scroll-strategy.spec.ts      | 25 +++------
 .../overlay/scroll/block-scroll-strategy.ts   |  2 +-
 src/cdk/scrolling/viewport-ruler.spec.ts      | 10 ++--
 src/cdk/scrolling/viewport-ruler.ts           | 52 ++++++++-----------
 src/cdk/testing/fake-viewport-ruler.ts        |  4 ++
 src/lib/select/select.ts                      |  8 +--
 7 files changed, 53 insertions(+), 64 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index eb08712ba797..10dcbdfe4320 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -122,8 +122,8 @@ export class ConnectedPositionStrategy implements PositionStrategy {
     const originRect = this._origin.getBoundingClientRect();
     const overlayRect = element.getBoundingClientRect();
 
-    // We use the viewport rect to determine whether a position would go off-screen.
-    const viewportRect = this._viewportRuler.getViewportRect();
+    // We use the viewport size to determine whether a position would go off-screen.
+    const viewportSize = this._viewportRuler.getViewportSize();
 
     // Fallback point if none of the fallbacks fit into the viewport.
     let fallbackPoint: OverlayPoint | undefined;
@@ -135,7 +135,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
       // Get the (x, y) point of connection on the origin, and then use that to get the
       // (top, left) coordinate for the overlay at `pos`.
       let originPoint = this._getOriginConnectionPoint(originRect, pos);
-      let overlayPoint = this._getOverlayPoint(originPoint, overlayRect, viewportRect, pos);
+      let overlayPoint = this._getOverlayPoint(originPoint, overlayRect, viewportSize, pos);
 
       // If the overlay in the calculated position fits on-screen, put it there and we're done.
       if (overlayPoint.fitsInViewport) {
@@ -169,11 +169,11 @@ export class ConnectedPositionStrategy implements PositionStrategy {
 
     const originRect = this._origin.getBoundingClientRect();
     const overlayRect = this._pane.getBoundingClientRect();
-    const viewportRect = this._viewportRuler.getViewportRect();
+    const viewportSize = this._viewportRuler.getViewportSize();
     const lastPosition = this._lastConnectedPosition || this._preferredPositions[0];
 
     let originPoint = this._getOriginConnectionPoint(originRect, lastPosition);
-    let overlayPoint = this._getOverlayPoint(originPoint, overlayRect, viewportRect, lastPosition);
+    let overlayPoint = this._getOverlayPoint(originPoint, overlayRect, viewportSize, lastPosition);
     this._setElementPosition(this._pane, overlayRect, overlayPoint, lastPosition);
   }
 
@@ -281,7 +281,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   private _getOverlayPoint(
       originPoint: Point,
       overlayRect: ClientRect,
-      viewportRect: ClientRect,
+      viewportSize: {width: number; height: number},
       pos: ConnectionPositionPair): OverlayPoint {
     // Calculate the (overlayStartX, overlayStartY), the start of the potential overlay position
     // relative to the origin point.
@@ -311,9 +311,9 @@ export class ConnectedPositionStrategy implements PositionStrategy {
 
     // How much the overlay would overflow at this position, on each side.
     let leftOverflow = 0 - x;
-    let rightOverflow = (x + overlayRect.width) - viewportRect.width;
+    let rightOverflow = (x + overlayRect.width) - viewportSize.width;
     let topOverflow = 0 - y;
-    let bottomOverflow = (y + overlayRect.height) - viewportRect.height;
+    let bottomOverflow = (y + overlayRect.height) - viewportSize.height;
 
     // Visible parts of the element on each axis.
     let visibleWidth = this._subtractOverflows(overlayRect.width, leftOverflow, rightOverflow);
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
index 6126e3a3b8f2..60a459609855 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
@@ -39,12 +39,12 @@ describe('BlockScrollStrategy', () => {
   afterEach(inject([OverlayContainer], (container: OverlayContainer) => {
     overlayRef.dispose();
     document.body.removeChild(forceScrollElement);
-    setScrollPosition(0, 0);
+    window.scroll(0, 0);
     container.getContainerElement().parentNode!.removeChild(container.getContainerElement());
   }));
 
   it('should toggle scroll blocking along the y axis', skipIOS(() => {
-    setScrollPosition(0, 100);
+    window.scroll(0, 100);
     expect(viewport.getViewportScrollPosition().top)
         .toBe(100, 'Expected viewport to be scrollable initially.');
 
@@ -52,7 +52,7 @@ describe('BlockScrollStrategy', () => {
     expect(document.documentElement.style.top)
         .toBe('-100px', 'Expected <html> element to be offset by the previous scroll amount.');
 
-    setScrollPosition(0, 300);
+    window.scroll(0, 300);
     expect(viewport.getViewportScrollPosition().top)
         .toBe(100, 'Expected the viewport not to scroll.');
 
@@ -60,7 +60,7 @@ describe('BlockScrollStrategy', () => {
     expect(viewport.getViewportScrollPosition().top)
         .toBe(100, 'Expected old scroll position to have bee restored after disabling.');
 
-    setScrollPosition(0, 300);
+    window.scroll(0, 300);
     expect(viewport.getViewportScrollPosition().top)
         .toBe(300, 'Expected user to be able to scroll after disabling.');
   }));
@@ -70,7 +70,7 @@ describe('BlockScrollStrategy', () => {
     forceScrollElement.style.height = '100px';
     forceScrollElement.style.width = '3000px';
 
-    setScrollPosition(100, 0);
+    window.scroll(100, 0);
     expect(viewport.getViewportScrollPosition().left)
         .toBe(100, 'Expected viewport to be scrollable initially.');
 
@@ -78,7 +78,7 @@ describe('BlockScrollStrategy', () => {
     expect(document.documentElement.style.left)
         .toBe('-100px', 'Expected <html> element to be offset by the previous scroll amount.');
 
-    setScrollPosition(300, 0);
+    window.scroll(300, 0);
     expect(viewport.getViewportScrollPosition().left)
         .toBe(100, 'Expected the viewport not to scroll.');
 
@@ -86,7 +86,7 @@ describe('BlockScrollStrategy', () => {
     expect(viewport.getViewportScrollPosition().left)
         .toBe(100, 'Expected old scroll position to have bee restored after disabling.');
 
-    setScrollPosition(300, 0);
+    window.scroll(300, 0);
     expect(viewport.getViewportScrollPosition().left)
         .toBe(300, 'Expected user to be able to scroll after disabling.');
   }));
@@ -163,7 +163,6 @@ describe('BlockScrollStrategy', () => {
    * tests unusable. For example, something as basic as the following won't work:
    * ```
    * window.scroll(0, 100);
-   * viewport._cacheViewportGeometry();
    * expect(viewport.getViewportScrollPosition().top).toBe(100);
    * ```
    * @param spec Test to be executed or skipped.
@@ -176,16 +175,6 @@ describe('BlockScrollStrategy', () => {
     };
   }
 
-  /**
-   * Scrolls the viewport and clears the cache.
-   * @param x Amount to scroll along the x axis.
-   * @param y Amount to scroll along the y axis.
-   */
-  function setScrollPosition(x: number, y: number) {
-    window.scroll(x, y);
-    viewport._cacheViewportGeometry();
-  }
-
 });
 
 
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.ts b/src/cdk/overlay/scroll/block-scroll-strategy.ts
index b828a96b97b4..68e74f04762e 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.ts
@@ -76,7 +76,7 @@ export class BlockScrollStrategy implements ScrollStrategy {
     }
 
     const body = document.body;
-    const viewport = this._viewportRuler.getViewportRect();
+    const viewport = this._viewportRuler.getViewportSize();
     return body.scrollHeight > viewport.height || body.scrollWidth > viewport.width;
   }
 }
diff --git a/src/cdk/scrolling/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts
index 678e9fb116b9..78546a5489dd 100644
--- a/src/cdk/scrolling/viewport-ruler.spec.ts
+++ b/src/cdk/scrolling/viewport-ruler.spec.ts
@@ -37,6 +37,12 @@ describe('ViewportRuler', () => {
     ruler.ngOnDestroy();
   });
 
+  it('should get the viewport size', () => {
+    let size = ruler.getViewportSize();
+    expect(size.width).toBe(window.innerWidth);
+    expect(size.height).toBe(window.innerHeight);
+  });
+
   it('should get the viewport bounds when the page is not scrolled', () => {
     let bounds = ruler.getViewportRect();
     expect(bounds.top).toBe(0);
@@ -49,8 +55,6 @@ describe('ViewportRuler', () => {
     document.body.appendChild(veryLargeElement);
 
     scrollTo(1500, 2000);
-    // Force an update of the cached viewport geometries because IE11 emits the scroll event later.
-    ruler._cacheViewportGeometry();
 
     let bounds = ruler.getViewportRect();
 
@@ -87,8 +91,6 @@ describe('ViewportRuler', () => {
     document.body.appendChild(veryLargeElement);
 
     scrollTo(1500, 2000);
-    // Force an update of the cached viewport geometries because IE11 emits the scroll event later.
-    ruler._cacheViewportGeometry();
 
     // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
     // body causes karma's iframe for the test to stretch to fit that content once we attempt to
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index a2e90e75ff2b..a1c8435505c4 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -24,9 +24,8 @@ export const DEFAULT_RESIZE_TIME = 20;
  */
 @Injectable()
 export class ViewportRuler implements OnDestroy {
-
-  /** Cached document client rectangle. */
-  private _documentRect?: ClientRect;
+  /** Cached viewport dimensions. */
+  private _viewportSize: {width: number; height: number};
 
   /** Stream of viewport change events. */
   private _change: Observable<Event>;
@@ -39,21 +38,24 @@ export class ViewportRuler implements OnDestroy {
       return merge<Event>(fromEvent(window, 'resize'), fromEvent(window, 'orientationchange'));
     }) : observableOf();
 
-    this._invalidateCache = this.change().subscribe(() => this._cacheViewportGeometry());
+    this._invalidateCache = this.change().subscribe(() => this._updateViewportSize());
   }
 
   ngOnDestroy() {
     this._invalidateCache.unsubscribe();
   }
 
-  /** Gets a ClientRect for the viewport's bounds. */
-  getViewportRect(documentRect: ClientRect | undefined = this._documentRect): ClientRect {
-    // Cache the document bounding rect so that we don't recompute it for multiple calls.
-    if (!documentRect) {
-      this._cacheViewportGeometry();
-      documentRect = this._documentRect;
+  /** Returns the viewport's width and height. */
+  getViewportSize(): Readonly<{width: number, height: number}> {
+    if (!this._viewportSize) {
+      this._updateViewportSize();
     }
 
+    return {width: this._viewportSize.width, height: this._viewportSize.height};
+  }
+
+  /** Gets a ClientRect for the viewport's bounds. */
+  getViewportRect(): ClientRect {
     // Use the document element's bounding rect rather than the window scroll properties
     // (e.g. pageYOffset, scrollY) due to in issue in Chrome and IE where window scroll
     // properties and client coordinates (boundingClientRect, clientX/Y, etc.) are in different
@@ -63,9 +65,8 @@ export class ViewportRuler implements OnDestroy {
     // We use the documentElement instead of the body because, by default (without a css reset)
     // browsers typically give the document body an 8px margin, which is not included in
     // getBoundingClientRect().
-    const scrollPosition = this.getViewportScrollPosition(documentRect);
-    const height = window.innerHeight;
-    const width = window.innerWidth;
+    const scrollPosition = this.getViewportScrollPosition();
+    const {width, height} = this.getViewportSize();
 
     return {
       top: scrollPosition.top,
@@ -77,27 +78,20 @@ export class ViewportRuler implements OnDestroy {
     };
   }
 
-  /**
-   * Gets the (top, left) scroll position of the viewport.
-   * @param documentRect
-   */
-  getViewportScrollPosition(documentRect: ClientRect | undefined = this._documentRect) {
-    // Cache the document bounding rect so that we don't recompute it for multiple calls.
-    if (!documentRect) {
-      this._cacheViewportGeometry();
-      documentRect = this._documentRect;
-    }
-
+  /** Gets the (top, left) scroll position of the viewport. */
+  getViewportScrollPosition() {
     // The top-left-corner of the viewport is determined by the scroll position of the document
     // body, normally just (scrollLeft, scrollTop). However, Chrome and Firefox disagree about
     // whether `document.body` or `document.documentElement` is the scrolled element, so reading
     // `scrollTop` and `scrollLeft` is inconsistent. However, using the bounding rect of
     // `document.documentElement` works consistently, where the `top` and `left` values will
     // equal negative the scroll position.
-    const top = -documentRect!.top || document.body.scrollTop || window.scrollY ||
+    const documentRect = document.documentElement.getBoundingClientRect();
+
+    const top = -documentRect.top || document.body.scrollTop || window.scrollY ||
                  document.documentElement.scrollTop || 0;
 
-    const left = -documentRect!.left || document.body.scrollLeft || window.scrollX ||
+    const left = -documentRect.left || document.body.scrollLeft || window.scrollX ||
                   document.documentElement.scrollLeft || 0;
 
     return {top, left};
@@ -111,9 +105,9 @@ export class ViewportRuler implements OnDestroy {
     return throttleTime > 0 ? this._change.pipe(auditTime(throttleTime)) : this._change;
   }
 
-  /** Caches the latest client rectangle of the document element. */
-  _cacheViewportGeometry() {
-    this._documentRect = document.documentElement.getBoundingClientRect();
+  /** Updates the cached viewport size. */
+  private _updateViewportSize() {
+    this._viewportSize = {width: window.innerWidth, height: window.innerHeight};
   }
 }
 
diff --git a/src/cdk/testing/fake-viewport-ruler.ts b/src/cdk/testing/fake-viewport-ruler.ts
index 644b8ffa310b..267c45fa0623 100644
--- a/src/cdk/testing/fake-viewport-ruler.ts
+++ b/src/cdk/testing/fake-viewport-ruler.ts
@@ -14,6 +14,10 @@ export class FakeViewportRuler {
     };
   }
 
+  getViewportSize() {
+    return {width: 1014, height: 686};
+  }
+
   getViewportScrollPosition() {
     return {top: 0, left: 0};
   }
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index e42a660550d9..e2e608b509e3 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -1013,7 +1013,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   private _calculateOverlayOffsetX(): void {
     const overlayRect = this.overlayDir.overlayRef.overlayElement.getBoundingClientRect();
-    const viewportRect = this._viewportRuler.getViewportRect();
+    const viewportSize = this._viewportRuler.getViewportSize();
     const isRtl = this._isRtl();
     const paddingWidth = this.multiple ? SELECT_MULTIPLE_PANEL_PADDING_X + SELECT_PANEL_PADDING_X :
                                          SELECT_PANEL_PADDING_X * 2;
@@ -1034,7 +1034,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
     // Determine how much the select overflows on each side.
     const leftOverflow = 0 - (overlayRect.left + offsetX - (isRtl ? paddingWidth : 0));
-    const rightOverflow = overlayRect.right + offsetX - viewportRect.width
+    const rightOverflow = overlayRect.right + offsetX - viewportSize.width
                           + (isRtl ? 0 : paddingWidth);
 
     // If the element overflows on either side, reduce the offset to allow it to fit.
@@ -1099,11 +1099,11 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    */
   private _checkOverlayWithinViewport(maxScroll: number): void {
     const itemHeight = this._getItemHeight();
-    const viewportRect = this._viewportRuler.getViewportRect();
+    const viewportSize = this._viewportRuler.getViewportSize();
 
     const topSpaceAvailable = this._triggerRect.top - SELECT_PANEL_VIEWPORT_PADDING;
     const bottomSpaceAvailable =
-        viewportRect.height - this._triggerRect.bottom - SELECT_PANEL_VIEWPORT_PADDING;
+        viewportSize.height - this._triggerRect.bottom - SELECT_PANEL_VIEWPORT_PADDING;
 
     const panelHeightTop = Math.abs(this._offsetY);
     const totalPanelHeight =

From 6fdc2371b014cd1d9058eaae529a6a8f5f96ca55 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:32:06 +0100
Subject: [PATCH 419/575] fix(overlay): emitting to detachments stream when not
 attached (#7944)

Currently the `detachments` stream will emit any time the `detach` or `dispose` methods are called, which doesn't reflect actual detachments. It is something I noticed while looking into #7922.
---
 src/cdk/overlay/overlay-ref.ts  | 12 +++++++++++-
 src/cdk/overlay/overlay.spec.ts | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 0f36b2a0ae72..c5b71dee498f 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -103,6 +103,10 @@ export class OverlayRef implements PortalOutlet {
    * @returns The portal detachment result.
    */
   detach(): any {
+    if (!this.hasAttached()) {
+      return;
+    }
+
     this.detachBackdrop();
 
     // When the overlay is detached, the pane element should disable pointer events.
@@ -133,6 +137,8 @@ export class OverlayRef implements PortalOutlet {
    * Cleans up the overlay from the DOM.
    */
   dispose(): void {
+    const isAttached = this.hasAttached();
+
     if (this._config.positionStrategy) {
       this._config.positionStrategy.dispose();
     }
@@ -145,7 +151,11 @@ export class OverlayRef implements PortalOutlet {
     this._portalOutlet.dispose();
     this._attachments.complete();
     this._backdropClick.complete();
-    this._detachments.next();
+
+    if (isAttached) {
+      this._detachments.next();
+    }
+
     this._detachments.complete();
   }
 
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index d15dd68c5e5f..2ea9ae873fa6 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -177,6 +177,26 @@ describe('Overlay', () => {
     expect(spy).toHaveBeenCalled();
   });
 
+  it('should not emit to the detach stream if the overlay has not been attached', () => {
+    let overlayRef = overlay.create();
+    let spy = jasmine.createSpy('detachments spy');
+
+    overlayRef.detachments().subscribe(spy);
+    overlayRef.detach();
+
+    expect(spy).not.toHaveBeenCalled();
+  });
+
+  it('should not emit to the detach stream on dispose if the overlay was not attached', () => {
+    let overlayRef = overlay.create();
+    let spy = jasmine.createSpy('detachments spy');
+
+    overlayRef.detachments().subscribe(spy);
+    overlayRef.dispose();
+
+    expect(spy).not.toHaveBeenCalled();
+  });
+
   it('should emit the detachment event after the overlay is removed from the DOM', () => {
     let overlayRef = overlay.create();
 

From c0ba25a0e8d6f2f298ed8897b596104d20debc9c Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:32:31 +0100
Subject: [PATCH 420/575] fix(overlay): CloseScrollStrategy not triggering
 change detection on close (#7929)

After some refactoring, the `ScrollDispatcher` no longer dispatches inside the `NgZone`, which caused the `CloseScrollStrategy` to break, because it detaches without triggering change detection. These changes bring the detachment back into the `NgZone`.

Fixes #7922.
---
 .../overlay/scroll/close-scroll-strategy.spec.ts    | 13 ++++++++++++-
 src/cdk/overlay/scroll/close-scroll-strategy.ts     | 13 ++++++++-----
 src/cdk/overlay/scroll/scroll-strategy-options.ts   |  7 ++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
index 57617f6c8bef..503c795e4326 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
@@ -1,5 +1,5 @@
 import {inject, TestBed, async} from '@angular/core/testing';
-import {NgModule, Component} from '@angular/core';
+import {NgModule, Component, NgZone} from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
@@ -59,6 +59,17 @@ describe('CloseScrollStrategy', () => {
     expect(overlayRef.detach).not.toHaveBeenCalled();
   });
 
+  it('should detach inside the NgZone', () => {
+    const spy = jasmine.createSpy('detachment spy');
+    const subscription = overlayRef.detachments().subscribe(() => spy(NgZone.isInAngularZone()));
+
+    overlayRef.attach(componentPortal);
+    scrolledSubject.next();
+
+    expect(spy).toHaveBeenCalledWith(true);
+    subscription.unsubscribe();
+  });
+
 });
 
 
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts
index e7defe7942da..970e3afcebe5 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {NgZone} from '@angular/core';
 import {ScrollStrategy, getMatScrollStrategyAlreadyAttachedError} from './scroll-strategy';
 import {OverlayRef} from '../overlay-ref';
 import {Subscription} from 'rxjs/Subscription';
@@ -19,7 +20,7 @@ export class CloseScrollStrategy implements ScrollStrategy {
   private _scrollSubscription: Subscription|null = null;
   private _overlayRef: OverlayRef;
 
-  constructor(private _scrollDispatcher: ScrollDispatcher) { }
+  constructor(private _scrollDispatcher: ScrollDispatcher, private _ngZone: NgZone) { }
 
   /** Attaches this scroll strategy to an overlay. */
   attach(overlayRef: OverlayRef) {
@@ -34,11 +35,13 @@ export class CloseScrollStrategy implements ScrollStrategy {
   enable() {
     if (!this._scrollSubscription) {
       this._scrollSubscription = this._scrollDispatcher.scrolled(0).subscribe(() => {
-        if (this._overlayRef.hasAttached()) {
-          this._overlayRef.detach();
-        }
+        this._ngZone.run(() => {
+          this.disable();
 
-        this.disable();
+          if (this._overlayRef.hasAttached()) {
+            this._overlayRef.detach();
+          }
+        });
       });
     }
   }
diff --git a/src/cdk/overlay/scroll/scroll-strategy-options.ts b/src/cdk/overlay/scroll/scroll-strategy-options.ts
index 2fb71b1e696a..07473fd51ef4 100644
--- a/src/cdk/overlay/scroll/scroll-strategy-options.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy-options.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
+import {Injectable, NgZone} from '@angular/core';
 import {CloseScrollStrategy} from './close-scroll-strategy';
 import {NoopScrollStrategy} from './noop-scroll-strategy';
 import {BlockScrollStrategy} from './block-scroll-strategy';
@@ -28,13 +28,14 @@ import {
 export class ScrollStrategyOptions {
   constructor(
     private _scrollDispatcher: ScrollDispatcher,
-    private _viewportRuler: ViewportRuler) { }
+    private _viewportRuler: ViewportRuler,
+    private _ngZone: NgZone) { }
 
   /** Do nothing on scroll. */
   noop = () => new NoopScrollStrategy();
 
   /** Close the overlay as soon as the user scrolls. */
-  close = () => new CloseScrollStrategy(this._scrollDispatcher);
+  close = () => new CloseScrollStrategy(this._scrollDispatcher, this._ngZone);
 
   /** Block scrolling. */
   block = () => new BlockScrollStrategy(this._viewportRuler);

From 7c4b3949d54547ef17de412ffd362c3a545f457b Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 1 Nov 2017 20:34:26 -0700
Subject: [PATCH 421/575] feat(table): add access to filtered data in
 MatTableDataSource (#7912)

* feat(table): add access to filtered data in MatTableDataSource

* add more test
---
 src/demo-app/table/table-demo.html | 37 ++++++++++++++++++----
 src/demo-app/table/table-demo.scss | 24 +++++++++++++-
 src/demo-app/table/table-demo.ts   | 51 +++++++++++++++++++++++++++---
 src/lib/table/table-data-source.ts | 14 ++++++--
 src/lib/table/table.spec.ts        |  9 ++++++
 5 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/src/demo-app/table/table-demo.html b/src/demo-app/table/table-demo.html
index 0433ee7f1ad7..2b5cf19f3eb8 100644
--- a/src/demo-app/table/table-demo.html
+++ b/src/demo-app/table/table-demo.html
@@ -214,18 +214,41 @@ <h3> MatTable Using 'When' Rows for Interactive Details</h3>
 <h3>MatTable With MatTableDataSource Example</h3>
 
 <mat-form-field>
-  <input matInput [formControl]="filter">
+  <input matInput #filter placeholder="Filter users">
 </mat-form-field>
 
-<div class="demo-table-container demo-mat-table-example mat-elevation-z4">
+<div class="demo-table-container demo-mat-table-example mat-elevation-z4 mat-table-selectable">
 
   <table-header-demo (shiftColumns)="displayedColumns.push(displayedColumns.shift())"
-                     (toggleColorColumn)="toggleColorColumn()">
+                     (toggleColorColumn)="toggleColorColumn()" *ngIf="selection.isEmpty()">
   </table-header-demo>
+  <div class="example-header example-selection-header"
+       *ngIf="!selection.isEmpty()">
+    {{selection.selected.length}}
+    {{selection.selected.length == 1 ? 'user' : 'users'}}
+    selected
+  </div>
 
   <mat-table [dataSource]="matTableDataSource" [trackBy]="userTrackBy" matSort
              #sortForDataSource="matSort">
 
+    <!-- Checkbox Column -->
+    <ng-container matColumnDef="select">
+      <mat-header-cell *matHeaderCellDef>
+        <mat-checkbox (change)="$event ? masterToggle() : null"
+                      [disabled]="!matTableDataSource.filteredData.length"
+                      [checked]="isMasterToggleChecked()"
+                      [indeterminate]="isMasterToggleIndeterminate()">
+        </mat-checkbox>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let row">
+        <mat-checkbox (click)="$event.stopPropagation()"
+                      (change)="$event ? selection.toggle(row) : null"
+                      [checked]="selection.isSelected(row)">
+        </mat-checkbox>
+      </mat-cell>
+    </ng-container>
+
     <!-- Column Definition: ID -->
     <ng-container cdkColumnDef="userId">
       <mat-header-cell *matHeaderCellDef mat-sort-header> ID </mat-header-cell>
@@ -258,9 +281,11 @@ <h3>MatTable With MatTableDataSource Example</h3>
       <mat-cell *matCellDef="let row" [style.color]="row.color"> {{row.color}} </mat-cell>
     </ng-container>
 
-    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
-    <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
-
+    <mat-header-row *matHeaderRowDef="matTableDataSourceColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: matTableDataSourceColumns;"
+             [class.selected]="selection.isSelected(row)"
+             (click)="selection.toggle(row)">
+    </mat-row>
   </mat-table>
 
   <mat-paginator #paginatorForDataSource
diff --git a/src/demo-app/table/table-demo.scss b/src/demo-app/table/table-demo.scss
index db3bf40507be..073c741b286a 100644
--- a/src/demo-app/table/table-demo.scss
+++ b/src/demo-app/table/table-demo.scss
@@ -73,7 +73,7 @@
   }
 }
 
-  /* Structure so that the table is contained on a card */
+/* Structure so that the table is contained on a card */
 .demo-table-container {
   max-height: 800px;
   display: flex;
@@ -98,6 +98,11 @@
   max-width: 160px;
 }
 
+.mat-column-select {
+  max-width: 48px;
+  overflow: inherit;
+}
+
 /* Progress bar styling */
 .cdk-column-progress {
   &.cdk-cell, &.mat-cell {
@@ -119,3 +124,20 @@
     }
   }
 }
+
+.example-selection-header {
+  height: 64px;
+  background: white;
+  display: flex;
+  align-items: center;
+  padding-left: 24px;
+}
+
+.mat-table-selectable {
+  .mat-row:hover {
+    background: #eeeeee;
+  }
+  .mat-row.selected {
+    background: #f5f5f5;
+  }
+}
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index c10015145426..faa0d978f4ff 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -1,10 +1,14 @@
-import {Component, ViewChild} from '@angular/core';
+import {Component, ElementRef, ViewChild} from '@angular/core';
 import {PeopleDatabase, UserData} from './people-database';
 import {PersonDataSource} from './person-data-source';
 import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 import {DetailRow, PersonDetailDataSource} from './person-detail-data-source';
 import {animate, state, style, transition, trigger} from '@angular/animations';
-import {FormControl} from '@angular/forms';
+import {SelectionModel} from '@angular/cdk/collections';
+import {Observable} from 'rxjs/Observable';
+import 'rxjs/add/operator/distinctUntilChanged';
+import 'rxjs/add/operator/debounceTime';
+import 'rxjs/add/observable/fromEvent';
 
 export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
 
@@ -35,7 +39,10 @@ export class TableDemo {
   highlights = new Set<string>();
   wasExpanded = new Set<UserData>();
 
-  filter = new FormControl();
+  matTableDataSourceColumns = ['select', 'userId', 'userName', 'progress', 'color'];
+  selection = new SelectionModel<UserData>(true, []);
+
+  @ViewChild('filter') filter: ElementRef;
 
   dynamicColumnDefs: any[] = [];
   dynamicColumnIds: string[] = [];
@@ -62,7 +69,6 @@ export class TableDemo {
     };
     this.matTableDataSource.filterPredicate =
         (data: UserData, filter: string) => data.name.indexOf(filter) != -1;
-    this.filter.valueChanges.subscribe(filter => this.matTableDataSource!.filter = filter);
   }
 
   ngAfterViewInit() {
@@ -74,6 +80,43 @@ export class TableDemo {
 
   ngOnInit() {
     this.connect();
+    Observable.fromEvent(this.filter.nativeElement, 'keyup')
+        .debounceTime(150)
+        .distinctUntilChanged()
+        .subscribe(() => {
+          this.paginatorForDataSource.pageIndex = 0;
+          this.matTableDataSource.filter = this.filter.nativeElement.value;
+        });
+  }
+
+  /** Whether all filtered rows are selected. */
+  isAllFilteredRowsSelected() {
+    return this.matTableDataSource.filteredData.every(data => this.selection.isSelected(data));
+  }
+
+  /** Whether the selection it totally matches the filtered rows. */
+  isMasterToggleChecked() {
+    return this.selection.hasValue() &&
+        this.isAllFilteredRowsSelected() &&
+        this.selection.selected.length >= this.matTableDataSource.filteredData.length;
+  }
+
+  /**
+   * Whether there is a selection that doesn't capture all the
+   * filtered rows there are no filtered rows displayed.
+   */
+  isMasterToggleIndeterminate() {
+    return this.selection.hasValue() &&
+        (!this.isAllFilteredRowsSelected() || !this.matTableDataSource.filteredData.length);
+  }
+
+  /** Selects all filtered rows if they are not all selected; otherwise clear selection. */
+  masterToggle() {
+    if (this.isMasterToggleChecked()) {
+      this.selection.clear();
+    } else {
+      this.matTableDataSource.filteredData.forEach(data => this.selection.select(data));
+    }
   }
 
   addDynamicColumnDef() {
diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
index 98fbd4b82baa..f45e427afffc 100644
--- a/src/lib/table/table-data-source.ts
+++ b/src/lib/table/table-data-source.ts
@@ -40,6 +40,14 @@ export class MatTableDataSource<T> implements DataSource<T> {
    */
   _renderChangesSubscription: Subscription;
 
+  /**
+   * The filtered set of data that has been matched by the filter string, or all the data if there
+   * is no filter. Useful for knowing the set of data the table represents.
+   * For example, a 'selectAll()' function would likely want to select the set of filtered data
+   * shown to the user rather than all the data.
+   */
+  filteredData: T[];
+
   /** Array of data that should be rendered by the table, where each object represents one row. */
   set data(data: T[]) { this._data.next(data); }
   get data() { return this._data.value; }
@@ -164,12 +172,12 @@ export class MatTableDataSource<T> implements DataSource<T> {
     // If there is a filter string, filter out data that does not contain it.
     // Each data object is converted to a string using the function defined by filterTermAccessor.
     // May be overriden for customization.
-    const filteredData =
+    this.filteredData =
         !this.filter ? data : data.filter(obj => this.filterPredicate(obj, this.filter));
 
-    if (this.paginator) { this._updatePaginator(filteredData.length); }
+    if (this.paginator) { this._updatePaginator(this.filteredData.length); }
 
-    return filteredData;
+    return this.filteredData;
   }
 
   /**
diff --git a/src/lib/table/table.spec.ts b/src/lib/table/table.spec.ts
index b4b398f3230e..2b2f1e360f63 100644
--- a/src/lib/table/table.spec.ts
+++ b/src/lib/table/table.spec.ts
@@ -102,16 +102,21 @@ describe('MatTable', () => {
       // Change filter to a_1, should match one row
       dataSource.filter = 'a_1';
       fixture.detectChanges();
+      expect(dataSource.filteredData.length).toBe(1);
+      expect(dataSource.filteredData[0]).toBe(dataSource.data[0]);
       expectTableToMatchContent(tableElement, [
         ['Column A', 'Column B', 'Column C'],
         ['a_1', 'b_1', 'c_1'],
       ]);
+
       flushMicrotasks();  // Resolve promise that updates paginator's length
       expect(dataSource.paginator!.length).toBe(1);
 
       // Change filter to '  A_2  ', should match one row (ignores case and whitespace)
       dataSource.filter = '  A_2  ';
       fixture.detectChanges();
+      expect(dataSource.filteredData.length).toBe(1);
+      expect(dataSource.filteredData[0]).toBe(dataSource.data[1]);
       expectTableToMatchContent(tableElement, [
         ['Column A', 'Column B', 'Column C'],
         ['a_2', 'b_2', 'c_2'],
@@ -120,6 +125,10 @@ describe('MatTable', () => {
       // Change filter to empty string, should match all rows
       dataSource.filter = '';
       fixture.detectChanges();
+      expect(dataSource.filteredData.length).toBe(3);
+      expect(dataSource.filteredData[0]).toBe(dataSource.data[0]);
+      expect(dataSource.filteredData[1]).toBe(dataSource.data[1]);
+      expect(dataSource.filteredData[2]).toBe(dataSource.data[2]);
       expectTableToMatchContent(tableElement, [
         ['Column A', 'Column B', 'Column C'],
         ['a_1', 'b_1', 'c_1'],

From ee4915cfca5f839fa2f6c63afcdbcd30a9af71c9 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:34:50 +0100
Subject: [PATCH 422/575] fix(button-toggle): support two-way binding of value
 (#7911)

Adds support for two-way data binding in the `value` property of the button toggle group. This is consistent with other components like `mat-select`.
---
 src/lib/button-toggle/button-toggle.spec.ts | 11 ++++++++++-
 src/lib/button-toggle/button-toggle.ts      |  9 ++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/lib/button-toggle/button-toggle.spec.ts b/src/lib/button-toggle/button-toggle.spec.ts
index 6d67caa7e7df..f6031f5bf983 100644
--- a/src/lib/button-toggle/button-toggle.spec.ts
+++ b/src/lib/button-toggle/button-toggle.spec.ts
@@ -267,6 +267,15 @@ describe('MatButtonToggle without forms', () => {
       expect(groupInstance.selected).toBe(buttonToggleInstances[0]);
     });
 
+    it('should propagate the value change back up via a two-way binding', () => {
+      expect(groupInstance.value).toBeFalsy();
+      buttonToggleLabelElements[0].click();
+      fixture.detectChanges();
+
+      expect(groupInstance.value).toBe('test1');
+      expect(testComponent.groupValue).toBe('test1');
+    });
+
     it('should update the group and toggles when one of the button toggles is clicked', () => {
       expect(groupInstance.value).toBeFalsy();
       buttonToggleLabelElements[0].click();
@@ -618,7 +627,7 @@ describe('MatButtonToggle without forms', () => {
   template: `
   <mat-button-toggle-group [disabled]="isGroupDisabled"
                            [vertical]="isVertical"
-                           [value]="groupValue">
+                           [(value)]="groupValue">
     <mat-button-toggle value="test1">Test1</mat-button-toggle>
     <mat-button-toggle value="test2">Test2</mat-button-toggle>
     <mat-button-toggle value="test3">Test3</mat-button-toggle>
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index 5c958cddc2bb..5ffd12ddfa31 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -128,11 +128,18 @@ export class MatButtonToggleGroup extends _MatButtonToggleGroupMixinBase
   set value(newValue: any) {
     if (this._value != newValue) {
       this._value = newValue;
-
+      this.valueChange.emit(newValue);
       this._updateSelectedButtonToggleFromValue();
     }
   }
 
+  /**
+   * Event that emits whenever the value of the group changes.
+   * Used to facilitate two-way data binding.
+   * @docs-private
+   */
+  @Output() valueChange = new EventEmitter<any>();
+
   /** Whether the toggle group is selected. */
   @Input()
   get selected() {

From 9a05ecdb632fbe91dd74b6d1e937ab9343d24413 Mon Sep 17 00:00:00 2001
From: Jeffrey Bosch <Jefiozie@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:36:26 +0100
Subject: [PATCH 423/575] fix(MatPaginatorIntl): Provide a provider if exists.
 (#7895)

* fix(MatPaginatorIntl): Provide a provider if exists.

If there is already a MatPaginatorIntl provider that one
If not create a new instance.

Closes #7344

* style(paginator): Changed arguments, removed spacing

* style(paginator): Changed argument name.
---
 src/lib/paginator/paginator-intl.ts   | 15 ++++++++++++++-
 src/lib/paginator/paginator-module.ts |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/lib/paginator/paginator-intl.ts b/src/lib/paginator/paginator-intl.ts
index d8e3566c4b30..60c46ddf89fb 100644
--- a/src/lib/paginator/paginator-intl.ts
+++ b/src/lib/paginator/paginator-intl.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
+import {Injectable, SkipSelf, Optional } from '@angular/core';
 import {Subject} from 'rxjs/Subject';
 
 /**
@@ -46,3 +46,16 @@ export class MatPaginatorIntl {
     return `${startIndex + 1} - ${endIndex} of ${length}`;
   }
 }
+
+/** @docs-private */
+export function MAT_PAGINATOR_INTL_PROVIDER_FACTORY(parentIntl: MatPaginatorIntl) {
+  return parentIntl || new MatPaginatorIntl();
+}
+
+/** @docs-private */
+export const MAT_PAGINATOR_INTL_PROVIDER = {
+  // If there is already an MatPaginatorIntl available, use that. Otherwise, provide a new one.
+  provide: MatPaginatorIntl,
+  deps: [[new Optional(), new SkipSelf(), MatPaginatorIntl]],
+  useFactory: MAT_PAGINATOR_INTL_PROVIDER_FACTORY
+};
diff --git a/src/lib/paginator/paginator-module.ts b/src/lib/paginator/paginator-module.ts
index 25eb8f645508..e0b7fd4463ed 100644
--- a/src/lib/paginator/paginator-module.ts
+++ b/src/lib/paginator/paginator-module.ts
@@ -12,7 +12,7 @@ import {MatButtonModule} from '@angular/material/button';
 import {MatSelectModule} from '@angular/material/select';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {MatPaginator} from './paginator';
-import {MatPaginatorIntl} from './paginator-intl';
+import {MAT_PAGINATOR_INTL_PROVIDER} from './paginator-intl';
 
 
 @NgModule({
@@ -24,6 +24,6 @@ import {MatPaginatorIntl} from './paginator-intl';
   ],
   exports: [MatPaginator],
   declarations: [MatPaginator],
-  providers: [MatPaginatorIntl],
+  providers: [MAT_PAGINATOR_INTL_PROVIDER],
 })
 export class MatPaginatorModule {}

From 943395ee5c90e15f68f6ad56bf2209edad4e73e0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:37:30 +0100
Subject: [PATCH 424/575] perf(tabs): avoid repainting while scrolling (#7889)

Along the same lines as #7721, #7719 and #6890 the tab body currently repaints on scroll.
---
 src/lib/tabs/tab-body.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/tabs/tab-body.scss b/src/lib/tabs/tab-body.scss
index a92aaf492e20..1b32d6be6154 100644
--- a/src/lib/tabs/tab-body.scss
+++ b/src/lib/tabs/tab-body.scss
@@ -1,4 +1,8 @@
+@import '../core/style/vendor-prefixes';
+
 .mat-tab-body-content {
+  // Avoids repainting while scrolling.
+  @include backface-visibility(hidden);
   height: 100%;
   overflow: auto;
 

From 8edb416d2602aaafe8139d1f47985a9e1661edf5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 04:38:08 +0100
Subject: [PATCH 425/575] fix(select): support typing to select items on when
 closed (#7885)

Adds support for selecting items on a closed select by typing. This is similar to how the native select works.
---
 src/cdk/a11y/list-key-manager.spec.ts | 12 +++++++
 src/cdk/a11y/list-key-manager.ts      |  7 +++-
 src/lib/select/select.spec.ts         | 40 +++++++++++++++++++++++
 src/lib/select/select.ts              | 46 +++++++++------------------
 4 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index 26b5975d8106..742b93990276 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -255,6 +255,18 @@ describe('Key managers', () => {
         subscription.unsubscribe();
       });
 
+      it('should not emit an event if the item did not change', () => {
+        const spy = jasmine.createSpy('change spy');
+        const subscription = keyManager.change.subscribe(spy);
+
+        keyManager.setActiveItem(2);
+        keyManager.setActiveItem(2);
+
+        expect(spy).toHaveBeenCalledTimes(1);
+
+        subscription.unsubscribe();
+      });
+
     });
 
     describe('programmatic focus', () => {
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index fca032b3dccb..ff54c0d08513 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -100,9 +100,14 @@ export class ListKeyManager<T extends ListKeyManagerOption> {
    * @param index The index of the item to be set as active.
    */
   setActiveItem(index: number): void {
+    const previousIndex = this._activeItemIndex;
+
     this._activeItemIndex = index;
     this._activeItem = this._items.toArray()[index];
-    this.change.next(index);
+
+    if (this._activeItemIndex !== previousIndex) {
+      this.change.next(index);
+    }
   }
 
   /**
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index ccc0b7f3ef67..4a81af1952e7 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -2066,6 +2066,27 @@ describe('MatSelect', () => {
           'Expected value from second option to have been set on the model.');
       }));
 
+      it('should be able to select options by typing on a closed select', fakeAsync(() => {
+        const formControl = fixture.componentInstance.control;
+        const options = fixture.componentInstance.options.toArray();
+
+        expect(formControl.value).toBeFalsy('Expected no initial value.');
+
+        dispatchEvent(select, createKeyboardEvent('keydown', 80, undefined, 'p'));
+        tick(200);
+
+        expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
+        expect(formControl.value).toBe(options[1].value,
+          'Expected value from second option to have been set on the model.');
+
+        dispatchEvent(select, createKeyboardEvent('keydown', 69, undefined, 'e'));
+        tick(200);
+
+        expect(options[5].selected).toBe(true, 'Expected sixth option to be selected.');
+        expect(formControl.value).toBe(options[5].value,
+          'Expected value from sixth option to have been set on the model.');
+      }));
+
       it('should open the panel when pressing the arrow keys on a closed multiple select', () => {
         fixture.destroy();
 
@@ -2086,6 +2107,25 @@ describe('MatSelect', () => {
         expect(event.defaultPrevented).toBe(true, 'Expected default to be prevented.');
       });
 
+      it('should do nothing when typing on a closed multi-select', () => {
+        fixture.destroy();
+
+        const multiFixture = TestBed.createComponent(MultiSelect);
+        const instance = multiFixture.componentInstance;
+
+        multiFixture.detectChanges();
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+
+        const initialValue = instance.control.value;
+
+        expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
+
+        dispatchEvent(select, createKeyboardEvent('keydown', 80, undefined, 'p'));
+
+        expect(instance.select.panelOpen).toBe(false, 'Expected panel to stay closed.');
+        expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
+      });
+
       it('should do nothing if the key manager did not change the active item', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
 
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index e2e608b509e3..0e4e3017b92a 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -524,9 +524,9 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     // `parseInt` ignores the trailing 'px' and converts this to a number.
     this._triggerFontSize = parseInt(getComputedStyle(this.trigger.nativeElement)['font-size']);
 
+    this._panelOpen = true;
     this._calculateOverlayPosition();
     this._highlightCorrectOption();
-    this._panelOpen = true;
     this._changeDetectorRef.markForCheck();
 
     // Set the font size on the panel element once it exists.
@@ -637,11 +637,15 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** Handles keyboard events while the select is closed. */
   private _handleClosedKeydown(event: KeyboardEvent): void {
-    if (event.keyCode === ENTER || event.keyCode === SPACE) {
+    const keyCode = event.keyCode;
+    const isArrowKey = keyCode === DOWN_ARROW || keyCode === UP_ARROW;
+    const isOpenKey = keyCode === ENTER || keyCode === SPACE;
+
+    if (isOpenKey || (this.multiple && isArrowKey)) {
       event.preventDefault(); // prevents the page from scrolling down when pressing space
       this.open();
-    } else if (event.keyCode === UP_ARROW || event.keyCode === DOWN_ARROW) {
-      this._handleClosedArrowKey(event);
+    } else if (!this.multiple) {
+      this._keyManager.onKeydown(event);
     }
   }
 
@@ -813,10 +817,13 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._keyManager = new ActiveDescendantKeyManager<MatOption>(this.options).withTypeAhead();
     this._keyManager.tabOut.pipe(takeUntil(this._destroy)).subscribe(() => this.close());
 
-    this._keyManager.change.pipe(
-      takeUntil(this._destroy),
-      filter(() => this._panelOpen && !!this.panel)
-    ).subscribe(() => this._scrollActiveOptionIntoView());
+    this._keyManager.change.pipe(takeUntil(this._destroy)).subscribe(() => {
+      if (this._panelOpen && this.panel) {
+        this._scrollActiveOptionIntoView();
+      } else if (!this._panelOpen && !this.multiple && this._keyManager.activeItem) {
+        this._keyManager.activeItem._selectViaInteraction();
+      }
+    });
   }
 
   /** Drops current option subscriptions and IDs and resets from scratch. */
@@ -1171,29 +1178,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return `50% ${originY}px 0px`;
   }
 
-  /** Handles the user pressing the arrow keys on a closed select.  */
-  private _handleClosedArrowKey(event: KeyboardEvent): void {
-    if (this._multiple) {
-      event.preventDefault();
-      this.open();
-    } else {
-      const prevActiveItem = this._keyManager.activeItem;
-
-      // Cycle though the select options even when the select is closed,
-      // matching the behavior of the native select element.
-      // TODO(crisbeto): native selects also cycle through the options with left/right arrows,
-      // however the key manager only supports up/down at the moment.
-      this._keyManager.onKeydown(event);
-
-      const currentActiveItem = this._keyManager.activeItem;
-
-      if (currentActiveItem && currentActiveItem !== prevActiveItem) {
-        this._clearSelection();
-        this._setSelectionByValue(currentActiveItem.value, true);
-      }
-    }
-  }
-
   /** Calculates the amount of items in the select. This includes options and group labels. */
   private _getItemCount(): number {
     return this.options.length + this.optionGroups.length;

From dff97274f7b3406f999ce7f5969d0b9239e1fe3e Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Wed, 1 Nov 2017 22:44:58 -0500
Subject: [PATCH 426/575] chore(keycodes): add comma to keycodes and update
 usages (#7852)

---
 src/cdk/keycodes/keycodes.ts                             | 1 +
 src/demo-app/chips/chips-demo.ts                         | 4 +---
 src/lib/chips/chip-input.spec.ts                         | 4 +---
 src/material-examples/chips-input/chips-input-example.ts | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/cdk/keycodes/keycodes.ts b/src/cdk/keycodes/keycodes.ts
index 4b36d51e3484..f8e93d23edbb 100644
--- a/src/cdk/keycodes/keycodes.ts
+++ b/src/cdk/keycodes/keycodes.ts
@@ -24,3 +24,4 @@ export const A = 65;
 export const Z = 90;
 export const ZERO = 48;
 export const NINE = 91;
+export const COMMA = 188;
diff --git a/src/demo-app/chips/chips-demo.ts b/src/demo-app/chips/chips-demo.ts
index ad3620047c67..a6703f1e1fdc 100644
--- a/src/demo-app/chips/chips-demo.ts
+++ b/src/demo-app/chips/chips-demo.ts
@@ -1,9 +1,7 @@
-import {ENTER} from '@angular/cdk/keycodes';
+import {ENTER, COMMA} from '@angular/cdk/keycodes';
 import {Component} from '@angular/core';
 import {MatChipInputEvent} from '@angular/material';
 
-const COMMA = 188;
-
 export interface Person {
   name: string;
 }
diff --git a/src/lib/chips/chip-input.spec.ts b/src/lib/chips/chip-input.spec.ts
index da845439823f..5f43c5b4e8f7 100644
--- a/src/lib/chips/chip-input.spec.ts
+++ b/src/lib/chips/chip-input.spec.ts
@@ -1,5 +1,5 @@
 import {Directionality} from '@angular/cdk/bidi';
-import {ENTER} from '@angular/cdk/keycodes';
+import {ENTER, COMMA} from '@angular/cdk/keycodes';
 import {PlatformModule} from '@angular/cdk/platform';
 import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
@@ -9,8 +9,6 @@ import {MatChipInput, MatChipInputEvent} from './chip-input';
 import {MatChipsModule} from './index';
 
 
-const COMMA = 188;
-
 describe('MatChipInput', () => {
   let fixture: ComponentFixture<any>;
   let testChipInput: TestChipInput;
diff --git a/src/material-examples/chips-input/chips-input-example.ts b/src/material-examples/chips-input/chips-input-example.ts
index 934fdcdc83d3..19ce1dc68eb0 100644
--- a/src/material-examples/chips-input/chips-input-example.ts
+++ b/src/material-examples/chips-input/chips-input-example.ts
@@ -1,8 +1,6 @@
 import {Component} from '@angular/core';
 import {MatChipInputEvent} from '@angular/material';
-import {ENTER} from '@angular/cdk/keycodes';
-
-const COMMA = 188;
+import {ENTER, COMMA} from '@angular/cdk/keycodes';
 
 /**
  * @title Chips with input

From 90fdacf6ad307280190ea334a57d69f3bb898132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Krzewski?= <rafal.krzewski@gmail.com>
Date: Thu, 2 Nov 2017 04:48:21 +0100
Subject: [PATCH 427/575] fix(radio) detect non-direct mat-radio descendants of
 mat-radio-group (#7842)

Fixes #7166
---
 src/lib/radio/radio.spec.ts | 50 +++++++++++++++++++++++++++++++++++++
 src/lib/radio/radio.ts      |  3 ++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/lib/radio/radio.spec.ts b/src/lib/radio/radio.spec.ts
index 88c3b1175a85..aa275181a417 100644
--- a/src/lib/radio/radio.spec.ts
+++ b/src/lib/radio/radio.spec.ts
@@ -18,6 +18,8 @@ describe('MatRadio', () => {
         RadioGroupWithNgModel,
         RadioGroupWithFormControl,
         StandaloneRadioButtons,
+        InterleavedRadioGroup,
+        TranscludingWrapper
       ],
       providers: [
         {provide: ViewportRuler, useClass: FakeViewportRuler}
@@ -666,6 +668,28 @@ describe('MatRadio', () => {
       expect(document.activeElement).toBe(inputEl);
     });
   });
+
+  describe('group interspersed with other tags', () => {
+    let fixture: ComponentFixture<InterleavedRadioGroup>;
+    let groupDebugElement: DebugElement;
+    let groupInstance: MatRadioGroup;
+    let radioDebugElements: DebugElement[];
+    let radioInstances: MatRadioButton[];
+
+    beforeEach(async(() => {
+      fixture = TestBed.createComponent(InterleavedRadioGroup);
+      fixture.detectChanges();
+
+      groupDebugElement = fixture.debugElement.query(By.directive(MatRadioGroup));
+      groupInstance = groupDebugElement.injector.get<MatRadioGroup>(MatRadioGroup);
+      radioDebugElements = fixture.debugElement.queryAll(By.directive(MatRadioButton));
+      radioInstances = radioDebugElements.map(debugEl => debugEl.componentInstance);
+    }));
+
+    it('should initialize selection of radios based on model value', () => {
+      expect(groupInstance.selected).toBe(radioInstances[2]);
+    });
+  });
 });
 
 
@@ -760,3 +784,29 @@ class RadioGroupWithFormControl {
   template: `<mat-radio-button tabindex="-1"></mat-radio-button>`
 })
 class FocusableRadioButton {}
+
+@Component({
+  template: `
+  <mat-radio-group name="group" [(ngModel)]="modelValue">
+    <transcluding-wrapper *ngFor="let option of options">
+      <mat-radio-button [value]="option.value">{{option.label}}</mat-radio-button>
+    </transcluding-wrapper>
+  </mat-radio-group>
+  `
+})
+class InterleavedRadioGroup {
+  modelValue = 'strawberry';
+  options = [
+    {label: 'Vanilla', value: 'vanilla'},
+    {label: 'Chocolate', value: 'chocolate'},
+    {label: 'Strawberry', value: 'strawberry'},
+  ];
+}
+
+@Component({
+  selector: 'transcluding-wrapper',
+  template: `
+    <div><ng-content></ng-content></div>
+  `
+})
+class TranscludingWrapper {}
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 9817815779f8..f72da0d11940 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -128,7 +128,8 @@ export class MatRadioGroup extends _MatRadioGroupMixinBase
   @Output() change: EventEmitter<MatRadioChange> = new EventEmitter<MatRadioChange>();
 
   /** Child radio buttons. */
-  @ContentChildren(forwardRef(() => MatRadioButton)) _radios: QueryList<MatRadioButton>;
+  @ContentChildren(forwardRef(() => MatRadioButton), { descendants: true })
+  _radios: QueryList<MatRadioButton>;
 
   /** Name of the radio button group. All radio buttons inside this group will use this name. */
   @Input()

From 2347f5bf5f851cc053daa6b537aa7a59eeac9fca Mon Sep 17 00:00:00 2001
From: Philip Pham <phillypham@google.com>
Date: Wed, 1 Nov 2017 20:48:56 -0700
Subject: [PATCH 428/575] demo(chips): Set addOnBlur for both inputs (#7812)

It's confusing to only have addOnBlur work for one example.
---
 src/demo-app/chips/chips-demo.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/demo-app/chips/chips-demo.html b/src/demo-app/chips/chips-demo.html
index 6df231e28ee0..3ad365c44110 100644
--- a/src/demo-app/chips/chips-demo.html
+++ b/src/demo-app/chips/chips-demo.html
@@ -58,7 +58,7 @@ <h4>Form Field</h4>
           <input placeholder="New Contributor..."
                  [matChipInputFor]="chipList1"
                  [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-                 [matChipInputAddOnBlur]="false"
+                 [matChipInputAddOnBlur]="addOnBlur"
                  (matChipInputTokenEnd)="add($event)" />
         </mat-chip-list>
       </mat-form-field>

From 55476e2cb96e0a48e4faba07436999caf0d52654 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Wed, 1 Nov 2017 20:51:44 -0700
Subject: [PATCH 429/575] fix(table): throw error when missing row defs (#7751)

* fix(table): throw error when missing row defs

* nit: change conditional
---
 src/cdk/table/table-errors.ts | 17 +++++++++++++----
 src/cdk/table/table.spec.ts   | 21 +++++++++++++++++++++
 src/cdk/table/table.ts        |  5 +++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/cdk/table/table-errors.ts b/src/cdk/table/table-errors.ts
index 7ec1b8c531bc..080250c69beb 100644
--- a/src/cdk/table/table-errors.ts
+++ b/src/cdk/table/table-errors.ts
@@ -12,7 +12,7 @@
  * @docs-private
  */
 export function getTableUnknownColumnError(id: string) {
-  return Error(`cdk-table: Could not find column with id "${id}".`);
+  return Error(`Could not find column with id "${id}".`);
 }
 
 /**
@@ -20,7 +20,7 @@ export function getTableUnknownColumnError(id: string) {
  * @docs-private
  */
 export function getTableDuplicateColumnNameError(name: string) {
-  return Error(`cdk-table: Duplicate column definition name provided: "${name}".`);
+  return Error(`Duplicate column definition name provided: "${name}".`);
 }
 
 /**
@@ -28,7 +28,7 @@ export function getTableDuplicateColumnNameError(name: string) {
  * @docs-private
  */
 export function getTableMultipleDefaultRowDefsError() {
-  return Error(`cdk-table: There can only be one default row without a when predicate function.`);
+  return Error(`There can only be one default row without a when predicate function.`);
 }
 
 /**
@@ -36,5 +36,14 @@ export function getTableMultipleDefaultRowDefsError() {
  * @docs-private
  */
 export function getTableMissingMatchingRowDefError() {
-  return Error(`cdk-table: Could not find a matching row definition for the provided row data.`);
+  return Error(`Could not find a matching row definition for the provided row data.`);
+}
+
+/**
+ * Returns an error to be thrown when there is no row definitions present in the content.
+ * @docs-private
+ */
+export function getTableMissingRowDefsError() {
+  return Error('Missing definitions for header and row, ' +
+      'cannot determine which columns should be rendered.');
 }
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index b659fefaac15..002b25c19ebf 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -10,6 +10,7 @@ import {map} from 'rxjs/operators/map';
 import {
   getTableDuplicateColumnNameError,
   getTableMissingMatchingRowDefError,
+  getTableMissingRowDefsError,
   getTableMultipleDefaultRowDefsError,
   getTableUnknownColumnError
 } from './table-errors';
@@ -39,6 +40,7 @@ describe('CdkTable', () => {
         WhenRowCdkTableApp,
         WhenRowWithoutDefaultCdkTableApp,
         WhenRowMultipleDefaultsCdkTableApp,
+        MissingRowDefsCdkTableApp,
         BooleanRowCdkTableApp
       ],
     }).compileComponents();
@@ -158,6 +160,11 @@ describe('CdkTable', () => {
         .toThrowError(getTableUnknownColumnError('column_a').message);
   });
 
+  it('should throw an error if the row definitions are missing', () => {
+    expect(() => TestBed.createComponent(MissingRowDefsCdkTableApp).detectChanges())
+        .toThrowError(getTableMissingRowDefsError().message);
+  });
+
   it('should not throw an error if columns are undefined on initialization', () => {
     const undefinedColumnsFixture = TestBed.createComponent(UndefinedColumnsCdkTableApp);
     undefinedColumnsFixture.detectChanges();
@@ -998,6 +1005,20 @@ class MissingColumnDefCdkTableApp {
   dataSource: FakeDataSource = new FakeDataSource();
 }
 
+@Component({
+  template: `
+    <cdk-table [dataSource]="dataSource">
+      <ng-container cdkColumnDef="column_a">
+        <cdk-header-cell *cdkHeaderCellDef> Column A</cdk-header-cell>
+        <cdk-cell *cdkCellDef="let row"> {{row.a}}</cdk-cell>
+      </ng-container>
+    </cdk-table>
+  `
+})
+class MissingRowDefsCdkTableApp {
+  dataSource: FakeDataSource = new FakeDataSource();
+}
+
 @Component({
   template: `
     <cdk-table [dataSource]="dataSource">
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index cb0aa60128bf..cbc944fa0580 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -39,6 +39,7 @@ import {CdkCellDef, CdkColumnDef, CdkHeaderCellDef} from './cell';
 import {
   getTableDuplicateColumnNameError,
   getTableMissingMatchingRowDefError,
+  getTableMissingRowDefsError,
   getTableMultipleDefaultRowDefsError,
   getTableUnknownColumnError
 } from './table-errors';
@@ -182,6 +183,10 @@ export class CdkTable<T> implements CollectionViewer {
   }
 
   ngAfterContentInit() {
+    if (!this._headerDef && !this._rowDefs.length) {
+      throw getTableMissingRowDefsError();
+    }
+
     this._cacheColumnDefsByName();
     this._columnDefs.changes.subscribe(() => this._cacheColumnDefsByName());
     this._renderHeaderRow();

From 44d61b207952fc44daf2fc65bed7391ed3df18ee Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 2 Nov 2017 05:04:06 +0100
Subject: [PATCH 430/575] docs: create ripples api document (#8147)

* Generates a `material-ripple.html` API file in the material docs content. This can be used to show the ripple API information in material.angular.io.
---
 tools/dgeni/processors/component-grouper.ts | 52 +++++++++++++--------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/tools/dgeni/processors/component-grouper.ts b/tools/dgeni/processors/component-grouper.ts
index 625af6ce9c25..e1f89b84ab98 100644
--- a/tools/dgeni/processors/component-grouper.ts
+++ b/tools/dgeni/processors/component-grouper.ts
@@ -1,5 +1,5 @@
 import {CategorizedClassDoc} from './categorizer';
-import {DocCollection, Processor} from 'dgeni';
+import {DocCollection, Document, Processor} from 'dgeni';
 import * as path from 'path';
 
 /** Component group data structure. */
@@ -66,24 +66,13 @@ export class ComponentGrouper implements Processor {
     const groups = new Map<string, ComponentGroup>();
 
     docs.forEach(doc => {
-      // Full path to the file for this doc.
-      const basePath = doc.fileInfo.basePath;
-      const filePath = doc.fileInfo.filePath;
-
-      // All of the component documentation is under either `src/lib` or `src/cdk`.
-      // We group the docs up by the directory immediately under that root.
-      let packageName, packageDisplayName;
-      if (filePath.includes('cdk')) {
-        packageName = 'cdk';
-        packageDisplayName = 'CDK';
-      } else {
-        packageName = 'material';
-        packageDisplayName = 'Material';
-      }
+      const documentInfo = getDocumentPackageInfo(doc);
 
-      const displayName = path.relative(basePath, filePath).split(path.sep)[1];
-      const moduleImportPath = `@angular/${packageName}/${displayName}`;
-      const groupName = packageName + '-' + displayName;
+      const packageName = documentInfo.packageName;
+      const packageDisplayName = documentInfo.packageName === 'cdk' ? 'CDK' : 'Material';
+
+      const moduleImportPath = `@angular/${packageName}/${documentInfo.entryPointName}`;
+      const groupName = packageName + '-' + documentInfo.name;
 
       // Get the group for this doc, or, if one does not exist, create it.
       let group;
@@ -94,9 +83,8 @@ export class ComponentGrouper implements Processor {
         groups.set(groupName, group);
       }
 
-      group.displayName = displayName;
+      group.displayName = documentInfo.name;
       group.moduleImportPath = moduleImportPath;
-
       group.packageName = packageName;
       group.packageDisplayName = packageDisplayName;
 
@@ -115,3 +103,27 @@ export class ComponentGrouper implements Processor {
     return Array.from(groups.values());
   }
 }
+
+/** Resolves package information for the given Dgeni document. */
+function getDocumentPackageInfo(doc: Document) {
+  // Full path to the file for this doc.
+  const basePath = doc.fileInfo.basePath;
+  const filePath = doc.fileInfo.filePath;
+
+  // All of the component documentation is under either `src/lib` or `src/cdk`.
+  // We group the docs up by the directory immediately under that root.
+  const pathSegments = path.relative(basePath, filePath).split(path.sep);
+  let groupName = pathSegments[1];
+
+  // For the ripples there should be a component group in the docs. Even it's not a
+  // secondary-entry point it can be still documented with its own `material-ripple.html` file.
+  if (pathSegments[1] === 'core' && pathSegments[2] === 'ripple') {
+    groupName = 'ripple';
+  }
+
+  return {
+    name: groupName,
+    packageName: pathSegments[0] === 'lib' ? 'material' : pathSegments[0],
+    entryPointName: pathSegments[1],
+  };
+}

From ebbbcca53f66c01ff950c390eb1a8fb34fd30b06 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 2 Nov 2017 05:04:38 +0100
Subject: [PATCH 431/575] docs: show platform service (#8148)

* No longer marks the `Platform` service from `@angular/cdk/platform` as `docs-private`. The platform service should be documented since it's useful and likely the only thing in the platform entry-point.
---
 src/cdk/platform/platform.ts | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/cdk/platform/platform.ts b/src/cdk/platform/platform.ts
index 534fb62c261b..81af1441020f 100755
--- a/src/cdk/platform/platform.ts
+++ b/src/cdk/platform/platform.ts
@@ -15,39 +15,47 @@ const hasV8BreakIterator = (typeof(Intl) !== 'undefined' && (Intl as any).v8Brea
 /**
  * Service to detect the current platform by comparing the userAgent strings and
  * checking browser-specific global properties.
- * @docs-private
  */
 @Injectable()
 export class Platform {
+  /** Whether the Angular application is being rendered in the browser. */
   isBrowser: boolean = typeof document === 'object' && !!document;
 
-  /** Layout Engines */
-  EDGE = this.isBrowser && /(edge)/i.test(navigator.userAgent);
-  TRIDENT = this.isBrowser && /(msie|trident)/i.test(navigator.userAgent);
+  /** Whether the current browser is Microsoft Edge. */
+  EDGE: boolean = this.isBrowser && /(edge)/i.test(navigator.userAgent);
 
+  /** Whether the current rendering engine is Microsoft Trident. */
+  TRIDENT: boolean = this.isBrowser && /(msie|trident)/i.test(navigator.userAgent);
+
+  /** Whether the current rendering engine is Blink. */
   // EdgeHTML and Trident mock Blink specific things and need to be excluded from this check.
-  BLINK = this.isBrowser &&
+  BLINK: boolean = this.isBrowser &&
       (!!((window as any).chrome || hasV8BreakIterator) && !!CSS && !this.EDGE && !this.TRIDENT);
 
+  /** Whether the current rendering engine is WebKit. */
   // Webkit is part of the userAgent in EdgeHTML, Blink and Trident. Therefore we need to
   // ensure that Webkit runs standalone and is not used as another engine's base.
-  WEBKIT = this.isBrowser &&
+  WEBKIT: boolean = this.isBrowser &&
       /AppleWebKit/i.test(navigator.userAgent) && !this.BLINK && !this.EDGE && !this.TRIDENT;
 
-  /** Browsers and Platform Types */
-  IOS = this.isBrowser && /iPad|iPhone|iPod/.test(navigator.userAgent) && !(window as any).MSStream;
+  /** Whether the current platform is Apple iOS. */
+  IOS: boolean = this.isBrowser && /iPad|iPhone|iPod/.test(navigator.userAgent) &&
+      !(window as any).MSStream;
 
+  /** Whether the current browser is Firefox. */
   // It's difficult to detect the plain Gecko engine, because most of the browsers identify
   // them self as Gecko-like browsers and modify the userAgent's according to that.
   // Since we only cover one explicit Firefox case, we can simply check for Firefox
   // instead of having an unstable check for Gecko.
-  FIREFOX = this.isBrowser && /(firefox|minefield)/i.test(navigator.userAgent);
+  FIREFOX: boolean = this.isBrowser && /(firefox|minefield)/i.test(navigator.userAgent);
 
+  /** Whether the current platform is Android. */
   // Trident on mobile adds the android platform to the userAgent to trick detections.
-  ANDROID = this.isBrowser && /android/i.test(navigator.userAgent) && !this.TRIDENT;
+  ANDROID: boolean = this.isBrowser && /android/i.test(navigator.userAgent) && !this.TRIDENT;
 
+  /** Whether the current browser is Safari. */
   // Safari browsers will include the Safari keyword in their userAgent. Some browsers may fake
   // this and just place the Safari keyword in the userAgent. To be more safe about Safari every
   // Safari browser should also use Webkit as its layout engine.
-  SAFARI = this.isBrowser && /safari/i.test(navigator.userAgent) && this.WEBKIT;
+  SAFARI: boolean = this.isBrowser && /safari/i.test(navigator.userAgent) && this.WEBKIT;
 }

From c5eaa7c8528aceb230618bad27686574a82d4a9f Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Thu, 2 Nov 2017 00:05:12 -0400
Subject: [PATCH 432/575] build(dgeni): render class descriptions as markdown
 (#8153)

---
 tools/dgeni/templates/class.template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/dgeni/templates/class.template.html b/tools/dgeni/templates/class.template.html
index 7948a18fda4a..db4b98947c79 100644
--- a/tools/dgeni/templates/class.template.html
+++ b/tools/dgeni/templates/class.template.html
@@ -10,7 +10,7 @@ <h4 id="{$ class.name $}" class="docs-header-link docs-api-h4 docs-api-class-nam
 </h4>
 
 {%- if class.description -%}
-<p class="docs-api-class-description">{$ class.description | safe $}</p>
+<p class="docs-api-class-description">{$ class.description | marked | safe $}</p>
 {%- endif -%}
 
 {%- if class.directiveSelectors -%}

From 3b50d3d08fb1da2fe579ac4d0c62f6b483830cdf Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Thu, 2 Nov 2017 00:05:27 -0400
Subject: [PATCH 433/575] docs(elevation): add guide for elevation helpers
 (#8172)

* docs(elevation): add guide for elevation helpers

- Credit to @M-a-c for intitial version

* Remove extra newlines

* Address comments
---
 guides/elevation.md                           | 50 +++++++++++++++++++
 .../elevation-overview-example.css            |  4 ++
 .../elevation-overview-example.html           |  7 +++
 .../elevation-overview-example.ts             | 13 +++++
 src/material-examples/example-module.ts       |  8 +++
 5 files changed, 82 insertions(+)
 create mode 100644 guides/elevation.md
 create mode 100644 src/material-examples/elevation-overview/elevation-overview-example.css
 create mode 100644 src/material-examples/elevation-overview/elevation-overview-example.html
 create mode 100644 src/material-examples/elevation-overview/elevation-overview-example.ts

diff --git a/guides/elevation.md b/guides/elevation.md
new file mode 100644
index 000000000000..270913f47c56
--- /dev/null
+++ b/guides/elevation.md
@@ -0,0 +1,50 @@
+Angular Material's elevation classes and mixins allow you to add separation between elements along
+the z-axis. All material design elements have resting elevations. In addition, some elements may
+change their elevation in response to user interaction. The
+[Material Design spec](https://material.io/guidelines/material-design/elevation-shadows.html)
+explains how to best use elevation.
+
+Angular Material provides two ways to control the elevation of elements: predefined CSS classes
+and mixins.
+
+### Predefined CSS classes
+
+The easiest way to add elevation to an element is to simply add one of the predefined CSS classes
+`mat-elevation-z#` where `#` is the elevation number you want, 0-24. Dynamic elevation can be
+achieved by switching elevation classes:
+
+```html
+<div [class.mat-elevation-z2]="!isActive" [class.mat-elevation-z8]="isActive"></div>
+```
+
+<!-- example(elevation-overview) -->
+
+### Mixins
+
+Elevations can also be added in CSS via the `mat-elevation` mixin, which takes a number 0-24
+indicating the elevation of the element. In order to use the mixin, you must import
+`~@angular/material/theming`:
+
+```scss
+@import '~@angular/material/theming';
+
+.my-class {
+  @include mat-elevation(2);
+}
+```
+
+For convenience, you can use the `mat-elevation-transition` mixin to add a transition when the
+elevation changes:
+
+```scss
+@import '~@angular/material/theming';
+
+.my-class {
+  @include mat-elevation-transition;
+  @include mat-elevation(2);
+
+  &:active {
+    @include mat-elevation(8);
+  }
+}
+```
diff --git a/src/material-examples/elevation-overview/elevation-overview-example.css b/src/material-examples/elevation-overview/elevation-overview-example.css
new file mode 100644
index 000000000000..49e543733c8f
--- /dev/null
+++ b/src/material-examples/elevation-overview/elevation-overview-example.css
@@ -0,0 +1,4 @@
+.example-container {
+  padding: 16px;
+  margin-bottom: 16px;
+}
diff --git a/src/material-examples/elevation-overview/elevation-overview-example.html b/src/material-examples/elevation-overview/elevation-overview-example.html
new file mode 100644
index 000000000000..1e38c9220e89
--- /dev/null
+++ b/src/material-examples/elevation-overview/elevation-overview-example.html
@@ -0,0 +1,7 @@
+<div class="example-container"
+    [class.mat-elevation-z2]="!isActive"
+    [class.mat-elevation-z8]="isActive">
+  Example
+</div>
+
+<button mat-button (click)="isActive = !isActive">Toggle Elevation</button>
diff --git a/src/material-examples/elevation-overview/elevation-overview-example.ts b/src/material-examples/elevation-overview/elevation-overview-example.ts
new file mode 100644
index 000000000000..bcb4c84b770e
--- /dev/null
+++ b/src/material-examples/elevation-overview/elevation-overview-example.ts
@@ -0,0 +1,13 @@
+import {Component} from '@angular/core';
+
+/**
+ * @title Elevation CSS classes
+ */
+@Component({
+  selector: 'elevation-overview-example',
+  styleUrls: ['elevation-overview-example.css'],
+  templateUrl: 'elevation-overview-example.html',
+})
+export class ElevationOverviewExample {
+  isActive = false;
+}
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 23a4d39a2bdb..1fd0719e1055 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -45,6 +45,7 @@ import {DialogContentExampleDialog,DialogContentExample} from './dialog-content/
 import {DialogDataExampleDialog,DialogDataExample} from './dialog-data/dialog-data-example';
 import {DialogElementsExampleDialog,DialogElementsExample} from './dialog-elements/dialog-elements-example';
 import {DialogOverviewExampleDialog,DialogOverviewExample} from './dialog-overview/dialog-overview-example';
+import {ElevationOverviewExample} from './elevation-overview/elevation-overview-example';
 import {ExpansionOverviewExample} from './expansion-overview/expansion-overview-example';
 import {ExpansionStepsExample} from './expansion-steps/expansion-steps-example';
 import {MyTelInput,FormFieldCustomControlExample} from './form-field-custom-control/form-field-custom-control-example';
@@ -312,6 +313,12 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: ["dialog-overview-example-dialog.html"],
     selectorName: 'DialogOverviewExample, DialogOverviewExampleDialog'
   },
+  'elevation-overview': {
+    title: 'Elevation CSS classes',
+    component: ElevationOverviewExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'expansion-overview': {
     title: 'Basic expansion panel',
     component: ExpansionOverviewExample,
@@ -785,6 +792,7 @@ export const EXAMPLE_LIST = [
   DialogDataExampleDialog,DialogDataExample,
   DialogElementsExampleDialog,DialogElementsExample,
   DialogOverviewExampleDialog,DialogOverviewExample,
+  ElevationOverviewExample,
   ExpansionOverviewExample,
   ExpansionStepsExample,
   MyTelInput,FormFieldCustomControlExample,

From cf11ff2e3ff1665236389d1c032628cf4276e78f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 2 Nov 2017 05:06:26 +0100
Subject: [PATCH 434/575] fix(stepper): error when selectedIndex is pre-set
 (#8035)

Fixes an error that is thrown if the `selectedIndex` is set before the steps are initialized.

Fixes #8031.
---
 src/cdk/stepper/stepper.ts      | 25 ++++++++++++++++---------
 src/lib/stepper/stepper.spec.ts | 26 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 9cd5a2a7d673..8d6db9dc481b 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -149,13 +149,17 @@ export class CdkStepper {
   @Input()
   get selectedIndex() { return this._selectedIndex; }
   set selectedIndex(index: number) {
-    if (this._anyControlsInvalid(index)
-        || index < this._selectedIndex && !this._steps.toArray()[index].editable) {
-      // remove focus from clicked step header if the step is not able to be selected
-      this._stepHeader.toArray()[index].nativeElement.blur();
-    } else if (this._selectedIndex != index) {
-      this._emitStepperSelectionEvent(index);
-      this._focusIndex = this._selectedIndex;
+    if (this._steps) {
+      if (this._anyControlsInvalid(index) || index < this._selectedIndex &&
+          !this._steps.toArray()[index].editable) {
+        // remove focus from clicked step header if the step is not able to be selected
+        this._stepHeader.toArray()[index].nativeElement.blur();
+      } else if (this._selectedIndex != index) {
+        this._emitStepperSelectionEvent(index);
+        this._focusIndex = this._selectedIndex;
+      }
+    } else {
+      this._selectedIndex = this._focusIndex = index;
     }
   }
   private _selectedIndex: number = 0;
@@ -281,9 +285,12 @@ export class CdkStepper {
   }
 
   private _anyControlsInvalid(index: number): boolean {
-    this._steps.toArray()[this._selectedIndex].interacted = true;
+    const steps = this._steps.toArray();
+
+    steps[this._selectedIndex].interacted = true;
+
     if (this._linear && index >= 0) {
-      return this._steps.toArray().slice(0, index).some(step => step.stepControl.invalid);
+      return steps.slice(0, index).some(step => step.stepControl && step.stepControl.invalid);
     }
     return false;
   }
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 3e25aaf9465c..02a326cc8f77 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -21,6 +21,7 @@ describe('MatHorizontalStepper', () => {
       imports: [MatStepperModule, NoopAnimationsModule, ReactiveFormsModule],
       declarations: [
         SimpleMatHorizontalStepperApp,
+        SimplePreselectedMatHorizontalStepperApp,
         LinearMatHorizontalStepperApp
       ],
       providers: [
@@ -168,6 +169,18 @@ describe('MatHorizontalStepper', () => {
     it('should be able to move to next step even when invalid if current step is optional', () => {
       assertOptionalStepValidity(testComponent, fixture);
     });
+
+    it('should not throw when there is a pre-defined selectedIndex', () => {
+      fixture.destroy();
+
+      let preselectedFixture = TestBed.createComponent(SimplePreselectedMatHorizontalStepperApp);
+      let debugElement = preselectedFixture.debugElement;
+
+      expect(() => preselectedFixture.detectChanges()).not.toThrow();
+
+      let stepHeaders = debugElement.queryAll(By.css('.mat-horizontal-stepper-header'));
+      assertSelectionChangeOnHeaderClick(preselectedFixture, stepHeaders);
+    });
   });
 });
 
@@ -862,3 +875,16 @@ class LinearMatVerticalStepperApp {
     });
   }
 }
+
+@Component({
+  template: `
+    <mat-horizontal-stepper [linear]="true" [selectedIndex]="index">
+      <mat-step label="One"></mat-step>
+      <mat-step label="Two"></mat-step>
+      <mat-step label="Three"></mat-step>
+    </mat-horizontal-stepper>
+  `
+})
+class SimplePreselectedMatHorizontalStepperApp {
+  index = 0;
+}

From 25bc760eefc72f834f9684bd79227661b8cd17f1 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:03:00 -0700
Subject: [PATCH 435/575] docs(input): fix example references (#8221)

---
 src/lib/input/input.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index 0c70e6e8dafe..afb5a8c291b9 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -59,7 +59,7 @@ must implement a single method `isErrorState` which takes the `FormControl` for
 well as the parent form and returns a boolean indicating whether errors should be shown. (`true`
 indicating that they should be shown, and `false` indicating that they should not.)
 
-<!-- example(input-error-state-matcher-example) -->
+<!-- example(input-error-state-matcher) -->
 
 A global error state matcher can be specified by setting the `ErrorStateMatcher` provider. This
 applies to all inputs. For convenience, `ShowOnDirtyErrorStateMatcher` is available in order to
@@ -80,7 +80,7 @@ globally cause input errors to show when the input is dirty and invalid.
 native `<textarea>` elements. The min and max size of the textarea can be specified in rows, using
 the `matAutosizeMinRows` and `matAutosizeMaxRows` properties respectively.
 
-<!-- example(input-autosize-textarea-example) -->
+<!-- example(input-autosize-textarea) -->
 
 ### Accessibility
 

From 24f0471b728e952ef330d0d2e67223955250464b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 3 Nov 2017 20:02:36 +0100
Subject: [PATCH 436/575] chore(spinner): avoid deprecation warning in Safari
 (#7810)

Fixes a deprecation warning that was being logged by the spinner on Safari.
---
 src/lib/progress-spinner/progress-spinner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index e3923167e3d8..bcc55cf3602e 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -203,7 +203,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     }
 
     if (styleTag && styleTag.sheet) {
-      (styleTag.sheet as CSSStyleSheet).insertRule(this._getAnimationText());
+      (styleTag.sheet as CSSStyleSheet).insertRule(this._getAnimationText(), 0);
     }
 
     MatProgressSpinner.diameters.add(this.diameter);

From c13848e715c8940de3fb923e0a69ba42e67bbcb3 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Mon, 6 Nov 2017 12:12:00 -0800
Subject: [PATCH 437/575] chore: bump version to 5.0.0-rc0 (#8256)

---
 CHANGELOG.md | 206 ++++++++++++++++++++++++++++++++++++++++++++++-----
 package.json |   2 +-
 2 files changed, 188 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f11ffb111111..b488b8298216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,175 @@
+<a name="5.0.0-rc0"></a>
+# [5.0.0-rc0 cesium-cephalopod](https://github.com/angular/material2/compare/2.0.0-beta.12...5.0.0-rc0) (2017-11-06)
+
+### Highlights
+
+* First release candidate for Angular Material and CDK! The team now believes that APIs and
+  behaviors are stable and mature enough to exit beta. Please continue to file issues that
+  help us eliminate more bugs from the forthcoming 5.0.0 release. Moving forward, the _major_
+  version number of Angular Material and CDK will update alongside Angular itself.
+* Based on Angular 5.0
+* More consistent naming conventions across the board
+* 60+ bug fixes
+
+### BREAKING CHANGES
+* Angular Material now requires Angular 5, which itself requires TypeScript 2.4+ and RxJS 5.5.2+
+* `mat-icon` now uses `HttpClient` from `@angular/common/http` instead of `Http` from
+  `@angular/http`. Any unit tests that faked icon responses should be changed to use an
+  `HttpInterceptor`.
+* `@angular/cdk/rxjs` has been removed in favor of [RxJS 5.5's lettable operators](https://github.com/ReactiveX/rxjs/blob/master/doc/lettable-operators.md).
+* **toolbar:** in previous versions, any content of `mat-toolbar` not wrapped in a
+  `mat-toolbar-row` would be rendered inside of an implicitly created `mat-toolbar-row`. As of rc0,
+  this implicit row will no longer be created. This means that any custom application CSS that
+  targeted this implicitly created `mat-toolbar-row` will no longer apply. Users can re-add the
+  `mat-toolbar-row` in their own templates to match the original output structure. This
+  resolves a longstanding issue where `display: flex` styles were difficult to use on `mat-toolbar`.
+* **accordion:** move CdkAccordion to `@angular/cdk/accordion`
+  - `CdkAccordion` and associated classes live in `@angular/cdk/accordion`
+  - `AccordionChild` is renamed to `CdkAccordionChild`
+  - `CdkAccordion` no longer has displayMode and hideToggle `@Inputs`
+  - `CdkAccordionItem` is now a `@Directive`
+* **table**:
+  - The argument order for the `when` property of `matRowDef` and `cdkRowDef` has been changed
+    from `(rowData, index)` to `(index, rowData)` in order to match `trackBy`.
+* **datepicker:**
+  - `fromIso8601` method on `DateAdapter` removed in favor of `deserialize`
+  - `DateAdapter` will return an invalid date instead of throwing an error
+  - The `userSelection` `@Output` of `mat-calendar` has been made internal-only
+* **cdk/scrolling:**
+  - `ScrollDispatcher.getScrollContainers` has been renamed to `getAncestorScrollContainers` to
+    better match its behavior.
+  - The `ScrollDispatcher.scrollableReferences` property has been renamed to `scrollContainers`.
+  - The `ScrollDispatcher.scrollableContainsElement` method has been removed.
+  - The `Scrollable` class has been renamed to `CdkScrollable` for consistency.
+* **unique-selection:** move UniqueSelectionDispatcher to `@angular/cdk/collections`
+  (`UniqueSelectionDispatcher`, `UniqueSelectionDispatcherListener`, and
+   `UNIQUE_SELECTION_DISPATCHER_PROVIDER`)
+* `MATERIAL_COMPATIBILITY_MODE`, `CompatibilityModule`, `NoConflictStyleCompatibilityMode`,
+  `MatPrefixRejector`, `MdPrefixRejector` symbols have been removed.
+* `MAT_CONNECTED_OVERLAY_SCROLL_STRATEGY` is renamed to `CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY`
+
+### Deprecations
+* The following classes have been renamed. The old names are still available as deprecated:
+`OverlayOrigin` -> `CdkOverlayOrigin`
+`ConnectedOverlayDirective` -> `CdkConnectedOverlay`
+`PortalDirective` -> `CdkPortal`
+`PortalHostDirective` -> `CdkPortalOutlet`
+`ObserveContent` -> `CdkObserveContent`
+* The following `@Output` names have been renamed. The old names are still available as deprecated:
+ - `mat-select`
+   - `onOpen` -> `opened`
+   - `onClose` -> `closed`
+   - `change` -> `selectionChange`
+ -  `mat-sidenav` / `mat-drawer`
+   - `open` -> `opened`
+   - `close` -> `closed`
+ - `mat-menu`
+   - `close` -> `closed`
+ - `matMenuTriggerFor`
+   - `onMenuOpen` -> `menuOpened`
+   - `onMenuClose` -> `menuClosed`
+ - `mat-chip`
+   - `onSelectionChange` -> `selectionChange`
+   - `remove` -> `removed`
+   - `destroy` -> `destroyed`
+ - `mat-tab-group`
+   - `selectChange` -> `selectedTabChange`
+
+
+### Features
+
+* **table:** add MatTableDataSource ([#6747](https://github.com/angular/material2/issues/6747)) ([a9600e7](https://github.com/angular/material2/commit/a9600e7))
+* **dialog:** support minWidth, minHeight, maxWidth and maxHeight ([#7488](https://github.com/angular/material2/issues/7488)) ([57f19cd](https://github.com/angular/material2/commit/57f19cd))
+* **overlay:** new keyboard dispatcher for targeting correct overlay ([#6682](https://github.com/angular/material2/issues/6682)) ([a2ca4d6](https://github.com/angular/material2/commit/a2ca4d6))
+* **snack-bar:** set snack bar to be responsive. ([#7485](https://github.com/angular/material2/issues/7485)) ([5b7982f](https://github.com/angular/material2/commit/5b7982f))
+* **sort:** use existing intl provider if one exists ([#7988](https://github.com/angular/material2/issues/7988)) ([c8df2c1](https://github.com/angular/material2/commit/c8df2c1))
+* **dialog:** add optional generic param for config data ([#7447](https://github.com/angular/material2/issues/7447)) ([b29ac45](https://github.com/angular/material2/commit/b29ac45)), closes [#4398](https://github.com/angular/material2/issues/4398)
+* Most directives / components now define an `exportAs` name ([#7554](https://github.com/angular/material2/issues/7554)) ([fa441bc](https://github.com/angular/material2/commit/fa441bc))
+
+### Bug Fixes
+
+* **block-scroll-strategy:** disable smooth scrolling before restoring scroll position ([#8132](https://github.com/angular/material2/issues/8132)) ([75bccde](https://github.com/angular/material2/commit/75bccde)), closes [#7139](https://github.com/angular/material2/issues/7139)
+* **button:** focus styles not applied to programmatically focused buttons ([#5966](https://github.com/angular/material2/issues/5966)) ([a0bb1a3](https://github.com/angular/material2/commit/a0bb1a3)), closes [#7510](https://github.com/angular/material2/issues/7510)
+* **button-toggle:** support two-way binding of value ([#7911](https://github.com/angular/material2/issues/7911)) ([ee4915c](https://github.com/angular/material2/commit/ee4915c))
+* **card:** change image path to https in example ([#7800](https://github.com/angular/material2/issues/7800)) ([65d3630](https://github.com/angular/material2/commit/65d3630))
+* **chip-list:** use role = listbox only if chip list is not empty ([#7664](https://github.com/angular/material2/issues/7664)) ([dc76c09](https://github.com/angular/material2/commit/dc76c09))
+* **chips:** programmatically selected chip stealing focus ([#7978](https://github.com/angular/material2/issues/7978)) ([8168667](https://github.com/angular/material2/commit/8168667))
+* **datepicker:** allow `DateAdapter` authors to have more control ove… ([#7346](https://github.com/angular/material2/issues/7346)) ([9fa075e](https://github.com/angular/material2/commit/9fa075e))
+* **datepicker:** use disabled state from FormControl ([#7514](https://github.com/angular/material2/issues/7514)) ([66e71c8](https://github.com/angular/material2/commit/66e71c8))
+* **dialog:** don't block other dialogs from opening while animating ([#8051](https://github.com/angular/material2/issues/8051)) ([cc4fc11](https://github.com/angular/material2/commit/cc4fc11)), closes [#6560](https://github.com/angular/material2/issues/6560)
+* **drawer:** not restoring focus on close ([#7668](https://github.com/angular/material2/issues/7668)) ([3041124](https://github.com/angular/material2/commit/3041124))
+* **drawer:** unable to toggle while drawer is animating ([#6810](https://github.com/angular/material2/issues/6810)) ([085827f](https://github.com/angular/material2/commit/085827f)), closes [#6376](https://github.com/angular/material2/issues/6376)
+* **expansion-panel:** prevent content from being clipped ([#7617](https://github.com/angular/material2/issues/7617)) ([aa77aa1](https://github.com/angular/material2/commit/aa77aa1))
+* **focus-trap:** server-side rendering error ([#7635](https://github.com/angular/material2/issues/7635)) ([f7a12b6](https://github.com/angular/material2/commit/f7a12b6)), closes [#7633](https://github.com/angular/material2/issues/7633)
+* **focus-trap:** update focus trap attrs to camel case [#6799](https://github.com/angular/material2/issues/6799) ([#6960](https://github.com/angular/material2/issues/6960)) ([c663fad](https://github.com/angular/material2/commit/c663fad))
+* **form-field:** fix underline at different zoom levels ([#7567](https://github.com/angular/material2/issues/7567)) ([5cffd7c](https://github.com/angular/material2/commit/5cffd7c))
+* **form-field:** remove 200px width since it messes up flex layouts ([#7083](https://github.com/angular/material2/issues/7083)) ([160a511](https://github.com/angular/material2/commit/160a511))
+* **form-field:** remove specific mention of matInput in error ([#7727](https://github.com/angular/material2/issues/7727)) ([f17cb99](https://github.com/angular/material2/commit/f17cb99))
+* **icon:** use SafeResourceUrl in getSvgIconFromUrl ([#7535](https://github.com/angular/material2/issues/7535)) ([291a87c](https://github.com/angular/material2/commit/291a87c))
+* **input:** remove IE clear icon ([#8095](https://github.com/angular/material2/issues/8095)) ([2fa679b](https://github.com/angular/material2/commit/2fa679b)), closes [#8076](https://github.com/angular/material2/issues/8076)
+* **menu:** add typography mat-font-weight ([7fe1b81](https://github.com/angular/material2/commit/7fe1b81))
+* **menu:** make @Output names consistent [#6677](https://github.com/angular/material2/issues/6677) ([#8053](https://github.com/angular/material2/issues/8053)) ([b2dd17a](https://github.com/angular/material2/commit/b2dd17a))
+* **menu:** not handling keyboard events when opened by mouse ([#4843](https://github.com/angular/material2/issues/4843)) ([d822a39](https://github.com/angular/material2/commit/d822a39)), closes [#4991](https://github.com/angular/material2/issues/4991)
+* **menu:** wrong offset for nested menu in a fallback position ([#7562](https://github.com/angular/material2/issues/7562)) ([074f6ce](https://github.com/angular/material2/commit/074f6ce)), closes [#7549](https://github.com/angular/material2/issues/7549)
+* **overlay:** CloseScrollStrategy not triggering change detection on close ([#7929](https://github.com/angular/material2/issues/7929)) ([c0ba25a](https://github.com/angular/material2/commit/c0ba25a)), closes [#7922](https://github.com/angular/material2/issues/7922)
+* **overlay:** emitting to detachments stream when not attached ([#7944](https://github.com/angular/material2/issues/7944)) ([6fdc237](https://github.com/angular/material2/commit/6fdc237))
+* **overlay:** import BidiModule in OverlayModule ([#7566](https://github.com/angular/material2/issues/7566)) ([4321f32](https://github.com/angular/material2/commit/4321f32))
+* **overlay:** overlay class audits [#6372](https://github.com/angular/material2/issues/6372) ([#8056](https://github.com/angular/material2/issues/8056)) ([cd05b54](https://github.com/angular/material2/commit/cd05b54))
+* **overlay:** wait until after change detection to position overlays ([#6527](https://github.com/angular/material2/issues/6527)) ([f299d25](https://github.com/angular/material2/commit/f299d25))
+* **paginator:** fix select baseline; support mobile ([#7610](https://github.com/angular/material2/issues/7610)) ([c12e4b5](https://github.com/angular/material2/commit/c12e4b5))
+* **progress-spinner:** fallback animation not working ([#7599](https://github.com/angular/material2/issues/7599)) ([4bb696e](https://github.com/angular/material2/commit/4bb696e))
+* **progress-spinner:** inaccurate stroke width on really small spinners ([#7725](https://github.com/angular/material2/issues/7725)) ([f52f078](https://github.com/angular/material2/commit/f52f078)), closes [#7686](https://github.com/angular/material2/issues/7686)
+* **progress-spinner:** spinner with narrower stroke not taking up entire element ([#7686](https://github.com/angular/material2/issues/7686)) ([2361983](https://github.com/angular/material2/commit/2361983)), closes [#7674](https://github.com/angular/material2/issues/7674)
+* **scroll:** Replace references to scrollableReferences ([#7752](https://github.com/angular/material2/issues/7752)) ([9673f63](https://github.com/angular/material2/commit/9673f63))
+* **select:** errors not shown on submit ([#7640](https://github.com/angular/material2/issues/7640)) ([d2f41a4](https://github.com/angular/material2/commit/d2f41a4)), closes [#7634](https://github.com/angular/material2/issues/7634)
+* **select:** make @Output names consistent [#6677](https://github.com/angular/material2/issues/6677) ([#8052](https://github.com/angular/material2/issues/8052)) ([f59abdb](https://github.com/angular/material2/commit/f59abdb))
+* **select:** not scrolling active option into view when typing ([#7620](https://github.com/angular/material2/issues/7620)) ([717f252](https://github.com/angular/material2/commit/717f252))
+* **select:** remove inert focus call ([#7729](https://github.com/angular/material2/issues/7729)) ([70c349c](https://github.com/angular/material2/commit/70c349c))
+* **select:** support typing to select items on when closed ([#7885](https://github.com/angular/material2/issues/7885)) ([8edb416](https://github.com/angular/material2/commit/8edb416))
+* **select:** unable to preselect array value in single selection mode ([#7603](https://github.com/angular/material2/issues/7603)) ([d55aa0c](https://github.com/angular/material2/commit/d55aa0c)), closes [#7584](https://github.com/angular/material2/issues/7584)
+* **select:** wrong cursor on disabled select ([#7696](https://github.com/angular/material2/issues/7696)) ([9b4f435](https://github.com/angular/material2/commit/9b4f435)), closes [#7695](https://github.com/angular/material2/issues/7695)
+* **selection-list:** fix option value coercion and selection events ([#6901](https://github.com/angular/material2/issues/6901)) ([80671bf](https://github.com/angular/material2/commit/80671bf)), closes [#6864](https://github.com/angular/material2/issues/6864)
+* **snack-bar:** add content fade in animation ([#7504](https://github.com/angular/material2/issues/7504)) ([2b9c470](https://github.com/angular/material2/commit/2b9c470))
+* **snackbar:** swap enter and exit animation curves ([#6791](https://github.com/angular/material2/issues/6791)) ([4f571b1](https://github.com/angular/material2/commit/4f571b1))
+* **sort:** fix arrow on width-constrained headers ([#7569](https://github.com/angular/material2/issues/7569)) ([147ae46](https://github.com/angular/material2/commit/147ae46))
+* **spinner:** set initial value for spinner to 0. ([#8139](https://github.com/angular/material2/issues/8139)) ([9e4c636](https://github.com/angular/material2/commit/9e4c636))
+* **stepper:** don't grey out non-linear steps ([#7479](https://github.com/angular/material2/issues/7479)) ([60707b3](https://github.com/angular/material2/commit/60707b3)), closes [#7260](https://github.com/angular/material2/issues/7260)
+* **stepper:** error when selectedIndex is pre-set ([#8035](https://github.com/angular/material2/issues/8035)) ([cf11ff2](https://github.com/angular/material2/commit/cf11ff2)), closes [#8031](https://github.com/angular/material2/issues/8031)
+* **table:** broaden abstraction for filtering ([#8059](https://github.com/angular/material2/issues/8059)) ([d47b37a](https://github.com/angular/material2/commit/d47b37a))
+* **table:** cell content should not stretch width ([#7666](https://github.com/angular/material2/issues/7666)) ([bb424e2](https://github.com/angular/material2/commit/bb424e2))
+* **table:** empty string should be sorted right ([#8011](https://github.com/angular/material2/issues/8011)) ([58627c4](https://github.com/angular/material2/commit/58627c4))
+* **table:** render cells even if data is falsy ([#7914](https://github.com/angular/material2/issues/7914)) ([f601e83](https://github.com/angular/material2/commit/f601e83))
+* **table:** switch when arguments ([#7516](https://github.com/angular/material2/issues/7516)) ([a2129fc](https://github.com/angular/material2/commit/a2129fc))
+* **table:** Provide a provider if exists. ([#7895](https://github.com/angular/material2/issues/7895)) ([9a05ecd](https://github.com/angular/material2/commit/9a05ecd)), closes [#7344](https://github.com/angular/material2/issues/7344)
+* **table:** throw error when missing row defs ([#7751](https://github.com/angular/material2/issues/7751)) ([55476e2](https://github.com/angular/material2/commit/55476e2))
+* **table:** update implicit when using trackby ([#7893](https://github.com/angular/material2/issues/7893)) ([f806286](https://github.com/angular/material2/commit/f806286))
+* **tabs:** incorrect ripple color for tabs with background ([#8123](https://github.com/angular/material2/issues/8123)) ([02d3eb6](https://github.com/angular/material2/commit/02d3eb6))
+* **toolbar:** no longer auto-generate toolbar rows ([#6661](https://github.com/angular/material2/issues/6661)) ([c3405aa](https://github.com/angular/material2/commit/c3405aa)), closes [#6004](https://github.com/angular/material2/issues/6004) [#1718](https://github.com/angular/material2/issues/1718)
+* **tooltip:** don't open from programmatic focus ([#7258](https://github.com/angular/material2/issues/7258)) ([90a55fa](https://github.com/angular/material2/commit/90a55fa)), closes [#7245](https://github.com/angular/material2/issues/7245)
+* **viewport-ruler:** incorrectly caching viewport size ([#7951](https://github.com/angular/material2/issues/7951)) ([0d6d9cc](https://github.com/angular/material2/commit/0d6d9cc))
+* consistent names for all cdk directives ([#8088](https://github.com/angular/material2/issues/8088)) ([f08b3f0](https://github.com/angular/material2/commit/f08b3f0))
+* don't show sanity check messages in tests ([#8080](https://github.com/angular/material2/issues/8080)) ([d17f9d2](https://github.com/angular/material2/commit/d17f9d2))
+* user-select mixin ignores value ([#7992](https://github.com/angular/material2/issues/7992)) ([eaa4a36](https://github.com/angular/material2/commit/eaa4a36))
+
+### Performance Improvements
+
+* **scroll** remove persistent global scroll listener ([#7560](https://github.com/angular/material2/issues/7560)) ([d6698e1](https://github.com/angular/material2/commit/d6698e1)), closes [#6882](https://github.com/angular/material2/issues/6882)
+* **drawer:** drawer content repainting on scroll ([#7719](https://github.com/angular/material2/issues/7719)) ([131e98f](https://github.com/angular/material2/commit/131e98f))
+* **focus-monitor:** use passive touch listener ([#7957](https://github.com/angular/material2/issues/7957)) ([ff7a13b](https://github.com/angular/material2/commit/ff7a13b))
+* **tabs:** avoid repainting while scrolling ([#7889](https://github.com/angular/material2/issues/7889)) ([943395e](https://github.com/angular/material2/commit/943395e))
+
+### Code Refactoring
+
+* **accordion:** move CdkAccordion to [<@S1DQE0YR5|@angular-core-eng>](https://github.com/angular)/cdk ([#7530](https://github.com/angular/material2/issues/7530)) ([4d04472](https://github.com/angular/material2/commit/4d04472))
+* remove compatibility mode ([#7689](https://github.com/angular/material2/issues/7689)) ([dcef604](https://github.com/angular/material2/commit/dcef604))
+* switch to HttpClient ([#6702](https://github.com/angular/material2/issues/6702)) ([0ea4370](https://github.com/angular/material2/commit/0ea4370))
+
 <a name="2.0.0-beta.12"></a>
 # [2.0.0-beta.12 marble-mustache](https://github.com/angular/material2/compare/2.0.0-beta.11...2.0.0-beta.12) (2017-10-05)
 
 ### Highlights
 
-* Progress spinner is now entirely css-based. 
+* Progress spinner is now entirely css-based.
 * Fixed sidenav: the sidenav can now be configured to use fixed positioning. This resolves a longstanding issue where sidenav-container would always introduce a scrolling region.
 * `mat-select` is now used inside `mat-form-field`. This makes all of the existing form-field features available with `mat-select`, including hints, errors, prefixes, and suffixes. This also ensures that `mat-select` and `matInput` have a consistent presentation.
 
@@ -13,6 +179,8 @@
     <mat-option *ngFor="let state of states" [value]="state">{{ state }}</mat-option>
   </mat-select>
 </mat-form-field>
+<a name="2.0.0-beta.12"></a>
+# [2.0.0-beta.12 marble-mustache](https://github.com/angular/material2/compare/2.0.0-beta.11...2.0.0-beta.12) (2017-10-05)
 ```
 
 
@@ -286,15 +454,15 @@ The current set of public `@angular/cdk` subpackages are:
 a11y, bidi, coercion, collections, keycodes, observers, overlay, platform, portal, rxjs,
 scrolling, table.
 
-If you are using SystemJS, each package you use must be added to the SystemJS configuration. 
+If you are using SystemJS, each package you use must be added to the SystemJS configuration.
 * All `Overlay` code has been moved from `@angular/material` to `@angular/cdk`. The symbols are
 still re-exported through `@angular/material`, but these re-exports will be removed in a
 subsequent release.
 * `cdkScrollable`, `ScrollDispatcher`, and `ViewportRuler` have been moved from overlay into its
-own `scrolling` subpackage in `@angular/cdk`. 
+own `scrolling` subpackage in `@angular/cdk`.
 * **input:** Inputs have a width of `200px` by default (similar to native input elements). The
 width can be overridden by via the `mat-form-field` css class.
-* **input:** CSS classes have changed from `mat-input-container-` to `mat-form-field-`. 
+* **input:** CSS classes have changed from `mat-input-container-` to `mat-form-field-`.
 * **input:** `md-prefix` and `md-suffix` are now `mdPrefix` and `mdSuffix`.
 * **portal:** `TemplatePortal` now requires a generic type (C) to align with `TemplateRef`.
 This will usually be `any`.
@@ -778,7 +946,7 @@ a few bugs, but things should mostly work.
 
 * `MdIconModule` no longer imports `HttpModule`. If your application depended on `Http` being provided through `MdIconModule`, you should now directly import `HttpModule` into your application.
 * The `forRoot` method on all Angular Material modules has been removed. It was previously deprecated and a no-op. Importing the modules directly will have the same effect.
-* Angular Material now requires TypeScript 2.2, which adds support for mixins. 
+* Angular Material now requires TypeScript 2.2, which adds support for mixins.
 
 ### Highlights
 
@@ -933,7 +1101,7 @@ need to explicitly import `BrowserAnimationsModule` (or `NoopAnimationsModule`)
 `@angular/platform-browser/animations` as well as installing `@angular/animations`.
 
 #### Other changes
-* The `DomProjection` service was removed. This was an experimental, undocumented service that we 
+* The `DomProjection` service was removed. This was an experimental, undocumented service that we
 ultimately found did not provide a good approach to composing components.
 * The `config` property was removed from `MdDialogRef`. If you were using this to access the `data`
 property, you can instead inject that value using the `MD_DIALOG_DATA` of the opened component.
@@ -1258,16 +1426,16 @@ as trusted using Angular's `DomSanitizer` service.
 allows for direct access to the native input element.
 * All `@Input` properties have been changed to use their camelCase names for binding. The old names
 are still available as deprecated but will be removed in the next release.
-* All `@Directive` selectors are now camelCase to be consistent with Angular core. For example, 
-`[md-tooltip]` is now `[mdTooltip]` The old selectors are still available as deprecated but will 
+* All `@Directive` selectors are now camelCase to be consistent with Angular core. For example,
+`[md-tooltip]` is now `[mdTooltip]` The old selectors are still available as deprecated but will
 be removed in the next release.
 * `<md-progress-circle>` has been renamed to `<md-progress-spinner>`. The old selector and symbols
 are still available as deprecated but will be removed in the next release.
-* `<md-sidenav-layout>` has been renamed to `<md-sidenav-container>`. The old selector is still 
+* `<md-sidenav-layout>` has been renamed to `<md-sidenav-container>`. The old selector is still
 available as deprecated but will be removed in the next release.
-* Several components in `core/`, such as Overlay, have had their prefix changed to `cdk-` (short 
-for "component dev kit"). This signifies that these are general-purpose tools for building 
-components that are not coupled to Material Design.The old selectors are still 
+* Several components in `core/`, such as Overlay, have had their prefix changed to `cdk-` (short
+for "component dev kit"). This signifies that these are general-purpose tools for building
+components that are not coupled to Material Design.The old selectors are still
 available as deprecated but will be removed in the next release. The CSS classes have been changed.
 * The `align` property for `md-checkbox` and `md-radio-button` has been changed to `labelPosition`
 with values `before` and `after`.
@@ -1565,12 +1733,12 @@ In addition to this, each component now has an `index.js` file, so you should no
 import {MdButtonModule} from '@angular2-material/button'
 ```
 
-Instead of 
+Instead of
 ```ts
 import {MdButtonModule} from '@angular2-material/button/button'
 ```
 
-* all: material modules must be included with `forRoot()` when bootstrapping. See the [ngModules guide](https://angular.io/docs/ts/latest/cookbook/ngmodule-faq.html#!#q-for-root) for 
+* all: material modules must be included with `forRoot()` when bootstrapping. See the [ngModules guide](https://angular.io/docs/ts/latest/cookbook/ngmodule-faq.html#!#q-for-root) for
 more information.
 
 ```ts
@@ -1586,7 +1754,7 @@ more information.
 
 * all: material now depends on TypeScript 2.0
 
-* input: `md-input` attributes now match the casing of native attributes. Previously they were camel-cased; now they are all lowercase. 
+* input: `md-input` attributes now match the casing of native attributes. Previously they were camel-cased; now they are all lowercase.
 Example: `autoComplete` is now `autocomplete`.   See [#1066](https://github.com/angular/material2/pull/1066) for a full list.
 
 * overlay: overlays are now synchronous. This means actions like creating an overlay no longer return a promise.
@@ -1649,7 +1817,7 @@ The MD_XXX_DIRECTIVES constants are now deprecated and will be removed in alpha.
 * **md-menu** initial version for md-menu (more features coming in alpha.8) ([#893](https://github.com/angular/material2/issues/893)) ([16eb6be](https://github.com/angular/material2/commit/16eb6be)) ([#855](https://github.com/angular/material2/issues/855)) ([e324e47](https://github.com/angular/material2/commit/e324e47)) ([#867](https://github.com/angular/material2/issues/867)) ([9a32489](https://github.com/angular/material2/commit/9a32489))
 * **ripple:** initial mdInkRipple implementation ([#681](https://github.com/angular/material2/issues/681)) ([47448cb](https://github.com/angular/material2/commit/47448cb))
 * **button:** add ripple to md-button ([32aa461](https://github.com/angular/material2/commit/32aa461))
-* **input:** support autocapitalize and autocorrect attributes ([#858](https://github.com/angular/material2/issues/858)) ([b2471f2](https://github.com/angular/material2/commit/b2471f2)) 
+* **input:** support autocapitalize and autocorrect attributes ([#858](https://github.com/angular/material2/issues/858)) ([b2471f2](https://github.com/angular/material2/commit/b2471f2))
 * **slide-toggle:** add drag functionality to thumb ([#750](https://github.com/angular/material2/issues/750)) ([25b4f21](https://github.com/angular/material2/commit/25b4f21))
 
 
@@ -1672,7 +1840,7 @@ The MD_XXX_DIRECTIVES constants are now deprecated and will be removed in alpha.
 
 ### Breaking changes
 * `MdRadioDispatcher` is now `MdUniqueSelectionDispatcher` and is imported from `core`
-* Form controls use the new `@angular/forms` package. To make migration easier, you can 
+* Form controls use the new `@angular/forms` package. To make migration easier, you can
   alternatively install alpha.5-3, which is the same as alpha.6 without the new forms package.
   [Please see the docs for the new forms module](https://angular.io/docs/ts/latest/guide/forms.html).
 
@@ -1868,10 +2036,10 @@ This inaugural release includes 6 components:
 * [md-card](src/components/card)
 * [md-toolbar](src/components/toolbar)
 * [md-sidenav](src/components/sidenav)
-* [md-checkbox](src/components/checkbox) 
+* [md-checkbox](src/components/checkbox)
 * [md-progress-circle and md-spinner](src/components/progress-circle)
 
 As the alpha process continues, these components will continue to evolve. There *will* be
 breaking changes between alpha releases; the alpha releases are here for people that want an
-early look or who like to live on the edge and are very tolerant of breaking API and behavior 
+early look or who like to live on the edge and are very tolerant of breaking API and behavior
 changes.
diff --git a/package.json b/package.json
index 4884cbe36bfb..1b9e5dbf7324 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "docs": "gulp docs",
     "api": "gulp api-docs"
   },
-  "version": "2.0.0-beta.12",
+  "version": "5.0.0-rc0",
   "license": "MIT",
   "engines": {
     "node": ">= 5.4.1"

From b3e1448b3d6c6f267ab1f8d630faa68f1a3cca48 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Mon, 6 Nov 2017 13:29:18 -0800
Subject: [PATCH 438/575] Add moment adapter release to changelog (#8257)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b488b8298216..b850ee07cc6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
   behaviors are stable and mature enough to exit beta. Please continue to file issues that
   help us eliminate more bugs from the forthcoming 5.0.0 release. Moving forward, the _major_
   version number of Angular Material and CDK will update alongside Angular itself.
+* A [moment.js](http://momentjs.com/) implementation of the `DateAdapter` for `MatDatepicker` is now available as `@angular/material-moment-adapter`
 * Based on Angular 5.0
 * More consistent naming conventions across the board
 * 60+ bug fixes

From 6e872b72a13ec604634e9799adbba2bfbace7203 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 6 Nov 2017 21:57:40 +0000
Subject: [PATCH 439/575] docs: fix forms warning in custom form field example
 (#8224)

---
 .../form-field-custom-control-example.html                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.html b/src/material-examples/form-field-custom-control/form-field-custom-control-example.html
index cfa6188f73b1..a720cfd4018c 100644
--- a/src/material-examples/form-field-custom-control/form-field-custom-control-example.html
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.html
@@ -1,7 +1,7 @@
 <div [formGroup]="parts">
-  <input class="area" formControlName="area" size="3" [disabled]="disabled">
+  <input class="area" formControlName="area" size="3">
   <span>&ndash;</span>
-  <input class="exchange" formControlName="exchange" size="3" [disabled]="disabled">
+  <input class="exchange" formControlName="exchange" size="3">
   <span>&ndash;</span>
-  <input class="subscriber" formControlName="subscriber" size="4" [disabled]="disabled">
+  <input class="subscriber" formControlName="subscriber" size="4">
 </div>

From e172d19f9b39d1cf6f50ec210bbdbc462bfc3d82 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 6 Nov 2017 13:58:40 -0800
Subject: [PATCH 440/575] chore(table): add sort accessor type to data source
 (#8222)

---
 src/lib/table/table-data-source.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/table/table-data-source.ts b/src/lib/table/table-data-source.ts
index f45e427afffc..71f408a2273d 100644
--- a/src/lib/table/table-data-source.ts
+++ b/src/lib/table/table-data-source.ts
@@ -95,7 +95,8 @@ export class MatTableDataSource<T> implements DataSource<T> {
    * @param data Data object that is being accessed.
    * @param sortHeaderId The name of the column that represents the data.
    */
-  sortingDataAccessor = (data: T, sortHeaderId: string): string|number => {
+  sortingDataAccessor: ((data: T, sortHeaderId: string) => string|number) =
+      (data: T, sortHeaderId: string): string|number => {
     const value: any = data[sortHeaderId];
 
     // If the value is a string and only whitespace, return the value.

From 4e8626b8ad761a443a238b4673398882542bdd6b Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 6 Nov 2017 21:59:33 +0000
Subject: [PATCH 441/575] build: remove es5 tsconfig files (#8203)

---
 src/cdk/a11y/tsconfig-es5.json                | 13 ------
 src/cdk/accordion/tsconfig-es5.json           | 13 ------
 src/cdk/bidi/tsconfig-es5.json                | 13 ------
 src/cdk/coercion/tsconfig-es5.json            | 13 ------
 src/cdk/collections/tsconfig-es5.json         | 13 ------
 src/cdk/keycodes/tsconfig-es5.json            | 13 ------
 src/cdk/layout/tsconfig-es5.json              | 13 ------
 src/cdk/observers/tsconfig-es5.json           | 13 ------
 src/cdk/overlay/tsconfig-es5.json             | 13 ------
 src/cdk/platform/tsconfig-es5.json            | 13 ------
 src/cdk/portal/tsconfig-es5.json              | 13 ------
 src/cdk/scrolling/tsconfig-es5.json           | 13 ------
 src/cdk/stepper/tsconfig-es5.json             | 14 ------
 src/cdk/table/tsconfig-es5.json               | 14 ------
 src/cdk/tsconfig-es5.json                     | 38 ----------------
 src/lib/autocomplete/tsconfig-es5.json        | 14 ------
 src/lib/button-toggle/tsconfig-es5.json       | 14 ------
 src/lib/button/tsconfig-es5.json              | 14 ------
 src/lib/card/tsconfig-es5.json                | 14 ------
 src/lib/checkbox/tsconfig-es5.json            | 14 ------
 src/lib/chips/tsconfig-es5.json               | 14 ------
 src/lib/core/tsconfig-es5.json                | 14 ------
 src/lib/datepicker/tsconfig-es5.json          | 14 ------
 src/lib/dialog/tsconfig-es5.json              | 14 ------
 src/lib/expansion/tsconfig-es5.json           | 14 ------
 src/lib/form-field/tsconfig-es5.json          | 14 ------
 src/lib/grid-list/tsconfig-es5.json           | 14 ------
 src/lib/icon/tsconfig-es5.json                | 14 ------
 src/lib/input/tsconfig-es5.json               | 14 ------
 src/lib/list/tsconfig-es5.json                | 14 ------
 src/lib/menu/tsconfig-es5.json                | 14 ------
 src/lib/paginator/tsconfig-es5.json           | 14 ------
 src/lib/progress-bar/tsconfig-es5.json        | 14 ------
 src/lib/progress-spinner/tsconfig-es5.json    | 14 ------
 src/lib/radio/tsconfig-es5.json               | 14 ------
 src/lib/select/tsconfig-es5.json              | 14 ------
 src/lib/sidenav/tsconfig-es5.json             | 14 ------
 src/lib/slide-toggle/tsconfig-es5.json        | 14 ------
 src/lib/slider/tsconfig-es5.json              | 14 ------
 src/lib/snack-bar/tsconfig-es5.json           | 14 ------
 src/lib/sort/tsconfig-es5.json                | 14 ------
 src/lib/stepper/tsconfig-es5.json             | 14 ------
 src/lib/table/tsconfig-es5.json               | 14 ------
 src/lib/tabs/tsconfig-es5.json                | 14 ------
 src/lib/toolbar/tsconfig-es5.json             | 14 ------
 src/lib/tooltip/tsconfig-es5.json             | 14 ------
 src/lib/tsconfig-es5.json                     | 43 -------------------
 src/material-examples/tsconfig-es5.json       | 41 ------------------
 src/material-moment-adapter/tsconfig-es5.json | 41 ------------------
 tools/package-tools/build-package.ts          |  7 +--
 tools/package-tools/compile-entry-point.ts    | 10 ++++-
 51 files changed, 10 insertions(+), 788 deletions(-)
 delete mode 100644 src/cdk/a11y/tsconfig-es5.json
 delete mode 100644 src/cdk/accordion/tsconfig-es5.json
 delete mode 100644 src/cdk/bidi/tsconfig-es5.json
 delete mode 100644 src/cdk/coercion/tsconfig-es5.json
 delete mode 100644 src/cdk/collections/tsconfig-es5.json
 delete mode 100644 src/cdk/keycodes/tsconfig-es5.json
 delete mode 100644 src/cdk/layout/tsconfig-es5.json
 delete mode 100644 src/cdk/observers/tsconfig-es5.json
 delete mode 100644 src/cdk/overlay/tsconfig-es5.json
 delete mode 100644 src/cdk/platform/tsconfig-es5.json
 delete mode 100644 src/cdk/portal/tsconfig-es5.json
 delete mode 100644 src/cdk/scrolling/tsconfig-es5.json
 delete mode 100644 src/cdk/stepper/tsconfig-es5.json
 delete mode 100644 src/cdk/table/tsconfig-es5.json
 delete mode 100644 src/cdk/tsconfig-es5.json
 delete mode 100644 src/lib/autocomplete/tsconfig-es5.json
 delete mode 100644 src/lib/button-toggle/tsconfig-es5.json
 delete mode 100644 src/lib/button/tsconfig-es5.json
 delete mode 100644 src/lib/card/tsconfig-es5.json
 delete mode 100644 src/lib/checkbox/tsconfig-es5.json
 delete mode 100644 src/lib/chips/tsconfig-es5.json
 delete mode 100644 src/lib/core/tsconfig-es5.json
 delete mode 100644 src/lib/datepicker/tsconfig-es5.json
 delete mode 100644 src/lib/dialog/tsconfig-es5.json
 delete mode 100644 src/lib/expansion/tsconfig-es5.json
 delete mode 100644 src/lib/form-field/tsconfig-es5.json
 delete mode 100644 src/lib/grid-list/tsconfig-es5.json
 delete mode 100644 src/lib/icon/tsconfig-es5.json
 delete mode 100644 src/lib/input/tsconfig-es5.json
 delete mode 100644 src/lib/list/tsconfig-es5.json
 delete mode 100644 src/lib/menu/tsconfig-es5.json
 delete mode 100644 src/lib/paginator/tsconfig-es5.json
 delete mode 100644 src/lib/progress-bar/tsconfig-es5.json
 delete mode 100644 src/lib/progress-spinner/tsconfig-es5.json
 delete mode 100644 src/lib/radio/tsconfig-es5.json
 delete mode 100644 src/lib/select/tsconfig-es5.json
 delete mode 100644 src/lib/sidenav/tsconfig-es5.json
 delete mode 100644 src/lib/slide-toggle/tsconfig-es5.json
 delete mode 100644 src/lib/slider/tsconfig-es5.json
 delete mode 100644 src/lib/snack-bar/tsconfig-es5.json
 delete mode 100644 src/lib/sort/tsconfig-es5.json
 delete mode 100644 src/lib/stepper/tsconfig-es5.json
 delete mode 100644 src/lib/table/tsconfig-es5.json
 delete mode 100644 src/lib/tabs/tsconfig-es5.json
 delete mode 100644 src/lib/toolbar/tsconfig-es5.json
 delete mode 100644 src/lib/tooltip/tsconfig-es5.json
 delete mode 100644 src/lib/tsconfig-es5.json
 delete mode 100644 src/material-examples/tsconfig-es5.json
 delete mode 100644 src/material-moment-adapter/tsconfig-es5.json

diff --git a/src/cdk/a11y/tsconfig-es5.json b/src/cdk/a11y/tsconfig-es5.json
deleted file mode 100644
index 9f859ef5e0e5..000000000000
--- a/src/cdk/a11y/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/a11y",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/accordion/tsconfig-es5.json b/src/cdk/accordion/tsconfig-es5.json
deleted file mode 100644
index 96ab7d413373..000000000000
--- a/src/cdk/accordion/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/accordion",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/bidi/tsconfig-es5.json b/src/cdk/bidi/tsconfig-es5.json
deleted file mode 100644
index 1d5216f97ef5..000000000000
--- a/src/cdk/bidi/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/bidi",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/coercion/tsconfig-es5.json b/src/cdk/coercion/tsconfig-es5.json
deleted file mode 100644
index 43c178eabddb..000000000000
--- a/src/cdk/coercion/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/coercion",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/collections/tsconfig-es5.json b/src/cdk/collections/tsconfig-es5.json
deleted file mode 100644
index 09d592aacabc..000000000000
--- a/src/cdk/collections/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/collections",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/keycodes/tsconfig-es5.json b/src/cdk/keycodes/tsconfig-es5.json
deleted file mode 100644
index f923de0e6448..000000000000
--- a/src/cdk/keycodes/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/keycodes",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/layout/tsconfig-es5.json b/src/cdk/layout/tsconfig-es5.json
deleted file mode 100644
index 646c9c20d1b7..000000000000
--- a/src/cdk/layout/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/layout",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/observers/tsconfig-es5.json b/src/cdk/observers/tsconfig-es5.json
deleted file mode 100644
index 3006179c63d4..000000000000
--- a/src/cdk/observers/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/observers",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/overlay/tsconfig-es5.json b/src/cdk/overlay/tsconfig-es5.json
deleted file mode 100644
index 3ea6fd8f9d03..000000000000
--- a/src/cdk/overlay/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/overlay",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/platform/tsconfig-es5.json b/src/cdk/platform/tsconfig-es5.json
deleted file mode 100644
index d51201683c7e..000000000000
--- a/src/cdk/platform/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/platform",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/portal/tsconfig-es5.json b/src/cdk/portal/tsconfig-es5.json
deleted file mode 100644
index 021b7e9a7a21..000000000000
--- a/src/cdk/portal/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/portal",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/scrolling/tsconfig-es5.json b/src/cdk/scrolling/tsconfig-es5.json
deleted file mode 100644
index 01eed669f762..000000000000
--- a/src/cdk/scrolling/tsconfig-es5.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/scrolling",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/stepper/tsconfig-es5.json b/src/cdk/stepper/tsconfig-es5.json
deleted file mode 100644
index 3eabe48b6384..000000000000
--- a/src/cdk/stepper/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/stepper",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/table/tsconfig-es5.json b/src/cdk/table/tsconfig-es5.json
deleted file mode 100644
index c431202d220a..000000000000
--- a/src/cdk/table/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk/table",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/cdk/tsconfig-es5.json b/src/cdk/tsconfig-es5.json
deleted file mode 100644
index eeb6d924c00c..000000000000
--- a/src/cdk/tsconfig-es5.json
+++ /dev/null
@@ -1,38 +0,0 @@
-// TypeScript config file that is used to compile the cdk's ES5 package.
-// TODO: Remove this file in favor of overrides when we update to ngc 5.x
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "declaration": false,
-    "stripInternal": false,
-    "experimentalDecorators": true,
-    "noUnusedParameters": true,
-    "strictNullChecks": true,
-    "importHelpers": true,
-    "newLine": "lf",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/cdk/esm5",
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "types": [],
-    "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
-    }
-  },
-  "files": [
-    "public-api.ts",
-    "typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/cdk",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/autocomplete/tsconfig-es5.json b/src/lib/autocomplete/tsconfig-es5.json
deleted file mode 100644
index 270cd7838bee..000000000000
--- a/src/lib/autocomplete/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/autocomplete",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/button-toggle/tsconfig-es5.json b/src/lib/button-toggle/tsconfig-es5.json
deleted file mode 100644
index af9532f0a445..000000000000
--- a/src/lib/button-toggle/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/button-toggle",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/button/tsconfig-es5.json b/src/lib/button/tsconfig-es5.json
deleted file mode 100644
index e9d81168005e..000000000000
--- a/src/lib/button/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/button",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/card/tsconfig-es5.json b/src/lib/card/tsconfig-es5.json
deleted file mode 100644
index 2a4cd40559bc..000000000000
--- a/src/lib/card/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/card",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/checkbox/tsconfig-es5.json b/src/lib/checkbox/tsconfig-es5.json
deleted file mode 100644
index 4b2b11e78453..000000000000
--- a/src/lib/checkbox/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/checkbox",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/chips/tsconfig-es5.json b/src/lib/chips/tsconfig-es5.json
deleted file mode 100644
index fa2928e33c28..000000000000
--- a/src/lib/chips/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/chips",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/core/tsconfig-es5.json b/src/lib/core/tsconfig-es5.json
deleted file mode 100644
index b6cc1b088696..000000000000
--- a/src/lib/core/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/core",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/datepicker/tsconfig-es5.json b/src/lib/datepicker/tsconfig-es5.json
deleted file mode 100644
index fdb09e47a9dc..000000000000
--- a/src/lib/datepicker/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/datepicker",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/dialog/tsconfig-es5.json b/src/lib/dialog/tsconfig-es5.json
deleted file mode 100644
index 29106ba3e285..000000000000
--- a/src/lib/dialog/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/dialog",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/expansion/tsconfig-es5.json b/src/lib/expansion/tsconfig-es5.json
deleted file mode 100644
index 44013006f711..000000000000
--- a/src/lib/expansion/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/expansion",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/form-field/tsconfig-es5.json b/src/lib/form-field/tsconfig-es5.json
deleted file mode 100644
index d60777a3bc17..000000000000
--- a/src/lib/form-field/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/form-field",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/grid-list/tsconfig-es5.json b/src/lib/grid-list/tsconfig-es5.json
deleted file mode 100644
index fa301bb0536b..000000000000
--- a/src/lib/grid-list/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/grid-list",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/icon/tsconfig-es5.json b/src/lib/icon/tsconfig-es5.json
deleted file mode 100644
index e198911c3ff1..000000000000
--- a/src/lib/icon/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/icon",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/input/tsconfig-es5.json b/src/lib/input/tsconfig-es5.json
deleted file mode 100644
index d525ac0e2db6..000000000000
--- a/src/lib/input/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/input",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/list/tsconfig-es5.json b/src/lib/list/tsconfig-es5.json
deleted file mode 100644
index 70ed29f73566..000000000000
--- a/src/lib/list/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/list",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/menu/tsconfig-es5.json b/src/lib/menu/tsconfig-es5.json
deleted file mode 100644
index 0ab607ca20b8..000000000000
--- a/src/lib/menu/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/menu",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/paginator/tsconfig-es5.json b/src/lib/paginator/tsconfig-es5.json
deleted file mode 100644
index c44fbd84a895..000000000000
--- a/src/lib/paginator/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/paginator",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/progress-bar/tsconfig-es5.json b/src/lib/progress-bar/tsconfig-es5.json
deleted file mode 100644
index de3a5147f84a..000000000000
--- a/src/lib/progress-bar/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/progress-bar",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/progress-spinner/tsconfig-es5.json b/src/lib/progress-spinner/tsconfig-es5.json
deleted file mode 100644
index 3c36425605e9..000000000000
--- a/src/lib/progress-spinner/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/progress-spinner",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/radio/tsconfig-es5.json b/src/lib/radio/tsconfig-es5.json
deleted file mode 100644
index ad255b05988b..000000000000
--- a/src/lib/radio/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/radio",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/select/tsconfig-es5.json b/src/lib/select/tsconfig-es5.json
deleted file mode 100644
index d62b57196fca..000000000000
--- a/src/lib/select/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/select",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/sidenav/tsconfig-es5.json b/src/lib/sidenav/tsconfig-es5.json
deleted file mode 100644
index 3dd15b1fb496..000000000000
--- a/src/lib/sidenav/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/sidenav",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/slide-toggle/tsconfig-es5.json b/src/lib/slide-toggle/tsconfig-es5.json
deleted file mode 100644
index b97898736129..000000000000
--- a/src/lib/slide-toggle/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/slide-toggle",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/slider/tsconfig-es5.json b/src/lib/slider/tsconfig-es5.json
deleted file mode 100644
index 99221098dfce..000000000000
--- a/src/lib/slider/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/slider",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/snack-bar/tsconfig-es5.json b/src/lib/snack-bar/tsconfig-es5.json
deleted file mode 100644
index 37a896c2f10f..000000000000
--- a/src/lib/snack-bar/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/snack-bar",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/sort/tsconfig-es5.json b/src/lib/sort/tsconfig-es5.json
deleted file mode 100644
index bb823828f668..000000000000
--- a/src/lib/sort/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/sort",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/stepper/tsconfig-es5.json b/src/lib/stepper/tsconfig-es5.json
deleted file mode 100644
index 8d84f1139b9d..000000000000
--- a/src/lib/stepper/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/stepper",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/table/tsconfig-es5.json b/src/lib/table/tsconfig-es5.json
deleted file mode 100644
index fe82cc879d3a..000000000000
--- a/src/lib/table/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/table",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/tabs/tsconfig-es5.json b/src/lib/tabs/tsconfig-es5.json
deleted file mode 100644
index 67cceed8ef8a..000000000000
--- a/src/lib/tabs/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/tabs",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/toolbar/tsconfig-es5.json b/src/lib/toolbar/tsconfig-es5.json
deleted file mode 100644
index a759c38fcec4..000000000000
--- a/src/lib/toolbar/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/toolbar",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/tooltip/tsconfig-es5.json b/src/lib/tooltip/tsconfig-es5.json
deleted file mode 100644
index 8f5505fabaa2..000000000000
--- a/src/lib/tooltip/tsconfig-es5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig-es5",
-  "files": [
-    "public-api.ts",
-    "../typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material/tooltip",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/lib/tsconfig-es5.json b/src/lib/tsconfig-es5.json
deleted file mode 100644
index 49aed8849f99..000000000000
--- a/src/lib/tsconfig-es5.json
+++ /dev/null
@@ -1,43 +0,0 @@
-// TypeScript config file that is used to compile the library into ES5.
-// TODO: Remove this file in favor of overrides when we update to ngc 5.x
-{
-  "compilerOptions": {
-    "declaration": false,
-    "stripInternal": false,
-    "experimentalDecorators": true,
-    "noUnusedParameters": true,
-    "strictNullChecks": true,
-    "importHelpers": true,
-    "newLine": "lf",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/material/esm5",
-    "rootDir": ".",
-    "rootDirs": [
-      ".",
-      "../../dist/packages/material"
-    ],
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "types": [],
-    "baseUrl": ".",
-    "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*"],
-      "@angular/material/*": ["../../dist/packages/material/*"]
-    }
-  },
-  "files": [
-    "public-api.ts",
-    "typings.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/material-examples/tsconfig-es5.json b/src/material-examples/tsconfig-es5.json
deleted file mode 100644
index 736e14fbb28f..000000000000
--- a/src/material-examples/tsconfig-es5.json
+++ /dev/null
@@ -1,41 +0,0 @@
-// TypeScript config file that is used to compile the examples. Target environment needs to be
-// ES2015 since the build process will create FESM bundles using rollup.
-{
-  "compilerOptions": {
-    // Needed for Moment.js since it doesn't have a default export.
-    "allowSyntheticDefaultImports": true,
-    "declaration": false,
-    "stripInternal": false,
-    "experimentalDecorators": true,
-    "noUnusedParameters": true,
-    "strictNullChecks": true,
-    "importHelpers": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/material-examples/esm5",
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "types": [],
-    "baseUrl": ".",
-    "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*"],
-      "@angular/material": ["../../dist/packages/material/public-api"],
-      "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
-    }
-  },
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material-examples",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/src/material-moment-adapter/tsconfig-es5.json b/src/material-moment-adapter/tsconfig-es5.json
deleted file mode 100644
index d291171d03d4..000000000000
--- a/src/material-moment-adapter/tsconfig-es5.json
+++ /dev/null
@@ -1,41 +0,0 @@
-// TypeScript config file that is used to compile the moment-adapter package into ES5.
-// TODO: Remove this file in favor of overrides when we update to ngc 5.x
-{
-  "compilerOptions": {
-    // Needed for Moment.js since it doesn't have a default export.
-    "allowSyntheticDefaultImports": true,
-    "baseUrl": ".",
-    "declaration": false,
-    "stripInternal": false,
-    "experimentalDecorators": true,
-    "noUnusedParameters": true,
-    "strictNullChecks": true,
-    "importHelpers": true,
-    "newLine": "lf",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/material-moment-adapter/esm5",
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "types": [],
-    "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*"],
-      "@angular/material": ["../../dist/packages/material"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*"]
-    }
-  },
-  "files": [
-    "public-api.ts"
-  ],
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true,
-    "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material-moment-adapter",
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index 3d8227e9d7d6..8eaa3a63dc3c 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -11,9 +11,6 @@ const {packagesDir, outputDir} = buildConfig;
 /** Name of the tsconfig file that is responsible for building an ES2015 package. */
 const buildTsconfigName = 'tsconfig-build.json';
 
-/** Name of the tsconfig file that is responsible for building an ES5 package. */
-const es5TsconfigName = 'tsconfig-es5.json';
-
 /** Name of the tsconfig file that is responsible for building the tests. */
 const testsTsconfigName = 'tsconfig-tests.json';
 
@@ -98,8 +95,8 @@ export class BuildPackage {
   /** Compiles TS into both ES2015 and ES5, then updates exports. */
   private async _compileBothTargets(p = '') {
     return compileEntryPoint(this, buildTsconfigName, p)
-        .then(() => compileEntryPoint(this, es5TsconfigName, p))
-        .then(() => renamePrivateReExportsToBeUnique(this, p));
+      .then(() => compileEntryPoint(this, buildTsconfigName, p, this.esm5OutputDir))
+      .then(() => renamePrivateReExportsToBeUnique(this, p));
   }
 
   /** Compiles the TypeScript sources of a primary or secondary entry point. */
diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts
index 9f211e15d621..b62e52e07668 100644
--- a/tools/package-tools/compile-entry-point.ts
+++ b/tools/package-tools/compile-entry-point.ts
@@ -10,13 +10,19 @@ let nextId = 0;
 
 /** Compiles the TypeScript sources of a primary or secondary entry point. */
 export async function compileEntryPoint(buildPackage: BuildPackage, tsconfigName: string,
-                                          secondaryEntryPoint = '') {
+                                          secondaryEntryPoint = '', es5OutputPath?: string) {
   const entryPointPath = join(buildPackage.sourceDir, secondaryEntryPoint);
   const entryPointTsconfigPath = join(entryPointPath, tsconfigName);
+  const ngcFlags = ['-p', entryPointTsconfigPath];
+
+  if (es5OutputPath) {
+    ngcFlags.push('--outDir', es5OutputPath);
+    ngcFlags.push('--target', 'ES5');
+  }
 
   return new Promise((resolve, reject) => {
     const ngcPath = resolvePath('./node_modules/.bin/ngc');
-    const childProcess = spawn(ngcPath, ['-p', entryPointTsconfigPath], {shell: true});
+    const childProcess = spawn(ngcPath, ngcFlags, {shell: true});
 
     // Pipe stdout and stderr from the child process.
     childProcess.stdout.on('data', (data: any) => console.log(`${data}`));

From b65c642205626b600081dc94ec3cdac3fcf30ea0 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Mon, 6 Nov 2017 14:14:09 -0800
Subject: [PATCH 442/575] Fix changelog bullet indentation (#8260)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b850ee07cc6d..e8514d6f7d89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,7 +61,7 @@
    - `onOpen` -> `opened`
    - `onClose` -> `closed`
    - `change` -> `selectionChange`
- -  `mat-sidenav` / `mat-drawer`
+ - `mat-sidenav` / `mat-drawer`
    - `open` -> `opened`
    - `close` -> `closed`
  - `mat-menu`

From 0c257705a3dbb8d66222e814ae82c938b01f39bd Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 6 Nov 2017 22:15:33 +0000
Subject: [PATCH 443/575] build: fix screenshot-tool app deployment (#8174)

---
 tools/screenshot-test/package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/screenshot-test/package.json b/tools/screenshot-test/package.json
index 7e70981adbd1..726f23be3ca7 100644
--- a/tools/screenshot-test/package.json
+++ b/tools/screenshot-test/package.json
@@ -10,27 +10,27 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^5.0.0",
-    "@angular/cdk": "angular/cdk-builds",
+    "@angular/cdk": "github:angular/cdk-builds#master",
     "@angular/common": "^5.0.0",
     "@angular/compiler": "^5.0.0",
     "@angular/compiler-cli": "^5.0.0",
     "@angular/core": "^5.0.0",
     "@angular/forms": "^5.0.0",
-    "@angular/material": "angular/material2-builds",
+    "@angular/material": "github:angular/material2-builds#master",
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
     "@angular/router": "^5.0.0",
     "core-js": "^2.4.1",
     "firebase": "^3.7.6",
-    "rxjs": "^5.0.1",
+    "rxjs": "^5.5.0",
     "ts-helpers": "^1.1.1",
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/cli": "^1.0.0",
+    "@angular/cli": "^1.4.9",
     "@angular/compiler-cli": "^5.0.0",
     "@types/node": "^6.0.42",
     "ts-node": "1.2.1",
-    "typescript": "~2.2.1"
+    "typescript": "~2.4.2"
   }
 }

From 2667c017cdc2ab9e53b8e96ff06ec04e913ca1d7 Mon Sep 17 00:00:00 2001
From: Andrew Scott <atscott01@gmail.com>
Date: Mon, 6 Nov 2017 14:16:11 -0800
Subject: [PATCH 444/575] chore(docs): update autocomplete-filter-example.ts
 (#8167)

---
 .../autocomplete-filter/autocomplete-filter-example.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts b/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts
index dde59515e0db..ffa103ae0cef 100644
--- a/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts
+++ b/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts
@@ -26,8 +26,8 @@ export class AutocompleteFilterExample {
 
    ngOnInit() {
       this.filteredOptions = this.myControl.valueChanges
-         .startWith(null)
-         .map(val => val ? this.filter(val) : this.options.slice());
+         .startWith('')
+         .map(val => this.filter(val));
    }
 
     filter(val: string): string[] {

From 020ed61e87082d9c9c302d5229889d8853971390 Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewseguin@users.noreply.github.com>
Date: Mon, 6 Nov 2017 14:16:51 -0800
Subject: [PATCH 445/575] docs(table): add selection example (#8161)

* Add comment

* newline

* triple equals
---
 .../table-selection-example.css               | 15 +++++
 .../table-selection-example.html              | 49 +++++++++++++++
 .../table-selection-example.ts                | 61 +++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 src/material-examples/table-selection/table-selection-example.css
 create mode 100644 src/material-examples/table-selection/table-selection-example.html
 create mode 100644 src/material-examples/table-selection/table-selection-example.ts

diff --git a/src/material-examples/table-selection/table-selection-example.css b/src/material-examples/table-selection/table-selection-example.css
new file mode 100644
index 000000000000..3054e3cfbffb
--- /dev/null
+++ b/src/material-examples/table-selection/table-selection-example.css
@@ -0,0 +1,15 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+  max-height: 500px;
+  min-width: 300px;
+}
+
+.mat-table {
+  overflow: auto;
+  max-height: 500px;
+}
+
+.mat-column-select {
+  overflow: initial;
+}
diff --git a/src/material-examples/table-selection/table-selection-example.html b/src/material-examples/table-selection/table-selection-example.html
new file mode 100644
index 000000000000..d9c1135d317d
--- /dev/null
+++ b/src/material-examples/table-selection/table-selection-example.html
@@ -0,0 +1,49 @@
+<div class="example-container mat-elevation-z8">
+  <mat-table #table [dataSource]="dataSource">
+
+    <!-- Checkbox Column -->
+    <ng-container matColumnDef="select">
+      <mat-header-cell *matHeaderCellDef>
+        <mat-checkbox (change)="$event ? masterToggle() : null"
+                      [checked]="selection.hasValue() && isAllSelected()"
+                      [indeterminate]="selection.hasValue() && !isAllSelected()">
+        </mat-checkbox>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let row">
+        <mat-checkbox (click)="$event.stopPropagation()"
+                      (change)="$event ? selection.toggle(row) : null"
+                      [checked]="selection.isSelected(row)">
+        </mat-checkbox>
+      </mat-cell>
+    </ng-container>
+
+    <!-- Position Column -->
+    <ng-container matColumnDef="position">
+      <mat-header-cell *matHeaderCellDef> No. </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.position}} </mat-cell>
+    </ng-container>
+
+    <!-- Name Column -->
+    <ng-container matColumnDef="name">
+      <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.name}} </mat-cell>
+    </ng-container>
+
+    <!-- Weight Column -->
+    <ng-container matColumnDef="weight">
+      <mat-header-cell *matHeaderCellDef> Weight </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.weight}} </mat-cell>
+    </ng-container>
+
+    <!-- Color Column -->
+    <ng-container matColumnDef="symbol">
+      <mat-header-cell *matHeaderCellDef> Symbol </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.symbol}} </mat-cell>
+    </ng-container>
+
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"
+             (click)="selection.toggle(row)">
+    </mat-row>
+  </mat-table>
+</div>
diff --git a/src/material-examples/table-selection/table-selection-example.ts b/src/material-examples/table-selection/table-selection-example.ts
new file mode 100644
index 000000000000..88e72ead84cb
--- /dev/null
+++ b/src/material-examples/table-selection/table-selection-example.ts
@@ -0,0 +1,61 @@
+import {Component} from '@angular/core';
+import {MatTableDataSource} from '@angular/material';
+import {SelectionModel} from '@angular/cdk/collections';
+
+/**
+ * @title Table with selection
+ */
+@Component({
+  selector: 'table-selection-example',
+  styleUrls: ['table-selection-example.css'],
+  templateUrl: 'table-selection-example.html',
+})
+export class TableSelectionExample {
+  displayedColumns = ['select', 'position', 'name', 'weight', 'symbol'];
+  dataSource = new MatTableDataSource<Element>(ELEMENT_DATA);
+  selection = new SelectionModel<Element>(true, []);
+
+  /** Whether the number of selected elements matches the total number of rows. */
+  isAllSelected() {
+    const numSelected = this.selection.selected.length;
+    const numRows = this.dataSource.data.length;
+    return numSelected === numRows;
+  }
+
+  /** Selects all rows if they are not all selected; otherwise clear selection. */
+  masterToggle() {
+    this.isAllSelected() ?
+        this.selection.clear() :
+        this.dataSource.data.forEach(row => this.selection.select(row));
+  }
+}
+
+export interface Element {
+  name: string;
+  position: number;
+  weight: number;
+  symbol: string;
+}
+
+const ELEMENT_DATA: Element[] = [
+  {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'},
+  {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'},
+  {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'},
+  {position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be'},
+  {position: 5, name: 'Boron', weight: 10.811, symbol: 'B'},
+  {position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C'},
+  {position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N'},
+  {position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O'},
+  {position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F'},
+  {position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne'},
+  {position: 11, name: 'Sodium', weight: 22.9897, symbol: 'Na'},
+  {position: 12, name: 'Magnesium', weight: 24.305, symbol: 'Mg'},
+  {position: 13, name: 'Aluminum', weight: 26.9815, symbol: 'Al'},
+  {position: 14, name: 'Silicon', weight: 28.0855, symbol: 'Si'},
+  {position: 15, name: 'Phosphorus', weight: 30.9738, symbol: 'P'},
+  {position: 16, name: 'Sulfur', weight: 32.065, symbol: 'S'},
+  {position: 17, name: 'Chlorine', weight: 35.453, symbol: 'Cl'},
+  {position: 18, name: 'Argon', weight: 39.948, symbol: 'Ar'},
+  {position: 19, name: 'Potassium', weight: 39.0983, symbol: 'K'},
+  {position: 20, name: 'Calcium', weight: 40.078, symbol: 'Ca'},
+];

From c088a0f3723e2a1088c4fa3996a8395d8b1e2d43 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 6 Nov 2017 14:17:35 -0800
Subject: [PATCH 446/575] test(select): switch all select tests to fakeAsync
 (#7913)

---
 src/lib/select/select.spec.ts   | 1716 +++++++++++++++----------------
 tools/gulp/tasks/development.ts |   10 +-
 2 files changed, 839 insertions(+), 887 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 4a81af1952e7..45cb03cf0c59 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -4,9 +4,9 @@ import {OverlayContainer} from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
 import {
-  dispatchFakeEvent,
-  dispatchEvent,
   createKeyboardEvent,
+  dispatchEvent,
+  dispatchFakeEvent,
   dispatchKeyboardEvent,
   wrappedErrorMessage,
 } from '@angular/cdk/testing';
@@ -19,7 +19,7 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
-import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
+import {ComponentFixture, fakeAsync, flush, inject, TestBed, tick} from '@angular/core/testing';
 import {
   ControlValueAccessor,
   FormControl,
@@ -31,11 +31,11 @@ import {
   Validators,
 } from '@angular/forms';
 import {
+  ErrorStateMatcher,
   extendObject,
   FloatPlaceholderType,
   MAT_PLACEHOLDER_GLOBAL_OPTIONS,
   MatOption,
-  ErrorStateMatcher,
 } from '@angular/material/core';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
@@ -50,11 +50,10 @@ import {
   getMatSelectNonFunctionValueError
 } from './select-errors';
 
-/** Duration of the select opening animation. */
-const SELECT_OPEN_ANIMATION = 200;
+/** The debounce interval when typing letters to select an option. */
+const LETTER_KEY_DEBOUNCE_INTERVAL = 200;
 
-/** Duration of the select closing animation and the timeout interval for the backdrop. */
-const SELECT_CLOSE_ANIMATION = 500;
+const platform = new Platform();
 
 
 describe('MatSelect', () => {
@@ -63,7 +62,7 @@ describe('MatSelect', () => {
   let scrolledSubject = new Subject();
   let viewportRuler: ViewportRuler;
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         MatFormFieldModule,
@@ -128,49 +127,47 @@ describe('MatSelect', () => {
     }).compileComponents();
   }));
 
-  beforeEach(inject([ViewportRuler], (_ruler: ViewportRuler) => {
+  beforeEach(fakeAsync(inject([ViewportRuler], (_ruler: ViewportRuler) => {
     viewportRuler = _ruler;
-  }));
+  })));
 
-  afterEach(() => {
+  afterEach(fakeAsync(() => {
     document.body.removeChild(overlayContainerElement);
-  });
+  }));
 
   it('should select the proper option when the list of options is initialized at a later point',
-    async(() => {
-      let fixture = TestBed.createComponent(SelectInitWithoutOptions);
-      let instance = fixture.componentInstance;
+      fakeAsync(() => {
+        let fixture = TestBed.createComponent(SelectInitWithoutOptions);
+        let instance = fixture.componentInstance;
 
-      fixture.detectChanges();
+        fixture.detectChanges();
+        flush();
 
-      // Wait for the initial writeValue promise.
-      fixture.whenStable().then(() => {
+        // Wait for the initial writeValue promise.
         expect(instance.select.selected).toBeFalsy();
 
         instance.addOptions();
         fixture.detectChanges();
+        flush();
 
         // Wait for the next writeValue promise.
-        fixture.whenStable().then(() => {
-          expect(instance.select.selected).toBe(instance.options.toArray()[1]);
-        });
-      });
-    }));
+        expect(instance.select.selected).toBe(instance.options.toArray()[1]);
+      }));
 
   describe('overlay panel', () => {
     let fixture: ComponentFixture<BasicSelect>;
     let trigger: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    });
+    }));
 
     it('should open the panel when trigger is clicked', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.select.panelOpen).toBe(true);
       expect(overlayContainerElement.textContent).toContain('Steak');
@@ -181,12 +178,12 @@ describe('MatSelect', () => {
     it('should close the panel when an item is clicked', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(overlayContainerElement.textContent).toEqual('');
       expect(fixture.componentInstance.select.panelOpen).toBe(false);
@@ -195,31 +192,31 @@ describe('MatSelect', () => {
     it('should close the panel when a click occurs outside the panel', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const backdrop =
           overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
 
       backdrop.click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(overlayContainerElement.textContent).toEqual('');
       expect(fixture.componentInstance.select.panelOpen).toBe(false);
     }));
 
-    it('should set the width of the overlay based on the trigger', async(() => {
+    it('should set the width of the overlay based on the trigger', fakeAsync(() => {
       trigger.style.width = '200px';
 
-      fixture.whenStable().then(() => {
-        trigger.click();
-        fixture.detectChanges();
-        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-        expect(pane.style.minWidth).toBe('200px');
-      });
+      trigger.click();
+      fixture.detectChanges();
+      flush();
+
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(pane.style.minWidth).toBe('200px');
     }));
 
-    it('should set the width of the overlay if the element was hidden initially', async(() => {
+    it('should set the width of the overlay if the element was hidden initially', fakeAsync(() => {
       let initiallyHidden = TestBed.createComponent(BasicSelectInitiallyHidden);
 
       initiallyHidden.detectChanges();
@@ -229,16 +226,15 @@ describe('MatSelect', () => {
       initiallyHidden.componentInstance.isVisible = true;
       initiallyHidden.detectChanges();
 
-      initiallyHidden.whenStable().then(() => {
-        trigger.click();
-        initiallyHidden.detectChanges();
+      trigger.click();
+      initiallyHidden.detectChanges();
+      flush();
 
-        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-        expect(pane.style.minWidth).toBe('200px');
-      });
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(pane.style.minWidth).toBe('200px');
     }));
 
-    it('should not attempt to open a select that does not have any options', () => {
+    it('should not attempt to open a select that does not have any options', fakeAsync(() => {
       fixture.componentInstance.foods = [];
       fixture.detectChanges();
 
@@ -246,7 +242,7 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(fixture.componentInstance.select.panelOpen).toBe(false);
-    });
+    }));
 
     it('should set the width of the overlay if there is no placeholder', fakeAsync(() => {
       let noPlaceholder = TestBed.createComponent(BasicSelectNoPlaceholder);
@@ -256,7 +252,7 @@ describe('MatSelect', () => {
 
       trigger.click();
       noPlaceholder.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
       expect(parseInt(pane.style.minWidth as string)).toBeGreaterThan(0);
@@ -265,12 +261,13 @@ describe('MatSelect', () => {
     it('should close the panel when tabbing out', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
+
       expect(fixture.componentInstance.select.panelOpen).toBe(true);
 
       dispatchKeyboardEvent(trigger, 'keydown', TAB);
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.select.panelOpen).toBe(false);
     }));
@@ -281,7 +278,7 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const event = dispatchKeyboardEvent(trigger, 'keydown', HOME);
       fixture.detectChanges();
@@ -296,7 +293,7 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const event = dispatchKeyboardEvent(trigger, 'keydown', END);
       fixture.detectChanges();
@@ -305,7 +302,7 @@ describe('MatSelect', () => {
       expect(event.defaultPrevented).toBe(true);
     }));
 
-    it('should be able to set extra classes on the panel', () => {
+    it('should be able to set extra classes on the panel', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -313,9 +310,9 @@ describe('MatSelect', () => {
 
       expect(panel.classList).toContain('custom-one');
       expect(panel.classList).toContain('custom-two');
-    });
+    }));
 
-    it('should prevent the default action when pressing SPACE on an option', () => {
+    it('should prevent the default action when pressing SPACE on an option', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -323,9 +320,9 @@ describe('MatSelect', () => {
       const event = dispatchKeyboardEvent(option, 'keydown', SPACE);
 
       expect(event.defaultPrevented).toBe(true);
-    });
+    }));
 
-    it('should prevent the default action when pressing ENTER on an option', () => {
+    it('should prevent the default action when pressing ENTER on an option', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -333,20 +330,20 @@ describe('MatSelect', () => {
       const event = dispatchKeyboardEvent(option, 'keydown', ENTER);
 
       expect(event.defaultPrevented).toBe(true);
-    });
+    }));
 
-    it('should update disableRipple properly on each option', () => {
+    it('should update disableRipple properly on each option', fakeAsync(() => {
       const options = fixture.componentInstance.options.toArray();
 
       expect(options.every(option => option.disableRipple === false))
-        .toBeTruthy('Expected all options to have disableRipple set to false initially.');
+          .toBeTruthy('Expected all options to have disableRipple set to false initially.');
 
       fixture.componentInstance.disableRipple = true;
       fixture.detectChanges();
 
       expect(options.every(option => option.disableRipple === true))
-        .toBeTruthy('Expected all options to have disableRipple set to true.');
-    });
+          .toBeTruthy('Expected all options to have disableRipple set to true.');
+    }));
 
     it('should not show ripples if they were disabled', fakeAsync(() => {
       fixture.componentInstance.disableRipple = true;
@@ -354,7 +351,7 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const option = overlayContainerElement.querySelector('mat-option')!;
 
@@ -370,22 +367,22 @@ describe('MatSelect', () => {
     let trigger: HTMLElement;
     let formField: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-    });
+    }));
 
-    it('should not float placeholder if no option is selected', () => {
+    it('should not float placeholder if no option is selected', fakeAsync(() => {
       expect(formField.classList.contains('mat-form-field-should-float'))
           .toBe(false, 'placeholder should not be floating');
-    });
+    }));
 
     it('should focus the first option if no option is selected', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(0);
     }));
@@ -393,43 +390,43 @@ describe('MatSelect', () => {
     it('should select an option when it is clicked', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       let option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
       expect(option.classList).toContain('mat-selected');
       expect(fixture.componentInstance.options.first.selected).toBe(true);
       expect(fixture.componentInstance.select.selected)
-        .toBe(fixture.componentInstance.options.first);
+          .toBe(fixture.componentInstance.options.first);
     }));
 
     it('should deselect other options when one is selected', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       let options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       expect(options[1].classList).not.toContain('mat-selected');
       expect(options[2].classList).not.toContain('mat-selected');
 
@@ -444,70 +441,68 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       let options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       options[0].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       control.setValue(foods[1].value);
       fixture.detectChanges();
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
       expect(options[0].classList)
-        .not.toContain('mat-selected', 'Expected first option to no longer be selected');
+          .not.toContain('mat-selected', 'Expected first option to no longer be selected');
       expect(options[1].classList)
-        .toContain('mat-selected', 'Expected second option to be selected');
+          .toContain('mat-selected', 'Expected second option to be selected');
 
       const optionInstances = fixture.componentInstance.options.toArray();
 
       expect(optionInstances[0].selected)
-        .toBe(false, 'Expected first option to no longer be selected');
+          .toBe(false, 'Expected first option to no longer be selected');
       expect(optionInstances[1].selected)
-        .toBe(true, 'Expected second option to be selected');
+          .toBe(true, 'Expected second option to be selected');
     }));
 
-    it('should remove selection if option has been removed', async(() => {
+    it('should remove selection if option has been removed', fakeAsync(() => {
       let select = fixture.componentInstance.select;
 
       trigger.click();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
+      let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
 
-        firstOption.click();
-        fixture.detectChanges();
+      firstOption.click();
+      fixture.detectChanges();
 
-        expect(select.selected).toBe(select.options.first, 'Expected first option to be selected.');
+      expect(select.selected).toBe(select.options.first, 'Expected first option to be selected.');
 
-        fixture.componentInstance.foods = [];
-        fixture.detectChanges();
+      fixture.componentInstance.foods = [];
+      fixture.detectChanges();
+      flush();
 
-        fixture.whenStable().then(() => {
-          expect(select.selected)
-            .toBeUndefined('Expected selection to be removed when option no longer exists.');
-        });
-      });
+      expect(select.selected)
+          .toBeUndefined('Expected selection to be removed when option no longer exists.');
     }));
 
     it('should display the selected option in the trigger', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       const value = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
 
@@ -518,14 +513,14 @@ describe('MatSelect', () => {
 
     it('should focus the selected option if an option is selected', fakeAsync(() => {
       // must wait for initial writeValue promise to finish
-      tick();
+      flush();
 
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       // must wait for animation to finish
       fixture.detectChanges();
@@ -536,34 +531,34 @@ describe('MatSelect', () => {
       fixture.componentInstance.foods.push({viewValue: 'Potatoes', value: 'potatoes-8'});
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[8].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(trigger.textContent).toContain('Potatoes');
       expect(fixture.componentInstance.select.selected)
-        .toBe(fixture.componentInstance.options.last);
+          .toBe(fixture.componentInstance.options.last);
     }));
 
-    it('should not select disabled options', () => {
+    it('should not select disabled options', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
       const options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[2].click();
       fixture.detectChanges();
 
       expect(fixture.componentInstance.select.panelOpen).toBe(true);
       expect(options[2].classList).not.toContain('mat-selected');
       expect(fixture.componentInstance.select.selected).toBeUndefined();
-    });
+    }));
 
-    it('should not select options inside a disabled group', () => {
+    it('should not select options inside a disabled group', fakeAsync(() => {
       fixture.destroy();
 
       const groupFixture = TestBed.createComponent(SelectWithGroups);
@@ -580,19 +575,18 @@ describe('MatSelect', () => {
       expect(groupFixture.componentInstance.select.panelOpen).toBe(true);
       expect(options[0].classList).not.toContain('mat-selected');
       expect(groupFixture.componentInstance.select.selected).toBeUndefined();
-    });
-
+    }));
   });
 
   describe('forms integration', () => {
     let fixture: ComponentFixture<BasicSelect>;
     let trigger: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    });
+    }));
 
     it('should take an initial view value with reactive forms', fakeAsync(() => {
       fixture.componentInstance.control = new FormControl('pizza-1');
@@ -605,7 +599,7 @@ describe('MatSelect', () => {
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
@@ -627,29 +621,29 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options =
-        overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList)
-        .toContain('mat-selected', `Expected option with the control's new value to be selected.`);
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      expect(options[1].classList).toContain(
+          'mat-selected', `Expected option with the control's new value to be selected.`);
     }));
 
     it('should update the form value when the view changes', fakeAsync(() => {
       expect(fixture.componentInstance.control.value)
-        .toEqual(null, `Expected the control's value to be empty initially.`);
+          .toEqual(null, `Expected the control's value to be empty initially.`);
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.value)
-        .toEqual('steak-0', `Expected control's value to be set to the new option.`);
+          .toEqual('steak-0', `Expected control's value to be set to the new option.`);
     }));
 
     it('should clear the selection when a nonexistent option value is selected', fakeAsync(() => {
@@ -667,7 +661,7 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
@@ -691,7 +685,7 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options =
           overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
@@ -701,70 +695,70 @@ describe('MatSelect', () => {
 
     it('should set the control to touched when the select is touched', fakeAsync(() => {
       expect(fixture.componentInstance.control.touched)
-        .toEqual(false, `Expected the control to start off as untouched.`);
+          .toEqual(false, `Expected the control to start off as untouched.`);
 
       trigger.click();
       dispatchFakeEvent(trigger, 'blur');
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.touched)
-        .toEqual(false, `Expected the control to stay untouched when menu opened.`);
+          .toEqual(false, `Expected the control to stay untouched when menu opened.`);
 
       const backdrop =
-        overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+          overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
       backdrop.click();
       dispatchFakeEvent(trigger, 'blur');
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.touched)
-        .toEqual(true, `Expected the control to be touched as soon as focus left the select.`);
+          .toEqual(true, `Expected the control to be touched as soon as focus left the select.`);
     }));
 
-    it('should not set touched when a disabled select is touched', () => {
+    it('should not set touched when a disabled select is touched', fakeAsync(() => {
       expect(fixture.componentInstance.control.touched)
-        .toBe(false, 'Expected the control to start off as untouched.');
+          .toBe(false, 'Expected the control to start off as untouched.');
 
       fixture.componentInstance.control.disable();
       dispatchFakeEvent(trigger, 'blur');
 
       expect(fixture.componentInstance.control.touched)
-        .toBe(false, 'Expected the control to stay untouched.');
-    });
+          .toBe(false, 'Expected the control to stay untouched.');
+    }));
 
     it('should set the control to dirty when the select value changes in the DOM', fakeAsync(() => {
       expect(fixture.componentInstance.control.dirty)
-        .toEqual(false, `Expected control to start out pristine.`);
+          .toEqual(false, `Expected control to start out pristine.`);
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
       option.click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.dirty)
-        .toEqual(true, `Expected control to be dirty after value was changed by user.`);
+          .toEqual(true, `Expected control to be dirty after value was changed by user.`);
     }));
 
-    it('should not set the control to dirty when the value changes programmatically', () => {
-      expect(fixture.componentInstance.control.dirty)
-        .toEqual(false, `Expected control to start out pristine.`);
-
-      fixture.componentInstance.control.setValue('pizza-1');
+    it('should not set the control to dirty when the value changes programmatically',
+        fakeAsync(() => {
+          expect(fixture.componentInstance.control.dirty)
+              .toEqual(false, `Expected control to start out pristine.`);
 
-      expect(fixture.componentInstance.control.dirty)
-        .toEqual(false, `Expected control to stay pristine after programmatic change.`);
-    });
+          fixture.componentInstance.control.setValue('pizza-1');
 
+          expect(fixture.componentInstance.control.dirty)
+              .toEqual(false, `Expected control to stay pristine after programmatic change.`);
+        }));
 
-    it('should set an asterisk after the placeholder if the control is required', () => {
+    it('should set an asterisk after the placeholder if the control is required', fakeAsync(() => {
       let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
       expect(requiredMarker)
-        .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
+          .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
 
       fixture.componentInstance.isRequired = true;
       fixture.detectChanges();
@@ -772,7 +766,7 @@ describe('MatSelect', () => {
       requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
       expect(requiredMarker)
           .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
-    });
+    }));
 
     it('should be able to programmatically select a falsy option', fakeAsync(() => {
       fixture.destroy();
@@ -783,14 +777,13 @@ describe('MatSelect', () => {
       falsyFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
       falsyFixture.componentInstance.control.setValue(0);
       falsyFixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       expect(falsyFixture.componentInstance.options.first.selected)
-        .toBe(true, 'Expected first option to be selected');
+          .toBe(true, 'Expected first option to be selected');
       expect(overlayContainerElement.querySelectorAll('mat-option')[0].classList)
-        .toContain('mat-selected', 'Expected first option to be selected');
+          .toContain('mat-selected', 'Expected first option to be selected');
     }));
-
   });
 
   describe('selection without Angular forms', () => {
@@ -804,11 +797,11 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.selectedFood).toBe('steak-0');
       expect(fixture.componentInstance.select.value).toBe('steak-0');
@@ -816,18 +809,18 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       (overlayContainerElement.querySelectorAll('mat-option')[2] as HTMLElement).click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.selectedFood).toBe('sandwich-2');
       expect(fixture.componentInstance.select.value).toBe('sandwich-2');
       expect(trigger.textContent).toContain('Sandwich');
     }));
 
-    it('should mark options as selected when the value is set', () => {
+    it('should mark options as selected when the value is set', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
       fixture.detectChanges();
@@ -844,7 +837,7 @@ describe('MatSelect', () => {
 
       expect(option.classList).toContain('mat-selected');
       expect(fixture.componentInstance.select.value).toBe('sandwich-2');
-    });
+    }));
 
     it('should reset the placeholder when a null value is set', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
@@ -856,11 +849,11 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.selectedFood).toBe('steak-0');
       expect(fixture.componentInstance.select.value).toBe('steak-0');
@@ -873,27 +866,26 @@ describe('MatSelect', () => {
       expect(trigger.textContent).not.toContain('Steak');
     }));
 
-    it('should reflect the preselected value', async(() => {
+    it('should reflect the preselected value', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutFormsPreselected);
 
       fixture.detectChanges();
-      fixture.whenStable().then(() => {
-        const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      flush();
 
-        fixture.detectChanges();
-        expect(trigger.textContent).toContain('Pizza');
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      fixture.detectChanges();
+      expect(trigger.textContent).toContain('Pizza');
 
-        trigger.click();
-        fixture.detectChanges();
+      trigger.click();
+      fixture.detectChanges();
 
-        const option = overlayContainerElement.querySelectorAll('mat-option')[1];
+      const option = overlayContainerElement.querySelectorAll('mat-option')[1];
 
-        expect(option.classList).toContain('mat-selected');
-        expect(fixture.componentInstance.select.value).toBe('pizza-1');
-      });
+      expect(option.classList).toContain('mat-selected');
+      expect(fixture.componentInstance.select.value).toBe('pizza-1');
     }));
 
-    it('should be able to select multiple values', () => {
+    it('should be able to select multiple values', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutFormsMultiple);
 
       fixture.detectChanges();
@@ -927,106 +919,103 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0', 'pizza-1', 'sandwich-2']);
       expect(fixture.componentInstance.select.value).toEqual(['steak-0', 'pizza-1', 'sandwich-2']);
       expect(trigger.textContent).toContain('Steak, Pizza, Sandwich');
-    });
+    }));
 
-    it('should restore focus to the host element', async(() => {
+    it('should restore focus to the host element', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
       fixture.detectChanges();
       fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
-        fixture.detectChanges();
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
+      fixture.detectChanges();
+      flush();
 
-        const select = fixture.debugElement.nativeElement.querySelector('mat-select');
+      const select = fixture.debugElement.nativeElement.querySelector('mat-select');
 
-        expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
-      });
+      expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
     }));
-
   });
 
   describe('disabled behavior', () => {
-    it('should disable itself when control is disabled programmatically', () => {
+    it('should disable itself when control is disabled programmatically', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
 
       fixture.componentInstance.control.disable();
       fixture.detectChanges();
       let trigger =
-        fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+          fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-        .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
+          .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
 
       trigger.click();
       fixture.detectChanges();
 
       expect(overlayContainerElement.textContent)
-        .toEqual('', `Expected select panel to stay closed.`);
+          .toEqual('', `Expected select panel to stay closed.`);
       expect(fixture.componentInstance.select.panelOpen)
-        .toBe(false, `Expected select panelOpen property to stay false.`);
+          .toBe(false, `Expected select panelOpen property to stay false.`);
 
       fixture.componentInstance.control.enable();
       fixture.detectChanges();
       expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-        .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
+          .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
 
       trigger.click();
       fixture.detectChanges();
 
       expect(overlayContainerElement.textContent)
-        .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
+          .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
       expect(fixture.componentInstance.select.panelOpen)
-        .toBe(true, `Expected select panelOpen property to become true.`);
-    });
+          .toBe(true, `Expected select panelOpen property to become true.`);
+    }));
 
-    it('should disable itself when control is disabled using the property', async(() => {
+    it('should disable itself when control is disabled using the property', fakeAsync(() => {
       const fixture = TestBed.createComponent(NgModelSelect);
       fixture.detectChanges();
 
       fixture.componentInstance.isDisabled = true;
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        fixture.detectChanges();
-        let trigger =
+      fixture.detectChanges();
+      let trigger =
           fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        expect(getComputedStyle(trigger).getPropertyValue('cursor'))
+      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
           .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
 
-        trigger.click();
-        fixture.detectChanges();
+      trigger.click();
+      fixture.detectChanges();
 
-        expect(overlayContainerElement.textContent)
+      expect(overlayContainerElement.textContent)
           .toEqual('', `Expected select panel to stay closed.`);
-        expect(fixture.componentInstance.select.panelOpen)
+      expect(fixture.componentInstance.select.panelOpen)
           .toBe(false, `Expected select panelOpen property to stay false.`);
 
-        fixture.componentInstance.isDisabled = false;
-        fixture.detectChanges();
+      fixture.componentInstance.isDisabled = false;
+      fixture.detectChanges();
+      flush();
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
-          expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-            .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
+      fixture.detectChanges();
+      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
+          .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
 
-          trigger.click();
-          fixture.detectChanges();
+      trigger.click();
+      fixture.detectChanges();
 
-          expect(overlayContainerElement.textContent)
-            .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
-          expect(fixture.componentInstance.select.panelOpen)
-            .toBe(true, `Expected select panelOpen property to become true.`);
-        });
-      });
+      expect(overlayContainerElement.textContent)
+          .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
+      expect(fixture.componentInstance.select.panelOpen)
+          .toBe(true, `Expected select panelOpen property to become true.`);
     }));
 
     it('should be able to preselect an array value in single-selection mode', fakeAsync(() => {
       const fixture = TestBed.createComponent(SingleSelectWithPreselectedArrayValues);
       fixture.detectChanges();
-      tick();
+      flush();
       fixture.detectChanges();
 
       const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
@@ -1034,11 +1023,10 @@ describe('MatSelect', () => {
       expect(trigger.textContent).toContain('Pizza');
       expect(fixture.componentInstance.options.toArray()[1].selected).toBe(true);
     }));
-
   });
 
   describe('misc forms', () => {
-    it('should support use inside a custom value accessor', () => {
+    it('should support use inside a custom value accessor', fakeAsync(() => {
       const fixture = TestBed.createComponent(CompWithCustomSelect);
       spyOn(fixture.componentInstance.customAccessor, 'writeValue');
       fixture.detectChanges();
@@ -1046,8 +1034,7 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.customAccessor.select.ngControl)
           .toBe(null, 'Expected mat-select NOT to inherit control from parent value accessor.');
       expect(fixture.componentInstance.customAccessor.writeValue).toHaveBeenCalled();
-    });
-
+    }));
   });
 
   describe('animations', () => {
@@ -1068,16 +1055,15 @@ describe('MatSelect', () => {
           .toBe(false, 'Expected placeholder to initially have a normal position.');
 
       fixture.componentInstance.select.open();
-      tick();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       expect(formField.classList).toContain('mat-form-field-should-float',
           'Expected placeholder to animate up to floating position.');
 
       fixture.componentInstance.select.close();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(formField.classList).not.toContain('mat-form-field-should-float',
           'Expected placeholder to animate back down to normal position.');
@@ -1091,7 +1077,7 @@ describe('MatSelect', () => {
 
       expect(panel.classList).not.toContain('mat-select-panel-done-animating');
 
-      tick(250);
+      flush();
       fixture.detectChanges();
 
       expect(panel.classList).toContain('mat-select-panel-done-animating');
@@ -1104,13 +1090,13 @@ describe('MatSelect', () => {
     let select: HTMLElement;
     let formField: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
       formField = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
-    });
+    }));
 
     /**
      * Asserts that the given option is aligned with the trigger.
@@ -1118,7 +1104,7 @@ describe('MatSelect', () => {
      * @param selectInstance Instance of the `mat-select` component to check against.
      */
     function checkTriggerAlignedWithOption(index: number, selectInstance =
-      fixture.componentInstance.select): void {
+        fixture.componentInstance.select): void {
 
       const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
       const triggerTop = trigger.getBoundingClientRect().top;
@@ -1151,99 +1137,101 @@ describe('MatSelect', () => {
     }
 
     describe('ample space to open', () => {
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         // these styles are necessary because we are first testing the overlay's position
         // if there is room for it to open to its full extent in either direction.
         formField.style.position = 'fixed';
         formField.style.top = '285px';
         formField.style.left = '20px';
-      });
+      }));
 
-      it('should align the first option with trigger text if no option is selected', async(() => {
-        trigger.click();
-        fixture.detectChanges();
+      it('should align the first option with trigger text if no option is selected',
+          fakeAsync(() => {
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        fixture.whenStable().then(() => {
-          // The panel should be scrolled to 0 because centering the option is not possible.
-          expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
-          checkTriggerAlignedWithOption(0);
-        });
-      }));
+            // The panel should be scrolled to 0 because centering the option is not possible.
+            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+            checkTriggerAlignedWithOption(0);
+          }));
 
       it('should align a selected option too high to be centered with the trigger text',
-        async(() => {
-          // Select the second option, because it can't be scrolled any further downward
-          fixture.componentInstance.control.setValue('pizza-1');
-          fixture.detectChanges();
+          fakeAsync(() => {
+            // Select the second option, because it can't be scrolled any further downward
+            fixture.componentInstance.control.setValue('pizza-1');
+            fixture.detectChanges();
 
-          trigger.click();
-          fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-          fixture.whenStable().then(() => {
             // The panel should be scrolled to 0 because centering the option is not possible.
             expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
             checkTriggerAlignedWithOption(1);
-          });
-        }));
+          }));
 
-      it('should align a selected option in the middle with the trigger text', async(() => {
+      it('should align a selected option in the middle with the trigger text', fakeAsync(() => {
         // Select the fifth option, which has enough space to scroll to the center
         fixture.componentInstance.control.setValue('chips-4');
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          trigger.click();
-          fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-          fixture.whenStable().then(() => {
-            // The selected option should be scrolled to the center of the panel.
-            // This will be its original offset from the scrollTop - half the panel height + half
-            // the option height. 4 (index) * 48 (option height) = 192px offset from scrollTop
-            // 192 - 256/2 + 48/2 = 88px
-            expect(scrollContainer.scrollTop)
-              .toEqual(88, `Expected overlay panel to be scrolled to center the selected option.`);
+        // The selected option should be scrolled to the center of the panel.
+        // This will be its original offset from the scrollTop - half the panel height + half
+        // the option height. 4 (index) * 48 (option height) = 192px offset from scrollTop
+        // 192 - 256/2 + 48/2 = 88px
+        expect(scrollContainer.scrollTop)
+            .toEqual(88, `Expected overlay panel to be scrolled to center the selected option.`);
 
-            checkTriggerAlignedWithOption(4);
-          });
-        });
+        checkTriggerAlignedWithOption(4);
       }));
 
-      it('should align a selected option at the scroll max with the trigger text', async(() => {
+      it('should align a selected option at the scroll max with the trigger text', fakeAsync(() => {
         // Select the last option in the list
         fixture.componentInstance.control.setValue('sushi-7');
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          trigger.click();
-          fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-          fixture.whenStable().then(() => {
-            // The selected option should be scrolled to the max scroll position.
-            // This will be the height of the scrollContainer - the panel height.
-            // 8 options * 48px = 384 scrollContainer height, 384 - 256 = 128px max scroll
-            expect(scrollContainer.scrollTop)
-                .toEqual(128, `Expected overlay panel to be scrolled to its maximum position.`);
+        // The selected option should be scrolled to the max scroll position.
+        // This will be the height of the scrollContainer - the panel height.
+        // 8 options * 48px = 384 scrollContainer height, 384 - 256 = 128px max scroll
+        expect(scrollContainer.scrollTop)
+            .toEqual(128, `Expected overlay panel to be scrolled to its maximum position.`);
 
-            checkTriggerAlignedWithOption(7);
-          });
-        });
+        checkTriggerAlignedWithOption(7);
       }));
 
-      it('should account for preceding label groups when aligning the option', async(() => {
+      it('should account for preceding label groups when aligning the option', fakeAsync(() => {
+        // Test is off-by-one on edge for some reason, but verified that it looks correct through
+        // manual testing.
+        if (platform.EDGE) {
+          return;
+        }
+
         fixture.destroy();
 
         let groupFixture = TestBed.createComponent(SelectWithGroups);
         groupFixture.detectChanges();
         trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
         select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
+        formField = groupFixture.debugElement.query(By.css('mat-form-field')).nativeElement;
 
         formField.style.position = 'fixed';
         formField.style.top = '200px';
@@ -1255,133 +1243,132 @@ describe('MatSelect', () => {
 
         trigger.click();
         groupFixture.detectChanges();
+        flush();
 
         const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-        fixture.whenStable().then(() => {
-          // The selected option should be scrolled to the center of the panel.
-          // This will be its original offset from the scrollTop - half the panel height + half the
-          // option height. 10 (option index + 3 group labels before it) * 48 (option height) = 480
-          // 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
-          expect(Math.floor(scrollContainer.scrollTop))
-              .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
+        // The selected option should be scrolled to the center of the panel.
+        // This will be its original offset from the scrollTop - half the panel height + half the
+        // option height. 10 (option index + 3 group labels before it) * 48 (option height) = 480
+        // 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
+        expect(Math.floor(scrollContainer.scrollTop))
+            .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
 
-          checkTriggerAlignedWithOption(7, groupFixture.componentInstance.select);
-        });
+        checkTriggerAlignedWithOption(7, groupFixture.componentInstance.select);
       }));
     });
 
     describe('limited space to open vertically', () => {
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         formField.style.position = 'fixed';
         formField.style.left = '20px';
-      });
+      }));
 
-      it('should adjust position of centered option if there is little space above', async(() => {
-        const selectMenuHeight = 256;
-        const selectMenuViewportPadding = 8;
-        const selectItemHeight = 48;
-        const selectedIndex = 4;
-        const fontSize = 16;
-        const lineHeightEm = 1.125;
-        const expectedExtraScroll = 5;
+      it('should adjust position of centered option if there is little space above',
+          fakeAsync(() => {
+            const selectMenuHeight = 256;
+            const selectMenuViewportPadding = 8;
+            const selectItemHeight = 48;
+            const selectedIndex = 4;
+            const fontSize = 16;
+            const lineHeightEm = 1.125;
+            const expectedExtraScroll = 5;
 
-        // Trigger element height.
-        const triggerHeight = fontSize * lineHeightEm;
+            // Trigger element height.
+            const triggerHeight = fontSize * lineHeightEm;
 
-        // Ideal space above selected item in order to center it.
-        const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
+            // Ideal space above selected item in order to center it.
+            const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
 
-        // Actual space above selected item.
-        const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
+            // Actual space above selected item.
+            const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
 
-        // Ideal scroll position to center.
-        const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
+            // Ideal scroll position to center.
+            const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
 
-        // Top-most select-position that allows for perfect centering.
-        const topMostPositionForPerfectCentering =
-            idealSpaceAboveSelectedItem + selectMenuViewportPadding +
-            (selectItemHeight - triggerHeight) / 2;
+            // Top-most select-position that allows for perfect centering.
+            const topMostPositionForPerfectCentering =
+                idealSpaceAboveSelectedItem + selectMenuViewportPadding +
+                (selectItemHeight - triggerHeight) / 2;
 
-        // Position of select relative to top edge of mat-form-field.
-        const formFieldTopSpace =
-            trigger.getBoundingClientRect().top - formField.getBoundingClientRect().top;
+            // Position of select relative to top edge of mat-form-field.
+            const formFieldTopSpace =
+                trigger.getBoundingClientRect().top - formField.getBoundingClientRect().top;
 
-        const formFieldTop =
-            topMostPositionForPerfectCentering - formFieldTopSpace - expectedExtraScroll;
+            const formFieldTop =
+                topMostPositionForPerfectCentering - formFieldTopSpace - expectedExtraScroll;
 
-        formField.style.top = `${formFieldTop}px`;
+            formField.style.top = `${formFieldTop}px`;
 
-        // Select an option in the middle of the list
-        fixture.componentInstance.control.setValue('chips-4');
-        fixture.detectChanges();
+            // Select an option in the middle of the list
+            fixture.componentInstance.control.setValue('chips-4');
+            fixture.detectChanges();
+            flush();
 
-        fixture.whenStable().then(() => {
-          trigger.click();
-          fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-          fixture.whenStable().then(() => {
             expect(Math.ceil(scrollContainer.scrollTop))
                 .toEqual(Math.ceil(idealScrollTop + 5),
                     `Expected panel to adjust scroll position to fit in viewport.`);
 
             checkTriggerAlignedWithOption(4);
-          });
-        });
-      }));
+          }));
 
-      it('should adjust position of centered option if there is little space below', async(() => {
-        const selectMenuHeight = 256;
-        const selectMenuViewportPadding = 8;
-        const selectItemHeight = 48;
-        const selectedIndex = 4;
-        const fontSize = 16;
-        const lineHeightEm = 1.125;
-        const expectedExtraScroll = 5;
+      it('should adjust position of centered option if there is little space below',
+          fakeAsync(() => {
+            const selectMenuHeight = 256;
+            const selectMenuViewportPadding = 8;
+            const selectItemHeight = 48;
+            const selectedIndex = 4;
+            const fontSize = 16;
+            const lineHeightEm = 1.125;
+            const expectedExtraScroll = 5;
 
-        // Trigger element height.
-        const triggerHeight = fontSize * lineHeightEm;
+            // Trigger element height.
+            const triggerHeight = fontSize * lineHeightEm;
 
-        // Ideal space above selected item in order to center it.
-        const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
+            // Ideal space above selected item in order to center it.
+            const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
 
-        // Actual space above selected item.
-        const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
+            // Actual space above selected item.
+            const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
 
-        // Ideal scroll position to center.
-        const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
+            // Ideal scroll position to center.
+            const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
 
-        // Bottom-most select-position that allows for perfect centering.
-        const bottomMostPositionForPerfectCentering =
-            idealSpaceAboveSelectedItem + selectMenuViewportPadding +
-            (selectItemHeight - triggerHeight) / 2;
+            // Bottom-most select-position that allows for perfect centering.
+            const bottomMostPositionForPerfectCentering =
+                idealSpaceAboveSelectedItem + selectMenuViewportPadding +
+                (selectItemHeight - triggerHeight) / 2;
 
-        // Position of select relative to bottom edge of mat-form-field:
-        const formFieldBottomSpace =
-            formField.getBoundingClientRect().bottom - trigger.getBoundingClientRect().bottom;
+            // Position of select relative to bottom edge of mat-form-field:
+            const formFieldBottomSpace =
+                formField.getBoundingClientRect().bottom - trigger.getBoundingClientRect().bottom;
 
-        const formFieldBottom =
-            bottomMostPositionForPerfectCentering - formFieldBottomSpace - expectedExtraScroll;
+            const formFieldBottom =
+                bottomMostPositionForPerfectCentering - formFieldBottomSpace - expectedExtraScroll;
 
-        // Push the select to a position with not quite enough space on the bottom to open
-        // with the option completely centered (needs 113px at least: 256/2 - 48/2 + 9)
-        formField.style.bottom = `${formFieldBottom}px`;
+            // Push the select to a position with not quite enough space on the bottom to open
+            // with the option completely centered (needs 113px at least: 256/2 - 48/2 + 9)
+            formField.style.bottom = `${formFieldBottom}px`;
 
-        // Select an option in the middle of the list
-        fixture.componentInstance.control.setValue('chips-4');
-        fixture.detectChanges();
+            // Select an option in the middle of the list
+            fixture.componentInstance.control.setValue('chips-4');
+            fixture.detectChanges();
+            flush();
 
-        fixture.whenStable().then(() => {
-          fixture.detectChanges();
+            fixture.detectChanges();
 
-          trigger.click();
-          fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-          const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-          fixture.whenStable().then(() => {
             // Scroll should adjust by the difference between the bottom space available
             // (56px from the bottom of the screen - 8px padding = 48px)
             // and the height of the panel below the option (113px).
@@ -1396,56 +1383,55 @@ describe('MatSelect', () => {
                 .toBe(true, `Expected panel to adjust scroll position to fit in viewport.`);
 
             checkTriggerAlignedWithOption(4);
-          });
-        });
-      }));
+          }));
 
-      it('should fall back to "above" positioning if scroll adjustment will not help', async(() => {
-        // Push the select to a position with not enough space on the bottom to open
-        formField.style.bottom = '56px';
-        fixture.detectChanges();
+      it('should fall back to "above" positioning if scroll adjustment will not help',
+          fakeAsync(() => {
+            // Push the select to a position with not enough space on the bottom to open
+            formField.style.bottom = '56px';
+            fixture.detectChanges();
 
-        // Select an option that cannot be scrolled any farther upward
-        fixture.componentInstance.control.setValue('coke-0');
-        fixture.detectChanges();
+            // Select an option that cannot be scrolled any farther upward
+            fixture.componentInstance.control.setValue('coke-0');
+            fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-        fixture.whenStable().then(() => {
-          const overlayPane = document.querySelector('.cdk-overlay-pane')!;
-          const triggerBottom = trigger.getBoundingClientRect().bottom;
-          const overlayBottom = overlayPane.getBoundingClientRect().bottom;
-          const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
+            const overlayPane = document.querySelector('.cdk-overlay-pane')!;
+            const triggerBottom = trigger.getBoundingClientRect().bottom;
+            const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+            const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
 
-          // Expect no scroll to be attempted
-          expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+            // Expect no scroll to be attempted
+            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
 
-        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
+            const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
 
-        // Check that the values are within a pixel of each other. This avoids sub-pixel
-        // deviations between OS and browser versions.
-        expect(Math.abs(difference) < 2)
-            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
+            // Check that the values are within a pixel of each other. This avoids sub-pixel
+            // deviations between OS and browser versions.
+            expect(Math.abs(difference) < 2)
+                .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
 
-          expect(fixture.componentInstance.select._transformOrigin)
-              .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
-        });
-      }));
+            expect(fixture.componentInstance.select._transformOrigin)
+                .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
+          }));
 
-      it('should fall back to "below" positioning if scroll adjustment won\'t help', async(() => {
-        // Push the select to a position with not enough space on the top to open
-        formField.style.top = '85px';
+      it('should fall back to "below" positioning if scroll adjustment won\'t help',
+          fakeAsync(() => {
+            // Push the select to a position with not enough space on the top to open
+            formField.style.top = '85px';
 
-        // Select an option that cannot be scrolled any farther downward
-        fixture.componentInstance.control.setValue('sushi-7');
-        fixture.detectChanges();
+            // Select an option that cannot be scrolled any farther downward
+            fixture.componentInstance.control.setValue('sushi-7');
+            fixture.detectChanges();
+            flush();
 
-        fixture.whenStable().then(() => {
-          trigger.click();
-          fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-          fixture.whenStable().then(() => {
             const overlayPane = document.querySelector('.cdk-overlay-pane')!;
             const triggerTop = trigger.getBoundingClientRect().top;
             const overlayTop = overlayPane.getBoundingClientRect().top;
@@ -1459,105 +1445,92 @@ describe('MatSelect', () => {
 
             expect(fixture.componentInstance.select._transformOrigin)
                 .toContain(`top`, `Expected panel animation to originate at the top.`);
-          });
-        });
-      }));
+          }));
 
     });
 
     describe('limited space to open horizontally', () => {
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         formField.style.position = 'absolute';
         formField.style.top = '200px';
-      });
+      }));
 
-      it('should stay within the viewport when overflowing on the left in ltr', async(() => {
+      it('should stay within the viewport when overflowing on the left in ltr', fakeAsync(() => {
         formField.style.left = '-100px';
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const panelLeft = document.querySelector('.mat-select-panel')!
-              .getBoundingClientRect().left;
+        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-          expect(panelLeft).toBeGreaterThan(0,
-              `Expected select panel to be inside the viewport in ltr.`);
-        });
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in ltr.`);
       }));
 
-      it('should stay within the viewport when overflowing on the left in rtl', async(() => {
+      it('should stay within the viewport when overflowing on the left in rtl', fakeAsync(() => {
         dir.value = 'rtl';
         formField.style.left = '-100px';
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const panelLeft = document.querySelector('.mat-select-panel')!
-              .getBoundingClientRect().left;
+        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-          expect(panelLeft).toBeGreaterThan(0,
-              `Expected select panel to be inside the viewport in rtl.`);
-        });
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in rtl.`);
       }));
 
-      it('should stay within the viewport when overflowing on the right in ltr', async(() => {
+      it('should stay within the viewport when overflowing on the right in ltr', fakeAsync(() => {
         formField.style.right = '-100px';
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const viewportRect = viewportRuler.getViewportRect().right;
-          const panelRight = document.querySelector('.mat-select-panel')!
-              .getBoundingClientRect().right;
+        const viewportRect = viewportRuler.getViewportRect().right;
+        const panelRight = document.querySelector('.mat-select-panel')!
+            .getBoundingClientRect().right;
 
-          expect(viewportRect - panelRight).toBeGreaterThan(0,
-              `Expected select panel to be inside the viewport in ltr.`);
-        });
+        expect(viewportRect - panelRight).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in ltr.`);
       }));
 
-      it('should stay within the viewport when overflowing on the right in rtl', async(() => {
+      it('should stay within the viewport when overflowing on the right in rtl', fakeAsync(() => {
         dir.value = 'rtl';
         formField.style.right = '-100px';
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const viewportRect = viewportRuler.getViewportRect().right;
-          const panelRight = document.querySelector('.mat-select-panel')!
-              .getBoundingClientRect().right;
+        const viewportRect = viewportRuler.getViewportRect().right;
+        const panelRight = document.querySelector('.mat-select-panel')!
+            .getBoundingClientRect().right;
 
-          expect(viewportRect - panelRight).toBeGreaterThan(0,
-              `Expected select panel to be inside the viewport in rtl.`);
-        });
+        expect(viewportRect - panelRight).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in rtl.`);
       }));
 
       it('should keep the position within the viewport on repeat openings', fakeAsync(() => {
         formField.style.left = '-100px';
         trigger.click();
         fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
+        flush();
 
-        fixture.whenStable().then(() => {
-          let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+        let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-          expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
+        expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
 
-          fixture.componentInstance.select.close();
-          fixture.detectChanges();
+        fixture.componentInstance.select.close();
+        fixture.detectChanges();
+        flush();
 
-          fixture.whenStable().then(() => {
-            trigger.click();
-            fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-            fixture.whenStable().then(() => {
-              panelLeft = document.querySelector('.mat-select-panel')!
-                .getBoundingClientRect().left;
+        panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-              expect(panelLeft).toBeGreaterThan(0,
-                  `Expected select panel continue being inside the viewport.`);
-            });
-          });
-        });
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel continue being inside the viewport.`);
       }));
     });
 
@@ -1571,7 +1544,7 @@ describe('MatSelect', () => {
         document.documentElement.scrollTop = num;
       }
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         // Make the div above the select very tall, so the page will scroll
         fixture.componentInstance.heightAbove = 2000;
         fixture.detectChanges();
@@ -1580,9 +1553,9 @@ describe('MatSelect', () => {
         // Give the select enough horizontal space to open
         formField.style.marginLeft = '20px';
         formField.style.marginRight = '20px';
-      });
+      }));
 
-      it('should align the first option properly when scrolled', async(() => {
+      it('should align the first option properly when scrolled', fakeAsync(() => {
         // Give the select enough space to open
         fixture.componentInstance.heightBelow = 400;
         fixture.detectChanges();
@@ -1601,64 +1574,59 @@ describe('MatSelect', () => {
 
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          checkTriggerAlignedWithOption(0);
-        });
+        checkTriggerAlignedWithOption(0);
       }));
 
-      it('should align a centered option properly when scrolled', async(() => {
+      it('should align a centered option properly when scrolled', fakeAsync(() => {
         // Give the select enough space to open
         fixture.componentInstance.heightBelow = 400;
         fixture.detectChanges();
 
         fixture.componentInstance.control.setValue('chips-4');
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          // Scroll the select into view
-          setScrollTop(1700);
+        // Scroll the select into view
+        setScrollTop(1700);
 
-          // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
-          // body causes karma's iframe for the test to stretch to fit that content once we attempt
-          // to scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does
-          // not successfully constrain its size. As such, skip assertions in environments where the
-          // window size has changed since the start of the test.
-          if (window.innerHeight > startingWindowHeight) {
-            return;
-          }
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt
+        // to scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does
+        // not successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
 
-          trigger.click();
-          fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-          fixture.whenStable().then(() => {
-            checkTriggerAlignedWithOption(4);
-          });
-        });
+        checkTriggerAlignedWithOption(4);
       }));
 
       it('should align a centered option properly when scrolling while the panel is open',
-        async(() => {
-          fixture.componentInstance.heightBelow = 400;
-          fixture.componentInstance.heightAbove = 400;
-          fixture.componentInstance.control.setValue('chips-4');
-          fixture.detectChanges();
+          fakeAsync(() => {
+            fixture.componentInstance.heightBelow = 400;
+            fixture.componentInstance.heightAbove = 400;
+            fixture.componentInstance.control.setValue('chips-4');
+            fixture.detectChanges();
+            flush();
 
-          fixture.whenStable().then(() => {
             trigger.click();
             fixture.detectChanges();
+            flush();
 
-            fixture.whenStable().then(() => {
-              setScrollTop(100);
-              scrolledSubject.next();
-              fixture.detectChanges();
+            setScrollTop(100);
+            scrolledSubject.next();
+            fixture.detectChanges();
 
-              checkTriggerAlignedWithOption(4);
-            });
-          });
-        }));
+            checkTriggerAlignedWithOption(4);
+          }));
 
-      it('should fall back to "above" positioning properly when scrolled', async(() => {
+      it('should fall back to "above" positioning properly when scrolled', fakeAsync(() => {
         // Give the select insufficient space to open below the trigger
         fixture.componentInstance.heightAbove = 0;
         fixture.componentInstance.heightBelow = 100;
@@ -1679,21 +1647,20 @@ describe('MatSelect', () => {
 
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-          const triggerBottom = trigger.getBoundingClientRect().bottom;
-          const overlayBottom = overlayPane.getBoundingClientRect().bottom;
-          const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
+        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+        const triggerBottom = trigger.getBoundingClientRect().bottom;
+        const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
 
-          // Check that the values are within a pixel of each other. This avoids sub-pixel
-          // deviations between OS and browser versions.
-          expect(Math.abs(difference) < 2)
-              .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
-        });
+        // Check that the values are within a pixel of each other. This avoids sub-pixel
+        // deviations between OS and browser versions.
+        expect(Math.abs(difference) < 2)
+            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
       }));
 
-      it('should fall back to "below" positioning properly when scrolled', async(() => {
+      it('should fall back to "below" positioning properly when scrolled', fakeAsync(() => {
         // Give plenty of space for the select to open below the trigger
         fixture.componentInstance.heightBelow = 650;
         fixture.detectChanges();
@@ -1716,65 +1683,62 @@ describe('MatSelect', () => {
 
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-          const triggerTop = trigger.getBoundingClientRect().top;
-          const overlayTop = overlayPane.getBoundingClientRect().top;
+        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+        const triggerTop = trigger.getBoundingClientRect().top;
+        const overlayTop = overlayPane.getBoundingClientRect().top;
 
-          expect(Math.floor(overlayTop))
-              .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
-        });
+        expect(Math.floor(overlayTop))
+            .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
       }));
-
     });
 
     describe('x-axis positioning', () => {
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         formField.style.position = 'fixed';
         formField.style.left = '30px';
-      });
+      }));
 
-      it('should align the trigger and the selected option on the x-axis in ltr', async(() => {
+      it('should align the trigger and the selected option on the x-axis in ltr', fakeAsync(() => {
         trigger.click();
         fixture.detectChanges();
+        flush();
 
-        fixture.whenStable().then(() => {
-          const triggerLeft = trigger.getBoundingClientRect().left;
-          const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
-              .getBoundingClientRect().left;
+        const triggerLeft = trigger.getBoundingClientRect().left;
+        const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
+            .getBoundingClientRect().left;
 
-          // Each option is 32px wider than the trigger, so it must be adjusted 16px
-          // to ensure the text overlaps correctly.
-          expect(Math.floor(firstOptionLeft)).toEqual(Math.floor(triggerLeft - 16),
-              `Expected trigger to align with the selected option on the x-axis in LTR.`);
-        });
+        // Each option is 32px wider than the trigger, so it must be adjusted 16px
+        // to ensure the text overlaps correctly.
+        expect(Math.floor(firstOptionLeft)).toEqual(Math.floor(triggerLeft - 16),
+            `Expected trigger to align with the selected option on the x-axis in LTR.`);
       }));
 
-      it('should align the trigger and the selected option on the x-axis in rtl', async(() => {
+      it('should align the trigger and the selected option on the x-axis in rtl', fakeAsync(() => {
         dir.value = 'rtl';
         fixture.detectChanges();
 
         trigger.click();
         fixture.detectChanges();
-        fixture.whenStable().then(() => {
-          const triggerRight = trigger.getBoundingClientRect().right;
-          const firstOptionRight =
-              document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
-
-          // Each option is 32px wider than the trigger, so it must be adjusted 16px
-          // to ensure the text overlaps correctly.
-          expect(Math.floor(firstOptionRight))
-              .toEqual(Math.floor(triggerRight + 16),
-                  `Expected trigger to align with the selected option on the x-axis in RTL.`);
-        });
+        flush();
+
+        const triggerRight = trigger.getBoundingClientRect().right;
+        const firstOptionRight =
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+
+        // Each option is 32px wider than the trigger, so it must be adjusted 16px
+        // to ensure the text overlaps correctly.
+        expect(Math.floor(firstOptionRight))
+            .toEqual(Math.floor(triggerRight + 16),
+                `Expected trigger to align with the selected option on the x-axis in RTL.`);
       }));
     });
 
     describe('x-axis positioning in multi select mode', () => {
       let multiFixture: ComponentFixture<MultiSelect>;
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         multiFixture = TestBed.createComponent(MultiSelect);
         multiFixture.detectChanges();
         formField = multiFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
@@ -1783,46 +1747,44 @@ describe('MatSelect', () => {
 
         formField.style.position = 'fixed';
         formField.style.left = '60px';
-      });
+      }));
 
-      it('should adjust for the checkbox in ltr', async(() => {
+      it('should adjust for the checkbox in ltr', fakeAsync(() => {
         trigger.click();
         multiFixture.detectChanges();
+        flush();
 
-        multiFixture.whenStable().then(() => {
-          const triggerLeft = trigger.getBoundingClientRect().left;
-          const firstOptionLeft =
-              document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().left;
+        const triggerLeft = trigger.getBoundingClientRect().left;
+        const firstOptionLeft =
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().left;
 
-          // 44px accounts for the checkbox size, margin and the panel's padding.
-          expect(Math.floor(firstOptionLeft))
-              .toEqual(Math.floor(triggerLeft - 44),
-                  `Expected trigger label to align along x-axis, accounting for the checkbox.`);
-        });
+        // 44px accounts for the checkbox size, margin and the panel's padding.
+        expect(Math.floor(firstOptionLeft))
+            .toEqual(Math.floor(triggerLeft - 44),
+                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
       }));
 
-      it('should adjust for the checkbox in rtl', async(() => {
+      it('should adjust for the checkbox in rtl', fakeAsync(() => {
         dir.value = 'rtl';
         trigger.click();
         multiFixture.detectChanges();
+        flush();
 
-        multiFixture.whenStable().then(() => {
-          const triggerRight = trigger.getBoundingClientRect().right;
-          const firstOptionRight =
-              document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+        const triggerRight = trigger.getBoundingClientRect().right;
+        const firstOptionRight =
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
 
-          // 44px accounts for the checkbox size, margin and the panel's padding.
-          expect(Math.floor(firstOptionRight))
+        // 44px accounts for the checkbox size, margin and the panel's padding.
+        expect(Math.floor(firstOptionRight))
             .toEqual(Math.floor(triggerRight + 44),
-              `Expected trigger label to align along x-axis, accounting for the checkbox.`);
-        });
+                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
       }));
     });
 
     describe('x-axis positioning with groups', () => {
       let groupFixture: ComponentFixture<SelectWithGroups>;
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         groupFixture = TestBed.createComponent(SelectWithGroups);
         groupFixture.detectChanges();
         formField = groupFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
@@ -1831,9 +1793,9 @@ describe('MatSelect', () => {
 
         formField.style.position = 'fixed';
         formField.style.left = '60px';
-      });
+      }));
 
-      it('should adjust for the group padding in ltr', async(() => {
+      it('should adjust for the group padding in ltr', fakeAsync(() => {
         groupFixture.componentInstance.control.setValue('oddish-1');
         groupFixture.detectChanges();
 
@@ -1852,45 +1814,43 @@ describe('MatSelect', () => {
         });
       }));
 
-      it('should adjust for the group padding in rtl', async(() => {
+      it('should adjust for the group padding in rtl', fakeAsync(() => {
         dir.value = 'rtl';
         groupFixture.componentInstance.control.setValue('oddish-1');
         groupFixture.detectChanges();
 
         trigger.click();
         groupFixture.detectChanges();
+        flush();
 
-        groupFixture.whenStable().then(() => {
-          const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
-          const triggerRight = trigger.getBoundingClientRect().right;
-          const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
-              .getBoundingClientRect().right;
+        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
+        const triggerRight = trigger.getBoundingClientRect().right;
+        const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
+            .getBoundingClientRect().right;
 
-          // 32px is the 16px default padding plus 16px of padding when an option is in a group.
-          expect(Math.floor(selectedOptionRight)).toEqual(Math.floor(triggerRight + 32),
-              `Expected trigger label to align along x-axis, accounting for the padding in rtl.`);
-        });
+        // 32px is the 16px default padding plus 16px of padding when an option is in a group.
+        expect(Math.floor(selectedOptionRight)).toEqual(Math.floor(triggerRight + 32),
+            `Expected trigger label to align along x-axis, accounting for the padding in rtl.`);
       }));
 
       it('should not adjust if all options are within a group, except the selected one',
-        async(() => {
-          groupFixture.componentInstance.control.setValue('mime-11');
-          groupFixture.detectChanges();
+          fakeAsync(() => {
+            groupFixture.componentInstance.control.setValue('mime-11');
+            groupFixture.detectChanges();
 
-          trigger.click();
-          groupFixture.detectChanges();
+            trigger.click();
+            groupFixture.detectChanges();
+            flush();
 
-          fixture.whenStable().then(() => {
             const selected = document.querySelector('.cdk-overlay-pane mat-option.mat-selected')!;
             const selectedOptionLeft = selected.getBoundingClientRect().left;
             const triggerLeft = trigger.getBoundingClientRect().left;
 
             // 16px is the default option padding
             expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 16));
-          });
-        }));
+          }));
 
-      it('should align the first option to the trigger, if nothing is selected', async(() => {
+      it('should align the first option to the trigger, if nothing is selected', fakeAsync(() => {
         // Push down the form field so there is space for the item to completely align.
         formField.style.top = '100px';
 
@@ -1901,26 +1861,25 @@ describe('MatSelect', () => {
 
         trigger.click();
         groupFixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-          const triggerTop = trigger.getBoundingClientRect().top;
-
-          const option = overlayContainerElement.querySelector('.cdk-overlay-pane mat-option');
-          const optionTop = option ? option.getBoundingClientRect().top : 0;
-
-          // There appears to be a small rounding error on IE, so we verify that the value is close,
-          // not exact.
-          let platform = new Platform();
-          if (platform.TRIDENT) {
-            let difference =
-                Math.abs(optionTop + (menuItemHeight - triggerHeight) / 2 - triggerTop);
-            expect(difference)
-                .toBeLessThan(0.1, 'Expected trigger to align with the first option.');
-          } else {
-            expect(Math.floor(optionTop + (menuItemHeight - triggerHeight) / 2))
-                .toBe(Math.floor(triggerTop), 'Expected trigger to align with the first option.');
-          }
-        });
+        flush();
+
+        const triggerTop = trigger.getBoundingClientRect().top;
+
+        const option = overlayContainerElement.querySelector('.cdk-overlay-pane mat-option');
+        const optionTop = option ? option.getBoundingClientRect().top : 0;
+
+        // There appears to be a small rounding error on IE, so we verify that the value is close,
+        // not exact.
+        let platform = new Platform();
+        if (platform.TRIDENT) {
+          let difference =
+              Math.abs(optionTop + (menuItemHeight - triggerHeight) / 2 - triggerTop);
+          expect(difference)
+              .toBeLessThan(0.1, 'Expected trigger to align with the first option.');
+        } else {
+          expect(Math.floor(optionTop + (menuItemHeight - triggerHeight) / 2))
+              .toBe(Math.floor(triggerTop), 'Expected trigger to align with the first option.');
+        }
       }));
     });
   });
@@ -1930,52 +1889,52 @@ describe('MatSelect', () => {
       let fixture: ComponentFixture<BasicSelect>;
       let select: HTMLElement;
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         fixture = TestBed.createComponent(BasicSelect);
         fixture.detectChanges();
         select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-      });
+      }));
 
-      it('should set the role of the select to listbox', () => {
+      it('should set the role of the select to listbox', fakeAsync(() => {
         expect(select.getAttribute('role')).toEqual('listbox');
-      });
+      }));
 
-      it('should set the aria label of the select to the placeholder', () => {
+      it('should set the aria label of the select to the placeholder', fakeAsync(() => {
         expect(select.getAttribute('aria-label')).toEqual('Food');
-      });
+      }));
 
-      it('should support setting a custom aria-label', () => {
+      it('should support setting a custom aria-label', fakeAsync(() => {
         fixture.componentInstance.ariaLabel = 'Custom Label';
         fixture.detectChanges();
 
         expect(select.getAttribute('aria-label')).toEqual('Custom Label');
-      });
+      }));
 
-      it('should not set an aria-label if aria-labelledby is specified', () => {
+      it('should not set an aria-label if aria-labelledby is specified', fakeAsync(() => {
         fixture.componentInstance.ariaLabelledby = 'myLabelId';
         fixture.detectChanges();
 
         expect(select.getAttribute('aria-label')).toBeFalsy('Expected no aria-label to be set.');
         expect(select.getAttribute('aria-labelledby')).toBe('myLabelId');
-      });
+      }));
 
-      it('should not have aria-labelledby in the DOM if it`s not specified', () => {
+      it('should not have aria-labelledby in the DOM if it`s not specified', fakeAsync(() => {
         fixture.detectChanges();
         expect(select.hasAttribute('aria-labelledby')).toBeFalsy();
-      });
+      }));
 
-      it('should set the tabindex of the select to 0 by default', () => {
+      it('should set the tabindex of the select to 0 by default', fakeAsync(() => {
         expect(select.getAttribute('tabindex')).toEqual('0');
-      });
+      }));
 
-      it('should be able to override the tabindex', () => {
+      it('should be able to override the tabindex', fakeAsync(() => {
         fixture.componentInstance.tabIndexOverride = 3;
         fixture.detectChanges();
 
         expect(select.getAttribute('tabindex')).toBe('3');
-      });
+      }));
 
-      it('should be able to set the tabindex via the native attribute', () => {
+      it('should be able to set the tabindex via the native attribute', fakeAsync(() => {
         fixture.destroy();
 
         const plainTabindexFixture = TestBed.createComponent(SelectWithPlainTabindex);
@@ -1984,20 +1943,20 @@ describe('MatSelect', () => {
         select = plainTabindexFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         expect(select.getAttribute('tabindex')).toBe('5');
-      });
+      }));
 
-      it('should set aria-required for required selects', () => {
+      it('should set aria-required for required selects', fakeAsync(() => {
         expect(select.getAttribute('aria-required'))
-          .toEqual('false', `Expected aria-required attr to be false for normal selects.`);
+            .toEqual('false', `Expected aria-required attr to be false for normal selects.`);
 
         fixture.componentInstance.isRequired = true;
         fixture.detectChanges();
 
         expect(select.getAttribute('aria-required'))
-          .toEqual('true', `Expected aria-required attr to be true for required selects.`);
-      });
+            .toEqual('true', `Expected aria-required attr to be true for required selects.`);
+      }));
 
-      it('should set the mat-select-required class for required selects', () => {
+      it('should set the mat-select-required class for required selects', fakeAsync(() => {
         expect(select.classList).not.toContain(
             'mat-select-required', `Expected the mat-select-required class not to be set.`);
 
@@ -2005,31 +1964,31 @@ describe('MatSelect', () => {
         fixture.detectChanges();
 
         expect(select.classList).toContain(
-          'mat-select-required', `Expected the mat-select-required class to be set.`);
-      });
+            'mat-select-required', `Expected the mat-select-required class to be set.`);
+      }));
 
-      it('should set aria-invalid for selects that are invalid and touched', () => {
+      it('should set aria-invalid for selects that are invalid and touched', fakeAsync(() => {
         expect(select.getAttribute('aria-invalid'))
-          .toEqual('false', `Expected aria-invalid attr to be false for valid selects.`);
+            .toEqual('false', `Expected aria-invalid attr to be false for valid selects.`);
 
         fixture.componentInstance.isRequired = true;
         fixture.componentInstance.control.markAsTouched();
         fixture.detectChanges();
 
         expect(select.getAttribute('aria-invalid'))
-          .toEqual('true', `Expected aria-invalid attr to be true for invalid selects.`);
-      });
+            .toEqual('true', `Expected aria-invalid attr to be true for invalid selects.`);
+      }));
 
-      it('should set aria-disabled for disabled selects', () => {
+      it('should set aria-disabled for disabled selects', fakeAsync(() => {
         expect(select.getAttribute('aria-disabled')).toEqual('false');
 
         fixture.componentInstance.control.disable();
         fixture.detectChanges();
 
         expect(select.getAttribute('aria-disabled')).toEqual('true');
-      });
+      }));
 
-      it('should set the tabindex of the select to -1 if disabled', () => {
+      it('should set the tabindex of the select to -1 if disabled', fakeAsync(() => {
         fixture.componentInstance.control.disable();
         fixture.detectChanges();
         expect(select.getAttribute('tabindex')).toEqual('-1');
@@ -2037,7 +1996,7 @@ describe('MatSelect', () => {
         fixture.componentInstance.control.enable();
         fixture.detectChanges();
         expect(select.getAttribute('tabindex')).toEqual('0');
-      });
+      }));
 
       it('should be able to select options via the arrow keys on a closed select', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
@@ -2049,7 +2008,7 @@ describe('MatSelect', () => {
 
         expect(options[0].selected).toBe(true, 'Expected first option to be selected.');
         expect(formControl.value).toBe(options[0].value,
-          'Expected value from first option to have been set on the model.');
+            'Expected value from first option to have been set on the model.');
 
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
         dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
@@ -2057,13 +2016,13 @@ describe('MatSelect', () => {
         // Note that the third option is skipped, because it is disabled.
         expect(options[3].selected).toBe(true, 'Expected fourth option to be selected.');
         expect(formControl.value).toBe(options[3].value,
-          'Expected value from fourth option to have been set on the model.');
+            'Expected value from fourth option to have been set on the model.');
 
         dispatchKeyboardEvent(select, 'keydown', UP_ARROW);
 
         expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
         expect(formControl.value).toBe(options[1].value,
-          'Expected value from second option to have been set on the model.');
+            'Expected value from second option to have been set on the model.');
       }));
 
       it('should be able to select options by typing on a closed select', fakeAsync(() => {
@@ -2087,27 +2046,28 @@ describe('MatSelect', () => {
           'Expected value from sixth option to have been set on the model.');
       }));
 
-      it('should open the panel when pressing the arrow keys on a closed multiple select', () => {
-        fixture.destroy();
+      it('should open the panel when pressing the arrow keys on a closed multiple select',
+          fakeAsync(() => {
+            fixture.destroy();
 
-        const multiFixture = TestBed.createComponent(MultiSelect);
-        const instance = multiFixture.componentInstance;
+            const multiFixture = TestBed.createComponent(MultiSelect);
+            const instance = multiFixture.componentInstance;
 
-        multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+            multiFixture.detectChanges();
+            select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-        const initialValue = instance.control.value;
+            const initialValue = instance.control.value;
 
-        expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
+            expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
 
-        const event = dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+            const event = dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-        expect(instance.select.panelOpen).toBe(true, 'Expected panel to be open.');
-        expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
-        expect(event.defaultPrevented).toBe(true, 'Expected default to be prevented.');
-      });
+            expect(instance.select.panelOpen).toBe(true, 'Expected panel to be open.');
+            expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
+            expect(event.defaultPrevented).toBe(true, 'Expected default to be prevented.');
+          }));
 
-      it('should do nothing when typing on a closed multi-select', () => {
+      it('should do nothing when typing on a closed multi-select', fakeAsync(() => {
         fixture.destroy();
 
         const multiFixture = TestBed.createComponent(MultiSelect);
@@ -2124,7 +2084,7 @@ describe('MatSelect', () => {
 
         expect(instance.select.panelOpen).toBe(false, 'Expected panel to stay closed.');
         expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
-      });
+      }));
 
       it('should do nothing if the key manager did not change the active item', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
@@ -2139,41 +2099,41 @@ describe('MatSelect', () => {
       }));
 
       it('should continue from the selected option when the value is set programmatically',
-        fakeAsync(() => {
-          const formControl = fixture.componentInstance.control;
+          fakeAsync(() => {
+            const formControl = fixture.componentInstance.control;
 
-          formControl.setValue('eggs-5');
-          fixture.detectChanges();
+            formControl.setValue('eggs-5');
+            fixture.detectChanges();
 
-          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+            dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-          expect(formControl.value).toBe('pasta-6');
-          expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
-        }));
+            expect(formControl.value).toBe('pasta-6');
+            expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
+          }));
 
       it('should not shift focus when the selected options are updated programmatically ' +
-        'in a multi select', () => {
-          fixture.destroy();
+          'in a multi select', fakeAsync(() => {
+        fixture.destroy();
 
-          const multiFixture = TestBed.createComponent(MultiSelect);
+        const multiFixture = TestBed.createComponent(MultiSelect);
 
-          multiFixture.detectChanges();
-          select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
-          multiFixture.componentInstance.select.open();
-          multiFixture.detectChanges();
+        multiFixture.detectChanges();
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+        multiFixture.componentInstance.select.open();
+        multiFixture.detectChanges();
 
-          const options =
-              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-          options[3].focus();
-          expect(document.activeElement).toBe(options[3], 'Expected fourth option to be focused.');
+        options[3].focus();
+        expect(document.activeElement).toBe(options[3], 'Expected fourth option to be focused.');
 
-          multiFixture.componentInstance.control.setValue(['steak-0', 'sushi-7']);
-          multiFixture.detectChanges();
+        multiFixture.componentInstance.control.setValue(['steak-0', 'sushi-7']);
+        multiFixture.detectChanges();
 
-          expect(document.activeElement)
-              .toBe(options[3], 'Expected fourth option to remain focused.');
-        });
+        expect(document.activeElement)
+            .toBe(options[3], 'Expected fourth option to remain focused.');
+      }));
 
       it('should not cycle through the options if the control is disabled', fakeAsync(() => {
         const formControl = fixture.componentInstance.control;
@@ -2200,7 +2160,7 @@ describe('MatSelect', () => {
         expect(lastOption.selected).toBe(true, 'Expected last option to stay selected.');
       }));
 
-      it('should not open a multiple select when tabbing through', () => {
+      it('should not open a multiple select when tabbing through', fakeAsync(() => {
         fixture.destroy();
 
         const multiFixture = TestBed.createComponent(MultiSelect);
@@ -2215,12 +2175,12 @@ describe('MatSelect', () => {
 
         expect(multiFixture.componentInstance.select.panelOpen)
             .toBe(false, 'Expected panel to stay closed.');
-      });
+      }));
 
-      it('should prevent the default action when pressing space', () => {
+      it('should prevent the default action when pressing space', fakeAsync(() => {
         const event = dispatchKeyboardEvent(select, 'keydown', SPACE);
         expect(event.defaultPrevented).toBe(true);
-      });
+      }));
 
       it('should consider the selection a result of a user action when closed', fakeAsync(() => {
         const option = fixture.componentInstance.options.first;
@@ -2233,24 +2193,24 @@ describe('MatSelect', () => {
         subscription.unsubscribe();
       }));
 
-      it('should be able to focus the select trigger', () => {
+      it('should be able to focus the select trigger', fakeAsync(() => {
         document.body.focus(); // ensure that focus isn't on the trigger already
 
         fixture.componentInstance.select.focus();
 
         expect(document.activeElement).toBe(select, 'Expected select element to be focused.');
-      });
+      }));
 
       // Having `aria-hidden` on the trigger avoids issues where
       // screen readers read out the wrong amount of options.
-      it('should set aria-hidden on the trigger element', () => {
+      it('should set aria-hidden on the trigger element', fakeAsync(() => {
         const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
         expect(trigger.getAttribute('aria-hidden'))
             .toBe('true', 'Expected aria-hidden to be true when the select is open.');
-      });
+      }));
 
-      it('should set `aria-multiselectable` to true on multi-select instances', () => {
+      it('should set `aria-multiselectable` to true on multi-select instances', fakeAsync(() => {
         fixture.destroy();
 
         const multiFixture = TestBed.createComponent(MultiSelect);
@@ -2259,11 +2219,11 @@ describe('MatSelect', () => {
         select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         expect(select.getAttribute('aria-multiselectable')).toBe('true');
-      });
+      }));
 
-      it('should set `aria-multiselectable` false on single-selection instances', () => {
+      it('should set `aria-multiselectable` false on single-selection instances', fakeAsync(() => {
         expect(select.getAttribute('aria-multiselectable')).toBe('false');
-      });
+      }));
 
       it('should set aria-activedescendant only while the panel is open', fakeAsync(() => {
         fixture.componentInstance.control.setValue('chips-4');
@@ -2275,30 +2235,28 @@ describe('MatSelect', () => {
             .toBe(false, 'Expected no aria-activedescendant on init.');
 
         fixture.componentInstance.select.open();
-        tick();
         fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
+        flush();
 
         const options = overlayContainerElement.querySelectorAll('mat-option');
 
         expect(host.getAttribute('aria-activedescendant'))
-          .toBe(options[4].id, 'Expected aria-activedescendant to match the active option.');
+            .toBe(options[4].id, 'Expected aria-activedescendant to match the active option.');
 
         fixture.componentInstance.select.close();
         fixture.detectChanges();
-        tick(SELECT_CLOSE_ANIMATION);
+        flush();
 
         expect(host.hasAttribute('aria-activedescendant'))
-          .toBe(false, 'Expected no aria-activedescendant when closed.');
+            .toBe(false, 'Expected no aria-activedescendant when closed.');
       }));
 
       it('should set aria-activedescendant based on the focused option', fakeAsync(() => {
         const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
 
         fixture.componentInstance.select.open();
-        tick();
         fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
+        flush();
 
         const options = overlayContainerElement.querySelectorAll('mat-option');
 
@@ -2324,7 +2282,7 @@ describe('MatSelect', () => {
       let trigger: HTMLElement;
       let options: NodeListOf<HTMLElement>;
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         fixture = TestBed.createComponent(BasicSelect);
         fixture.detectChanges();
         trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
@@ -2332,16 +2290,16 @@ describe('MatSelect', () => {
         fixture.detectChanges();
 
         options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      });
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      }));
 
-      it('should set the role of mat-option to option', () => {
+      it('should set the role of mat-option to option', fakeAsync(() => {
         expect(options[0].getAttribute('role')).toEqual('option');
         expect(options[1].getAttribute('role')).toEqual('option');
         expect(options[2].getAttribute('role')).toEqual('option');
-      });
+      }));
 
-      it('should set aria-selected on each option', () => {
+      it('should set aria-selected on each option', fakeAsync(() => {
         expect(options[0].getAttribute('aria-selected')).toEqual('false');
         expect(options[1].getAttribute('aria-selected')).toEqual('false');
         expect(options[2].getAttribute('aria-selected')).toEqual('false');
@@ -2351,19 +2309,20 @@ describe('MatSelect', () => {
 
         trigger.click();
         fixture.detectChanges();
+        flush();
 
         expect(options[0].getAttribute('aria-selected')).toEqual('false');
         expect(options[1].getAttribute('aria-selected')).toEqual('true');
         expect(options[2].getAttribute('aria-selected')).toEqual('false');
-      });
+      }));
 
-      it('should set the tabindex of each option according to disabled state', () => {
+      it('should set the tabindex of each option according to disabled state', fakeAsync(() => {
         expect(options[0].getAttribute('tabindex')).toEqual('0');
         expect(options[1].getAttribute('tabindex')).toEqual('0');
         expect(options[2].getAttribute('tabindex')).toEqual('-1');
-      });
+      }));
 
-      it('should set aria-disabled for disabled options', () => {
+      it('should set aria-disabled for disabled options', fakeAsync(() => {
         expect(options[0].getAttribute('aria-disabled')).toEqual('false');
         expect(options[1].getAttribute('aria-disabled')).toEqual('false');
         expect(options[2].getAttribute('aria-disabled')).toEqual('true');
@@ -2374,8 +2333,7 @@ describe('MatSelect', () => {
         expect(options[0].getAttribute('aria-disabled')).toEqual('false');
         expect(options[1].getAttribute('aria-disabled')).toEqual('false');
         expect(options[2].getAttribute('aria-disabled')).toEqual('false');
-      });
-
+      }));
     });
 
     describe('for option groups', () => {
@@ -2383,7 +2341,7 @@ describe('MatSelect', () => {
       let trigger: HTMLElement;
       let groups: NodeListOf<HTMLElement>;
 
-      beforeEach(() => {
+      beforeEach(fakeAsync(() => {
         fixture = TestBed.createComponent(SelectWithGroups);
         fixture.detectChanges();
         trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
@@ -2391,25 +2349,24 @@ describe('MatSelect', () => {
         fixture.detectChanges();
         groups =
             overlayContainerElement.querySelectorAll('mat-optgroup') as NodeListOf<HTMLElement>;
-      });
+      }));
 
-      it('should set the appropriate role', () => {
+      it('should set the appropriate role', fakeAsync(() => {
         expect(groups[0].getAttribute('role')).toBe('group');
-      });
+      }));
 
-      it('should set the `aria-labelledby` attribute', () => {
+      it('should set the `aria-labelledby` attribute', fakeAsync(() => {
         let group = groups[0];
         let label = group.querySelector('label')!;
 
         expect(label.getAttribute('id')).toBeTruthy('Expected label to have an id.');
         expect(group.getAttribute('aria-labelledby'))
             .toBe(label.getAttribute('id'), 'Expected `aria-labelledby` to match the label id.');
-      });
+      }));
 
-      it('should set the `aria-disabled` attribute if the group is disabled', () => {
+      it('should set the `aria-disabled` attribute if the group is disabled', fakeAsync(() => {
         expect(groups[1].getAttribute('aria-disabled')).toBe('true');
-      });
-
+      }));
     });
 
     describe('aria-owns', () => {
@@ -2424,10 +2381,9 @@ describe('MatSelect', () => {
 
         triggers[0].nativeElement.click();
         fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
+        flush();
 
-        options =
-            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       }));
 
       it('should set aria-owns properly', fakeAsync(() => {
@@ -2442,11 +2398,11 @@ describe('MatSelect', () => {
             overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
         backdrop.click();
         fixture.detectChanges();
-        tick(SELECT_CLOSE_ANIMATION);
+        flush();
 
         triggers[1].nativeElement.click();
         fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
+        flush();
 
         options =
             overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
@@ -2454,7 +2410,6 @@ describe('MatSelect', () => {
             .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
         expect(selects[1].nativeElement.getAttribute('aria-owns'))
             .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
-
       }));
 
       it('should set the option id properly', fakeAsync(() => {
@@ -2468,11 +2423,11 @@ describe('MatSelect', () => {
             overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
         backdrop.click();
         fixture.detectChanges();
-        tick(SELECT_CLOSE_ANIMATION);
+        flush();
 
         triggers[1].nativeElement.click();
         fixture.detectChanges();
-        tick(SELECT_OPEN_ANIMATION);
+        flush();
 
         options =
             overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
@@ -2495,12 +2450,9 @@ describe('MatSelect', () => {
       const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       trigger.style.width = '300px';
 
-      fixture.detectChanges();
-      tick();
-
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const value = fixture.debugElement.query(By.css('.mat-select-value'));
       expect(value.nativeElement.textContent)
@@ -2515,39 +2467,40 @@ describe('MatSelect', () => {
       expect(overlayContainerElement.textContent).toContain('Tacos');
     }));
 
-    it('should not crash the browser when a sibling throws an error on init', () => {
+    it('should not crash the browser when a sibling throws an error on init', fakeAsync(() => {
       // Note that this test can be considered successful if the error being thrown didn't
       // end up crashing the testing setup altogether.
       expect(() => {
         TestBed.createComponent(SelectWithErrorSibling).detectChanges();
       }).toThrowError(new RegExp('Oh no!', 'g'));
-    });
+    }));
 
-    it('should not throw when trying to access the selected value on init', () => {
+    it('should not throw when trying to access the selected value on init', fakeAsync(() => {
       expect(() => {
         TestBed.createComponent(SelectEarlyAccessSibling).detectChanges();
       }).not.toThrow();
-    });
+    }));
 
     it('should not throw selection model-related errors in addition to the errors from ngModel',
-      () => {
-        const fixture = TestBed.createComponent(InvalidSelectInForm);
+        fakeAsync(() => {
+          const fixture = TestBed.createComponent(InvalidSelectInForm);
 
-        // The first change detection run will throw the "ngModel is missing a name" error.
-        expect(() => fixture.detectChanges()).toThrowError(/the name attribute must be set/g);
+          // The first change detection run will throw the "ngModel is missing a name" error.
+          expect(() => fixture.detectChanges()).toThrowError(/the name attribute must be set/g);
 
-        // The second run shouldn't throw selection-model related errors.
-        expect(() => fixture.detectChanges()).not.toThrow();
-      });
+          // The second run shouldn't throw selection-model related errors.
+          expect(() => fixture.detectChanges()).not.toThrow();
+        }));
 
-    it('should not throw when the triggerValue is accessed when there is no selected value', () => {
-      const fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
+    it('should not throw when the triggerValue is accessed when there is no selected value',
+        fakeAsync(() => {
+          const fixture = TestBed.createComponent(BasicSelect);
+          fixture.detectChanges();
 
-      expect(() => fixture.componentInstance.select.triggerValue).not.toThrow();
-    });
+          expect(() => fixture.componentInstance.select.triggerValue).not.toThrow();
+        }));
 
-    it('should allow the user to customize the label', () => {
+    it('should allow the user to customize the label', fakeAsync(() => {
       const fixture = TestBed.createComponent(SelectWithCustomTrigger);
       fixture.detectChanges();
 
@@ -2558,30 +2511,30 @@ describe('MatSelect', () => {
 
       expect(label.textContent).toContain('azziP',
           'Expected the displayed text to be "Pizza" in reverse.');
-    });
+    }));
   });
 
   describe('change event', () => {
     let fixture: ComponentFixture<SelectWithChangeEvent>;
     let trigger: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(SelectWithChangeEvent);
       fixture.detectChanges();
 
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    });
+    }));
 
-    it('should emit an event when the selected option has changed', () => {
+    it('should emit an event when the selected option has changed', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
       (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
 
       expect(fixture.componentInstance.changeListener).toHaveBeenCalled();
-    });
+    }));
 
-    it('should not emit multiple change events for the same option', () => {
+    it('should not emit multiple change events for the same option', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -2591,29 +2544,28 @@ describe('MatSelect', () => {
       option.click();
 
       expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
-    });
+    }));
 
     it('should only emit one event when pressing the arrow keys on a closed select',
-      fakeAsync(() => {
-        const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-
-        expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
-      }));
+        fakeAsync(() => {
+          const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
+          expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
+        }));
   });
 
   describe('floatPlaceholder option', () => {
     let fixture: ComponentFixture<FloatPlaceholderSelect>;
     let formField: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(FloatPlaceholderSelect);
       fixture.detectChanges();
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-    });
+    }));
 
-    it('should be able to disable the floating placeholder', () => {
+    it('should be able to disable the floating placeholder', fakeAsync(() => {
       fixture.componentInstance.floatPlaceholder = 'never';
       fixture.detectChanges();
 
@@ -2625,9 +2577,9 @@ describe('MatSelect', () => {
 
       expect(formField.classList.contains('mat-form-field-can-float'))
           .toBe(false, 'Floating placeholder should be disabled');
-    });
+    }));
 
-    it('should be able to always float the placeholder', () => {
+    it('should be able to always float the placeholder', fakeAsync(() => {
       expect(fixture.componentInstance.control.value).toBeFalsy();
 
       fixture.componentInstance.floatPlaceholder = 'always';
@@ -2637,9 +2589,9 @@ describe('MatSelect', () => {
           .toBe(true, 'Placeholder should be able to float');
       expect(formField.classList.contains('mat-form-field-should-float'))
           .toBe(true, 'Placeholder should be floating');
-    });
+    }));
 
-    it ('should default to global floating placeholder type', () => {
+    it ('should default to global floating placeholder type', fakeAsync(() => {
       fixture.destroy();
 
       TestBed.resetTestingModule();
@@ -2666,25 +2618,24 @@ describe('MatSelect', () => {
           .toBe(true, 'Placeholder should be able to float');
       expect(formField.classList.contains('mat-form-field-should-float'))
           .toBe(true, 'Placeholder should be floating');
-    });
+    }));
   });
 
   describe('with OnPush change detection', () => {
-    it('should set the trigger text based on the value when initialized', async(() => {
+    it('should set the trigger text based on the value when initialized', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicSelectOnPushPreselected);
 
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        let trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      let trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-        fixture.detectChanges();
+      fixture.detectChanges();
 
-        expect(trigger.textContent).toContain('Pizza');
-      });
+      expect(trigger.textContent).toContain('Pizza');
     }));
 
-    it('should update the trigger based on the value', () => {
+    it('should update the trigger based on the value', fakeAsync(() => {
       let fixture = TestBed.createComponent(BasicSelectOnPush);
       fixture.detectChanges();
       let trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
@@ -2698,8 +2649,7 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(trigger.textContent).not.toContain('Pizza');
-    });
-
+    }));
   });
 
   describe('multiple selection', () => {
@@ -2707,15 +2657,15 @@ describe('MatSelect', () => {
     let testInstance: MultiSelect;
     let trigger: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(MultiSelect);
       testInstance = fixture.componentInstance;
       fixture.detectChanges();
 
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    });
+    }));
 
-    it('should be able to select multiple values', () => {
+    it('should be able to select multiple values', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -2728,9 +2678,9 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(testInstance.control.value).toEqual(['steak-0', 'tacos-2', 'eggs-5']);
-    });
+    }));
 
-    it('should be able to toggle an option on and off', () => {
+    it('should be able to toggle an option on and off', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -2745,12 +2695,12 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(testInstance.control.value).toEqual([]);
-    });
+    }));
 
     it('should update the label', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
@@ -2768,7 +2718,7 @@ describe('MatSelect', () => {
       expect(trigger.textContent).toContain('Steak, Eggs');
     }));
 
-    it('should be able to set the selected value by taking an array', () => {
+    it('should be able to set the selected value by taking an array', fakeAsync(() => {
       trigger.click();
       testInstance.control.setValue(['steak-0', 'eggs-5']);
       fixture.detectChanges();
@@ -2783,9 +2733,9 @@ describe('MatSelect', () => {
 
       expect(optionInstances[0].selected).toBe(true);
       expect(optionInstances[5].selected).toBe(true);
-    });
+    }));
 
-    it('should override the previously-selected value when setting an array', () => {
+    it('should override the previously-selected value when setting an array', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -2802,9 +2752,9 @@ describe('MatSelect', () => {
 
       expect(options[0].classList).not.toContain('mat-selected');
       expect(options[5].classList).toContain('mat-selected');
-    });
+    }));
 
-    it('should not close the panel when clicking on options', () => {
+    it('should not close the panel when clicking on options', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
 
@@ -2818,12 +2768,12 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(testInstance.select.panelOpen).toBe(true);
-    });
+    }));
 
     it('should sort the selected options based on their order in the panel', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
@@ -2841,7 +2791,7 @@ describe('MatSelect', () => {
       dir.value = 'rtl';
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       const options = overlayContainerElement.querySelectorAll('mat-option') as
           NodeListOf<HTMLElement>;
@@ -2855,17 +2805,18 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
     }));
 
-    it('should sort the values, that get set via the model, based on the panel order', () => {
-      trigger.click();
-      fixture.detectChanges();
+    it('should sort the values, that get set via the model, based on the panel order',
+        fakeAsync(() => {
+          trigger.click();
+          fixture.detectChanges();
 
-      testInstance.control.setValue(['tacos-2', 'steak-0', 'pizza-1']);
-      fixture.detectChanges();
+          testInstance.control.setValue(['tacos-2', 'steak-0', 'pizza-1']);
+          fixture.detectChanges();
 
-      expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
-    });
+          expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
+        }));
 
-    it('should reverse sort the values, that get set via the model in rtl', () => {
+    it('should reverse sort the values, that get set via the model in rtl', fakeAsync(() => {
       dir.value = 'rtl';
       trigger.click();
       fixture.detectChanges();
@@ -2874,24 +2825,24 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
-    });
+    }));
 
-    it('should throw an exception when trying to set a non-array value', () => {
+    it('should throw an exception when trying to set a non-array value', fakeAsync(() => {
       expect(() => {
         testInstance.control.setValue('not-an-array');
       }).toThrowError(wrappedErrorMessage(getMatSelectNonArrayValueError()));
-    });
+    }));
 
-    it('should throw an exception when trying to change multiple mode after init', () => {
+    it('should throw an exception when trying to change multiple mode after init', fakeAsync(() => {
       expect(() => {
         testInstance.select.multiple = false;
       }).toThrowError(wrappedErrorMessage(getMatSelectDynamicMultipleError()));
-    });
+    }));
 
     it('should pass the `multiple` value to all of the option instances', fakeAsync(() => {
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
           'Expected `multiple` to have been added to initial set of options.');
@@ -2902,18 +2853,17 @@ describe('MatSelect', () => {
       expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
           'Expected `multiple` to have been set on dynamically-added option.');
     }));
-
   });
 
   describe('theming', () => {
     let fixture: ComponentFixture<BasicSelectWithTheming>;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(BasicSelectWithTheming);
       fixture.detectChanges();
-    });
+    }));
 
-    it('should transfer the theme to the select panel', () => {
+    it('should transfer the theme to the select panel', fakeAsync(() => {
       fixture.componentInstance.theme = 'warn';
       fixture.detectChanges();
 
@@ -2922,7 +2872,7 @@ describe('MatSelect', () => {
 
       const panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
       expect(panel.classList).toContain('mat-warn');
-    });
+    }));
   });
 
   describe('reset values', () => {
@@ -2939,18 +2889,18 @@ describe('MatSelect', () => {
 
       trigger.click();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       options[0].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
     }));
 
     it('should reset when an option with an undefined value is selected', fakeAsync(() => {
       options[4].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.value).toBeUndefined();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
@@ -2961,7 +2911,7 @@ describe('MatSelect', () => {
     it('should reset when an option with a null value is selected', fakeAsync(() => {
       options[5].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.value).toBeNull();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
@@ -2972,7 +2922,7 @@ describe('MatSelect', () => {
     it('should reset when a blank option is selected', fakeAsync(() => {
       options[6].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.value).toBeUndefined();
       expect(fixture.componentInstance.select.selected).toBeFalsy();
@@ -2983,7 +2933,7 @@ describe('MatSelect', () => {
     it('should not reset when any other falsy option is selected', fakeAsync(() => {
       options[3].click();
       fixture.detectChanges();
-      tick(SELECT_CLOSE_ANIMATION);
+      flush();
 
       expect(fixture.componentInstance.control.value).toBe(false);
       expect(fixture.componentInstance.select.selected).toBeTruthy();
@@ -2991,19 +2941,19 @@ describe('MatSelect', () => {
       expect(trigger.textContent).toContain('Falsy');
     }));
 
-    it('should not consider the reset values as selected when resetting the form control', () => {
-      expect(formField.classList).toContain('mat-form-field-should-float');
-
-      fixture.componentInstance.control.reset();
-      fixture.detectChanges();
+    it('should not consider the reset values as selected when resetting the form control',
+        fakeAsync(() => {
+          expect(formField.classList).toContain('mat-form-field-should-float');
 
-      expect(fixture.componentInstance.control.value).toBeNull();
-      expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(formField.classList).not.toContain('mat-formf-field-should-float');
-      expect(trigger.textContent).not.toContain('Null');
-      expect(trigger.textContent).not.toContain('Undefined');
-    });
+          fixture.componentInstance.control.reset();
+          fixture.detectChanges();
 
+          expect(fixture.componentInstance.control.value).toBeNull();
+          expect(fixture.componentInstance.select.selected).toBeFalsy();
+          expect(formField.classList).not.toContain('mat-formf-field-should-float');
+          expect(trigger.textContent).not.toContain('Null');
+          expect(trigger.textContent).not.toContain('Undefined');
+        }));
   });
 
   describe('error state', () => {
@@ -3011,23 +2961,23 @@ describe('MatSelect', () => {
     let testComponent: SelectInsideFormGroup;
     let select: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(SelectInsideFormGroup);
       fixture.detectChanges();
       testComponent = fixture.componentInstance;
       select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-    });
+    }));
 
-    it('should not set the invalid class on a clean select', () => {
+    it('should not set the invalid class on a clean select', fakeAsync(() => {
       expect(testComponent.formGroup.untouched).toBe(true, 'Expected the form to be untouched.');
       expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid.');
       expect(select.classList)
           .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
       expect(select.getAttribute('aria-invalid'))
           .toBe('false', 'Expected aria-invalid to be set to false.');
-    });
+    }));
 
-    it('should appear as invalid if it becomes touched', () => {
+    it('should appear as invalid if it becomes touched', fakeAsync(() => {
       expect(select.classList)
           .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
       expect(select.getAttribute('aria-invalid'))
@@ -3040,9 +2990,9 @@ describe('MatSelect', () => {
           .toContain('mat-select-invalid', 'Expected select to appear invalid.');
       expect(select.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to true.');
-    });
+    }));
 
-    it('should not have the invalid class when the select becomes valid', () => {
+    it('should not have the invalid class when the select becomes valid', fakeAsync(() => {
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
 
@@ -3058,9 +3008,9 @@ describe('MatSelect', () => {
           .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
       expect(select.getAttribute('aria-invalid'))
           .toBe('false', 'Expected aria-invalid to be set to false.');
-    });
+    }));
 
-    it('should appear as invalid when the parent form group is submitted', () => {
+    it('should appear as invalid when the parent form group is submitted', fakeAsync(() => {
       expect(select.classList)
           .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
       expect(select.getAttribute('aria-invalid'))
@@ -3073,9 +3023,9 @@ describe('MatSelect', () => {
           .toContain('mat-select-invalid', 'Expected select to appear invalid.');
       expect(select.getAttribute('aria-invalid'))
           .toBe('true', 'Expected aria-invalid to be set to true.');
-    });
+    }));
 
-    it('should render the error messages when the parent form is submitted', () => {
+    it('should render the error messages when the parent form is submitted', fakeAsync(() => {
       const debugEl = fixture.debugElement.nativeElement;
 
       expect(debugEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error messages');
@@ -3084,9 +3034,9 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(debugEl.querySelectorAll('mat-error').length).toBe(1, 'Expected one error message');
-    });
+    }));
 
-    it('should be able to override the error matching behavior via an @Input', () => {
+    it('should be able to override the error matching behavior via an @Input', fakeAsync(() => {
       fixture.destroy();
 
       const customErrorFixture = TestBed.createComponent(CustomErrorBehaviorSelect);
@@ -3103,36 +3053,37 @@ describe('MatSelect', () => {
 
       expect(component.select.errorState).toBe(true);
       expect(matcher).toHaveBeenCalled();
-    });
+    }));
 
-    it('should be able to override the error matching behavior via the injection token', () => {
-      const errorStateMatcher: ErrorStateMatcher = {
-        isErrorState: jasmine.createSpy('error state matcher').and.returnValue(true)
-      };
+    it('should be able to override the error matching behavior via the injection token',
+        fakeAsync(() => {
+          const errorStateMatcher: ErrorStateMatcher = {
+            isErrorState: jasmine.createSpy('error state matcher').and.returnValue(true)
+          };
 
-      fixture.destroy();
+          fixture.destroy();
 
-      TestBed.resetTestingModule().configureTestingModule({
-        imports: [MatSelectModule, ReactiveFormsModule, FormsModule, NoopAnimationsModule],
-        declarations: [SelectInsideFormGroup],
-        providers: [{ provide: ErrorStateMatcher, useValue: errorStateMatcher }],
-      });
+          TestBed.resetTestingModule().configureTestingModule({
+            imports: [MatSelectModule, ReactiveFormsModule, FormsModule, NoopAnimationsModule],
+            declarations: [SelectInsideFormGroup],
+            providers: [{ provide: ErrorStateMatcher, useValue: errorStateMatcher }],
+          });
 
-      const errorFixture = TestBed.createComponent(SelectInsideFormGroup);
-      const component = errorFixture.componentInstance;
+          const errorFixture = TestBed.createComponent(SelectInsideFormGroup);
+          const component = errorFixture.componentInstance;
 
-      errorFixture.detectChanges();
+          errorFixture.detectChanges();
 
-      expect(component.select.errorState).toBe(true);
-      expect(errorStateMatcher.isErrorState).toHaveBeenCalled();
-    });
+          expect(component.select.errorState).toBe(true);
+          expect(errorStateMatcher.isErrorState).toHaveBeenCalled();
+        }));
   });
 
   describe('compareWith behavior', () => {
     let fixture: ComponentFixture<NgModelCompareWithSelect>;
     let instance: NgModelCompareWithSelect;
 
-    beforeEach(async(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(NgModelCompareWithSelect);
       instance = fixture.componentInstance;
       fixture.detectChanges();
@@ -3140,56 +3091,55 @@ describe('MatSelect', () => {
 
     describe('when comparing by value', () => {
 
-      it('should have a selection', () => {
+      it('should have a selection', fakeAsync(() => {
         const selectedOption = instance.select.selected as MatOption;
         expect(selectedOption.value.value).toEqual('pizza-1');
-      });
+      }));
 
-      it('should update when making a new selection', async(() => {
+      it('should update when making a new selection', fakeAsync(() => {
         instance.options.last._selectViaInteraction();
         fixture.detectChanges();
-        fixture.whenStable().then(() => {
-          const selectedOption = instance.select.selected as MatOption;
-          expect(instance.selectedFood.value).toEqual('tacos-2');
-          expect(selectedOption.value.value).toEqual('tacos-2');
-        });
+        flush();
+
+        const selectedOption = instance.select.selected as MatOption;
+        expect(instance.selectedFood.value).toEqual('tacos-2');
+        expect(selectedOption.value.value).toEqual('tacos-2');
       }));
 
     });
 
     describe('when comparing by reference', () => {
-      beforeEach(async(() => {
+      beforeEach(fakeAsync(() => {
         spyOn(instance, 'compareByReference').and.callThrough();
         instance.useCompareByReference();
         fixture.detectChanges();
       }));
 
-      it('should use the comparator', () => {
+      it('should use the comparator', fakeAsync(() => {
         expect(instance.compareByReference).toHaveBeenCalled();
-      });
+      }));
 
-      it('should initialize with no selection despite having a value', () => {
+      it('should initialize with no selection despite having a value', fakeAsync(() => {
         expect(instance.selectedFood.value).toBe('pizza-1');
         expect(instance.select.selected).toBeUndefined();
-      });
+      }));
 
-      it('should not update the selection if value is copied on change', async(() => {
+      it('should not update the selection if value is copied on change', fakeAsync(() => {
         instance.options.first._selectViaInteraction();
         fixture.detectChanges();
-        fixture.whenStable().then(() => {
-          expect(instance.selectedFood.value).toEqual('steak-0');
-          expect(instance.select.selected).toBeUndefined();
-        });
+        flush();
+
+        expect(instance.selectedFood.value).toEqual('steak-0');
+        expect(instance.select.selected).toBeUndefined();
       }));
 
-      it('should throw an error when using a non-function comparator', () => {
+      it('should throw an error when using a non-function comparator', fakeAsync(() => {
         instance.useNullComparator();
 
         expect(() => {
           fixture.detectChanges();
         }).toThrowError(wrappedErrorMessage(getMatSelectNonFunctionValueError()));
-      });
-
+      }));
     });
   });
 
@@ -3210,7 +3160,7 @@ describe('MatSelect', () => {
       fixture.detectChanges();
       fixture.componentInstance.select.open();
       fixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
       panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
@@ -3251,14 +3201,13 @@ describe('MatSelect', () => {
 
     it('should skip option group labels', fakeAsync(() => {
       fixture.destroy();
-      tick(SELECT_CLOSE_ANIMATION);
 
       const groupFixture = TestBed.createComponent(SelectWithGroups);
 
       groupFixture.detectChanges();
       groupFixture.componentInstance.select.open();
       groupFixture.detectChanges();
-      tick(SELECT_OPEN_ANIMATION);
+      flush();
 
       host = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
       panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
@@ -3276,14 +3225,12 @@ describe('MatSelect', () => {
     it('should scroll top the top when pressing HOME', fakeAsync(() => {
       for (let i = 0; i < 20; i++) {
         dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-        tick();
         fixture.detectChanges();
       }
 
       expect(panel.scrollTop).toBeGreaterThan(0, 'Expected panel to be scrolled down.');
 
       dispatchKeyboardEvent(host, 'keydown', HOME);
-      tick();
       fixture.detectChanges();
 
       expect(panel.scrollTop).toBe(0, 'Expected panel to be scrolled to the top');
@@ -3291,7 +3238,6 @@ describe('MatSelect', () => {
 
     it('should scroll to the bottom of the panel when pressing END', fakeAsync(() => {
       dispatchKeyboardEvent(host, 'keydown', END);
-      tick();
       fixture.detectChanges();
 
       // <option amount> * <option height> - <panel height> = 30 * 48 - 256 = 1184
@@ -3302,12 +3248,10 @@ describe('MatSelect', () => {
       for (let i = 0; i < 15; i++) {
         // Press the letter 'o' 15 times since all the options are named 'Option <index>'
         dispatchEvent(host, createKeyboardEvent('keydown', 79, undefined, 'o'));
-        tick();
         fixture.detectChanges();
-        tick(200);
+        tick(LETTER_KEY_DEBOUNCE_INTERVAL);
       }
-
-      tick(200);
+      flush();
 
       // <option index * height> - <panel height> = 16 * 48 - 256 = 512
       expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index d2c8cece3ec1..9321112b4c0c 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -19,7 +19,15 @@ const outDir = join(outputDir, 'packages', 'demo-app');
 
 /** Array of vendors that are required to serve the demo-app. */
 const appVendors = [
-  '@angular', 'systemjs', 'zone.js', 'rxjs', 'hammerjs', 'core-js', 'web-animations-js', 'moment',
+  '@angular',
+  'systemjs',
+  'zone.js',
+  'rxjs',
+  'hammerjs',
+  'core-js',
+  'web-animations-js',
+  'moment',
+  'tslib',
 ];
 
 /** Glob that matches all required vendors for the demo-app. */

From 2f2325a856680cef25a63953b19d87d5f61db8f4 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 7 Nov 2017 09:52:39 -0800
Subject: [PATCH 447/575] fix(datepicker): correct DST issues on IE 11 (#7858)

---
 src/lib/core/datetime/index.ts               |  4 +++-
 src/lib/core/datetime/native-date-adapter.ts | 16 ++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/lib/core/datetime/index.ts b/src/lib/core/datetime/index.ts
index 0059b79b50bc..e5ef807f498a 100644
--- a/src/lib/core/datetime/index.ts
+++ b/src/lib/core/datetime/index.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {PlatformModule} from '@angular/cdk/platform';
 import {NgModule} from '@angular/core';
 import {DateAdapter, MAT_DATE_LOCALE_PROVIDER} from './date-adapter';
-import {NativeDateAdapter} from './native-date-adapter';
 import {MAT_DATE_FORMATS} from './date-formats';
+import {NativeDateAdapter} from './native-date-adapter';
 import {MAT_NATIVE_DATE_FORMATS} from './native-date-formats';
 
 export * from './date-adapter';
@@ -19,6 +20,7 @@ export * from './native-date-formats';
 
 
 @NgModule({
+  imports: [PlatformModule],
   providers: [
     {provide: DateAdapter, useClass: NativeDateAdapter},
     MAT_DATE_LOCALE_PROVIDER
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index 22fd954693b2..40c0c15e3ec8 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Platform} from '@angular/cdk/platform';
 import {Inject, Injectable, Optional} from '@angular/core';
 import {extendObject} from '../util/object-extend';
 import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
@@ -60,18 +61,21 @@ function range<T>(length: number, valueFunction: (index: number) => T): T[] {
 /** Adapts the native JS Date for use with cdk-based components that work with dates. */
 @Injectable()
 export class NativeDateAdapter extends DateAdapter<Date> {
-  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string) {
-    super();
-    super.setLocale(matDateLocale);
-  }
-
   /**
    * Whether to use `timeZone: 'utc'` with `Intl.DateTimeFormat` when formatting dates.
    * Without this `Intl.DateTimeFormat` sometimes chooses the wrong timeZone, which can throw off
    * the result. (e.g. in the en-US locale `new Date(1800, 7, 14).toLocaleDateString()`
    * will produce `'8/13/1800'`.
    */
-  useUtcForDisplay = true;
+  useUtcForDisplay: boolean;
+
+  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string, platform: Platform) {
+    super();
+    super.setLocale(matDateLocale);
+
+    // IE does its own time zone correction, so we disable this on IE.
+    this.useUtcForDisplay = !platform.TRIDENT;
+  }
 
   getYear(date: Date): number {
     return date.getFullYear();

From 9b88aac155e695af761cf16272c7fd59492007fd Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Tue, 7 Nov 2017 09:55:54 -0800
Subject: [PATCH 448/575] fix(expansion) Add expansion panel outputs (#7309)

---
 e2e/components/expansion-e2e.spec.ts          | 27 ++++++++--
 src/e2e-app/main.ts                           |  3 ++
 src/lib/expansion/expansion-panel.ts          |  1 +
 .../expansion-overview-example.html           | 50 ++++++++++++-------
 .../expansion-overview-example.ts             |  4 +-
 5 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/e2e/components/expansion-e2e.spec.ts b/e2e/components/expansion-e2e.spec.ts
index 944c4e46653b..b50d6281d0bd 100644
--- a/e2e/components/expansion-e2e.spec.ts
+++ b/e2e/components/expansion-e2e.spec.ts
@@ -5,15 +5,19 @@ describe('expansion', () => {
 
   beforeEach(() => browser.get('/expansion'));
 
-  it('should show a expansion panel', async () => {
-    expect(element(by.css('.mat-expansion-panel'))).toBeDefined();
+  it('should show an accordion', async () => {
+    expect(element(by.css('.mat-accordion'))).toBeDefined();
+    screenshot();
+  });
 
+  it('should show two panels', async () => {
+    expect(element.all(by.css('.mat-expansion-panel')).count()).toBe(2);
     screenshot();
   });
 
   it('should hide contents of the expansion panel on click', async () => {
-    const panelHeader = element(by.css('.mat-expansion-panel-header'));
-    const panelContent = element(by.css('.mat-expansion-panel-content'));
+    const panelHeader = element.all(by.css('.mat-expansion-panel-header')).get(0);
+    const panelContent = element.all(by.css('.mat-expansion-panel-content')).get(0);
 
     expect(panelContent.isDisplayed()).toBe(false);
 
@@ -22,4 +26,19 @@ describe('expansion', () => {
     expect(panelContent.isDisplayed()).toBe(true);
   });
 
+  it('should emit events for expanding and collapsing', async () => {
+    const panelHeader = element.all(by.css('.mat-expansion-panel-header')).get(1);
+    const panelDescription = element
+      .all(by.css('.mat-expansion-panel-header mat-panel-description')).get(1);
+
+    panelHeader.click();
+
+    expect(panelDescription.getText()).toContain('Currently I am open');
+
+    panelHeader.click();
+
+    expect(panelDescription.getText()).toContain('Currently I am closed');
+  });
+
 });
+
diff --git a/src/e2e-app/main.ts b/src/e2e-app/main.ts
index f90682639bf7..361873c20f28 100644
--- a/src/e2e-app/main.ts
+++ b/src/e2e-app/main.ts
@@ -1,4 +1,7 @@
 import {platformBrowser} from '@angular/platform-browser';
 import {E2eAppModuleNgFactory} from './e2e-app-module.ngfactory';
+import {enableProdMode} from '@angular/core';
+
+enableProdMode();
 
 platformBrowser().bootstrapModuleFactory(E2eAppModuleNgFactory);
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 4ab23c55a50f..2c5eed73a982 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -72,6 +72,7 @@ export type MatExpansionPanelState = 'expanded' | 'collapsed';
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['disabled', 'expanded'],
+  outputs: ['opened', 'closed'],
   host: {
     'class': 'mat-expansion-panel',
     '[class.mat-expanded]': 'expanded',
diff --git a/src/material-examples/expansion-overview/expansion-overview-example.html b/src/material-examples/expansion-overview/expansion-overview-example.html
index 9d105bef4d64..8ba383c31746 100644
--- a/src/material-examples/expansion-overview/expansion-overview-example.html
+++ b/src/material-examples/expansion-overview/expansion-overview-example.html
@@ -1,18 +1,32 @@
-<mat-expansion-panel>
-  <mat-expansion-panel-header>
-    <mat-panel-title>
-      Personal data
-    </mat-panel-title>
-    <mat-panel-description>
-      Type your name and age
-    </mat-panel-description>
-  </mat-expansion-panel-header>
-  
-  <mat-form-field>
-    <input matInput placeholder="First name">
-  </mat-form-field>
-  
-  <mat-form-field>
-    <input matInput placeholder="Age">
-  </mat-form-field>
-</mat-expansion-panel>
+<mat-accordion>
+  <mat-expansion-panel>
+    <mat-expansion-panel-header>
+      <mat-panel-title>
+        Personal data
+      </mat-panel-title>
+      <mat-panel-description>
+        Type your name and age
+      </mat-panel-description>
+    </mat-expansion-panel-header>
+
+    <mat-form-field>
+      <input matInput placeholder="First name">
+    </mat-form-field>
+
+    <mat-form-field>
+      <input matInput placeholder="Age">
+    </mat-form-field>
+  </mat-expansion-panel>
+  <mat-expansion-panel (opened)="panelOpenState = true"
+                       (closed)="panelOpenState = false">
+    <mat-expansion-panel-header>
+      <mat-panel-title>
+        Self aware panel
+      </mat-panel-title>
+      <mat-panel-description>
+        Currently I am {{panelOpenState ? 'open' : 'closed'}}
+      </mat-panel-description>
+    </mat-expansion-panel-header>
+    <p>I'm visible because I am open</p>
+  </mat-expansion-panel>
+</mat-accordion>
diff --git a/src/material-examples/expansion-overview/expansion-overview-example.ts b/src/material-examples/expansion-overview/expansion-overview-example.ts
index 75cff7cc4ca8..dcf49d93afa6 100644
--- a/src/material-examples/expansion-overview/expansion-overview-example.ts
+++ b/src/material-examples/expansion-overview/expansion-overview-example.ts
@@ -7,4 +7,6 @@ import {Component} from '@angular/core';
   selector: 'expansion-overview-example',
   templateUrl: 'expansion-overview-example.html',
 })
-export class ExpansionOverviewExample {}
+export class ExpansionOverviewExample {
+  panelOpenState: boolean = false;
+}

From d6d9ff8f796321c00be0c5f43c924f6429147eb9 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 7 Nov 2017 09:56:16 -0800
Subject: [PATCH 449/575] fix(datepicker): add missing exportAs (#7782)

---
 src/lib/datepicker/calendar-body.ts     | 1 +
 src/lib/datepicker/calendar.ts          | 1 +
 src/lib/datepicker/datepicker-toggle.ts | 1 +
 src/lib/datepicker/datepicker.ts        | 1 +
 src/lib/datepicker/month-view.ts        | 1 +
 src/lib/datepicker/year-view.ts         | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/lib/datepicker/calendar-body.ts b/src/lib/datepicker/calendar-body.ts
index ad263133d369..bac222427799 100644
--- a/src/lib/datepicker/calendar-body.ts
+++ b/src/lib/datepicker/calendar-body.ts
@@ -40,6 +40,7 @@ export class MatCalendarCell {
   host: {
     'class': 'mat-calendar-body',
   },
+  exportAs: 'matCalendarBody',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index 321e177a74c2..591b317e7976 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -56,6 +56,7 @@ import {MatYearView} from './year-view';
   host: {
     'class': 'mat-calendar',
   },
+  exportAs: 'matCalendar',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/lib/datepicker/datepicker-toggle.ts b/src/lib/datepicker/datepicker-toggle.ts
index 3d4b889329dd..147a680a3081 100644
--- a/src/lib/datepicker/datepicker-toggle.ts
+++ b/src/lib/datepicker/datepicker-toggle.ts
@@ -32,6 +32,7 @@ import {MatDatepickerIntl} from './datepicker-intl';
   host: {
     'class': 'mat-datepicker-toggle',
   },
+  exportAs: 'matDatepickerToggle',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index f7b67becb270..baf9ed3ebf1f 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -84,6 +84,7 @@ export const MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER = {
     '[class.mat-datepicker-content-touch]': 'datepicker.touchUi',
     '(keydown)': '_handleKeydown($event)',
   },
+  exportAs: 'matDatepickerContent',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/lib/datepicker/month-view.ts b/src/lib/datepicker/month-view.ts
index c8d9fc0ae926..d1412717e5fd 100644
--- a/src/lib/datepicker/month-view.ts
+++ b/src/lib/datepicker/month-view.ts
@@ -34,6 +34,7 @@ const DAYS_PER_WEEK = 7;
   moduleId: module.id,
   selector: 'mat-month-view',
   templateUrl: 'month-view.html',
+  exportAs: 'matMonthVeiw',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/lib/datepicker/year-view.ts b/src/lib/datepicker/year-view.ts
index 3e60fdf190e9..63ceb39791ff 100644
--- a/src/lib/datepicker/year-view.ts
+++ b/src/lib/datepicker/year-view.ts
@@ -31,6 +31,7 @@ import {createMissingDateImplError} from './datepicker-errors';
   moduleId: module.id,
   selector: 'mat-year-view',
   templateUrl: 'year-view.html',
+  exportAs: 'matYearView',
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,

From 7610c7c5678cec6f5b2fb96c86592f1d46687b19 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 7 Nov 2017 17:57:31 +0000
Subject: [PATCH 450/575] fix(drawer): re-add openedStart and closedStart
 events (#7747)

* Re-adds the `openedStart` and `closedStart` events due to popular demand.
* Fixes wrong signature for the returned promise from toggle. The signature states that the resolved value is supposed to be a `MatDrawerToggleResult` while in practice it was `undefined`.
---
 src/demo-app/drawer/drawer-demo.html |  2 +-
 src/lib/sidenav/drawer.spec.ts       | 96 ++++++++++++++++++++++++----
 src/lib/sidenav/drawer.ts            | 28 ++++++--
 3 files changed, 108 insertions(+), 18 deletions(-)

diff --git a/src/demo-app/drawer/drawer-demo.html b/src/demo-app/drawer/drawer-demo.html
index 58bbe94eb95b..e83193ac1b6c 100644
--- a/src/demo-app/drawer/drawer-demo.html
+++ b/src/demo-app/drawer/drawer-demo.html
@@ -1,7 +1,7 @@
 <h2>Basic Use Case</h2>
 
 <mat-drawer-container class="demo-drawer-container">
-  <mat-drawer #start (open)="myinput.focus()" mode="side">
+  <mat-drawer #start (opened)="myinput.focus()" mode="side">
     Start Side Drawer
     <br>
     <button mat-button (click)="start.close()">Close</button>
diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index b3f941de525a..a6ac276b7227 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -28,45 +28,98 @@ describe('MatDrawer', () => {
   }));
 
   describe('methods', () => {
-    it('should be able to open and close', fakeAsync(() => {
-      let fixture = TestBed.createComponent(BasicTestApp);
+    it('should be able to open', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicTestApp);
 
       fixture.detectChanges();
 
-      let testComponent: BasicTestApp = fixture.debugElement.componentInstance;
-      let drawer = fixture.debugElement.query(By.directive(MatDrawer));
-      let drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
+      const testComponent: BasicTestApp = fixture.debugElement.componentInstance;
+      const drawer = fixture.debugElement.query(By.directive(MatDrawer));
+      const drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
 
       drawerBackdropElement.nativeElement.style.transition = 'none';
       fixture.debugElement.query(By.css('.open')).nativeElement.click();
       fixture.detectChanges();
 
       expect(testComponent.openCount).toBe(0);
-      expect(testComponent.closeCount).toBe(0);
+      expect(testComponent.openStartCount).toBe(0);
 
       tick();
+      expect(testComponent.openStartCount).toBe(1);
       fixture.detectChanges();
 
       expect(testComponent.openCount).toBe(1);
-      expect(testComponent.closeCount).toBe(0);
+      expect(testComponent.openStartCount).toBe(1);
       expect(getComputedStyle(drawer.nativeElement).visibility).toBe('visible');
       expect(getComputedStyle(drawerBackdropElement.nativeElement).visibility).toBe('visible');
+    }));
+
+    it('should be able to close', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicTestApp);
+
+      fixture.detectChanges();
+
+      const testComponent: BasicTestApp = fixture.debugElement.componentInstance;
+      const drawer = fixture.debugElement.query(By.directive(MatDrawer));
+      const drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
+
+      drawerBackdropElement.nativeElement.style.transition = 'none';
+      fixture.debugElement.query(By.css('.open')).nativeElement.click();
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
 
       fixture.debugElement.query(By.css('.close')).nativeElement.click();
       fixture.detectChanges();
 
-      expect(testComponent.openCount).toBe(1);
       expect(testComponent.closeCount).toBe(0);
+      expect(testComponent.closeStartCount).toBe(0);
 
       tick();
+      expect(testComponent.closeStartCount).toBe(1);
       fixture.detectChanges();
 
-      expect(testComponent.openCount).toBe(1);
       expect(testComponent.closeCount).toBe(1);
+      expect(testComponent.closeStartCount).toBe(1);
       expect(getComputedStyle(drawer.nativeElement).visibility).toBe('hidden');
       expect(getComputedStyle(drawerBackdropElement.nativeElement).visibility).toBe('hidden');
     }));
 
+    it('should resolve the open method promise with an object', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicTestApp);
+      fixture.detectChanges();
+      const drawer = fixture.debugElement.query(By.directive(MatDrawer));
+
+      drawer.componentInstance.open().then(result => {
+        expect(result).toBeTruthy();
+        expect(result.type).toBe('open');
+        expect(result.animationFinished).toBe(true);
+      });
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+    }));
+
+    it('should resolve the close method promise with an object', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicTestApp);
+      fixture.detectChanges();
+      const drawer = fixture.debugElement.query(By.directive(MatDrawer));
+
+      drawer.componentInstance.open();
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+
+      drawer.componentInstance.close().then(result => {
+        expect(result).toBeTruthy();
+        expect(result.type).toBe('close');
+        expect(result.animationFinished).toBe(true);
+      });
+      fixture.detectChanges();
+      tick();
+      fixture.detectChanges();
+    }));
+
     it('should be able to close while the open animation is running', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicTestApp);
       fixture.detectChanges();
@@ -139,13 +192,16 @@ describe('MatDrawer', () => {
       tick();
 
       expect(testComponent.openCount).toBe(1, 'Expected one open event.');
+      expect(testComponent.openStartCount).toBe(1, 'Expected one open start event.');
       expect(testComponent.closeCount).toBe(0, 'Expected no close events.');
+      expect(testComponent.closeStartCount).toBe(0, 'Expected no close start events.');
 
       dispatchKeyboardEvent(drawer.nativeElement, 'keydown', ESCAPE);
       fixture.detectChanges();
       tick();
 
       expect(testComponent.closeCount).toBe(1, 'Expected one close event.');
+      expect(testComponent.closeStartCount).toBe(1, 'Expected one close start event.');
     }));
 
     it('should fire the open event when open on init', fakeAsync(() => {
@@ -172,6 +228,7 @@ describe('MatDrawer', () => {
       tick();
 
       expect(testComponent.closeCount).toBe(0);
+      expect(testComponent.closeStartCount).toBe(0);
     }));
 
     it('should not close by clicking on the backdrop when disableClose is set', fakeAsync(() => {
@@ -189,6 +246,7 @@ describe('MatDrawer', () => {
       tick();
 
       expect(testComponent.closeCount).toBe(0);
+      expect(testComponent.closeStartCount).toBe(0);
     }));
 
     it('should restore focus on close if focus is inside drawer', fakeAsync(() => {
@@ -490,7 +548,9 @@ class DrawerContainerTwoDrawerTestApp {
     <mat-drawer-container (backdropClick)="backdropClicked()">
       <mat-drawer #drawer position="start"
                  (opened)="open()"
-                 (closed)="close()">
+                 (openedStart)="openStart()"
+                 (closed)="close()"
+                 (closedStart)="closeStart()">
         <button #drawerButton>Content.</button>
       </mat-drawer>
       <button (click)="drawer.open()" class="open" #openButton></button>
@@ -498,9 +558,11 @@ class DrawerContainerTwoDrawerTestApp {
     </mat-drawer-container>`,
 })
 class BasicTestApp {
-  openCount: number = 0;
-  closeCount: number = 0;
-  backdropClickedCount: number = 0;
+  openCount = 0;
+  openStartCount = 0;
+  closeCount = 0;
+  closeStartCount = 0;
+  backdropClickedCount = 0;
 
   @ViewChild('drawerButton') drawerButton: ElementRef;
   @ViewChild('openButton') openButton: ElementRef;
@@ -510,10 +572,18 @@ class BasicTestApp {
     this.openCount++;
   }
 
+  openStart() {
+    this.openStartCount++;
+  }
+
   close() {
     this.closeCount++;
   }
 
+  closeStart() {
+    this.closeStartCount++;
+  }
+
   backdropClicked() {
     this.backdropClickedCount++;
   }
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 8497f8e5d5e4..6a9b4410b062 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -193,21 +193,39 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     return this.openedChange.pipe(filter(o => o), map(() => {}));
   }
 
+  /** Event emitted when the drawer has started opening. */
+  @Output()
+  get openedStart(): Observable<void> {
+    return this._animationStarted.pipe(
+      filter(e => e.fromState !== e.toState && e.toState.indexOf('open') === 0),
+      map(() => {})
+    );
+  }
+
   /** Event emitted when the drawer has been closed. */
   @Output('closed')
   get _closedStream(): Observable<void> {
     return this.openedChange.pipe(filter(o => !o), map(() => {}));
   }
 
+  /** Event emitted when the drawer has started closing. */
+  @Output()
+  get closedStart(): Observable<void> {
+    return this._animationStarted.pipe(
+      filter(e => e.fromState !== e.toState && e.toState === 'void'),
+      map(() => {})
+    );
+  }
+
   /**
    * Event emitted when the drawer is fully opened.
-   * @deprecated Use `openedChange` instead.
+   * @deprecated Use `opened` instead.
    */
   @Output('open') onOpen = this._openedStream;
 
   /**
    * Event emitted when the drawer is fully closed.
-   * @deprecated Use `openedChange` instead.
+   * @deprecated Use `closed` instead.
    */
   @Output('close') onClose = this._closedStream;
 
@@ -327,8 +345,10 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
 
     // TODO(crisbeto): This promise is here for backwards-compatibility.
     // It should be removed next time we do breaking changes in the drawer.
-    return new Promise(resolve => {
-      (isOpen ? this.onOpen : this.onClose).pipe(first()).subscribe(resolve);
+    return new Promise<any>(resolve => {
+      this.openedChange.pipe(first()).subscribe(open => {
+        resolve(new MatDrawerToggleResult(open ? 'open' : 'close', true));
+      });
     });
   }
 

From 20b47d72b17b53799ef44c99c8d665d6d8590d92 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 7 Nov 2017 09:58:41 -0800
Subject: [PATCH 451/575] feat(a11y): add autoCapture option to cdkTrapFocus
 (#7641)

This also renames `FocusTrapDirective` to `CdkTrapFocus` and re-exports it under the old name.
---
 src/cdk/a11y/a11y-module.ts     |  6 ++--
 src/cdk/a11y/focus-trap.spec.ts | 50 ++++++++++++++++++++++++++++-----
 src/cdk/a11y/focus-trap.ts      | 31 ++++++++++++++++++--
 src/cdk/a11y/public-api.ts      |  5 ++++
 4 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/src/cdk/a11y/a11y-module.ts b/src/cdk/a11y/a11y-module.ts
index 1cb501da20df..27b754af6a43 100644
--- a/src/cdk/a11y/a11y-module.ts
+++ b/src/cdk/a11y/a11y-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {FocusTrapDeprecatedDirective, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
+import {FocusTrapDeprecatedDirective, CdkTrapFocus, FocusTrapFactory} from './focus-trap';
 import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer';
 import {InteractivityChecker} from './interactivity-checker';
 import {CommonModule} from '@angular/common';
@@ -17,8 +17,8 @@ import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor';
 
 @NgModule({
   imports: [CommonModule, PlatformModule],
-  declarations: [FocusTrapDirective, FocusTrapDeprecatedDirective, CdkMonitorFocus],
-  exports: [FocusTrapDirective, FocusTrapDeprecatedDirective, CdkMonitorFocus],
+  declarations: [CdkTrapFocus, FocusTrapDeprecatedDirective, CdkMonitorFocus],
+  exports: [CdkTrapFocus, FocusTrapDeprecatedDirective, CdkMonitorFocus],
   providers: [
     InteractivityChecker,
     FocusTrapFactory,
diff --git a/src/cdk/a11y/focus-trap.spec.ts b/src/cdk/a11y/focus-trap.spec.ts
index bb3657308f17..13cbc9ca1c04 100644
--- a/src/cdk/a11y/focus-trap.spec.ts
+++ b/src/cdk/a11y/focus-trap.spec.ts
@@ -1,7 +1,7 @@
 import {Platform} from '@angular/cdk/platform';
 import {Component, ViewChild} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {FocusTrap, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
+import {FocusTrap, CdkTrapFocus, FocusTrapFactory} from './focus-trap';
 import {InteractivityChecker} from './interactivity-checker';
 
 
@@ -10,12 +10,13 @@ describe('FocusTrap', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
-        FocusTrapDirective,
+        CdkTrapFocus,
         FocusTrapWithBindings,
         SimpleFocusTrap,
         FocusTrapTargets,
         FocusTrapWithSvg,
         FocusTrapWithoutFocusableElements,
+        FocusTrapWithAutoCapture,
       ],
       providers: [InteractivityChecker, Platform, FocusTrapFactory]
     });
@@ -154,6 +155,27 @@ describe('FocusTrap', () => {
       expect(() => focusTrapInstance.focusLastTabbableElement()).not.toThrow();
     });
   });
+
+  describe('with autoCapture', () => {
+    it('should automatically capture and return focus on init / destroy', async(() => {
+      const fixture = TestBed.createComponent(FocusTrapWithAutoCapture);
+      fixture.detectChanges();
+
+      const buttonOutsideTrappedRegion = fixture.nativeElement.querySelector('button');
+      buttonOutsideTrappedRegion.focus();
+      expect(document.activeElement).toBe(buttonOutsideTrappedRegion);
+
+      fixture.componentInstance.showTrappedRegion = true;
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        expect(document.activeElement.id).toBe('auto-capture-target');
+
+        fixture.destroy();
+        expect(document.activeElement).toBe(buttonOutsideTrappedRegion);
+      });
+    }));
+  });
 });
 
 
@@ -166,7 +188,21 @@ describe('FocusTrap', () => {
     `
 })
 class SimpleFocusTrap {
-  @ViewChild(FocusTrapDirective) focusTrapDirective: FocusTrapDirective;
+  @ViewChild(CdkTrapFocus) focusTrapDirective: CdkTrapFocus;
+}
+
+@Component({
+  template: `
+    <button type="button">Toggle</button>
+    <div *ngIf="showTrappedRegion" cdkTrapFocus cdkTrapFocusAutoCapture>
+      <input id="auto-capture-target">
+      <button>SAVE</button>
+    </div>
+    `
+})
+class FocusTrapWithAutoCapture {
+  @ViewChild(CdkTrapFocus) focusTrapDirective: CdkTrapFocus;
+  showTrappedRegion = false;
 }
 
 
@@ -179,7 +215,7 @@ class SimpleFocusTrap {
     `
 })
 class FocusTrapWithBindings {
-  @ViewChild(FocusTrapDirective) focusTrapDirective: FocusTrapDirective;
+  @ViewChild(CdkTrapFocus) focusTrapDirective: CdkTrapFocus;
   renderFocusTrap = true;
   _isFocusTrapEnabled = true;
 }
@@ -199,7 +235,7 @@ class FocusTrapWithBindings {
     `
 })
 class FocusTrapTargets {
-  @ViewChild(FocusTrapDirective) focusTrapDirective: FocusTrapDirective;
+  @ViewChild(CdkTrapFocus) focusTrapDirective: CdkTrapFocus;
 }
 
 
@@ -213,7 +249,7 @@ class FocusTrapTargets {
     `
 })
 class FocusTrapWithSvg {
-  @ViewChild(FocusTrapDirective) focusTrapDirective: FocusTrapDirective;
+  @ViewChild(CdkTrapFocus) focusTrapDirective: CdkTrapFocus;
 }
 
 @Component({
@@ -224,5 +260,5 @@ class FocusTrapWithSvg {
     `
 })
 class FocusTrapWithoutFocusableElements {
-  @ViewChild(FocusTrapDirective) focusTrapDirective: FocusTrapDirective;
+  @ViewChild(CdkTrapFocus) focusTrapDirective: CdkTrapFocus;
 }
diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index a89b8cdd0fdc..f6e217133c6e 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -348,24 +348,51 @@ export class FocusTrapDeprecatedDirective implements OnDestroy, AfterContentInit
   selector: '[cdkTrapFocus]',
   exportAs: 'cdkTrapFocus',
 })
-export class FocusTrapDirective implements OnDestroy, AfterContentInit {
+export class CdkTrapFocus implements OnDestroy, AfterContentInit {
   /** Underlying FocusTrap instance. */
   focusTrap: FocusTrap;
 
+  /** Previously focused element to restore focus to upon destroy when using autoCapture. */
+  private _previouslyFocusedElement: HTMLElement | null = null;
+
   /** Whether the focus trap is active. */
   @Input('cdkTrapFocus')
   get enabled(): boolean { return this.focusTrap.enabled; }
   set enabled(value: boolean) { this.focusTrap.enabled = coerceBooleanProperty(value); }
 
-  constructor(private _elementRef: ElementRef, private _focusTrapFactory: FocusTrapFactory) {
+  /**
+   * Whether the directive should automatially move focus into the trapped region upon
+   * initialization and return focus to the previous activeElement upon destruction.
+   */
+  @Input('cdkTrapFocusAutoCapture')
+  get autoCapture(): boolean { return this._autoCapture; }
+  set autoCapture(value: boolean) { this._autoCapture = coerceBooleanProperty(value); }
+  private _autoCapture: boolean;
+
+  constructor(
+      private _elementRef: ElementRef,
+      private _focusTrapFactory: FocusTrapFactory,
+      private _platform: Platform) {
     this.focusTrap = this._focusTrapFactory.create(this._elementRef.nativeElement, true);
   }
 
   ngOnDestroy() {
     this.focusTrap.destroy();
+
+    // If we stored a previously focused element when using autoCapture, return focus to that
+    // element now that the trapped region is being destroyed.
+    if (this._previouslyFocusedElement) {
+      this._previouslyFocusedElement.focus();
+      this._previouslyFocusedElement = null;
+    }
   }
 
   ngAfterContentInit() {
     this.focusTrap.attachAnchors();
+
+    if (this.autoCapture && this._platform.isBrowser) {
+      this._previouslyFocusedElement = document.activeElement as HTMLElement;
+      this.focusTrap.focusInitialElementWhenReady();
+    }
   }
 }
diff --git a/src/cdk/a11y/public-api.ts b/src/cdk/a11y/public-api.ts
index c615cd7d5f6d..552cd7a5bfc7 100644
--- a/src/cdk/a11y/public-api.ts
+++ b/src/cdk/a11y/public-api.ts
@@ -5,6 +5,8 @@
  * 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 {CdkTrapFocus} from './focus-trap';
+
 
 export * from './activedescendant-key-manager';
 export * from './aria-describer';
@@ -16,3 +18,6 @@ export * from './list-key-manager';
 export * from './live-announcer';
 export * from './focus-monitor';
 export * from './a11y-module';
+
+/** @deprecated Renamed to CdkTrapFocus. */
+export {CdkTrapFocus as FocusTrapDirective};

From b9973532bfe0f13d5e14c32aabcf44485c8e41b3 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 7 Nov 2017 18:07:27 +0000
Subject: [PATCH 452/575] fix(progress-spinner): default strokeWidth to 10% of
 the diameter (#7746)

Currently the default stroke of a spinner is always 10px which doesn't look great on anything that's smaller than the default. These changes switch it to be 10% of the circle's diameter.
---
 src/lib/progress-spinner/progress-spinner.spec.ts | 14 ++++++++++++--
 src/lib/progress-spinner/progress-spinner.ts      | 12 +++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index 03c6a9358bc7..5aff4b509922 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -1,7 +1,7 @@
 import {TestBed, async} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MatProgressSpinnerModule} from './index';
+import {MatProgressSpinnerModule, MatProgressSpinner} from './index';
 
 
 describe('MatProgressSpinner', () => {
@@ -80,6 +80,16 @@ describe('MatProgressSpinner', () => {
     expect(progressComponent.value).toBe(0);
   });
 
+  it('should default to a stroke width that is 10% of the diameter', () => {
+    const fixture = TestBed.createComponent(ProgressSpinnerCustomDiameter);
+    const spinner = fixture.debugElement.query(By.directive(MatProgressSpinner));
+
+    fixture.componentInstance.diameter = 67;
+    fixture.detectChanges();
+
+    expect(spinner.componentInstance.strokeWidth).toBe(6.7);
+  });
+
   it('should allow a custom diameter', () => {
     const fixture = TestBed.createComponent(ProgressSpinnerCustomDiameter);
     const spinner = fixture.debugElement.query(By.css('mat-progress-spinner')).nativeElement;
@@ -97,7 +107,7 @@ describe('MatProgressSpinner', () => {
     expect(parseInt(svgElement.style.height))
         .toBe(32, 'Expected the custom diameter to be applied to the svg element height.');
     expect(svgElement.getAttribute('viewBox'))
-        .toBe('0 0 32 32', 'Expected the custom diameter to be applied to the svg viewBox.');
+        .toBe('0 0 25.2 25.2', 'Expected the custom diameter to be applied to the svg viewBox.');
   });
 
   it('should allow a custom stroke width', () => {
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index bcc55cf3602e..f2c55071e1b7 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -21,6 +21,7 @@ import {
 import {CanColor, mixinColor} from '@angular/material/core';
 import {Platform} from '@angular/cdk/platform';
 import {DOCUMENT} from '@angular/common';
+import {coerceNumberProperty} from '@angular/cdk/coercion';
 
 /** Possible mode for a progress spinner. */
 export type ProgressSpinnerMode = 'determinate' | 'indeterminate';
@@ -87,6 +88,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   private readonly _baseSize = 100;
   private readonly _baseStrokeWidth = 10;
   private _fallbackAnimation = false;
+  private _strokeWidth: number;
 
   /** The width and height of the host element. Will grow with stroke width. **/
   _elementSize = this._baseSize;
@@ -112,7 +114,15 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   _diameter = this._baseSize;
 
   /** Stroke width of the progress spinner. */
-  @Input() strokeWidth: number = 10;
+  @Input()
+  get strokeWidth(): number {
+    return this._strokeWidth || this.diameter / 10;
+  }
+
+  set strokeWidth(value: number) {
+    this._strokeWidth = coerceNumberProperty(value);
+  }
+
 
   /** Mode of the progress circle */
   @Input() mode: ProgressSpinnerMode = 'determinate';

From 998153a535c7e5a6a71ba6319a81513663d57679 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 7 Nov 2017 18:09:28 +0000
Subject: [PATCH 453/575] feat(datepicker): dispatch events when datepicker is
 opened and closed (#7792)

Adds `opened` and `closed` events, dispatched when a datepicker is opened/closed.
---
 src/lib/datepicker/datepicker.spec.ts | 44 +++++++++++++++++++++++++++
 src/lib/datepicker/datepicker.ts      |  8 +++++
 2 files changed, 52 insertions(+)

diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 4df9754f2284..98fc04612156 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -60,6 +60,7 @@ describe('MatDatepicker', () => {
           MultiInputDatepicker,
           NoInputDatepicker,
           StandardDatepicker,
+          DatepickerWithEvents,
         ],
       });
 
@@ -906,6 +907,36 @@ describe('MatDatepicker', () => {
         });
       }));
     });
+
+    describe('with events', () => {
+      let fixture: ComponentFixture<DatepickerWithEvents>;
+      let testComponent: DatepickerWithEvents;
+
+      beforeEach(async(() => {
+        fixture = TestBed.createComponent(DatepickerWithEvents);
+        fixture.detectChanges();
+        testComponent = fixture.componentInstance;
+      }));
+
+      it('should dispatch an event when a datepicker is opened', () => {
+        testComponent.datepicker.open();
+        fixture.detectChanges();
+
+        expect(testComponent.openedSpy).toHaveBeenCalled();
+      });
+
+      it('should dispatch an event when a datepicker is closed', () => {
+        testComponent.datepicker.open();
+        fixture.detectChanges();
+
+        testComponent.datepicker.close();
+        fixture.detectChanges();
+
+        expect(testComponent.closedSpy).toHaveBeenCalled();
+      });
+
+    });
+
   });
 
   describe('with missing DateAdapter and MAT_DATE_FORMATS', () => {
@@ -1240,3 +1271,16 @@ class DatepickerWithISOStrings {
   @ViewChild('d') datepicker: MatDatepicker<Date>;
   @ViewChild(MatDatepickerInput) datepickerInput: MatDatepickerInput<Date>;
 }
+
+@Component({
+  template: `
+    <input [(ngModel)]="selected" [matDatepicker]="d">
+    <mat-datepicker (opened)="openedSpy()" (closed)="closedSpy()" #d></mat-datepicker>
+  `,
+})
+class DatepickerWithEvents {
+  selected: Date | null = null;
+  openedSpy = jasmine.createSpy('opened spy');
+  closedSpy = jasmine.createSpy('closed spy');
+  @ViewChild('d') datepicker: MatDatepicker<Date>;
+}
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index baf9ed3ebf1f..acab5074036a 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -172,6 +172,12 @@ export class MatDatepicker<D> implements OnDestroy {
   /** Classes to be passed to the date picker panel. Supports the same syntax as `ngClass`. */
   @Input() panelClass: string | string[];
 
+  /** Emits when the datepicker has been opened. */
+  @Output('opened') openedStream: EventEmitter<void> = new EventEmitter<void>();
+
+  /** Emits when the datepicker has been closed. */
+  @Output('closed') closedStream: EventEmitter<void> = new EventEmitter<void>();
+
   /** Whether the calendar is open. */
   opened = false;
 
@@ -276,6 +282,7 @@ export class MatDatepicker<D> implements OnDestroy {
 
     this.touchUi ? this._openAsDialog() : this._openAsPopup();
     this.opened = true;
+    this.openedStream.emit();
   }
 
   /** Close the calendar. */
@@ -301,6 +308,7 @@ export class MatDatepicker<D> implements OnDestroy {
     }
 
     this.opened = false;
+    this.closedStream.emit();
   }
 
   /** Open the calendar as a dialog. */

From 8b3c8a5873aa6f7501f275c185addb8af7d374e2 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 7 Nov 2017 11:32:47 -0800
Subject: [PATCH 454/575] cleanup(datepicker): undo breaking change to
 `NativeDateAdapter` (#8281)

---
 src/lib/core/datetime/index.ts               | 2 --
 src/lib/core/datetime/native-date-adapter.ts | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/core/datetime/index.ts b/src/lib/core/datetime/index.ts
index e5ef807f498a..9a8895841fe9 100644
--- a/src/lib/core/datetime/index.ts
+++ b/src/lib/core/datetime/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PlatformModule} from '@angular/cdk/platform';
 import {NgModule} from '@angular/core';
 import {DateAdapter, MAT_DATE_LOCALE_PROVIDER} from './date-adapter';
 import {MAT_DATE_FORMATS} from './date-formats';
@@ -20,7 +19,6 @@ export * from './native-date-formats';
 
 
 @NgModule({
-  imports: [PlatformModule],
   providers: [
     {provide: DateAdapter, useClass: NativeDateAdapter},
     MAT_DATE_LOCALE_PROVIDER
diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index 40c0c15e3ec8..4b9b9af46243 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Platform} from '@angular/cdk/platform';
 import {Inject, Injectable, Optional} from '@angular/core';
 import {extendObject} from '../util/object-extend';
 import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
@@ -69,12 +68,15 @@ export class NativeDateAdapter extends DateAdapter<Date> {
    */
   useUtcForDisplay: boolean;
 
-  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string, platform: Platform) {
+  constructor(@Optional() @Inject(MAT_DATE_LOCALE) matDateLocale: string) {
     super();
     super.setLocale(matDateLocale);
 
     // IE does its own time zone correction, so we disable this on IE.
-    this.useUtcForDisplay = !platform.TRIDENT;
+    // TODO(mmalerba): replace with !platform.TRIDENT, logic currently duplicated to avoid breaking
+    // change from injecting the Platform.
+    this.useUtcForDisplay = !(typeof document === 'object' && !!document &&
+        /(msie|trident)/i.test(navigator.userAgent));
   }
 
   getYear(date: Date): number {

From dbd64b6c319e961f1914beeaf339e54d68586874 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 8 Nov 2017 22:55:34 +0000
Subject: [PATCH 455/575] chore: fix lint errors (#8288)

---
 src/lib/select/select.spec.ts                                   | 1 -
 .../table-selection/table-selection-example.css                 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 45cb03cf0c59..a58f331646b7 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -1870,7 +1870,6 @@ describe('MatSelect', () => {
 
         // There appears to be a small rounding error on IE, so we verify that the value is close,
         // not exact.
-        let platform = new Platform();
         if (platform.TRIDENT) {
           let difference =
               Math.abs(optionTop + (menuItemHeight - triggerHeight) / 2 - triggerTop);
diff --git a/src/material-examples/table-selection/table-selection-example.css b/src/material-examples/table-selection/table-selection-example.css
index 3054e3cfbffb..ee01a3c8fa53 100644
--- a/src/material-examples/table-selection/table-selection-example.css
+++ b/src/material-examples/table-selection/table-selection-example.css
@@ -11,5 +11,5 @@
 }
 
 .mat-column-select {
-  overflow: initial;
+  overflow: visible;
 }

From a01972960f7c94a51355948ccd5db0ee4775e49a Mon Sep 17 00:00:00 2001
From: Aleksey <33517987+zadorozhniyal@users.noreply.github.com>
Date: Fri, 10 Nov 2017 02:22:03 +0200
Subject: [PATCH 456/575] docs(slider): change slider value binding to ngModel
 (#8338)

---
 .../slider-configurable/slider-configurable-example.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material-examples/slider-configurable/slider-configurable-example.html b/src/material-examples/slider-configurable/slider-configurable-example.html
index 666753cdf4c6..b06304dad935 100644
--- a/src/material-examples/slider-configurable/slider-configurable-example.html
+++ b/src/material-examples/slider-configurable/slider-configurable-example.html
@@ -56,7 +56,7 @@ <h2 class="example-h2">Result</h2>
         [step]="step"
         [thumb-label]="thumbLabel"
         [tick-interval]="tickInterval"
-        [value]="value"
+        [(ngModel)]="value"
         [vertical]="vertical">
     </mat-slider>
   </mat-card-content>

From 691bb7321a6ed7d324fd82d944b6bca5335fbc21 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 10 Nov 2017 09:53:37 -0800
Subject: [PATCH 457/575] chore(form-field): prevent overzealous floating
 placeholder rule optimization (#8343)

---
 src/lib/form-field/_form-field-theme.scss | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index ea8163ab9658..3277aac5bb81 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -105,6 +105,19 @@
   width: 100% / $font-scale;
 }
 
+// This is a total duplicate of the mixin above with insignificant values added to the rules.
+// This exists because the mixin is used in two places. When Google's CSS Optimizer runs over this
+// css (after compiling from sass), it combines those two declarations into one. However, one of
+// those places uses `:-webkit-autofill`. When Firefox encounters this unknown pseuedo-class,
+// it ignores the entire rule. To work around this, we force one of the delcarations to be
+// technically different but still render the same by adding a tiny value to the transform / width.
+@mixin _mat-form-field-placeholder-float-nodedupe($font-scale, $infix-padding, $infix-margin-top) {
+  transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale) perspective(100px)
+             translateZ(0.002px);
+  -ms-transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale);
+  width: (100% / $font-scale) + 0.0001;
+}
+
 @mixin mat-form-field-typography($config) {
   // The unit-less line-height from the font config.
   $line-height: mat-line-height($config, input);
@@ -182,7 +195,7 @@
 
     .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
         .mat-form-field-placeholder {
-      @include _mat-form-field-placeholder-floating(
+      @include _mat-form-field-placeholder-float-nodedupe(
               $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
   }

From 0e03bf4400a51b80a05580832d631930fefe24a9 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 10 Nov 2017 09:54:35 -0800
Subject: [PATCH 458/575] chore(tabs): move tabs to smart portal directive.
 (#7266)

---
 src/lib/tabs/public-api.ts     |  9 ++--
 src/lib/tabs/tab-body.html     |  2 +-
 src/lib/tabs/tab-body.spec.ts  | 29 ++-----------
 src/lib/tabs/tab-body.ts       | 79 +++++++++++++++++++++++-----------
 src/lib/tabs/tab-group.spec.ts | 30 ++++++++-----
 src/lib/tabs/tabs-module.ts    |  3 +-
 6 files changed, 87 insertions(+), 65 deletions(-)

diff --git a/src/lib/tabs/public-api.ts b/src/lib/tabs/public-api.ts
index 9d08a2fef027..5bdae5816899 100644
--- a/src/lib/tabs/public-api.ts
+++ b/src/lib/tabs/public-api.ts
@@ -9,11 +9,14 @@
 export * from './tabs-module';
 export * from './tab-group';
 export {MatInkBar} from './ink-bar';
-export {MatTabBody, MatTabBodyOriginState, MatTabBodyPositionState} from './tab-body';
+export {
+  MatTabBody,
+  MatTabBodyOriginState,
+  MatTabBodyPositionState,
+  MatTabBodyPortal
+} from './tab-body';
 export {MatTabHeader, ScrollDirection} from './tab-header';
 export {MatTabLabelWrapper} from './tab-label-wrapper';
 export {MatTab} from './tab';
 export {MatTabLabel} from './tab-label';
 export {MatTabNav, MatTabLink} from './tab-nav-bar/index';
-
-
diff --git a/src/lib/tabs/tab-body.html b/src/lib/tabs/tab-body.html
index 0650b3fdc08d..312b1848a072 100644
--- a/src/lib/tabs/tab-body.html
+++ b/src/lib/tabs/tab-body.html
@@ -2,5 +2,5 @@
      [@translateTab]="_position"
      (@translateTab.start)="_onTranslateTabStarted($event)"
      (@translateTab.done)="_onTranslateTabComplete($event)">
-  <ng-template cdkPortalOutlet></ng-template>
+  <ng-template matTabBodyHost></ng-template>
 </div>
diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts
index 4572e9f756fe..58c9f81edbc5 100644
--- a/src/lib/tabs/tab-body.spec.ts
+++ b/src/lib/tabs/tab-body.spec.ts
@@ -2,10 +2,10 @@ import {Direction, Directionality} from '@angular/cdk/bidi';
 import {PortalModule, TemplatePortal} from '@angular/cdk/portal';
 import {CommonModule} from '@angular/common';
 import {Component, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
-import {async, ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {MatRippleModule} from '@angular/material/core';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatTabBody} from './tab-body';
+import {MatTabBody, MatTabBodyPortal} from './tab-body';
 
 
 describe('MatTabBody', () => {
@@ -17,6 +17,7 @@ describe('MatTabBody', () => {
       imports: [CommonModule, PortalModule, MatRippleModule, NoopAnimationsModule],
       declarations: [
         MatTabBody,
+        MatTabBodyPortal,
         SimpleTabBodyApp,
       ],
       providers: [
@@ -145,30 +146,6 @@ describe('MatTabBody', () => {
       expect(fixture.componentInstance.tabBody._position).toBe('left');
     });
   });
-
-  describe('on centered', () => {
-    let fixture: ComponentFixture<SimpleTabBodyApp>;
-
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(SimpleTabBodyApp);
-    }));
-
-    it('should attach the content when centered and detach when not', fakeAsync(() => {
-      fixture.componentInstance.position = 1;
-      fixture.detectChanges();
-      expect(fixture.componentInstance.tabBody._portalOutlet.hasAttached()).toBe(false);
-
-      fixture.componentInstance.position = 0;
-      fixture.detectChanges();
-      expect(fixture.componentInstance.tabBody._portalOutlet.hasAttached()).toBe(true);
-
-      fixture.componentInstance.position = 1;
-      fixture.detectChanges();
-      flushMicrotasks(); // Finish animation and let it detach in animation done handler
-      expect(fixture.componentInstance.tabBody._portalOutlet.hasAttached()).toBe(false);
-    }));
-  });
-
 });
 
 
diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index a0519883e437..e08eb716b14f 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -7,17 +7,21 @@
  */
 
 import {
-  ViewChild,
   Component,
   Input,
+  Inject,
   Output,
   EventEmitter,
+  OnDestroy,
   OnInit,
   ElementRef,
+  Directive,
   Optional,
-  AfterViewChecked,
   ViewEncapsulation,
   ChangeDetectionStrategy,
+  ComponentFactoryResolver,
+  ViewContainerRef,
+  forwardRef,
 } from '@angular/core';
 import {
   trigger,
@@ -29,7 +33,10 @@ import {
 } from '@angular/animations';
 import {TemplatePortal, CdkPortalOutlet} from '@angular/cdk/portal';
 import {Directionality, Direction} from '@angular/cdk/bidi';
+import {Subscription} from 'rxjs/Subscription';
 
+/** Workaround for https://github.com/angular/angular/issues/17849 */
+export const _MatTabBodyPortalBaseClass = CdkPortalOutlet;
 
 /**
  * These position states are used internally as animation states for the tab body. Setting the
@@ -52,6 +59,44 @@ export type MatTabBodyPositionState =
  */
 export type MatTabBodyOriginState = 'left' | 'right';
 
+/**
+ * The portal host directive for the contents of the tab.
+ * @docs-private
+ */
+@Directive({
+  selector: '[matTabBodyHost]'
+})
+export class MatTabBodyPortal extends _MatTabBodyPortalBaseClass implements OnInit, OnDestroy {
+  /** A subscription to events for when the tab body begins centering. */
+  private _centeringSub: Subscription;
+
+  constructor(
+    _componentFactoryResolver: ComponentFactoryResolver,
+    _viewContainerRef: ViewContainerRef,
+    @Inject(forwardRef(() => MatTabBody)) private _host: MatTabBody) {
+      super(_componentFactoryResolver, _viewContainerRef);
+  }
+
+  /** Set initial visibility or set up subscription for changing visibility. */
+  ngOnInit(): void {
+    if (this._host._isCenterPosition(this._host._position)) {
+      this.attach(this._host._content);
+    } else {
+      this._centeringSub = this._host._beforeCentering.subscribe(() => {
+        this.attach(this._host._content);
+        this._centeringSub.unsubscribe();
+      });
+    }
+  }
+
+  /** Clean up subscription if necessary. */
+  ngOnDestroy(): void {
+    if (this._centeringSub && !this._centeringSub.closed) {
+      this._centeringSub.unsubscribe();
+    }
+  }
+}
+
 /**
  * Wrapper for the contents of a tab.
  * @docs-private
@@ -86,13 +131,13 @@ export type MatTabBodyOriginState = 'left' | 'right';
     ])
   ]
 })
-export class MatTabBody implements OnInit, AfterViewChecked {
-  /** The portal outlet inside of this container into which the tab body content will be loaded. */
-  @ViewChild(CdkPortalOutlet) _portalOutlet: CdkPortalOutlet;
-
+export class MatTabBody implements OnInit {
   /** Event emitted when the tab begins to animate towards the center as the active tab. */
   @Output() _onCentering: EventEmitter<number> = new EventEmitter<number>();
 
+  /** Event emitted before the centering of the tab begins. */
+  @Output() _beforeCentering: EventEmitter<number> = new EventEmitter<number>();
+
   /** Event emitted when the tab completes its animation towards the center. */
   @Output() _onCentered: EventEmitter<void> = new EventEmitter<void>(true);
 
@@ -139,28 +184,14 @@ export class MatTabBody implements OnInit, AfterViewChecked {
     }
   }
 
-  /**
-   * After the view has been set, check if the tab content is set to the center and attach the
-   * content if it is not already attached.
-   */
-  ngAfterViewChecked() {
-    if (this._isCenterPosition(this._position) && !this._portalOutlet.hasAttached()) {
-      this._portalOutlet.attach(this._content);
-    }
-  }
-
-  _onTranslateTabStarted(e: AnimationEvent) {
+  _onTranslateTabStarted(e: AnimationEvent): void {
     if (this._isCenterPosition(e.toState)) {
+      this._beforeCentering.emit();
       this._onCentering.emit(this._elementRef.nativeElement.clientHeight);
     }
   }
 
-  _onTranslateTabComplete(e: AnimationEvent) {
-    // If the end state is that the tab is not centered, then detach the content.
-    if (!this._isCenterPosition(e.toState) && !this._isCenterPosition(this._position)) {
-      this._portalOutlet.detach();
-    }
-
+  _onTranslateTabComplete(e: AnimationEvent): void {
     // If the transition to the center is complete, emit an event.
     if (this._isCenterPosition(e.toState) && this._isCenterPosition(this._position)) {
       this._onCentered.emit();
@@ -173,7 +204,7 @@ export class MatTabBody implements OnInit, AfterViewChecked {
   }
 
   /** Whether the provided position state is considered center, regardless of origin. */
-  private _isCenterPosition(position: MatTabBodyPositionState|string): boolean {
+  _isCenterPosition(position: MatTabBodyPositionState|string): boolean {
     return position == 'center' ||
         position == 'left-origin-center' ||
         position == 'right-origin-center';
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index 5134ee024677..03780b818d27 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -26,15 +26,22 @@ describe('MatTabGroup', () => {
 
   describe('basic behavior', () => {
     let fixture: ComponentFixture<SimpleTabsTestApp>;
+    let element: HTMLElement;
 
     beforeEach(() => {
       fixture = TestBed.createComponent(SimpleTabsTestApp);
+      element = fixture.nativeElement;
     });
 
     it('should default to the first tab', () => {
       checkSelectedIndex(1, fixture);
     });
 
+    it('will properly load content on first change detection pass', () => {
+      fixture.detectChanges();
+      expect(element.querySelectorAll('.mat-tab-body')[1].querySelectorAll('span').length).toBe(3);
+    });
+
     it('should change selected index on click', () => {
       let component = fixture.debugElement.componentInstance;
       component.selectedIndex = 0;
@@ -318,23 +325,26 @@ describe('MatTabGroup', () => {
           fixture.debugElement.query(By.directive(MatTabGroup)).componentInstance as MatTabGroup;
     });
 
-    it('should support a tab-group with the simple api', () => {
+    it('should support a tab-group with the simple api', async(() => {
       expect(getSelectedLabel(fixture).textContent).toMatch('Junk food');
       expect(getSelectedContent(fixture).textContent).toMatch('Pizza, fries');
 
       tabGroup.selectedIndex = 2;
       fixture.detectChanges();
+      // Use whenStable to wait for async observables and change detection to run in content.
+      fixture.whenStable().then(() => {
 
-      expect(getSelectedLabel(fixture).textContent).toMatch('Fruit');
-      expect(getSelectedContent(fixture).textContent).toMatch('Apples, grapes');
+        expect(getSelectedLabel(fixture).textContent).toMatch('Fruit');
+        expect(getSelectedContent(fixture).textContent).toMatch('Apples, grapes');
 
-      fixture.componentInstance.otherLabel = 'Chips';
-      fixture.componentInstance.otherContent = 'Salt, vinegar';
-      fixture.detectChanges();
+        fixture.componentInstance.otherLabel = 'Chips';
+        fixture.componentInstance.otherContent = 'Salt, vinegar';
+        fixture.detectChanges();
 
-      expect(getSelectedLabel(fixture).textContent).toMatch('Chips');
-      expect(getSelectedContent(fixture).textContent).toMatch('Salt, vinegar');
-    });
+        expect(getSelectedLabel(fixture).textContent).toMatch('Chips');
+        expect(getSelectedContent(fixture).textContent).toMatch('Salt, vinegar');
+      });
+    }));
 
     it('should support @ViewChild in the tab content', () => {
       expect(fixture.componentInstance.legumes).toBeTruthy();
@@ -415,7 +425,7 @@ describe('nested MatTabGroup with enabled animations', () => {
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>Tab Two</ng-template>
-        Tab two content
+        <span>Tab </span><span>two</span><span>content</span>
       </mat-tab>
       <mat-tab>
         <ng-template mat-tab-label>Tab Three</ng-template>
diff --git a/src/lib/tabs/tabs-module.ts b/src/lib/tabs/tabs-module.ts
index 40e4e962cbf4..5defcedd2e58 100644
--- a/src/lib/tabs/tabs-module.ts
+++ b/src/lib/tabs/tabs-module.ts
@@ -14,7 +14,7 @@ import {NgModule} from '@angular/core';
 import {MatCommonModule, MatRippleModule} from '@angular/material/core';
 import {MatInkBar} from './ink-bar';
 import {MatTab} from './tab';
-import {MatTabBody} from './tab-body';
+import {MatTabBody, MatTabBodyPortal} from './tab-body';
 import {MatTabGroup} from './tab-group';
 import {MatTabHeader} from './tab-header';
 import {MatTabLabel} from './tab-label';
@@ -49,6 +49,7 @@ import {MatTabLink, MatTabNav} from './tab-nav-bar/tab-nav-bar';
     MatTabNav,
     MatTabLink,
     MatTabBody,
+    MatTabBodyPortal,
     MatTabHeader
   ],
   providers: [VIEWPORT_RULER_PROVIDER],

From 8dc8dc45c860c2ef1b536c237c65ff1807d47724 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 10 Nov 2017 10:16:05 -0800
Subject: [PATCH 459/575]  fix(focus-monitor): cleanup global listeners and
 don't require Renderer2 (#7728)

* fix(focus-monitor): cleanup global listeners and don't require Renderer2
---
 src/cdk/a11y/focus-monitor.spec.ts            |   4 +-
 src/cdk/a11y/focus-monitor.ts                 | 118 ++++++++++++------
 src/lib/button-toggle/button-toggle.ts        |  20 ++-
 src/lib/button/button.ts                      |   6 +-
 src/lib/checkbox/checkbox.ts                  |   4 +-
 src/lib/expansion/expansion-panel-header.ts   |   4 +-
 src/lib/radio/radio.ts                        |   9 +-
 src/lib/sidenav/sidenav.md                    |   2 +-
 src/lib/slide-toggle/slide-toggle.ts          |  11 +-
 src/lib/slider/slider.ts                      |   4 +-
 src/lib/stepper/step-header.ts                |  22 ++--
 src/lib/tooltip/tooltip.ts                    |   8 +-
 .../form-field-custom-control-example.ts      |   7 +-
 13 files changed, 127 insertions(+), 92 deletions(-)

diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts
index 693ca9e958c6..7cb6b426c6f0 100644
--- a/src/cdk/a11y/focus-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor.spec.ts
@@ -10,7 +10,6 @@ import {A11yModule} from './index';
 describe('FocusMonitor', () => {
   let fixture: ComponentFixture<PlainButton>;
   let buttonElement: HTMLElement;
-  let buttonRenderer: Renderer2;
   let focusMonitor: FocusMonitor;
   let changeHandler: (origin: FocusOrigin) => void;
 
@@ -28,11 +27,10 @@ describe('FocusMonitor', () => {
     fixture.detectChanges();
 
     buttonElement = fixture.debugElement.query(By.css('button')).nativeElement;
-    buttonRenderer = fixture.componentInstance.renderer;
     focusMonitor = fm;
 
     changeHandler = jasmine.createSpy('focus origin change handler');
-    focusMonitor.monitor(buttonElement, buttonRenderer, false).subscribe(changeHandler);
+    focusMonitor.monitor(buttonElement, false).subscribe(changeHandler);
     patchElementFocus(buttonElement);
   }));
 
diff --git a/src/cdk/a11y/focus-monitor.ts b/src/cdk/a11y/focus-monitor.ts
index a1d34a7ff988..ae8cc1f8eb3c 100644
--- a/src/cdk/a11y/focus-monitor.ts
+++ b/src/cdk/a11y/focus-monitor.ts
@@ -36,7 +36,6 @@ export type FocusOrigin = 'touch' | 'mouse' | 'keyboard' | 'program' | null;
 type MonitoredElementInfo = {
   unlisten: Function,
   checkChildren: boolean,
-  renderer: Renderer2,
   subject: Subject<FocusOrigin>
 };
 
@@ -62,22 +61,38 @@ export class FocusMonitor {
   /** Weak map of elements being monitored to their info. */
   private _elementInfo = new WeakMap<Element, MonitoredElementInfo>();
 
-  constructor(private _ngZone: NgZone, private _platform: Platform) {
-    this._ngZone.runOutsideAngular(() => this._registerDocumentEvents());
-  }
+  /** A map of global objects to lists of current listeners. */
+  private _unregisterGlobalListeners = () => {};
+
+  /** The number of elements currently being monitored. */
+  private _monitoredElementCount = 0;
 
+  constructor(private _ngZone: NgZone, private _platform: Platform) {}
+
+  /**
+   * @docs-private
+   * @deprecated renderer param no longer needed.
+   */
+  monitor(element: HTMLElement, renderer: Renderer2, checkChildren: boolean):
+      Observable<FocusOrigin>;
   /**
    * Monitors focus on an element and applies appropriate CSS classes.
    * @param element The element to monitor
-   * @param renderer The renderer to use to apply CSS classes to the element.
    * @param checkChildren Whether to count the element as focused when its children are focused.
    * @returns An observable that emits when the focus state of the element changes.
    *     When the element is blurred, null will be emitted.
    */
+  monitor(element: HTMLElement, checkChildren: boolean): Observable<FocusOrigin>;
   monitor(
       element: HTMLElement,
-      renderer: Renderer2,
-      checkChildren: boolean): Observable<FocusOrigin> {
+      renderer: Renderer2 | boolean,
+      checkChildren?: boolean): Observable<FocusOrigin> {
+    // TODO(mmalerba): clean up after deprecated signature is removed.
+    if (!(renderer instanceof Renderer2)) {
+      checkChildren = renderer;
+    }
+    checkChildren = !!checkChildren;
+
     // Do nothing if we're not on the browser platform.
     if (!this._platform.isBrowser) {
       return observableOf(null);
@@ -93,10 +108,10 @@ export class FocusMonitor {
     let info: MonitoredElementInfo = {
       unlisten: () => {},
       checkChildren: checkChildren,
-      renderer: renderer,
       subject: new Subject<FocusOrigin>()
     };
     this._elementInfo.set(element, info);
+    this._incrementMonitoredElementCount();
 
     // Start listening. We need to listen in capture phase since focus events don't bubble.
     let focusListener = (event: FocusEvent) => this._onFocus(event, element);
@@ -128,6 +143,7 @@ export class FocusMonitor {
 
       this._setClasses(element);
       this._elementInfo.delete(element);
+      this._decrementMonitoredElementCount();
     }
   }
 
@@ -142,49 +158,69 @@ export class FocusMonitor {
   }
 
   /** Register necessary event listeners on the document and window. */
-  private _registerDocumentEvents() {
+  private _registerGlobalListeners() {
     // Do nothing if we're not on the browser platform.
     if (!this._platform.isBrowser) {
       return;
     }
 
-    // Note: we listen to events in the capture phase so we can detect them even if the user stops
-    // propagation.
-
     // On keydown record the origin and clear any touch event that may be in progress.
-    document.addEventListener('keydown', () => {
+    let documentKeydownListener = () => {
       this._lastTouchTarget = null;
       this._setOriginForCurrentEventQueue('keyboard');
-    }, true);
+    };
 
     // On mousedown record the origin only if there is not touch target, since a mousedown can
     // happen as a result of a touch event.
-    document.addEventListener('mousedown', () => {
+    let documentMousedownListener = () => {
       if (!this._lastTouchTarget) {
         this._setOriginForCurrentEventQueue('mouse');
       }
-    }, true);
+    };
 
     // When the touchstart event fires the focus event is not yet in the event queue. This means
     // we can't rely on the trick used above (setting timeout of 0ms). Instead we wait 650ms to
     // see if a focus happens.
-    document.addEventListener('touchstart', (event: TouchEvent) => {
+    let documentTouchstartListener = (event: TouchEvent) => {
       if (this._touchTimeout != null) {
         clearTimeout(this._touchTimeout);
       }
       this._lastTouchTarget = event.target;
       this._touchTimeout = setTimeout(() => this._lastTouchTarget = null, TOUCH_BUFFER_MS);
-
-      // Note that we need to cast the event options to `any`, because at the time of writing
-      // (TypeScript 2.5), the built-in types don't support the `addEventListener` options param.
-    }, supportsPassiveEventListeners() ? ({passive: true, capture: true} as any) : true);
+    };
 
     // Make a note of when the window regains focus, so we can restore the origin info for the
     // focused element.
-    window.addEventListener('focus', () => {
+    let windowFocusListener = () => {
       this._windowFocused = true;
       setTimeout(() => this._windowFocused = false, 0);
+    };
+
+    // Note: we listen to events in the capture phase so we can detect them even if the user stops
+    // propagation.
+    this._ngZone.runOutsideAngular(() => {
+      document.addEventListener('keydown', documentKeydownListener, true);
+      document.addEventListener('mousedown', documentMousedownListener, true);
+      document.addEventListener('touchstart', documentTouchstartListener,
+          supportsPassiveEventListeners() ? ({passive: true, capture: true} as any) : true);
+      window.addEventListener('focus', windowFocusListener);
     });
+
+    this._unregisterGlobalListeners = () => {
+      document.removeEventListener('keydown', documentKeydownListener, true);
+      document.removeEventListener('mousedown', documentMousedownListener, true);
+      document.removeEventListener('touchstart', documentTouchstartListener,
+          supportsPassiveEventListeners() ? ({passive: true, capture: true} as any) : true);
+      window.removeEventListener('focus', windowFocusListener);
+    };
+  }
+
+  private _toggleClass(element: Element, className: string, shouldSet: boolean) {
+    if (shouldSet) {
+      element.classList.add(className);
+    } else {
+      element.classList.remove(className);
+    }
   }
 
   /**
@@ -196,16 +232,11 @@ export class FocusMonitor {
     const elementInfo = this._elementInfo.get(element);
 
     if (elementInfo) {
-      const toggleClass = (className: string, shouldSet: boolean) => {
-        shouldSet ? elementInfo.renderer.addClass(element, className) :
-                    elementInfo.renderer.removeClass(element, className);
-      };
-
-      toggleClass('cdk-focused', !!origin);
-      toggleClass('cdk-touch-focused', origin === 'touch');
-      toggleClass('cdk-keyboard-focused', origin === 'keyboard');
-      toggleClass('cdk-mouse-focused', origin === 'mouse');
-      toggleClass('cdk-program-focused', origin === 'program');
+      this._toggleClass(element, 'cdk-focused', !!origin);
+      this._toggleClass(element, 'cdk-touch-focused', origin === 'touch');
+      this._toggleClass(element, 'cdk-keyboard-focused', origin === 'keyboard');
+      this._toggleClass(element, 'cdk-mouse-focused', origin === 'mouse');
+      this._toggleClass(element, 'cdk-program-focused', origin === 'program');
     }
   }
 
@@ -235,7 +266,7 @@ export class FocusMonitor {
     // result, this code will still consider it to have been caused by the touch event and will
     // apply the cdk-touch-focused class rather than the cdk-program-focused class. This is a
     // relatively small edge-case that can be worked around by using
-    // focusVia(parentEl, renderer,  'program') to focus the parent element.
+    // focusVia(parentEl, 'program') to focus the parent element.
     //
     // If we decide that we absolutely must handle this case correctly, we can do so by listening
     // for the first focus event after the touchstart, and then the first blur event after that
@@ -304,6 +335,22 @@ export class FocusMonitor {
     this._setClasses(element);
     elementInfo.subject.next(null);
   }
+
+  private _incrementMonitoredElementCount() {
+    // Register global listeners when first element is monitored.
+    if (++this._monitoredElementCount == 1) {
+      this._registerGlobalListeners();
+    }
+  }
+
+  private _decrementMonitoredElementCount() {
+    // Unregister global listeners when last element is unmonitored.
+    if (!--this._monitoredElementCount) {
+      this._unregisterGlobalListeners();
+      this._unregisterGlobalListeners = () => {};
+    }
+  }
+
 }
 
 
@@ -323,10 +370,9 @@ export class CdkMonitorFocus implements OnDestroy {
   private _monitorSubscription: Subscription;
   @Output() cdkFocusChange = new EventEmitter<FocusOrigin>();
 
-  constructor(private _elementRef: ElementRef, private _focusMonitor: FocusMonitor,
-              renderer: Renderer2) {
+  constructor(private _elementRef: ElementRef, private _focusMonitor: FocusMonitor) {
     this._monitorSubscription = this._focusMonitor.monitor(
-        this._elementRef.nativeElement, renderer,
+        this._elementRef.nativeElement,
         this._elementRef.nativeElement.hasAttribute('cdkMonitorSubtreeFocus'))
         .subscribe(origin => this.cdkFocusChange.emit(origin));
   }
diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
index 5ffd12ddfa31..7a69e66b5fd3 100644
--- a/src/lib/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -6,30 +6,29 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ContentChildren,
   Directive,
   ElementRef,
-  Renderer2,
   EventEmitter,
+  forwardRef,
   Input,
-  OnInit,
   OnDestroy,
+  OnInit,
   Optional,
   Output,
   QueryList,
   ViewChild,
   ViewEncapsulation,
-  forwardRef,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
 } from '@angular/core';
-import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
-import {FocusMonitor} from '@angular/cdk/a11y';
-import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 
 /** Acceptable types for a button toggle. */
 export type ToggleType = 'checkbox' | 'radio';
@@ -386,7 +385,6 @@ export class MatButtonToggle implements OnInit, OnDestroy {
               @Optional() toggleGroupMultiple: MatButtonToggleGroupMultiple,
               private _changeDetectorRef: ChangeDetectorRef,
               private _buttonToggleDispatcher: UniqueSelectionDispatcher,
-              private _renderer: Renderer2,
               private _elementRef: ElementRef,
               private _focusMonitor: FocusMonitor) {
 
@@ -421,7 +419,7 @@ export class MatButtonToggle implements OnInit, OnDestroy {
     if (this.buttonToggleGroup && this._value == this.buttonToggleGroup.value) {
       this._checked = true;
     }
-    this._focusMonitor.monitor(this._elementRef.nativeElement, this._renderer, true);
+    this._focusMonitor.monitor(this._elementRef.nativeElement, true);
   }
 
   /** Focuses the button. */
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 9003eb85e9b3..7afa98ef5fe6 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor} from '@angular/cdk/a11y';
+import {Platform} from '@angular/cdk/platform';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -19,7 +21,6 @@ import {
   Self,
   ViewEncapsulation,
 } from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
 import {
   CanColor,
   CanDisable,
@@ -28,7 +29,6 @@ import {
   mixinDisabled,
   mixinDisableRipple
 } from '@angular/material/core';
-import {FocusMonitor} from '@angular/cdk/a11y';
 
 
 // TODO(kara): Convert attribute selectors to classes when attr maps become available
@@ -141,7 +141,7 @@ export class MatButton extends _MatButtonMixinBase
               private _platform: Platform,
               private _focusMonitor: FocusMonitor) {
     super(renderer, elementRef);
-    this._focusMonitor.monitor(this._elementRef.nativeElement, this._renderer, true);
+    this._focusMonitor.monitor(this._elementRef.nativeElement, true);
   }
 
   ngOnDestroy() {
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 8959caeaf8a4..2d4b7db7c66b 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {
   AfterViewInit,
@@ -36,7 +37,6 @@ import {
   mixinTabIndex,
   RippleRef,
 } from '@angular/material/core';
-import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 
 // Increasing integer for generating unique ids for checkbox components.
@@ -209,7 +209,7 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
 
   ngAfterViewInit() {
     this._focusMonitor
-      .monitor(this._inputElement.nativeElement, this._renderer, false)
+      .monitor(this._inputElement.nativeElement, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 05baf2b90e93..5cbc7d07b5df 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -19,7 +19,6 @@ import {
   Host,
   Input,
   OnDestroy,
-  Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
 import {merge} from 'rxjs/observable/merge';
@@ -85,7 +84,6 @@ export class MatExpansionPanelHeader implements OnDestroy {
   private _parentChangeSubscription = Subscription.EMPTY;
 
   constructor(
-    renderer: Renderer2,
     @Host() public panel: MatExpansionPanel,
     private _element: ElementRef,
     private _focusMonitor: FocusMonitor,
@@ -100,7 +98,7 @@ export class MatExpansionPanelHeader implements OnDestroy {
     )
     .subscribe(() => this._changeDetectorRef.markForCheck());
 
-    _focusMonitor.monitor(_element.nativeElement, renderer, false);
+    _focusMonitor.monitor(_element.nativeElement, false);
   }
 
   /** Height of the header while the panel is expanded. */
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index f72da0d11940..2d675060b090 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -6,6 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {
   AfterContentInit,
   AfterViewInit,
@@ -38,9 +41,6 @@ import {
   mixinDisableRipple,
   RippleRef,
 } from '@angular/material/core';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
-import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for radio components.
 let nextUniqueId = 0;
@@ -538,8 +538,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
   }
 
   ngAfterViewInit() {
-    this._focusMonitor
-      .monitor(this._inputElement.nativeElement, this._renderer, false)
+    this._focusMonitor.monitor(this._inputElement.nativeElement, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
diff --git a/src/lib/sidenav/sidenav.md b/src/lib/sidenav/sidenav.md
index 7260c637fd71..cdbcaff0baa8 100644
--- a/src/lib/sidenav/sidenav.md
+++ b/src/lib/sidenav/sidenav.md
@@ -81,4 +81,4 @@ is clicked or <kbd>ESCAPE</kbd> is pressed. To add custom logic on backdrop clic
 <mat-sidenav-container (backdropClick)="customBackdropClickHandler()">
   <mat-sidenav disableClose (keydown)="customKeydownHandler($event)"></mat-sidenav>
 </mat-sidenav-container>
-```
\ No newline at end of file
+```
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index ef3d48ec991a..fe4138a59e2f 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -6,6 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {Platform} from '@angular/cdk/platform';
 import {
   AfterContentInit,
   Attribute,
@@ -22,8 +25,7 @@ import {
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {
   applyCssTransform,
   CanColor,
@@ -38,8 +40,6 @@ import {
   mixinTabIndex,
   RippleRef,
 } from '@angular/material/core';
-import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 
 // Increasing integer for generating unique ids for slide-toggle components.
 let nextUniqueId = 0;
@@ -153,8 +153,7 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
   ngAfterContentInit() {
     this._slideRenderer = new SlideToggleRenderer(this._elementRef, this._platform);
 
-    this._focusMonitor
-      .monitor(this._inputElement.nativeElement, this._renderer, false)
+    this._focusMonitor.monitor(this._inputElement.nativeElement, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 0e1033329cbd..15a675235fcd 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 import {
@@ -42,7 +43,6 @@ import {
   mixinColor,
   mixinDisabled,
 } from '@angular/material/core';
-import {FocusOrigin, FocusMonitor} from '@angular/cdk/a11y';
 import {Subscription} from 'rxjs/Subscription';
 
 /**
@@ -424,7 +424,7 @@ export class MatSlider extends _MatSliderMixinBase
 
   ngOnInit() {
     this._focusMonitor
-        .monitor(this._elementRef.nativeElement, this._renderer, true)
+        .monitor(this._elementRef.nativeElement, true)
         .subscribe((origin: FocusOrigin) => {
           this._isActive = !!origin && origin !== 'keyboard';
           this._changeDetectorRef.detectChanges();
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 55203b2b690f..d629665835b5 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -9,18 +9,17 @@
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
+  ElementRef,
   Input,
-  ViewEncapsulation,
-  ChangeDetectorRef,
   OnDestroy,
-  ElementRef,
-  Renderer2,
-  ChangeDetectionStrategy,
+  ViewEncapsulation,
 } from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
 import {MatStepLabel} from './step-label';
 import {MatStepperIntl} from './stepper-intl';
-import {Subscription} from 'rxjs/Subscription';
 
 
 @Component({
@@ -78,12 +77,11 @@ export class MatStepHeader implements OnDestroy {
   private _optional: boolean;
 
   constructor(
-    public _intl: MatStepperIntl,
-    private _focusMonitor: FocusMonitor,
-    private _element: ElementRef,
-    renderer: Renderer2,
-    changeDetectorRef: ChangeDetectorRef) {
-    _focusMonitor.monitor(_element.nativeElement, renderer, true);
+      public _intl: MatStepperIntl,
+      private _focusMonitor: FocusMonitor,
+      private _element: ElementRef,
+      changeDetectorRef: ChangeDetectorRef) {
+    _focusMonitor.monitor(_element.nativeElement, true);
     this._intlSubscription = _intl.changes.subscribe(() => changeDetectorRef.markForCheck());
   }
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 8975731045c5..8e12056e2e13 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -11,15 +11,15 @@ import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {
+  ConnectionPositionPair,
+  HorizontalConnectionPos,
   OriginConnectionPosition,
   Overlay,
+  OverlayConfig,
   OverlayConnectionPosition,
   OverlayRef,
-  OverlayConfig,
   RepositionScrollStrategy,
   ScrollStrategy,
-  ConnectionPositionPair,
-  HorizontalConnectionPos,
   VerticalConnectionPos,
 } from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
@@ -187,7 +187,7 @@ export class MatTooltip implements OnDestroy {
         renderer.listen(_elementRef.nativeElement, 'mouseleave', () => this.hide());
     }
 
-    _focusMonitor.monitor(_elementRef.nativeElement, renderer, false).subscribe(origin => {
+    _focusMonitor.monitor(_elementRef.nativeElement, false).subscribe(origin => {
       // Note that the focus monitor runs outside the Angular zone.
       if (!origin) {
         _ngZone.run(() => this.hide(0));
diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
index 7aa65c0b762b..4a507a8eefe3 100644
--- a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
@@ -1,6 +1,6 @@
 import {FocusMonitor} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {Component, ElementRef, Input, OnDestroy, Renderer2} from '@angular/core';
+import {Component, ElementRef, Input, OnDestroy} from '@angular/core';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {MatFormFieldControl} from '@angular/material/form-field';
 import {Subject} from 'rxjs/Subject';
@@ -96,15 +96,14 @@ export class MyTelInput implements MatFormFieldControl<MyTel>, OnDestroy {
     this.stateChanges.next();
   }
 
-  constructor(fb: FormBuilder, private fm: FocusMonitor, private elRef: ElementRef,
-              renderer: Renderer2) {
+  constructor(fb: FormBuilder, private fm: FocusMonitor, private elRef: ElementRef) {
     this.parts =  fb.group({
       'area': '',
       'exchange': '',
       'subscriber': '',
     });
 
-    fm.monitor(elRef.nativeElement, renderer, true).subscribe((origin) => {
+    fm.monitor(elRef.nativeElement, true).subscribe((origin) => {
       this.focused = !!origin;
       this.stateChanges.next();
     });

From 3ca801a903d86f350e49a53625973f9a05127ddf Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Fri, 10 Nov 2017 13:04:47 -0600
Subject: [PATCH 460/575] fix: consistently coerce boolean and number
 properties (#7283)

---
 src/cdk/accordion/accordion-item.ts  |  7 +++++--
 src/cdk/coercion/number-property.ts  |  2 ++
 src/lib/datepicker/datepicker.ts     | 13 ++++++++++---
 src/lib/expansion/expansion-panel.ts | 11 ++++++++++-
 src/lib/menu/menu-directive.ts       | 10 +++++++++-
 src/lib/slide-toggle/slide-toggle.ts |  2 +-
 src/lib/tabs/tab-group.ts            |  6 ++++--
 src/lib/tabs/tab-header.ts           |  2 ++
 8 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/cdk/accordion/accordion-item.ts b/src/cdk/accordion/accordion-item.ts
index 1323bf00cca3..f058b3e5d4bb 100644
--- a/src/cdk/accordion/accordion-item.ts
+++ b/src/cdk/accordion/accordion-item.ts
@@ -17,6 +17,7 @@ import {
 } from '@angular/core';
 import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {CdkAccordion} from './accordion';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
 /** Used to generate unique ID for each accordion item. */
 let nextId = 0;
@@ -41,8 +42,10 @@ export class CdkAccordionItem implements OnDestroy {
 
   /** Whether the AccordionItem is expanded. */
   @Input()
-  get expanded(): boolean { return this._expanded; }
-  set expanded(expanded: boolean) {
+  get expanded(): any { return this._expanded; }
+  set expanded(expanded: any) {
+    expanded = coerceBooleanProperty(expanded);
+
     // Only emit events and update the internal value if the value changes.
     if (this._expanded !== expanded) {
       this._expanded = expanded;
diff --git a/src/cdk/coercion/number-property.ts b/src/cdk/coercion/number-property.ts
index d10568e2700f..38d783974a6b 100644
--- a/src/cdk/coercion/number-property.ts
+++ b/src/cdk/coercion/number-property.ts
@@ -7,6 +7,8 @@
  */
 
 /** Coerces a data-bound value (typically a string) to a number. */
+export function coerceNumberProperty(value: any): number;
+export function coerceNumberProperty<D>(value: any, fallback: D): number | D;
 export function coerceNumberProperty(value: any, fallbackValue = 0) {
   // parseFloat(value) handles most of the cases we're interested in (it treats null, empty string,
   // and other non-number values as NaN, where Number just uses 0) but it considers the string
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index acab5074036a..ae0bd02aab63 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -145,15 +145,22 @@ export class MatDatepicker<D> implements OnDestroy {
    * Whether the calendar UI is in touch mode. In touch mode the calendar opens in a dialog rather
    * than a popup and elements have more padding to allow for bigger touch targets.
    */
-  @Input() touchUi = false;
+  @Input()
+  get touchUi(): boolean {
+    return this._touchUi;
+  }
+  set touchUi(value: boolean) {
+    this._touchUi = coerceBooleanProperty(value);
+  }
+  private _touchUi = false;
 
   /** Whether the datepicker pop-up should be disabled. */
   @Input()
-  get disabled() {
+  get disabled(): boolean {
     return this._disabled === undefined && this._datepickerInput ?
         this._datepickerInput.disabled : !!this._disabled;
   }
-  set disabled(value: any) {
+  set disabled(value: boolean) {
     const newValue = coerceBooleanProperty(value);
 
     if (newValue !== this._disabled) {
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index 2c5eed73a982..f04cb2cdc44a 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -26,6 +26,7 @@ import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 import {MatAccordion} from './accordion';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
 export const _CdkAccordionItem = CdkAccordionItem;
@@ -91,8 +92,16 @@ export type MatExpansionPanelState = 'expanded' | 'collapsed';
 })
 export class MatExpansionPanel extends _MatExpansionPanelMixinBase
     implements CanDisable, OnChanges, OnDestroy {
+
   /** Whether the toggle indicator should be hidden. */
-  @Input() hideToggle: boolean = false;
+  @Input()
+  get hideToggle(): boolean {
+    return this._hideToggle;
+  }
+  set hideToggle(value: boolean) {
+    this._hideToggle = coerceBooleanProperty(value);
+  }
+  private _hideToggle = false;
 
   /** Stream that emits for changes in `@Input` properties. */
   _inputChanges = new Subject<SimpleChanges>();
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 3c8b777aa08f..c3ef87da5242 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -39,6 +39,7 @@ import {throwMatMenuInvalidPositionX, throwMatMenuInvalidPositionY} from './menu
 import {MatMenuItem} from './menu-item';
 import {MatMenuPanel} from './menu-panel';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
 
 /** Default `mat-menu` options that can be overridden. */
@@ -122,7 +123,14 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
   @ContentChildren(MatMenuItem) items: QueryList<MatMenuItem>;
 
   /** Whether the menu should overlap its trigger. */
-  @Input() overlapTrigger = this._defaultOptions.overlapTrigger;
+  @Input()
+  set overlapTrigger(value: boolean) {
+    this._overlapTrigger = coerceBooleanProperty(value);
+  }
+  get overlapTrigger(): boolean {
+    return this._overlapTrigger;
+  }
+  private _overlapTrigger: boolean = this._defaultOptions.overlapTrigger;
 
   /**
    * This method takes classes set on the host mat-menu element and applies them on the
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index fe4138a59e2f..7d0110bbde97 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -124,7 +124,7 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
   @Input()
   get checked(): boolean { return this._checked; }
   set checked(value) {
-    this._checked = !!value;
+    this._checked = coerceBooleanProperty(value);
     this._changeDetectorRef.markForCheck();
   }
   /** An event will be dispatched each time the slide-toggle changes its value. */
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index a41bd2225867..da581c60b5bb 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -23,7 +23,7 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
 import {Subscription} from 'rxjs/Subscription';
 import {MatTab} from './tab';
 import {MatTabHeader} from './tab-header';
@@ -109,7 +109,9 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
 
   /** The index of the active tab. */
   @Input()
-  set selectedIndex(value: number | null) { this._indexToSelect = value; }
+  set selectedIndex(value: number | null) {
+    this._indexToSelect = coerceNumberProperty(value, null);
+  }
   get selectedIndex(): number | null { return this._selectedIndex; }
   private _selectedIndex: number | null = null;
 
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index e7b3f26e391e..31b62051ba24 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -31,6 +31,7 @@ import {CanDisableRipple, mixinDisableRipple} from '@angular/material/core';
 import {merge} from 'rxjs/observable/merge';
 import {of as observableOf} from 'rxjs/observable/of';
 import {Subscription} from 'rxjs/Subscription';
+import {coerceNumberProperty} from '@angular/cdk/coercion';
 import {MatInkBar} from './ink-bar';
 import {MatTabLabelWrapper} from './tab-label-wrapper';
 import {ViewportRuler} from '@angular/cdk/scrolling';
@@ -120,6 +121,7 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
   @Input()
   get selectedIndex(): number { return this._selectedIndex; }
   set selectedIndex(value: number) {
+    value = coerceNumberProperty(value);
     this._selectedIndexChanged = this._selectedIndex != value;
     this._selectedIndex = value;
     this._focusIndex = value;

From 4b59ca1a64f9484fac02fad98573770690b3e045 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Fri, 10 Nov 2017 11:05:57 -0800
Subject: [PATCH 461/575] fix(datepicker): prevent `matInput` from clobbering
 date value (#7831)

---
 src/demo-app/datepicker/datepicker-demo.html | 12 ++++++++
 src/lib/datepicker/datepicker-input.ts       | 11 +++++--
 src/lib/datepicker/datepicker.spec.ts        |  8 +++++
 src/lib/input/input-value-accessor.ts        | 19 ++++++++++++
 src/lib/input/input.ts                       | 31 +++++++++++++-------
 src/lib/input/public-api.ts                  |  2 +-
 6 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 src/lib/input/input-value-accessor.ts

diff --git a/src/demo-app/datepicker/datepicker-demo.html b/src/demo-app/datepicker/datepicker-demo.html
index 03de75ca83de..b9c6c7dba22c 100644
--- a/src/demo-app/datepicker/datepicker-demo.html
+++ b/src/demo-app/datepicker/datepicker-demo.html
@@ -121,3 +121,15 @@ <h2>Input disabled, datepicker popup enabled</h2>
                    [startView]="yearView ? 'year' : 'month'"></mat-datepicker>
   </mat-form-field>
 </p>
+
+<h2>Datepicker with value property binding</h2>
+<p>
+  <mat-datepicker-toggle [for]="datePicker4"></mat-datepicker-toggle>
+  <mat-form-field>
+    <input matInput [matDatepicker]="datePicker4" [value]="date" [min]="minDate"
+           [max]="maxDate" [matDatepickerFilter]="filterOdd ? dateFilter : null"
+           placeholder="Value binding">
+    <mat-datepicker #datePicker4 [touchUi]="touch" [startAt]="startAt"
+                    [startView]="yearView ? 'year' : 'month'"></mat-datepicker>
+  </mat-form-field>
+</p>
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 45b847adc845..4b06adaf9581 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -19,7 +19,7 @@ import {
   OnDestroy,
   Optional,
   Output,
-  Renderer2,
+  Renderer2
 } from '@angular/core';
 import {
   AbstractControl,
@@ -29,10 +29,11 @@ import {
   ValidationErrors,
   Validator,
   ValidatorFn,
-  Validators,
+  Validators
 } from '@angular/forms';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
 import {MatFormField} from '@angular/material/form-field';
+import {MAT_INPUT_VALUE_ACCESSOR} from '@angular/material/input';
 import {Subscription} from 'rxjs/Subscription';
 import {MatDatepicker} from './datepicker';
 import {createMissingDateImplError} from './datepicker-errors';
@@ -70,7 +71,11 @@ export class MatDatepickerInputEvent<D> {
 /** Directive used to connect an input to a MatDatepicker. */
 @Directive({
   selector: 'input[matDatepicker]',
-  providers: [MAT_DATEPICKER_VALUE_ACCESSOR, MAT_DATEPICKER_VALIDATORS],
+  providers: [
+    MAT_DATEPICKER_VALUE_ACCESSOR,
+    MAT_DATEPICKER_VALIDATORS,
+    {provide: MAT_INPUT_VALUE_ACCESSOR, useExisting: MatDatepickerInput},
+  ],
   host: {
     '[attr.aria-haspopup]': 'true',
     '[attr.aria-owns]': '(_datepicker?.opened && _datepicker.id) || null',
diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 98fc04612156..81576b717270 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -30,6 +30,8 @@ import {MatDatepickerIntl, MatDatepickerModule} from './index';
 
 
 describe('MatDatepicker', () => {
+  const SUPPORTS_INTL = typeof Intl != 'undefined';
+
   afterEach(inject([OverlayContainer], (container: OverlayContainer) => {
     container.getContainerElement().parentNode!.removeChild(container.getContainerElement());
   }));
@@ -83,6 +85,12 @@ describe('MatDatepicker', () => {
         fixture.detectChanges();
       }));
 
+      it('should initialize with correct value shown in input', () => {
+        if (SUPPORTS_INTL) {
+          expect(fixture.nativeElement.querySelector('input').value).toBe('1/1/2020');
+        }
+      });
+
       it('open non-touch should open popup', () => {
         expect(document.querySelector('.cdk-overlay-pane.mat-datepicker-popup')).toBeNull();
 
diff --git a/src/lib/input/input-value-accessor.ts b/src/lib/input/input-value-accessor.ts
new file mode 100644
index 000000000000..158c8b7bba19
--- /dev/null
+++ b/src/lib/input/input-value-accessor.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {InjectionToken} from '@angular/core';
+
+
+/**
+ * This token is used to inject the object whose value should be set into `MatInput`. If none is
+ * provided, the native `HTMLInputElement` is used. Directives like `MatDatepickerInput` can provide
+ * themselves for this token, in order to make `MatInput` delegate the getting and setting of the
+ * value to them.
+ */
+export const MAT_INPUT_VALUE_ACCESSOR =
+    new InjectionToken<{value: any}>('MAT_INPUT_VALUE_ACCESSOR');
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 204f6b8a8557..a1171211ad93 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -6,24 +6,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {getSupportedInputTypes, Platform} from '@angular/cdk/platform';
 import {
   Directive,
   DoCheck,
   ElementRef,
+  Inject,
   Input,
   OnChanges,
   OnDestroy,
   Optional,
   Renderer2,
-  Self,
+  Self
 } from '@angular/core';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {FormGroupDirective, NgControl, NgForm, FormControl} from '@angular/forms';
-import {Platform, getSupportedInputTypes} from '@angular/cdk/platform';
-import {getMatInputUnsupportedTypeError} from './input-errors';
+import {FormControl, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material/core';
-import {Subject} from 'rxjs/Subject';
 import {MatFormFieldControl} from '@angular/material/form-field';
+import {Subject} from 'rxjs/Subject';
+import {getMatInputUnsupportedTypeError} from './input-errors';
+import {MAT_INPUT_VALUE_ACCESSOR} from './input-value-accessor';
 
 // Invalid input type. Using one of these will throw an MatInputUnsupportedTypeError.
 const MAT_INPUT_INVALID_TYPES = [
@@ -70,7 +72,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   protected _required = false;
   protected _id: string;
   protected _uid = `mat-input-${nextUniqueId++}`;
-  protected _previousNativeValue = this.value;
+  protected _previousNativeValue: any;
   private _readonly = false;
 
   /** Whether the input is focused. */
@@ -129,10 +131,10 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
 
   /** The input element's value. */
   @Input()
-  get value() { return this._elementRef.nativeElement.value; }
-  set value(value: string) {
+  get value(): any { return this._inputValueAccessor.value; }
+  set value(value: any) {
     if (value !== this.value) {
-      this._elementRef.nativeElement.value = value;
+      this._inputValueAccessor.value = value;
       this.stateChanges.next();
     }
   }
@@ -157,7 +159,14 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
               @Optional() @Self() public ngControl: NgControl,
               @Optional() protected _parentForm: NgForm,
               @Optional() protected _parentFormGroup: FormGroupDirective,
-              private _defaultErrorStateMatcher: ErrorStateMatcher) {
+              private _defaultErrorStateMatcher: ErrorStateMatcher,
+              @Optional() @Self() @Inject(MAT_INPUT_VALUE_ACCESSOR)
+                  private _inputValueAccessor: {value: any}) {
+    // If no input value accessor was explicitly specified, use the element as the input value
+    // accessor.
+    this._inputValueAccessor = this._inputValueAccessor || this._elementRef.nativeElement;
+
+    this._previousNativeValue = this.value;
 
     // Force setter to be called in case id was not specified.
     this.id = this.id;
diff --git a/src/lib/input/public-api.ts b/src/lib/input/public-api.ts
index bc0416c79413..5eaaf7d50575 100644
--- a/src/lib/input/public-api.ts
+++ b/src/lib/input/public-api.ts
@@ -11,5 +11,5 @@ export * from './input-module';
 export * from './autosize';
 export * from './input';
 export * from './input-errors';
-
+export * from './input-value-accessor';
 

From b6712f8d13067b7b6bb364c7e6df2c45d930347f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 10 Nov 2017 19:07:07 +0000
Subject: [PATCH 462/575] fix(progress-spinner): coerceNumber values (#7791)

Coerces any string values that are passed to `value`, `diameter` and `strokeWidth` to numbers.
---
 .../progress-spinner/progress-spinner.spec.ts | 26 +++++++++++
 src/lib/progress-spinner/progress-spinner.ts  | 46 ++++++++++---------
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index 5aff4b509922..5c9c758f69ab 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -17,6 +17,7 @@ describe('MatProgressSpinner', () => {
         ProgressSpinnerCustomStrokeWidth,
         ProgressSpinnerCustomDiameter,
         SpinnerWithColor,
+        ProgressSpinnerWithStringValues,
       ],
     }).compileComponents();
   }));
@@ -184,6 +185,24 @@ describe('MatProgressSpinner', () => {
     expect(fixture.nativeElement.querySelector('svg').getAttribute('focusable')).toBe('false');
   });
 
+  it('should handle the number inputs being passed in as strings', () => {
+    const fixture = TestBed.createComponent(ProgressSpinnerWithStringValues);
+    const spinner = fixture.debugElement.query(By.directive(MatProgressSpinner));
+    const svgElement = spinner.nativeElement.querySelector('svg');
+
+    fixture.detectChanges();
+
+    expect(spinner.componentInstance.diameter).toBe(37);
+    expect(spinner.componentInstance.strokeWidth).toBe(11);
+    expect(spinner.componentInstance.value).toBe(25);
+
+    expect(spinner.nativeElement.style.width).toBe('38px');
+    expect(spinner.nativeElement.style.height).toBe('38px');
+    expect(svgElement.style.width).toBe('38px');
+    expect(svgElement.style.height).toBe('38px');
+    expect(svgElement.getAttribute('viewBox')).toBe('0 0 38 38');
+  });
+
 });
 
 
@@ -211,3 +230,10 @@ class SpinnerWithColor { color: string = 'primary'; }
 
 @Component({template: `<mat-progress-spinner value="50" [color]="color"></mat-progress-spinner>`})
 class ProgressSpinnerWithColor { color: string = 'primary'; }
+
+@Component({
+  template: `
+    <mat-progress-spinner value="25" diameter="37" strokeWidth="11"></mat-progress-spinner>
+  `
+})
+class ProgressSpinnerWithStringValues { }
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index f2c55071e1b7..c4db3d0016ef 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -26,6 +26,18 @@ import {coerceNumberProperty} from '@angular/cdk/coercion';
 /** Possible mode for a progress spinner. */
 export type ProgressSpinnerMode = 'determinate' | 'indeterminate';
 
+/**
+ * Base reference size of the spinner.
+ * @docs-private
+ */
+const BASE_SIZE = 100;
+
+/**
+ * Base reference stroke width of the spinner.
+ * @docs-private
+ */
+const BASE_STROKE_WIDTH = 10;
+
 // Boilerplate for applying mixins to MatProgressSpinner.
 /** @docs-private */
 export class MatProgressSpinnerBase {
@@ -84,17 +96,15 @@ const INDETERMINATE_ANIMATION_TEMPLATE = `
 export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements CanColor,
   OnChanges {
 
-  private _value: number = 0;
-  private readonly _baseSize = 100;
-  private readonly _baseStrokeWidth = 10;
-  private _fallbackAnimation = false;
+  private _value = 0;
   private _strokeWidth: number;
+  private _fallbackAnimation = false;
 
   /** The width and height of the host element. Will grow with stroke width. **/
-  _elementSize = this._baseSize;
+  _elementSize = BASE_SIZE;
 
   /** Tracks diameters of existing instances to de-dupe generated styles (default d = 100) */
-  private static diameters = new Set<number>([100]);
+  private static diameters = new Set<number>([BASE_SIZE]);
 
   /**
    * Used for storing all of the generated keyframe animations.
@@ -107,11 +117,14 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   get diameter(): number {
     return this._diameter;
   }
-
   set diameter(size: number) {
-    this._setDiameterAndInitStyles(size);
+    this._diameter = coerceNumberProperty(size);
+
+    if (!this._fallbackAnimation && !MatProgressSpinner.diameters.has(this._diameter)) {
+      this._attachStyleNode();
+    }
   }
-  _diameter = this._baseSize;
+  private _diameter = BASE_SIZE;
 
   /** Stroke width of the progress spinner. */
   @Input()
@@ -134,7 +147,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   }
   set value(newValue: number) {
     if (newValue != null && this.mode === 'determinate') {
-      this._value = Math.max(0, Math.min(100, newValue));
+      this._value = Math.max(0, Math.min(100, coerceNumberProperty(newValue)));
     }
   }
 
@@ -154,14 +167,13 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.strokeWidth || changes.diameter) {
-      this._elementSize =
-          this._diameter + Math.max(this.strokeWidth - this._baseStrokeWidth, 0);
+      this._elementSize = this._diameter + Math.max(this.strokeWidth - BASE_STROKE_WIDTH, 0);
     }
   }
 
   /** The radius of the spinner, adjusted for stroke width. */
   get _circleRadius() {
-    return (this.diameter - this._baseStrokeWidth) / 2;
+    return (this.diameter - BASE_STROKE_WIDTH) / 2;
   }
 
   /** The view box of the spinner's svg element. */
@@ -194,14 +206,6 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     return this.strokeWidth / this._elementSize * 100;
   }
 
-  /** Sets the diameter and adds diameter-specific styles if necessary. */
-  private _setDiameterAndInitStyles(size: number): void {
-    this._diameter = size;
-    if (!MatProgressSpinner.diameters.has(this.diameter) && !this._fallbackAnimation) {
-      this._attachStyleNode();
-    }
-  }
-
   /** Dynamically generates a style tag containing the correct animation for this diameter. */
   private _attachStyleNode(): void {
     let styleTag = MatProgressSpinner.styleTag;

From ba36d3ab5096b91076ab96868672e433f14e5c38 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 10 Nov 2017 19:07:47 +0000
Subject: [PATCH 463/575] fix(select): error when attempting to open before
 init (#8242)

---
 src/lib/select/select.spec.ts |  5 +++++
 src/lib/select/select.ts      | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index a58f331646b7..9f2732d6a480 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -2511,6 +2511,11 @@ describe('MatSelect', () => {
       expect(label.textContent).toContain('azziP',
           'Expected the displayed text to be "Pizza" in reverse.');
     }));
+
+    it('should not throw when attempting to open too early', () => {
+      const fixture = TestBed.createComponent(BasicSelect);
+      expect(() => fixture.componentInstance.select.open()).not.toThrow();
+    });
   });
 
   describe('change event', () => {
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 0e4e3017b92a..5688af37e37f 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -515,7 +515,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** Opens the overlay panel. */
   open(): void {
-    if (this.disabled || !this.options.length) {
+    if (this.disabled || !this.options || !this.options.length) {
       return;
     }
 
@@ -605,7 +605,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   /** The value displayed in the trigger. */
   get triggerValue(): string {
-    if (!this._selectionModel || this._selectionModel.isEmpty()) {
+    if (this.empty) {
       return '';
     }
 
@@ -912,10 +912,12 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * the first item instead.
    */
   private _highlightCorrectOption(): void {
-    if (this._selectionModel.isEmpty()) {
-      this._keyManager.setFirstItemActive();
-    } else {
-      this._keyManager.setActiveItem(this._getOptionIndex(this._selectionModel.selected[0])!);
+    if (this._keyManager) {
+      if (this.empty) {
+        this._keyManager.setFirstItemActive();
+      } else {
+        this._keyManager.setActiveItem(this._getOptionIndex(this._selectionModel.selected[0])!);
+      }
     }
   }
 

From 76806e3fef73541e56c4ec0c4d9e20fc672dda4a Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 10 Nov 2017 11:08:16 -0800
Subject: [PATCH 464/575] fix(icon): remove IDs from source icon set from
 rendered output (#8266)

---
 src/lib/icon/fake-svgs.ts     | 21 +++++++++++----------
 src/lib/icon/icon-registry.ts | 21 ++++++++++++---------
 src/lib/icon/icon.spec.ts     | 16 ++++++++++------
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/lib/icon/fake-svgs.ts b/src/lib/icon/fake-svgs.ts
index 6d38254123ca..1148f2387584 100644
--- a/src/lib/icon/fake-svgs.ts
+++ b/src/lib/icon/fake-svgs.ts
@@ -8,39 +8,40 @@
 
 /**
  * Fake URLs and associated SVG documents used by tests.
+ * The ID attribute is used to load the icons, the name attribute is only used for testing.
  * @docs-private
  */
 export const FAKE_SVGS = {
-  cat: '<svg><path id="meow"></path></svg>',
-  dog: '<svg><path id="woof"></path></svg>',
+  cat: '<svg><path id="meow" name="meow"></path></svg>',
+  dog: '<svg><path id="woof" name="woof"></path></svg>',
   farmSet1: `
     <svg>
       <defs>
-        <g id="pig"><path id="oink"></path></g>
-        <g id="cow"><path id="moo"></path></g>
+        <g id="pig" name="pig"><path name="oink"></path></g>
+        <g id="cow" name="cow"><path name="moo"></path></g>
       </defs>
     </svg>
   `,
   farmSet2: `
     <svg>
       <defs>
-        <g id="cow"><path id="moo moo"></path></g>
-        <g id="sheep"><path id="baa"></path></g>
+        <g id="cow" name="cow"><path name="moo moo"></path></g>
+        <g id="sheep" name="sheep"><path name="baa"></path></g>
       </defs>
     </svg>
   `,
   farmSet3: `
     <svg>
-      <symbol id="duck">
-        <path id="quack"></path>
+      <symbol id="duck" name="duck">
+        <path id="quack" name="quack"></path>
       </symbol>
     </svg>
   `,
   arrows: `
     <svg>
       <defs>
-        <svg id="left-arrow"><path id="left"></path></svg>
-        <svg id="right-arrow"><path id="right"></path></svg>
+        <svg id="left-arrow" name="left-arrow"><path name="left"></path></svg>
+        <svg id="right-arrow" name="right-arrow"><path name="right"></path></svg>
       </defs>
     </svg>  `
 };
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 6d054db8a7f7..828ab35e18d3 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -365,23 +365,28 @@ export class MatIconRegistry {
    * returns it. Returns null if no matching element is found.
    */
   private _extractSvgIconFromSet(iconSet: SVGElement, iconName: string): SVGElement | null {
-    const iconNode = iconSet.querySelector('#' + iconName);
+    const iconSource = iconSet.querySelector('#' + iconName);
 
-    if (!iconNode) {
+    if (!iconSource) {
       return null;
     }
 
+    // Clone the element and remove the ID to prevent multiple elements from being added
+    // to the page with the same ID.
+    const iconElement = iconSource.cloneNode(true) as Element;
+    iconElement.id = '';
+
     // If the icon node is itself an <svg> node, clone and return it directly. If not, set it as
     // the content of a new <svg> node.
-    if (iconNode.tagName.toLowerCase() === 'svg') {
-      return this._setSvgAttributes(iconNode.cloneNode(true) as SVGElement);
+    if (iconElement.nodeName.toLowerCase() === 'svg') {
+      return this._setSvgAttributes(iconElement as SVGElement);
     }
 
     // If the node is a <symbol>, it won't be rendered so we have to convert it into <svg>. Note
     // that the same could be achieved by referring to it via <use href="#id">, however the <use>
     // tag is problematic on Firefox, because it needs to include the current page path.
-    if (iconNode.nodeName.toLowerCase() === 'symbol') {
-      return this._setSvgAttributes(this._toSvgElement(iconNode));
+    if (iconElement.nodeName.toLowerCase() === 'symbol') {
+      return this._setSvgAttributes(this._toSvgElement(iconElement));
     }
 
     // createElement('SVG') doesn't work as expected; the DOM ends up with
@@ -391,7 +396,7 @@ export class MatIconRegistry {
     // http://stackoverflow.com/questions/23003278/svg-innerhtml-in-firefox-can-not-display
     const svg = this._svgElementFromString('<svg></svg>');
     // Clone the node so we don't remove it from the parent icon set element.
-    svg.appendChild(iconNode.cloneNode(true));
+    svg.appendChild(iconElement);
 
     return this._setSvgAttributes(svg);
   }
@@ -400,8 +405,6 @@ export class MatIconRegistry {
    * Creates a DOM element from the given SVG string.
    */
   private _svgElementFromString(str: string): SVGElement {
-    // TODO: Is there a better way than innerHTML? Renderer doesn't appear to have a method for
-    // creating an element from an HTML string.
     const div = document.createElement('DIV');
     div.innerHTML = str;
     const svg = div.querySelector('svg') as SVGElement;
diff --git a/src/lib/icon/icon.spec.ts b/src/lib/icon/icon.spec.ts
index 4b34fd0c0ebb..a3fa25d6770b 100644
--- a/src/lib/icon/icon.spec.ts
+++ b/src/lib/icon/icon.spec.ts
@@ -17,6 +17,7 @@ function sortedClassNames(element: Element): string[] {
  * Verifies that an element contains a single <svg> child element, and returns that child.
  */
 function verifyAndGetSingleSvgChild(element: SVGElement): SVGElement {
+  expect(element.id).toBeFalsy();
   expect(element.childNodes.length).toBe(1);
   const svgChild = element.childNodes[0] as SVGElement;
   expect(svgChild.tagName.toLowerCase()).toBe('svg');
@@ -31,7 +32,9 @@ function verifyPathChildElement(element: Element, attributeValue: string): void
   expect(element.childNodes.length).toBe(1);
   const pathElement = element.childNodes[0] as SVGPathElement;
   expect(pathElement.tagName.toLowerCase()).toBe('path');
-  expect(pathElement.getAttribute('id')).toBe(attributeValue);
+
+  // The testing data SVGs have the name attribute set for verification.
+  expect(pathElement.getAttribute('name')).toBe(attributeValue);
 }
 
 
@@ -190,7 +193,7 @@ describe('MatIcon', () => {
       svgChild = svgElement.childNodes[0];
       // The first <svg> child should be the <g id="pig"> element.
       expect(svgChild.tagName.toLowerCase()).toBe('g');
-      expect(svgChild.getAttribute('id')).toBe('pig');
+      expect(svgChild.getAttribute('name')).toBe('pig');
       verifyPathChildElement(svgChild, 'oink');
 
       // Change the icon, and the SVG element should be replaced.
@@ -200,7 +203,7 @@ describe('MatIcon', () => {
       svgChild = svgElement.childNodes[0];
       // The first <svg> child should be the <g id="cow"> element.
       expect(svgChild.tagName.toLowerCase()).toBe('g');
-      expect(svgChild.getAttribute('id')).toBe('cow');
+      expect(svgChild.getAttribute('name')).toBe('cow');
       verifyPathChildElement(svgChild, 'moo');
     });
 
@@ -224,7 +227,8 @@ describe('MatIcon', () => {
       svgChild = svgElement.childNodes[0];
       // The <svg> child should be the <g id="pig"> element.
       expect(svgChild.tagName.toLowerCase()).toBe('g');
-      expect(svgChild.getAttribute('id')).toBe('pig');
+      expect(svgChild.getAttribute('name')).toBe('pig');
+      expect(svgChild.getAttribute('id')).toBe('');
       expect(svgChild.childNodes.length).toBe(1);
       verifyPathChildElement(svgChild, 'oink');
 
@@ -237,7 +241,7 @@ describe('MatIcon', () => {
       svgChild = svgElement.childNodes[0];
       // The first <svg> child should be the <g id="cow"> element.
       expect(svgChild.tagName.toLowerCase()).toBe('g');
-      expect(svgChild.getAttribute('id')).toBe('cow');
+      expect(svgChild.getAttribute('name')).toBe('cow');
       expect(svgChild.childNodes.length).toBe(1);
       verifyPathChildElement(svgChild, 'moo moo');
     });
@@ -259,7 +263,7 @@ describe('MatIcon', () => {
       expect(svgElement.querySelector('symbol')).toBeFalsy();
       expect(svgElement.childNodes.length).toBe(1);
       expect(firstChild.nodeName.toLowerCase()).toBe('path');
-      expect((firstChild as HTMLElement).getAttribute('id')).toBe('quack');
+      expect((firstChild as HTMLElement).getAttribute('name')).toBe('quack');
     });
 
     it('should not wrap <svg> elements in icon sets in another svg tag', () => {

From 9eda324b9d7822ee954868e78569d1c717609fc8 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Fri, 10 Nov 2017 11:10:10 -0800
Subject: [PATCH 465/575] chore(overlay): export OverlayKeyboardDispatcher to
 aide in extending the Overlay class. (#8311)

---
 src/cdk/overlay/public-api.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cdk/overlay/public-api.ts b/src/cdk/overlay/public-api.ts
index 59a51335a37a..cfed88a95159 100644
--- a/src/cdk/overlay/public-api.ts
+++ b/src/cdk/overlay/public-api.ts
@@ -17,6 +17,7 @@ export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
 export {OverlayRef} from './overlay-ref';
 export {ViewportRuler} from '@angular/cdk/scrolling';
 export {ComponentType} from '@angular/cdk/portal';
+export {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 
 // Export pre-defined position strategies and interface to build custom ones.
 export {PositionStrategy} from './position/position-strategy';

From d35436b7fc02f98c6f5f397ce4def02ade917d19 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 10 Nov 2017 19:12:10 +0000
Subject: [PATCH 466/575] chore(ripple): remove prefix specific filtering for
 changes (#7903)

---
 src/lib/core/ripple/ripple.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index a2d21e7eb799..4ff85f98ee50 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -100,7 +100,7 @@ export class MatRipple implements OnChanges, OnDestroy {
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    if ((changes['trigger'] || changes['_matRippleTrigger']) && this.trigger) {
+    if (changes['trigger'] && this.trigger) {
       this._rippleRenderer.setTriggerElement(this.trigger);
     }
 

From 0719c3866225874c2d900ece2554612675ce4d0b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 10 Nov 2017 19:13:05 +0000
Subject: [PATCH 467/575] fix(tooltip): allow toolip to reopen when closed by
 detaching overlay (#8232)

---
 src/lib/tooltip/tooltip.spec.ts | 20 ++++++++++++++++++++
 src/lib/tooltip/tooltip.ts      |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index bb3e6eb95482..951a5d50baed 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -113,6 +113,26 @@ describe('MatTooltip', () => {
       expect(tooltipDirective._tooltipInstance).toBeNull();
     }));
 
+    it('should be able to re-open a tooltip if it was closed by detaching the overlay',
+      fakeAsync(() => {
+        tooltipDirective.show();
+        tick(0);
+        expect(tooltipDirective._isTooltipVisible()).toBe(true);
+        fixture.detectChanges();
+        tick(500);
+
+        tooltipDirective._overlayRef!.detach();
+        tick(0);
+        fixture.detectChanges();
+        expect(tooltipDirective._isTooltipVisible()).toBe(false);
+        flushMicrotasks();
+        expect(tooltipDirective._tooltipInstance).toBeNull();
+
+        tooltipDirective.show();
+        tick(0);
+        expect(tooltipDirective._isTooltipVisible()).toBe(true);
+      }));
+
     it('should show with delay', fakeAsync(() => {
       expect(tooltipDirective._tooltipInstance).toBeUndefined();
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 8e12056e2e13..4e37dbacc4f3 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -255,13 +255,13 @@ export class MatTooltip implements OnDestroy {
 
   /** Create the tooltip to display */
   private _createTooltip(): void {
-    let overlayRef = this._createOverlay();
-    let portal = new ComponentPortal(TooltipComponent, this._viewContainerRef);
+    const overlayRef = this._createOverlay();
+    const portal = new ComponentPortal(TooltipComponent, this._viewContainerRef);
 
     this._tooltipInstance = overlayRef.attach(portal).instance;
 
-    // Dispose the overlay when finished the shown tooltip.
-    this._tooltipInstance!.afterHidden().subscribe(() => {
+    // Dispose of the tooltip when the overlay is detached.
+    overlayRef.detachments().subscribe(() => {
       // Check first if the tooltip has already been removed through this components destroy.
       if (this._tooltipInstance) {
         this._disposeTooltip();

From bc8560e495342ca7a3bafd4224b65c4003b3502f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 10 Nov 2017 19:13:45 +0000
Subject: [PATCH 468/575] fix(snack-bar): complete onAction observable on close
 (#8183)

---
 src/lib/snack-bar/snack-bar-ref.ts  |  5 ++
 src/lib/snack-bar/snack-bar.spec.ts | 99 ++++++++++++++---------------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar-ref.ts b/src/lib/snack-bar/snack-bar-ref.ts
index cdd1a42140c4..338f10c70c6e 100644
--- a/src/lib/snack-bar/snack-bar-ref.ts
+++ b/src/lib/snack-bar/snack-bar-ref.ts
@@ -79,6 +79,11 @@ export class MatSnackBarRef<T> {
   /** Cleans up the DOM after closing. */
   private _finishDismiss(): void {
     this._overlayRef.dispose();
+
+    if (!this._onAction.closed) {
+      this._onAction.complete();
+    }
+
     this._afterClosed.next();
     this._afterClosed.complete();
   }
diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 8459ee0c46f2..81c27cd01614 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -128,22 +128,20 @@ describe('MatSnackBar', () => {
 
   it('should dismiss the snack bar and remove itself from the view', async(() => {
     let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
-    let dismissObservableCompleted = false;
+    let dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
 
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
     viewContainerFixture.detectChanges();
     expect(overlayContainerElement.childElementCount)
         .toBeGreaterThan(0, 'Expected overlay container element to have at least one child');
 
-    snackBarRef.afterDismissed().subscribe(undefined, undefined, () => {
-      dismissObservableCompleted = true;
-    });
+    snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
 
     snackBarRef.dismiss();
     viewContainerFixture.detectChanges();  // Run through animations for dismissal
 
     viewContainerFixture.whenStable().then(() => {
-      expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
+      expect(dismissCompleteSpy).toHaveBeenCalled();
       expect(overlayContainerElement.childElementCount)
           .toBe(0, 'Expected the overlay container element to have no child elements');
     });
@@ -204,7 +202,7 @@ describe('MatSnackBar', () => {
       state to visible on entry of new snack bar`, async(() => {
     let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
-    let dismissObservableCompleted = false;
+    let dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
 
     viewContainerFixture.detectChanges();
     expect(snackBarRef.containerInstance._animationState)
@@ -214,12 +212,10 @@ describe('MatSnackBar', () => {
     let snackBarRef2 = snackBar.open(simpleMessage, undefined, config2);
 
     viewContainerFixture.detectChanges();
-    snackBarRef.afterDismissed().subscribe(undefined, undefined, () => {
-      dismissObservableCompleted = true;
-    });
+    snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
 
     viewContainerFixture.whenStable().then(() => {
-      expect(dismissObservableCompleted).toBe(true);
+      expect(dismissCompleteSpy).toHaveBeenCalled();
       expect(snackBarRef.containerInstance._animationState)
           .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
       expect(snackBarRef2.containerInstance._animationState)
@@ -282,70 +278,75 @@ describe('MatSnackBar', () => {
 
   it('should dismiss the snackbar when the action is called, notifying of both action and dismiss',
      fakeAsync(() => {
-       let dismissObservableCompleted = false;
-       let actionObservableCompleted = false;
-       let snackBarRef = snackBar.open('Some content', 'Dismiss');
-       viewContainerFixture.detectChanges();
-
-       snackBarRef.afterDismissed().subscribe(undefined, undefined, () => {
-         dismissObservableCompleted = true;
-       });
-       snackBarRef.onAction().subscribe(undefined, undefined, () => {
-         actionObservableCompleted = true;
-      });
+      const dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
+      const actionCompleteSpy = jasmine.createSpy('action complete spy');
+      const snackBarRef = snackBar.open('Some content', 'Dismiss');
+      viewContainerFixture.detectChanges();
+
+      snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
+      snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
 
-      let actionButton =
+      const actionButton =
         overlayContainerElement.querySelector('.mat-simple-snackbar-action') as HTMLButtonElement;
       actionButton.click();
       viewContainerFixture.detectChanges();
       tick();
 
-      expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
-      expect(actionObservableCompleted).toBeTruthy('Expected the snack bar to notify of action');
+      expect(dismissCompleteSpy).toHaveBeenCalled();
+      expect(actionCompleteSpy).toHaveBeenCalled();
 
       tick(500);
     }));
 
   it('should allow manually closing with an action', fakeAsync(() => {
-    let dismissObservableCompleted = false;
-    let actionObservableCompleted = false;
-    let snackBarRef = snackBar.open('Some content');
+    const dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
+    const actionCompleteSpy = jasmine.createSpy('action complete spy');
+    const snackBarRef = snackBar.open('Some content');
     viewContainerFixture.detectChanges();
 
-    snackBarRef.afterDismissed().subscribe(undefined, undefined, () => {
-      dismissObservableCompleted = true;
-    });
-    snackBarRef.onAction().subscribe(undefined, undefined, () => {
-      actionObservableCompleted = true;
-    });
+    snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
+    snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
 
     snackBarRef.closeWithAction();
     viewContainerFixture.detectChanges();
     tick();
 
-    expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
-    expect(actionObservableCompleted).toBeTruthy('Expected the snack bar to notify of action');
+    expect(dismissCompleteSpy).toHaveBeenCalled();
+    expect(actionCompleteSpy).toHaveBeenCalled();
+
+    tick(500);
+  }));
+
+  it('should complete the onAction stream when not closing via an action', fakeAsync(() => {
+    const actionCompleteSpy = jasmine.createSpy('action complete spy');
+    const snackBarRef = snackBar.open('Some content');
+    viewContainerFixture.detectChanges();
+
+    snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
+    snackBarRef.dismiss();
+    viewContainerFixture.detectChanges();
+    tick();
+
+    expect(actionCompleteSpy).toHaveBeenCalled();
 
     tick(500);
   }));
 
   it('should dismiss automatically after a specified timeout', fakeAsync(() => {
-    let dismissObservableCompleted = false;
     let config = new MatSnackBarConfig();
     config.duration = 250;
     let snackBarRef = snackBar.open('content', 'test', config);
-    snackBarRef.afterDismissed().subscribe(() => {
-      dismissObservableCompleted = true;
-    });
+    let afterDismissSpy = jasmine.createSpy('after dismiss spy');
+    snackBarRef.afterDismissed().subscribe(afterDismissSpy);
 
     viewContainerFixture.detectChanges();
     tick();
-    expect(dismissObservableCompleted).toBeFalsy('Expected the snack bar not to be dismissed');
+    expect(afterDismissSpy).not.toHaveBeenCalled();
 
     tick(1000);
     viewContainerFixture.detectChanges();
     tick();
-    expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
+    expect(afterDismissSpy).toHaveBeenCalled();
   }));
 
   it('should clear the dismiss timeout when dismissed before timeout expiration', fakeAsync(() => {
@@ -411,24 +412,20 @@ describe('MatSnackBar', () => {
     });
 
     it('should allow manually closing with an action', fakeAsync(() => {
-      let dismissObservableCompleted = false;
-      let actionObservableCompleted = false;
+      const dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
+      const actionCompleteSpy = jasmine.createSpy('action complete spy');
       const snackBarRef = snackBar.openFromComponent(BurritosNotification);
       viewContainerFixture.detectChanges();
 
-      snackBarRef.afterDismissed().subscribe(undefined, undefined, () => {
-        dismissObservableCompleted = true;
-      });
-      snackBarRef.onAction().subscribe(undefined, undefined, () => {
-        actionObservableCompleted = true;
-      });
+      snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
+      snackBarRef.onAction().subscribe(undefined, undefined, actionCompleteSpy);
 
       snackBarRef.closeWithAction();
       viewContainerFixture.detectChanges();
       tick();
 
-      expect(dismissObservableCompleted).toBeTruthy('Expected the snack bar to be dismissed');
-      expect(actionObservableCompleted).toBeTruthy('Expected the snack bar to notify of action');
+      expect(dismissCompleteSpy).toHaveBeenCalled();
+      expect(actionCompleteSpy).toHaveBeenCalled();
 
       tick(500);
     }));

From 8178d6f70de27c1c371d461054ba67c0bbeb2b7e Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 10 Nov 2017 11:14:06 -0800
Subject: [PATCH 469/575] fix(input): add aria-required to inputs (#8034)

---
 src/lib/input/input.spec.ts | 17 +++++++++++++++++
 src/lib/input/input.ts      |  1 +
 2 files changed, 18 insertions(+)

diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 82382d81863c..926ad8a95b7b 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -238,6 +238,23 @@ describe('MatInput without forms', function () {
     expect(labelElement.getAttribute('aria-owns')).toBe(inputElement.id);
   });
 
+  it('should add aria-required reflecting the required state', () => {
+    const fixture = TestBed.createComponent(MatInputWithRequired);
+    fixture.detectChanges();
+
+    const inputElement: HTMLInputElement =
+        fixture.debugElement.query(By.css('input')).nativeElement;
+
+    expect(inputElement.getAttribute('aria-required'))
+        .toBe('false', 'Expected aria-required to reflect required state of false');
+
+    fixture.componentInstance.required = true;
+    fixture.detectChanges();
+
+    expect(inputElement.getAttribute('aria-required'))
+        .toBe('true', 'Expected aria-required to reflect required state of true');
+  });
+
   it('should not overwrite existing id', () => {
     let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index a1171211ad93..f73544968287 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -59,6 +59,7 @@ let nextUniqueId = 0;
     '[readonly]': 'readonly',
     '[attr.aria-describedby]': '_ariaDescribedby || null',
     '[attr.aria-invalid]': 'errorState',
+    '[attr.aria-required]': 'required.toString()',
     '(blur)': '_focusChanged(false)',
     '(focus)': '_focusChanged(true)',
     '(input)': '_onInput()',

From 57c8f05d6eeacdaa4485d41b8335108f73b9dcd0 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 10 Nov 2017 19:14:54 +0000
Subject: [PATCH 470/575] chore(button): remove prefix specific checks (#7843)

---
 src/lib/button/button.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index 7afa98ef5fe6..d3300a14fb79 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -131,10 +131,10 @@ export class MatButton extends _MatButtonMixinBase
     implements OnDestroy, CanDisable, CanColor, CanDisableRipple {
 
   /** Whether the button is round. */
-  _isRoundButton: boolean = this._hasAttributeWithPrefix('fab', 'mini-fab');
+  _isRoundButton: boolean = this._hasHostAttributes('mat-fab', 'mat-mini-fab');
 
   /** Whether the button is icon button. */
-  _isIconButton: boolean = this._hasAttributeWithPrefix('icon-button');
+  _isIconButton: boolean = this._hasHostAttributes('mat-icon-button');
 
   constructor(renderer: Renderer2,
               elementRef: ElementRef,
@@ -161,8 +161,8 @@ export class MatButton extends _MatButtonMixinBase
     return this.disableRipple || this.disabled;
   }
 
-  /** Gets whether the button has one of the given attributes with a 'mat-' prefix. */
-  _hasAttributeWithPrefix(...unprefixedAttributeNames: string[]) {
+  /** Gets whether the button has one of the given attributes. */
+  _hasHostAttributes(...attributes: string[]) {
     // If not on the browser, say that there are none of the attributes present.
     // Since these only affect how the ripple displays (and ripples only happen on the client),
     // detecting these attributes isn't necessary when not on the browser.
@@ -170,9 +170,7 @@ export class MatButton extends _MatButtonMixinBase
       return false;
     }
 
-    return unprefixedAttributeNames.some(suffix => {
-      return this._getHostElement().hasAttribute('mat-' + suffix);
-    });
+    return attributes.some(attribute => this._getHostElement().hasAttribute(attribute));
   }
 }
 

From d79903a8ea149e836b0ed9fbd78af798c259df07 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Fri, 10 Nov 2017 11:15:37 -0800
Subject: [PATCH 471/575] fix(chips): remove chip bottom margin in sibling
 chips (#8198)

---
 src/lib/chips/chips.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/chips/chips.scss b/src/lib/chips/chips.scss
index ba5a529a3767..4fda74c06a9f 100644
--- a/src/lib/chips/chips.scss
+++ b/src/lib/chips/chips.scss
@@ -7,7 +7,6 @@ $mat-chip-remove-margin-before: 6px;
 $mat-chip-remove-margin-after: -4px;
 
 $mat-chips-chip-margin: 8px;
-$mat-chips-chip-bottom-margin: 3px;
 
 $mat-chip-input-width: 150px;
 $mat-chip-input-margin: 3px;
@@ -29,10 +28,10 @@ $mat-chip-input-margin: 3px;
 
   // Apply a margin to adjacent sibling chips.
   & + & {
-    margin: 0 0 $mat-chips-chip-bottom-margin $mat-chips-chip-margin;
+    margin: 0 0 0 $mat-chips-chip-margin;
 
     [dir='rtl'] & {
-      margin: 0 $mat-chips-chip-margin $mat-chips-chip-bottom-margin 0;
+      margin: 0 $mat-chips-chip-margin 0 0;
     }
   }
 

From 8dfe470c3013c8d76cd7e65b95814401a9ed29a5 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 10 Nov 2017 11:17:05 -0800
Subject: [PATCH 472/575] fix(cdk-observers):  prevent attribute renaming in
 closure compilers advanced optimizations  (#7894)

---
 src/cdk/observers/observe-content.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index 9d71aba87d17..3ba74c12269a 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -75,9 +75,9 @@ export class CdkObserveContent implements AfterContentInit, OnDestroy {
 
     if (this._observer) {
       this._observer.observe(this._elementRef.nativeElement, {
-        characterData: true,
-        childList: true,
-        subtree: true
+        'characterData': true,
+        'childList': true,
+        'subtree': true
       });
     }
   }

From 33edff5f14394c740e7c5633bb2e7ba6505cff45 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 14 Nov 2017 03:55:53 +0100
Subject: [PATCH 473/575] build: update jasmine for improved type safety
 (#8350)

* Bumps the version of Jasmine to allow for better type safety in the assertions.
* Fixes a few new compilation errors.
---
 e2e/components/button-e2e.spec.ts           |     4 +-
 e2e/components/expansion-e2e.spec.ts        |     6 +-
 e2e/components/fullscreen-e2e.spec.ts       |    22 +-
 e2e/components/input-e2e.spec.ts            |    16 +-
 e2e/components/menu-e2e.spec.ts             |    18 +-
 e2e/components/progress-spinner-e2e.spec.ts |    13 +-
 e2e/components/stepper-e2e.spec.ts          |    10 +-
 e2e/components/tabs-e2e.spec.ts             |    32 +-
 e2e/index-e2e.spec.ts                       |     4 +-
 package-lock.json                           | 13965 +++++++++---------
 package.json                                |     4 +-
 src/cdk/table/table.spec.ts                 |     6 +-
 src/lib/input/input.spec.ts                 |     2 +-
 src/lib/input/input.ts                      |     6 +-
 src/lib/menu/menu.spec.ts                   |     2 +-
 src/lib/select/select.spec.ts               |     2 +-
 16 files changed, 7224 insertions(+), 6888 deletions(-)

diff --git a/e2e/components/button-e2e.spec.ts b/e2e/components/button-e2e.spec.ts
index db275e50595c..7ec6164b6d33 100644
--- a/e2e/components/button-e2e.spec.ts
+++ b/e2e/components/button-e2e.spec.ts
@@ -8,7 +8,7 @@ describe('button', () => {
 
     it('should prevent click handlers from executing when disabled', async () => {
       element(by.id('test-button')).click();
-      expect(element(by.id('click-counter')).getText()).toEqual('1');
+      expect(await element(by.id('click-counter')).getText()).toEqual('1');
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
@@ -16,7 +16,7 @@ describe('button', () => {
 
       element(by.id('disable-toggle')).click();
       element(by.id('test-button')).click();
-      expect(element(by.id('click-counter')).getText()).toEqual('1');
+      expect(await element(by.id('click-counter')).getText()).toEqual('1');
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
diff --git a/e2e/components/expansion-e2e.spec.ts b/e2e/components/expansion-e2e.spec.ts
index b50d6281d0bd..4fc3427e13b7 100644
--- a/e2e/components/expansion-e2e.spec.ts
+++ b/e2e/components/expansion-e2e.spec.ts
@@ -11,7 +11,7 @@ describe('expansion', () => {
   });
 
   it('should show two panels', async () => {
-    expect(element.all(by.css('.mat-expansion-panel')).count()).toBe(2);
+    expect(await element.all(by.css('.mat-expansion-panel')).count()).toBe(2);
     screenshot();
   });
 
@@ -19,11 +19,11 @@ describe('expansion', () => {
     const panelHeader = element.all(by.css('.mat-expansion-panel-header')).get(0);
     const panelContent = element.all(by.css('.mat-expansion-panel-content')).get(0);
 
-    expect(panelContent.isDisplayed()).toBe(false);
+    expect(await panelContent.isDisplayed()).toBe(false);
 
     panelHeader.click();
 
-    expect(panelContent.isDisplayed()).toBe(true);
+    expect(await panelContent.isDisplayed()).toBe(true);
   });
 
   it('should emit events for expanding and collapsing', async () => {
diff --git a/e2e/components/fullscreen-e2e.spec.ts b/e2e/components/fullscreen-e2e.spec.ts
index a9f4a8535c65..4404f484537b 100644
--- a/e2e/components/fullscreen-e2e.spec.ts
+++ b/e2e/components/fullscreen-e2e.spec.ts
@@ -4,36 +4,36 @@ describe('fullscreen', () => {
 
   beforeEach(() => browser.get('/fullscreen'));
 
-  it('should open a dialog inside a fullscreen element and move it to the document body', () => {
+  it('should open a dialog inside a fullscreen element and move it to the body', async () => {
     element(by.id('fullscreen-open')).click();
     element(by.id('dialog-open')).click();
 
-    expectOverlayInFullscreen();
+    await expectOverlayInFullscreen();
 
     element(by.id('dialog-fullscreen-exit')).click();
-    expectOverlayInBody();
+    await expectOverlayInBody();
   });
 
-  it('should open a dialog inside the document body and move it to a fullscreen element', () => {
+  it('should open a dialog inside the body and move it to a fullscreen element', async () => {
     element(by.id('dialog-open')).click();
-    expectOverlayInBody();
+    await expectOverlayInBody();
 
     element(by.id('dialog-fullscreen-open')).click();
-    expectOverlayInFullscreen();
+    await expectOverlayInFullscreen();
 
     element(by.id('dialog-fullscreen-exit')).click();
-    expectOverlayInBody();
+    await expectOverlayInBody();
   });
 
   /** Expects the overlay container to be inside of the body element. */
-  function expectOverlayInBody() {
-    expect(browser.isElementPresent(by.css('body > .cdk-overlay-container')))
+  async function expectOverlayInBody() {
+    expect(await browser.isElementPresent(by.css('body > .cdk-overlay-container')))
       .toBe(true, 'Expected the overlay container to be inside of the body.');
   }
 
   /** Expects the overlay container to be in fullscreen mode. */
-  function expectOverlayInFullscreen() {
-    expect(browser.isElementPresent(by.css('#fullscreen-pane > .cdk-overlay-container')))
+  async function expectOverlayInFullscreen() {
+    expect(await browser.isElementPresent(by.css('#fullscreen-pane > .cdk-overlay-container')))
       .toBe(true, 'Expected the overlay container to be in fullscreen mode.');
   }
 
diff --git a/e2e/components/input-e2e.spec.ts b/e2e/components/input-e2e.spec.ts
index 9fcd587ecf02..6b860d896929 100644
--- a/e2e/components/input-e2e.spec.ts
+++ b/e2e/components/input-e2e.spec.ts
@@ -12,20 +12,20 @@ describe('input', () => {
   describe('text input', () => {
     beforeEach(() => browser.get('/input'));
 
-    it('should update input value when user types', () => {
+    it('should update input value when user types', async () => {
       let input = element(by.id('text-input'));
       input.sendKeys('abc123');
-      expect(input.getAttribute('value')).toBe('abc123');
+      expect(await input.getAttribute('value')).toBe('abc123');
     });
   });
 
   describe('number input', () => {
     beforeEach(() => browser.get('/input'));
 
-    it('should update input value when user types', () => {
+    it('should update input value when user types', async () => {
       let input = element(by.id('number-input'));
       input.sendKeys('abc123');
-      expect(input.getAttribute('value')).toBe('123');
+      expect(await input.getAttribute('value')).toBe('123');
     });
 
     it('should increment when increment button clicked', async () => {
@@ -40,24 +40,24 @@ describe('input', () => {
           .click()
           .perform();
 
-      expect(input.getAttribute('value')).toBe('1');
+      expect(await input.getAttribute('value')).toBe('1');
 
       browser.actions()
           .mouseMove(input, {x: size.width - 5, y: size.height - 5})
           .click()
           .perform();
 
-      expect(input.getAttribute('value')).toBe('0');
+      expect(await input.getAttribute('value')).toBe('0');
     });
   });
 
   describe('textarea', () => {
     beforeEach(() => browser.get('/input'));
 
-    it('should update input value when user types', () => {
+    it('should update input value when user types', async () => {
       let input = element(by.id('text-area'));
       input.sendKeys('abc123');
-      expect(input.getAttribute('value')).toBe('abc123');
+      expect(await input.getAttribute('value')).toBe('abc123');
     });
   });
 
diff --git a/e2e/components/menu-e2e.spec.ts b/e2e/components/menu-e2e.spec.ts
index c5b1870719d6..d3368d75f61c 100644
--- a/e2e/components/menu-e2e.spec.ts
+++ b/e2e/components/menu-e2e.spec.ts
@@ -18,12 +18,12 @@ describe('menu', () => {
 
   beforeEach(() => page = new MenuPage());
 
-  it('should open menu when the trigger is clicked', () => {
+  it('should open menu when the trigger is clicked', async () => {
     expectToExist(menuSelector, false);
     page.trigger().click();
 
     expectToExist(menuSelector);
-    expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
+    expect(await page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
     screenshot();
   });
 
@@ -34,29 +34,29 @@ describe('menu', () => {
     screenshot();
   });
 
-  it('should run click handlers on regular menu items', () => {
+  it('should run click handlers on regular menu items', async () => {
     page.trigger().click();
     page.items(0).click();
-    expect(page.getResultText()).toEqual('one');
+    expect(await page.getResultText()).toEqual('one');
     screenshot('one');
 
     page.trigger().click();
     page.items(1).click();
-    expect(page.getResultText()).toEqual('two');
+    expect(await page.getResultText()).toEqual('two');
     screenshot('two');
   });
 
-  it('should run not run click handlers on disabled menu items', () => {
+  it('should run not run click handlers on disabled menu items', async () => {
     page.trigger().click();
     page.items(2).click();
-    expect(page.getResultText()).toEqual('');
+    expect(await page.getResultText()).toEqual('');
     screenshot();
   });
 
   it('should support multiple triggers opening the same menu', async () => {
     page.triggerTwo().click();
 
-    expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
+    expect(await page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
     expectAlignedWith(page.menu(), '#trigger-two');
 
     page.backdrop().click();
@@ -65,7 +65,7 @@ describe('menu', () => {
 
     page.trigger().click();
 
-    expect(page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
+    expect(await page.menu().getText()).toEqual('One\nTwo\nThree\nFour');
     expectAlignedWith(page.menu(), '#trigger');
 
     page.backdrop().click();
diff --git a/e2e/components/progress-spinner-e2e.spec.ts b/e2e/components/progress-spinner-e2e.spec.ts
index c415636ef8db..07a23f765288 100644
--- a/e2e/components/progress-spinner-e2e.spec.ts
+++ b/e2e/components/progress-spinner-e2e.spec.ts
@@ -3,15 +3,16 @@ import {browser, by, element} from 'protractor';
 describe('progress-spinner', () => {
   beforeEach(() => browser.get('/progress-spinner'));
 
-  it('should render a determinate progress spinner', () => {
-    expect(element(by.css('mat-progress-spinner')).isPresent()).toBe(true);
+  it('should render a determinate progress spinner', async () => {
+    expect(await element(by.css('mat-progress-spinner')).isPresent()).toBe(true);
   });
 
-  it('should render an indeterminate progress spinner', () => {
-    expect(element(by.css('mat-progress-spinner[mode="indeterminate"]')).isPresent()).toBe(true);
+  it('should render an indeterminate progress spinner', async () => {
+    expect(await element(by.css('mat-progress-spinner[mode="indeterminate"]')).isPresent())
+        .toBe(true);
   });
 
-  it('should render a spinner', () => {
-    expect(element(by.css('mat-spinner')).isPresent()).toBe(true);
+  it('should render a spinner', async () => {
+    expect(await element(by.css('mat-spinner')).isPresent()).toBe(true);
   });
 });
diff --git a/e2e/components/stepper-e2e.spec.ts b/e2e/components/stepper-e2e.spec.ts
index d4745dcbde0d..833ba1d6d40e 100644
--- a/e2e/components/stepper-e2e.spec.ts
+++ b/e2e/components/stepper-e2e.spec.ts
@@ -19,13 +19,13 @@ describe('stepper', () => {
       const previousButton = element.all(by.buttonText('Back'));
       const nextButton = element.all(by.buttonText('Next'));
 
-      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
+      expect(await element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('1\nFill out your name');
 
       screenshot('start');
       nextButton.get(0).click();
 
-      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
+      expect(await element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('2\nFill out your address');
 
       await browser.wait(ExpectedConditions.not(
@@ -34,7 +34,7 @@ describe('stepper', () => {
 
       previousButton.get(0).click();
 
-      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
+      expect(await element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('1\nFill out your name');
 
       await browser.wait(ExpectedConditions.not(
@@ -73,11 +73,11 @@ describe('stepper', () => {
       linearButton.click();
     });
 
-    it('should not move to next step when stepper button is clicked', () => {
+    it('should not move to next step when stepper button is clicked', async () => {
       let nextButton = element.all(by.buttonText('Next'));
       nextButton.get(0).click();
 
-      expect(element(by.css('mat-step-header[aria-selected="true"]')).getText())
+      expect(await element(by.css('mat-step-header[aria-selected="true"]')).getText())
           .toBe('1\nFill out your name');
     });
   });
diff --git a/e2e/components/tabs-e2e.spec.ts b/e2e/components/tabs-e2e.spec.ts
index 8fc2971b85d5..db7f2ed87bec 100644
--- a/e2e/components/tabs-e2e.spec.ts
+++ b/e2e/components/tabs-e2e.spec.ts
@@ -26,46 +26,46 @@ describe('tabs', () => {
 
     it('should change tabs when the label is clicked', async () => {
       tabLabels.get(1).click();
-      expect(getLabelActiveStates(tabLabels)).toEqual([false, true, false]);
-      expect(getBodyActiveStates(tabBodies)).toEqual([false, true, false]);
+      expect(await getLabelActiveStates(tabLabels)).toEqual([false, true, false]);
+      expect(await getBodyActiveStates(tabBodies)).toEqual([false, true, false]);
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
       screenshot('click1');
 
       tabLabels.get(0).click();
-      expect(getLabelActiveStates(tabLabels)).toEqual([true, false, false]);
-      expect(getBodyActiveStates(tabBodies)).toEqual([true, false, false]);
+      expect(await getLabelActiveStates(tabLabels)).toEqual([true, false, false]);
+      expect(await getBodyActiveStates(tabBodies)).toEqual([true, false, false]);
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
       screenshot('click0');
     });
 
-    it('should change focus with keyboard interaction', () => {
+    it('should change focus with keyboard interaction', async () => {
       let right = Key.RIGHT;
       let left = Key.LEFT;
 
       tabLabels.get(0).click();
-      expect(getFocusStates(tabLabels)).toEqual([true, false, false]);
+      expect(await getFocusStates(tabLabels)).toEqual([true, false, false]);
 
       pressKeys(right);
-      expect(getFocusStates(tabLabels)).toEqual([false, true, false]);
+      expect(await getFocusStates(tabLabels)).toEqual([false, true, false]);
 
       pressKeys(right);
-      expect(getFocusStates(tabLabels)).toEqual([false, false, true]);
+      expect(await getFocusStates(tabLabels)).toEqual([false, false, true]);
 
       pressKeys(right);
-      expect(getFocusStates(tabLabels)).toEqual([false, false, true]);
+      expect(await getFocusStates(tabLabels)).toEqual([false, false, true]);
 
       pressKeys(left);
-      expect(getFocusStates(tabLabels)).toEqual([false, true, false]);
+      expect(await getFocusStates(tabLabels)).toEqual([false, true, false]);
 
       pressKeys(left);
-      expect(getFocusStates(tabLabels)).toEqual([true, false, false]);
+      expect(await getFocusStates(tabLabels)).toEqual([true, false, false]);
 
       pressKeys(left);
-      expect(getFocusStates(tabLabels)).toEqual([true, false, false]);
+      expect(await getFocusStates(tabLabels)).toEqual([true, false, false]);
     });
   });
 });
@@ -74,8 +74,8 @@ describe('tabs', () => {
  * Returns an array of true/false that represents the focus states of the provided elements.
  */
 async function getFocusStates(elements: ElementArrayFinder) {
-  return elements.map(async (element) => {
-    let elementText = await element!.getText();
+  return elements.map(async el => {
+    let elementText = await el!.getText();
     let activeText = await browser.driver.switchTo().activeElement().getText();
 
     return activeText === elementText;
@@ -97,8 +97,8 @@ function getBodyActiveStates(elements: ElementArrayFinder) {
  * each element.
  */
 async function getClassStates(elements: ElementArrayFinder, className: string) {
-  return elements.map(async (element) => {
-    let classes = await element!.getAttribute('class');
+  return elements.map(async el => {
+    let classes = await el!.getAttribute('class');
     return classes.split(/ +/g).indexOf(className) >= 0;
   });
 }
diff --git a/e2e/index-e2e.spec.ts b/e2e/index-e2e.spec.ts
index f0fce6fd3827..9464a17605c3 100644
--- a/e2e/index-e2e.spec.ts
+++ b/e2e/index-e2e.spec.ts
@@ -3,8 +3,8 @@ import {browser} from 'protractor';
 describe('hello, protractor', () => {
   describe('index', () => {
     browser.get('/');
-    it('should have a title', () => {
-      expect(browser.getTitle()).toBe('Angular Material');
+    it('should have a title', async () => {
+      expect(await browser.getTitle()).toBe('Angular Material');
     });
   });
 });
diff --git a/package-lock.json b/package-lock.json
index c8c521b987f2..5f43db626986 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "material2-srcs",
-  "version": "2.0.0-beta.12",
+  "version": "5.0.0-rc0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -198,2016 +198,1474 @@
         "through2": "2.0.3"
       }
     },
-    "@google-cloud/common-grpc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.2.tgz",
-      "integrity": "sha1-jPb7vkGZdueOtuD+aoGXTEYfMaw=",
+    "@google-cloud/functions-emulator": {
+      "version": "1.0.0-alpha.25",
+      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
+      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "@google-cloud/common": "0.13.6",
-        "dot-prop": "2.4.0",
-        "duplexify": "3.5.1",
-        "extend": "3.0.1",
-        "grpc": "1.6.6",
-        "is": "3.2.1",
-        "modelo": "4.2.0",
-        "retry-request": "3.1.0",
-        "through2": "2.0.3"
+        "@google-cloud/storage": "1.2.1",
+        "adm-zip": "0.4.7",
+        "ajv": "5.2.2",
+        "body-parser": "1.17.2",
+        "cli-table2": "0.2.0",
+        "colors": "1.1.2",
+        "configstore": "3.1.1",
+        "express": "4.15.4",
+        "google-proto-files": "0.12.1",
+        "googleapis": "20.1.0",
+        "got": "7.1.0",
+        "grpc": "1.4.1",
+        "http-proxy": "1.16.2",
+        "lodash": "4.17.4",
+        "prompt": "1.0.0",
+        "rimraf": "2.6.1",
+        "semver": "5.4.1",
+        "serializerr": "1.0.3",
+        "tmp": "0.0.33",
+        "uuid": "3.1.0",
+        "winston": "2.3.1",
+        "yargs": "8.0.2"
       },
       "dependencies": {
-        "dot-prop": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
-          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
+        "@google-cloud/storage": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "is-obj": "1.0.1"
+            "@google-cloud/common": "0.13.6",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
           }
         },
-        "grpc": {
-          "version": "1.6.6",
-          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
-          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
+        "ajv": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "arguejs": "0.2.3",
-            "lodash": "4.17.4",
-            "nan": "2.7.0",
-            "node-pre-gyp": "0.6.38",
-            "protobufjs": "5.0.2"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "optional": 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,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "winston": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
+          "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
+          "dev": true,
+          "optional": 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": {
-            "abbrev": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-              "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"
-              }
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-              "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"
-              }
-            },
-            "asn1": {
-              "version": "0.2.3",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-              "dev": true
-            },
-            "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
-            },
-            "asynckit": {
-              "version": "0.4.0",
-              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-              "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
-            },
-            "balanced-match": {
+            "async": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-              "dev": true
-            },
-            "bcrypt-pbkdf": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-              "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+              "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+              "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
               "dev": true,
-              "optional": true,
-              "requires": {
-                "tweetnacl": "0.14.5"
-              }
+              "optional": 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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "caseless": {
-              "version": "0.12.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-              "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
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "extend": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-              "dev": true
-            },
-            "extsprintf": {
-              "version": "1.3.0",
-              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-              "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
-            },
-            "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.17"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-              "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.2"
-              }
-            },
-            "fstream-ignore": {
-              "version": "1.0.5",
-              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-              "dev": true,
-              "requires": {
-                "fstream": "1.0.11",
-                "inherits": "2.0.3",
-                "minimatch": "3.0.4"
-              }
-            },
-            "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.2.0",
-                "console-control-strings": "1.1.0",
-                "has-unicode": "2.0.1",
-                "object-assign": "4.1.1",
-                "signal-exit": "3.0.2",
-                "string-width": "1.0.2",
-                "strip-ansi": "3.0.1",
-                "wide-align": "1.1.2"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "graceful-fs": {
-              "version": "4.1.11",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-              "dev": true
-            },
-            "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": "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"
-              }
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            },
-            "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.1",
-                "sshpk": "1.13.1"
-              }
-            },
-            "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
-            },
-            "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-typedarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-              "dev": true
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-              "dev": true
-            },
-            "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
-            },
-            "jsbn": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+            "colors": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
               "dev": true,
               "optional": 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
-            },
-            "jsonify": {
-              "version": "0.0.0",
-              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-              "dev": true
-            },
-            "jsprim": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-              "dev": true,
-              "requires": {
-                "assert-plus": "1.0.0",
-                "extsprintf": "1.3.0",
-                "json-schema": "0.2.3",
-                "verror": "1.10.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
-                }
-              }
-            },
-            "mime-db": {
-              "version": "1.30.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-              "dev": true
-            },
-            "mime-types": {
-              "version": "2.1.17",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-              "dev": true,
-              "requires": {
-                "mime-db": "1.30.0"
-              }
-            },
-            "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=",
-              "dev": true
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-              "dev": true,
-              "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=",
-                  "dev": true
-                }
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            },
-            "node-pre-gyp": {
-              "version": "0.6.38",
-              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
-              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
-              "dev": true,
-              "requires": {
-                "hawk": "3.1.3",
-                "mkdirp": "0.5.1",
-                "nopt": "4.0.1",
-                "npmlog": "4.1.2",
-                "rc": "1.2.1",
-                "request": "2.81.0",
-                "rimraf": "2.6.2",
-                "semver": "5.4.1",
-                "tar": "2.2.1",
-                "tar-pack": "3.4.0"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-              "dev": true,
-              "requires": {
-                "abbrev": "1.1.1",
-                "osenv": "0.1.4"
-              }
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "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-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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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
-            },
-            "punycode": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-              "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
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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.17",
-                "oauth-sign": "0.8.2",
-                "performance-now": "0.2.0",
-                "qs": "6.4.0",
-                "safe-buffer": "5.1.1",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.3",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.1.0"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-              "dev": true,
-              "requires": {
-                "glob": "7.1.2"
-              }
-            },
-            "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
-            },
-            "semver": {
-              "version": "5.4.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-              "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
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-              "dev": true
-            },
-            "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"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "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-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"
-              }
-            },
-            "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-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
-            },
-            "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"
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-              "dev": true,
-              "requires": {
-                "debug": "2.6.9",
-                "fstream": "1.0.11",
-                "fstream-ignore": "1.0.5",
-                "once": "1.4.0",
-                "readable-stream": "2.3.3",
-                "rimraf": "2.6.2",
-                "tar": "2.2.1",
-                "uid-number": "0.0.6"
-              }
-            },
-            "tough-cookie": {
-              "version": "2.3.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-              "dev": true,
-              "requires": {
-                "punycode": "1.4.1"
-              }
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "uid-number": {
-              "version": "0.0.6",
-              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-              "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
-            },
-            "uuid": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-              "dev": true
-            },
-            "verror": {
-              "version": "1.10.0",
-              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-              "dev": true,
-              "requires": {
-                "assert-plus": "1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "1.3.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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "@google-cloud/firestore": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
-      "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
-      "dev": true,
-      "requires": {
-        "@google-cloud/common": "0.13.6",
-        "@google-cloud/common-grpc": "0.4.2",
-        "bun": "0.0.12",
-        "extend": "3.0.1",
-        "functional-red-black-tree": "1.0.1",
-        "google-gax": "0.14.2",
-        "grpc": "1.6.6",
-        "is": "3.2.1",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "grpc": {
-          "version": "1.6.6",
-          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
-          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
-          "dev": true,
-          "requires": {
-            "arguejs": "0.2.3",
-            "lodash": "4.17.4",
-            "nan": "2.7.0",
-            "node-pre-gyp": "0.6.38",
-            "protobufjs": "5.0.2"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-              "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"
-              }
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-              "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"
-              }
-            },
-            "asn1": {
-              "version": "0.2.3",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-              "dev": true
-            },
-            "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
-            },
-            "asynckit": {
-              "version": "0.4.0",
-              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-              "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
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-              "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "caseless": {
-              "version": "0.12.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-              "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
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "extend": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-              "dev": true
-            },
-            "extsprintf": {
-              "version": "1.3.0",
-              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-              "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
-            },
-            "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.17"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-              "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.2"
-              }
-            },
-            "fstream-ignore": {
-              "version": "1.0.5",
-              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-              "dev": true,
-              "requires": {
-                "fstream": "1.0.11",
-                "inherits": "2.0.3",
-                "minimatch": "3.0.4"
-              }
-            },
-            "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.2.0",
-                "console-control-strings": "1.1.0",
-                "has-unicode": "2.0.1",
-                "object-assign": "4.1.1",
-                "signal-exit": "3.0.2",
-                "string-width": "1.0.2",
-                "strip-ansi": "3.0.1",
-                "wide-align": "1.1.2"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "graceful-fs": {
-              "version": "4.1.11",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-              "dev": true
-            },
-            "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": "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"
-              }
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            },
-            "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.1",
-                "sshpk": "1.13.1"
-              }
-            },
-            "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
-            },
-            "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-typedarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-              "dev": true
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-              "dev": true
-            },
-            "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
-            },
-            "jsbn": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-              "dev": true,
-              "optional": 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
-            },
-            "jsonify": {
-              "version": "0.0.0",
-              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-              "dev": true
-            },
-            "jsprim": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-              "dev": true,
-              "requires": {
-                "assert-plus": "1.0.0",
-                "extsprintf": "1.3.0",
-                "json-schema": "0.2.3",
-                "verror": "1.10.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
-                }
-              }
-            },
-            "mime-db": {
-              "version": "1.30.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-              "dev": true
-            },
-            "mime-types": {
-              "version": "2.1.17",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-              "dev": true,
-              "requires": {
-                "mime-db": "1.30.0"
-              }
-            },
-            "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=",
-              "dev": true
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-              "dev": true,
-              "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=",
-                  "dev": true
-                }
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            },
-            "node-pre-gyp": {
-              "version": "0.6.38",
-              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
-              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
-              "dev": true,
-              "requires": {
-                "hawk": "3.1.3",
-                "mkdirp": "0.5.1",
-                "nopt": "4.0.1",
-                "npmlog": "4.1.2",
-                "rc": "1.2.1",
-                "request": "2.81.0",
-                "rimraf": "2.6.2",
-                "semver": "5.4.1",
-                "tar": "2.2.1",
-                "tar-pack": "3.4.0"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-              "dev": true,
-              "requires": {
-                "abbrev": "1.1.1",
-                "osenv": "0.1.4"
-              }
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "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-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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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
-            },
-            "punycode": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-              "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
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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.17",
-                "oauth-sign": "0.8.2",
-                "performance-now": "0.2.0",
-                "qs": "6.4.0",
-                "safe-buffer": "5.1.1",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.3",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.1.0"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-              "dev": true,
-              "requires": {
-                "glob": "7.1.2"
-              }
-            },
-            "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
-            },
-            "semver": {
-              "version": "5.4.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-              "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
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-              "dev": true
-            },
-            "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"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "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-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"
-              }
-            },
-            "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-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
-            },
-            "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"
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-              "dev": true,
-              "requires": {
-                "debug": "2.6.9",
-                "fstream": "1.0.11",
-                "fstream-ignore": "1.0.5",
-                "once": "1.4.0",
-                "readable-stream": "2.3.3",
-                "rimraf": "2.6.2",
-                "tar": "2.2.1",
-                "uid-number": "0.0.6"
-              }
-            },
-            "tough-cookie": {
-              "version": "2.3.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-              "dev": true,
-              "requires": {
-                "punycode": "1.4.1"
-              }
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "uid-number": {
-              "version": "0.0.6",
-              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-              "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
-            },
-            "uuid": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-              "dev": true
-            },
-            "verror": {
-              "version": "1.10.0",
-              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-              "dev": true,
-              "requires": {
-                "assert-plus": "1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "1.3.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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-              "dev": true
             }
           }
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
+          }
+        }
+      }
+    },
+    "@google-cloud/storage": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
+      "integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
+      "dev": true,
+      "requires": {
+        "@google-cloud/common": "0.13.6",
+        "arrify": "1.0.1",
+        "async": "2.5.0",
+        "concat-stream": "1.6.0",
+        "create-error-class": "3.0.2",
+        "duplexify": "3.5.1",
+        "extend": "3.0.1",
+        "gcs-resumable-upload": "0.8.2",
+        "hash-stream-validation": "0.2.1",
+        "is": "3.2.1",
+        "mime-types": "2.1.17",
+        "once": "1.4.0",
+        "pumpify": "1.3.5",
+        "safe-buffer": "5.1.1",
+        "snakeize": "0.1.0",
+        "stream-events": "1.0.2",
+        "string-format-obj": "1.1.0",
+        "through2": "2.0.3"
+      }
+    },
+    "@types/chalk": {
+      "version": "0.4.31",
+      "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz",
+      "integrity": "sha1-ox10JBprHtu5c8822XooloNKUfk=",
+      "dev": true
+    },
+    "@types/fs-extra": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "@types/glob": {
+      "version": "5.0.33",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.33.tgz",
+      "integrity": "sha512-BcD4yyWz+qmCggaYMSFF0Xn7GkO6tgwm3Fh9Gxk/kQmEU3Z7flQTnVlMyKBUNvXXNTCCyjqK4XT4/2hLd1gQ2A==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "3.0.1",
+        "@types/node": "7.0.46"
+      }
+    },
+    "@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": "7.0.46",
+        "@types/orchestrator": "0.3.0",
+        "@types/vinyl": "2.0.1"
+      }
+    },
+    "@types/hammerjs": {
+      "version": "2.0.35",
+      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.35.tgz",
+      "integrity": "sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==",
+      "dev": true
+    },
+    "@types/jasmine": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.3.tgz",
+      "integrity": "sha512-2dJf9//QxTnFBXHsCqLbB55jlMreJQie9HhgsZrSgHveOKCWVmgcXgRyvIi22Ndk/dJ/e2srLOstk2NgVbb7XA==",
+      "dev": true
+    },
+    "@types/merge2": {
+      "version": "0.3.30",
+      "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-0.3.30.tgz",
+      "integrity": "sha1-njnQT2/k82+nR3VmytH6+AsqZx8=",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz",
+      "integrity": "sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
+      "dev": true
+    },
+    "@types/minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "7.0.46",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz",
+      "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==",
+      "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": "7.0.46",
+        "@types/q": "0.0.37"
+      }
+    },
+    "@types/q": {
+      "version": "0.0.37",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
+      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
+      "dev": true
+    },
+    "@types/run-sequence": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.29.tgz",
+      "integrity": "sha1-atD3ODE24TklMi5p/EHbd7MLIHU=",
+      "dev": true,
+      "requires": {
+        "@types/gulp": "3.8.32",
+        "@types/node": "7.0.46"
+      }
+    },
+    "@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/vinyl": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz",
+      "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "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"
+      }
+    },
+    "a-sync-waterfall": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
+      "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=",
+      "dev": true
+    },
+    "abab": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.17",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
+      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
+      "dev": true
+    },
+    "acorn-globals": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
+      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
+      "dev": true,
+      "requires": {
+        "acorn": "2.7.0"
+      }
+    },
+    "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.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "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": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "json-schema-traverse": "0.3.1",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+      "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": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
+      "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "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": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "app-module-path": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-1.1.0.tgz",
+      "integrity": "sha1-pqxTaEUPIJufW4bpo+Smq2/nUxw=",
+      "dev": true
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "archiver": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz",
+      "integrity": "sha1-u1cDRomdCGXrd+1mcnqzxjT8GlA=",
+      "dev": true,
+      "requires": {
+        "async": "1.4.2",
+        "buffer-crc32": "0.2.13",
+        "glob": "5.0.15",
+        "lazystream": "0.1.0",
+        "lodash": "3.10.1",
+        "readable-stream": "1.0.34",
+        "tar-stream": "1.2.2",
+        "zip-stream": "0.6.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
+          "integrity": "sha1-bJ7csRztTw3S8tQNsNSaEJwIiqs=",
+          "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"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "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
+        }
+      }
+    },
+    "archiver-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lazystream": "1.0.0",
+        "lodash": "4.17.4",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "arguejs": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
+      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
+      "dev": true,
+      "optional": true
+    },
+    "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
+    },
+    "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-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+      "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-parallel": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
+      "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=",
+      "dev": true
+    },
+    "array-series": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
+      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8=",
+      "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
+    },
+    "as-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz",
+      "integrity": "sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc=",
+      "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
+    },
+    "ascli": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "colour": "0.7.1",
+        "optjs": "3.2.2"
+      }
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "ast-module-types": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.3.2.tgz",
+      "integrity": "sha1-S7HeLXKWeIJEKeIqYo0D6H30rRE=",
+      "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-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": "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.30000748",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "axe-core": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
+      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
+      "dev": true
+    },
+    "axe-webdriverjs": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/axe-webdriverjs/-/axe-webdriverjs-1.1.5.tgz",
+      "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
+      "dev": true,
+      "requires": {
+        "axe-core": "2.4.2"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "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.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "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": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "base64url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+      "dev": true
+    },
+    "basic-auth": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
+      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "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
+    },
+    "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"
+      }
+    },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "dev": true,
+      "requires": {
+        "buffers": "0.1.1",
+        "chainsaw": "0.1.0"
+      }
+    },
+    "binary-extensions": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+      "dev": true
+    },
+    "bl": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "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.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
+      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
+      "dev": true,
+      "requires": {
+        "bytes": "2.4.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.7",
+        "depd": "1.1.1",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.15",
+        "on-finished": "2.3.0",
+        "qs": "6.4.0",
+        "raw-body": "2.2.0",
+        "type-is": "1.6.15"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        }
+      }
+    },
+    "boom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+      "dev": true,
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "boxen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
+      "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
+      "dev": true,
+      "requires": {
+        "ansi-align": "1.1.0",
+        "camelcase": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-boxes": "1.0.0",
+        "filled-array": "1.1.0",
+        "object-assign": "4.1.1",
+        "repeating": "2.0.1",
+        "string-width": "1.0.2",
+        "widest-line": "1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "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
+        }
+      }
+    },
+    "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.30000748",
+        "electron-to-chromium": "1.3.27"
+      }
+    },
+    "browserstack": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.0.tgz",
+      "integrity": "sha1-tWVCWtYu1ywQgqHrl51TE8fUdU8=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0"
+      }
+    },
+    "browserstacktunnel-wrapper": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.1.tgz",
+      "integrity": "sha1-/+GRDW45/oZhgYPoJmkAQa9T7a4=",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "1.0.0",
+        "unzip": "0.1.11"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+      "dev": true
+    },
+    "buffered-spawn": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-1.1.2.tgz",
+      "integrity": "sha1-Ia2XNd+/ZXZ0W+DXSiPvJXvzxY0=",
+      "dev": true,
+      "requires": {
+        "cross-spawn-async": "1.0.1",
+        "err-code": "0.1.2",
+        "q": "1.4.1"
+      }
+    },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+      "dev": true
+    },
+    "bufferstreams": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz",
+      "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "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
+    },
+    "bytebuffer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "long": "3.2.0"
+      }
+    },
+    "bytes": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
+      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
+      "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.2",
+        "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.30000748",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz",
+      "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=",
+      "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.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "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"
+      }
+    },
+    "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"
+      }
+    },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "dev": true,
+      "requires": {
+        "traverse": "0.3.9"
+      }
+    },
+    "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": {
+        "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
         }
       }
     },
-    "@google-cloud/functions-emulator": {
-      "version": "1.0.0-alpha.25",
-      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
-      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
+    "change-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz",
+      "integrity": "sha1-bJyONfh5CHCoK2sHRb6MPL75sIE=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "@google-cloud/storage": "1.2.1",
-        "adm-zip": "0.4.7",
-        "ajv": "5.2.2",
-        "body-parser": "1.17.2",
-        "cli-table2": "0.2.0",
-        "colors": "1.1.2",
-        "configstore": "3.1.1",
-        "express": "4.15.4",
-        "google-proto-files": "0.12.1",
-        "googleapis": "20.1.0",
-        "got": "7.1.0",
-        "grpc": "1.4.1",
-        "http-proxy": "1.16.2",
-        "lodash": "4.17.4",
-        "prompt": "1.0.0",
-        "rimraf": "2.6.1",
-        "semver": "5.4.1",
-        "serializerr": "1.0.3",
-        "tmp": "0.0.33",
-        "uuid": "3.1.0",
-        "winston": "2.3.1",
-        "yargs": "8.0.2"
+        "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.2",
+        "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"
+      }
+    },
+    "char-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz",
+      "integrity": "sha1-5upnvSR+EHESmDt6sEee02KAAIE=",
+      "dev": true
+    },
+    "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.2",
+        "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"
+      }
+    },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "cjson": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.3.3.tgz",
+      "integrity": "sha1-qS2ceG5b+bkwgGMp7gXV0yYbSvo=",
+      "dev": true,
+      "requires": {
+        "json-parse-helpfulerror": "1.0.3"
+      }
+    },
+    "clean-css": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
+      "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
+    "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": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "1.0.1"
+      }
+    },
+    "cli-spinners": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+      "dev": true
+    },
+    "cli-table": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+      "dev": true,
+      "requires": {
+        "colors": "1.0.3"
+      }
+    },
+    "cli-table2": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz",
+      "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "colors": "1.1.2",
+        "lodash": "3.10.1",
+        "string-width": "1.0.2"
       },
       "dependencies": {
-        "@google-cloud/storage": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
-          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@google-cloud/common": "0.13.6",
-            "arrify": "1.0.1",
-            "async": "2.5.0",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "gcs-resumable-upload": "0.8.2",
-            "hash-stream-validation": "0.2.1",
-            "is": "3.2.1",
-            "mime-types": "2.1.17",
-            "once": "1.4.0",
-            "pumpify": "1.3.5",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
-          }
-        },
-        "ajv": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true,
-          "optional": 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,
-          "optional": true
-        },
         "colors": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -2215,1218 +1673,1583 @@
           "dev": true,
           "optional": 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=",
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true,
           "optional": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "optional": 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,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "winston": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
-          "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
-          "dev": true,
-          "optional": 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,
-              "optional": true
-            },
-            "colors": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
-          }
         }
       }
     },
-    "@google-cloud/storage": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.4.0.tgz",
-      "integrity": "sha512-vt1NU7D12OGYPhWfwBD1Q2qFS6Suykorlp3NLaES2W9CW6sEBWLwScxElXt8nPvonYBCFt99jP4g1AqY+0hefw==",
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "@google-cloud/common": "0.13.6",
-        "arrify": "1.0.1",
-        "async": "2.5.0",
-        "concat-stream": "1.6.0",
-        "create-error-class": "3.0.2",
-        "duplexify": "3.5.1",
-        "extend": "3.0.1",
-        "gcs-resumable-upload": "0.8.2",
-        "hash-stream-validation": "0.2.1",
-        "is": "3.2.1",
-        "mime-types": "2.1.17",
-        "once": "1.4.0",
-        "pumpify": "1.3.5",
-        "safe-buffer": "5.1.1",
-        "snakeize": "0.1.0",
-        "stream-events": "1.0.2",
-        "string-format-obj": "1.1.0",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
+      }
+    },
+    "clone": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
+    },
+    "clone-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
+      "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
+      "dev": true,
+      "requires": {
+        "is-regexp": "1.0.0",
+        "is-supported-regexp-flag": "1.0.0"
+      }
+    },
+    "clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
+      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "process-nextick-args": "1.0.7",
         "through2": "2.0.3"
       }
     },
-    "@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+    "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
     },
-    "@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+    "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.3"
+      }
+    },
+    "color-diff": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
+      "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
       "dev": true
     },
-    "@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
-    "@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+    "colorguard": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
+      "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
       "dev": true,
       "requires": {
-        "@protobufjs/aspromise": "1.1.2",
-        "@protobufjs/inquire": "1.1.0"
+        "chalk": "1.1.3",
+        "color-diff": "0.1.7",
+        "log-symbols": "1.0.2",
+        "object-assign": "4.1.1",
+        "pipetteur": "2.0.3",
+        "plur": "2.1.2",
+        "postcss": "5.2.18",
+        "postcss-reporter": "1.4.1",
+        "text-table": "0.2.0",
+        "yargs": "1.3.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "plur": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
+          "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
+          "dev": true,
+          "requires": {
+            "irregular-plurals": "1.4.0"
+          }
+        },
+        "postcss-reporter": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
+          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "lodash": "4.17.4",
+            "log-symbols": "1.0.2",
+            "postcss": "5.2.18"
+          }
+        },
+        "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
+        },
+        "yargs": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
+          "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
+          "dev": true
+        }
       }
     },
-    "@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
-      "dev": true
-    },
-    "@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
-      "dev": true
-    },
-    "@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
-      "dev": true
-    },
-    "@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
-      "dev": true
-    },
-    "@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
+    "colors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
       "dev": true
     },
-    "@types/chalk": {
-      "version": "0.4.31",
-      "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz",
-      "integrity": "sha1-ox10JBprHtu5c8822XooloNKUfk=",
-      "dev": true
+    "colour": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
+      "dev": true,
+      "optional": true
     },
-    "@types/fs-extra": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
-      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
+    "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": {
-        "@types/node": "7.0.46"
+        "lodash": "4.17.4"
       }
     },
-    "@types/glob": {
-      "version": "5.0.33",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.33.tgz",
-      "integrity": "sha512-BcD4yyWz+qmCggaYMSFF0Xn7GkO6tgwm3Fh9Gxk/kQmEU3Z7flQTnVlMyKBUNvXXNTCCyjqK4XT4/2hLd1gQ2A==",
+    "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": {
-        "@types/minimatch": "3.0.1",
-        "@types/node": "7.0.46"
+        "delayed-stream": "1.0.0"
       }
     },
-    "@types/google-cloud__storage": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
-      "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "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": {
-        "@types/node": "7.0.46"
+        "array-ify": "1.0.0",
+        "dot-prop": "3.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
       }
     },
-    "@types/gulp": {
-      "version": "3.8.32",
-      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.32.tgz",
-      "integrity": "sha1-g8WcaBzCM9Hsf4LSaVVVZvoTMVY=",
+    "compare-semver": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz",
+      "integrity": "sha1-fAp5onu4C2xplERfgpWCWdPQIVM=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46",
-        "@types/orchestrator": "0.3.0",
-        "@types/vinyl": "2.0.1"
+        "semver": "5.4.1"
       }
     },
-    "@types/hammerjs": {
-      "version": "2.0.35",
-      "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.35.tgz",
-      "integrity": "sha512-4mUIMSZ2U4UOWq1b+iV7XUTE4w+Kr3x+Zb/Qz5ROO6BTZLw2c8/ftjq0aRgluguLs4KRuBnrOy/s389HVn1/zA==",
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
       "dev": true
     },
-    "@types/jasmine": {
-      "version": "2.5.45",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.45.tgz",
-      "integrity": "sha1-WJKKYh0BTOarWcWpxBBx9zKLDKk=",
+    "component-emitter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
       "dev": true
     },
-    "@types/long": {
-      "version": "3.0.32",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
-      "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
+    "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
     },
-    "@types/merge2": {
-      "version": "0.3.30",
-      "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-0.3.30.tgz",
-      "integrity": "sha1-njnQT2/k82+nR3VmytH6+AsqZx8=",
+    "compress-commons": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz",
+      "integrity": "sha1-lwk+Lhk/dWf6EyA9S43vzVlxpRk=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46"
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "0.3.4",
+        "node-int64": "0.4.0",
+        "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
+        }
       }
     },
-    "@types/minimatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.1.tgz",
-      "integrity": "sha512-rUO/jz10KRSyA9SHoCWQ8WX9BICyj5jZYu1/ucKEJKb4KzLZCKMURdYbadP157Q6Zl1x0vHsrU+Z/O0XlhYQDw==",
-      "dev": true
+    "compressible": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
+      "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.30.0"
+      }
     },
-    "@types/minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
-      "dev": true
+    "compression": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
+      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "bytes": "3.0.0",
+        "compressible": "2.0.12",
+        "debug": "2.6.9",
+        "on-headers": "1.0.1",
+        "safe-buffer": "5.1.1",
+        "vary": "1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
     },
-    "@types/node": {
-      "version": "7.0.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.46.tgz",
-      "integrity": "sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A==",
+    "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
     },
-    "@types/orchestrator": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@types/orchestrator/-/orchestrator-0.3.0.tgz",
-      "integrity": "sha1-v4ShaZyTMNT+ic2BJj6PwJ+zKXg=",
+    "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": {
-        "@types/node": "7.0.46",
-        "@types/q": "0.0.37"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
       }
     },
-    "@types/q": {
-      "version": "0.0.37",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
-      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
-      "dev": true
-    },
-    "@types/run-sequence": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/run-sequence/-/run-sequence-0.0.29.tgz",
-      "integrity": "sha1-atD3ODE24TklMi5p/EHbd7MLIHU=",
+    "configstore": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
       "dev": true,
       "requires": {
-        "@types/gulp": "3.8.32",
-        "@types/node": "7.0.46"
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.0.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.3.0",
+        "xdg-basedir": "3.0.0"
       }
     },
-    "@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/vinyl": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.1.tgz",
-      "integrity": "sha512-Joudabfn2ZofU2usW04y8OLmN75u7ZQkW0MCT3AnoBf5oUBp5iQ3Pgfz9+y1RdWkzhCPZo9/wBJ7FMWW2JrY0g==",
+    "connect": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
+      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
       "dev": true,
       "requires": {
-        "@types/node": "7.0.46"
+        "debug": "2.6.9",
+        "finalhandler": "1.0.6",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "dev": true
+        }
       }
     },
-    "a-sync-waterfall": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
-      "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=",
-      "dev": true
-    },
-    "abab": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
+    "connect-livereload": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.4.tgz",
+      "integrity": "sha1-gBV9E3HJ83zBQDmrGJWXDRGdw7w=",
       "dev": true
     },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+    "connect-query": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-1.0.0.tgz",
+      "integrity": "sha1-3kT1dyCdokBNH8BGktGkEY5YIRk=",
+      "dev": true,
+      "requires": {
+        "qs": "6.4.0"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        }
+      }
     },
-    "accepts": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
-      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+    "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": {
-        "mime-types": "2.1.17",
-        "negotiator": "0.6.1"
+        "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.4.0"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
       }
     },
-    "acorn": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
+    "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
     },
-    "acorn-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
-      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
+    "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": {
-        "acorn": "2.7.0"
+        "snake-case": "2.1.0",
+        "upper-case": "1.1.3"
       }
     },
-    "add-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-      "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-      "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,
+      "optional": 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=",
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true
     },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+    "content-type-parser": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
+      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
       "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": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+    "conventional-changelog": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
+      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
       "dev": true,
       "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "json-schema-traverse": "0.3.1",
-        "json-stable-stringify": "1.0.1"
+        "conventional-changelog-angular": "1.5.1",
+        "conventional-changelog-atom": "0.1.1",
+        "conventional-changelog-codemirror": "0.2.0",
+        "conventional-changelog-core": "1.9.2",
+        "conventional-changelog-ember": "0.2.8",
+        "conventional-changelog-eslint": "0.2.0",
+        "conventional-changelog-express": "0.2.0",
+        "conventional-changelog-jquery": "0.1.0",
+        "conventional-changelog-jscs": "0.1.0",
+        "conventional-changelog-jshint": "0.2.0"
       }
     },
-    "ajv-keywords": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
-      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
-      "dev": true
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+    "conventional-changelog-angular": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
+      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2",
-        "longest": "1.0.1",
-        "repeat-string": "1.6.1"
+        "compare-func": "1.3.2",
+        "q": "1.4.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": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
-      "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
+    "conventional-changelog-atom": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
+      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2"
+        "q": "1.4.1"
       }
     },
-    "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": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+    "conventional-changelog-codemirror": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
+      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
       "dev": true,
       "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
+        "q": "1.4.1"
       }
     },
-    "app-module-path": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-1.1.0.tgz",
-      "integrity": "sha1-pqxTaEUPIJufW4bpo+Smq2/nUxw=",
-      "dev": true
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "archiver": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz",
-      "integrity": "sha1-u1cDRomdCGXrd+1mcnqzxjT8GlA=",
+    "conventional-changelog-core": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
+      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
       "dev": true,
       "requires": {
-        "async": "1.4.2",
-        "buffer-crc32": "0.2.13",
-        "glob": "5.0.15",
-        "lazystream": "0.1.0",
-        "lodash": "3.10.1",
-        "readable-stream": "1.0.34",
-        "tar-stream": "1.2.2",
-        "zip-stream": "0.6.0"
+        "conventional-changelog-writer": "2.0.1",
+        "conventional-commits-parser": "2.0.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.2",
+        "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.3"
       },
       "dependencies": {
-        "async": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
-          "integrity": "sha1-bJ7csRztTw3S8tQNsNSaEJwIiqs=",
-          "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"
+          }
         },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+        "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": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.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
+        "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"
+          }
         },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "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"
+          }
         },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+        "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": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
-        "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
+        "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"
+          }
+        },
+        "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"
+          }
         }
       }
     },
-    "archiver-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
-      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+    "conventional-changelog-ember": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
+      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-eslint": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
+      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
+      "dev": true,
+      "requires": {
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-express": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
+      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+      "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.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
+      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
       "dev": true,
       "requires": {
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "lazystream": "1.0.0",
+        "compare-func": "1.3.2",
+        "q": "1.4.1"
+      }
+    },
+    "conventional-changelog-writer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
+      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+      "dev": true,
+      "requires": {
+        "compare-func": "1.3.2",
+        "conventional-commits-filter": "1.0.0",
+        "dateformat": "1.0.12",
+        "handlebars": "4.0.11",
+        "json-stringify-safe": "5.0.1",
         "lodash": "4.17.4",
-        "normalize-path": "2.1.1",
-        "readable-stream": "2.3.3"
+        "meow": "3.7.0",
+        "semver": "5.4.1",
+        "split": "1.0.1",
+        "through2": "2.0.3"
       },
       "dependencies": {
-        "lazystream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-          "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+        "dateformat": {
+          "version": "1.0.12",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
           "dev": true,
           "requires": {
-            "readable-stream": "2.3.3"
+            "get-stdin": "4.0.1",
+            "meow": "3.7.0"
+          }
+        },
+        "split": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+          "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+          "dev": true,
+          "requires": {
+            "through": "2.3.8"
           }
         }
       }
     },
-    "archy": {
+    "conventional-commits-filter": {
       "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=",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
+      "integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
       "dev": true,
       "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
+        "is-subset": "0.1.1",
+        "modify-values": "1.0.0"
       }
     },
-    "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+    "conventional-commits-parser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
+      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
-        "sprintf-js": "1.0.3"
+        "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
+        "lodash": "4.17.4",
+        "meow": "3.7.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3",
+        "trim-off-newlines": "1.0.1"
       }
     },
-    "arguejs": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
-      "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
       "dev": true
     },
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+    "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": {
-        "arr-flatten": "1.1.0"
+        "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
+        }
       }
     },
-    "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
-    },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "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
+    "copy-props": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-1.6.0.tgz",
+      "integrity": "sha1-8DJLvumXcRAeezraES8xPDk9uO0=",
+      "dev": true,
+      "requires": {
+        "each-props": "1.3.1",
+        "is-plain-object": "2.0.4"
+      }
     },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
+    "core-js": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
     },
-    "array-find-index": {
+    "core-util-is": {
       "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-parallel": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
-      "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=",
-      "dev": true
-    },
-    "array-series": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
-      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8=",
-      "dev": true
-    },
-    "array-slice": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz",
-      "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+    "cosmiconfig": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "is-directory": "0.3.1",
+        "js-yaml": "3.10.0",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
       }
     },
-    "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=",
+    "crc": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
+      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
       "dev": true
     },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
+    "crc32-stream": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
+      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "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
+        }
+      }
     },
-    "as-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/as-array/-/as-array-2.0.0.tgz",
-      "integrity": "sha1-TwSAXYf4/OjlEbwhCPjl46KH1Uc=",
-      "dev": true
+    "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"
+      }
     },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
+    "cross-spawn": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "which": "1.3.0"
+      }
     },
-    "ascli": {
+    "cross-spawn-async": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-1.0.1.tgz",
+      "integrity": "sha1-u1JcHkINmUJVLgR5Gj6y2Yh6EF8=",
       "dev": true,
       "requires": {
-        "colour": "0.7.1",
-        "optjs": "3.2.2"
+        "lru-cache": "2.7.3",
+        "which": "1.3.0"
+      },
+      "dependencies": {
+        "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
+        }
       }
     },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
+    "cryptiles": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "dev": true,
+      "requires": {
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
+      }
     },
-    "assert-plus": {
+    "crypto-random-string": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "ast-module-types": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.3.2.tgz",
-      "integrity": "sha1-S7HeLXKWeIJEKeIqYo0D6H30rRE=",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
       "dev": true
     },
-    "async": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+    "csrf": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz",
+      "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4"
+        "rndm": "1.2.0",
+        "tsscmp": "1.0.5",
+        "uid-safe": "2.1.4"
       }
     },
-    "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=",
+    "css-color-names": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
+      "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
       "dev": true
     },
-    "autoprefixer": {
-      "version": "6.7.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+    "css-rule-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
+      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
       "dev": true,
       "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000748",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
+        "css-tokenize": "1.0.1",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "1.2.1",
+        "through2": "0.6.5"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        },
+        "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"
+          },
+          "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"
+              }
+            }
+          }
+        }
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+    "css-tokenize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
+      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "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
+        }
+      }
     },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+    "cssom": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
+      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
       "dev": true
     },
-    "axe-core": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
-      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
-      "dev": true
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "dev": true,
+      "requires": {
+        "cssom": "0.3.2"
+      }
     },
-    "axe-webdriverjs": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/axe-webdriverjs/-/axe-webdriverjs-1.1.5.tgz",
-      "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
+    "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": {
-        "axe-core": "2.4.2"
+        "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.4.0"
+          }
+        }
       }
     },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+    "csv-streamify": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/csv-streamify/-/csv-streamify-3.0.4.tgz",
+      "integrity": "sha1-TLYUxX4/KZzKF7Y/3LStFnd39Ho=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "through2": "2.0.1"
       },
       "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "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": {
-            "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"
+            "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"
           }
         },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+        "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": "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"
+          }
         }
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+    "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": {
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
+        "array-find-index": "1.0.2"
       }
     },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
       "dev": true
     },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
       "dev": true
     },
-    "balanced-match": {
+    "d": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.35"
+      }
     },
-    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "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"
+      }
     },
-    "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
+    "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"
+      }
     },
-    "base64id": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+    "dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
       "dev": true
     },
-    "base64url": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-      "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+    "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"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
-    "basic-auth": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
-      "integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "mimic-response": "1.0.0"
       }
     },
-    "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=",
+    "deep-equal": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
+      "dev": true,
+      "optional": 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
     },
-    "batch": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz",
-      "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=",
+    "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
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "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
+        }
       }
     },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "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=",
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
       "dev": true,
       "requires": {
-        "callsite": "1.0.0"
+        "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"
       }
     },
-    "binary": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-      "dev": true,
-      "requires": {
-        "buffers": "0.1.1",
-        "chainsaw": "0.1.0"
-      }
+    "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.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+      "dev": true
     },
-    "binary-extensions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
-      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+    "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
     },
-    "bl": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+    "dependency-tree": {
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-5.11.0.tgz",
+      "integrity": "sha1-koRk1vknNgfT9muaV+JZ5jVmd1U=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "commander": "2.11.0",
+        "debug": "2.6.7",
+        "filing-cabinet": "1.12.0",
+        "precinct": "3.8.0"
       }
     },
-    "blob": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
-      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+    "deprecated": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
+      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
       "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=",
+    "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": {
-        "inherits": "2.0.3"
+        "fs-exists-sync": "0.1.0"
       }
     },
-    "blocking-proxy": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-0.0.5.tgz",
-      "integrity": "sha1-RikF4Nz76pcPQao3Ij3anAexkSs=",
+    "detective-amd": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-2.4.0.tgz",
+      "integrity": "sha1-XrDfTvXBipQDOwfa8TbbzV/HXNU=",
       "dev": true,
       "requires": {
-        "minimist": "1.2.0"
+        "ast-module-types": "2.3.2",
+        "escodegen": "1.9.0",
+        "get-amd-module-type": "2.0.5",
+        "node-source-walk": "3.3.0"
       }
     },
-    "bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.17.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
-      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
+    "detective-cjs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-2.0.0.tgz",
+      "integrity": "sha1-3OTJMCzcpS5ri/04d8qT9ixczAM=",
       "dev": true,
       "requires": {
-        "bytes": "2.4.0",
-        "content-type": "1.0.4",
-        "debug": "2.6.7",
-        "depd": "1.1.1",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.15",
-        "on-finished": "2.3.0",
-        "qs": "6.4.0",
-        "raw-body": "2.2.0",
-        "type-is": "1.6.15"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true
-        }
+        "ast-module-types": "2.3.2",
+        "node-source-walk": "3.3.0"
       }
     },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+    "detective-es6": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-1.2.0.tgz",
+      "integrity": "sha1-a5s71Uf9jyH4lQL2JuRe0qMnb9w=",
       "dev": true,
       "requires": {
-        "hoek": "4.2.0"
+        "node-source-walk": "3.3.0"
       }
     },
-    "boxen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
-      "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
+    "detective-less": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.0.tgz",
+      "integrity": "sha1-Qmx4yatuMnW/ZsyRq6wAU7tFLX0=",
       "dev": true,
       "requires": {
-        "ansi-align": "1.1.0",
-        "camelcase": "2.1.1",
-        "chalk": "1.1.3",
-        "cli-boxes": "1.0.0",
-        "filled-array": "1.1.0",
-        "object-assign": "4.1.1",
-        "repeating": "2.0.1",
-        "string-width": "1.0.2",
-        "widest-line": "1.0.0"
+        "debug": "2.2.0",
+        "gonzales-pe": "3.4.7",
+        "node-source-walk": "3.3.0"
       },
       "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
           "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"
+            "ms": "0.7.1"
           }
         },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
           "dev": true
         }
       }
     },
-    "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=",
+    "detective-sass": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-2.0.1.tgz",
+      "integrity": "sha1-BWYKoblc/Yf1dGQ7+s4+iiaBEqE=",
       "dev": true,
       "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
+        "debug": "3.1.0",
+        "gonzales-pe": "3.4.7",
+        "node-source-walk": "3.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
-    "browser-resolve": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
-      "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
+    "detective-scss": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-1.0.1.tgz",
+      "integrity": "sha1-dDJGoN01jZ2R/0ElQX9qd/vPJw8=",
       "dev": true,
       "requires": {
-        "resolve": "1.1.7"
+        "debug": "3.1.0",
+        "gonzales-pe": "3.4.7",
+        "node-source-walk": "3.3.0"
       },
       "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
         }
       }
     },
-    "browserslist": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+    "detective-stylus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz",
+      "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
+      "dev": true
+    },
+    "detective-typescript": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-1.0.1.tgz",
+      "integrity": "sha512-4DZpsap+dVzQblcL/ffVXtaXtA7byrP14XQnvyAvwo8+z7/C0OrwLNQhyiC6cLZlzy2T8QuPc+mDsYsa4lAxHw==",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000748",
-        "electron-to-chromium": "1.3.27"
+        "node-source-walk": "3.2.0",
+        "typescript": "2.0.10",
+        "typescript-eslint-parser": "1.0.2"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "6.8.4",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.4.tgz",
+          "integrity": "sha1-CXMGuNq66VFZIlzymz6lWRIFMYA=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.26.0"
+          }
+        },
+        "node-source-walk": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.2.0.tgz",
+          "integrity": "sha1-PGBcxTq97ktFq2XpR9+x23yQ8OM=",
+          "dev": true,
+          "requires": {
+            "babylon": "6.8.4"
+          }
+        },
+        "typescript": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz",
+          "integrity": "sha1-zN1O2G/VVQpAcQGggUAS4bP6w90=",
+          "dev": true
+        }
       }
     },
-    "browserstack": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.0.tgz",
-      "integrity": "sha1-tWVCWtYu1ywQgqHrl51TE8fUdU8=",
+    "dgeni": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/dgeni/-/dgeni-0.4.9.tgz",
+      "integrity": "sha1-nkJ3WxOGyl64JHU6ws0WnY9hztE=",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "1.0.0"
+        "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.4.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        }
       }
     },
-    "browserstacktunnel-wrapper": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.1.tgz",
-      "integrity": "sha1-/+GRDW45/oZhgYPoJmkAQa9T7a4=",
+    "dgeni-packages": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.22.0.tgz",
+      "integrity": "sha1-ftB6+QdPZUeEclbBpltIiloXrQM=",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "1.0.0",
-        "unzip": "0.1.11"
+        "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.1.2",
+        "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": "3.0.1",
+        "semver": "5.4.1",
+        "shelljs": "0.7.8",
+        "source-map-support": "0.4.18",
+        "spdx-license-list": "2.1.0",
+        "stringmap": "0.2.2",
+        "typescript": "2.4.2"
       }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
       "dev": true
     },
-    "buffered-spawn": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-1.1.2.tgz",
-      "integrity": "sha1-Ia2XNd+/ZXZ0W+DXSiPvJXvzxY0=",
-      "dev": true,
-      "requires": {
-        "cross-spawn-async": "1.0.1",
-        "err-code": "0.1.2",
-        "q": "1.4.1"
-      }
-    },
-    "buffers": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+    "didyoumean": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
+      "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=",
       "dev": true
     },
-    "bufferstreams": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz",
-      "integrity": "sha1-AWE3MGCsWYjv+ZBYcxEU9uGV1R4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.3.3"
-      }
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+    "diff": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
+      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
       "dev": true
     },
-    "bun": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
-      "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
+    "doiuse": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
+      "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
       "dev": true,
       "requires": {
-        "readable-stream": "1.0.34"
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000748",
+        "css-rule-stream": "1.1.0",
+        "duplexer2": "0.0.2",
+        "jsonfilter": "1.1.2",
+        "ldjson-stream": "1.2.1",
+        "lodash": "4.17.4",
+        "multimatch": "2.1.0",
+        "postcss": "5.2.18",
+        "source-map": "0.4.4",
+        "through2": "0.6.5",
+        "yargs": "3.32.0"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -3434,9 +3257,9 @@
           "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=",
+          "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",
@@ -3445,689 +3268,731 @@
             "string_decoder": "0.10.31"
           }
         },
+        "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"
+          }
+        },
         "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"
+          },
+          "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"
+              }
+            }
+          }
         }
       }
     },
-    "bytebuffer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
-      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
-      "dev": true,
-      "requires": {
-        "long": "3.2.0"
-      }
-    },
-    "bytes": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
-      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
-      "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.2",
-        "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=",
+    "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": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
       }
     },
-    "caniuse-db": {
-      "version": "1.0.30000748",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz",
-      "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=",
-      "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
+    "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
+        }
+      }
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
       "dev": true
     },
-    "catharsis": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
-      "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
+    "domhandler": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
       "dev": true,
       "requires": {
-        "underscore-contrib": "0.3.0"
+        "domelementtype": "1.3.0"
       }
     },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+    "domino": {
+      "version": "1.0.30",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz",
+      "integrity": "sha512-ikq8WiDSkICdkElud317F2Sigc6A3EDpWsxWBwIZqOl95km4p/Vc9Rj98id7qKgsjDmExj0AVM7JOd4bb647Xg==",
+      "dev": true
+    },
+    "domutils": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
       "dev": true,
       "requires": {
-        "align-text": "0.1.4",
-        "lazy-cache": "1.0.4"
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
       }
     },
-    "chainsaw": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+    "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": {
-        "traverse": "0.3.9"
+        "no-case": "2.3.2"
       }
     },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "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": {
-        "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
-        }
+        "is-obj": "1.0.1"
       }
     },
-    "change-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz",
-      "integrity": "sha1-bJyONfh5CHCoK2sHRb6MPL75sIE=",
+    "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.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
       "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.2",
-        "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"
+        "readable-stream": "2.3.3"
       }
     },
-    "char-spinner": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz",
-      "integrity": "sha1-5upnvSR+EHESmDt6sEee02KAAIE=",
-      "dev": true
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true,
+      "optional": true
     },
-    "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+    "duplexify": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
       "dev": true,
       "requires": {
-        "anymatch": "1.3.2",
-        "async-each": "1.0.1",
-        "glob-parent": "2.0.0",
+        "end-of-stream": "1.4.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"
+        "readable-stream": "2.3.3",
+        "stream-shift": "1.0.0"
       }
     },
-    "chownr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
-      "dev": true
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
+    "each-props": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.1.tgz",
+      "integrity": "sha1-/BOPUeOid0KG1IWOAtbn3kYt4Vg=",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
+      }
     },
-    "cjson": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/cjson/-/cjson-0.3.3.tgz",
-      "integrity": "sha1-qS2ceG5b+bkwgGMp7gXV0yYbSvo=",
+    "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": {
-        "json-parse-helpfulerror": "1.0.3"
+        "jsbn": "0.1.1"
       }
     },
-    "clean-css": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
-      "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
+    "ecdsa-sig-formatter": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "base64url": "2.0.0",
+        "safe-buffer": "5.1.1"
       }
     },
-    "cli-boxes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
-    "cli-cursor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+    "electron-to-chromium": {
+      "version": "1.3.27",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "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": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
       "dev": true,
       "requires": {
-        "restore-cursor": "1.0.1"
+        "once": "1.4.0"
       }
     },
-    "cli-spinners": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
-      "dev": true
-    },
-    "cli-table": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+    "engine.io": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
+      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
       "dev": true,
       "requires": {
-        "colors": "1.0.3"
+        "accepts": "1.3.3",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "ws": "1.1.2"
+      },
+      "dependencies": {
+        "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.17",
+            "negotiator": "0.6.1"
+          }
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
       }
     },
-    "cli-table2": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz",
-      "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
+    "engine.io-client": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
+      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "colors": "1.1.2",
-        "lodash": "3.10.1",
-        "string-width": "1.0.2"
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parsejson": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "1.1.2",
+        "xmlhttprequest-ssl": "1.5.3",
+        "yeast": "0.1.2"
       },
       "dependencies": {
-        "colors": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-          "dev": true,
-          "optional": true
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
         },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
         }
       }
     },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
+    "engine.io-parser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
+      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "0.0.6",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.4",
+        "has-binary": "0.1.7",
+        "wtf-8": "1.0.0"
+      }
     },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+    "enhanced-resolve": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz",
+      "integrity": "sha1-3xTAa1/F7sreEJTJxaErSz7cC2I=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "object-assign": "4.1.1",
+        "tapable": "0.2.8"
       }
     },
-    "clone": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
       "dev": true
     },
-    "clone-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz",
-      "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=",
+    "err-code": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-0.1.2.tgz",
+      "integrity": "sha1-EiqSszQrmJnaArWsmU0w+V1HY+4=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
       "dev": true,
       "requires": {
-        "is-regexp": "1.0.0",
-        "is-supported-regexp-flag": "1.0.0"
+        "prr": "0.0.0"
       }
     },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
+    "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": {
-        "inherits": "2.0.3",
-        "process-nextick-args": "1.0.7",
-        "through2": "2.0.3"
+        "is-arrayish": "0.2.1"
       }
     },
-    "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
-    },
-    "color-convert": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+    "errorhandler": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz",
+      "integrity": "sha1-t7cO2PNZ6duICS8tIMD4MUIK2D8=",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "accepts": "1.3.4",
+        "escape-html": "1.0.3"
       }
     },
-    "color-diff": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz",
-      "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=",
-      "dev": true
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "colorguard": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz",
-      "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=",
+    "es5-ext": {
+      "version": "0.10.35",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
+      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "color-diff": "0.1.7",
-        "log-symbols": "1.0.2",
-        "object-assign": "4.1.1",
-        "pipetteur": "2.0.3",
-        "plur": "2.1.2",
-        "postcss": "5.2.18",
-        "postcss-reporter": "1.4.1",
-        "text-table": "0.2.0",
-        "yargs": "1.3.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "plur": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
-          "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=",
-          "dev": true,
-          "requires": {
-            "irregular-plurals": "1.4.0"
-          }
-        },
-        "postcss-reporter": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz",
-          "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "lodash": "4.17.4",
-            "log-symbols": "1.0.2",
-            "postcss": "5.2.18"
-          }
-        },
-        "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
-        },
-        "yargs": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-          "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
-          "dev": true
-        }
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-symbol": "3.1.1"
       }
     },
-    "colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "dev": true
-    },
-    "colour": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
+    "es6-promise": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
+      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
       "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=",
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
       }
     },
-    "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "delayed-stream": "1.0.0"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
       }
     },
-    "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
       "dev": true
     },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+    "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
     },
-    "compare-func": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
-      "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
+    "escodegen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
+      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
       "dev": true,
       "requires": {
-        "array-ify": "1.0.0",
-        "dot-prop": "3.0.0"
+        "esprima": "3.1.3",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.5.7"
       },
       "dependencies": {
-        "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"
-          }
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
         }
       }
     },
-    "compare-semver": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/compare-semver/-/compare-semver-1.1.0.tgz",
-      "integrity": "sha1-fAp5onu4C2xplERfgpWCWdPQIVM=",
-      "dev": true,
-      "requires": {
-        "semver": "5.4.1"
-      }
+    "espree": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
+      "integrity": "sha1-32kbkxCIlAKuspzAZnCMVmkLhUs=",
+      "dev": true
     },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
       "dev": true
     },
-    "component-emitter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
-      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
       "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=",
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
       "dev": true
     },
-    "compress-commons": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz",
-      "integrity": "sha1-lwk+Lhk/dWf6EyA9S43vzVlxpRk=",
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13",
-        "crc32-stream": "0.3.4",
-        "node-int64": "0.4.0",
-        "readable-stream": "1.0.34"
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
+      }
+    },
+    "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"
+      }
+    },
+    "eventemitter3": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
+      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+      "dev": true
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "optional": 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"
       },
       "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=",
+        "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,
+          "optional": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "lru-cache": "4.1.1",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
           }
-        },
-        "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
         }
       }
     },
-    "compressible": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
-      "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+    "execall": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
+      "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
       "dev": true,
       "requires": {
-        "mime-db": "1.30.0"
+        "clone-regexp": "1.0.0"
       }
     },
-    "compression": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
-      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "exit-code": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/exit-code/-/exit-code-1.0.2.tgz",
+      "integrity": "sha1-zhZYEcnxF69qX4gpQLlq5/muzDQ=",
+      "dev": true
+    },
+    "exit-hook": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
+      "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": {
-        "accepts": "1.3.4",
-        "bytes": "3.0.0",
-        "compressible": "2.0.12",
-        "debug": "2.6.9",
-        "on-headers": "1.0.1",
-        "safe-buffer": "5.1.1",
-        "vary": "1.1.2"
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
           "dev": true
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "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
         }
       }
     },
-    "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
+    "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"
+      }
     },
-    "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+    "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": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "typedarray": "0.0.6"
+        "fill-range": "2.2.3"
       }
     },
-    "configstore": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-      "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+    "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": {
-        "dot-prop": "4.2.0",
-        "graceful-fs": "4.1.11",
-        "make-dir": "1.0.0",
-        "unique-string": "1.0.0",
-        "write-file-atomic": "2.3.0",
-        "xdg-basedir": "3.0.0"
+        "os-homedir": "1.0.2"
       }
     },
-    "connect": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
-      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
+    "express": {
+      "version": "4.15.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
+      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "debug": "2.6.9",
+        "accepts": "1.3.4",
+        "array-flatten": "1.1.1",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.8",
+        "depd": "1.1.1",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
         "finalhandler": "1.0.6",
+        "fresh": "0.5.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
         "parseurl": "1.3.2",
-        "utils-merge": "1.0.1"
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "1.1.5",
+        "qs": "6.5.0",
+        "range-parser": "1.2.0",
+        "send": "0.15.4",
+        "serve-static": "1.12.4",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1",
+        "type-is": "1.6.15",
+        "utils-merge": "1.0.0",
+        "vary": "1.1.2"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
-        "utils-merge": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-          "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-query": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/connect-query/-/connect-query-1.0.0.tgz",
-      "integrity": "sha1-3kT1dyCdokBNH8BGktGkEY5YIRk=",
-      "dev": true,
-      "requires": {
-        "qs": "6.4.0"
-      },
-      "dependencies": {
         "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
+          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
+          "dev": true,
+          "optional": true
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true,
+          "optional": true
         }
       }
     },
-    "connect-timeout": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz",
-      "integrity": "sha1-3ppexh4zoStu2qt7XwYumMWZuI4=",
+    "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",
-        "http-errors": "1.3.1",
-        "ms": "0.7.1",
-        "on-headers": "1.0.1"
+        "depd": "1.0.1",
+        "on-headers": "1.0.1",
+        "parseurl": "1.3.2",
+        "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",
@@ -4137,3875 +4002,4332 @@
             "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.4.0"
-          }
+        "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
+    },
+    "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.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "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"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
         }
       }
     },
-    "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=",
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
       "dev": true
     },
-    "constant-case": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz",
-      "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=",
+    "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
+    },
+    "fast-url-parser": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
+      "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
       "dev": true,
       "requires": {
-        "snake-case": "2.1.0",
-        "upper-case": "1.1.3"
+        "punycode": "1.4.1"
       }
     },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+    "faye-websocket": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+      "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
       "dev": true,
-      "optional": true
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "content-type-parser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
-      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
-      "dev": true
+      "requires": {
+        "websocket-driver": "0.7.0"
+      }
     },
-    "conventional-changelog": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
-      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
+    "figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "conventional-changelog-angular": "1.5.1",
-        "conventional-changelog-atom": "0.1.1",
-        "conventional-changelog-codemirror": "0.2.0",
-        "conventional-changelog-core": "1.9.2",
-        "conventional-changelog-ember": "0.2.8",
-        "conventional-changelog-eslint": "0.2.0",
-        "conventional-changelog-express": "0.2.0",
-        "conventional-changelog-jquery": "0.1.0",
-        "conventional-changelog-jscs": "0.1.0",
-        "conventional-changelog-jshint": "0.2.0"
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
       }
     },
-    "conventional-changelog-angular": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
-      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "compare-func": "1.3.2",
-        "q": "1.4.1"
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
       }
     },
-    "conventional-changelog-atom": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
-      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
+    "file-exists": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-1.0.0.tgz",
+      "integrity": "sha1-5tJptWVnuJIlgTmOmQ3XB49y1hY=",
+      "dev": true
+    },
+    "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
+    },
+    "filesize": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
+      "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==",
+      "dev": true
+    },
+    "filing-cabinet": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-1.12.0.tgz",
+      "integrity": "sha1-b7k/2WjoO+3xtCmPKCNqiq/ffXg=",
       "dev": true,
       "requires": {
-        "q": "1.4.1"
+        "app-module-path": "1.1.0",
+        "commander": "2.11.0",
+        "debug": "2.6.7",
+        "enhanced-resolve": "3.0.3",
+        "is-relative-path": "1.0.2",
+        "module-definition": "2.2.4",
+        "module-lookup-amd": "4.0.5",
+        "object-assign": "4.1.1",
+        "resolve": "1.4.0",
+        "resolve-dependency-path": "1.0.2",
+        "sass-lookup": "1.1.0",
+        "stylus-lookup": "1.0.2",
+        "typescript": "2.4.2"
       }
     },
-    "conventional-changelog-codemirror": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
-      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
+    "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": {
-        "q": "1.4.1"
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
       }
     },
-    "conventional-changelog-core": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
-      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
+    "filled-array": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
+      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
+      "dev": true
+    },
+    "finalhandler": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
       "dev": true,
       "requires": {
-        "conventional-changelog-writer": "2.0.1",
-        "conventional-commits-parser": "2.0.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.2",
-        "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.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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-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"
-          }
-        },
-        "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"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+        "debug": "2.6.9",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "is-utf8": "0.2.1"
+            "ms": "2.0.0"
           }
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true
         }
       }
     },
-    "conventional-changelog-ember": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
-      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+    "find": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/find/-/find-0.2.6.tgz",
+      "integrity": "sha1-DSGLXUjDQkGT9kzqWdOJ+NqnHQE=",
       "dev": true,
       "requires": {
-        "q": "1.4.1"
+        "traverse-chain": "0.1.0"
       }
     },
-    "conventional-changelog-eslint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
-      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
-      "dev": true,
-      "requires": {
-        "q": "1.4.1"
-      }
+    "find-index": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
+      "dev": true
     },
-    "conventional-changelog-express": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
-      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+    "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": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "q": "1.4.1"
+        "locate-path": "2.0.0"
       }
     },
-    "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=",
+    "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": {
-        "q": "1.4.1"
+        "detect-file": "0.1.0",
+        "is-glob": "2.0.1",
+        "micromatch": "2.3.11",
+        "resolve-dir": "0.1.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=",
+    "fined": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
+      "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
       "dev": true,
       "requires": {
-        "q": "1.4.1"
+        "expand-tilde": "2.0.2",
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0",
+        "object.pick": "1.3.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"
+          }
+        }
       }
     },
-    "conventional-changelog-jshint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
-      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
+    "firebase": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.0.tgz",
+      "integrity": "sha512-lfVXLQiCNcNsmG7ZxQapQRdE/kZOjheBZVZ1MNK80GTsuK9RO7DYO5Qdf4K9Om8r7OBZ4nRp438kGkf24x7sOg==",
       "dev": true,
       "requires": {
-        "compare-func": "1.3.2",
-        "q": "1.4.1"
+        "@firebase/app": "0.1.1",
+        "@firebase/auth": "0.2.0",
+        "@firebase/database": "0.1.2",
+        "@firebase/firestore": "0.1.2",
+        "@firebase/messaging": "0.1.2",
+        "@firebase/polyfill": "0.1.1",
+        "@firebase/storage": "0.1.1",
+        "dom-storage": "2.0.2",
+        "xmlhttprequest": "1.8.0"
+      },
+      "dependencies": {
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
+        },
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+        },
+        "dom-storage": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
+          "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
+          "dev": true
+        },
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+          "requires": {
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+          "requires": {
+            "websocket-driver": "0.6.5"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+        },
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo="
+        },
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+          "requires": {
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          }
+        },
+        "jsonwebtoken": {
+          "version": "7.4.3",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
+          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
+          "requires": {
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "2.0.0",
+            "xtend": "4.0.1"
+          }
+        },
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+          "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "promise-polyfill": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
+          "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "websocket-driver": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+          "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="
+        },
+        "xmlhttprequest": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+          "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+          "dev": true
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+        }
       }
     },
-    "conventional-changelog-writer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
-      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+    "firebase-admin": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.4.2.tgz",
+      "integrity": "sha1-AC9YvirYkBIp5SXsVfpybRL5BOs=",
       "dev": true,
       "requires": {
-        "compare-func": "1.3.2",
-        "conventional-commits-filter": "1.0.0",
-        "dateformat": "1.0.12",
-        "handlebars": "4.0.11",
-        "json-stringify-safe": "5.0.1",
+        "@google-cloud/firestore": "0.8.2",
+        "@google-cloud/storage": "1.3.1",
+        "@types/google-cloud__storage": "1.1.5",
+        "@types/jsonwebtoken": "7.2.3",
+        "@types/node": "8.0.33",
+        "faye-websocket": "0.9.3",
+        "google-auth-library": "0.10.0",
+        "jsonwebtoken": "7.1.9",
         "lodash": "4.17.4",
-        "meow": "3.7.0",
-        "semver": "5.4.1",
-        "split": "1.0.1",
-        "through2": "2.0.3"
+        "node-forge": "0.7.1"
       },
       "dependencies": {
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+        "@google-cloud/common": {
+          "version": "0.13.6",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+          "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
           "dev": true,
           "requires": {
-            "get-stdin": "4.0.1",
-            "meow": "3.7.0"
+            "array-uniq": "1.0.3",
+            "arrify": "1.0.1",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "ent": "2.2.0",
+            "extend": "3.0.1",
+            "google-auto-auth": "0.7.2",
+            "is": "3.2.1",
+            "log-driver": "1.2.5",
+            "methmeth": "1.1.0",
+            "modelo": "4.2.0",
+            "request": "2.83.0",
+            "retry-request": "3.0.0",
+            "split-array-stream": "1.0.3",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
           }
         },
-        "split": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-          "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+        "@google-cloud/common-grpc": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.1.tgz",
+          "integrity": "sha1-CSZGB++4k0MJr/1jhJmG+7gPkhg=",
           "dev": true,
           "requires": {
-            "through": "2.3.8"
+            "@google-cloud/common": "0.13.6",
+            "dot-prop": "2.4.0",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "grpc": "1.6.6",
+            "is": "3.2.1",
+            "modelo": "4.2.0",
+            "retry-request": "3.0.0",
+            "through2": "2.0.3"
           }
-        }
-      }
-    },
-    "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": "2.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
-      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
-      "dev": true,
-      "requires": {
-        "is-text-path": "1.0.1",
-        "JSONStream": "1.3.1",
-        "lodash": "4.17.4",
-        "meow": "3.7.0",
-        "split2": "2.2.0",
-        "through2": "2.0.3",
-        "trim-off-newlines": "1.0.1"
-      }
-    },
-    "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=",
+        },
+        "@google-cloud/firestore": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
+          "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
+          "dev": true,
+          "requires": {
+            "@google-cloud/common": "0.13.6",
+            "@google-cloud/common-grpc": "0.4.1",
+            "bun": "0.0.12",
+            "extend": "3.0.1",
+            "functional-red-black-tree": "1.0.1",
+            "google-gax": "0.14.1",
+            "grpc": "1.6.6",
+            "is": "3.2.1",
+            "through2": "2.0.3"
+          }
+        },
+        "@google-cloud/storage": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
+          "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
+          "dev": true,
+          "requires": {
+            "@google-cloud/common": "0.13.6",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "safe-buffer": "5.1.1",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
+        "@protobufjs/aspromise": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+          "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
           "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
-    },
-    "copy-props": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-1.6.0.tgz",
-      "integrity": "sha1-8DJLvumXcRAeezraES8xPDk9uO0=",
-      "dev": true,
-      "requires": {
-        "each-props": "1.3.1",
-        "is-plain-object": "2.0.4"
-      }
-    },
-    "core-js": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
-    },
-    "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
-    },
-    "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-      "dev": true,
-      "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.10.0",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
-      }
-    },
-    "crc": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
-      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
-      "dev": true
-    },
-    "crc32-stream": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
-      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "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=",
+        },
+        "@protobufjs/base64": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+          "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+          "dev": true
+        },
+        "@protobufjs/codegen": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+          "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+          "dev": true
+        },
+        "@protobufjs/eventemitter": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+          "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
+          "dev": true
+        },
+        "@protobufjs/fetch": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+          "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+          "dev": true,
+          "requires": {
+            "@protobufjs/aspromise": "1.1.2",
+            "@protobufjs/inquire": "1.1.0"
+          }
+        },
+        "@protobufjs/float": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+          "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
+          "dev": true
+        },
+        "@protobufjs/inquire": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+          "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
+          "dev": true
+        },
+        "@protobufjs/path": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+          "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
+          "dev": true
+        },
+        "@protobufjs/pool": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+          "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
+          "dev": true
+        },
+        "@protobufjs/utf8": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+          "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
+          "dev": true
+        },
+        "@types/google-cloud__storage": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
+          "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
+          "dev": true,
+          "requires": {
+            "@types/node": "8.0.33"
+          }
+        },
+        "@types/jsonwebtoken": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
+          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "8.0.33"
+          }
+        },
+        "@types/long": {
+          "version": "3.0.32",
+          "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
+          "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
           "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=",
+        "@types/node": {
+          "version": "8.0.33",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.33.tgz",
+          "integrity": "sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.1",
-        "which": "1.3.0"
-      }
-    },
-    "cross-spawn-async": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-1.0.1.tgz",
-      "integrity": "sha1-u1JcHkINmUJVLgR5Gj6y2Yh6EF8=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "2.7.3",
-        "which": "1.3.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+        },
+        "arguejs": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
+          "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
           "dev": true
-        }
-      }
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "dev": true,
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
+        },
+        "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
+        },
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+          "dev": true
+        },
+        "ascli": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+          "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+          "dev": true,
+          "requires": {
+            "colour": "0.7.1",
+            "optjs": "3.2.2"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "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"
+          }
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+          "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
+        },
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
+          "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"
+          }
+        },
         "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
           "dev": true,
           "requires": {
             "hoek": "4.2.0"
           }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz",
-      "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=",
-      "dev": true
-    },
-    "css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-      "dev": true,
-      "requires": {
-        "css-tokenize": "1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "1.2.1",
-        "through2": "0.6.5"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+        },
+        "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"
+          }
+        },
+        "buffer-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+          "dev": true
+        },
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+          "dev": true
+        },
+        "bun": {
+          "version": "0.0.12",
+          "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
+          "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
+          "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
+            }
+          }
+        },
+        "bytebuffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+          "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.1.14"
+            "long": "3.2.0"
           }
         },
-        "isarray": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "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.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+          "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"
+          }
+        },
+        "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
+        },
+        "colour": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+          "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "concat-map": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true
         },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+        "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": {
-            "core-util-is": "1.0.2",
             "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "readable-stream": "2.3.3",
+            "typedarray": "0.0.6"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "configstore": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "4.2.0",
+            "graceful-fs": "4.1.11",
+            "make-dir": "1.0.0",
+            "unique-string": "1.0.0",
+            "write-file-atomic": "2.3.0",
+            "xdg-basedir": "3.0.0"
+          },
+          "dependencies": {
+            "dot-prop": {
+              "version": "4.2.0",
+              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+              "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+              "dev": true,
+              "requires": {
+                "is-obj": "1.0.1"
+              }
+            }
+          }
+        },
+        "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
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "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": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
+            "capture-stack-trace": "1.0.0"
+          }
+        },
+        "cryptiles": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+          "dev": true,
+          "requires": {
+            "boom": "5.2.0"
           },
           "dependencies": {
-            "readable-stream": {
-              "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
               "dev": true,
               "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "0.0.1",
-                "string_decoder": "0.10.31"
+                "hoek": "4.2.0"
               }
             }
           }
-        }
-      }
-    },
-    "css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "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=",
+        },
+        "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
         },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+        "dashdash": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "assert-plus": "1.0.0"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "dev": true,
-      "requires": {
-        "cssom": "0.3.2"
-      }
-    },
-    "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=",
+        },
+        "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
         },
-        "http-errors": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz",
-          "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=",
+        "dot-prop": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
+          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3",
-            "statuses": "1.4.0"
+            "is-obj": "1.0.1"
           }
-        }
-      }
-    },
-    "csv-streamify": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/csv-streamify/-/csv-streamify-3.0.4.tgz",
-      "integrity": "sha1-TLYUxX4/KZzKF7Y/3LStFnd39Ho=",
-      "dev": true,
-      "requires": {
-        "through2": "2.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=",
+        },
+        "duplexify": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
+            "end-of-stream": "1.4.0",
             "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "0.10.31",
-            "util-deprecate": "1.0.2"
+            "readable-stream": "2.3.3",
+            "stream-shift": "1.0.0"
+          }
+        },
+        "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"
           }
         },
-        "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": "2.0.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
-          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
           "dev": true,
           "requires": {
-            "readable-stream": "2.0.6",
-            "xtend": "4.0.1"
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.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
-    },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "0.10.35"
-      }
-    },
-    "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"
-      }
-    },
-    "dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
-    },
-    "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"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "mimic-response": "1.0.0"
-      }
-    },
-    "deep-equal": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
-      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
-      "dev": true,
-      "optional": 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
-        }
-      }
-    },
-    "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.1",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
-      "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
-    },
-    "dependency-tree": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-5.11.0.tgz",
-      "integrity": "sha1-koRk1vknNgfT9muaV+JZ5jVmd1U=",
-      "dev": true,
-      "requires": {
-        "commander": "2.11.0",
-        "debug": "2.6.7",
-        "filing-cabinet": "1.12.0",
-        "precinct": "3.8.0"
-      }
-    },
-    "deprecated": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-      "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-      "dev": true
-    },
-    "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"
-      }
-    },
-    "detective-amd": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-2.4.0.tgz",
-      "integrity": "sha1-XrDfTvXBipQDOwfa8TbbzV/HXNU=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "escodegen": "1.9.0",
-        "get-amd-module-type": "2.0.5",
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "detective-cjs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-2.0.0.tgz",
-      "integrity": "sha1-3OTJMCzcpS5ri/04d8qT9ixczAM=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "detective-es6": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-1.2.0.tgz",
-      "integrity": "sha1-a5s71Uf9jyH4lQL2JuRe0qMnb9w=",
-      "dev": true,
-      "requires": {
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "detective-less": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.0.tgz",
-      "integrity": "sha1-Qmx4yatuMnW/ZsyRq6wAU7tFLX0=",
-      "dev": true,
-      "requires": {
-        "debug": "2.2.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.0"
-      },
-      "dependencies": {
-        "debug": {
+        },
+        "end-of-stream": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+          "dev": true,
+          "requires": {
+            "once": "1.4.0"
+          }
+        },
+        "ent": {
           "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+          "dev": true
+        },
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+          "dev": true
+        },
+        "extsprintf": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+          "dev": true
+        },
+        "faye-websocket": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
           "dev": true,
           "requires": {
-            "ms": "0.7.1"
+            "websocket-driver": "0.7.0"
           }
         },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+        "forever-agent": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
           "dev": true
-        }
-      }
-    },
-    "detective-sass": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-2.0.1.tgz",
-      "integrity": "sha1-BWYKoblc/Yf1dGQ7+s4+iiaBEqE=",
-      "dev": true,
-      "requires": {
-        "debug": "3.1.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        },
+        "form-data": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
           }
-        }
-      }
-    },
-    "detective-scss": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-1.0.1.tgz",
-      "integrity": "sha1-dDJGoN01jZ2R/0ElQX9qd/vPJw8=",
-      "dev": true,
-      "requires": {
-        "debug": "3.1.0",
-        "gonzales-pe": "3.4.7",
-        "node-source-walk": "3.3.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+          "dev": true
+        },
+        "functional-red-black-tree": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+          "dev": true
+        },
+        "gcp-metadata": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "extend": "3.0.1",
+            "retry-request": "3.0.0"
           }
-        }
-      }
-    },
-    "detective-stylus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz",
-      "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
-      "dev": true
-    },
-    "detective-typescript": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-1.0.1.tgz",
-      "integrity": "sha512-4DZpsap+dVzQblcL/ffVXtaXtA7byrP14XQnvyAvwo8+z7/C0OrwLNQhyiC6cLZlzy2T8QuPc+mDsYsa4lAxHw==",
-      "dev": true,
-      "requires": {
-        "node-source-walk": "3.2.0",
-        "typescript": "2.0.10",
-        "typescript-eslint-parser": "1.0.2"
-      },
-      "dependencies": {
-        "babylon": {
-          "version": "6.8.4",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.4.tgz",
-          "integrity": "sha1-CXMGuNq66VFZIlzymz6lWRIFMYA=",
+        },
+        "gcs-resumable-upload": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
           "dev": true,
           "requires": {
-            "babel-runtime": "6.26.0"
+            "buffer-equal": "1.0.0",
+            "configstore": "3.1.1",
+            "google-auto-auth": "0.7.2",
+            "pumpify": "1.3.5",
+            "request": "2.83.0",
+            "stream-events": "1.0.2",
+            "through2": "2.0.3"
           }
         },
-        "node-source-walk": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-3.2.0.tgz",
-          "integrity": "sha1-PGBcxTq97ktFq2XpR9+x23yQ8OM=",
+        "getpass": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
           "dev": true,
           "requires": {
-            "babylon": "6.8.4"
+            "assert-plus": "1.0.0"
           }
         },
-        "typescript": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.10.tgz",
-          "integrity": "sha1-zN1O2G/VVQpAcQGggUAS4bP6w90=",
-          "dev": true
-        }
-      }
-    },
-    "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.4.0"
-      },
-      "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.22.0",
-      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.22.0.tgz",
-      "integrity": "sha1-ftB6+QdPZUeEclbBpltIiloXrQM=",
-      "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.1.2",
-        "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": "3.0.1",
-        "semver": "5.4.1",
-        "shelljs": "0.7.8",
-        "source-map-support": "0.4.18",
-        "spdx-license-list": "2.1.0",
-        "stringmap": "0.2.2",
-        "typescript": "2.4.2"
-      }
-    },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "didyoumean": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
-      "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=",
-      "dev": true
-    },
-    "diff": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
-      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
-      "dev": true
-    },
-    "doiuse": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz",
-      "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000748",
-        "css-rule-stream": "1.1.0",
-        "duplexer2": "0.0.2",
-        "jsonfilter": "1.1.2",
-        "ldjson-stream": "1.2.1",
-        "lodash": "4.17.4",
-        "multimatch": "2.1.0",
-        "postcss": "5.2.18",
-        "source-map": "0.4.4",
-        "through2": "0.6.5",
-        "yargs": "3.32.0"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+        "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"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.1.14"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.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
+        "google-auth-library": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+          "dev": true,
+          "requires": {
+            "gtoken": "1.2.2",
+            "jws": "3.1.4",
+            "lodash.noop": "3.0.1",
+            "request": "2.83.0"
+          }
         },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+        "google-auto-auth": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "async": "2.5.0",
+            "gcp-metadata": "0.3.1",
+            "google-auth-library": "0.10.0",
+            "request": "2.83.0"
           }
         },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+        "google-gax": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.1.tgz",
+          "integrity": "sha1-/oj7nVAw0mJ3xjUIp5r3s3F54Tk=",
           "dev": true,
           "requires": {
-            "amdefine": "1.0.1"
+            "extend": "3.0.1",
+            "globby": "6.1.0",
+            "google-auto-auth": "0.5.4",
+            "google-proto-files": "0.13.1",
+            "grpc": "1.6.6",
+            "is-stream-ended": "0.1.3",
+            "lodash": "4.17.4",
+            "process-nextick-args": "1.0.7",
+            "protobufjs": "6.8.0",
+            "readable-stream": "2.3.3",
+            "through2": "2.0.3"
+          },
+          "dependencies": {
+            "@types/node": {
+              "version": "7.0.43",
+              "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
+              "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==",
+              "dev": true
+            },
+            "google-auto-auth": {
+              "version": "0.5.4",
+              "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.5.4.tgz",
+              "integrity": "sha1-HYbHko1jPnWpwasDSlJ+/M5KQLE=",
+              "dev": true,
+              "requires": {
+                "async": "2.5.0",
+                "google-auth-library": "0.10.0",
+                "object-assign": "3.0.0",
+                "request": "2.83.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
+            },
+            "protobufjs": {
+              "version": "6.8.0",
+              "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+              "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+              "dev": true,
+              "requires": {
+                "@protobufjs/aspromise": "1.1.2",
+                "@protobufjs/base64": "1.1.2",
+                "@protobufjs/codegen": "2.0.4",
+                "@protobufjs/eventemitter": "1.1.0",
+                "@protobufjs/fetch": "1.1.0",
+                "@protobufjs/float": "1.0.2",
+                "@protobufjs/inquire": "1.1.0",
+                "@protobufjs/path": "1.1.2",
+                "@protobufjs/pool": "1.1.0",
+                "@protobufjs/utf8": "1.1.0",
+                "@types/long": "3.0.32",
+                "@types/node": "7.0.43",
+                "long": "3.2.0"
+              }
+            }
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "google-p12-pem": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+          "dev": true,
+          "requires": {
+            "node-forge": "0.7.1"
+          }
+        },
+        "google-proto-files": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
+          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
           "dev": true
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+          "dev": true
+        },
+        "grpc": {
+          "version": "1.6.6",
+          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
+          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
+            "arguejs": "0.2.3",
+            "lodash": "4.17.4",
+            "nan": "2.7.0",
+            "node-pre-gyp": "0.6.38",
+            "protobufjs": "5.0.2"
           },
           "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+              "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"
+              }
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+              "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"
+              }
+            },
+            "asn1": {
+              "version": "0.2.3",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+              "dev": true
+            },
+            "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
+            },
+            "asynckit": {
+              "version": "0.4.0",
+              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+              "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
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+              "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "caseless": {
+              "version": "0.12.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+              "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
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "extend": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+              "dev": true
+            },
+            "extsprintf": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+              "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
+            },
+            "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.17"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+              "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.2"
+              }
+            },
+            "fstream-ignore": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+              "dev": true,
+              "requires": {
+                "fstream": "1.0.11",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4"
+              }
+            },
+            "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.2.0",
+                "console-control-strings": "1.1.0",
+                "has-unicode": "2.0.1",
+                "object-assign": "4.1.1",
+                "signal-exit": "3.0.2",
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wide-align": "1.1.2"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "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"
+              }
+            },
+            "graceful-fs": {
+              "version": "4.1.11",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+              "dev": true
+            },
+            "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": "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"
+              }
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            },
+            "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.1",
+                "sshpk": "1.13.1"
+              }
+            },
+            "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
+            },
+            "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-typedarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+              "dev": true
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+              "dev": true
+            },
+            "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
+            },
+            "jsbn": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+              "dev": true,
+              "optional": 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
+            },
+            "jsonify": {
+              "version": "0.0.0",
+              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+              "dev": true
+            },
+            "jsprim": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+              "dev": true,
+              "requires": {
+                "assert-plus": "1.0.0",
+                "extsprintf": "1.3.0",
+                "json-schema": "0.2.3",
+                "verror": "1.10.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
+                }
+              }
+            },
+            "mime-db": {
+              "version": "1.30.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+              "dev": true
+            },
+            "mime-types": {
+              "version": "2.1.17",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+              "dev": true,
+              "requires": {
+                "mime-db": "1.30.0"
+              }
+            },
+            "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=",
+              "dev": true
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "dev": true,
+              "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=",
+                  "dev": true
+                }
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            },
+            "node-pre-gyp": {
+              "version": "0.6.38",
+              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
+              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
+              "dev": true,
+              "requires": {
+                "hawk": "3.1.3",
+                "mkdirp": "0.5.1",
+                "nopt": "4.0.1",
+                "npmlog": "4.1.2",
+                "rc": "1.2.1",
+                "request": "2.81.0",
+                "rimraf": "2.6.2",
+                "semver": "5.4.1",
+                "tar": "2.2.1",
+                "tar-pack": "3.4.0"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "dev": true,
+              "requires": {
+                "abbrev": "1.1.1",
+                "osenv": "0.1.4"
+              }
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "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-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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "punycode": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+              "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
+            },
+            "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"
+              }
+            },
             "readable-stream": {
-              "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "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"
+              }
+            },
+            "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.17",
+                "oauth-sign": "0.8.2",
+                "performance-now": "0.2.0",
+                "qs": "6.4.0",
+                "safe-buffer": "5.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.3",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+              "dev": true,
+              "requires": {
+                "glob": "7.1.2"
+              }
+            },
+            "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
+            },
+            "semver": {
+              "version": "5.4.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+              "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
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+              "dev": true
+            },
+            "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"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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-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
+            },
+            "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"
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "dev": true,
+              "requires": {
+                "debug": "2.6.9",
+                "fstream": "1.0.11",
+                "fstream-ignore": "1.0.5",
+                "once": "1.4.0",
+                "readable-stream": "2.3.3",
+                "rimraf": "2.6.2",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              }
+            },
+            "tough-cookie": {
+              "version": "2.3.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+              "dev": true,
+              "requires": {
+                "punycode": "1.4.1"
+              }
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "uid-number": {
+              "version": "0.0.6",
+              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+              "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
+            },
+            "uuid": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+              "dev": true
+            },
+            "verror": {
+              "version": "1.10.0",
+              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+              "dev": true,
+              "requires": {
+                "assert-plus": "1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "1.3.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
+                }
+              }
+            },
+            "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": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "0.0.1",
-                "string_decoder": "0.10.31"
+                "string-width": "1.0.2"
               }
-            }
-          }
-        }
-      }
-    },
-    "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
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "domino": {
-      "version": "1.0.30",
-      "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz",
-      "integrity": "sha512-ikq8WiDSkICdkElud317F2Sigc6A3EDpWsxWBwIZqOl95km4p/Vc9Rj98id7qKgsjDmExj0AVM7JOd4bb647Xg==",
-      "dev": true
-    },
-    "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.2"
-      }
-    },
-    "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-      "dev": true,
-      "requires": {
-        "is-obj": "1.0.1"
-      }
-    },
-    "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.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"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true,
-      "optional": true
-    },
-    "duplexify": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "1.4.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "stream-shift": "1.0.0"
-      }
-    },
-    "each-props": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.1.tgz",
-      "integrity": "sha1-/BOPUeOid0KG1IWOAtbn3kYt4Vg=",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "2.0.4",
-        "object.defaults": "1.1.0"
-      }
-    },
-    "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"
-      }
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-      "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-      "dev": true,
-      "requires": {
-        "base64url": "2.0.0",
-        "safe-buffer": "5.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.27",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
-      "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": "1.4.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "engine.io": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
-      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
-      "dev": true,
-      "requires": {
-        "accepts": "1.3.3",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "ws": "1.1.2"
-      },
-      "dependencies": {
-        "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.17",
-            "negotiator": "0.6.1"
-          }
-        },
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
-      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "2.3.3",
-        "engine.io-parser": "1.3.2",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parsejson": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "1.1.2",
-        "xmlhttprequest-ssl": "1.5.3",
-        "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+              "dev": true
+            }
+          }
         },
-        "debug": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
-          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+        "gtoken": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
+          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
           "dev": true,
           "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
-      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
-      "dev": true,
-      "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "0.0.6",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.4",
-        "has-binary": "0.1.7",
-        "wtf-8": "1.0.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz",
-      "integrity": "sha1-3xTAa1/F7sreEJTJxaErSz7cC2I=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.4.1",
-        "object-assign": "4.1.1",
-        "tapable": "0.2.8"
-      }
-    },
-    "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
-    },
-    "err-code": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-0.1.2.tgz",
-      "integrity": "sha1-EiqSszQrmJnaArWsmU0w+V1HY+4=",
-      "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-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.4",
-        "escape-html": "1.0.3"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.35",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
-      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=",
-      "dev": true
-    },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35"
-      }
-    },
-    "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.9.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
-      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
-      "dev": true,
-      "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        }
-      }
-    },
-    "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
-    },
-    "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.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.35"
-      }
-    },
-    "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"
-      }
-    },
-    "eventemitter3": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
-      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
-      "dev": true
-    },
-    "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-      "dev": true,
-      "optional": 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"
-      },
-      "dependencies": {
-        "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=",
+            "google-p12-pem": "0.1.2",
+            "jws": "3.1.4",
+            "mime": "1.4.1",
+            "request": "2.83.0"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "ajv": "5.2.3",
+            "har-schema": "2.0.0"
           }
-        }
-      }
-    },
-    "execall": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz",
-      "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=",
-      "dev": true,
-      "requires": {
-        "clone-regexp": "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
-    },
-    "exit-code": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/exit-code/-/exit-code-1.0.2.tgz",
-      "integrity": "sha1-zhZYEcnxF69qX4gpQLlq5/muzDQ=",
-      "dev": true
-    },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "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=",
+        "hash-stream-validation": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
           "dev": true,
           "requires": {
-            "expand-range": "0.1.1"
+            "through2": "2.0.3"
           }
         },
-        "expand-range": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
-          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+        "hawk": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
           "dev": true,
           "requires": {
-            "is-number": "0.1.1",
-            "repeat-string": "0.2.2"
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.0",
+            "sntp": "2.0.2"
           }
         },
-        "is-number": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
-          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+        "hoek": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
           "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=",
+        "http-parser-js": {
+          "version": "0.4.9",
+          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+          "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
           "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.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
-      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "accepts": "1.3.4",
-        "array-flatten": "1.1.1",
-        "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.8",
-        "depd": "1.1.1",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "finalhandler": "1.0.6",
-        "fresh": "0.5.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "1.1.5",
-        "qs": "6.5.0",
-        "range-parser": "1.2.0",
-        "send": "0.15.4",
-        "serve-static": "1.12.4",
-        "setprototypeof": "1.0.3",
-        "statuses": "1.3.1",
-        "type-is": "1.6.15",
-        "utils-merge": "1.0.0",
-        "vary": "1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
           }
         },
-        "qs": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
-          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
+        "imurmurhash": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+          "dev": true
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
         },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "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
+        },
+        "is": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
+          "dev": true
+        },
+        "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,
-          "optional": true
-        }
-      }
-    },
-    "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.2",
-        "uid-safe": "2.0.0",
-        "utils-merge": "1.0.0"
-      },
-      "dependencies": {
-        "cookie": {
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "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-stream-ended": {
           "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz",
-          "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
+          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
+          "dev": true
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
           "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"
-          }
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
-        "depd": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz",
-          "integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
           "dev": true
         },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+        "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
         },
-        "uid-safe": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz",
-          "integrity": "sha1-p/PGymSh9qXQTsDvPkw9U2cxcTc=",
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
           "dev": true,
           "requires": {
-            "base64-url": "1.2.1"
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            }
           }
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-      "dev": true
-    },
-    "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.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "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"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
           "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"
-          }
+          "optional": true
         },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+        "json-schema": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
           "dev": true
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-      "dev": true
-    },
-    "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
-    },
-    "fast-url-parser": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
-      "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "faye-websocket": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-      "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-      "dev": true,
-      "requires": {
-        "websocket-driver": "0.7.0"
-      }
-    },
-    "figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "1.0.5",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "1.3.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-exists": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-1.0.0.tgz",
-      "integrity": "sha1-5tJptWVnuJIlgTmOmQ3XB49y1hY=",
-      "dev": true
-    },
-    "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
-    },
-    "filesize": {
-      "version": "3.5.11",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
-      "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==",
-      "dev": true
-    },
-    "filing-cabinet": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-1.12.0.tgz",
-      "integrity": "sha1-b7k/2WjoO+3xtCmPKCNqiq/ffXg=",
-      "dev": true,
-      "requires": {
-        "app-module-path": "1.1.0",
-        "commander": "2.11.0",
-        "debug": "2.6.7",
-        "enhanced-resolve": "3.0.3",
-        "is-relative-path": "1.0.2",
-        "module-definition": "2.2.4",
-        "module-lookup-amd": "4.0.5",
-        "object-assign": "4.1.1",
-        "resolve": "1.4.0",
-        "resolve-dependency-path": "1.0.2",
-        "sass-lookup": "1.1.0",
-        "stylus-lookup": "1.0.2",
-        "typescript": "2.4.2"
-      }
-    },
-    "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"
-      }
-    },
-    "filled-array": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
-      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
-      "dev": true
-    },
-    "finalhandler": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
-      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "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": {
-            "ms": "2.0.0"
+            "jsonify": "0.0.0"
           }
         },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+        "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
-        }
-      }
-    },
-    "find": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/find/-/find-0.2.6.tgz",
-      "integrity": "sha1-DSGLXUjDQkGT9kzqWdOJ+NqnHQE=",
-      "dev": true,
-      "requires": {
-        "traverse-chain": "0.1.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": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "locate-path": "2.0.0"
-      }
-    },
-    "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"
-      }
-    },
-    "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.3.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=",
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+          "dev": true
+        },
+        "jsonwebtoken": {
+          "version": "7.1.9",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
+          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "1.0.1"
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "0.7.3",
+            "xtend": "4.0.1"
           }
-        }
-      }
-    },
-    "firebase": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.0.tgz",
-      "integrity": "sha512-lfVXLQiCNcNsmG7ZxQapQRdE/kZOjheBZVZ1MNK80GTsuK9RO7DYO5Qdf4K9Om8r7OBZ4nRp438kGkf24x7sOg==",
-      "dev": true,
-      "requires": {
-        "@firebase/app": "0.1.1",
-        "@firebase/auth": "0.2.0",
-        "@firebase/database": "0.1.2",
-        "@firebase/firestore": "0.1.2",
-        "@firebase/messaging": "0.1.2",
-        "@firebase/polyfill": "0.1.1",
-        "@firebase/storage": "0.1.1",
-        "dom-storage": "2.0.2",
-        "xmlhttprequest": "1.8.0"
-      },
-      "dependencies": {
-        "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
         },
-        "buffer-equal-constant-time": {
+        "jsprim": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
+          }
+        },
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "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"
+          }
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+          "dev": true
+        },
+        "lodash.noop": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
+          "dev": true
+        },
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
+          "dev": true
+        },
+        "log-driver": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
+          "dev": true
+        },
+        "long": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+          "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "methmeth": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.30.0"
+          }
+        },
+        "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"
+          }
+        },
+        "modelo": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
+          "dev": true
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
+          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
+          "dev": true
+        },
+        "nan": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+          "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+          "dev": true
+        },
+        "node-forge": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
+          "dev": true
+        },
+        "number-is-nan": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "dev": true
+        },
+        "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
         },
-        "dom-storage": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
-          "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
+        "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
         },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+        "once": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.1.1"
+            "wrappy": "1.0.2"
           }
         },
-        "faye-websocket": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+        "optjs": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
+          "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
+          "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": {
-            "websocket-driver": "0.6.5"
+            "lcid": "1.0.0"
           }
         },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+        "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
         },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo="
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true
         },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+        "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": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
+            "pinkie": "2.0.4"
           }
         },
-        "jsonwebtoken": {
-          "version": "7.4.3",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
-          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
+        "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
+        },
+        "protobufjs": {
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
+          "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
+          "dev": true,
           "requires": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "2.0.0",
-            "xtend": "4.0.1"
+            "ascli": "1.0.1",
+            "bytebuffer": "5.0.1",
+            "glob": "7.1.2",
+            "yargs": "3.32.0"
           }
         },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+        "pump": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+          "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.1"
+            "end-of-stream": "1.4.0",
+            "once": "1.4.0"
           }
         },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+        "pumpify": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+          "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.1.1"
+            "duplexify": "3.5.1",
+            "inherits": "2.0.3",
+            "pump": "1.0.2"
           }
         },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
         },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        "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"
+          }
         },
-        "promise-polyfill": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
-          "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
+        "request": {
+          "version": "2.83.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.1",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.1",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "retry-request": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
+          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
+          "dev": true,
+          "requires": {
+            "request": "2.83.0",
+            "through2": "2.0.3"
+          }
         },
         "safe-buffer": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+          "dev": true
         },
-        "topo": {
+        "signal-exit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+          "dev": true
+        },
+        "sntp": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "split-array-stream": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+          "dev": true,
+          "requires": {
+            "async": "2.5.0",
+            "is-stream-ended": "0.1.3"
+          }
+        },
+        "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"
+          }
+        },
+        "stream-events": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+          "dev": true,
+          "requires": {
+            "stubs": "3.0.0"
+          }
+        },
+        "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
+        },
+        "string-format-obj": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+          "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": {
-            "hoek": "2.16.3"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
-        "websocket-driver": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+        "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": {
-            "websocket-extensions": "0.1.1"
+            "safe-buffer": "5.1.1"
           }
         },
-        "websocket-extensions": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec="
-        },
-        "xmlhttprequest": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-          "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+        "stringstream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
           "dev": true
         },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-        }
-      }
-    },
-    "firebase-admin": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.4.2.tgz",
-      "integrity": "sha1-AC9YvirYkBIp5SXsVfpybRL5BOs=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/firestore": "0.8.2",
-        "@google-cloud/storage": "1.3.1",
-        "@types/google-cloud__storage": "1.1.5",
-        "@types/jsonwebtoken": "7.2.3",
-        "@types/node": "8.0.33",
-        "faye-websocket": "0.9.3",
-        "google-auth-library": "0.10.0",
-        "jsonwebtoken": "7.1.9",
-        "lodash": "4.17.4",
-        "node-forge": "0.7.1"
-      },
-      "dependencies": {
-        "@google-cloud/common": {
-          "version": "0.13.6",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
-          "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
+        "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": {
-            "array-uniq": "1.0.3",
-            "arrify": "1.0.1",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "ent": "2.2.0",
-            "extend": "3.0.1",
-            "google-auto-auth": "0.7.2",
-            "is": "3.2.1",
-            "log-driver": "1.2.5",
-            "methmeth": "1.1.0",
-            "modelo": "4.2.0",
-            "request": "2.83.0",
-            "retry-request": "3.0.0",
-            "split-array-stream": "1.0.3",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
+            "ansi-regex": "2.1.1"
           }
         },
-        "@google-cloud/storage": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
-          "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
+        "stubs": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "@google-cloud/common": "0.13.6",
-            "arrify": "1.0.1",
-            "async": "2.5.0",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "gcs-resumable-upload": "0.8.2",
-            "hash-stream-validation": "0.2.1",
-            "is": "3.2.1",
-            "mime-types": "2.1.17",
-            "once": "1.4.0",
-            "pumpify": "1.3.5",
-            "safe-buffer": "5.1.1",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
+            "readable-stream": "2.3.3",
+            "xtend": "4.0.1"
           }
         },
-        "@types/jsonwebtoken": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
-          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
           "dev": true,
           "requires": {
-            "@types/node": "8.0.33"
+            "hoek": "2.16.3"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            }
           }
         },
-        "@types/node": {
-          "version": "8.0.33",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.33.tgz",
-          "integrity": "sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==",
-          "dev": true
-        },
-        "ajv": {
-          "version": "5.2.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
           "dev": true,
           "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
+            "punycode": "1.4.1"
           }
         },
-        "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
+        "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"
+          }
         },
-        "arrify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-          "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
         },
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+        "typedarray": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
           "dev": true
         },
-        "assert-plus": {
+        "unique-string": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        },
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+          "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
           "dev": true,
           "requires": {
-            "lodash": "4.17.4"
+            "crypto-random-string": "1.0.0"
           }
         },
-        "asynckit": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-          "dev": true
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+        "util-deprecate": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "dev": true
         },
-        "aws4": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
           "dev": true
         },
-        "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
-          "dev": true
+        "verror": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "1.3.0"
+          }
         },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-          "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+        "websocket-driver": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "tweetnacl": "0.14.5"
+            "http-parser-js": "0.4.9",
+            "websocket-extensions": "0.1.2"
           }
         },
-        "boom": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+        "websocket-extensions": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+          "dev": true
+        },
+        "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
+        },
+        "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": {
-            "hoek": "4.2.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1"
           }
         },
-        "buffer-equal": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+        "wrappy": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "dev": true
         },
-        "buffer-equal-constant-time": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
-          "dev": true
+        "write-file-atomic": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "signal-exit": "3.0.2"
+          }
         },
-        "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=",
+        "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
         },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
           "dev": true
         },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
-        "combined-stream": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+        "yargs": {
+          "version": "3.32.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+          "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
           "dev": true,
           "requires": {
-            "delayed-stream": "1.0.0"
+            "camelcase": "2.1.1",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "os-locale": "1.4.0",
+            "string-width": "1.0.2",
+            "window-size": "0.1.4",
+            "y18n": "3.2.1"
           }
+        }
+      }
+    },
+    "firebase-tools": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.13.1.tgz",
+      "integrity": "sha1-LKgqXN1eiHxf6WHNgBnkqYdiX1o=",
+      "dev": true,
+      "requires": {
+        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
+        "JSONStream": "1.3.1",
+        "archiver": "0.16.0",
+        "chalk": "1.1.3",
+        "cjson": "0.3.3",
+        "cli-table": "0.3.1",
+        "commander": "2.11.0",
+        "configstore": "1.4.0",
+        "cross-spawn": "4.0.2",
+        "csv-streamify": "3.0.4",
+        "didyoumean": "1.2.1",
+        "es6-set": "0.1.5",
+        "exit-code": "1.0.2",
+        "filesize": "3.5.11",
+        "firebase": "2.4.2",
+        "fs-extra": "0.23.1",
+        "fstream-ignore": "1.0.5",
+        "glob": "7.1.2",
+        "google-auto-auth": "0.7.2",
+        "inquirer": "0.12.0",
+        "jsonschema": "1.2.0",
+        "jsonwebtoken": "7.4.3",
+        "lodash": "4.17.4",
+        "open": "0.0.5",
+        "ora": "0.2.3",
+        "portfinder": "0.4.0",
+        "progress": "2.0.0",
+        "request": "2.83.0",
+        "rsvp": "3.6.2",
+        "semver": "5.4.1",
+        "superstatic": "5.0.1",
+        "tar": "3.2.1",
+        "tmp": "0.0.27",
+        "universal-analytics": "0.3.11",
+        "update-notifier": "0.5.0",
+        "user-home": "2.0.0",
+        "uuid": "3.1.0",
+        "winston": "1.1.2"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
         },
-        "concat-stream": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-          "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.3",
-            "typedarray": "0.0.6"
+            "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"
           }
         },
         "configstore": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
+          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
           "dev": true,
           "requires": {
-            "dot-prop": "4.2.0",
             "graceful-fs": "4.1.11",
-            "make-dir": "1.0.0",
-            "unique-string": "1.0.0",
-            "write-file-atomic": "2.3.0",
-            "xdg-basedir": "3.0.0"
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "os-tmpdir": "1.0.2",
+            "osenv": "0.1.4",
+            "uuid": "2.0.3",
+            "write-file-atomic": "1.3.4",
+            "xdg-basedir": "2.0.0"
           },
           "dependencies": {
-            "dot-prop": {
-              "version": "4.2.0",
-              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-              "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-              "dev": true,
-              "requires": {
-                "is-obj": "1.0.1"
-              }
+            "uuid": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+              "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
-        },
-        "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"
-          }
-        },
-        "cryptiles": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+        "firebase": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
+          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
           "dev": true,
           "requires": {
-            "boom": "5.2.0"
+            "faye-websocket": "0.9.3"
           },
           "dependencies": {
-            "boom": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+            "faye-websocket": {
+              "version": "0.9.3",
+              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
               "dev": true,
               "requires": {
-                "hoek": "4.2.0"
+                "websocket-driver": "0.5.2"
+              },
+              "dependencies": {
+                "websocket-driver": {
+                  "version": "0.5.2",
+                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
+                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
+                  "dev": true,
+                  "requires": {
+                    "websocket-extensions": "0.1.1"
+                  },
+                  "dependencies": {
+                    "websocket-extensions": {
+                      "version": "0.1.1",
+                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+                      "dev": true
+                    }
+                  }
+                }
               }
             }
           }
         },
-        "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
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+        "fs-extra": {
+          "version": "0.23.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
+          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
           "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
-            }
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "path-is-absolute": "1.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=",
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
           "dev": true
         },
-        "dot-prop": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
-          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
-          "requires": {
-            "is-obj": "1.0.1"
-          }
+        "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
         },
-        "duplexify": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+        "winston": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.0",
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.3",
-            "stream-shift": "1.0.0"
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
           }
         },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-          "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+        "write-file-atomic": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
           }
         },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+        "xdg-basedir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
           "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.1.1"
+            "os-homedir": "1.0.2"
           }
-        },
-        "end-of-stream": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+        }
+      }
+    },
+    "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
+    },
+    "flat-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
+      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "1.1.1",
+        "as-array": "1.0.0",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isobject": "3.0.2"
+      },
+      "dependencies": {
+        "as-array": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
+          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
           "dev": true,
           "requires": {
-            "once": "1.4.0"
+            "lodash.isarguments": "2.4.1",
+            "lodash.isobject": "2.4.1",
+            "lodash.values": "2.4.1"
+          },
+          "dependencies": {
+            "lodash.isarguments": {
+              "version": "2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
+              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
+              "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"
+              }
+            }
           }
         },
-        "ent": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+        "lodash.isobject": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
           "dev": true
-        },
-        "extend": {
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "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"
+      }
+    },
+    "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.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": 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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-          "dev": true
-        },
-        "extsprintf": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
+    "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.7.0",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "faye-websocket": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "websocket-driver": "0.7.0"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
-        "forever-agent": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
           "dev": true
         },
-        "form-data": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-          "dev": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.17"
-          }
-        },
-        "gcp-metadata": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "extend": "3.0.1",
-            "retry-request": "3.0.0"
-          }
+          "optional": true
         },
-        "gcs-resumable-upload": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "buffer-equal": "1.0.0",
-            "configstore": "3.1.1",
-            "google-auto-auth": "0.7.2",
-            "pumpify": "1.3.5",
-            "request": "2.83.0",
-            "stream-events": "1.0.2",
-            "through2": "2.0.3"
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
           }
         },
-        "getpass": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
           "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
-            }
-          }
+          "optional": true
         },
-        "google-auth-library": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "gtoken": "1.2.2",
-            "jws": "3.1.4",
-            "lodash.noop": "3.0.1",
-            "request": "2.83.0"
-          }
+          "optional": true
         },
-        "google-auto-auth": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "async": "2.5.0",
-            "gcp-metadata": "0.3.1",
-            "google-auth-library": "0.10.0",
-            "request": "2.83.0"
-          }
+          "optional": true
         },
-        "google-p12-pem": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "node-forge": "0.7.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "dev": true
+          "optional": true
         },
-        "gtoken": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "google-p12-pem": "0.1.2",
-            "jws": "3.1.4",
-            "mime": "1.4.1",
-            "request": "2.83.0"
-          }
+          "optional": true
         },
-        "har-schema": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
           "dev": true
         },
-        "har-validator": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "ajv": "5.2.3",
-            "har-schema": "2.0.0"
+            "tweetnacl": "0.14.5"
           }
         },
-        "hash-stream-validation": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "through2": "2.0.3"
+            "inherits": "2.0.3"
           }
         },
-        "hawk": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "boom": "4.3.1",
-            "cryptiles": "3.1.2",
-            "hoek": "4.2.0",
-            "sntp": "2.0.2"
+            "hoek": "2.16.3"
           }
         },
-        "hoek": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.13.1"
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
           }
         },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-          "dev": true
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "is": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-          "dev": true
-        },
-        "is-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-        },
-        "is-stream-ended": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
-          "dev": true
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-          "dev": true
-        },
-        "isarray": {
+        "buffer-shims": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-          "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+          "bundled": true,
           "dev": true
         },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
-          },
-          "dependencies": {
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            }
-          }
+          "optional": true
         },
-        "jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
-        "json-schema": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
           "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=",
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "jsonify": "0.0.0"
+            "delayed-stream": "1.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=",
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
           "dev": true
         },
-        "jsonify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
           "dev": true
         },
-        "jsonwebtoken": {
-          "version": "7.1.9",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
-          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "0.7.3",
-            "xtend": "4.0.1"
+            "boom": "2.10.1"
           }
         },
-        "jsprim": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
+            "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
+              "bundled": true,
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.1"
+            "ms": "2.0.0"
           }
         },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        },
-        "lodash.noop": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
-          "dev": true
-        },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
-          "dev": true
+          "optional": true
         },
-        "log-driver": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
           "dev": true
         },
-        "make-dir": {
+        "delegates": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-          "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "pify": "2.3.0"
+            "jsbn": "0.1.1"
           }
         },
-        "methmeth": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
-          "dev": true
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true
         },
-        "mime-db": {
-          "version": "1.30.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-          "dev": true
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "mime-types": {
-          "version": "2.1.17",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "mime-db": "1.30.0"
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
           }
         },
-        "modelo": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
-          "dev": true
-        },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
           "dev": true
         },
-        "ms": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
-          "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"
+          }
         },
-        "node-forge": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
-          "dev": true
+        "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"
+          }
         },
-        "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
+        "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"
+          }
         },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
           }
         },
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-          "dev": 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"
+          }
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
           "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
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "pump": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "end-of-stream": "1.4.0",
-            "once": "1.4.0"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
-        "pumpify": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "duplexify": "3.5.1",
-            "inherits": "2.0.3",
-            "pump": "1.0.2"
-          }
+          "optional": true
         },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": 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"
+          }
         },
-        "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
           "dev": true
         },
-        "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==",
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
           "dev": true,
+          "optional": 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"
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
           }
         },
-        "request": {
-          "version": "2.83.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "aws-sign2": "0.7.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.3.1",
-            "har-validator": "5.0.3",
-            "hawk": "6.0.2",
-            "http-signature": "1.2.0",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.17",
-            "oauth-sign": "0.8.2",
-            "performance-now": "2.1.0",
-            "qs": "6.5.1",
-            "safe-buffer": "5.1.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.1.0"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
-        "retry-request": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
-          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
+        "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": {
-            "request": "2.83.0",
-            "through2": "2.0.3"
+            "number-is-nan": "1.0.1"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
           "dev": true
         },
-        "slide": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-          "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc="
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "sntp": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "hoek": "4.2.0"
+            "jsbn": "0.1.1"
           }
         },
-        "split-array-stream": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+        "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": {
-            "async": "2.5.0",
-            "is-stream-ended": "0.1.3"
+            "jsonify": "0.0.0"
           }
         },
-        "sshpk": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-          "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+        "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": {
-            "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"
+            "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
+              "bundled": true,
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "stream-events": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "stubs": "3.0.0"
+            "mime-db": "1.27.0"
           }
         },
-        "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
-        },
-        "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==",
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "brace-expansion": "1.1.7"
           }
         },
-        "string-format-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
           "dev": true
         },
-        "stringstream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-          "dev": true
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
         },
-        "stubs": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
-          "dev": true
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
+            "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"
           }
         },
-        "topo": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "hoek": "2.16.3"
-          },
-          "dependencies": {
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            }
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
           }
         },
-        "tough-cookie": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "punycode": "1.4.1"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+        "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": {
-            "safe-buffer": "5.1.1"
+            "wrappy": "1.0.2"
           }
         },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
-        "typedarray": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-          "dev": true
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "unique-string": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-          "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "crypto-random-string": "1.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
           "dev": true
         },
-        "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
           "dev": true
         },
-        "verror": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+        "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": {
-            "assert-plus": "1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "1.3.0"
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "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
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "websocket-driver": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "http-parser-js": "0.4.9",
-            "websocket-extensions": "0.1.2"
+            "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"
           }
         },
-        "websocket-extensions": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
-          "dev": true
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+        "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"
+          }
         },
-        "write-file-atomic": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "signal-exit": "3.0.2"
+            "glob": "7.1.2"
           }
         },
-        "xdg-basedir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-          "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
           "dev": true
         },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
-      }
-    },
-    "firebase-tools": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.13.1.tgz",
-      "integrity": "sha1-LKgqXN1eiHxf6WHNgBnkqYdiX1o=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
-        "archiver": "0.16.0",
-        "chalk": "1.1.3",
-        "cjson": "0.3.3",
-        "cli-table": "0.3.1",
-        "commander": "2.11.0",
-        "configstore": "1.4.0",
-        "cross-spawn": "4.0.2",
-        "csv-streamify": "3.0.4",
-        "didyoumean": "1.2.1",
-        "es6-set": "0.1.5",
-        "exit-code": "1.0.2",
-        "filesize": "3.5.11",
-        "firebase": "2.4.2",
-        "fs-extra": "0.23.1",
-        "fstream-ignore": "1.0.5",
-        "glob": "7.1.2",
-        "google-auto-auth": "0.7.2",
-        "inquirer": "0.12.0",
-        "jsonschema": "1.2.0",
-        "JSONStream": "1.3.1",
-        "jsonwebtoken": "7.4.3",
-        "lodash": "4.17.4",
-        "open": "0.0.5",
-        "ora": "0.2.3",
-        "portfinder": "0.4.0",
-        "progress": "2.0.0",
-        "request": "2.83.0",
-        "rsvp": "3.6.2",
-        "semver": "5.4.1",
-        "superstatic": "5.0.1",
-        "tar": "3.2.1",
-        "tmp": "0.0.27",
-        "universal-analytics": "0.3.11",
-        "update-notifier": "0.5.0",
-        "user-home": "2.0.0",
-        "uuid": "3.1.0",
-        "winston": "1.1.2"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
-          "dev": true
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
           "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"
-          }
+          "optional": true
         },
-        "configstore": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
-          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "mkdirp": "0.5.1",
-            "object-assign": "4.1.1",
-            "os-tmpdir": "1.0.2",
-            "osenv": "0.1.4",
-            "uuid": "2.0.3",
-            "write-file-atomic": "1.3.4",
-            "xdg-basedir": "2.0.0"
-          },
-          "dependencies": {
-            "uuid": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-              "dev": true
-            }
+            "hoek": "2.16.3"
           }
         },
-        "firebase": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
-          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "faye-websocket": "0.9.3"
-          },
-          "dependencies": {
-            "faye-websocket": {
-              "version": "0.9.3",
-              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-              "dev": true,
-              "requires": {
-                "websocket-driver": "0.5.2"
-              },
-              "dependencies": {
-                "websocket-driver": {
-                  "version": "0.5.2",
-                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
-                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
-                  "dev": true,
-                  "requires": {
-                    "websocket-extensions": "0.1.1"
-                  },
-                  "dependencies": {
-                    "websocket-extensions": {
-                      "version": "0.1.1",
-                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-                      "dev": true
-                    }
-                  }
-                }
-              }
+            "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
             }
           }
         },
-        "fs-extra": {
-          "version": "0.23.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
-          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.1"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
-        "pkginfo": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
-          "dev": true
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
         },
-        "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
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "winston": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
+            "ansi-regex": "2.1.1"
           }
         },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
           }
         },
-        "xdg-basedir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "os-homedir": "1.0.2"
+            "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"
           }
-        }
-      }
-    },
-    "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
-    },
-    "flat-arguments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "1.1.1",
-        "as-array": "1.0.0",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isobject": "3.0.2"
-      },
-      "dependencies": {
-        "as-array": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "lodash.isarguments": "2.4.1",
-            "lodash.isobject": "2.4.1",
-            "lodash.values": "2.4.1"
-          },
-          "dependencies": {
-            "lodash.isarguments": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
-              "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"
-              }
-            }
+            "punycode": "1.4.1"
           }
         },
-        "lodash.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
-          "dev": true
-        }
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "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"
-      }
-    },
-    "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.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "dev": true,
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true,
-      "optional": 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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
-      },
-      "dependencies": {
-        "jsonfile": {
+        "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",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "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
         }
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -8029,12 +8351,6 @@
         "minimatch": "3.0.4"
       }
     },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
     "gather-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
@@ -8577,67 +8893,6 @@
         }
       }
     },
-    "google-gax": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.2.tgz",
-      "integrity": "sha1-Kx8rhui+mKYgBBzucQ5PTOYbbis=",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.1",
-        "globby": "6.1.0",
-        "google-auto-auth": "0.7.2",
-        "google-proto-files": "0.13.1",
-        "grpc": "1.4.1",
-        "is-stream-ended": "0.1.3",
-        "lodash": "4.17.4",
-        "process-nextick-args": "1.0.7",
-        "protobufjs": "6.8.0",
-        "readable-stream": "2.3.3",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "google-proto-files": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
-          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
-          "dev": true
-        },
-        "protobufjs": {
-          "version": "6.8.0",
-          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
-          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
-          "dev": true,
-          "requires": {
-            "@protobufjs/aspromise": "1.1.2",
-            "@protobufjs/base64": "1.1.2",
-            "@protobufjs/codegen": "2.0.4",
-            "@protobufjs/eventemitter": "1.1.0",
-            "@protobufjs/fetch": "1.1.0",
-            "@protobufjs/float": "1.0.2",
-            "@protobufjs/inquire": "1.1.0",
-            "@protobufjs/path": "1.1.2",
-            "@protobufjs/pool": "1.1.0",
-            "@protobufjs/utf8": "1.1.0",
-            "@types/long": "3.0.32",
-            "@types/node": "7.0.46",
-            "long": "3.2.0"
-          }
-        }
-      }
-    },
     "google-p12-pem": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
@@ -8727,6 +8982,7 @@
       "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.4.1.tgz",
       "integrity": "sha1-PuSoNGphPygjkoyfj5kIG2No7Hw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "arguejs": "0.2.3",
         "lodash": "4.17.4",
@@ -8740,6 +8996,7 @@
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
           "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
           "dev": true,
+          "optional": true,
           "requires": {
             "mkdirp": "0.5.1",
             "nopt": "4.0.1",
@@ -8774,6 +9031,7 @@
               "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
               "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "abbrev": "1.1.0",
                 "osenv": "0.1.4"
@@ -8783,13 +9041,15 @@
                   "version": "1.1.0",
                   "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
                   "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "osenv": {
                   "version": "0.1.4",
                   "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
                   "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "os-homedir": "1.0.2",
                     "os-tmpdir": "1.0.2"
@@ -8799,13 +9059,15 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
                       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     },
                     "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
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 }
@@ -8816,6 +9078,7 @@
               "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
               "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "are-we-there-yet": "1.1.4",
                 "console-control-strings": "1.1.0",
@@ -8828,6 +9091,7 @@
                   "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
                   "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "delegates": "1.0.0",
                     "readable-stream": "2.3.2"
@@ -8837,13 +9101,15 @@
                       "version": "1.0.0",
                       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
                       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     },
                     "readable-stream": {
                       "version": "2.3.2",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
                       "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "core-util-is": "1.0.2",
                         "inherits": "2.0.3",
@@ -8858,25 +9124,29 @@
                           "version": "1.0.2",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-                          "dev": true
+                          "dev": true,
+                          "optional": true
                         },
                         "inherits": {
                           "version": "2.0.3",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                          "dev": true
+                          "dev": true,
+                          "optional": true
                         },
                         "isarray": {
                           "version": "1.0.0",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
                           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                          "dev": true
+                          "dev": true,
+                          "optional": 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
+                          "dev": true,
+                          "optional": true
                         },
                         "safe-buffer": {
                           "version": "5.1.1",
@@ -8889,6 +9159,7 @@
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
                           "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
                           "dev": true,
+                          "optional": true,
                           "requires": {
                             "safe-buffer": "5.1.1"
                           }
@@ -8897,7 +9168,8 @@
                           "version": "1.0.2",
                           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
                           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                          "dev": true
+                          "dev": true,
+                          "optional": true
                         }
                       }
                     }
@@ -8914,6 +9186,7 @@
                   "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
                   "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "aproba": "1.1.2",
                     "console-control-strings": "1.1.0",
@@ -8929,25 +9202,29 @@
                       "version": "1.1.2",
                       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
                       "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     },
                     "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
+                      "dev": true,
+                      "optional": 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
+                      "dev": true,
+                      "optional": 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
+                      "dev": true,
+                      "optional": true
                     },
                     "string-width": {
                       "version": "1.0.2",
@@ -9007,6 +9284,7 @@
                       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
                       "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "string-width": "1.0.2"
                       }
@@ -9017,7 +9295,8 @@
                   "version": "2.0.0",
                   "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
                   "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 }
               }
             },
@@ -9026,6 +9305,7 @@
               "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
               "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "deep-extend": "0.4.2",
                 "ini": "1.3.4",
@@ -9037,25 +9317,29 @@
                   "version": "0.4.2",
                   "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
                   "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "ini": {
                   "version": "1.3.4",
                   "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
                   "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "minimist": {
                   "version": "1.2.0",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
                   "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "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
+                  "dev": true,
+                  "optional": true
                 }
               }
             },
@@ -9064,6 +9348,7 @@
               "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
               "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "aws-sign2": "0.6.0",
                 "aws4": "1.6.0",
@@ -9093,19 +9378,22 @@
                   "version": "0.6.0",
                   "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
                   "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "aws4": {
                   "version": "1.6.0",
                   "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
                   "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "caseless": {
                   "version": "0.12.0",
                   "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
                   "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "combined-stream": {
                   "version": "1.0.5",
@@ -9128,19 +9416,22 @@
                   "version": "3.0.1",
                   "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
                   "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-                  "dev": true
+                  "dev": true,
+                  "optional": 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
+                  "dev": true,
+                  "optional": 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,
+                  "optional": true,
                   "requires": {
                     "asynckit": "0.4.0",
                     "combined-stream": "1.0.5",
@@ -9151,7 +9442,8 @@
                       "version": "0.4.0",
                       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
                       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 },
@@ -9160,6 +9452,7 @@
                   "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
                   "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "ajv": "4.11.8",
                     "har-schema": "1.0.5"
@@ -9170,6 +9463,7 @@
                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
                       "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "co": "4.6.0",
                         "json-stable-stringify": "1.0.1"
@@ -9179,13 +9473,15 @@
                           "version": "4.6.0",
                           "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
                           "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-                          "dev": true
+                          "dev": true,
+                          "optional": 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,
+                          "optional": true,
                           "requires": {
                             "jsonify": "0.0.0"
                           },
@@ -9194,7 +9490,8 @@
                               "version": "0.0.0",
                               "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
                               "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-                              "dev": true
+                              "dev": true,
+                              "optional": true
                             }
                           }
                         }
@@ -9204,7 +9501,8 @@
                       "version": "1.0.5",
                       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
                       "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 },
@@ -9213,6 +9511,7 @@
                   "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
                   "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "boom": "2.10.1",
                     "cryptiles": "2.0.5",
@@ -9234,6 +9533,7 @@
                       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
                       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "boom": "2.10.1"
                       }
@@ -9249,6 +9549,7 @@
                       "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
                       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "hoek": "2.16.3"
                       }
@@ -9260,6 +9561,7 @@
                   "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
                   "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "assert-plus": "0.2.0",
                     "jsprim": "1.4.0",
@@ -9270,13 +9572,15 @@
                       "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
+                      "dev": true,
+                      "optional": true
                     },
                     "jsprim": {
                       "version": "1.4.0",
                       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
                       "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "assert-plus": "1.0.0",
                         "extsprintf": "1.0.2",
@@ -9288,7 +9592,8 @@
                           "version": "1.0.0",
                           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
                           "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                          "dev": true
+                          "dev": true,
+                          "optional": true
                         },
                         "extsprintf": {
                           "version": "1.0.2",
@@ -9300,13 +9605,15 @@
                           "version": "0.2.3",
                           "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
                           "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-                          "dev": true
+                          "dev": true,
+                          "optional": 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,
+                          "optional": true,
                           "requires": {
                             "extsprintf": "1.0.2"
                           }
@@ -9318,6 +9625,7 @@
                       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
                       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "asn1": "0.2.3",
                         "assert-plus": "1.0.0",
@@ -9333,7 +9641,8 @@
                           "version": "0.2.3",
                           "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
                           "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-                          "dev": true
+                          "dev": true,
+                          "optional": true
                         },
                         "assert-plus": {
                           "version": "1.0.0",
@@ -9356,6 +9665,7 @@
                           "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
                           "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
                           "dev": true,
+                          "optional": true,
                           "requires": {
                             "assert-plus": "1.0.0"
                           }
@@ -9375,6 +9685,7 @@
                           "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
                           "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
                           "dev": true,
+                          "optional": true,
                           "requires": {
                             "assert-plus": "1.0.0"
                           }
@@ -9401,19 +9712,22 @@
                   "version": "1.0.0",
                   "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
                   "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "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
+                  "dev": true,
+                  "optional": true
                 },
                 "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
+                  "dev": true,
+                  "optional": true
                 },
                 "mime-types": {
                   "version": "2.1.15",
@@ -9436,19 +9750,22 @@
                   "version": "0.8.2",
                   "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
                   "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-                  "dev": true
+                  "dev": true,
+                  "optional": 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
+                  "dev": true,
+                  "optional": 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
+                  "dev": true,
+                  "optional": true
                 },
                 "safe-buffer": {
                   "version": "5.1.1",
@@ -9460,13 +9777,15 @@
                   "version": "0.0.5",
                   "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
                   "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 },
                 "tough-cookie": {
                   "version": "2.3.2",
                   "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
                   "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "punycode": "1.4.1"
                   },
@@ -9475,7 +9794,8 @@
                       "version": "1.4.1",
                       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
                       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 },
@@ -9484,6 +9804,7 @@
                   "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
                   "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "safe-buffer": "5.1.1"
                   }
@@ -9492,7 +9813,8 @@
                   "version": "3.1.0",
                   "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
                   "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 }
               }
             },
@@ -9615,7 +9937,8 @@
               "version": "5.3.0",
               "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
               "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "tar": {
               "version": "2.2.1",
@@ -9670,6 +9993,7 @@
               "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
               "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "debug": "2.6.8",
                 "fstream": "1.0.11",
@@ -9686,6 +10010,7 @@
                   "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
                   "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "ms": "2.0.0"
                   },
@@ -9694,7 +10019,8 @@
                       "version": "2.0.0",
                       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
                       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 },
@@ -9729,6 +10055,7 @@
                   "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
                   "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "fstream": "1.0.11",
                     "inherits": "2.0.3",
@@ -9739,13 +10066,15 @@
                       "version": "2.0.3",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     },
                     "minimatch": {
                       "version": "3.0.4",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
                       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "brace-expansion": "1.1.8"
                       },
@@ -9755,6 +10084,7 @@
                           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
                           "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
                           "dev": true,
+                          "optional": true,
                           "requires": {
                             "balanced-match": "1.0.0",
                             "concat-map": "0.0.1"
@@ -9764,13 +10094,15 @@
                               "version": "1.0.0",
                               "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
                               "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-                              "dev": true
+                              "dev": true,
+                              "optional": 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
+                              "dev": true,
+                              "optional": true
                             }
                           }
                         }
@@ -9783,6 +10115,7 @@
                   "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
                   "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "wrappy": "1.0.2"
                   },
@@ -9791,7 +10124,8 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 },
@@ -9800,6 +10134,7 @@
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
                   "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
                   "dev": true,
+                  "optional": true,
                   "requires": {
                     "core-util-is": "1.0.2",
                     "inherits": "2.0.3",
@@ -9814,25 +10149,29 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     },
                     "inherits": {
                       "version": "2.0.3",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     },
                     "isarray": {
                       "version": "1.0.0",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
                       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                      "dev": true
+                      "dev": true,
+                      "optional": 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
+                      "dev": true,
+                      "optional": true
                     },
                     "safe-buffer": {
                       "version": "5.1.1",
@@ -9845,6 +10184,7 @@
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
                       "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
                       "dev": true,
+                      "optional": true,
                       "requires": {
                         "safe-buffer": "5.1.1"
                       }
@@ -9853,7 +10193,8 @@
                       "version": "1.0.2",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
                       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                      "dev": true
+                      "dev": true,
+                      "optional": true
                     }
                   }
                 },
@@ -9861,7 +10202,8 @@
                   "version": "0.0.6",
                   "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
                   "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-                  "dev": true
+                  "dev": true,
+                  "optional": true
                 }
               }
             }
@@ -12026,6 +12368,16 @@
         "through2": "0.6.5"
       },
       "dependencies": {
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -12038,16 +12390,6 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -12112,16 +12454,6 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
-      }
-    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -12955,7 +13287,8 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
       "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "longest": {
       "version": "1.0.1",
@@ -14282,7 +14615,8 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
       "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "ora": {
       "version": "0.2.3",
@@ -14998,6 +15332,7 @@
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
       "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "ascli": "1.0.1",
         "bytebuffer": "5.0.1",
@@ -16895,15 +17230,6 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -16937,6 +17263,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "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"
+      }
+    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
diff --git a/package.json b/package.json
index 1b9e5dbf7324..84fa85760cd8 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@types/glob": "^5.0.33",
     "@types/gulp": "3.8.32",
     "@types/hammerjs": "^2.0.35",
-    "@types/jasmine": "2.5.45",
+    "@types/jasmine": "^2.6.0",
     "@types/merge2": "^0.3.30",
     "@types/minimist": "^1.2.0",
     "@types/node": "^7.0.21",
@@ -87,7 +87,7 @@
     "highlight.js": "^9.11.0",
     "http-rewrite-middleware": "^0.1.6",
     "image-diff": "^1.6.3",
-    "jasmine-core": "^2.6.2",
+    "jasmine-core": "^2.8.0",
     "jsonwebtoken": "^7.4.1",
     "karma": "^1.7.1",
     "karma-browserstack-launcher": "^1.3.0",
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index 002b25c19ebf..5ed869374b5d 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -66,7 +66,7 @@ describe('CdkTable', () => {
     it('with a rendered header with the right number of header cells', () => {
       const header = getHeaderRow(tableElement);
 
-      expect(header).not.toBe(undefined);
+      expect(header).toBeTruthy();
       expect(header.classList).toContain('customHeaderRowClass');
       expect(getHeaderCells(tableElement).length).toBe(component.columnsToRender.length);
     });
@@ -488,7 +488,7 @@ describe('CdkTable', () => {
     ]);
 
     // Remove the data source and check to make sure the table is empty again.
-    component.dataSource = null;
+    component.dataSource = undefined;
     dynamicDataSourceFixture.detectChanges();
 
     // Expect that the old data source has been disconnected.
@@ -696,7 +696,7 @@ class BooleanDataSource extends DataSource<boolean> {
   `
 })
 class SimpleCdkTableApp {
-  dataSource: FakeDataSource | null = new FakeDataSource();
+  dataSource: FakeDataSource | undefined = new FakeDataSource();
   columnsToRender = ['column_a', 'column_b', 'column_c'];
 
   @ViewChild(CdkTable) table: CdkTable<TestData>;
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 926ad8a95b7b..f1b84b2675ad 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -223,7 +223,7 @@ describe('MatInput without forms', function () {
         fixture.debugElement.query(By.css('label')).nativeElement;
 
     expect(inputElement.id).toBeTruthy();
-    expect(inputElement.id).toEqual(labelElement.getAttribute('for'));
+    expect(inputElement.id).toEqual(labelElement.getAttribute('for')!);
   });
 
   it('should add aria-owns to the label for the associated control', () => {
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index f73544968287..cc4f82bc7875 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -75,6 +75,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   protected _uid = `mat-input-${nextUniqueId++}`;
   protected _previousNativeValue: any;
   private _readonly = false;
+  private _inputValueAccessor: {value: any};
 
   /** Whether the input is focused. */
   focused = false;
@@ -161,11 +162,10 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
               @Optional() protected _parentForm: NgForm,
               @Optional() protected _parentFormGroup: FormGroupDirective,
               private _defaultErrorStateMatcher: ErrorStateMatcher,
-              @Optional() @Self() @Inject(MAT_INPUT_VALUE_ACCESSOR)
-                  private _inputValueAccessor: {value: any}) {
+              @Optional() @Self() @Inject(MAT_INPUT_VALUE_ACCESSOR) inputValueAccessor: any) {
     // If no input value accessor was explicitly specified, use the element as the input value
     // accessor.
-    this._inputValueAccessor = this._inputValueAccessor || this._elementRef.nativeElement;
+    this._inputValueAccessor = inputValueAccessor || this._elementRef.nativeElement;
 
     this._previousNativeValue = this.value;
 
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 082257508200..39945f0c238a 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -203,7 +203,7 @@ describe('MatMenu', () => {
     triggerEl.click();
     fixture.detectChanges();
 
-    const panel = overlayContainerElement.querySelector('.mat-menu-panel');
+    const panel = overlayContainerElement.querySelector('.mat-menu-panel')!;
 
     expect(panel).toBeTruthy('Expected the panel to be rendered.');
     expect(document.activeElement).toBe(panel, 'Expected the panel to be focused.');
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 9f2732d6a480..e1b0625bb95f 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -1032,7 +1032,7 @@ describe('MatSelect', () => {
       fixture.detectChanges();
 
       expect(fixture.componentInstance.customAccessor.select.ngControl)
-          .toBe(null, 'Expected mat-select NOT to inherit control from parent value accessor.');
+          .toBeFalsy('Expected mat-select NOT to inherit control from parent value accessor.');
       expect(fixture.componentInstance.customAccessor.writeValue).toHaveBeenCalled();
     }));
   });

From b959014ca54e1278c46741dd9c66b04584e25ea8 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 14 Nov 2017 17:40:45 +0100
Subject: [PATCH 474/575] chore(tooltip): unit test failures (#8385)

* Fixes a regression in the tooltip that was introduced by 0719c3866225874c2d900ece2554612675ce4d0b which caused the tests to fail.
* Avoids issues in the future where failures in some tooltip tests can cause Jasmine to throw the browser into an infinite loop by trying to stringify a circular object.
---
 src/lib/tooltip/tooltip.spec.ts | 46 +++++++++++++++++++--------------
 src/lib/tooltip/tooltip.ts      |  3 ++-
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 951a5d50baed..1c2b481eec63 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -53,7 +53,7 @@ describe('MatTooltip', () => {
           return {getContainerElement: () => overlayContainerElement};
         }},
         {provide: Directionality, useFactory: () => {
-          return dir = { value: 'ltr' };
+          return dir = {value: 'ltr'};
         }}
       ]
     });
@@ -80,7 +80,7 @@ describe('MatTooltip', () => {
     });
 
     it('should show and hide the tooltip', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.show();
       tick(0); // Tick for the show delay (default is 0)
@@ -110,7 +110,7 @@ describe('MatTooltip', () => {
 
       // On animation complete, should expect that the tooltip has been detached.
       flushMicrotasks();
-      expect(tooltipDirective._tooltipInstance).toBeNull();
+      assertTooltipInstance(tooltipDirective, false);
     }));
 
     it('should be able to re-open a tooltip if it was closed by detaching the overlay',
@@ -126,7 +126,7 @@ describe('MatTooltip', () => {
         fixture.detectChanges();
         expect(tooltipDirective._isTooltipVisible()).toBe(false);
         flushMicrotasks();
-        expect(tooltipDirective._tooltipInstance).toBeNull();
+        assertTooltipInstance(tooltipDirective, false);
 
         tooltipDirective.show();
         tick(0);
@@ -134,7 +134,7 @@ describe('MatTooltip', () => {
       }));
 
     it('should show with delay', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       const tooltipDelay = 1000;
       tooltipDirective.show(tooltipDelay);
@@ -192,7 +192,7 @@ describe('MatTooltip', () => {
     }));
 
     it('should not show if hide is called before delay finishes', async(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       const tooltipDelay = 1000;
 
@@ -209,27 +209,27 @@ describe('MatTooltip', () => {
     }));
 
     it('should not show tooltip if message is not present or empty', () => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.message = undefined!;
       fixture.detectChanges();
       tooltipDirective.show();
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.message = null!;
       fixture.detectChanges();
       tooltipDirective.show();
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.message = '';
       fixture.detectChanges();
       tooltipDirective.show();
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.message = '   ';
       fixture.detectChanges();
       tooltipDirective.show();
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
     });
 
     it('should not follow through with hide if show is called after', fakeAsync(() => {
@@ -252,7 +252,7 @@ describe('MatTooltip', () => {
       const initialPosition: TooltipPosition = 'below';
       const changedPosition: TooltipPosition = 'above';
 
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.position = initialPosition;
       tooltipDirective.show();
@@ -264,12 +264,12 @@ describe('MatTooltip', () => {
 
       // Different position value should destroy the tooltip
       tooltipDirective.position = changedPosition;
-      expect(tooltipDirective._tooltipInstance).toBeNull();
+      assertTooltipInstance(tooltipDirective, false);
       expect(tooltipDirective._overlayRef).toBeNull();
     });
 
     it('should be able to modify the tooltip message', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.show();
       tick(0); // Tick for the show delay (default is 0)
@@ -286,7 +286,7 @@ describe('MatTooltip', () => {
     }));
 
     it('should allow extra classes to be set on the tooltip', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.show();
       tick(0); // Tick for the show delay (default is 0)
@@ -510,7 +510,7 @@ describe('MatTooltip', () => {
     }));
 
     it('should not show the tooltip on progammatic focus', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       buttonElement.focus();
       tick(0);
@@ -585,7 +585,7 @@ describe('MatTooltip', () => {
     });
 
     it('should hide tooltip if clipped after changing positions', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       // Show the tooltip and tick for the show delay (default is 0)
       tooltipDirective.show();
@@ -626,7 +626,7 @@ describe('MatTooltip', () => {
     });
 
     it('should show and hide the tooltip', fakeAsync(() => {
-      expect(tooltipDirective._tooltipInstance).toBeUndefined();
+      assertTooltipInstance(tooltipDirective, false);
 
       tooltipDirective.show();
       tick(0); // Tick for the show delay (default is 0)
@@ -654,7 +654,7 @@ describe('MatTooltip', () => {
 
       // On animation complete, should expect that the tooltip has been detached.
       flushMicrotasks();
-      expect(tooltipDirective._tooltipInstance).toBeNull();
+      assertTooltipInstance(tooltipDirective, false);
     }));
 
     it('should have rendered the tooltip text on init', fakeAsync(() => {
@@ -751,3 +751,11 @@ class DynamicTooltipsDemo {
     return this._elementRef.nativeElement.querySelectorAll('button');
   }
 }
+
+/** Asserts whether a tooltip directive has a tooltip instance. */
+function assertTooltipInstance(tooltip: MatTooltip, shouldExist: boolean): void {
+  // Note that we have to cast this to a boolean, because Jasmine will go into an infinite loop
+  // if it tries to stringify the `_tooltipInstance` when an assertion fails. The infinite loop
+  // happens due to the `_tooltipInstance` having a circular structure.
+  expect(!!tooltip._tooltipInstance).toBe(shouldExist);
+}
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 4e37dbacc4f3..d1c243b532a3 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -25,6 +25,7 @@ import {
 import {Platform} from '@angular/cdk/platform';
 import {ComponentPortal} from '@angular/cdk/portal';
 import {first} from 'rxjs/operators/first';
+import {merge} from 'rxjs/observable/merge';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
   ChangeDetectionStrategy,
@@ -261,7 +262,7 @@ export class MatTooltip implements OnDestroy {
     this._tooltipInstance = overlayRef.attach(portal).instance;
 
     // Dispose of the tooltip when the overlay is detached.
-    overlayRef.detachments().subscribe(() => {
+    merge(this._tooltipInstance!.afterHidden(), overlayRef.detachments()).subscribe(() => {
       // Check first if the tooltip has already been removed through this components destroy.
       if (this._tooltipInstance) {
         this._disposeTooltip();

From 3510064215b45abf860e517c53b82dd55b9d4649 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 14 Nov 2017 17:41:25 +0100
Subject: [PATCH 475/575] chore(table): fix test compilation (#8430)

Fixes a compilation error in the table tests and fixes the package-lock not being up to date.
---
 package-lock.json           | 9411 ++++++++++-------------------------
 src/cdk/table/table.spec.ts |    2 +-
 2 files changed, 2758 insertions(+), 6655 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5f43db626986..b166682cf923 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,33 +5,33 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
-      "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.1.tgz",
+      "integrity": "sha1-qSsrGGpuWjGp8VhJEd1qp+FsXeE=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/common": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
-      "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.1.tgz",
+      "integrity": "sha1-QwBas8i4/68Xaq+zuGupMcPkvfk=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
-      "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.1.tgz",
+      "integrity": "sha1-f9TH+ku770wUaWL6lGuCczCmyO0=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz",
-      "integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.1.tgz",
+      "integrity": "sha1-Um3BuzlPsWrZFmAe6pqgDrRLT/8=",
       "dev": true,
       "requires": {
         "chokidar": "1.7.0",
@@ -41,51 +41,51 @@
       }
     },
     "@angular/core": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
-      "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.1.tgz",
+      "integrity": "sha1-pKdK/H4gWNMLgmPrbWbarOn0J7o=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/forms": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
-      "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.1.tgz",
+      "integrity": "sha1-afMDxME9o8qg3mNDdYg4i2rWKyE=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/http": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
-      "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.1.tgz",
+      "integrity": "sha1-NQy99jz6yJOWE9dT/wce1YpgVhs=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
-      "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.1.tgz",
+      "integrity": "sha1-FIld0w7Sow7nuZx2t2R0j0bBqGI=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
-      "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.1.tgz",
+      "integrity": "sha1-Fttn1S1FMVY6sVQpxr3+GLwb7cg=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-server": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.0.tgz",
-      "integrity": "sha1-h30l74FK+S//x7C1I7lxpv8iIBg=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.1.tgz",
+      "integrity": "sha1-AFpk62V+Zw0mX9+ulHPxmnZPhzc=",
       "dev": true,
       "requires": {
         "domino": "1.0.30",
@@ -94,82 +94,82 @@
       }
     },
     "@angular/router": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
-      "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.1.tgz",
+      "integrity": "sha1-msCPKTAu9gzf08eBDZbCZd7EY9Y=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@firebase/app": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.1.tgz",
-      "integrity": "sha512-LoZj/Igo1PbfSorPRCozTlBhrFvOyxZsiMo2fLyDa2w/gdPbMucpWUi0vIBronR6T/yNJRWdZyyHOMieLtnjcw==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.2.tgz",
+      "integrity": "sha512-H2moN0Dl5LJn1AiRsCvwJsfE7PLKYYYJc+WKqAta+qIB/ZzBAay8NTVBYHiqsteLHc7gXofoi8zEUrGjbmz4OQ==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.1.1"
+        "@firebase/util": "0.1.2"
       }
     },
     "@firebase/auth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.2.0.tgz",
-      "integrity": "sha512-02tAnE1KcorVJRjs+xf0AngsRyYRpdZ9yDVHX+J5x2Z9v4qNpp1FPkx3A8hmqznCAgqc4C0EbaxHg0BcUlQsWw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.2.2.tgz",
+      "integrity": "sha512-/qUnCjil7Eb0KQVErkziuyIbG1FrszD6+ttGY7+DTTbN+/QGjyqwTizwGLQDF8Itvf29O7YWKEdsoJyiwn/F4Q==",
       "dev": true
     },
     "@firebase/database": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.1.2.tgz",
-      "integrity": "sha512-60D08yaQJ6RVegxriC/VNpHE2+/4itTtxBbo15P8WkFfnsjjJVK8AkkFiCjOxj6TccpjzoAz69Xe2/p8po2fEg==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.1.3.tgz",
+      "integrity": "sha512-Uk9IRPYDmpDRBvnIZhs16iQX/7GxetslWD+7N6GKgEDmO9csPC+9hHmdXkcVc6cG7xHCePdRJGvhrVt3ax7Fcw==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.1.1",
-        "faye-websocket": "0.9.3"
+        "@firebase/util": "0.1.2",
+        "faye-websocket": "0.11.1"
       }
     },
     "@firebase/firestore": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.1.2.tgz",
-      "integrity": "sha512-VqPLPKiSy0EzsQfA4w0qYT93KgkiL/NAIS6Ibajuuts2wbz2CBgsZM1nPvgJnaQCN8LPAT/Vvn2th7nMozFHag==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.1.4.tgz",
+      "integrity": "sha512-ltt3zvvZ6LE37oIfVm0zeNA0DPo75YKWkfIyEbFlXDWkeNIt3lunhB4L777weUzZOmcZhX8T6pHx6xZM+ysDkA==",
       "dev": true,
       "requires": {
-        "@firebase/webchannel-wrapper": "0.2.3"
+        "@firebase/webchannel-wrapper": "0.2.4"
       }
     },
     "@firebase/messaging": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.1.2.tgz",
-      "integrity": "sha512-fZHhO1FO2RHOVg8A0BhwF+Ay0A34AtMEyjo9csht+TQNEaG924Jkf2tUG13nqRda63tmjT5REeWnGv6qAZU4Jw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.1.3.tgz",
+      "integrity": "sha512-mQxG4y+wT7hCSsNzPGdFKjZ7/NLIdSJRYX59bLL3F0HMIuOlNtYXxKjN23vBGljwFufx3dQBtlX8beDBKbOv4Q==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.1.1"
+        "@firebase/util": "0.1.2"
       }
     },
     "@firebase/polyfill": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.1.1.tgz",
-      "integrity": "sha512-XvZzppOmu5NZvWkvxZuWpD5VeMhyhhlrMvyFAwlOeYrJKcBFkIbmSX46Pe5ttuXYp6EjrVia/Bh1h2h0NYgE7g==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.1.2.tgz",
+      "integrity": "sha512-5oneu9nOYDZkZWyfvBXFa+ORWj9HeOYhwWy4HSJzCLKLnOvQSSZRcNBD2cVrysGR8tZCEfyKqq3fnwtODCvIQg==",
       "dev": true,
       "requires": {
         "promise-polyfill": "6.0.2"
       }
     },
     "@firebase/storage": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.1.tgz",
-      "integrity": "sha512-ccnANSW/Sun8/pFssCdOsVQrdyDb/ReKU/P0rbDdU0LvnWkYEckegJrYSoDliHuht19qHSl5C062q82ZxReVRQ==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.2.tgz",
+      "integrity": "sha512-Il1+R2BbFfhwq4H6OAF+hpxr5mAxoD3CK/i/78CiDATtKR5OU9kuQf7T3V3khMeFspK0H6r02Oe9gTbS2XhPkQ==",
       "dev": true
     },
     "@firebase/util": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.1.tgz",
-      "integrity": "sha512-HtJ3UEecoy2qjoTXwtp0tN4pVR+zH6+pSMtxLHSxgkAAExKsPJUp5W91O6LivjRdiakRwjMZEE9bVPFUCHDhlQ==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.2.tgz",
+      "integrity": "sha512-XzvnxTsPIukAJmBVpBOGTLVgz27Iyoudmum6Bqy8Czu2qhWjikhkE1UlND7Gh5BwTpBVr03axjovRXgh5xgIxw==",
       "dev": true
     },
     "@firebase/webchannel-wrapper": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.3.tgz",
-      "integrity": "sha512-EWSvoDVXmUwP1nP65ob1gEGiJi38Pv1e9dmL1DHBcupmYdST1cbYper6N2EVnCkzMIm2/EfZiGSL1nf8V4uiKg==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.4.tgz",
+      "integrity": "sha512-jEpglcwMlwdXc/JgvJaJtCSkPMktnFeI0gAZxPrmbJxKVzMZJ2zM582NbW/r6M22pSdNWjcWeg1I2LRg3jQGQA==",
       "dev": true
     },
     "@google-cloud/common": {
@@ -191,82 +191,90 @@
         "methmeth": "1.1.0",
         "modelo": "4.2.0",
         "request": "2.83.0",
-        "retry-request": "3.1.0",
+        "retry-request": "3.1.1",
         "split-array-stream": "1.0.3",
         "stream-events": "1.0.2",
         "string-format-obj": "1.1.0",
         "through2": "2.0.3"
       }
     },
+    "@google-cloud/common-grpc": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.2.tgz",
+      "integrity": "sha1-jPb7vkGZdueOtuD+aoGXTEYfMaw=",
+      "dev": true,
+      "requires": {
+        "@google-cloud/common": "0.13.6",
+        "dot-prop": "2.4.0",
+        "duplexify": "3.5.1",
+        "extend": "3.0.1",
+        "grpc": "1.7.1",
+        "is": "3.2.1",
+        "modelo": "4.2.0",
+        "retry-request": "3.1.1",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "dot-prop": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
+          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
+          "dev": true,
+          "requires": {
+            "is-obj": "1.0.1"
+          }
+        }
+      }
+    },
+    "@google-cloud/firestore": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.9.0.tgz",
+      "integrity": "sha512-IoWsM1lkoBQffywJgbjJzzYMLPXSowOyrDRSx67u5kvPwTsYFl1AupPEOet48k/5tvaT4yhmhP2OsU+MSjrp5w==",
+      "dev": true,
+      "requires": {
+        "@google-cloud/common": "0.13.6",
+        "@google-cloud/common-grpc": "0.4.2",
+        "bun": "0.0.12",
+        "extend": "3.0.1",
+        "functional-red-black-tree": "1.0.1",
+        "google-gax": "0.14.2",
+        "grpc": "1.7.1",
+        "is": "3.2.1",
+        "safe-buffer": "5.1.1",
+        "through2": "2.0.3"
+      }
+    },
     "@google-cloud/functions-emulator": {
-      "version": "1.0.0-alpha.25",
-      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
-      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
+      "version": "1.0.0-alpha.27",
+      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.27.tgz",
+      "integrity": "sha1-0iEKArtKCQN95jpRLn1amMKBI+c=",
       "dev": true,
       "optional": true,
       "requires": {
-        "@google-cloud/storage": "1.2.1",
+        "@google-cloud/storage": "1.4.0",
         "adm-zip": "0.4.7",
-        "ajv": "5.2.2",
-        "body-parser": "1.17.2",
+        "ajv": "5.3.0",
+        "body-parser": "1.18.2",
         "cli-table2": "0.2.0",
         "colors": "1.1.2",
         "configstore": "3.1.1",
-        "express": "4.15.4",
-        "google-proto-files": "0.12.1",
-        "googleapis": "20.1.0",
+        "express": "4.16.2",
+        "google-proto-files": "0.14.1",
+        "googleapis": "22.2.0",
         "got": "7.1.0",
-        "grpc": "1.4.1",
+        "grpc": "1.7.1",
         "http-proxy": "1.16.2",
         "lodash": "4.17.4",
         "prompt": "1.0.0",
-        "rimraf": "2.6.1",
+        "rimraf": "2.6.2",
         "semver": "5.4.1",
         "serializerr": "1.0.3",
         "tmp": "0.0.33",
         "uuid": "3.1.0",
-        "winston": "2.3.1",
-        "yargs": "8.0.2"
+        "winston": "2.4.0",
+        "yargs": "10.0.3"
       },
       "dependencies": {
-        "@google-cloud/storage": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
-          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@google-cloud/common": "0.13.6",
-            "arrify": "1.0.1",
-            "async": "2.5.0",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "gcs-resumable-upload": "0.8.2",
-            "hash-stream-validation": "0.2.1",
-            "is": "3.2.1",
-            "mime-types": "2.1.17",
-            "once": "1.4.0",
-            "pumpify": "1.3.5",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
-          }
-        },
-        "ajv": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -274,13 +282,6 @@
           "dev": true,
           "optional": 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,
-          "optional": true
-        },
         "colors": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -288,6 +289,17 @@
           "dev": true,
           "optional": true
         },
+        "google-proto-files": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.14.1.tgz",
+          "integrity": "sha1-bl8V+L1mFdc8o/3QjN7DM2P5r4k=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "globby": "6.1.0",
+            "protobufjs": "6.8.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",
@@ -307,6 +319,28 @@
             "mem": "1.1.0"
           }
         },
+        "protobufjs": {
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@protobufjs/aspromise": "1.1.2",
+            "@protobufjs/base64": "1.1.2",
+            "@protobufjs/codegen": "2.0.4",
+            "@protobufjs/eventemitter": "1.1.0",
+            "@protobufjs/fetch": "1.1.0",
+            "@protobufjs/float": "1.0.2",
+            "@protobufjs/inquire": "1.1.0",
+            "@protobufjs/path": "1.1.2",
+            "@protobufjs/pool": "1.1.0",
+            "@protobufjs/utf8": "1.1.0",
+            "@types/long": "3.0.32",
+            "@types/node": "7.0.46",
+            "long": "3.2.0"
+          }
+        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -338,57 +372,25 @@
             "os-tmpdir": "1.0.2"
           }
         },
-        "winston": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
-          "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
-          "dev": true,
-          "optional": 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,
-              "optional": true
-            },
-            "colors": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
         "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "version": "10.0.3",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz",
+          "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==",
           "dev": true,
           "optional": true,
           "requires": {
-            "camelcase": "4.1.0",
             "cliui": "3.2.0",
             "decamelize": "1.2.0",
+            "find-up": "2.1.0",
             "get-caller-file": "1.0.2",
             "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
             "require-directory": "2.1.1",
             "require-main-filename": "1.0.1",
             "set-blocking": "2.0.0",
             "string-width": "2.1.1",
             "which-module": "2.0.0",
             "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
+            "yargs-parser": "8.0.0"
           }
         }
       }
@@ -401,7 +403,7 @@
       "requires": {
         "@google-cloud/common": "0.13.6",
         "arrify": "1.0.1",
-        "async": "2.5.0",
+        "async": "2.6.0",
         "concat-stream": "1.6.0",
         "create-error-class": "3.0.2",
         "duplexify": "3.5.1",
@@ -419,6 +421,70 @@
         "through2": "2.0.3"
       }
     },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
+      "dev": true
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "dev": true
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+      "dev": true
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
+      "dev": true
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+      "dev": true,
+      "requires": {
+        "@protobufjs/aspromise": "1.1.2",
+        "@protobufjs/inquire": "1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
+      "dev": true
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
+      "dev": true
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
+      "dev": true
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
+      "dev": true
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
+      "dev": true
+    },
     "@types/chalk": {
       "version": "0.4.31",
       "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz",
@@ -426,9 +492,9 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
-      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.5.tgz",
+      "integrity": "sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw==",
       "dev": true,
       "requires": {
         "@types/node": "7.0.46"
@@ -444,6 +510,15 @@
         "@types/node": "7.0.46"
       }
     },
+    "@types/google-cloud__storage": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.6.tgz",
+      "integrity": "sha512-X/hXFBpcnrfUjm6Q+9wTqVOlxKY5vC5aFMB4AIOnpuIhWmksJ5uVwry9Tr60buoYmeWbBGtx5JRWACJK9MhC+Q==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
     "@types/gulp": {
       "version": "3.8.32",
       "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.32.tgz",
@@ -451,7 +526,7 @@
       "dev": true,
       "requires": {
         "@types/node": "7.0.46",
-        "@types/orchestrator": "0.3.0",
+        "@types/orchestrator": "0.3.2",
         "@types/vinyl": "2.0.1"
       }
     },
@@ -462,9 +537,24 @@
       "dev": true
     },
     "@types/jasmine": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.3.tgz",
-      "integrity": "sha512-2dJf9//QxTnFBXHsCqLbB55jlMreJQie9HhgsZrSgHveOKCWVmgcXgRyvIi22Ndk/dJ/e2srLOstk2NgVbb7XA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha512-NthRcmfDjp6PEevahmd3L5euekA/H2F7Xb+Mr9C5a8VYYA86pJIEMPqCDVUrJtVyFMY4Dv9XXnUYoSx9Nnxghg==",
+      "dev": true
+    },
+    "@types/jsonwebtoken": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
+      "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.46"
+      }
+    },
+    "@types/long": {
+      "version": "3.0.32",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
+      "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
       "dev": true
     },
     "@types/merge2": {
@@ -495,19 +585,19 @@
       "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=",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@types/orchestrator/-/orchestrator-0.3.2.tgz",
+      "integrity": "sha512-cKB4yTX0wGaRCSkdHDX2fkGQbMAA8UOshC2U7DQky1CE5o+5q2iQQ8VkbPbE/88uaTtsusvBPMcCX7dgmjxBhQ==",
       "dev": true,
       "requires": {
         "@types/node": "7.0.46",
-        "@types/q": "0.0.37"
+        "@types/q": "1.0.6"
       }
     },
     "@types/q": {
-      "version": "0.0.37",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
-      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.0.6.tgz",
+      "integrity": "sha512-LSx7jkcXoXWB+kkfwG5zc9Okbgn51BrjLMtKwbmnqfQlCGttTnTxvDVwQanHxkK6CLKb9yEfxQ1ID6pqDpeURw==",
       "dev": true
     },
     "@types/run-sequence": {
@@ -521,9 +611,9 @@
       }
     },
     "@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=",
+      "version": "2.53.43",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz",
+      "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
       "dev": true
     },
     "@types/vinyl": {
@@ -535,16 +625,6 @@
         "@types/node": "7.0.46"
       }
     },
-    "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"
-      }
-    },
     "a-sync-waterfall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
@@ -625,21 +705,21 @@
       }
     },
     "ajv": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
+      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
       "dev": true,
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
-        "json-schema-traverse": "0.3.1",
-        "json-stable-stringify": "1.0.1"
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
       }
     },
     "ajv-keywords": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
-      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
       "dev": true
     },
     "align-text": {
@@ -715,70 +795,19 @@
       "dev": true
     },
     "archiver": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz",
-      "integrity": "sha1-u1cDRomdCGXrd+1mcnqzxjT8GlA=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz",
+      "integrity": "sha1-0t8ujVdzqCwdzOklzMQUUOqZmv0=",
       "dev": true,
       "requires": {
-        "async": "1.4.2",
+        "archiver-utils": "1.3.0",
+        "async": "2.6.0",
         "buffer-crc32": "0.2.13",
-        "glob": "5.0.15",
-        "lazystream": "0.1.0",
-        "lodash": "3.10.1",
-        "readable-stream": "1.0.34",
-        "tar-stream": "1.2.2",
-        "zip-stream": "0.6.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
-          "integrity": "sha1-bJ7csRztTw3S8tQNsNSaEJwIiqs=",
-          "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"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "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
-        }
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "readable-stream": "2.3.3",
+        "tar-stream": "1.5.5",
+        "zip-stream": "1.2.0"
       }
     },
     "archiver-utils": {
@@ -793,17 +822,6 @@
         "lodash": "4.17.4",
         "normalize-path": "2.1.1",
         "readable-stream": "2.3.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
       }
     },
     "archy": {
@@ -835,8 +853,7 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
       "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "arr-diff": {
       "version": "2.0.0",
@@ -957,7 +974,6 @@
       "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
       "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
       "dev": true,
-      "optional": true,
       "requires": {
         "colour": "0.7.1",
         "optjs": "3.2.2"
@@ -982,9 +998,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
       "dev": true,
       "requires": {
         "lodash": "4.17.4"
@@ -1015,7 +1031,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000748",
+        "caniuse-db": "1.0.30000764",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.18",
@@ -1035,9 +1051,9 @@
       "dev": true
     },
     "axe-core": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
-      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.5.0.tgz",
+      "integrity": "sha512-onOXxjT3lXT3FfIBH5AIDxug+28Xw4q4XY66v+2rTRWg9o8dSiKr58ZWlCveh1cmE2kL5bT1KlO9PsSr7pWClA==",
       "dev": true
     },
     "axe-webdriverjs": {
@@ -1046,7 +1062,7 @@
       "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
       "dev": true,
       "requires": {
-        "axe-core": "2.4.2"
+        "axe-core": "2.5.0"
       }
     },
     "babel-code-frame": {
@@ -1058,27 +1074,6 @@
         "chalk": "1.1.3",
         "esutils": "2.0.2",
         "js-tokens": "3.0.2"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
       }
     },
     "babel-runtime": {
@@ -1235,29 +1230,21 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.17.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
-      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
       "dev": true,
       "requires": {
-        "bytes": "2.4.0",
+        "bytes": "3.0.0",
         "content-type": "1.0.4",
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "depd": "1.1.1",
         "http-errors": "1.6.2",
-        "iconv-lite": "0.4.15",
+        "iconv-lite": "0.4.19",
         "on-finished": "2.3.0",
-        "qs": "6.4.0",
-        "raw-body": "2.2.0",
+        "qs": "6.5.1",
+        "raw-body": "2.3.2",
         "type-is": "1.6.15"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-          "dev": true
-        }
       }
     },
     "boom": {
@@ -1284,27 +1271,6 @@
         "repeating": "2.0.1",
         "string-width": "1.0.2",
         "widest-line": "1.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
       }
     },
     "brace-expansion": {
@@ -1351,7 +1317,7 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000748",
+        "caniuse-db": "1.0.30000764",
         "electron-to-chromium": "1.3.27"
       }
     },
@@ -1424,20 +1390,54 @@
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
+    "bun": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
+      "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
+      "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
+        }
+      }
+    },
     "bytebuffer": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
       "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "long": "3.2.0"
       }
     },
     "bytes": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
-      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
       "dev": true
     },
     "callsite": {
@@ -1473,9 +1473,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000748",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz",
-      "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=",
+      "version": "1.0.30000764",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000764.tgz",
+      "integrity": "sha1-1zqxGuYvap4vaYZ9bZwjrj8uXY0=",
       "dev": true
     },
     "canonical-path": {
@@ -1585,7 +1585,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.2",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1751,9 +1751,9 @@
       "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=",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "dev": true,
       "requires": {
         "color-name": "1.1.3"
@@ -1789,19 +1789,6 @@
         "yargs": "1.3.3"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -1823,12 +1810,6 @@
             "postcss": "5.2.18"
           }
         },
-        "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
-        },
         "yargs": {
           "version": "1.3.3",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
@@ -1847,8 +1828,7 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
       "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "combine-lists": {
       "version": "1.0.1",
@@ -1929,41 +1909,15 @@
       "dev": true
     },
     "compress-commons": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz",
-      "integrity": "sha1-lwk+Lhk/dWf6EyA9S43vzVlxpRk=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
       "dev": true,
       "requires": {
         "buffer-crc32": "0.2.13",
-        "crc32-stream": "0.3.4",
-        "node-int64": "0.4.0",
-        "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
-        }
+        "crc32-stream": "2.0.0",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
       }
     },
     "compressible": {
@@ -1988,23 +1942,6 @@
         "on-headers": "1.0.1",
         "safe-buffer": "5.1.1",
         "vary": "1.1.2"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "concat-map": {
@@ -2032,7 +1969,7 @@
       "requires": {
         "dot-prop": "4.2.0",
         "graceful-fs": "4.1.11",
-        "make-dir": "1.0.0",
+        "make-dir": "1.1.0",
         "unique-string": "1.0.0",
         "write-file-atomic": "2.3.0",
         "xdg-basedir": "3.0.0"
@@ -2050,19 +1987,25 @@
         "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "finalhandler": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+          "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "debug": "2.6.9",
+            "encodeurl": "1.0.1",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.3.1",
+            "unpipe": "1.0.0"
           }
         },
-        "utils-merge": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
           "dev": true
         }
       }
@@ -2159,33 +2102,33 @@
       "dev": true
     },
     "content-type-parser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
-      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
+      "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==",
       "dev": true
     },
     "conventional-changelog": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
-      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz",
+      "integrity": "sha1-kVGmKx2O2y2CcR2r9bfPcQQfgrE=",
       "dev": true,
       "requires": {
-        "conventional-changelog-angular": "1.5.1",
-        "conventional-changelog-atom": "0.1.1",
-        "conventional-changelog-codemirror": "0.2.0",
-        "conventional-changelog-core": "1.9.2",
-        "conventional-changelog-ember": "0.2.8",
-        "conventional-changelog-eslint": "0.2.0",
-        "conventional-changelog-express": "0.2.0",
+        "conventional-changelog-angular": "1.5.2",
+        "conventional-changelog-atom": "0.1.2",
+        "conventional-changelog-codemirror": "0.2.1",
+        "conventional-changelog-core": "1.9.3",
+        "conventional-changelog-ember": "0.2.9",
+        "conventional-changelog-eslint": "0.2.1",
+        "conventional-changelog-express": "0.2.1",
         "conventional-changelog-jquery": "0.1.0",
         "conventional-changelog-jscs": "0.1.0",
-        "conventional-changelog-jshint": "0.2.0"
+        "conventional-changelog-jshint": "0.2.1"
       }
     },
     "conventional-changelog-angular": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
-      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.2.tgz",
+      "integrity": "sha1-Kzj2Zf6cWSCvGi+C9Uf0ur5t5Xw=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2193,36 +2136,36 @@
       }
     },
     "conventional-changelog-atom": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
-      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz",
+      "integrity": "sha1-Ella1SZ6aTfDTPkAKBscZRmKTGM=",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-codemirror": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
-      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz",
+      "integrity": "sha1-KZpPcUe681DmyBWPxUlUopHFzAk=",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-core": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
-      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.3.tgz",
+      "integrity": "sha1-KJn+d5OJoynw7EsnRsNt3vuY2i0=",
       "dev": true,
       "requires": {
-        "conventional-changelog-writer": "2.0.1",
-        "conventional-commits-parser": "2.0.0",
+        "conventional-changelog-writer": "2.0.2",
+        "conventional-commits-parser": "2.0.1",
         "dateformat": "1.0.12",
         "get-pkg-repo": "1.4.0",
-        "git-raw-commits": "1.2.0",
+        "git-raw-commits": "1.3.0",
         "git-remote-origin-url": "2.0.0",
-        "git-semver-tags": "1.2.2",
+        "git-semver-tags": "1.2.3",
         "lodash": "4.17.4",
         "normalize-package-data": "2.4.0",
         "q": "1.4.1",
@@ -2240,104 +2183,31 @@
             "get-stdin": "4.0.1",
             "meow": "3.7.0"
           }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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-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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
         }
       }
     },
     "conventional-changelog-ember": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
-      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.9.tgz",
+      "integrity": "sha1-jsc8wFTjqwZGZ/sf61L+jvGxZDg=",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-eslint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
-      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz",
+      "integrity": "sha1-LCoRvrIW+AZJunKDQYApO2h8BmI=",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-express": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
-      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz",
+      "integrity": "sha1-g42eHmyQmXA7FQucGaoteBdCvWw=",
       "dev": true,
       "requires": {
         "q": "1.4.1"
@@ -2362,9 +2232,9 @@
       }
     },
     "conventional-changelog-jshint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
-      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz",
+      "integrity": "sha1-hhObs6yZiZ8rF36WF+CbN9mbzzo=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2372,13 +2242,13 @@
       }
     },
     "conventional-changelog-writer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
-      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.2.tgz",
+      "integrity": "sha1-tYV97RsAHa+aeLnNQJJvRcE0lJs=",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
-        "conventional-commits-filter": "1.0.0",
+        "conventional-commits-filter": "1.1.0",
         "dateformat": "1.0.12",
         "handlebars": "4.0.11",
         "json-stringify-safe": "5.0.1",
@@ -2411,9 +2281,9 @@
       }
     },
     "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=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.0.tgz",
+      "integrity": "sha1-H8Ka8wte2rdvVOIpxBGwxmPQ+es=",
       "dev": true,
       "requires": {
         "is-subset": "0.1.1",
@@ -2421,13 +2291,13 @@
       }
     },
     "conventional-commits-parser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
-      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.1.tgz",
+      "integrity": "sha1-HxXOa4RPfKQUlcgZDAgzwwuLFpM=",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.1",
         "is-text-path": "1.0.1",
+        "JSONStream": "1.3.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.2.0",
@@ -2502,45 +2372,19 @@
       }
     },
     "crc": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
-      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+      "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
       "dev": true
     },
     "crc32-stream": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
-      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
+      "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13",
-        "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
-        }
+        "crc": "3.5.0",
+        "readable-stream": "2.3.3"
       }
     },
     "create-error-class": {
@@ -2871,9 +2715,9 @@
       "dev": true
     },
     "debug": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-      "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "requires": {
         "ms": "2.0.0"
@@ -2920,13 +2764,13 @@
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
       "requires": {
-        "clone": "1.0.2"
+        "clone": "1.0.3"
       },
       "dependencies": {
         "clone": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
+          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
           "dev": true
         }
       }
@@ -2943,7 +2787,29 @@
         "object-assign": "4.1.1",
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.1"
+        "rimraf": "2.6.2"
+      },
+      "dependencies": {
+        "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.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "delayed-stream": {
@@ -2977,7 +2843,7 @@
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "filing-cabinet": "1.12.0",
         "precinct": "3.8.0"
       }
@@ -3228,7 +3094,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000748",
+        "caniuse-db": "1.0.30000764",
         "css-rule-stream": "1.1.0",
         "duplexer2": "0.0.2",
         "jsonfilter": "1.1.2",
@@ -3339,6 +3205,12 @@
         }
       }
     },
+    "dom-storage": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
+      "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
+      "dev": true
+    },
     "domelementtype": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
@@ -3908,56 +3780,48 @@
       }
     },
     "express": {
-      "version": "4.15.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
-      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
+      "version": "4.16.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
+      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
       "dev": true,
       "optional": true,
       "requires": {
         "accepts": "1.3.4",
         "array-flatten": "1.1.1",
+        "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
         "content-type": "1.0.4",
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "depd": "1.1.1",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
-        "finalhandler": "1.0.6",
-        "fresh": "0.5.0",
+        "finalhandler": "1.1.0",
+        "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "1.1.2",
         "on-finished": "2.3.0",
         "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "1.1.5",
-        "qs": "6.5.0",
+        "proxy-addr": "2.0.2",
+        "qs": "6.5.1",
         "range-parser": "1.2.0",
-        "send": "0.15.4",
-        "serve-static": "1.12.4",
-        "setprototypeof": "1.0.3",
+        "safe-buffer": "5.1.1",
+        "send": "0.16.1",
+        "serve-static": "1.13.1",
+        "setprototypeof": "1.1.0",
         "statuses": "1.3.1",
         "type-is": "1.6.15",
-        "utils-merge": "1.0.0",
+        "utils-merge": "1.0.1",
         "vary": "1.1.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "qs": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
-          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
           "dev": true,
           "optional": true
         },
@@ -3993,6 +3857,12 @@
           "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
           "dev": true
         },
+        "crc": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
+          "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
+          "dev": true
+        },
         "debug": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
@@ -4022,6 +3892,12 @@
           "requires": {
             "base64-url": "1.2.1"
           }
+        },
+        "utils-merge": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
+          "dev": true
         }
       }
     },
@@ -4060,27 +3936,6 @@
       "requires": {
         "chalk": "1.1.3",
         "time-stamp": "1.1.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
       }
     },
     "fast-deep-equal": {
@@ -4089,6 +3944,12 @@
       "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
       "dev": true
     },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -4105,9 +3966,9 @@
       }
     },
     "faye-websocket": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-      "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+      "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
       "dev": true,
       "requires": {
         "websocket-driver": "0.7.0"
@@ -4159,13 +4020,13 @@
       "requires": {
         "app-module-path": "1.1.0",
         "commander": "2.11.0",
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "enhanced-resolve": "3.0.3",
         "is-relative-path": "1.0.2",
         "module-definition": "2.2.4",
         "module-lookup-amd": "4.0.5",
         "object-assign": "4.1.1",
-        "resolve": "1.4.0",
+        "resolve": "1.5.0",
         "resolve-dependency-path": "1.0.2",
         "sass-lookup": "1.1.0",
         "stylus-lookup": "1.0.2",
@@ -4192,10 +4053,11 @@
       "dev": true
     },
     "finalhandler": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
-      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
       "dev": true,
+      "optional": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "1.0.1",
@@ -4206,20 +4068,12 @@
         "unpipe": "1.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
           "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4291,866 +4145,725 @@
       }
     },
     "firebase": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.0.tgz",
-      "integrity": "sha512-lfVXLQiCNcNsmG7ZxQapQRdE/kZOjheBZVZ1MNK80GTsuK9RO7DYO5Qdf4K9Om8r7OBZ4nRp438kGkf24x7sOg==",
-      "dev": true,
-      "requires": {
-        "@firebase/app": "0.1.1",
-        "@firebase/auth": "0.2.0",
-        "@firebase/database": "0.1.2",
-        "@firebase/firestore": "0.1.2",
-        "@firebase/messaging": "0.1.2",
-        "@firebase/polyfill": "0.1.1",
-        "@firebase/storage": "0.1.1",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.2.tgz",
+      "integrity": "sha512-qI4qWZNO4/tS05goNaLYaxFd2/GgWVONPcqq+H1YyLi0ybWfF7oEVhw1dz8SY+7Xc5wc3S4jGSMi3apgINz1Zg==",
+      "dev": true,
+      "requires": {
+        "@firebase/app": "0.1.2",
+        "@firebase/auth": "0.2.2",
+        "@firebase/database": "0.1.3",
+        "@firebase/firestore": "0.1.4",
+        "@firebase/messaging": "0.1.3",
+        "@firebase/polyfill": "0.1.2",
+        "@firebase/storage": "0.1.2",
         "dom-storage": "2.0.2",
         "xmlhttprequest": "1.8.0"
+      }
+    },
+    "firebase-admin": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.5.0.tgz",
+      "integrity": "sha1-wxLgfcLCEmEFEwkwokjIHn1ux6c=",
+      "dev": true,
+      "requires": {
+        "@firebase/app": "0.1.2",
+        "@firebase/database": "0.1.3",
+        "@google-cloud/firestore": "0.9.0",
+        "@google-cloud/storage": "1.4.0",
+        "@types/google-cloud__storage": "1.1.6",
+        "@types/jsonwebtoken": "7.2.3",
+        "@types/node": "8.0.51",
+        "faye-websocket": "0.9.3",
+        "google-auth-library": "0.10.0",
+        "jsonwebtoken": "7.4.3",
+        "node-forge": "0.7.1"
       },
       "dependencies": {
-        "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
-        },
-        "buffer-equal-constant-time": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-        },
-        "dom-storage": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
-          "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
+        "@types/node": {
+          "version": "8.0.51",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.51.tgz",
+          "integrity": "sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==",
           "dev": true
         },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
-          "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.1.1"
-          }
-        },
         "faye-websocket": {
           "version": "0.9.3",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
           "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+          "dev": true,
           "requires": {
-            "websocket-driver": "0.6.5"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
-        },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo="
-        },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
-          "requires": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
-          }
-        },
-        "jsonwebtoken": {
-          "version": "7.4.3",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
-          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
-          "requires": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "2.0.0",
-            "xtend": "4.0.1"
-          }
-        },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
-          "requires": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
-          "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
-        },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "promise-polyfill": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
-          "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-        },
-        "topo": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "websocket-driver": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
-          "requires": {
-            "websocket-extensions": "0.1.1"
+            "websocket-driver": "0.7.0"
           }
-        },
-        "websocket-extensions": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-          "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec="
-        },
-        "xmlhttprequest": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-          "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
-          "dev": true
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
         }
       }
     },
-    "firebase-admin": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.4.2.tgz",
-      "integrity": "sha1-AC9YvirYkBIp5SXsVfpybRL5BOs=",
+    "firebase-tools": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.15.0.tgz",
+      "integrity": "sha1-H7qAH7N85D3Y0nA1MzSw5eaj/7M=",
       "dev": true,
       "requires": {
-        "@google-cloud/firestore": "0.8.2",
-        "@google-cloud/storage": "1.3.1",
-        "@types/google-cloud__storage": "1.1.5",
-        "@types/jsonwebtoken": "7.2.3",
-        "@types/node": "8.0.33",
-        "faye-websocket": "0.9.3",
-        "google-auth-library": "0.10.0",
-        "jsonwebtoken": "7.1.9",
+        "@google-cloud/functions-emulator": "1.0.0-alpha.27",
+        "archiver": "2.1.0",
+        "chalk": "1.1.3",
+        "cjson": "0.3.3",
+        "cli-table": "0.3.1",
+        "commander": "2.11.0",
+        "configstore": "1.4.0",
+        "cross-spawn": "4.0.2",
+        "csv-streamify": "3.0.4",
+        "didyoumean": "1.2.1",
+        "es6-set": "0.1.5",
+        "exit-code": "1.0.2",
+        "filesize": "3.5.11",
+        "firebase": "2.4.2",
+        "fs-extra": "0.23.1",
+        "fstream-ignore": "1.0.5",
+        "glob": "7.1.2",
+        "google-auto-auth": "0.7.2",
+        "inquirer": "0.12.0",
+        "jsonschema": "1.2.0",
+        "JSONStream": "1.3.1",
+        "jsonwebtoken": "7.4.3",
         "lodash": "4.17.4",
-        "node-forge": "0.7.1"
+        "open": "0.0.5",
+        "ora": "0.2.3",
+        "portfinder": "0.4.0",
+        "progress": "2.0.0",
+        "request": "2.83.0",
+        "rsvp": "3.6.2",
+        "semver": "5.4.1",
+        "superstatic": "5.0.1",
+        "tar": "3.2.1",
+        "tmp": "0.0.27",
+        "universal-analytics": "0.3.11",
+        "update-notifier": "0.5.0",
+        "user-home": "2.0.0",
+        "uuid": "3.1.0",
+        "winston": "1.1.2"
       },
       "dependencies": {
-        "@google-cloud/common": {
-          "version": "0.13.6",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
-          "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "configstore": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
+          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
           "dev": true,
           "requires": {
-            "array-uniq": "1.0.3",
-            "arrify": "1.0.1",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "ent": "2.2.0",
-            "extend": "3.0.1",
-            "google-auto-auth": "0.7.2",
-            "is": "3.2.1",
-            "log-driver": "1.2.5",
-            "methmeth": "1.1.0",
-            "modelo": "4.2.0",
-            "request": "2.83.0",
-            "retry-request": "3.0.0",
-            "split-array-stream": "1.0.3",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
+            "graceful-fs": "4.1.11",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "os-tmpdir": "1.0.2",
+            "osenv": "0.1.4",
+            "uuid": "2.0.3",
+            "write-file-atomic": "1.3.4",
+            "xdg-basedir": "2.0.0"
+          },
+          "dependencies": {
+            "uuid": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+              "dev": true
+            }
           }
         },
-        "@google-cloud/common-grpc": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.1.tgz",
-          "integrity": "sha1-CSZGB++4k0MJr/1jhJmG+7gPkhg=",
-          "dev": true,
-          "requires": {
-            "@google-cloud/common": "0.13.6",
-            "dot-prop": "2.4.0",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "grpc": "1.6.6",
-            "is": "3.2.1",
-            "modelo": "4.2.0",
-            "retry-request": "3.0.0",
-            "through2": "2.0.3"
-          }
-        },
-        "@google-cloud/firestore": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
-          "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
-          "dev": true,
-          "requires": {
-            "@google-cloud/common": "0.13.6",
-            "@google-cloud/common-grpc": "0.4.1",
-            "bun": "0.0.12",
-            "extend": "3.0.1",
-            "functional-red-black-tree": "1.0.1",
-            "google-gax": "0.14.1",
-            "grpc": "1.6.6",
-            "is": "3.2.1",
-            "through2": "2.0.3"
-          }
-        },
-        "@google-cloud/storage": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
-          "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
+        "firebase": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
+          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
           "dev": true,
           "requires": {
-            "@google-cloud/common": "0.13.6",
-            "arrify": "1.0.1",
-            "async": "2.5.0",
-            "concat-stream": "1.6.0",
-            "create-error-class": "3.0.2",
-            "duplexify": "3.5.1",
-            "extend": "3.0.1",
-            "gcs-resumable-upload": "0.8.2",
-            "hash-stream-validation": "0.2.1",
-            "is": "3.2.1",
-            "mime-types": "2.1.17",
-            "once": "1.4.0",
-            "pumpify": "1.3.5",
-            "safe-buffer": "5.1.1",
-            "stream-events": "1.0.2",
-            "string-format-obj": "1.1.0",
-            "through2": "2.0.3"
+            "faye-websocket": "0.9.3"
+          },
+          "dependencies": {
+            "faye-websocket": {
+              "version": "0.9.3",
+              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+              "dev": true,
+              "requires": {
+                "websocket-driver": "0.5.2"
+              },
+              "dependencies": {
+                "websocket-driver": {
+                  "version": "0.5.2",
+                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
+                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
+                  "dev": true,
+                  "requires": {
+                    "websocket-extensions": "0.1.1"
+                  },
+                  "dependencies": {
+                    "websocket-extensions": {
+                      "version": "0.1.1",
+                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+                      "dev": true
+                    }
+                  }
+                }
+              }
+            }
           }
         },
-        "@protobufjs/aspromise": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-          "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
-          "dev": true
-        },
-        "@protobufjs/base64": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-          "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-          "dev": true
-        },
-        "@protobufjs/codegen": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-          "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
-          "dev": true
-        },
-        "@protobufjs/eventemitter": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-          "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
-          "dev": true
-        },
-        "@protobufjs/fetch": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-          "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+        "fs-extra": {
+          "version": "0.23.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
+          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
           "dev": true,
           "requires": {
-            "@protobufjs/aspromise": "1.1.2",
-            "@protobufjs/inquire": "1.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.2"
           }
         },
-        "@protobufjs/float": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-          "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
-          "dev": true
-        },
-        "@protobufjs/inquire": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-          "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
           "dev": true
         },
-        "@protobufjs/path": {
+        "winston": {
           "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-          "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
-          "dev": true
-        },
-        "@protobufjs/pool": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-          "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
-          "dev": true
-        },
-        "@protobufjs/utf8": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-          "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
-          "dev": true
-        },
-        "@types/google-cloud__storage": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
-          "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
-          "dev": true,
-          "requires": {
-            "@types/node": "8.0.33"
-          }
-        },
-        "@types/jsonwebtoken": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
-          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
-          "dev": true,
-          "requires": {
-            "@types/node": "8.0.33"
-          }
-        },
-        "@types/long": {
-          "version": "3.0.32",
-          "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
-          "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
-          "dev": true
-        },
-        "@types/node": {
-          "version": "8.0.33",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.33.tgz",
-          "integrity": "sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==",
-          "dev": true
-        },
-        "ajv": {
-          "version": "5.2.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "arguejs": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
-          "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
-          "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
-        },
-        "arrify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-          "dev": true
-        },
-        "ascli": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
-          "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
           "dev": true,
           "requires": {
-            "colour": "0.7.1",
-            "optjs": "3.2.2"
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
           }
         },
-        "asn1": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-          "dev": true
-        },
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        },
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+        "write-file-atomic": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
           "dev": true,
           "requires": {
-            "lodash": "4.17.4"
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
           }
         },
-        "asynckit": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-          "dev": true
-        },
-        "aws-sign2": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-          "dev": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-          "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
-        },
-        "base64url": {
+        "xdg-basedir": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
-          "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"
-          }
-        },
-        "boom": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-          "dev": true,
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
           "dev": true,
           "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
+            "os-homedir": "1.0.2"
           }
-        },
-        "buffer-equal": {
+        }
+      }
+    },
+    "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
+    },
+    "flat-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
+      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "1.1.1",
+        "as-array": "1.0.0",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isobject": "3.0.2"
+      },
+      "dependencies": {
+        "as-array": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-          "dev": true
-        },
-        "buffer-equal-constant-time": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
-          "dev": true
-        },
-        "bun": {
-          "version": "0.0.12",
-          "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
-          "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
+          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
+          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34"
+            "lodash.isarguments": "2.4.1",
+            "lodash.isobject": "2.4.1",
+            "lodash.values": "2.4.1"
           },
           "dependencies": {
-            "isarray": {
-              "version": "0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-              "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+            "lodash.isarguments": {
+              "version": "2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
+              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
               "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=",
+            "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": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.3",
-                "isarray": "0.0.1",
-                "string_decoder": "0.10.31"
+                "lodash._objecttypes": "2.4.1"
               }
-            },
-            "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
             }
           }
         },
-        "bytebuffer": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
-          "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
-          "dev": true,
-          "requires": {
-            "long": "3.2.0"
+        "lodash.isobject": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+          "dev": true
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "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"
+      }
+    },
+    "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.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": true
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
+    "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.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.39"
+      },
+      "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"
           }
         },
-        "camelcase": {
+        "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "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=",
+          "bundled": true,
           "dev": true
         },
-        "caseless": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-          "dev": true
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wrap-ansi": "2.1.0"
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
           }
         },
-        "co": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-          "dev": true
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": 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
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "colour": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
-          "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
-          "dev": true
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "combined-stream": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-          "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
+          "optional": true
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
           "dev": true
         },
-        "concat-stream": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-          "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.3",
-            "typedarray": "0.0.6"
+            "tweetnacl": "0.14.5"
           }
         },
-        "configstore": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "dot-prop": "4.2.0",
-            "graceful-fs": "4.1.11",
-            "make-dir": "1.0.0",
-            "unique-string": "1.0.0",
-            "write-file-atomic": "2.3.0",
-            "xdg-basedir": "3.0.0"
-          },
-          "dependencies": {
-            "dot-prop": {
-              "version": "4.2.0",
-              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-              "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-              "dev": true,
-              "requires": {
-                "is-obj": "1.0.1"
-              }
-            }
+            "inherits": "2.0.3"
           }
         },
-        "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
-        },
-        "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=",
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "capture-stack-trace": "1.0.0"
+            "hoek": "2.16.3"
           }
         },
-        "cryptiles": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "boom": "5.2.0"
-          },
-          "dependencies": {
-            "boom": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-              "dev": true,
-              "requires": {
-                "hoek": "4.2.0"
-              }
-            }
-          }
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
         },
-        "crypto-random-string": {
+        "buffer-shims": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-          "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
+          "bundled": true,
           "dev": true
         },
-        "dashdash": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+        "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": {
-            "assert-plus": "1.0.0"
+            "delayed-stream": "1.0.0"
           }
         },
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
           "dev": true
         },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
           "dev": true
         },
-        "dot-prop": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
-          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "is-obj": "1.0.1"
+            "boom": "2.10.1"
           }
         },
-        "duplexify": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "end-of-stream": "1.4.0",
-            "inherits": "2.0.3",
-            "readable-stream": "2.3.3",
-            "stream-shift": "1.0.0"
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
           }
         },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-          "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "ms": "2.0.0"
           }
         },
-        "ecdsa-sig-formatter": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "base64url": "2.0.0",
-            "safe-buffer": "5.1.1"
-          }
+          "optional": true
         },
-        "end-of-stream": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "once": "1.4.0"
+            "jsbn": "0.1.1"
           }
         },
-        "ent": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-          "dev": true
-        },
         "extend": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "extsprintf": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-          "dev": true
-        },
-        "fast-deep-equal": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true
         },
-        "faye-websocket": {
-          "version": "0.9.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-          "dev": true,
-          "requires": {
-            "websocket-driver": "0.7.0"
-          }
-        },
         "forever-agent": {
           "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "form-data": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+          "version": "2.1.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "asynckit": "0.4.0",
             "combined-stream": "1.0.5",
-            "mime-types": "2.1.17"
+            "mime-types": "2.1.15"
           }
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+          "bundled": true,
           "dev": true
         },
-        "functional-red-black-tree": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-          "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"
+          }
         },
-        "gcp-metadata": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "extend": "3.0.1",
-            "retry-request": "3.0.0"
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
           }
         },
-        "gcs-resumable-upload": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "buffer-equal": "1.0.0",
-            "configstore": "3.1.1",
-            "google-auto-auth": "0.7.2",
-            "pumpify": "1.3.5",
-            "request": "2.83.0",
-            "stream-events": "1.0.2",
-            "through2": "2.0.3"
+            "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",
-          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+          "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",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "bundled": true,
           "dev": true,
           "requires": {
             "fs.realpath": "1.0.0",
@@ -5161,1660 +4874,431 @@
             "path-is-absolute": "1.0.1"
           }
         },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
         },
-        "google-auth-library": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "gtoken": "1.2.2",
-            "jws": "3.1.4",
-            "lodash.noop": "3.0.1",
-            "request": "2.83.0"
-          }
+          "optional": true
         },
-        "google-auto-auth": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "async": "2.5.0",
-            "gcp-metadata": "0.3.1",
-            "google-auth-library": "0.10.0",
-            "request": "2.83.0"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
-        "google-gax": {
-          "version": "0.14.1",
-          "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.1.tgz",
-          "integrity": "sha1-/oj7nVAw0mJ3xjUIp5r3s3F54Tk=",
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "extend": "3.0.1",
-            "globby": "6.1.0",
-            "google-auto-auth": "0.5.4",
-            "google-proto-files": "0.13.1",
-            "grpc": "1.6.6",
-            "is-stream-ended": "0.1.3",
-            "lodash": "4.17.4",
-            "process-nextick-args": "1.0.7",
-            "protobufjs": "6.8.0",
-            "readable-stream": "2.3.3",
-            "through2": "2.0.3"
-          },
-          "dependencies": {
-            "@types/node": {
-              "version": "7.0.43",
-              "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
-              "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==",
-              "dev": true
-            },
-            "google-auto-auth": {
-              "version": "0.5.4",
-              "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.5.4.tgz",
-              "integrity": "sha1-HYbHko1jPnWpwasDSlJ+/M5KQLE=",
-              "dev": true,
-              "requires": {
-                "async": "2.5.0",
-                "google-auth-library": "0.10.0",
-                "object-assign": "3.0.0",
-                "request": "2.83.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
-            },
-            "protobufjs": {
-              "version": "6.8.0",
-              "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
-              "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
-              "dev": true,
-              "requires": {
-                "@protobufjs/aspromise": "1.1.2",
-                "@protobufjs/base64": "1.1.2",
-                "@protobufjs/codegen": "2.0.4",
-                "@protobufjs/eventemitter": "1.1.0",
-                "@protobufjs/fetch": "1.1.0",
-                "@protobufjs/float": "1.0.2",
-                "@protobufjs/inquire": "1.1.0",
-                "@protobufjs/path": "1.1.2",
-                "@protobufjs/pool": "1.1.0",
-                "@protobufjs/utf8": "1.1.0",
-                "@types/long": "3.0.32",
-                "@types/node": "7.0.43",
-                "long": "3.2.0"
-              }
-            }
-          }
+          "optional": true
         },
-        "google-p12-pem": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "node-forge": "0.7.1"
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
           }
         },
-        "google-proto-files": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
-          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
           "dev": true
         },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-          "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"
+          }
         },
-        "grpc": {
-          "version": "1.6.6",
-          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
-          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "arguejs": "0.2.3",
-            "lodash": "4.17.4",
-            "nan": "2.7.0",
-            "node-pre-gyp": "0.6.38",
-            "protobufjs": "5.0.2"
+            "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": {
-            "abbrev": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-              "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"
-              }
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-              "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"
-              }
-            },
-            "asn1": {
-              "version": "0.2.3",
-              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-              "dev": true
-            },
             "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
-            },
-            "asynckit": {
-              "version": "0.4.0",
-              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-              "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
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-              "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "caseless": {
-              "version": "0.12.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-              "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
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "debug": {
-              "version": "2.6.9",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "extend": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-              "dev": true
-            },
-            "extsprintf": {
-              "version": "1.3.0",
-              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-              "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
-            },
-            "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.17"
-              }
-            },
-            "fs.realpath": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-              "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.2"
-              }
-            },
-            "fstream-ignore": {
-              "version": "1.0.5",
-              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-              "dev": true,
-              "requires": {
-                "fstream": "1.0.11",
-                "inherits": "2.0.3",
-                "minimatch": "3.0.4"
-              }
-            },
-            "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.2.0",
-                "console-control-strings": "1.1.0",
-                "has-unicode": "2.0.1",
-                "object-assign": "4.1.1",
-                "signal-exit": "3.0.2",
-                "string-width": "1.0.2",
-                "strip-ansi": "3.0.1",
-                "wide-align": "1.1.2"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "graceful-fs": {
-              "version": "4.1.11",
-              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-              "dev": true
-            },
-            "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": "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"
-              }
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            },
-            "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.1",
-                "sshpk": "1.13.1"
-              }
-            },
-            "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
-            },
-            "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-typedarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-              "dev": true
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-              "dev": true
-            },
-            "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
-            },
-            "jsbn": {
-              "version": "0.1.1",
-              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-              "dev": true,
-              "optional": 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
-            },
-            "jsonify": {
-              "version": "0.0.0",
-              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-              "dev": true
-            },
-            "jsprim": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-              "dev": true,
-              "requires": {
-                "assert-plus": "1.0.0",
-                "extsprintf": "1.3.0",
-                "json-schema": "0.2.3",
-                "verror": "1.10.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
-                }
-              }
-            },
-            "mime-db": {
-              "version": "1.30.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-              "dev": true
-            },
-            "mime-types": {
-              "version": "2.1.17",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-              "dev": true,
-              "requires": {
-                "mime-db": "1.30.0"
-              }
-            },
-            "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=",
-              "dev": true
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-              "dev": true,
-              "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=",
-                  "dev": true
-                }
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            },
-            "node-pre-gyp": {
-              "version": "0.6.38",
-              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
-              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
-              "dev": true,
-              "requires": {
-                "hawk": "3.1.3",
-                "mkdirp": "0.5.1",
-                "nopt": "4.0.1",
-                "npmlog": "4.1.2",
-                "rc": "1.2.1",
-                "request": "2.81.0",
-                "rimraf": "2.6.2",
-                "semver": "5.4.1",
-                "tar": "2.2.1",
-                "tar-pack": "3.4.0"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-              "dev": true,
-              "requires": {
-                "abbrev": "1.1.1",
-                "osenv": "0.1.4"
-              }
-            },
-            "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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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"
-              }
-            },
-            "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-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"
-              }
-            },
-            "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
-            },
-            "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
-            },
-            "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
-            },
-            "punycode": {
-              "version": "1.4.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-              "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
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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.17",
-                "oauth-sign": "0.8.2",
-                "performance-now": "0.2.0",
-                "qs": "6.4.0",
-                "safe-buffer": "5.1.1",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.3",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.1.0"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.2",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-              "dev": true,
-              "requires": {
-                "glob": "7.1.2"
-              }
-            },
-            "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
-            },
-            "semver": {
-              "version": "5.4.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-              "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
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-              "dev": true
-            },
-            "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"
-              }
-            },
-            "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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "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"
-              }
-            },
-            "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-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
-            },
-            "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"
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-              "dev": true,
-              "requires": {
-                "debug": "2.6.9",
-                "fstream": "1.0.11",
-                "fstream-ignore": "1.0.5",
-                "once": "1.4.0",
-                "readable-stream": "2.3.3",
-                "rimraf": "2.6.2",
-                "tar": "2.2.1",
-                "uid-number": "0.0.6"
-              }
-            },
-            "tough-cookie": {
-              "version": "2.3.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-              "dev": true,
-              "requires": {
-                "punycode": "1.4.1"
-              }
-            },
-            "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"
-              }
-            },
-            "tweetnacl": {
-              "version": "0.14.5",
-              "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-              "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+              "bundled": true,
               "dev": true,
               "optional": true
-            },
-            "uid-number": {
-              "version": "0.0.6",
-              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-              "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
-            },
-            "uuid": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-              "dev": true
-            },
-            "verror": {
-              "version": "1.10.0",
-              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-              "dev": true,
-              "requires": {
-                "assert-plus": "1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "1.3.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
-                }
-              }
-            },
-            "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"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-              "dev": true
             }
           }
         },
-        "gtoken": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
-          "dev": true,
-          "requires": {
-            "google-p12-pem": "0.1.2",
-            "jws": "3.1.4",
-            "mime": "1.4.1",
-            "request": "2.83.0"
-          }
-        },
-        "har-schema": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
           "dev": true
         },
-        "har-validator": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-          "dev": true,
-          "requires": {
-            "ajv": "5.2.3",
-            "har-schema": "2.0.0"
-          }
-        },
-        "hash-stream-validation": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "through2": "2.0.3"
+            "mime-db": "1.27.0"
           }
         },
-        "hawk": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "boom": "4.3.1",
-            "cryptiles": "3.1.2",
-            "hoek": "4.2.0",
-            "sntp": "2.0.2"
+            "brace-expansion": "1.1.7"
           }
         },
-        "hoek": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-          "dev": true
-        },
-        "http-parser-js": {
-          "version": "0.4.9",
-          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
-          "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
           "dev": true
         },
-        "http-signature": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.13.1"
+            "minimist": "0.0.8"
           }
         },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-          "dev": true
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "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"
           }
         },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "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
-        },
-        "is": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-          "dev": true
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
         },
-        "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=",
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
-        "is-obj": {
+        "number-is-nan": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-          "dev": true
-        },
-        "is-stream-ended": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
-          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
-          "dev": true
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "bundled": true,
           "dev": true
         },
-        "isemail": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
-          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
-          "dev": true
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "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
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "joi": {
-          "version": "6.10.1",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "hoek": "2.16.3",
-            "isemail": "1.2.0",
-            "moment": "2.18.1",
-            "topo": "1.1.0"
-          },
-          "dependencies": {
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            }
+            "wrappy": "1.0.2"
           }
         },
-        "jsbn": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true,
           "optional": 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-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-          "dev": true
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": 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=",
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "jsonify": "0.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
-        "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=",
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
           "dev": true
         },
-        "jsonify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
           "dev": true
         },
-        "jsonwebtoken": {
-          "version": "7.1.9",
-          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
-          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "joi": "6.10.1",
-            "jws": "3.1.4",
-            "lodash.once": "4.1.1",
-            "ms": "0.7.3",
-            "xtend": "4.0.1"
-          }
+          "optional": true
         },
-        "jsprim": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          }
+          "optional": true
         },
-        "jwa": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "base64url": "2.0.0",
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.9",
-            "safe-buffer": "5.1.1"
+            "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
+            }
           }
         },
-        "jws": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "base64url": "2.0.0",
-            "jwa": "1.1.5",
-            "safe-buffer": "5.1.1"
+            "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"
           }
         },
-        "lcid": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "invert-kv": "1.0.0"
+            "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"
           }
         },
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        },
-        "lodash.noop": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
-          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
-          "dev": true
-        },
-        "lodash.once": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
-          "dev": true
-        },
-        "log-driver": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
-          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
-          "dev": true
-        },
-        "long": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-          "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-          "dev": true
-        },
-        "make-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-          "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "pify": "2.3.0"
+            "glob": "7.1.2"
           }
         },
-        "methmeth": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
-          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
           "dev": true
         },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "mime-db": {
-          "version": "1.30.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-          "dev": true
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "mime-types": {
-          "version": "2.1.17",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "mime-db": "1.30.0"
-          }
+          "optional": true
         },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.8"
-          }
-        },
-        "modelo": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
-          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
-          "dev": true
-        },
-        "moment": {
-          "version": "2.18.1",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
-          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
-          "dev": true
-        },
-        "ms": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
-          "dev": true
-        },
-        "nan": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-          "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
-          "dev": true
-        },
-        "node-forge": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
-          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
-          "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
-        },
-        "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
-        },
-        "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"
-          }
-        },
-        "optjs": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
-          "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
-          "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"
-          }
-        },
-        "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
-        },
-        "performance-now": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-          "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"
-          }
-        },
-        "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
-        },
-        "protobufjs": {
-          "version": "5.0.2",
-          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
-          "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
-          "dev": true,
-          "requires": {
-            "ascli": "1.0.1",
-            "bytebuffer": "5.0.1",
-            "glob": "7.1.2",
-            "yargs": "3.32.0"
-          }
-        },
-        "pump": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "1.4.0",
-            "once": "1.4.0"
-          }
-        },
-        "pumpify": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
-          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
-          "dev": true,
-          "requires": {
-            "duplexify": "3.5.1",
-            "inherits": "2.0.3",
-            "pump": "1.0.2"
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-          "dev": true
-        },
-        "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"
-          }
-        },
-        "request": {
-          "version": "2.83.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "0.7.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.3.1",
-            "har-validator": "5.0.3",
-            "hawk": "6.0.2",
-            "http-signature": "1.2.0",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.17",
-            "oauth-sign": "0.8.2",
-            "performance-now": "2.1.0",
-            "qs": "6.5.1",
-            "safe-buffer": "5.1.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.1.0"
-          }
-        },
-        "retry-request": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
-          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
-          "dev": true,
-          "requires": {
-            "request": "2.83.0",
-            "through2": "2.0.3"
-          }
-        },
-        "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
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-          "dev": true
-        },
-        "sntp": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
-          "dev": true,
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        },
-        "split-array-stream": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
-          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
-          "dev": true,
-          "requires": {
-            "async": "2.5.0",
-            "is-stream-ended": "0.1.3"
+            "hoek": "2.16.3"
           }
         },
         "sshpk": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-          "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+          "version": "1.13.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "asn1": "0.2.3",
             "assert-plus": "1.0.0",
@@ -6822,35 +5306,30 @@
             "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
+            }
           }
         },
-        "stream-events": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
-          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "stubs": "3.0.0"
+            "safe-buffer": "5.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
-        },
-        "string-format-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
-          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
-          "dev": true
-        },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "bundled": true,
           "dev": true,
           "requires": {
             "code-point-at": "1.1.0",
@@ -6858,657 +5337,881 @@
             "strip-ansi": "3.0.1"
           }
         },
-        "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"
-          }
-        },
         "stringstream": {
           "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-          "dev": true
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "bundled": true,
           "dev": true,
           "requires": {
             "ansi-regex": "2.1.1"
           }
         },
-        "stubs": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
-          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
-          "dev": true
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
           }
         },
-        "topo": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "hoek": "2.16.3"
-          },
-          "dependencies": {
-            "hoek": {
-              "version": "2.16.3",
-              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-              "dev": true
-            }
+            "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.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "version": "2.3.2",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "punycode": "1.4.1"
           }
         },
         "tunnel-agent": {
           "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.0.1"
           }
         },
         "tweetnacl": {
           "version": "0.14.5",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+          "bundled": true,
           "dev": true,
           "optional": true
         },
-        "typedarray": {
+        "uid-number": {
           "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-          "dev": true
-        },
-        "unique-string": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-          "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+          "bundled": true,
           "dev": true,
-          "requires": {
-            "crypto-random-string": "1.0.0"
-          }
+          "optional": true
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+          "bundled": true,
           "dev": true
         },
         "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-          "dev": true
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
         },
         "verror": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+          "version": "1.3.6",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "1.3.0"
+            "extsprintf": "1.0.2"
           }
         },
-        "websocket-driver": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "http-parser-js": "0.4.9",
-            "websocket-extensions": "0.1.2"
+            "string-width": "1.0.2"
           }
         },
-        "websocket-extensions": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
-          "dev": true
-        },
-        "window-size": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-          "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
           "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.3.0",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "signal-exit": "3.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
-        },
-        "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
-        },
-        "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"
-          }
         }
       }
     },
-    "firebase-tools": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.13.1.tgz",
-      "integrity": "sha1-LKgqXN1eiHxf6WHNgBnkqYdiX1o=",
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
-        "JSONStream": "1.3.1",
-        "archiver": "0.16.0",
-        "chalk": "1.1.3",
-        "cjson": "0.3.3",
-        "cli-table": "0.3.1",
-        "commander": "2.11.0",
-        "configstore": "1.4.0",
-        "cross-spawn": "4.0.2",
-        "csv-streamify": "3.0.4",
-        "didyoumean": "1.2.1",
-        "es6-set": "0.1.5",
-        "exit-code": "1.0.2",
-        "filesize": "3.5.11",
-        "firebase": "2.4.2",
-        "fs-extra": "0.23.1",
-        "fstream-ignore": "1.0.5",
-        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
+      }
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gather-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
+      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
+      "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.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      }
+    },
+    "gaze": {
+      "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"
+      }
+    },
+    "gcp-metadata": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "retry-request": "3.1.1"
+      }
+    },
+    "gcs-resumable-upload": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "1.0.0",
+        "configstore": "3.1.1",
         "google-auto-auth": "0.7.2",
-        "inquirer": "0.12.0",
-        "jsonschema": "1.2.0",
-        "jsonwebtoken": "7.4.3",
-        "lodash": "4.17.4",
-        "open": "0.0.5",
-        "ora": "0.2.3",
-        "portfinder": "0.4.0",
-        "progress": "2.0.0",
+        "pumpify": "1.3.5",
         "request": "2.83.0",
-        "rsvp": "3.6.2",
-        "semver": "5.4.1",
-        "superstatic": "5.0.1",
-        "tar": "3.2.1",
-        "tmp": "0.0.27",
-        "universal-analytics": "0.3.11",
-        "update-notifier": "0.5.0",
-        "user-home": "2.0.0",
-        "uuid": "3.1.0",
-        "winston": "1.1.2"
+        "stream-events": "1.0.2",
+        "through2": "2.0.3"
+      }
+    },
+    "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-amd-module-type": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz",
+      "integrity": "sha1-5nHsWpatX79To6IqKJ6SOMdy3bA=",
+      "dev": true,
+      "requires": {
+        "ast-module-types": "2.3.2",
+        "node-source-walk": "3.3.0"
+      }
+    },
+    "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.1",
+        "through2": "2.0.3"
+      }
+    },
+    "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"
+      }
+    },
+    "git-raw-commits": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz",
+      "integrity": "sha1-C8hZbpDV/+c29/VUa9LRL3OrqsY=",
+      "dev": true,
+      "requires": {
+        "dargs": "4.1.0",
+        "lodash.template": "4.4.0",
+        "meow": "3.7.0",
+        "split2": "2.2.0",
+        "through2": "2.0.3"
       },
       "dependencies": {
-        "async": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "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": {
-            "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"
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.templatesettings": "4.1.0"
           }
         },
-        "configstore": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
-          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+        "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": {
-            "graceful-fs": "4.1.11",
-            "mkdirp": "0.5.1",
-            "object-assign": "4.1.1",
-            "os-tmpdir": "1.0.2",
-            "osenv": "0.1.4",
-            "uuid": "2.0.3",
-            "write-file-atomic": "1.3.4",
-            "xdg-basedir": "2.0.0"
-          },
-          "dependencies": {
-            "uuid": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-              "dev": true
-            }
-          }
-        },
-        "firebase": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
-          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
-          "dev": true,
-          "requires": {
-            "faye-websocket": "0.9.3"
-          },
-          "dependencies": {
-            "faye-websocket": {
-              "version": "0.9.3",
-              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-              "dev": true,
-              "requires": {
-                "websocket-driver": "0.5.2"
-              },
-              "dependencies": {
-                "websocket-driver": {
-                  "version": "0.5.2",
-                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
-                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
-                  "dev": true,
-                  "requires": {
-                    "websocket-extensions": "0.1.1"
-                  },
-                  "dependencies": {
-                    "websocket-extensions": {
-                      "version": "0.1.1",
-                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "fs-extra": {
-          "version": "0.23.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
-          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "pkginfo": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
-          "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
-        },
-        "winston": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
-          "dev": true,
-          "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
-          }
-        },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
-          }
-        },
-        "xdg-basedir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
-          "dev": true,
-          "requires": {
-            "os-homedir": "1.0.2"
+            "lodash._reinterpolate": "3.0.0"
           }
         }
       }
     },
-    "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
-    },
-    "flat-arguments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+    "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": {
-        "array-flatten": "1.1.1",
-        "as-array": "1.0.0",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isobject": "3.0.2"
+        "gitconfiglocal": "1.0.0",
+        "pify": "2.3.0"
       },
       "dependencies": {
-        "as-array": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
-          "dev": true,
-          "requires": {
-            "lodash.isarguments": "2.4.1",
-            "lodash.isobject": "2.4.1",
-            "lodash.values": "2.4.1"
-          },
-          "dependencies": {
-            "lodash.isarguments": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
-              "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.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         }
       }
     },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+    "git-semver-tags": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz",
+      "integrity": "sha1-GItFOIK/nXojr9Mbq6U32rc4jV0=",
       "dev": true,
       "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
+        "meow": "3.7.0",
+        "semver": "5.4.1"
       }
     },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "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=",
+    "gitconfiglocal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2"
+        "ini": "1.3.4"
       }
     },
-    "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.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "dev": true,
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
+        "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"
       }
     },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
       "dev": true,
-      "optional": true
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
     },
-    "fresh": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
-      "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=",
-      "dev": true
+    "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"
+      }
     },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+    "glob-slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
+      "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U=",
       "dev": true
     },
-    "fs-access": {
+    "glob-slasher": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
+      "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
       "dev": true,
       "requires": {
-        "null-check": "1.0.0"
+        "glob-slash": "1.0.0",
+        "lodash.isobject": "2.4.1",
+        "toxic": "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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+    "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": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
+        "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": {
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+        "glob": {
+          "version": "4.5.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11"
+            "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"
           }
         }
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+    "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"
+      }
+    },
+    "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.3.0"
+      }
+    },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+    "globs": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.3.tgz",
+      "integrity": "sha1-ZwA3ElKHy2VJqtlqRM+mhP18VQI=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.36"
+        "glob": "7.1.2"
+      }
+    },
+    "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"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
+        "glob": {
+          "version": "3.1.21",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "graceful-fs": "1.2.3",
+            "inherits": "1.0.2",
+            "minimatch": "0.2.14"
           }
         },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
+        "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
         },
-        "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"
-          }
+        "inherits": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
+          "dev": true
         },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "lodash": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+          "dev": true
         },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": 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
         },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "lru-cache": "2.7.3",
+            "sigmund": "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"
+      }
+    },
+    "gm": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/gm/-/gm-1.21.1.tgz",
+      "integrity": "sha1-ftXtBds20wwZQ/OcO8HIObjyNh0=",
+      "dev": true,
+      "requires": {
+        "array-parallel": "0.1.3",
+        "array-series": "0.1.5",
+        "debug": "2.2.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
+        }
+      }
+    },
+    "gonzales-pe": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
+      "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.1.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+          "dev": true
+        }
+      }
+    },
+    "google-auth-library": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+      "dev": true,
+      "requires": {
+        "gtoken": "1.2.3",
+        "jws": "3.1.4",
+        "lodash.noop": "3.0.1",
+        "request": "2.83.0"
+      }
+    },
+    "google-auto-auth": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.0",
+        "gcp-metadata": "0.3.1",
+        "google-auth-library": "0.10.0",
+        "request": "2.83.0"
+      }
+    },
+    "google-closure-compiler": {
+      "version": "20170409.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20170409.0.0.tgz",
+      "integrity": "sha1-3Bvimp9+74YRNkUzsnG5+sdXyXA=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "vinyl": "2.1.0",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      }
+    },
+    "google-gax": {
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.2.tgz",
+      "integrity": "sha1-Kx8rhui+mKYgBBzucQ5PTOYbbis=",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "globby": "6.1.0",
+        "google-auto-auth": "0.7.2",
+        "google-proto-files": "0.13.1",
+        "grpc": "1.7.1",
+        "is-stream-ended": "0.1.3",
+        "lodash": "4.17.4",
+        "process-nextick-args": "1.0.7",
+        "protobufjs": "6.8.0",
+        "readable-stream": "2.3.3",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "protobufjs": {
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+          "dev": true,
+          "requires": {
+            "@protobufjs/aspromise": "1.1.2",
+            "@protobufjs/base64": "1.1.2",
+            "@protobufjs/codegen": "2.0.4",
+            "@protobufjs/eventemitter": "1.1.0",
+            "@protobufjs/fetch": "1.1.0",
+            "@protobufjs/float": "1.0.2",
+            "@protobufjs/inquire": "1.1.0",
+            "@protobufjs/path": "1.1.2",
+            "@protobufjs/pool": "1.1.0",
+            "@protobufjs/utf8": "1.1.0",
+            "@types/long": "3.0.32",
+            "@types/node": "7.0.46",
+            "long": "3.2.0"
+          }
+        }
+      }
+    },
+    "google-p12-pem": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.1"
+      }
+    },
+    "google-proto-files": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
+      "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
+      "dev": true
+    },
+    "googleapis": {
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-22.2.0.tgz",
+      "integrity": "sha1-/XnDwm5+caT1ouwafaX7EV2IU9I=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "2.3.0",
+        "google-auth-library": "0.10.0",
+        "string-template": "1.0.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
+          "integrity": "sha1-EBPRBRBH3TIP4k5JTVxm7K9hR9k=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lodash": "4.17.4"
+          }
+        }
+      }
+    },
+    "got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-response": "3.3.0",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-plain-obj": "1.1.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "isurl": "1.0.0",
+        "lowercase-keys": "1.0.0",
+        "p-cancelable": "0.3.0",
+        "p-timeout": "1.2.0",
+        "safe-buffer": "5.1.1",
+        "timed-out": "4.0.1",
+        "url-parse-lax": "1.0.0",
+        "url-to-options": "1.0.1"
+      }
+    },
+    "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
+    },
+    "graphviz": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
+      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
+      "dev": true,
+      "requires": {
+        "temp": "0.4.0"
+      }
+    },
+    "grpc": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.1.tgz",
+      "integrity": "sha512-lMgjZUzJx09VL5iCfs7rFagE5htikdv/9VzX/ji3zuwlzAhijqcU47bi5N5lbVw/UB2fxneeYg8sBTfQfd0c4A==",
+      "dev": true,
+      "requires": {
+        "arguejs": "0.2.3",
+        "lodash": "4.17.4",
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.39",
+        "protobufjs": "5.0.2"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": 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.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.3"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true
         },
         "aws-sign2": {
           "version": "0.6.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aws4": {
           "version": "1.6.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "balanced-match": {
-          "version": "0.4.2",
+          "version": "1.0.0",
           "bundled": true,
           "dev": true
         },
@@ -7538,30 +6241,23 @@
           }
         },
         "brace-expansion": {
-          "version": "1.1.7",
+          "version": "1.1.8",
           "bundled": true,
           "dev": true,
           "requires": {
-            "balanced-match": "0.4.2",
+            "balanced-match": "1.0.0",
             "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
+          "dev": true
         },
         "co": {
           "version": "4.6.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "code-point-at": {
           "version": "1.1.0",
@@ -7595,7 +6291,6 @@
           "version": "2.0.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "boom": "2.10.1"
           }
@@ -7604,7 +6299,6 @@
           "version": "1.14.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "assert-plus": "1.0.0"
           },
@@ -7612,8 +6306,7 @@
             "assert-plus": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -7621,7 +6314,6 @@
           "version": "2.6.8",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -7629,8 +6321,7 @@
         "deep-extend": {
           "version": "0.4.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "delayed-stream": {
           "version": "1.0.0",
@@ -7640,8 +6331,12 @@
         "delegates": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
         },
         "ecc-jsbn": {
           "version": "0.1.1",
@@ -7655,29 +6350,26 @@
         "extend": {
           "version": "3.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "extsprintf": {
-          "version": "1.0.2",
+          "version": "1.3.0",
           "bundled": true,
           "dev": true
         },
         "forever-agent": {
           "version": "0.6.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": 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"
+            "mime-types": "2.1.17"
           }
         },
         "fs.realpath": {
@@ -7693,14 +6385,13 @@
             "graceful-fs": "4.1.11",
             "inherits": "2.0.3",
             "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
+            "rimraf": "2.6.2"
           }
         },
         "fstream-ignore": {
           "version": "1.0.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "fstream": "1.0.11",
             "inherits": "2.0.3",
@@ -7711,9 +6402,8 @@
           "version": "2.7.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
-            "aproba": "1.1.1",
+            "aproba": "1.2.0",
             "console-control-strings": "1.1.0",
             "has-unicode": "2.0.1",
             "object-assign": "4.1.1",
@@ -7727,7 +6417,6 @@
           "version": "0.1.7",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "assert-plus": "1.0.0"
           },
@@ -7735,13 +6424,12 @@
             "assert-plus": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
         "glob": {
-          "version": "7.1.2",
+          "version": "7.1.1",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -7761,14 +6449,12 @@
         "har-schema": {
           "version": "1.0.5",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "har-validator": {
           "version": "4.2.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ajv": "4.11.8",
             "har-schema": "1.0.5"
@@ -7777,14 +6463,12 @@
         "has-unicode": {
           "version": "2.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "hawk": {
           "version": "3.1.3",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "boom": "2.10.1",
             "cryptiles": "2.0.5",
@@ -7801,11 +6485,10 @@
           "version": "1.1.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
           }
         },
         "inflight": {
@@ -7825,8 +6508,7 @@
         "ini": {
           "version": "1.3.4",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
@@ -7839,8 +6521,7 @@
         "is-typedarray": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "isarray": {
           "version": "1.0.0",
@@ -7850,17 +6531,7 @@
         "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"
-          }
+          "dev": true
         },
         "jsbn": {
           "version": "0.1.1",
@@ -7871,14 +6542,12 @@
         "json-schema": {
           "version": "0.2.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "json-stable-stringify": {
           "version": "1.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "jsonify": "0.0.0"
           }
@@ -7886,46 +6555,42 @@
         "json-stringify-safe": {
           "version": "5.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "jsonify": {
           "version": "0.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "jsprim": {
-          "version": "1.4.0",
+          "version": "1.4.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
+            "extsprintf": "1.3.0",
             "json-schema": "0.2.3",
-            "verror": "1.3.6"
+            "verror": "1.10.0"
           },
           "dependencies": {
             "assert-plus": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
         "mime-db": {
-          "version": "1.27.0",
+          "version": "1.30.0",
           "bundled": true,
           "dev": true
         },
         "mime-types": {
-          "version": "2.1.15",
+          "version": "2.1.17",
           "bundled": true,
           "dev": true,
           "requires": {
-            "mime-db": "1.27.0"
+            "mime-db": "1.30.0"
           }
         },
         "minimatch": {
@@ -7933,7 +6598,7 @@
           "bundled": true,
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.7"
+            "brace-expansion": "1.1.8"
           }
         },
         "minimist": {
@@ -7952,41 +6617,41 @@
         "ms": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "node-pre-gyp": {
-          "version": "0.6.36",
+          "version": "0.6.39",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
             "mkdirp": "0.5.1",
             "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
+            "npmlog": "4.1.2",
+            "rc": "1.2.2",
             "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
+            "rimraf": "2.6.2",
+            "semver": "5.4.1",
             "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"
+            "tar-pack": "3.4.1"
+          },
+          "dependencies": {
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "abbrev": "1.0.9",
+                "osenv": "0.1.4"
+              }
+            }
           }
         },
         "npmlog": {
-          "version": "4.1.0",
+          "version": "4.1.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "are-we-there-yet": "1.1.4",
             "console-control-strings": "1.1.0",
@@ -8002,14 +6667,12 @@
         "oauth-sign": {
           "version": "0.8.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "once": {
           "version": "1.4.0",
@@ -8022,20 +6685,17 @@
         "os-homedir": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "osenv": {
           "version": "0.1.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "os-homedir": "1.0.2",
             "os-tmpdir": "1.0.2"
@@ -8049,8 +6709,7 @@
         "performance-now": {
           "version": "0.2.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "process-nextick-args": {
           "version": "1.0.7",
@@ -8060,20 +6719,17 @@
         "punycode": {
           "version": "1.4.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "qs": {
           "version": "6.4.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "rc": {
-          "version": "1.2.1",
+          "version": "1.2.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "deep-extend": "0.4.2",
             "ini": "1.3.4",
@@ -8084,22 +6740,21 @@
             "minimist": {
               "version": "1.2.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
         "readable-stream": {
-          "version": "2.2.9",
+          "version": "2.3.3",
           "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",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
             "util-deprecate": "1.0.2"
           }
         },
@@ -8107,7 +6762,6 @@
           "version": "2.81.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "aws-sign2": "0.6.0",
             "aws4": "1.6.0",
@@ -8122,2099 +6776,209 @@
             "is-typedarray": "1.0.0",
             "isstream": "0.1.2",
             "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
+            "mime-types": "2.1.17",
             "oauth-sign": "0.8.2",
             "performance-now": "0.2.0",
             "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
+            "safe-buffer": "5.1.1",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
+            "tough-cookie": "2.3.3",
             "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
+            "uuid": "3.1.0"
           }
         },
         "rimraf": {
-          "version": "2.6.1",
+          "version": "2.6.2",
           "bundled": true,
           "dev": true,
           "requires": {
-            "glob": "7.1.2"
+            "glob": "7.1.1"
           }
         },
         "safe-buffer": {
-          "version": "5.0.1",
+          "version": "5.1.1",
           "bundled": true,
           "dev": true
         },
         "semver": {
-          "version": "5.3.0",
+          "version": "5.4.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "set-blocking": {
           "version": "2.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": 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-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"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
+          "dev": true
         },
-        "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"
-      }
-    },
-    "fstream-ignore": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-      "dev": true,
-      "requires": {
-        "fstream": "1.0.11",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4"
-      }
-    },
-    "gather-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
-      "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.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
-      }
-    },
-    "gaze": {
-      "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"
-      }
-    },
-    "gcp-metadata": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.1",
-        "retry-request": "3.1.0"
-      }
-    },
-    "gcs-resumable-upload": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "1.0.0",
-        "configstore": "3.1.1",
-        "google-auto-auth": "0.7.2",
-        "pumpify": "1.3.5",
-        "request": "2.83.0",
-        "stream-events": "1.0.2",
-        "through2": "2.0.3"
-      }
-    },
-    "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-amd-module-type": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz",
-      "integrity": "sha1-5nHsWpatX79To6IqKJ6SOMdy3bA=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "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.1",
-        "through2": "2.0.3"
-      }
-    },
-    "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"
-      }
-    },
-    "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.2.0",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
-    "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.2",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
-      "integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
-      "dev": true,
-      "requires": {
-        "meow": "3.7.0",
-        "semver": "5.4.1"
-      }
-    },
-    "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"
-      }
-    },
-    "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-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-slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
-      "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U=",
-      "dev": true
-    },
-    "glob-slasher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
-      "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
-      "dev": true,
-      "requires": {
-        "glob-slash": "1.0.0",
-        "lodash.isobject": "2.4.1",
-        "toxic": "1.0.0"
-      }
-    },
-    "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"
-      }
-    },
-    "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.3.0"
-      }
-    },
-    "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.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "globs": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.3.tgz",
-      "integrity": "sha1-ZwA3ElKHy2VJqtlqRM+mhP18VQI=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2"
-      }
-    },
-    "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"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "gm": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/gm/-/gm-1.21.1.tgz",
-      "integrity": "sha1-ftXtBds20wwZQ/OcO8HIObjyNh0=",
-      "dev": true,
-      "requires": {
-        "array-parallel": "0.1.3",
-        "array-series": "0.1.5",
-        "debug": "2.2.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
-        }
-      }
-    },
-    "gonzales-pe": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
-      "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
-      "dev": true,
-      "requires": {
-        "minimist": "1.1.3"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
-          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
-          "dev": true
-        }
-      }
-    },
-    "google-auth-library": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-      "dev": true,
-      "requires": {
-        "gtoken": "1.2.2",
-        "jws": "3.1.4",
-        "lodash.noop": "3.0.1",
-        "request": "2.83.0"
-      }
-    },
-    "google-auto-auth": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
-      "dev": true,
-      "requires": {
-        "async": "2.5.0",
-        "gcp-metadata": "0.3.1",
-        "google-auth-library": "0.10.0",
-        "request": "2.83.0"
-      }
-    },
-    "google-closure-compiler": {
-      "version": "20170409.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20170409.0.0.tgz",
-      "integrity": "sha1-3Bvimp9+74YRNkUzsnG5+sdXyXA=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "vinyl": "2.1.0",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
-      }
-    },
-    "google-p12-pem": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.7.1"
-      }
-    },
-    "google-proto-files": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.12.1.tgz",
-      "integrity": "sha512-d+BiTMpYP4/pN+Kgi0lWE+2/GaVN4jy8LCabjo2Wd16Ykm5oRO5bI40bo8u2U4rN/GpZkMyfxZAjWVPRjGe3nQ==",
-      "dev": true,
-      "optional": true
-    },
-    "googleapis": {
-      "version": "20.1.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-20.1.0.tgz",
-      "integrity": "sha512-UZYpUKPcwt28tZIvC+sT7yHtl56bMxnePNJBtZ3tG0OrQ1KegukirKRRuIxPavNCOcVC/ka5j/RRDhEIrYf5UA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "async": "2.3.0",
-        "google-auth-library": "0.10.0",
-        "string-template": "1.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
-          "integrity": "sha1-EBPRBRBH3TIP4k5JTVxm7K9hR9k=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lodash": "4.17.4"
-          }
-        }
-      }
-    },
-    "got": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
-      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-response": "3.3.0",
-        "duplexer3": "0.1.4",
-        "get-stream": "3.0.0",
-        "is-plain-obj": "1.1.0",
-        "is-retry-allowed": "1.1.0",
-        "is-stream": "1.1.0",
-        "isurl": "1.0.0",
-        "lowercase-keys": "1.0.0",
-        "p-cancelable": "0.3.0",
-        "p-timeout": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "timed-out": "4.0.1",
-        "url-parse-lax": "1.0.0",
-        "url-to-options": "1.0.1"
-      }
-    },
-    "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
-    },
-    "graphviz": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
-      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
-      "dev": true,
-      "requires": {
-        "temp": "0.4.0"
-      }
-    },
-    "grpc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.4.1.tgz",
-      "integrity": "sha1-PuSoNGphPygjkoyfj5kIG2No7Hw=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "arguejs": "0.2.3",
-        "lodash": "4.17.4",
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.36",
-        "protobufjs": "5.0.2"
-      },
-      "dependencies": {
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
-          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.2",
-            "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"
-          },
-          "dependencies": {
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-              "dev": true,
-              "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=",
-                  "dev": true
-                }
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1.1.0",
-                "osenv": "0.1.4"
-              },
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.1.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-                  "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-                  "dev": true,
-                  "optional": true
-                },
-                "osenv": {
-                  "version": "0.1.4",
-                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-                  "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "os-homedir": "1.0.2",
-                    "os-tmpdir": "1.0.2"
-                  },
-                  "dependencies": {
-                    "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,
-                      "optional": true
-                    },
-                    "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,
-                      "optional": true
-                    }
-                  }
-                }
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-              "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
-              "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"
-              },
-              "dependencies": {
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "delegates": "1.0.0",
-                    "readable-stream": "2.3.2"
-                  },
-                  "dependencies": {
-                    "delegates": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-                      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "readable-stream": {
-                      "version": "2.3.2",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
-                      "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
-                      "dev": true,
-                      "optional": 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"
-                      },
-                      "dependencies": {
-                        "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,
-                          "optional": true
-                        },
-                        "inherits": {
-                          "version": "2.0.3",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                          "dev": true,
-                          "optional": true
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                          "dev": true,
-                          "optional": 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,
-                          "optional": true
-                        },
-                        "safe-buffer": {
-                          "version": "5.1.1",
-                          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                          "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-                          "dev": true
-                        },
-                        "string_decoder": {
-                          "version": "1.0.3",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-                          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "safe-buffer": "5.1.1"
-                          }
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                          "dev": true,
-                          "optional": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "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
-                },
-                "gauge": {
-                  "version": "2.7.4",
-                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-                  "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-                  "dev": true,
-                  "optional": 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"
-                  },
-                  "dependencies": {
-                    "aproba": {
-                      "version": "1.1.2",
-                      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
-                      "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "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,
-                      "optional": 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,
-                      "optional": 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,
-                      "optional": 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"
-                      },
-                      "dependencies": {
-                        "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
-                        },
-                        "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"
-                          },
-                          "dependencies": {
-                            "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
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "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"
-                      },
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.1.1",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                          "dev": true
-                        }
-                      }
-                    },
-                    "wide-align": {
-                      "version": "1.1.2",
-                      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-                      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "string-width": "1.0.2"
-                      }
-                    }
-                  }
-                },
-                "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,
-                  "optional": true
-                }
-              }
-            },
-            "rc": {
-              "version": "1.2.1",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-              "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-              "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": {
-                "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,
-                  "optional": true
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-                  "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-                  "dev": true,
-                  "optional": true
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                  "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                  "dev": true,
-                  "optional": true
-                },
-                "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,
-                  "optional": true
-                }
-              }
-            },
-            "request": {
-              "version": "2.81.0",
-              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-              "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.1.1",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.2",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.1.0"
-              },
-              "dependencies": {
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-                  "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-                  "dev": true,
-                  "optional": true
-                },
-                "aws4": {
-                  "version": "1.6.0",
-                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-                  "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-                  "dev": true,
-                  "optional": true
-                },
-                "caseless": {
-                  "version": "0.12.0",
-                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-                  "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-                  "dev": true,
-                  "optional": true
-                },
-                "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"
-                  },
-                  "dependencies": {
-                    "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
-                    }
-                  }
-                },
-                "extend": {
-                  "version": "3.0.1",
-                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-                  "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-                  "dev": true,
-                  "optional": 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,
-                  "optional": 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,
-                  "optional": true,
-                  "requires": {
-                    "asynckit": "0.4.0",
-                    "combined-stream": "1.0.5",
-                    "mime-types": "2.1.15"
-                  },
-                  "dependencies": {
-                    "asynckit": {
-                      "version": "0.4.0",
-                      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-                      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "ajv": "4.11.8",
-                    "har-schema": "1.0.5"
-                  },
-                  "dependencies": {
-                    "ajv": {
-                      "version": "4.11.8",
-                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-                      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "co": "4.6.0",
-                        "json-stable-stringify": "1.0.1"
-                      },
-                      "dependencies": {
-                        "co": {
-                          "version": "4.6.0",
-                          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-                          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-                          "dev": true,
-                          "optional": 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,
-                          "optional": true,
-                          "requires": {
-                            "jsonify": "0.0.0"
-                          },
-                          "dependencies": {
-                            "jsonify": {
-                              "version": "0.0.0",
-                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-                              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-                              "dev": true,
-                              "optional": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "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,
-                      "optional": true
-                    }
-                  }
-                },
-                "hawk": {
-                  "version": "3.1.3",
-                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-                  "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "boom": "2.10.1",
-                    "cryptiles": "2.0.5",
-                    "hoek": "2.16.3",
-                    "sntp": "1.0.9"
-                  },
-                  "dependencies": {
-                    "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"
-                      }
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-                      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "boom": "2.10.1"
-                      }
-                    },
-                    "hoek": {
-                      "version": "2.16.3",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-                      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-                      "dev": true
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-                      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "hoek": "2.16.3"
-                      }
-                    }
-                  }
-                },
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "assert-plus": "0.2.0",
-                    "jsprim": "1.4.0",
-                    "sshpk": "1.13.1"
-                  },
-                  "dependencies": {
-                    "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,
-                      "optional": true
-                    },
-                    "jsprim": {
-                      "version": "1.4.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-                      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-                      "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",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                          "dev": true,
-                          "optional": true
-                        },
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-                          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-                          "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,
-                          "optional": 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,
-                          "optional": true,
-                          "requires": {
-                            "extsprintf": "1.0.2"
-                          }
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.13.1",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-                      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-                      "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",
-                        "jsbn": "0.1.1",
-                        "tweetnacl": "0.14.5"
-                      },
-                      "dependencies": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-                          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-                          "dev": true,
-                          "optional": true
-                        },
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                          "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"
-                          }
-                        },
-                        "dashdash": {
-                          "version": "1.14.1",
-                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-                          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "assert-plus": "1.0.0"
-                          }
-                        },
-                        "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"
-                          }
-                        },
-                        "getpass": {
-                          "version": "0.1.7",
-                          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-                          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "assert-plus": "1.0.0"
-                          }
-                        },
-                        "jsbn": {
-                          "version": "0.1.1",
-                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-                          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-                          "dev": true,
-                          "optional": 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
-                        }
-                      }
-                    }
-                  }
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-                  "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-                  "dev": true,
-                  "optional": true
-                },
-                "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,
-                  "optional": true
-                },
-                "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,
-                  "optional": 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"
-                  },
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.27.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-                      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-                      "dev": true
-                    }
-                  }
-                },
-                "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,
-                  "optional": 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,
-                  "optional": 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,
-                  "optional": true
-                },
-                "safe-buffer": {
-                  "version": "5.1.1",
-                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                  "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-                  "dev": true
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-                  "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-                  "dev": true,
-                  "optional": true
-                },
-                "tough-cookie": {
-                  "version": "2.3.2",
-                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-                  "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "punycode": "1.4.1"
-                  },
-                  "dependencies": {
-                    "punycode": {
-                      "version": "1.4.1",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "tunnel-agent": {
-                  "version": "0.6.0",
-                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-                  "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "safe-buffer": "5.1.1"
-                  }
-                },
-                "uuid": {
-                  "version": "3.1.0",
-                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-                  "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
-                  "dev": true,
-                  "optional": true
-                }
-              }
-            },
-            "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.1.2"
-              },
-              "dependencies": {
-                "glob": {
-                  "version": "7.1.2",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-                  "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-                  "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"
-                  },
-                  "dependencies": {
-                    "fs.realpath": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                      "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"
-                      },
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                          "dev": true
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true
-                    },
-                    "minimatch": {
-                      "version": "3.0.4",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-                      "dev": true,
-                      "requires": {
-                        "brace-expansion": "1.1.8"
-                      },
-                      "dependencies": {
-                        "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"
-                          },
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "1.0.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-                              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-                              "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
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "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"
-                      },
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                          "dev": true
-                        }
-                      }
-                    },
-                    "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
-                    }
-                  }
-                }
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-              "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-              "dev": true,
-              "optional": 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"
-              },
-              "dependencies": {
-                "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"
-                  }
-                },
-                "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"
-                  },
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                      "dev": true
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.3",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                  "dev": true
-                }
-              }
-            },
-            "tar-pack": {
-              "version": "3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-              "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.3.2",
-                "rimraf": "2.6.1",
-                "tar": "2.2.1",
-                "uid-number": "0.0.6"
-              },
-              "dependencies": {
-                "debug": {
-                  "version": "2.6.8",
-                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-                  "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "ms": "2.0.0"
-                  },
-                  "dependencies": {
-                    "ms": {
-                      "version": "2.0.0",
-                      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                      "dev": true,
-                      "optional": 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"
-                  },
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-                      "dev": true
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true
-                    }
-                  }
-                },
-                "fstream-ignore": {
-                  "version": "1.0.5",
-                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-                  "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "fstream": "1.0.11",
-                    "inherits": "2.0.3",
-                    "minimatch": "3.0.4"
-                  },
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "minimatch": {
-                      "version": "3.0.4",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "brace-expansion": "1.1.8"
-                      },
-                      "dependencies": {
-                        "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,
-                          "optional": true,
-                          "requires": {
-                            "balanced-match": "1.0.0",
-                            "concat-map": "0.0.1"
-                          },
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "1.0.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-                              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-                              "dev": true,
-                              "optional": 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,
-                              "optional": true
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-                  "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-                  "dev": true,
-                  "optional": true,
-                  "requires": {
-                    "wrappy": "1.0.2"
-                  },
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.3.2",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
-                  "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
-                  "dev": true,
-                  "optional": 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"
-                  },
-                  "dependencies": {
-                    "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,
-                      "optional": true
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                      "dev": true,
-                      "optional": true
-                    },
-                    "isarray": {
-                      "version": "1.0.0",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                      "dev": true,
-                      "optional": 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,
-                      "optional": true
-                    },
-                    "safe-buffer": {
-                      "version": "5.1.1",
-                      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-                      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-                      "dev": true
-                    },
-                    "string_decoder": {
-                      "version": "1.0.3",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-                      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "safe-buffer": "5.1.1"
-                      }
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-                  "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-                  "dev": true,
-                  "optional": true
-                }
-              }
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.1",
+          "bundled": true,
+          "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",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.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
+        },
+        "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
+        },
+        "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.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.3.3",
+            "rimraf": "2.6.2",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "verror": {
+          "version": "1.10.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "1.3.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true
             }
           }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
         }
       }
     },
     "gtoken": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
-      "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
+      "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==",
       "dev": true,
       "requires": {
         "google-p12-pem": "0.1.2",
@@ -10244,30 +7008,11 @@
         "vinyl-fs": "0.3.14"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "semver": {
           "version": "4.3.6",
           "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
           "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
         }
       }
     },
@@ -10278,7 +7023,7 @@
       "dev": true,
       "requires": {
         "gulp-util": "2.2.20",
-        "rimraf": "2.6.1",
+        "rimraf": "2.6.2",
         "through2": "0.4.2"
       },
       "dependencies": {
@@ -10521,27 +7266,6 @@
         "v8flags": "2.1.1",
         "wreck": "6.3.0",
         "yargs": "3.32.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
       }
     },
     "gulp-connect": {
@@ -10844,6 +7568,12 @@
             }
           }
         },
+        "utils-merge": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+          "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
+          "dev": true
+        },
         "vary": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
@@ -10853,14 +7583,14 @@
       }
     },
     "gulp-conventional-changelog": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.6.tgz",
-      "integrity": "sha512-zJ3ZfEukUqzLmFTWA5r8k9D4UAsymq+zsgINJmTRhw+H6Q1O9iCgREeye0gxicmusm6z6jI0fz5wLvlS66cmFg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.7.tgz",
+      "integrity": "sha1-Azf2hLSeKTWOYj4W6UtJ8FotK/E=",
       "dev": true,
       "requires": {
         "add-stream": "1.0.0",
         "concat-stream": "1.6.0",
-        "conventional-changelog": "1.1.6",
+        "conventional-changelog": "1.1.7",
         "gulp-util": "3.0.8",
         "object-assign": "4.1.1",
         "through2": "2.0.3"
@@ -10877,23 +7607,10 @@
         "through2": "2.0.1"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "clone": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
+          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
           "dev": true
         },
         "clone-stats": {
@@ -10970,12 +7687,6 @@
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "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
-        },
         "through2": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
@@ -10992,7 +7703,7 @@
           "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
           "dev": true,
           "requires": {
-            "clone": "1.0.2",
+            "clone": "1.0.3",
             "clone-stats": "0.0.1",
             "replace-ext": "0.0.1"
           }
@@ -11079,7 +7790,7 @@
       "requires": {
         "gulp-util": "3.0.8",
         "lodash.clonedeep": "4.5.0",
-        "node-sass": "4.5.3",
+        "node-sass": "4.6.1",
         "through2": "2.0.3",
         "vinyl-sourcemaps-apply": "0.2.1"
       }
@@ -11120,23 +7831,10 @@
         "vinyl": "0.5.3"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "clone": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
+          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
           "dev": true
         },
         "clone-stats": {
@@ -11157,19 +7855,13 @@
           "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
           "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
-        },
         "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": "1.0.3",
             "clone-stats": "0.0.1",
             "replace-ext": "0.0.1"
           }
@@ -11232,7 +7924,7 @@
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "5.2.3",
+        "ajv": "5.3.0",
         "har-schema": "2.0.0"
       }
     },
@@ -11324,7 +8016,7 @@
         "boom": "4.3.1",
         "cryptiles": "3.1.2",
         "hoek": "4.2.0",
-        "sntp": "2.0.2"
+        "sntp": "2.1.0"
       }
     },
     "he": {
@@ -11377,12 +8069,12 @@
       "dev": true
     },
     "html-encoding-sniffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz",
-      "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
       "dev": true,
       "requires": {
-        "whatwg-encoding": "1.0.1"
+        "whatwg-encoding": "1.0.3"
       }
     },
     "html-minifier": {
@@ -11398,7 +8090,7 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.1.4"
+        "uglify-js": "3.1.9"
       },
       "dependencies": {
         "source-map": {
@@ -11408,9 +8100,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.4.tgz",
-          "integrity": "sha512-DcbkPg11Lw2lAWpwCmQDX+qoR4JiII6ypsQmF6tscZtlxGPFAmSRUGuMoVT3/0EHqypVik/TpkH4ITiMJeQqQA==",
+          "version": "3.1.9",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.9.tgz",
+          "integrity": "sha512-ari2E89bD7f+fMU173NgF12JBcOhgoxeyuCs97h5K58IBENrnG9eVj2lFadrOPdqf0KifsxVmUQfzA2cHNxCZQ==",
           "dev": true,
           "requires": {
             "commander": "2.11.0",
@@ -11491,7 +8183,7 @@
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "extend": "3.0.1"
       }
     },
@@ -11503,15 +8195,15 @@
       "optional": true
     },
     "iconv-lite": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
       "dev": true
     },
     "ignore": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
-      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
       "dev": true
     },
     "image-diff": {
@@ -11629,41 +8321,20 @@
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
       "dev": true,
-      "requires": {
-        "ansi-escapes": "1.4.0",
-        "ansi-regex": "2.1.1",
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "cli-width": "2.2.0",
-        "figures": "1.7.0",
-        "lodash": "4.17.4",
-        "readline2": "1.0.1",
-        "run-async": "0.1.0",
-        "rx-lite": "3.1.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "through": "2.3.8"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "ansi-regex": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-width": "2.2.0",
+        "figures": "1.7.0",
+        "lodash": "4.17.4",
+        "readline2": "1.0.1",
+        "run-async": "0.1.0",
+        "rx-lite": "3.1.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "through": "2.3.8"
       }
     },
     "interpret": {
@@ -11679,9 +8350,9 @@
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz",
-      "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
+      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=",
       "dev": true,
       "optional": true
     },
@@ -11723,9 +8394,9 @@
       }
     },
     "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-builtin-module": {
@@ -12209,7 +8880,7 @@
       "requires": {
         "hoek": "2.16.3",
         "isemail": "1.2.0",
-        "moment": "2.19.1",
+        "moment": "2.19.2",
         "topo": "1.1.0"
       },
       "dependencies": {
@@ -12279,12 +8950,12 @@
         "acorn": "2.7.0",
         "acorn-globals": "1.0.9",
         "array-equal": "1.0.0",
-        "content-type-parser": "1.0.1",
+        "content-type-parser": "1.0.2",
         "cssom": "0.3.2",
         "cssstyle": "0.2.37",
         "escodegen": "1.9.0",
-        "html-encoding-sniffer": "1.0.1",
-        "iconv-lite": "0.4.15",
+        "html-encoding-sniffer": "1.0.2",
+        "iconv-lite": "0.4.19",
         "nwmatcher": "1.4.3",
         "parse5": "1.5.1",
         "request": "2.83.0",
@@ -12292,17 +8963,9 @@
         "symbol-tree": "3.2.2",
         "tough-cookie": "2.3.3",
         "webidl-conversions": "3.0.1",
-        "whatwg-encoding": "1.0.1",
+        "whatwg-encoding": "1.0.3",
         "whatwg-url": "3.1.0",
         "xml-name-validator": "2.0.1"
-      },
-      "dependencies": {
-        "parse5": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-          "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-          "dev": true
-        }
       }
     },
     "json-parse-helpfulerror": {
@@ -12326,15 +8989,6 @@
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
       "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",
@@ -12368,16 +9022,6 @@
         "through2": "0.6.5"
       },
       "dependencies": {
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -12390,6 +9034,16 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -12430,12 +9084,6 @@
         }
       }
     },
-    "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",
@@ -12454,6 +9102,16 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
+      }
+    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -12480,9 +9138,9 @@
       }
     },
     "jszip": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz",
-      "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
+      "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
       "dev": true,
       "requires": {
         "core-js": "2.3.0",
@@ -12550,7 +9208,7 @@
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
-        "body-parser": "1.17.2",
+        "body-parser": "1.18.2",
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
@@ -12570,7 +9228,7 @@
         "optimist": "0.6.1",
         "qjobs": "1.1.5",
         "range-parser": "1.2.0",
-        "rimraf": "2.6.1",
+        "rimraf": "2.6.2",
         "safe-buffer": "5.1.1",
         "socket.io": "1.7.3",
         "source-map": "0.5.7",
@@ -12680,7 +9338,7 @@
       "dev": true,
       "requires": {
         "q": "1.5.1",
-        "sauce-connect-launcher": "1.2.2",
+        "sauce-connect-launcher": "1.2.3",
         "saucelabs": "1.4.0",
         "wd": "1.4.1"
       },
@@ -12708,7 +9366,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "1.1.5"
+        "is-buffer": "1.1.6"
       }
     },
     "klaw": {
@@ -12748,38 +9406,12 @@
       "dev": true
     },
     "lazystream": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
-      "integrity": "sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "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
-        }
+        "readable-stream": "2.3.3"
       }
     },
     "lcid": {
@@ -12879,7 +9511,7 @@
         "lodash.isstring": "4.0.1",
         "lodash.mapvalues": "4.6.0",
         "rechoir": "0.6.2",
-        "resolve": "1.4.0"
+        "resolve": "1.5.0"
       }
     },
     "livereload-js": {
@@ -12889,16 +9521,33 @@
       "dev": true
     },
     "load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "parse-json": "2.2.0",
         "pify": "2.3.0",
-        "strip-bom": "3.0.0"
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "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"
+          }
+        }
       }
     },
     "locate-path": {
@@ -13218,27 +9867,6 @@
       "dev": true,
       "requires": {
         "chalk": "1.1.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
       }
     },
     "log4js": {
@@ -13287,8 +9915,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
       "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "longest": {
       "version": "1.0.1",
@@ -13357,19 +9984,6 @@
         "walkdir": "0.0.11"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "cli-cursor": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -13409,17 +10023,6 @@
           "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
           "dev": true
         },
-        "mz": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mz/-/mz-2.4.0.tgz",
-          "integrity": "sha1-mHupYk2JOVOIw3y0dB4sr03ROxo=",
-          "dev": true,
-          "requires": {
-            "any-promise": "1.3.0",
-            "object-assign": "4.1.1",
-            "thenify-all": "1.6.0"
-          }
-        },
         "onetime": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -13441,12 +10044,6 @@
             "log-symbols": "1.0.2"
           }
         },
-        "pluralize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
-          "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
-          "dev": true
-        },
         "rc": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
@@ -13474,12 +10071,6 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
           "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
           "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
         }
       }
     },
@@ -13493,12 +10084,12 @@
       }
     },
     "make-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
+      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
       "dev": true,
       "requires": {
-        "pify": "2.3.0"
+        "pify": "3.0.0"
       }
     },
     "make-error": {
@@ -13663,81 +10254,6 @@
         "read-pkg-up": "1.0.1",
         "redent": "1.0.0",
         "trim-newlines": "1.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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-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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        }
       }
     },
     "merge-descriptors": {
@@ -13772,17 +10288,6 @@
         "methods": "1.1.2",
         "parseurl": "1.3.2",
         "vary": "1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "methods": {
@@ -13958,9 +10463,9 @@
       }
     },
     "moment": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
-      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz",
+      "integrity": "sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA==",
       "dev": true
     },
     "morgan": {
@@ -13974,17 +10479,6 @@
         "depd": "1.1.1",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
       }
     },
     "ms": {
@@ -14099,9 +10593,9 @@
       "optional": true
     },
     "mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.4.0.tgz",
+      "integrity": "sha1-mHupYk2JOVOIw3y0dB4sr03ROxo=",
       "dev": true,
       "requires": {
         "any-promise": "1.3.0",
@@ -14208,7 +10702,7 @@
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
         "request": "2.83.0",
-        "rimraf": "2.6.1",
+        "rimraf": "2.6.2",
         "semver": "5.3.0",
         "tar": "2.2.1",
         "which": "1.3.0"
@@ -14239,16 +10733,10 @@
       "integrity": "sha1-iXNhjXJ9pVJqgwtH0HwNgD4KFcY=",
       "dev": true
     },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "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=",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.6.1.tgz",
+      "integrity": "sha512-0zQQ7tjEK5W8RfW9LiQrkzfo7uLZ0QtZGV69rdKn5cFzdweHLJ14lR6xLPvI6UimkXMO8m0qDsXwUCNdnqV3sA==",
       "dev": true,
       "requires": {
         "async-foreach": "0.1.3",
@@ -14271,19 +10759,6 @@
         "stdout-stream": "1.4.0"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "cross-spawn": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -14309,16 +10784,10 @@
           "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
           "dev": true,
           "requires": {
-            "glob": "7.1.2",
-            "lodash": "4.17.4",
-            "minimatch": "3.0.4"
-          }
-        },
-        "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
+            "glob": "7.1.2",
+            "lodash": "4.17.4",
+            "minimatch": "3.0.4"
+          }
         }
       }
     },
@@ -14615,8 +11084,7 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
       "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "ora": {
       "version": "0.2.3",
@@ -14628,27 +11096,6 @@
         "cli-cursor": "1.0.2",
         "cli-spinners": "0.1.2",
         "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        }
       }
     },
     "orchestrator": {
@@ -14873,6 +11320,12 @@
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
+    "parse5": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
+      "dev": true
+    },
     "parsejson": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
@@ -14979,13 +11432,22 @@
       "dev": true
     },
     "path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "pify": "2.3.0"
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "pause": {
@@ -15010,9 +11472,9 @@
       "dev": true
     },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
       "dev": true
     },
     "pinkie": {
@@ -15053,6 +11515,12 @@
       "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
       "dev": true
     },
+    "pluralize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+      "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
+      "dev": true
+    },
     "portfinder": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz",
@@ -15081,29 +11549,6 @@
         "js-base64": "2.3.2",
         "source-map": "0.5.7",
         "supports-color": "3.2.3"
-      },
-      "dependencies": {
-        "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": {
-            "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
-            }
-          }
-        }
       }
     },
     "postcss-less": {
@@ -15332,7 +11777,6 @@
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
       "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "ascli": "1.0.1",
         "bytebuffer": "5.0.1",
@@ -15355,7 +11799,7 @@
       "requires": {
         "@types/node": "6.0.90",
         "@types/q": "0.0.32",
-        "@types/selenium-webdriver": "2.53.42",
+        "@types/selenium-webdriver": "2.53.43",
         "blocking-proxy": "0.0.5",
         "chalk": "1.1.3",
         "glob": "7.1.2",
@@ -15382,19 +11826,6 @@
           "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
           "dev": true
         },
-        "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"
-          }
-        },
         "saucelabs": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
@@ -15404,12 +11835,6 @@
             "https-proxy-agent": "1.0.0"
           }
         },
-        "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
-        },
         "webdriver-manager": {
           "version": "12.0.6",
           "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz",
@@ -15424,7 +11849,7 @@
             "minimist": "1.2.0",
             "q": "1.4.1",
             "request": "2.83.0",
-            "rimraf": "2.6.1",
+            "rimraf": "2.6.2",
             "semver": "5.4.1",
             "xml2js": "0.4.19"
           }
@@ -15432,14 +11857,14 @@
       }
     },
     "proxy-addr": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz",
-      "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
+      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
       "dev": true,
       "optional": true,
       "requires": {
         "forwarded": "0.1.2",
-        "ipaddr.js": "1.4.0"
+        "ipaddr.js": "1.5.2"
       }
     },
     "prr": {
@@ -15568,7 +11993,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "1.1.5"
+                "is-buffer": "1.1.6"
               }
             }
           }
@@ -15579,7 +12004,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -15591,13 +12016,14 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz",
-      "integrity": "sha1-mUl2z2pQlqQRYoQEkvC9xdbn+5Y=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
       "dev": true,
       "requires": {
-        "bytes": "2.4.0",
-        "iconv-lite": "0.4.15",
+        "bytes": "3.0.0",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
         "unpipe": "1.0.0"
       }
     },
@@ -15643,26 +12069,45 @@
       }
     },
     "read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "load-json-file": "2.0.0",
+        "load-json-file": "1.1.0",
         "normalize-package-data": "2.4.0",
-        "path-type": "2.0.0"
+        "path-type": "1.1.0"
       }
     },
     "read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "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,
-      "optional": true,
       "requires": {
-        "find-up": "2.1.0",
-        "read-pkg": "2.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
+          }
+        }
       }
     },
     "readable-stream": {
@@ -15717,7 +12162,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "1.4.0"
+        "resolve": "1.5.0"
       }
     },
     "redent": {
@@ -15837,17 +12282,6 @@
         "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-          "dev": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        }
       }
     },
     "require-directory": {
@@ -15936,9 +12370,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
-      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
       "dev": true,
       "requires": {
         "path-parse": "1.0.5"
@@ -15996,9 +12430,9 @@
       }
     },
     "retry-request": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
-      "integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.1.tgz",
+      "integrity": "sha512-Sj3M3bC8ODJT+jfVxbTwvORRkFtc/AlDhhiMch5RJalLMAjz6+lIf5Q/Ox2esAM4tXcAYfG4ecNHPtaGNWIqvQ==",
       "dev": true,
       "requires": {
         "request": "2.83.0",
@@ -16022,9 +12456,9 @@
       }
     },
     "rimraf": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
         "glob": "7.1.2"
@@ -16063,7 +12497,7 @@
         "browser-resolve": "1.11.2",
         "builtin-modules": "1.1.1",
         "is-module": "1.0.0",
-        "resolve": "1.4.0"
+        "resolve": "1.5.0"
       }
     },
     "router": {
@@ -16087,26 +12521,11 @@
           "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
           "dev": true
         },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
           "dev": true
-        },
-        "utils-merge": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-          "dev": true
         }
       }
     },
@@ -16142,9 +12561,9 @@
       "dev": true
     },
     "rxjs": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.0.tgz",
-      "integrity": "sha512-vmvP5y/oJIJmXKHY36PIjVeI/46Sny6BMBa7/ou2zsNz1PiqU/Gtcz1GujnHz5Qlxncv+J9VlWmttnshqFj3Kg==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
+      "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
       "requires": {
         "symbol-observable": "1.0.4"
       }
@@ -16164,7 +12583,7 @@
         "es6-promise": "3.3.1",
         "graceful-fs": "4.1.11",
         "mkdirp": "0.5.1",
-        "rimraf": "2.6.1"
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "es6-promise": {
@@ -16193,79 +12612,6 @@
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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-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"
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
         "which-module": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -16326,16 +12672,16 @@
       }
     },
     "sauce-connect-launcher": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.2.tgz",
-      "integrity": "sha1-c0bMj73EQxkTI0ObBzNFH181IfI=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.3.tgz",
+      "integrity": "sha1-0vkxrXro/avxlopEDnsgQXrKf4Y=",
       "dev": true,
       "requires": {
         "adm-zip": "0.4.7",
-        "async": "2.5.0",
+        "async": "2.6.0",
         "https-proxy-agent": "1.0.0",
         "lodash": "4.17.4",
-        "rimraf": "2.6.1"
+        "rimraf": "2.6.2"
       }
     },
     "saucelabs": {
@@ -16352,100 +12698,38 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
-    },
-    "scss-bundle": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-2.1.0.tgz",
-      "integrity": "sha512-8TJaz8f5FMyyH2Se0mxfQY6CKaFb8gxyIE0qPHxk4Dfx7x8IhnvIIXyZwh0O5XK+uD0L4/gQkkRVT5zW+GcJcw==",
-      "dev": true,
-      "requires": {
-        "archy": "1.0.0",
-        "globs": "0.1.3",
-        "mkdirp": "0.5.1",
-        "mz": "2.7.0",
-        "node-sass": "4.5.3",
-        "pretty-bytes": "4.0.2",
-        "promise": "7.3.1",
-        "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
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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-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"
-          }
-        },
-        "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"
-          }
+    },
+    "scss-bundle": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/scss-bundle/-/scss-bundle-2.1.0.tgz",
+      "integrity": "sha512-8TJaz8f5FMyyH2Se0mxfQY6CKaFb8gxyIE0qPHxk4Dfx7x8IhnvIIXyZwh0O5XK+uD0L4/gQkkRVT5zW+GcJcw==",
+      "dev": true,
+      "requires": {
+        "archy": "1.0.0",
+        "globs": "0.1.3",
+        "mkdirp": "0.5.1",
+        "mz": "2.7.0",
+        "node-sass": "4.6.1",
+        "pretty-bytes": "4.0.2",
+        "promise": "7.3.1",
+        "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
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+        "mz": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+          "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
           "dev": true,
           "requires": {
-            "is-utf8": "0.2.1"
+            "any-promise": "1.3.0",
+            "object-assign": "4.1.1",
+            "thenify-all": "1.6.0"
           }
         },
         "which-module": {
@@ -16513,8 +12797,8 @@
       "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
-        "jszip": "3.1.4",
-        "rimraf": "2.6.1",
+        "jszip": "3.1.5",
+        "rimraf": "2.6.2",
         "tmp": "0.0.30",
         "xml2js": "0.4.19"
       },
@@ -16555,41 +12839,26 @@
       }
     },
     "send": {
-      "version": "0.15.4",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz",
-      "integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
+      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
       "dev": true,
       "requires": {
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "depd": "1.1.1",
         "destroy": "1.0.4",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
-        "fresh": "0.5.0",
+        "fresh": "0.5.2",
         "http-errors": "1.6.2",
-        "mime": "1.3.4",
+        "mime": "1.4.1",
         "ms": "2.0.0",
         "on-finished": "2.3.0",
         "range-parser": "1.2.0",
         "statuses": "1.3.1"
       },
       "dependencies": {
-        "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"
-          }
-        },
-        "mime": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-          "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
-          "dev": true
-        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -16715,16 +12984,16 @@
       }
     },
     "serve-static": {
-      "version": "1.12.4",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz",
-      "integrity": "sha1-m2qpjutyU8Tu3Ewfb9vKYJkBqWE=",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
+      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
       "dev": true,
       "optional": true,
       "requires": {
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "parseurl": "1.3.2",
-        "send": "0.15.4"
+        "send": "0.16.1"
       }
     },
     "set-blocking": {
@@ -16871,9 +13140,9 @@
       "dev": true
     },
     "sntp": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
       "dev": true,
       "requires": {
         "hoek": "4.2.0"
@@ -17109,7 +13378,7 @@
       "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
       "dev": true,
       "requires": {
-        "async": "2.5.0",
+        "async": "2.6.0",
         "is-stream-ended": "0.1.3"
       }
     },
@@ -17230,6 +13499,15 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -17263,15 +13541,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "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"
-      }
-    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -17300,10 +13569,14 @@
       }
     },
     "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
+      "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"
+      }
     },
     "strip-eof": {
       "version": "1.0.0",
@@ -17358,19 +13631,6 @@
         "write-file-stdout": "0.0.2"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -17391,12 +13651,6 @@
             "log-symbols": "1.0.2",
             "postcss": "5.2.18"
           }
-        },
-        "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
         }
       }
     },
@@ -17408,10 +13662,10 @@
       "requires": {
         "autoprefixer": "6.7.7",
         "balanced-match": "0.4.2",
-        "chalk": "2.2.0",
+        "chalk": "2.3.0",
         "colorguard": "1.2.0",
         "cosmiconfig": "2.2.2",
-        "debug": "2.6.7",
+        "debug": "2.6.9",
         "doiuse": "2.6.0",
         "execall": "1.0.0",
         "file-entry-cache": "2.0.0",
@@ -17419,7 +13673,7 @@
         "globby": "6.1.0",
         "globjoin": "0.1.4",
         "html-tags": "2.0.0",
-        "ignore": "3.3.5",
+        "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
         "known-css-properties": "0.2.0",
         "lodash": "4.17.4",
@@ -17459,7 +13713,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "balanced-match": {
@@ -17469,9 +13723,9 @@
           "dev": true
         },
         "chalk": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
-          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -17485,19 +13739,6 @@
           "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
           "dev": true
         },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
         "has-flag": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
@@ -17510,6 +13751,12 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -17624,19 +13871,6 @@
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
           "dev": true
         },
-        "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"
-          }
-        },
         "configstore": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
@@ -17673,7 +13907,7 @@
             "jsonfile": "2.4.0",
             "klaw": "1.3.1",
             "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.1"
+            "rimraf": "2.6.2"
           }
         },
         "isarray": {
@@ -17691,12 +13925,6 @@
             "isarray": "0.0.1"
           }
         },
-        "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
-        },
         "update-notifier": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
@@ -17810,9 +14038,9 @@
       "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
-        "ajv": "5.2.3",
-        "ajv-keywords": "2.1.0",
-        "chalk": "2.2.0",
+        "ajv": "5.3.0",
+        "ajv-keywords": "2.1.1",
+        "chalk": "2.3.0",
         "lodash": "4.17.4",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1"
@@ -17830,13 +14058,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
-          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -17914,9 +14142,9 @@
       }
     },
     "tar-stream": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.2.2.tgz",
-      "integrity": "sha1-ljLyPZj9M9QWYbvewFSJEg3sYCg=",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
+      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
       "dev": true,
       "requires": {
         "bl": "1.2.1",
@@ -18241,7 +14469,7 @@
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
-        "chalk": "2.2.0",
+        "chalk": "2.3.0",
         "diff": "3.4.0",
         "make-error": "1.3.0",
         "minimist": "1.2.0",
@@ -18258,13 +14486,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
-          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -18306,6 +14534,14 @@
       "requires": {
         "strip-bom": "3.0.0",
         "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
       }
     },
     "tsconfig-paths": {
@@ -18364,15 +14600,15 @@
       "requires": {
         "babel-code-frame": "6.26.0",
         "builtin-modules": "1.1.1",
-        "chalk": "2.2.0",
+        "chalk": "2.3.0",
         "commander": "2.11.0",
         "diff": "3.4.0",
         "glob": "7.1.2",
         "minimatch": "3.0.4",
-        "resolve": "1.4.0",
+        "resolve": "1.5.0",
         "semver": "5.4.1",
         "tslib": "1.8.0",
-        "tsutils": "2.12.1"
+        "tsutils": "2.12.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -18381,13 +14617,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0"
+            "color-convert": "1.9.1"
           }
         },
         "chalk": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
-          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -18419,9 +14655,9 @@
       "dev": true
     },
     "tsutils": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.1.tgz",
-      "integrity": "sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ=",
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz",
+      "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
@@ -18673,7 +14909,7 @@
             "graceful-fs": "3.0.11",
             "inherits": "2.0.3",
             "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
+            "rimraf": "2.6.2"
           }
         },
         "graceful-fs": {
@@ -18732,19 +14968,6 @@
         "string-length": "1.0.1"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "configstore": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
@@ -18815,12 +15038,6 @@
             "is-finite": "1.0.2"
           }
         },
-        "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
-        },
         "timed-out": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
@@ -18937,7 +15154,7 @@
         "i": "0.3.6",
         "mkdirp": "0.5.1",
         "ncp": "1.0.1",
-        "rimraf": "2.6.1"
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "async": {
@@ -18950,9 +15167,9 @@
       }
     },
     "utils-merge": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
       "dev": true
     },
     "uuid": {
@@ -19104,16 +15321,6 @@
           "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",
@@ -19191,7 +15398,7 @@
             "glob": "7.1.2",
             "lodash": "4.16.2",
             "readable-stream": "2.3.3",
-            "tar-stream": "1.5.4",
+            "tar-stream": "1.5.5",
             "walkdir": "0.0.11",
             "zip-stream": "1.2.0"
           }
@@ -19232,47 +15439,6 @@
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
           "dev": true
         },
-        "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"
-          }
-        },
-        "compress-commons": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
-          "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
-          "dev": true,
-          "requires": {
-            "buffer-crc32": "0.2.13",
-            "crc32-stream": "2.0.0",
-            "normalize-path": "2.1.1",
-            "readable-stream": "2.3.3"
-          }
-        },
-        "crc": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
-          "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
-          "dev": true
-        },
-        "crc32-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
-          "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
-          "dev": true,
-          "requires": {
-            "crc": "3.5.0",
-            "readable-stream": "2.3.3"
-          }
-        },
         "cryptiles": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -19383,41 +15549,11 @@
             "hoek": "2.16.3"
           }
         },
-        "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
-        },
-        "tar-stream": {
-          "version": "1.5.4",
-          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
-          "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=",
-          "dev": true,
-          "requires": {
-            "bl": "1.2.1",
-            "end-of-stream": "1.4.0",
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        },
         "tunnel-agent": {
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
           "dev": true
-        },
-        "zip-stream": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
-          "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
-          "dev": true,
-          "requires": {
-            "archiver-utils": "1.3.0",
-            "compress-commons": "1.2.2",
-            "lodash": "4.16.2",
-            "readable-stream": "2.3.3"
-          }
         }
       }
     },
@@ -19433,7 +15569,7 @@
       "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=",
       "dev": true,
       "requires": {
-        "@types/selenium-webdriver": "2.53.42",
+        "@types/selenium-webdriver": "2.53.43",
         "selenium-webdriver": "2.53.3"
       },
       "dependencies": {
@@ -19456,7 +15592,7 @@
           "dev": true,
           "requires": {
             "adm-zip": "0.4.4",
-            "rimraf": "2.6.1",
+            "rimraf": "2.6.2",
             "tmp": "0.0.24",
             "ws": "1.1.2",
             "xml2js": "0.4.4"
@@ -19493,30 +15629,22 @@
       "dev": true,
       "requires": {
         "http-parser-js": "0.4.9",
-        "websocket-extensions": "0.1.2"
+        "websocket-extensions": "0.1.3"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
-      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
     "whatwg-encoding": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz",
-      "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",
+      "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.13"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.13",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
-          "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
-          "dev": true
-        }
+        "iconv-lite": "0.4.19"
       }
     },
     "whatwg-url": {
@@ -19727,6 +15855,12 @@
       "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
       "dev": true
     },
+    "xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+      "dev": true
+    },
     "xmlhttprequest-ssl": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
@@ -19767,9 +15901,9 @@
       }
     },
     "yargs-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz",
+      "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -19798,46 +15932,15 @@
       "dev": true
     },
     "zip-stream": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.6.0.tgz",
-      "integrity": "sha1-7pM67ZlvsYs0SpGuO10mTOxegSs=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
+      "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
       "dev": true,
       "requires": {
-        "compress-commons": "0.3.0",
-        "lodash": "3.10.1",
-        "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
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
-          "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
-        }
+        "archiver-utils": "1.3.0",
+        "compress-commons": "1.2.2",
+        "lodash": "4.17.4",
+        "readable-stream": "2.3.3"
       }
     },
     "zone.js": {
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index 5ed869374b5d..25ea69b40465 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -468,7 +468,7 @@ describe('CdkTable', () => {
     dynamicDataSourceFixture.detectChanges();
 
     // Expect that the component has no data source and the table element reflects empty data.
-    expect(component.dataSource).toBe(undefined);
+    expect(component.dataSource).toBeUndefined();
     expectTableToMatchContent(tableElement, [
       ['Column A']
     ]);

From cd12561cb017db7b7ecf960c1c7d17eb22296b27 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 14 Nov 2017 10:08:39 -0800
Subject: [PATCH 476/575] chore(select): organize up tests to better scope
 compilation (#8342)

---
 src/lib/select/select.spec.ts | 4929 +++++++++++++++++----------------
 1 file changed, 2503 insertions(+), 2426 deletions(-)

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index e1b0625bb95f..985a25735d48 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -19,7 +19,15 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
-import {ComponentFixture, fakeAsync, flush, inject, TestBed, tick} from '@angular/core/testing';
+import {
+  async,
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import {
   ControlValueAccessor,
   FormControl,
@@ -47,7 +55,7 @@ import {MatSelect} from './select';
 import {
   getMatSelectDynamicMultipleError,
   getMatSelectNonArrayValueError,
-  getMatSelectNonFunctionValueError
+  getMatSelectNonFunctionValueError,
 } from './select-errors';
 
 /** The debounce interval when typing letters to select an option. */
@@ -62,3208 +70,3285 @@ describe('MatSelect', () => {
   let scrolledSubject = new Subject();
   let viewportRuler: ViewportRuler;
 
-  beforeEach(fakeAsync(() => {
+  // Providers used for all mat-select tests
+  const commonProviders = [
+    {
+      provide: OverlayContainer, useFactory: () => {
+        overlayContainerElement = document.createElement('div') as HTMLElement;
+        overlayContainerElement.classList.add('cdk-overlay-container');
+
+        document.body.appendChild(overlayContainerElement);
+
+        // remove body padding to keep consistent cross-browser
+        document.body.style.padding = '0';
+        document.body.style.margin = '0';
+
+        return {getContainerElement: () => overlayContainerElement};
+      },
+    },
+    {provide: Directionality, useFactory: () => dir = {value: 'ltr'}},
+    {
+      provide: ScrollDispatcher, useFactory: () => ({
+        scrolled: () => scrolledSubject.asObservable(),
+      }),
+    },
+  ];
+
+  // NgModule imports used for all mat-select tests.
+  const commonModuleImports = [
+    MatFormFieldModule,
+    MatSelectModule,
+    ReactiveFormsModule,
+    FormsModule,
+    NoopAnimationsModule,
+  ];
+
+  /**
+   * Configures the test module for MatSelect with the given declarations. This is broken out so
+   * that we're only compiling the necessary test components for each test in order to speed up
+   * overall test time.
+   * @param declarations Components to declare for this block
+   */
+  function configureMatSelectTestingModule(declarations) {
     TestBed.configureTestingModule({
-      imports: [
-        MatFormFieldModule,
-        MatSelectModule,
-        ReactiveFormsModule,
-        FormsModule,
-        NoopAnimationsModule
-      ],
-      declarations: [
+      imports: commonModuleImports,
+      declarations: declarations,
+      providers: commonProviders,
+    }).compileComponents();
+  }
+
+  afterEach(() => {
+    document.body.removeChild(overlayContainerElement);
+  });
+
+  describe('core', () => {
+    beforeEach(async(() => {
+      configureMatSelectTestingModule([
         BasicSelect,
-        NgModelSelect,
-        ManySelects,
-        NgIfSelect,
-        SelectInitWithoutOptions,
-        SelectWithChangeEvent,
-        CustomSelectAccessor,
-        CompWithCustomSelect,
         MultiSelect,
-        FloatPlaceholderSelect,
-        SelectWithErrorSibling,
-        ThrowsErrorOnInit,
-        BasicSelectOnPush,
-        BasicSelectOnPushPreselected,
-        SelectWithPlainTabindex,
-        SelectEarlyAccessSibling,
-        BasicSelectInitiallyHidden,
-        BasicSelectNoPlaceholder,
-        BasicSelectWithTheming,
-        ResetValuesSelect,
-        FalsyValueSelect,
         SelectWithGroups,
-        InvalidSelectInForm,
-        BasicSelectWithoutForms,
-        BasicSelectWithoutFormsPreselected,
-        BasicSelectWithoutFormsMultiple,
-        SelectInsideFormGroup,
-        SelectWithCustomTrigger,
-        FalsyValueSelect,
-        SelectInsideFormGroup,
-        NgModelCompareWithSelect,
-        CustomErrorBehaviorSelect,
-        SingleSelectWithPreselectedArrayValues,
-      ],
-      providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div') as HTMLElement;
-          overlayContainerElement.classList.add('cdk-overlay-container');
-
-          document.body.appendChild(overlayContainerElement);
-
-          // remove body padding to keep consistent cross-browser
-          document.body.style.padding = '0';
-          document.body.style.margin = '0';
-
-          return {getContainerElement: () => overlayContainerElement};
-        }},
-        {provide: Directionality, useFactory: () => dir = { value: 'ltr' }},
-        {provide: ScrollDispatcher, useFactory: () => ({
-          scrolled: () => scrolledSubject.asObservable()
-        })}
-      ]
-    }).compileComponents();
-  }));
+      ]);
+    }));
 
-  beforeEach(fakeAsync(inject([ViewportRuler], (_ruler: ViewportRuler) => {
-    viewportRuler = _ruler;
-  })));
+    describe('accessibility', () => {
+      describe('for select', () => {
+        let fixture: ComponentFixture<BasicSelect>;
+        let select: HTMLElement;
 
-  afterEach(fakeAsync(() => {
-    document.body.removeChild(overlayContainerElement);
-  }));
+        beforeEach(fakeAsync(() => {
+          fixture = TestBed.createComponent(BasicSelect);
+          fixture.detectChanges();
+          select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+        }));
 
-  it('should select the proper option when the list of options is initialized at a later point',
-      fakeAsync(() => {
-        let fixture = TestBed.createComponent(SelectInitWithoutOptions);
-        let instance = fixture.componentInstance;
+        it('should set the role of the select to listbox', fakeAsync(() => {
+          expect(select.getAttribute('role')).toEqual('listbox');
+        }));
 
-        fixture.detectChanges();
-        flush();
+        it('should set the aria label of the select to the placeholder', fakeAsync(() => {
+          expect(select.getAttribute('aria-label')).toEqual('Food');
+        }));
 
-        // Wait for the initial writeValue promise.
-        expect(instance.select.selected).toBeFalsy();
+        it('should support setting a custom aria-label', fakeAsync(() => {
+          fixture.componentInstance.ariaLabel = 'Custom Label';
+          fixture.detectChanges();
 
-        instance.addOptions();
-        fixture.detectChanges();
-        flush();
+          expect(select.getAttribute('aria-label')).toEqual('Custom Label');
+        }));
 
-        // Wait for the next writeValue promise.
-        expect(instance.select.selected).toBe(instance.options.toArray()[1]);
-      }));
+        it('should not set an aria-label if aria-labelledby is specified', fakeAsync(() => {
+          fixture.componentInstance.ariaLabelledby = 'myLabelId';
+          fixture.detectChanges();
 
-  describe('overlay panel', () => {
-    let fixture: ComponentFixture<BasicSelect>;
-    let trigger: HTMLElement;
+          expect(select.getAttribute('aria-label')).toBeFalsy('Expected no aria-label to be set.');
+          expect(select.getAttribute('aria-labelledby')).toBe('myLabelId');
+        }));
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    }));
+        it('should not have aria-labelledby in the DOM if it`s not specified', fakeAsync(() => {
+          fixture.detectChanges();
+          expect(select.hasAttribute('aria-labelledby')).toBeFalsy();
+        }));
 
-    it('should open the panel when trigger is clicked', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        it('should set the tabindex of the select to 0 by default', fakeAsync(() => {
+          expect(select.getAttribute('tabindex')).toEqual('0');
+        }));
 
-      expect(fixture.componentInstance.select.panelOpen).toBe(true);
-      expect(overlayContainerElement.textContent).toContain('Steak');
-      expect(overlayContainerElement.textContent).toContain('Pizza');
-      expect(overlayContainerElement.textContent).toContain('Tacos');
-    }));
+        it('should be able to override the tabindex', fakeAsync(() => {
+          fixture.componentInstance.tabIndexOverride = 3;
+          fixture.detectChanges();
 
-    it('should close the panel when an item is clicked', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(select.getAttribute('tabindex')).toBe('3');
+        }));
 
-      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
-      option.click();
-      fixture.detectChanges();
-      flush();
+        it('should set aria-required for required selects', fakeAsync(() => {
+          expect(select.getAttribute('aria-required'))
+              .toEqual('false', `Expected aria-required attr to be false for normal selects.`);
 
-      expect(overlayContainerElement.textContent).toEqual('');
-      expect(fixture.componentInstance.select.panelOpen).toBe(false);
-    }));
+          fixture.componentInstance.isRequired = true;
+          fixture.detectChanges();
 
-    it('should close the panel when a click occurs outside the panel', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(select.getAttribute('aria-required'))
+              .toEqual('true', `Expected aria-required attr to be true for required selects.`);
+        }));
 
-      const backdrop =
-          overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+        it('should set the mat-select-required class for required selects', fakeAsync(() => {
+          expect(select.classList).not.toContain(
+              'mat-select-required', `Expected the mat-select-required class not to be set.`);
 
-      backdrop.click();
-      fixture.detectChanges();
-      flush();
+          fixture.componentInstance.isRequired = true;
+          fixture.detectChanges();
 
-      expect(overlayContainerElement.textContent).toEqual('');
-      expect(fixture.componentInstance.select.panelOpen).toBe(false);
-    }));
+          expect(select.classList).toContain(
+              'mat-select-required', `Expected the mat-select-required class to be set.`);
+        }));
 
-    it('should set the width of the overlay based on the trigger', fakeAsync(() => {
-      trigger.style.width = '200px';
+        it('should set aria-invalid for selects that are invalid and touched', fakeAsync(() => {
+          expect(select.getAttribute('aria-invalid'))
+              .toEqual('false', `Expected aria-invalid attr to be false for valid selects.`);
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          fixture.componentInstance.isRequired = true;
+          fixture.componentInstance.control.markAsTouched();
+          fixture.detectChanges();
 
-      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-      expect(pane.style.minWidth).toBe('200px');
-    }));
+          expect(select.getAttribute('aria-invalid'))
+              .toEqual('true', `Expected aria-invalid attr to be true for invalid selects.`);
+        }));
 
-    it('should set the width of the overlay if the element was hidden initially', fakeAsync(() => {
-      let initiallyHidden = TestBed.createComponent(BasicSelectInitiallyHidden);
+        it('should set aria-disabled for disabled selects', fakeAsync(() => {
+          expect(select.getAttribute('aria-disabled')).toEqual('false');
 
-      initiallyHidden.detectChanges();
-      trigger = initiallyHidden.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      trigger.style.width = '200px';
+          fixture.componentInstance.control.disable();
+          fixture.detectChanges();
 
-      initiallyHidden.componentInstance.isVisible = true;
-      initiallyHidden.detectChanges();
+          expect(select.getAttribute('aria-disabled')).toEqual('true');
+        }));
 
-      trigger.click();
-      initiallyHidden.detectChanges();
-      flush();
+        it('should set the tabindex of the select to -1 if disabled', fakeAsync(() => {
+          fixture.componentInstance.control.disable();
+          fixture.detectChanges();
+          expect(select.getAttribute('tabindex')).toEqual('-1');
 
-      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-      expect(pane.style.minWidth).toBe('200px');
-    }));
+          fixture.componentInstance.control.enable();
+          fixture.detectChanges();
+          expect(select.getAttribute('tabindex')).toEqual('0');
+        }));
 
-    it('should not attempt to open a select that does not have any options', fakeAsync(() => {
-      fixture.componentInstance.foods = [];
-      fixture.detectChanges();
+        it('should select options via the arrow keys on a closed select', fakeAsync(() => {
+          const formControl = fixture.componentInstance.control;
+          const options = fixture.componentInstance.options.toArray();
 
-      trigger.click();
-      fixture.detectChanges();
+          expect(formControl.value).toBeFalsy('Expected no initial value.');
 
-      expect(fixture.componentInstance.select.panelOpen).toBe(false);
-    }));
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-    it('should set the width of the overlay if there is no placeholder', fakeAsync(() => {
-      let noPlaceholder = TestBed.createComponent(BasicSelectNoPlaceholder);
+          expect(options[0].selected).toBe(true, 'Expected first option to be selected.');
+          expect(formControl.value).toBe(options[0].value,
+              'Expected value from first option to have been set on the model.');
 
-      noPlaceholder.detectChanges();
-      trigger = noPlaceholder.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-      trigger.click();
-      noPlaceholder.detectChanges();
-      flush();
+          // Note that the third option is skipped, because it is disabled.
+          expect(options[3].selected).toBe(true, 'Expected fourth option to be selected.');
+          expect(formControl.value).toBe(options[3].value,
+              'Expected value from fourth option to have been set on the model.');
 
-      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-      expect(parseInt(pane.style.minWidth as string)).toBeGreaterThan(0);
-    }));
+          dispatchKeyboardEvent(select, 'keydown', UP_ARROW);
 
-    it('should close the panel when tabbing out', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
+          expect(formControl.value).toBe(options[1].value,
+              'Expected value from second option to have been set on the model.');
+        }));
 
-      expect(fixture.componentInstance.select.panelOpen).toBe(true);
+        it('should be able to select options by typing on a closed select', fakeAsync(() => {
+          const formControl = fixture.componentInstance.control;
+          const options = fixture.componentInstance.options.toArray();
 
-      dispatchKeyboardEvent(trigger, 'keydown', TAB);
-      fixture.detectChanges();
-      flush();
+          expect(formControl.value).toBeFalsy('Expected no initial value.');
 
-      expect(fixture.componentInstance.select.panelOpen).toBe(false);
-    }));
+          dispatchEvent(select, createKeyboardEvent('keydown', 80, undefined, 'p'));
+          tick(200);
 
-    it('should focus the first option when pressing HOME', fakeAsync(() => {
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+          expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
+          expect(formControl.value).toBe(options[1].value,
+            'Expected value from second option to have been set on the model.');
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          dispatchEvent(select, createKeyboardEvent('keydown', 69, undefined, 'e'));
+          tick(200);
 
-      const event = dispatchKeyboardEvent(trigger, 'keydown', HOME);
-      fixture.detectChanges();
+          expect(options[5].selected).toBe(true, 'Expected sixth option to be selected.');
+          expect(formControl.value).toBe(options[5].value,
+            'Expected value from sixth option to have been set on the model.');
+        }));
 
-      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(0);
-      expect(event.defaultPrevented).toBe(true);
-    }));
+        it('should open the panel when pressing the arrow keys on a closed multiple select',
+            fakeAsync(() => {
+              fixture.destroy();
 
-    it('should focus the last option when pressing END', fakeAsync(() => {
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+              const multiFixture = TestBed.createComponent(MultiSelect);
+              const instance = multiFixture.componentInstance;
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+              multiFixture.detectChanges();
+              select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-      const event = dispatchKeyboardEvent(trigger, 'keydown', END);
-      fixture.detectChanges();
+              const initialValue = instance.control.value;
 
-      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(7);
-      expect(event.defaultPrevented).toBe(true);
-    }));
+              expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
 
-    it('should be able to set extra classes on the panel', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+              const event = dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-      const panel = overlayContainerElement.querySelector('.mat-select-panel') as HTMLElement;
+              expect(instance.select.panelOpen).toBe(true, 'Expected panel to be open.');
+              expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
+              expect(event.defaultPrevented).toBe(true, 'Expected default to be prevented.');
+            }));
 
-      expect(panel.classList).toContain('custom-one');
-      expect(panel.classList).toContain('custom-two');
-    }));
+        it('should do nothing when typing on a closed multi-select', fakeAsync(() => {
+          fixture.destroy();
 
-    it('should prevent the default action when pressing SPACE on an option', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+          const multiFixture = TestBed.createComponent(MultiSelect);
+          const instance = multiFixture.componentInstance;
 
-      const option = overlayContainerElement.querySelector('mat-option')!;
-      const event = dispatchKeyboardEvent(option, 'keydown', SPACE);
+          multiFixture.detectChanges();
+          select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-      expect(event.defaultPrevented).toBe(true);
-    }));
+          const initialValue = instance.control.value;
 
-    it('should prevent the default action when pressing ENTER on an option', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+          expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
 
-      const option = overlayContainerElement.querySelector('mat-option')!;
-      const event = dispatchKeyboardEvent(option, 'keydown', ENTER);
+          dispatchEvent(select, createKeyboardEvent('keydown', 80, undefined, 'p'));
 
-      expect(event.defaultPrevented).toBe(true);
-    }));
+          expect(instance.select.panelOpen).toBe(false, 'Expected panel to stay closed.');
+          expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
+        }));
 
-    it('should update disableRipple properly on each option', fakeAsync(() => {
-      const options = fixture.componentInstance.options.toArray();
+        it('should do nothing if the key manager did not change the active item', fakeAsync(() => {
+          const formControl = fixture.componentInstance.control;
 
-      expect(options.every(option => option.disableRipple === false))
-          .toBeTruthy('Expected all options to have disableRipple set to false initially.');
+          expect(formControl.value).toBeNull('Expected form control value to be empty.');
+          expect(formControl.pristine).toBe(true, 'Expected form control to be clean.');
 
-      fixture.componentInstance.disableRipple = true;
-      fixture.detectChanges();
+          dispatchKeyboardEvent(select, 'keydown', 16); // Press a random key.
 
-      expect(options.every(option => option.disableRipple === true))
-          .toBeTruthy('Expected all options to have disableRipple set to true.');
-    }));
+          expect(formControl.value).toBeNull('Expected form control value to stay empty.');
+          expect(formControl.pristine).toBe(true, 'Expected form control to stay clean.');
+        }));
 
-    it('should not show ripples if they were disabled', fakeAsync(() => {
-      fixture.componentInstance.disableRipple = true;
-      fixture.detectChanges();
+        it('should continue from the selected option when the value is set programmatically',
+            fakeAsync(() => {
+              const formControl = fixture.componentInstance.control;
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+              formControl.setValue('eggs-5');
+              fixture.detectChanges();
 
-      const option = overlayContainerElement.querySelector('mat-option')!;
+              dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-      dispatchFakeEvent(option, 'mousedown');
-      dispatchFakeEvent(option, 'mouseup');
+              expect(formControl.value).toBe('pasta-6');
+              expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
+            }));
 
-      expect(option.querySelectorAll('.mat-ripple-element').length).toBe(0);
-    }));
-  });
+        it('should not shift focus when the selected options are updated programmatically ' +
+            'in a multi select', fakeAsync(() => {
+          fixture.destroy();
 
-  describe('selection logic', () => {
-    let fixture: ComponentFixture<BasicSelect>;
-    let trigger: HTMLElement;
-    let formField: HTMLElement;
+          const multiFixture = TestBed.createComponent(MultiSelect);
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-    }));
+          multiFixture.detectChanges();
+          select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+          multiFixture.componentInstance.select.open();
+          multiFixture.detectChanges();
 
-    it('should not float placeholder if no option is selected', fakeAsync(() => {
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(false, 'placeholder should not be floating');
-    }));
+          const options =
+              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-    it('should focus the first option if no option is selected', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          options[3].focus();
+          expect(document.activeElement).toBe(options[3], 'Expected fourth option to be focused.');
 
-      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(0);
-    }));
+          multiFixture.componentInstance.control.setValue(['steak-0', 'sushi-7']);
+          multiFixture.detectChanges();
 
-    it('should select an option when it is clicked', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(document.activeElement)
+              .toBe(options[3], 'Expected fourth option to remain focused.');
+        }));
 
-      let option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
-      option.click();
-      fixture.detectChanges();
-      flush();
+        it('should not cycle through the options if the control is disabled', fakeAsync(() => {
+          const formControl = fixture.componentInstance.control;
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          formControl.setValue('eggs-5');
+          formControl.disable();
 
-      option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-      expect(option.classList).toContain('mat-selected');
-      expect(fixture.componentInstance.options.first.selected).toBe(true);
-      expect(fixture.componentInstance.select.selected)
-          .toBe(fixture.componentInstance.options.first);
-    }));
+          expect(formControl.value).toBe('eggs-5', 'Expected value to remain unchaged.');
+        }));
 
-    it('should deselect other options when one is selected', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        it('should not wrap selection after reaching the end of the options', fakeAsync(() => {
+          const lastOption = fixture.componentInstance.options.last;
 
-      let options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          fixture.componentInstance.options.forEach(() => {
+            dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+          });
 
-      options[0].click();
-      fixture.detectChanges();
-      flush();
+          expect(lastOption.selected).toBe(true, 'Expected last option to be selected.');
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-      options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList).not.toContain('mat-selected');
-      expect(options[2].classList).not.toContain('mat-selected');
+          expect(lastOption.selected).toBe(true, 'Expected last option to stay selected.');
+        }));
 
-      const optionInstances = fixture.componentInstance.options.toArray();
-      expect(optionInstances[1].selected).toBe(false);
-      expect(optionInstances[2].selected).toBe(false);
-    }));
+        it('should not open a multiple select when tabbing through', fakeAsync(() => {
+          fixture.destroy();
 
-    it('should deselect other options when one is programmatically selected', fakeAsync(() => {
-      let control = fixture.componentInstance.control;
-      let foods = fixture.componentInstance.foods;
+          const multiFixture = TestBed.createComponent(MultiSelect);
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          multiFixture.detectChanges();
+          select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-      let options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+          expect(multiFixture.componentInstance.select.panelOpen)
+              .toBe(false, 'Expected panel to be closed initially.');
 
-      options[0].click();
-      fixture.detectChanges();
-      flush();
+          dispatchKeyboardEvent(select, 'keydown', TAB);
 
-      control.setValue(foods[1].value);
-      fixture.detectChanges();
+          expect(multiFixture.componentInstance.select.panelOpen)
+              .toBe(false, 'Expected panel to stay closed.');
+        }));
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        it('should prevent the default action when pressing space', fakeAsync(() => {
+          const event = dispatchKeyboardEvent(select, 'keydown', SPACE);
+          expect(event.defaultPrevented).toBe(true);
+        }));
 
-      options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        it('should consider the selection a result of a user action when closed', fakeAsync(() => {
+          const option = fixture.componentInstance.options.first;
+          const spy = jasmine.createSpy('option selection spy');
+          const subscription =
+              option.onSelectionChange.pipe(map(e => e.isUserInput)).subscribe(spy);
 
-      expect(options[0].classList)
-          .not.toContain('mat-selected', 'Expected first option to no longer be selected');
-      expect(options[1].classList)
-          .toContain('mat-selected', 'Expected second option to be selected');
+          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+          expect(spy).toHaveBeenCalledWith(true);
 
-      const optionInstances = fixture.componentInstance.options.toArray();
+          subscription.unsubscribe();
+        }));
 
-      expect(optionInstances[0].selected)
-          .toBe(false, 'Expected first option to no longer be selected');
-      expect(optionInstances[1].selected)
-          .toBe(true, 'Expected second option to be selected');
-    }));
+        it('should be able to focus the select trigger', fakeAsync(() => {
+          document.body.focus(); // ensure that focus isn't on the trigger already
 
-    it('should remove selection if option has been removed', fakeAsync(() => {
-      let select = fixture.componentInstance.select;
+          fixture.componentInstance.select.focus();
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(document.activeElement).toBe(select, 'Expected select element to be focused.');
+        }));
 
-      let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
+        // Having `aria-hidden` on the trigger avoids issues where
+        // screen readers read out the wrong amount of options.
+        it('should set aria-hidden on the trigger element', fakeAsync(() => {
+          const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-      firstOption.click();
-      fixture.detectChanges();
+          expect(trigger.getAttribute('aria-hidden'))
+              .toBe('true', 'Expected aria-hidden to be true when the select is open.');
+        }));
 
-      expect(select.selected).toBe(select.options.first, 'Expected first option to be selected.');
+        it('should set `aria-multiselectable` to true on multi-select instances', fakeAsync(() => {
+          fixture.destroy();
 
-      fixture.componentInstance.foods = [];
-      fixture.detectChanges();
-      flush();
+          const multiFixture = TestBed.createComponent(MultiSelect);
 
-      expect(select.selected)
-          .toBeUndefined('Expected selection to be removed when option no longer exists.');
-    }));
+          multiFixture.detectChanges();
+          select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-    it('should display the selected option in the trigger', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(select.getAttribute('aria-multiselectable')).toBe('true');
+        }));
 
-      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
-      option.click();
-      fixture.detectChanges();
-      flush();
+        it('should set aria-multiselectable false on single-selection instances', fakeAsync(() => {
+          expect(select.getAttribute('aria-multiselectable')).toBe('false');
+        }));
 
-      const value = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
+        it('should set aria-activedescendant only while the panel is open', fakeAsync(() => {
+          fixture.componentInstance.control.setValue('chips-4');
+          fixture.detectChanges();
 
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(true, 'placeholder should be floating');
-      expect(value.textContent).toContain('Steak');
-    }));
+          const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-    it('should focus the selected option if an option is selected', fakeAsync(() => {
-      // must wait for initial writeValue promise to finish
-      flush();
+          expect(host.hasAttribute('aria-activedescendant'))
+              .toBe(false, 'Expected no aria-activedescendant on init.');
 
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+          fixture.componentInstance.select.open();
+          fixture.detectChanges();
+          flush();
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          const options = overlayContainerElement.querySelectorAll('mat-option');
 
-      // must wait for animation to finish
-      fixture.detectChanges();
-      expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(1);
-    }));
+          expect(host.getAttribute('aria-activedescendant'))
+              .toBe(options[4].id, 'Expected aria-activedescendant to match the active option.');
 
-    it('should select an option that was added after initialization', fakeAsync(() => {
-      fixture.componentInstance.foods.push({viewValue: 'Potatoes', value: 'potatoes-8'});
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          fixture.componentInstance.select.close();
+          fixture.detectChanges();
+          flush();
 
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      options[8].click();
-      fixture.detectChanges();
-      flush();
+          expect(host.hasAttribute('aria-activedescendant'))
+              .toBe(false, 'Expected no aria-activedescendant when closed.');
+        }));
 
-      expect(trigger.textContent).toContain('Potatoes');
-      expect(fixture.componentInstance.select.selected)
-          .toBe(fixture.componentInstance.options.last);
-    }));
+        it('should set aria-activedescendant based on the focused option', fakeAsync(() => {
+          const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
 
-    it('should not select disabled options', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      options[2].click();
-      fixture.detectChanges();
+          fixture.componentInstance.select.open();
+          fixture.detectChanges();
+          flush();
 
-      expect(fixture.componentInstance.select.panelOpen).toBe(true);
-      expect(options[2].classList).not.toContain('mat-selected');
-      expect(fixture.componentInstance.select.selected).toBeUndefined();
-    }));
+          const options = overlayContainerElement.querySelectorAll('mat-option');
 
-    it('should not select options inside a disabled group', fakeAsync(() => {
-      fixture.destroy();
+          expect(host.getAttribute('aria-activedescendant')).toBe(options[0].id);
 
-      const groupFixture = TestBed.createComponent(SelectWithGroups);
-      groupFixture.detectChanges();
-      groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
-      groupFixture.detectChanges();
+          [1, 2, 3].forEach(() => {
+            dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+            fixture.detectChanges();
+          });
 
-      const disabledGroup = overlayContainerElement.querySelectorAll('mat-optgroup')[1];
-      const options = disabledGroup.querySelectorAll('mat-option');
+          expect(host.getAttribute('aria-activedescendant')).toBe(options[4].id);
 
-      (options[0] as HTMLElement).click();
-      groupFixture.detectChanges();
+          dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
+          fixture.detectChanges();
 
-      expect(groupFixture.componentInstance.select.panelOpen).toBe(true);
-      expect(options[0].classList).not.toContain('mat-selected');
-      expect(groupFixture.componentInstance.select.selected).toBeUndefined();
-    }));
-  });
+          expect(host.getAttribute('aria-activedescendant')).toBe(options[3].id);
+        }));
 
-  describe('forms integration', () => {
-    let fixture: ComponentFixture<BasicSelect>;
-    let trigger: HTMLElement;
+      });
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    }));
+      describe('for options', () => {
+        let fixture: ComponentFixture<BasicSelect>;
+        let trigger: HTMLElement;
+        let options: NodeListOf<HTMLElement>;
 
-    it('should take an initial view value with reactive forms', fakeAsync(() => {
-      fixture.componentInstance.control = new FormControl('pizza-1');
-      fixture.detectChanges();
+        beforeEach(fakeAsync(() => {
+          fixture = TestBed.createComponent(BasicSelect);
+          fixture.detectChanges();
+          trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+          trigger.click();
+          fixture.detectChanges();
 
-      const value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value.nativeElement.textContent)
-          .toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
+          options =
+              overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        }));
 
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        it('should set the role of mat-option to option', fakeAsync(() => {
+          expect(options[0].getAttribute('role')).toEqual('option');
+          expect(options[1].getAttribute('role')).toEqual('option');
+          expect(options[2].getAttribute('role')).toEqual('option');
+        }));
 
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList)
-          .toContain('mat-selected',
-              `Expected option with the control's initial value to be selected.`);
-    }));
+        it('should set aria-selected on each option', fakeAsync(() => {
+          expect(options[0].getAttribute('aria-selected')).toEqual('false');
+          expect(options[1].getAttribute('aria-selected')).toEqual('false');
+          expect(options[2].getAttribute('aria-selected')).toEqual('false');
 
-    it('should set the view value from the form', fakeAsync(() => {
-      let value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value.nativeElement.textContent.trim()).toBe('');
+          options[1].click();
+          fixture.detectChanges();
 
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+          trigger.click();
+          fixture.detectChanges();
+          flush();
 
-      value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value.nativeElement.textContent)
-          .toContain('Pizza', `Expected trigger to be populated by the control's new value.`);
+          expect(options[0].getAttribute('aria-selected')).toEqual('false');
+          expect(options[1].getAttribute('aria-selected')).toEqual('true');
+          expect(options[2].getAttribute('aria-selected')).toEqual('false');
+        }));
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        it('should set the tabindex of each option according to disabled state', fakeAsync(() => {
+          expect(options[0].getAttribute('tabindex')).toEqual('0');
+          expect(options[1].getAttribute('tabindex')).toEqual('0');
+          expect(options[2].getAttribute('tabindex')).toEqual('-1');
+        }));
 
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList).toContain(
-          'mat-selected', `Expected option with the control's new value to be selected.`);
-    }));
+        it('should set aria-disabled for disabled options', fakeAsync(() => {
+          expect(options[0].getAttribute('aria-disabled')).toEqual('false');
+          expect(options[1].getAttribute('aria-disabled')).toEqual('false');
+          expect(options[2].getAttribute('aria-disabled')).toEqual('true');
 
-    it('should update the form value when the view changes', fakeAsync(() => {
-      expect(fixture.componentInstance.control.value)
-          .toEqual(null, `Expected the control's value to be empty initially.`);
+          fixture.componentInstance.foods[2]['disabled'] = false;
+          fixture.detectChanges();
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+          expect(options[0].getAttribute('aria-disabled')).toEqual('false');
+          expect(options[1].getAttribute('aria-disabled')).toEqual('false');
+          expect(options[2].getAttribute('aria-disabled')).toEqual('false');
+        }));
+      });
 
-      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
-      option.click();
-      fixture.detectChanges();
-      flush();
+      describe('for option groups', () => {
+        let fixture: ComponentFixture<SelectWithGroups>;
+        let trigger: HTMLElement;
+        let groups: NodeListOf<HTMLElement>;
 
-      expect(fixture.componentInstance.control.value)
-          .toEqual('steak-0', `Expected control's value to be set to the new option.`);
-    }));
+        beforeEach(fakeAsync(() => {
+          fixture = TestBed.createComponent(SelectWithGroups);
+          fixture.detectChanges();
+          trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+          trigger.click();
+          fixture.detectChanges();
+          groups =
+              overlayContainerElement.querySelectorAll('mat-optgroup') as NodeListOf<HTMLElement>;
+        }));
 
-    it('should clear the selection when a nonexistent option value is selected', fakeAsync(() => {
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+        it('should set the appropriate role', fakeAsync(() => {
+          expect(groups[0].getAttribute('role')).toBe('group');
+        }));
 
-      fixture.componentInstance.control.setValue('gibberish');
-      fixture.detectChanges();
+        it('should set the `aria-labelledby` attribute', fakeAsync(() => {
+          let group = groups[0];
+          let label = group.querySelector('label')!;
 
-      const value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value.nativeElement.textContent.trim())
-          .toBe('', `Expected trigger to be cleared when option value is not found.`);
-      expect(trigger.textContent)
-          .not.toContain('Pizza', `Expected trigger to be cleared when option value is not found.`);
+          expect(label.getAttribute('id')).toBeTruthy('Expected label to have an id.');
+          expect(group.getAttribute('aria-labelledby'))
+              .toBe(label.getAttribute('id'), 'Expected `aria-labelledby` to match the label id.');
+        }));
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        it('should set the `aria-disabled` attribute if the group is disabled', fakeAsync(() => {
+          expect(groups[1].getAttribute('aria-disabled')).toBe('true');
+        }));
+      });
+    });
 
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList)
-          .not.toContain('mat-selected', `Expected option with the old value not to be selected.`);
-    }));
+    describe('overlay panel', () => {
+      let fixture: ComponentFixture<BasicSelect>;
+      let trigger: HTMLElement;
 
+      beforeEach(fakeAsync(() => {
+        fixture = TestBed.createComponent(BasicSelect);
+        fixture.detectChanges();
+        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      }));
 
-    it('should clear the selection when the control is reset', fakeAsync(() => {
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+      it('should not throw when attempting to open too early', () => {
+        // Create component and then immediately open without running change detection
+        fixture = TestBed.createComponent(BasicSelect);
+        expect(() => fixture.componentInstance.select.open()).not.toThrow();
+      });
 
-      fixture.componentInstance.control.reset();
-      fixture.detectChanges();
+      it('should open the panel when trigger is clicked', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      const value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value.nativeElement.textContent.trim())
-          .toBe('', `Expected trigger to be cleared when option value is not found.`);
-      expect(trigger.textContent)
-          .not.toContain('Pizza', `Expected trigger to be cleared when option value is not found.`);
+        expect(fixture.componentInstance.select.panelOpen).toBe(true);
+        expect(overlayContainerElement.textContent).toContain('Steak');
+        expect(overlayContainerElement.textContent).toContain('Pizza');
+        expect(overlayContainerElement.textContent).toContain('Tacos');
+      }));
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+      it('should close the panel when an item is clicked', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      expect(options[1].classList)
-          .not.toContain('mat-selected', `Expected option with the old value not to be selected.`);
-    }));
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+        option.click();
+        fixture.detectChanges();
+        flush();
 
-    it('should set the control to touched when the select is touched', fakeAsync(() => {
-      expect(fixture.componentInstance.control.touched)
-          .toEqual(false, `Expected the control to start off as untouched.`);
+        expect(overlayContainerElement.textContent).toEqual('');
+        expect(fixture.componentInstance.select.panelOpen).toBe(false);
+      }));
 
-      trigger.click();
-      dispatchFakeEvent(trigger, 'blur');
-      fixture.detectChanges();
-      flush();
+      it('should close the panel when a click occurs outside the panel', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.control.touched)
-          .toEqual(false, `Expected the control to stay untouched when menu opened.`);
+        const backdrop =
+            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
 
-      const backdrop =
-          overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
-      backdrop.click();
-      dispatchFakeEvent(trigger, 'blur');
-      fixture.detectChanges();
-      flush();
+        backdrop.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.control.touched)
-          .toEqual(true, `Expected the control to be touched as soon as focus left the select.`);
-    }));
+        expect(overlayContainerElement.textContent).toEqual('');
+        expect(fixture.componentInstance.select.panelOpen).toBe(false);
+      }));
 
-    it('should not set touched when a disabled select is touched', fakeAsync(() => {
-      expect(fixture.componentInstance.control.touched)
-          .toBe(false, 'Expected the control to start off as untouched.');
+      it('should set the width of the overlay based on the trigger', fakeAsync(() => {
+        trigger.style.width = '200px';
 
-      fixture.componentInstance.control.disable();
-      dispatchFakeEvent(trigger, 'blur');
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.control.touched)
-          .toBe(false, 'Expected the control to stay untouched.');
-    }));
+        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+        expect(pane.style.minWidth).toBe('200px');
+      }));
 
-    it('should set the control to dirty when the select value changes in the DOM', fakeAsync(() => {
-      expect(fixture.componentInstance.control.dirty)
-          .toEqual(false, `Expected control to start out pristine.`);
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
 
-      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
-      option.click();
-      fixture.detectChanges();
-      flush();
+      it('should not attempt to open a select that does not have any options', fakeAsync(() => {
+        fixture.componentInstance.foods = [];
+        fixture.detectChanges();
 
-      expect(fixture.componentInstance.control.dirty)
-          .toEqual(true, `Expected control to be dirty after value was changed by user.`);
-    }));
+        trigger.click();
+        fixture.detectChanges();
 
-    it('should not set the control to dirty when the value changes programmatically',
-        fakeAsync(() => {
-          expect(fixture.componentInstance.control.dirty)
-              .toEqual(false, `Expected control to start out pristine.`);
+        expect(fixture.componentInstance.select.panelOpen).toBe(false);
+      }));
 
-          fixture.componentInstance.control.setValue('pizza-1');
 
-          expect(fixture.componentInstance.control.dirty)
-              .toEqual(false, `Expected control to stay pristine after programmatic change.`);
-        }));
 
-    it('should set an asterisk after the placeholder if the control is required', fakeAsync(() => {
-      let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
-      expect(requiredMarker)
-          .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
+      it('should close the panel when tabbing out', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      fixture.componentInstance.isRequired = true;
-      fixture.detectChanges();
+        expect(fixture.componentInstance.select.panelOpen).toBe(true);
 
-      requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
-      expect(requiredMarker)
-          .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
-    }));
+        dispatchKeyboardEvent(trigger, 'keydown', TAB);
+        fixture.detectChanges();
+        flush();
 
-    it('should be able to programmatically select a falsy option', fakeAsync(() => {
-      fixture.destroy();
+        expect(fixture.componentInstance.select.panelOpen).toBe(false);
+      }));
 
-      const falsyFixture = TestBed.createComponent(FalsyValueSelect);
+      it('should focus the first option when pressing HOME', fakeAsync(() => {
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
 
-      falsyFixture.detectChanges();
-      falsyFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
-      falsyFixture.componentInstance.control.setValue(0);
-      falsyFixture.detectChanges();
-      flush();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(falsyFixture.componentInstance.options.first.selected)
-          .toBe(true, 'Expected first option to be selected');
-      expect(overlayContainerElement.querySelectorAll('mat-option')[0].classList)
-          .toContain('mat-selected', 'Expected first option to be selected');
-    }));
-  });
+        const event = dispatchKeyboardEvent(trigger, 'keydown', HOME);
+        fixture.detectChanges();
 
-  describe('selection without Angular forms', () => {
-    it('should set the value when options are clicked', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
+        expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(0);
+        expect(event.defaultPrevented).toBe(true);
+      }));
 
-      fixture.detectChanges();
-      expect(fixture.componentInstance.selectedFood).toBeFalsy();
+      it('should focus the last option when pressing END', fakeAsync(() => {
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
 
-      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        const event = dispatchKeyboardEvent(trigger, 'keydown', END);
+        fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
-      fixture.detectChanges();
-      flush();
+        expect(fixture.componentInstance.select._keyManager.activeItemIndex).toBe(7);
+        expect(event.defaultPrevented).toBe(true);
+      }));
 
-      expect(fixture.componentInstance.selectedFood).toBe('steak-0');
-      expect(fixture.componentInstance.select.value).toBe('steak-0');
-      expect(trigger.textContent).toContain('Steak');
+      it('should be able to set extra classes on the panel', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        const panel = overlayContainerElement.querySelector('.mat-select-panel') as HTMLElement;
 
-      (overlayContainerElement.querySelectorAll('mat-option')[2] as HTMLElement).click();
-      fixture.detectChanges();
-      flush();
+        expect(panel.classList).toContain('custom-one');
+        expect(panel.classList).toContain('custom-two');
+      }));
 
-      expect(fixture.componentInstance.selectedFood).toBe('sandwich-2');
-      expect(fixture.componentInstance.select.value).toBe('sandwich-2');
-      expect(trigger.textContent).toContain('Sandwich');
-    }));
+      it('should prevent the default action when pressing SPACE on an option', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
 
-    it('should mark options as selected when the value is set', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
+        const option = overlayContainerElement.querySelector('mat-option')!;
+        const event = dispatchKeyboardEvent(option, 'keydown', SPACE);
 
-      fixture.detectChanges();
-      fixture.componentInstance.selectedFood = 'sandwich-2';
-      fixture.detectChanges();
+        expect(event.defaultPrevented).toBe(true);
+      }));
 
-      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      expect(trigger.textContent).toContain('Sandwich');
+      it('should prevent the default action when pressing ENTER on an option', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
 
-      trigger.click();
-      fixture.detectChanges();
+        const option = overlayContainerElement.querySelector('mat-option')!;
+        const event = dispatchKeyboardEvent(option, 'keydown', ENTER);
 
-      const option = overlayContainerElement.querySelectorAll('mat-option')[2];
+        expect(event.defaultPrevented).toBe(true);
+      }));
 
-      expect(option.classList).toContain('mat-selected');
-      expect(fixture.componentInstance.select.value).toBe('sandwich-2');
-    }));
+      it('should update disableRipple properly on each option', fakeAsync(() => {
+        const options = fixture.componentInstance.options.toArray();
 
-    it('should reset the placeholder when a null value is set', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
+        expect(options.every(option => option.disableRipple === false))
+            .toBeTruthy('Expected all options to have disableRipple set to false initially.');
 
-      fixture.detectChanges();
-      expect(fixture.componentInstance.selectedFood).toBeFalsy();
+        fixture.componentInstance.disableRipple = true;
+        fixture.detectChanges();
 
-      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        expect(options.every(option => option.disableRipple === true))
+            .toBeTruthy('Expected all options to have disableRipple set to true.');
+      }));
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+      it('should not show ripples if they were disabled', fakeAsync(() => {
+        fixture.componentInstance.disableRipple = true;
+        fixture.detectChanges();
 
-      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
-      fixture.detectChanges();
-      flush();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.selectedFood).toBe('steak-0');
-      expect(fixture.componentInstance.select.value).toBe('steak-0');
-      expect(trigger.textContent).toContain('Steak');
+        const option = overlayContainerElement.querySelector('mat-option')!;
 
-      fixture.componentInstance.selectedFood = null;
-      fixture.detectChanges();
+        dispatchFakeEvent(option, 'mousedown');
+        dispatchFakeEvent(option, 'mouseup');
 
-      expect(fixture.componentInstance.select.value).toBeNull();
-      expect(trigger.textContent).not.toContain('Steak');
-    }));
+        expect(option.querySelectorAll('.mat-ripple-element').length).toBe(0);
+      }));
+    });
 
-    it('should reflect the preselected value', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelectWithoutFormsPreselected);
+    describe('selection logic', () => {
+      let fixture: ComponentFixture<BasicSelect>;
+      let trigger: HTMLElement;
+      let formField: HTMLElement;
 
-      fixture.detectChanges();
-      flush();
+      beforeEach(fakeAsync(() => {
+        fixture = TestBed.createComponent(BasicSelect);
+        fixture.detectChanges();
+        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+      }));
 
-      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      fixture.detectChanges();
-      expect(trigger.textContent).toContain('Pizza');
+      it('should not float placeholder if no option is selected', fakeAsync(() => {
+        expect(formField.classList.contains('mat-form-field-should-float'))
+            .toBe(false, 'placeholder should not be floating');
+      }));
 
-      trigger.click();
-      fixture.detectChanges();
+      it('should focus the first option if no option is selected', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      const option = overlayContainerElement.querySelectorAll('mat-option')[1];
+        expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(0);
+      }));
 
-      expect(option.classList).toContain('mat-selected');
-      expect(fixture.componentInstance.select.value).toBe('pizza-1');
-    }));
+      it('should select an option when it is clicked', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-    it('should be able to select multiple values', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelectWithoutFormsMultiple);
+        let option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+        option.click();
+        fixture.detectChanges();
+        flush();
 
-      fixture.detectChanges();
-      expect(fixture.componentInstance.selectedFoods).toBeFalsy();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
-      trigger.click();
-      fixture.detectChanges();
+        expect(option.classList).toContain('mat-selected');
+        expect(fixture.componentInstance.options.first.selected).toBe(true);
+        expect(fixture.componentInstance.select.selected)
+            .toBe(fixture.componentInstance.options.first);
+      }));
 
-      const options =
-          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      it('should deselect other options when one is selected', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      options[0].click();
-      fixture.detectChanges();
+        let options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0']);
-      expect(fixture.componentInstance.select.value).toEqual(['steak-0']);
-      expect(trigger.textContent).toContain('Steak');
+        options[0].click();
+        fixture.detectChanges();
+        flush();
 
-      options[2].click();
-      fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0', 'sandwich-2']);
-      expect(fixture.componentInstance.select.value).toEqual(['steak-0', 'sandwich-2']);
-      expect(trigger.textContent).toContain('Steak, Sandwich');
+        options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[1].classList).not.toContain('mat-selected');
+        expect(options[2].classList).not.toContain('mat-selected');
 
-      options[1].click();
-      fixture.detectChanges();
+        const optionInstances = fixture.componentInstance.options.toArray();
+        expect(optionInstances[1].selected).toBe(false);
+        expect(optionInstances[2].selected).toBe(false);
+      }));
 
-      expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0', 'pizza-1', 'sandwich-2']);
-      expect(fixture.componentInstance.select.value).toEqual(['steak-0', 'pizza-1', 'sandwich-2']);
-      expect(trigger.textContent).toContain('Steak, Pizza, Sandwich');
-    }));
+      it('should deselect other options when one is programmatically selected', fakeAsync(() => {
+        let control = fixture.componentInstance.control;
+        let foods = fixture.componentInstance.foods;
 
-    it('should restore focus to the host element', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      fixture.detectChanges();
-      fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
-      fixture.detectChanges();
-      flush();
+        let options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
-      fixture.detectChanges();
-      flush();
+        options[0].click();
+        fixture.detectChanges();
+        flush();
 
-      const select = fixture.debugElement.nativeElement.querySelector('mat-select');
+        control.setValue(foods[1].value);
+        fixture.detectChanges();
 
-      expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
-    }));
-  });
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-  describe('disabled behavior', () => {
-    it('should disable itself when control is disabled programmatically', fakeAsync(() => {
-      const fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
+        options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-      fixture.componentInstance.control.disable();
-      fixture.detectChanges();
-      let trigger =
-          fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-          .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
+        expect(options[0].classList)
+            .not.toContain('mat-selected', 'Expected first option to no longer be selected');
+        expect(options[1].classList)
+            .toContain('mat-selected', 'Expected second option to be selected');
 
-      trigger.click();
-      fixture.detectChanges();
+        const optionInstances = fixture.componentInstance.options.toArray();
 
-      expect(overlayContainerElement.textContent)
-          .toEqual('', `Expected select panel to stay closed.`);
-      expect(fixture.componentInstance.select.panelOpen)
-          .toBe(false, `Expected select panelOpen property to stay false.`);
+        expect(optionInstances[0].selected)
+            .toBe(false, 'Expected first option to no longer be selected');
+        expect(optionInstances[1].selected)
+            .toBe(true, 'Expected second option to be selected');
+      }));
 
-      fixture.componentInstance.control.enable();
-      fixture.detectChanges();
-      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-          .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
+      it('should remove selection if option has been removed', fakeAsync(() => {
+        let select = fixture.componentInstance.select;
 
-      trigger.click();
-      fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(overlayContainerElement.textContent)
-          .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
-      expect(fixture.componentInstance.select.panelOpen)
-          .toBe(true, `Expected select panelOpen property to become true.`);
-    }));
+        let firstOption = overlayContainerElement.querySelectorAll('mat-option')[0] as HTMLElement;
 
-    it('should disable itself when control is disabled using the property', fakeAsync(() => {
-      const fixture = TestBed.createComponent(NgModelSelect);
-      fixture.detectChanges();
+        firstOption.click();
+        fixture.detectChanges();
 
-      fixture.componentInstance.isDisabled = true;
-      fixture.detectChanges();
-      flush();
+        expect(select.selected).toBe(select.options.first, 'Expected first option to be selected.');
 
-      fixture.detectChanges();
-      let trigger =
-          fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-          .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
+        fixture.componentInstance.foods = [];
+        fixture.detectChanges();
+        flush();
 
-      trigger.click();
-      fixture.detectChanges();
+        expect(select.selected)
+            .toBeUndefined('Expected selection to be removed when option no longer exists.');
+      }));
 
-      expect(overlayContainerElement.textContent)
-          .toEqual('', `Expected select panel to stay closed.`);
-      expect(fixture.componentInstance.select.panelOpen)
-          .toBe(false, `Expected select panelOpen property to stay false.`);
+      it('should display the selected option in the trigger', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      fixture.componentInstance.isDisabled = false;
-      fixture.detectChanges();
-      flush();
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+        option.click();
+        fixture.detectChanges();
+        flush();
 
-      fixture.detectChanges();
-      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
-          .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
+        const value = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
 
-      trigger.click();
-      fixture.detectChanges();
+        expect(formField.classList.contains('mat-form-field-should-float'))
+            .toBe(true, 'placeholder should be floating');
+        expect(value.textContent).toContain('Steak');
+      }));
 
-      expect(overlayContainerElement.textContent)
-          .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
-      expect(fixture.componentInstance.select.panelOpen)
-          .toBe(true, `Expected select panelOpen property to become true.`);
-    }));
+      it('should focus the selected option if an option is selected', fakeAsync(() => {
+        // must wait for initial writeValue promise to finish
+        flush();
 
-    it('should be able to preselect an array value in single-selection mode', fakeAsync(() => {
-      const fixture = TestBed.createComponent(SingleSelectWithPreselectedArrayValues);
-      fixture.detectChanges();
-      flush();
-      fixture.detectChanges();
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
 
-      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(trigger.textContent).toContain('Pizza');
-      expect(fixture.componentInstance.options.toArray()[1].selected).toBe(true);
-    }));
-  });
+        // must wait for animation to finish
+        fixture.detectChanges();
+        expect(fixture.componentInstance.select._keyManager.activeItemIndex).toEqual(1);
+      }));
 
-  describe('misc forms', () => {
-    it('should support use inside a custom value accessor', fakeAsync(() => {
-      const fixture = TestBed.createComponent(CompWithCustomSelect);
-      spyOn(fixture.componentInstance.customAccessor, 'writeValue');
-      fixture.detectChanges();
+      it('should select an option that was added after initialization', fakeAsync(() => {
+        fixture.componentInstance.foods.push({viewValue: 'Potatoes', value: 'potatoes-8'});
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.customAccessor.select.ngControl)
-          .toBeFalsy('Expected mat-select NOT to inherit control from parent value accessor.');
-      expect(fixture.componentInstance.customAccessor.writeValue).toHaveBeenCalled();
-    }));
-  });
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        options[8].click();
+        fixture.detectChanges();
+        flush();
 
-  describe('animations', () => {
-    let fixture: ComponentFixture<BasicSelect>;
-    let trigger: HTMLElement;
-    let formField: HTMLElement;
+        expect(trigger.textContent).toContain('Potatoes');
+        expect(fixture.componentInstance.select.selected)
+            .toBe(fixture.componentInstance.options.last);
+      }));
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
+      it('should not select disabled options', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
 
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-    }));
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        options[2].click();
+        fixture.detectChanges();
 
-    it('should float the placeholder when the panel is open and unselected', fakeAsync(() => {
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(false, 'Expected placeholder to initially have a normal position.');
+        expect(fixture.componentInstance.select.panelOpen).toBe(true);
+        expect(options[2].classList).not.toContain('mat-selected');
+        expect(fixture.componentInstance.select.selected).toBeUndefined();
+      }));
 
-      fixture.componentInstance.select.open();
-      fixture.detectChanges();
-      flush();
+      it('should not select options inside a disabled group', fakeAsync(() => {
+        fixture.destroy();
 
-      expect(formField.classList).toContain('mat-form-field-should-float',
-          'Expected placeholder to animate up to floating position.');
+        const groupFixture = TestBed.createComponent(SelectWithGroups);
+        groupFixture.detectChanges();
+        groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
+        groupFixture.detectChanges();
 
-      fixture.componentInstance.select.close();
-      fixture.detectChanges();
-      flush();
+        const disabledGroup = overlayContainerElement.querySelectorAll('mat-optgroup')[1];
+        const options = disabledGroup.querySelectorAll('mat-option');
 
-      expect(formField.classList).not.toContain('mat-form-field-should-float',
-          'Expected placeholder to animate back down to normal position.');
-    }));
+        (options[0] as HTMLElement).click();
+        groupFixture.detectChanges();
 
-    it('should add a class to the panel when the menu is done animating', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+        expect(groupFixture.componentInstance.select.panelOpen).toBe(true);
+        expect(options[0].classList).not.toContain('mat-selected');
+        expect(groupFixture.componentInstance.select.selected).toBeUndefined();
+      }));
 
-      const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
+      it('should not throw if triggerValue accessed with no selected value', fakeAsync(() => {
+        expect(() => fixture.componentInstance.select.triggerValue).not.toThrow();
+      }));
+    });
 
-      expect(panel.classList).not.toContain('mat-select-panel-done-animating');
+    describe('forms integration', () => {
+      let fixture: ComponentFixture<BasicSelect>;
+      let trigger: HTMLElement;
 
-      flush();
-      fixture.detectChanges();
+      beforeEach(fakeAsync(() => {
+        fixture = TestBed.createComponent(BasicSelect);
+        fixture.detectChanges();
+        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      }));
 
-      expect(panel.classList).toContain('mat-select-panel-done-animating');
-    }));
-  });
+      it('should take an initial view value with reactive forms', fakeAsync(() => {
+        fixture.componentInstance.control = new FormControl('pizza-1');
+        fixture.detectChanges();
 
-  describe('positioning', () => {
-    let fixture: ComponentFixture<BasicSelect>;
-    let trigger: HTMLElement;
-    let select: HTMLElement;
-    let formField: HTMLElement;
+        const value = fixture.debugElement.query(By.css('.mat-select-value'));
+        expect(value.nativeElement.textContent)
+            .toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelect);
-      fixture.detectChanges();
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-      formField = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
-    }));
+        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-    /**
-     * Asserts that the given option is aligned with the trigger.
-     * @param index The index of the option.
-     * @param selectInstance Instance of the `mat-select` component to check against.
-     */
-    function checkTriggerAlignedWithOption(index: number, selectInstance =
-        fixture.componentInstance.select): void {
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[1].classList)
+            .toContain('mat-selected',
+                `Expected option with the control's initial value to be selected.`);
+      }));
 
-      const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-      const triggerTop = trigger.getBoundingClientRect().top;
-      const overlayTop = overlayPane.getBoundingClientRect().top;
-      const options = overlayPane.querySelectorAll('mat-option');
-      const optionTop = options[index].getBoundingClientRect().top;
-      const triggerFontSize = parseInt(window.getComputedStyle(trigger)['font-size']);
-      const triggerLineHeightEm = 1.125;
+      it('should set the view value from the form', fakeAsync(() => {
+        let value = fixture.debugElement.query(By.css('.mat-select-value'));
+        expect(value.nativeElement.textContent.trim()).toBe('');
 
-      // Extra trigger height beyond the font size caused by the fact that the line-height is
-      // greater than 1em.
-      const triggerExtraLineSpaceAbove = (1 - triggerLineHeightEm) * triggerFontSize / 2;
-      const topDifference = Math.floor(optionTop) -
-          Math.floor(triggerTop - triggerFontSize - triggerExtraLineSpaceAbove);
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
 
-      // Expect the coordinates to be within a pixel of each other. We can't rely on comparing
-      // the exact value, because different browsers report the various sizes with slight (< 1px)
-      // deviations.
-      expect(Math.abs(topDifference) < 2)
-          .toBe(true, `Expected trigger to align with option ${index}.`);
+        value = fixture.debugElement.query(By.css('.mat-select-value'));
+        expect(value.nativeElement.textContent)
+            .toContain('Pizza', `Expected trigger to be populated by the control's new value.`);
 
-      // For the animation to start at the option's center, its origin must be the distance
-      // from the top of the overlay to the option top + half the option height (48/2 = 24).
-      const expectedOrigin = Math.floor(optionTop - overlayTop + 24);
-      const rawYOrigin = selectInstance._transformOrigin.split(' ')[1].trim();
-      const origin = Math.floor(parseInt(rawYOrigin));
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(origin).toBe(expectedOrigin,
-          `Expected panel animation to originate in the center of option ${index}.`);
-    }
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[1].classList).toContain(
+            'mat-selected', `Expected option with the control's new value to be selected.`);
+      }));
 
-    describe('ample space to open', () => {
-      beforeEach(fakeAsync(() => {
-        // these styles are necessary because we are first testing the overlay's position
-        // if there is room for it to open to its full extent in either direction.
-        formField.style.position = 'fixed';
-        formField.style.top = '285px';
-        formField.style.left = '20px';
+      it('should update the form value when the view changes', fakeAsync(() => {
+        expect(fixture.componentInstance.control.value)
+            .toEqual(null, `Expected the control's value to be empty initially.`);
+
+        trigger.click();
+        fixture.detectChanges();
+        flush();
+
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+        option.click();
+        fixture.detectChanges();
+        flush();
+
+        expect(fixture.componentInstance.control.value)
+            .toEqual('steak-0', `Expected control's value to be set to the new option.`);
       }));
 
-      it('should align the first option with trigger text if no option is selected',
-          fakeAsync(() => {
-            trigger.click();
-            fixture.detectChanges();
-            flush();
+      it('should clear the selection when a nonexistent option value is selected', fakeAsync(() => {
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
 
-            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        fixture.componentInstance.control.setValue('gibberish');
+        fixture.detectChanges();
 
-            // The panel should be scrolled to 0 because centering the option is not possible.
-            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
-            checkTriggerAlignedWithOption(0);
-          }));
+        const value = fixture.debugElement.query(By.css('.mat-select-value'));
+        expect(value.nativeElement.textContent.trim())
+            .toBe('', `Expected trigger to be cleared when option value is not found.`);
+        expect(trigger.textContent)
+            .not.toContain('Pizza', `Expected trigger is cleared when option value is not found.`);
 
-      it('should align a selected option too high to be centered with the trigger text',
-          fakeAsync(() => {
-            // Select the second option, because it can't be scrolled any further downward
-            fixture.componentInstance.control.setValue('pizza-1');
-            fixture.detectChanges();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-            trigger.click();
-            fixture.detectChanges();
-            flush();
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[1].classList)
+            .not.toContain('mat-selected', `Expected option w/ the old value not to be selected.`);
+      }));
 
-            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-            // The panel should be scrolled to 0 because centering the option is not possible.
-            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
-            checkTriggerAlignedWithOption(1);
-          }));
+      it('should clear the selection when the control is reset', fakeAsync(() => {
+        fixture.componentInstance.control.setValue('pizza-1');
+        fixture.detectChanges();
 
-      it('should align a selected option in the middle with the trigger text', fakeAsync(() => {
-        // Select the fifth option, which has enough space to scroll to the center
-        fixture.componentInstance.control.setValue('chips-4');
+        fixture.componentInstance.control.reset();
+        fixture.detectChanges();
+
+        const value = fixture.debugElement.query(By.css('.mat-select-value'));
+        expect(value.nativeElement.textContent.trim())
+            .toBe('', `Expected trigger to be cleared when option value is not found.`);
+        expect(trigger.textContent)
+            .not.toContain('Pizza', `Expected trigger is cleared when option value is not found.`);
+
+        trigger.click();
         fixture.detectChanges();
         flush();
 
+        const options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[1].classList)
+            .not.toContain('mat-selected', `Expected option w/ the old value not to be selected.`);
+      }));
+
+      it('should set the control to touched when the select is touched', fakeAsync(() => {
+        expect(fixture.componentInstance.control.touched)
+            .toEqual(false, `Expected the control to start off as untouched.`);
+
         trigger.click();
+        dispatchFakeEvent(trigger, 'blur');
         fixture.detectChanges();
         flush();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        expect(fixture.componentInstance.control.touched)
+            .toEqual(false, `Expected the control to stay untouched when menu opened.`);
 
-        // The selected option should be scrolled to the center of the panel.
-        // This will be its original offset from the scrollTop - half the panel height + half
-        // the option height. 4 (index) * 48 (option height) = 192px offset from scrollTop
-        // 192 - 256/2 + 48/2 = 88px
-        expect(scrollContainer.scrollTop)
-            .toEqual(88, `Expected overlay panel to be scrolled to center the selected option.`);
+        const backdrop =
+            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+        backdrop.click();
+        dispatchFakeEvent(trigger, 'blur');
+        fixture.detectChanges();
+        flush();
 
-        checkTriggerAlignedWithOption(4);
+        expect(fixture.componentInstance.control.touched)
+            .toEqual(true, `Expected the control to be touched as soon as focus left the select.`);
       }));
 
-      it('should align a selected option at the scroll max with the trigger text', fakeAsync(() => {
-        // Select the last option in the list
-        fixture.componentInstance.control.setValue('sushi-7');
+      it('should not set touched when a disabled select is touched', fakeAsync(() => {
+        expect(fixture.componentInstance.control.touched)
+            .toBe(false, 'Expected the control to start off as untouched.');
+
+        fixture.componentInstance.control.disable();
+        dispatchFakeEvent(trigger, 'blur');
+
+        expect(fixture.componentInstance.control.touched)
+            .toBe(false, 'Expected the control to stay untouched.');
+      }));
+
+      it('should set the control to dirty when the select value changes in DOM', fakeAsync(() => {
+        expect(fixture.componentInstance.control.dirty)
+            .toEqual(false, `Expected control to start out pristine.`);
+
+        trigger.click();
         fixture.detectChanges();
         flush();
 
-        trigger.click();
+        const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+        option.click();
         fixture.detectChanges();
         flush();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        expect(fixture.componentInstance.control.dirty)
+            .toEqual(true, `Expected control to be dirty after value was changed by user.`);
+      }));
 
-        // The selected option should be scrolled to the max scroll position.
-        // This will be the height of the scrollContainer - the panel height.
-        // 8 options * 48px = 384 scrollContainer height, 384 - 256 = 128px max scroll
-        expect(scrollContainer.scrollTop)
-            .toEqual(128, `Expected overlay panel to be scrolled to its maximum position.`);
+      it('should not set the control to dirty when the value changes programmatically',
+          fakeAsync(() => {
+            expect(fixture.componentInstance.control.dirty)
+                .toEqual(false, `Expected control to start out pristine.`);
 
-        checkTriggerAlignedWithOption(7);
-      }));
+            fixture.componentInstance.control.setValue('pizza-1');
 
-      it('should account for preceding label groups when aligning the option', fakeAsync(() => {
-        // Test is off-by-one on edge for some reason, but verified that it looks correct through
-        // manual testing.
-        if (platform.EDGE) {
-          return;
-        }
+            expect(fixture.componentInstance.control.dirty)
+                .toEqual(false, `Expected control to stay pristine after programmatic change.`);
+          }));
 
-        fixture.destroy();
+      it('should set an asterisk after the placeholder if control is required', fakeAsync(() => {
+        let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+        expect(requiredMarker)
+            .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
 
-        let groupFixture = TestBed.createComponent(SelectWithGroups);
-        groupFixture.detectChanges();
-        trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
-        formField = groupFixture.debugElement.query(By.css('mat-form-field')).nativeElement;
+        fixture.componentInstance.isRequired = true;
+        fixture.detectChanges();
 
-        formField.style.position = 'fixed';
-        formField.style.top = '200px';
-        formField.style.left = '100px';
+        requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
+        expect(requiredMarker)
+            .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
+      }));
+    });
 
-        // Select an option in the third group, which has a couple of group labels before it.
-        groupFixture.componentInstance.control.setValue('vulpix-7');
-        groupFixture.detectChanges();
+    describe('disabled behavior', () => {
+      it('should disable itself when control is disabled programmatically', fakeAsync(() => {
+        const fixture = TestBed.createComponent(BasicSelect);
+        fixture.detectChanges();
+
+        fixture.componentInstance.control.disable();
+        fixture.detectChanges();
+        let trigger =
+            fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        expect(getComputedStyle(trigger).getPropertyValue('cursor'))
+            .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
 
         trigger.click();
-        groupFixture.detectChanges();
-        flush();
+        fixture.detectChanges();
 
-        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        expect(overlayContainerElement.textContent)
+            .toEqual('', `Expected select panel to stay closed.`);
+        expect(fixture.componentInstance.select.panelOpen)
+            .toBe(false, `Expected select panelOpen property to stay false.`);
 
-        // The selected option should be scrolled to the center of the panel.
-        // This will be its original offset from the scrollTop - half the panel height + half the
-        // option height. 10 (option index + 3 group labels before it) * 48 (option height) = 480
-        // 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
-        expect(Math.floor(scrollContainer.scrollTop))
-            .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
+        fixture.componentInstance.control.enable();
+        fixture.detectChanges();
+        expect(getComputedStyle(trigger).getPropertyValue('cursor'))
+            .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
 
-        checkTriggerAlignedWithOption(7, groupFixture.componentInstance.select);
+        trigger.click();
+        fixture.detectChanges();
+
+        expect(overlayContainerElement.textContent)
+            .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
+        expect(fixture.componentInstance.select.panelOpen)
+            .toBe(true, `Expected select panelOpen property to become true.`);
       }));
     });
 
-    describe('limited space to open vertically', () => {
+    describe('animations', () => {
+      let fixture: ComponentFixture<BasicSelect>;
+      let trigger: HTMLElement;
+      let formField: HTMLElement;
+
       beforeEach(fakeAsync(() => {
-        formField.style.position = 'fixed';
-        formField.style.left = '20px';
+        fixture = TestBed.createComponent(BasicSelect);
+        fixture.detectChanges();
+
+        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
       }));
 
-      it('should adjust position of centered option if there is little space above',
-          fakeAsync(() => {
-            const selectMenuHeight = 256;
-            const selectMenuViewportPadding = 8;
-            const selectItemHeight = 48;
-            const selectedIndex = 4;
-            const fontSize = 16;
-            const lineHeightEm = 1.125;
-            const expectedExtraScroll = 5;
+      it('should float the placeholder when the panel is open and unselected', fakeAsync(() => {
+        expect(formField.classList.contains('mat-form-field-should-float'))
+            .toBe(false, 'Expected placeholder to initially have a normal position.');
 
-            // Trigger element height.
-            const triggerHeight = fontSize * lineHeightEm;
+        fixture.componentInstance.select.open();
+        fixture.detectChanges();
+        flush();
 
-            // Ideal space above selected item in order to center it.
-            const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
+        expect(formField.classList).toContain('mat-form-field-should-float',
+            'Expected placeholder to animate up to floating position.');
 
-            // Actual space above selected item.
-            const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
+        fixture.componentInstance.select.close();
+        fixture.detectChanges();
+        flush();
 
-            // Ideal scroll position to center.
-            const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
+        expect(formField.classList).not.toContain('mat-form-field-should-float',
+            'Expected placeholder to animate back down to normal position.');
+      }));
 
-            // Top-most select-position that allows for perfect centering.
-            const topMostPositionForPerfectCentering =
-                idealSpaceAboveSelectedItem + selectMenuViewportPadding +
-                (selectItemHeight - triggerHeight) / 2;
+      it('should add a class to the panel when the menu is done animating', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
 
-            // Position of select relative to top edge of mat-form-field.
-            const formFieldTopSpace =
-                trigger.getBoundingClientRect().top - formField.getBoundingClientRect().top;
+        const panel = overlayContainerElement.querySelector('.mat-select-panel')!;
 
-            const formFieldTop =
-                topMostPositionForPerfectCentering - formFieldTopSpace - expectedExtraScroll;
+        expect(panel.classList).not.toContain('mat-select-panel-done-animating');
 
-            formField.style.top = `${formFieldTop}px`;
+        flush();
+        fixture.detectChanges();
 
-            // Select an option in the middle of the list
-            fixture.componentInstance.control.setValue('chips-4');
-            fixture.detectChanges();
-            flush();
+        expect(panel.classList).toContain('mat-select-panel-done-animating');
+      }));
+    });
 
-            trigger.click();
-            fixture.detectChanges();
-            flush();
+    describe('keyboard scrolling', () => {
+      let fixture: ComponentFixture<BasicSelect>;
+      let host: HTMLElement;
+      let panel: HTMLElement;
 
-            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+      beforeEach(fakeAsync(() => {
+        fixture = TestBed.createComponent(BasicSelect);
 
-            expect(Math.ceil(scrollContainer.scrollTop))
-                .toEqual(Math.ceil(idealScrollTop + 5),
-                    `Expected panel to adjust scroll position to fit in viewport.`);
+        fixture.componentInstance.foods = [];
 
-            checkTriggerAlignedWithOption(4);
-          }));
+        for (let i = 0; i < 30; i++) {
+          fixture.componentInstance.foods.push({value: `value-${i}`, viewValue: `Option ${i}`});
+        }
 
-      it('should adjust position of centered option if there is little space below',
-          fakeAsync(() => {
-            const selectMenuHeight = 256;
-            const selectMenuViewportPadding = 8;
-            const selectItemHeight = 48;
-            const selectedIndex = 4;
-            const fontSize = 16;
-            const lineHeightEm = 1.125;
-            const expectedExtraScroll = 5;
+        fixture.detectChanges();
+        fixture.componentInstance.select.open();
+        fixture.detectChanges();
+        flush();
 
-            // Trigger element height.
-            const triggerHeight = fontSize * lineHeightEm;
+        host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+        panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
+      }));
 
-            // Ideal space above selected item in order to center it.
-            const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
+      it('should not scroll to options that are completely in the view', fakeAsync(() => {
+        const initialScrollPosition = panel.scrollTop;
 
-            // Actual space above selected item.
-            const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
+        [1, 2, 3].forEach(() => {
+          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        });
 
-            // Ideal scroll position to center.
-            const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
+        expect(panel.scrollTop)
+            .toBe(initialScrollPosition, 'Expected scroll position not to change');
+      }));
 
-            // Bottom-most select-position that allows for perfect centering.
-            const bottomMostPositionForPerfectCentering =
-                idealSpaceAboveSelectedItem + selectMenuViewportPadding +
-                (selectItemHeight - triggerHeight) / 2;
+      it('should scroll down to the active option', fakeAsync(() => {
+        for (let i = 0; i < 15; i++) {
+          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        }
 
-            // Position of select relative to bottom edge of mat-form-field:
-            const formFieldBottomSpace =
-                formField.getBoundingClientRect().bottom - trigger.getBoundingClientRect().bottom;
+        // <option index * height> - <panel height> = 16 * 48 - 256 = 512
+        expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
+      }));
 
-            const formFieldBottom =
-                bottomMostPositionForPerfectCentering - formFieldBottomSpace - expectedExtraScroll;
+      it('should scroll up to the active option', fakeAsync(() => {
+        // Scroll to the bottom.
+        for (let i = 0; i < fixture.componentInstance.foods.length; i++) {
+          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        }
 
-            // Push the select to a position with not quite enough space on the bottom to open
-            // with the option completely centered (needs 113px at least: 256/2 - 48/2 + 9)
-            formField.style.bottom = `${formFieldBottom}px`;
+        for (let i = 0; i < 20; i++) {
+          dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
+        }
 
-            // Select an option in the middle of the list
-            fixture.componentInstance.control.setValue('chips-4');
-            fixture.detectChanges();
-            flush();
+        // <option index * height> = 9 * 48 = 432
+        expect(panel.scrollTop).toBe(432, 'Expected scroll to be at the 9th option.');
+      }));
 
-            fixture.detectChanges();
+      it('should skip option group labels', fakeAsync(() => {
+        fixture.destroy();
 
-            trigger.click();
-            fixture.detectChanges();
-            flush();
+        const groupFixture = TestBed.createComponent(SelectWithGroups);
 
-            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
+        groupFixture.detectChanges();
+        groupFixture.componentInstance.select.open();
+        groupFixture.detectChanges();
+        flush();
 
-            // Scroll should adjust by the difference between the bottom space available
-            // (56px from the bottom of the screen - 8px padding = 48px)
-            // and the height of the panel below the option (113px).
-            // 113px - 48px = 75px difference. Original scrollTop 88px - 75px = 23px
-            const difference = Math.ceil(scrollContainer.scrollTop) -
-                Math.ceil(idealScrollTop - expectedExtraScroll);
+        host = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
+        panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
 
-            // Note that different browser/OS combinations report the different dimensions with
-            // slight deviations (< 1px). We round the expectation and check that the values
-            // are within a pixel of each other to avoid flakes.
-            expect(Math.abs(difference) < 2)
-                .toBe(true, `Expected panel to adjust scroll position to fit in viewport.`);
+        for (let i = 0; i < 5; i++) {
+          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+        }
 
-            checkTriggerAlignedWithOption(4);
-          }));
+        // Note that we press down 5 times, but it will skip
+        // 3 options because the second group is disabled.
+        // <(option index + group labels) * height> - <panel height> = (9 + 3) * 48 - 256 = 320
+        expect(panel.scrollTop).toBe(320, 'Expected scroll to be at the 9th option.');
+      }));
 
-      it('should fall back to "above" positioning if scroll adjustment will not help',
-          fakeAsync(() => {
-            // Push the select to a position with not enough space on the bottom to open
-            formField.style.bottom = '56px';
-            fixture.detectChanges();
+      it('should scroll top the top when pressing HOME', fakeAsync(() => {
+        for (let i = 0; i < 20; i++) {
+          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
+          fixture.detectChanges();
+        }
 
-            // Select an option that cannot be scrolled any farther upward
-            fixture.componentInstance.control.setValue('coke-0');
-            fixture.detectChanges();
+        expect(panel.scrollTop).toBeGreaterThan(0, 'Expected panel to be scrolled down.');
 
-            trigger.click();
-            fixture.detectChanges();
-            flush();
+        dispatchKeyboardEvent(host, 'keydown', HOME);
+        fixture.detectChanges();
 
-            const overlayPane = document.querySelector('.cdk-overlay-pane')!;
-            const triggerBottom = trigger.getBoundingClientRect().bottom;
-            const overlayBottom = overlayPane.getBoundingClientRect().bottom;
-            const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
+        expect(panel.scrollTop).toBe(0, 'Expected panel to be scrolled to the top');
+      }));
 
-            // Expect no scroll to be attempted
-            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+      it('should scroll to the bottom of the panel when pressing END', fakeAsync(() => {
+        dispatchKeyboardEvent(host, 'keydown', END);
+        fixture.detectChanges();
 
-            const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
+        // <option amount> * <option height> - <panel height> = 30 * 48 - 256 = 1184
+        expect(panel.scrollTop).toBe(1184, 'Expected panel to be scrolled to the bottom');
+      }));
 
-            // Check that the values are within a pixel of each other. This avoids sub-pixel
-            // deviations between OS and browser versions.
-            expect(Math.abs(difference) < 2)
-                .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
+      it('should scroll to the active option when typing', fakeAsync(() => {
+        for (let i = 0; i < 15; i++) {
+          // Press the letter 'o' 15 times since all the options are named 'Option <index>'
+          dispatchEvent(host, createKeyboardEvent('keydown', 79, undefined, 'o'));
+          fixture.detectChanges();
+          tick(LETTER_KEY_DEBOUNCE_INTERVAL);
+        }
+        flush();
 
-            expect(fixture.componentInstance.select._transformOrigin)
-                .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
-          }));
+        // <option index * height> - <panel height> = 16 * 48 - 256 = 512
+        expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
+      }));
 
-      it('should fall back to "below" positioning if scroll adjustment won\'t help',
-          fakeAsync(() => {
-            // Push the select to a position with not enough space on the top to open
-            formField.style.top = '85px';
+    });
+  });
 
-            // Select an option that cannot be scrolled any farther downward
-            fixture.componentInstance.control.setValue('sushi-7');
-            fixture.detectChanges();
-            flush();
+  describe('when initialized without options', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([SelectInitWithoutOptions])));
 
-            trigger.click();
-            fixture.detectChanges();
-            flush();
+    it('should select the proper option when option list is initialized later', fakeAsync(() => {
+      const fixture = TestBed.createComponent(SelectInitWithoutOptions);
+      const instance = fixture.componentInstance;
 
-            const overlayPane = document.querySelector('.cdk-overlay-pane')!;
-            const triggerTop = trigger.getBoundingClientRect().top;
-            const overlayTop = overlayPane.getBoundingClientRect().top;
-            const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
+      fixture.detectChanges();
+      flush();
 
-            // Expect scroll to remain at the max scroll position
-            expect(scrollContainer.scrollTop).toEqual(128, `Expected panel to be at max scroll.`);
+      // Wait for the initial writeValue promise.
+      expect(instance.select.selected).toBeFalsy();
 
-            expect(Math.floor(overlayTop))
-                .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
+      instance.addOptions();
+      fixture.detectChanges();
+      flush();
 
-            expect(fixture.componentInstance.select._transformOrigin)
-                .toContain(`top`, `Expected panel animation to originate at the top.`);
-          }));
+      // Wait for the next writeValue promise.
+      expect(instance.select.selected).toBe(instance.options.toArray()[1]);
+    }));
+  });
 
-    });
+  describe('with a selectionChange event handler', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([SelectWithChangeEvent])));
 
-    describe('limited space to open horizontally', () => {
-      beforeEach(fakeAsync(() => {
-        formField.style.position = 'absolute';
-        formField.style.top = '200px';
-      }));
+    let fixture: ComponentFixture<SelectWithChangeEvent>;
+    let trigger: HTMLElement;
 
-      it('should stay within the viewport when overflowing on the left in ltr', fakeAsync(() => {
-        formField.style.left = '-100px';
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(SelectWithChangeEvent);
+      fixture.detectChanges();
 
-        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+    }));
 
-        expect(panelLeft).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in ltr.`);
-      }));
+    it('should emit an event when the selected option has changed', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
 
-      it('should stay within the viewport when overflowing on the left in rtl', fakeAsync(() => {
-        dir.value = 'rtl';
-        formField.style.left = '-100px';
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
 
-        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+      expect(fixture.componentInstance.changeListener).toHaveBeenCalled();
+    }));
 
-        expect(panelLeft).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in rtl.`);
-      }));
+    it('should not emit multiple change events for the same option', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
 
-      it('should stay within the viewport when overflowing on the right in ltr', fakeAsync(() => {
-        formField.style.right = '-100px';
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
-        const viewportRect = viewportRuler.getViewportRect().right;
-        const panelRight = document.querySelector('.mat-select-panel')!
-            .getBoundingClientRect().right;
+      option.click();
+      option.click();
 
-        expect(viewportRect - panelRight).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in ltr.`);
-      }));
+      expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
+    }));
 
-      it('should stay within the viewport when overflowing on the right in rtl', fakeAsync(() => {
-        dir.value = 'rtl';
-        formField.style.right = '-100px';
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+    it('should only emit one event when pressing arrow keys on closed select', fakeAsync(() => {
+      const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
 
-        const viewportRect = viewportRuler.getViewportRect().right;
-        const panelRight = document.querySelector('.mat-select-panel')!
-            .getBoundingClientRect().right;
+      expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
+    }));
+  });
 
-        expect(viewportRect - panelRight).toBeGreaterThan(0,
-            `Expected select panel to be inside the viewport in rtl.`);
-      }));
+  describe('with ngModel', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([NgModelSelect])));
 
-      it('should keep the position within the viewport on repeat openings', fakeAsync(() => {
-        formField.style.left = '-100px';
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+    it('should disable itself when control is disabled using the property', fakeAsync(() => {
+      const fixture = TestBed.createComponent(NgModelSelect);
+      fixture.detectChanges();
 
-        let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+      fixture.componentInstance.isDisabled = true;
+      fixture.detectChanges();
+      flush();
 
-        expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
+      fixture.detectChanges();
+      const trigger =
+          fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
+          .toEqual('default', `Expected cursor to be default arrow on disabled control.`);
 
-        fixture.componentInstance.select.close();
-        fixture.detectChanges();
-        flush();
+      trigger.click();
+      fixture.detectChanges();
 
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+      expect(overlayContainerElement.textContent)
+          .toEqual('', `Expected select panel to stay closed.`);
+      expect(fixture.componentInstance.select.panelOpen)
+          .toBe(false, `Expected select panelOpen property to stay false.`);
 
-        panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
+      fixture.componentInstance.isDisabled = false;
+      fixture.detectChanges();
+      flush();
 
-        expect(panelLeft).toBeGreaterThan(0,
-            `Expected select panel continue being inside the viewport.`);
-      }));
-    });
+      fixture.detectChanges();
+      expect(getComputedStyle(trigger).getPropertyValue('cursor'))
+          .toEqual('pointer', `Expected cursor to be a pointer on enabled control.`);
 
-    describe('when scrolled', () => {
-      const startingWindowHeight = window.innerHeight;
+      trigger.click();
+      fixture.detectChanges();
 
-      // Need to set the scrollTop two different ways to support
-      // both Chrome and Firefox.
-      function setScrollTop(num: number) {
-        document.body.scrollTop = num;
-        document.documentElement.scrollTop = num;
-      }
+      expect(overlayContainerElement.textContent)
+          .toContain('Steak', `Expected select panel to open normally on re-enabled control`);
+      expect(fixture.componentInstance.select.panelOpen)
+          .toBe(true, `Expected select panelOpen property to become true.`);
+    }));
+  });
 
-      beforeEach(fakeAsync(() => {
-        // Make the div above the select very tall, so the page will scroll
-        fixture.componentInstance.heightAbove = 2000;
-        fixture.detectChanges();
-        setScrollTop(0);
+  describe('with ngIf', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([NgIfSelect])));
 
-        // Give the select enough horizontal space to open
-        formField.style.marginLeft = '20px';
-        formField.style.marginRight = '20px';
-      }));
+    it('should handle nesting in an ngIf', fakeAsync(() => {
+      const fixture = TestBed.createComponent(NgIfSelect);
+      fixture.detectChanges();
 
-      it('should align the first option properly when scrolled', fakeAsync(() => {
-        // Give the select enough space to open
-        fixture.componentInstance.heightBelow = 400;
-        fixture.detectChanges();
+      fixture.componentInstance.isShowing = true;
+      fixture.detectChanges();
 
-        // Scroll the select into view
-        setScrollTop(1700);
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      trigger.style.width = '300px';
 
-        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
-        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
-        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
-        // successfully constrain its size. As such, skip assertions in environments where the
-        // window size has changed since the start of the test.
-        if (window.innerHeight > startingWindowHeight) {
-          return;
-        }
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+      const value = fixture.debugElement.query(By.css('.mat-select-value'));
+      expect(value.nativeElement.textContent)
+          .toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
 
-        checkTriggerAlignedWithOption(0);
-      }));
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(pane.style.minWidth).toEqual('300px');
 
-      it('should align a centered option properly when scrolled', fakeAsync(() => {
-        // Give the select enough space to open
-        fixture.componentInstance.heightBelow = 400;
-        fixture.detectChanges();
+      expect(fixture.componentInstance.select.panelOpen).toBe(true);
+      expect(overlayContainerElement.textContent).toContain('Steak');
+      expect(overlayContainerElement.textContent).toContain('Pizza');
+      expect(overlayContainerElement.textContent).toContain('Tacos');
+    }));
+  });
 
-        fixture.componentInstance.control.setValue('chips-4');
-        fixture.detectChanges();
-        flush();
+  describe('with multiple mat-select elements in one view', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([ManySelects])));
 
-        // Scroll the select into view
-        setScrollTop(1700);
+      let fixture: ComponentFixture<ManySelects>;
+      let triggers: DebugElement[];
+      let options: NodeListOf<HTMLElement>;
 
-        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
-        // body causes karma's iframe for the test to stretch to fit that content once we attempt
-        // to scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does
-        // not successfully constrain its size. As such, skip assertions in environments where the
-        // window size has changed since the start of the test.
-        if (window.innerHeight > startingWindowHeight) {
-          return;
-        }
+      beforeEach(fakeAsync(() => {
+        fixture = TestBed.createComponent(ManySelects);
+        fixture.detectChanges();
+        triggers = fixture.debugElement.queryAll(By.css('.mat-select-trigger'));
 
-        trigger.click();
+        triggers[0].nativeElement.click();
         fixture.detectChanges();
         flush();
 
-        checkTriggerAlignedWithOption(4);
+        options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
       }));
 
-      it('should align a centered option properly when scrolling while the panel is open',
-          fakeAsync(() => {
-            fixture.componentInstance.heightBelow = 400;
-            fixture.componentInstance.heightAbove = 400;
-            fixture.componentInstance.control.setValue('chips-4');
-            fixture.detectChanges();
-            flush();
-
-            trigger.click();
-            fixture.detectChanges();
-            flush();
-
-            setScrollTop(100);
-            scrolledSubject.next();
-            fixture.detectChanges();
+      it('should set aria-owns properly', fakeAsync(() => {
+        const selects = fixture.debugElement.queryAll(By.css('mat-select'));
 
-            checkTriggerAlignedWithOption(4);
-          }));
+        expect(selects[0].nativeElement.getAttribute('aria-owns'))
+            .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
+        expect(selects[0].nativeElement.getAttribute('aria-owns'))
+            .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
 
-      it('should fall back to "above" positioning properly when scrolled', fakeAsync(() => {
-        // Give the select insufficient space to open below the trigger
-        fixture.componentInstance.heightAbove = 0;
-        fixture.componentInstance.heightBelow = 100;
-        trigger.style.marginTop = '2000px';
+        const backdrop =
+            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+        backdrop.click();
         fixture.detectChanges();
+        flush();
 
-        // Scroll the select into view
-        setScrollTop(1400);
-
-        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
-        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
-        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
-        // successfully constrain its size. As such, skip assertions in environments where the
-        // window size has changed since the start of the test.
-        if (window.innerHeight > startingWindowHeight) {
-          return;
-        }
-
-        trigger.click();
+        triggers[1].nativeElement.click();
         fixture.detectChanges();
         flush();
 
-        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-        const triggerBottom = trigger.getBoundingClientRect().bottom;
-        const overlayBottom = overlayPane.getBoundingClientRect().bottom;
-        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
-
-        // Check that the values are within a pixel of each other. This avoids sub-pixel
-        // deviations between OS and browser versions.
-        expect(Math.abs(difference) < 2)
-            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
+        options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(selects[1].nativeElement.getAttribute('aria-owns'))
+            .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
+        expect(selects[1].nativeElement.getAttribute('aria-owns'))
+            .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
       }));
 
-      it('should fall back to "below" positioning properly when scrolled', fakeAsync(() => {
-        // Give plenty of space for the select to open below the trigger
-        fixture.componentInstance.heightBelow = 650;
-        fixture.detectChanges();
-
-        // Select an option too low in the list to fit in limited space above
-        fixture.componentInstance.control.setValue('sushi-7');
-        fixture.detectChanges();
-
-        // Scroll the select so that it has insufficient space to open above the trigger
-        setScrollTop(1950);
+      it('should set the option id properly', fakeAsync(() => {
+        let firstOptionID = options[0].id;
 
-        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
-        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
-        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
-        // successfully constrain its size. As such, skip assertions in environments where the
-        // window size has changed since the start of the test.
-        if (window.innerHeight > startingWindowHeight) {
-          return;
-        }
+        expect(options[0].id)
+            .toContain('mat-option', `Expected option ID to have the correct prefix.`);
+        expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
 
-        trigger.click();
+        const backdrop =
+            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+        backdrop.click();
         fixture.detectChanges();
         flush();
 
-        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
-        const triggerTop = trigger.getBoundingClientRect().top;
-        const overlayTop = overlayPane.getBoundingClientRect().top;
-
-        expect(Math.floor(overlayTop))
-            .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
-      }));
-    });
-
-    describe('x-axis positioning', () => {
-      beforeEach(fakeAsync(() => {
-        formField.style.position = 'fixed';
-        formField.style.left = '30px';
-      }));
-
-      it('should align the trigger and the selected option on the x-axis in ltr', fakeAsync(() => {
-        trigger.click();
+        triggers[1].nativeElement.click();
         fixture.detectChanges();
         flush();
 
-        const triggerLeft = trigger.getBoundingClientRect().left;
-        const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
-            .getBoundingClientRect().left;
-
-        // Each option is 32px wider than the trigger, so it must be adjusted 16px
-        // to ensure the text overlaps correctly.
-        expect(Math.floor(firstOptionLeft)).toEqual(Math.floor(triggerLeft - 16),
-            `Expected trigger to align with the selected option on the x-axis in LTR.`);
+        options =
+            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+        expect(options[0].id)
+            .toContain('mat-option', `Expected option ID to have the correct prefix.`);
+        expect(options[0].id).not.toEqual(firstOptionID, `Expected option IDs to be unique.`);
+        expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
       }));
+  });
 
-      it('should align the trigger and the selected option on the x-axis in rtl', fakeAsync(() => {
-        dir.value = 'rtl';
-        fixture.detectChanges();
+  describe('with floatPlaceholder', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([FloatPlaceholderSelect])));
 
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+    let fixture: ComponentFixture<FloatPlaceholderSelect>;
+    let formField: HTMLElement;
 
-        const triggerRight = trigger.getBoundingClientRect().right;
-        const firstOptionRight =
-            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(FloatPlaceholderSelect);
+      fixture.detectChanges();
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+    }));
 
-        // Each option is 32px wider than the trigger, so it must be adjusted 16px
-        // to ensure the text overlaps correctly.
-        expect(Math.floor(firstOptionRight))
-            .toEqual(Math.floor(triggerRight + 16),
-                `Expected trigger to align with the selected option on the x-axis in RTL.`);
-      }));
-    });
+    it('should be able to disable the floating placeholder', fakeAsync(() => {
+      fixture.componentInstance.floatPlaceholder = 'never';
+      fixture.detectChanges();
 
-    describe('x-axis positioning in multi select mode', () => {
-      let multiFixture: ComponentFixture<MultiSelect>;
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(false, 'Floating placeholder should be disabled');
 
-      beforeEach(fakeAsync(() => {
-        multiFixture = TestBed.createComponent(MultiSelect);
-        multiFixture.detectChanges();
-        formField = multiFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-        trigger = multiFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      fixture.componentInstance.control.setValue('pizza-1');
+      fixture.detectChanges();
 
-        formField.style.position = 'fixed';
-        formField.style.left = '60px';
-      }));
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(false, 'Floating placeholder should be disabled');
+    }));
 
-      it('should adjust for the checkbox in ltr', fakeAsync(() => {
-        trigger.click();
-        multiFixture.detectChanges();
-        flush();
+    it('should be able to always float the placeholder', fakeAsync(() => {
+      expect(fixture.componentInstance.control.value).toBeFalsy();
 
-        const triggerLeft = trigger.getBoundingClientRect().left;
-        const firstOptionLeft =
-            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().left;
+      fixture.componentInstance.floatPlaceholder = 'always';
+      fixture.detectChanges();
 
-        // 44px accounts for the checkbox size, margin and the panel's padding.
-        expect(Math.floor(firstOptionLeft))
-            .toEqual(Math.floor(triggerLeft - 44),
-                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
-      }));
-
-      it('should adjust for the checkbox in rtl', fakeAsync(() => {
-        dir.value = 'rtl';
-        trigger.click();
-        multiFixture.detectChanges();
-        flush();
-
-        const triggerRight = trigger.getBoundingClientRect().right;
-        const firstOptionRight =
-            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
-
-        // 44px accounts for the checkbox size, margin and the panel's padding.
-        expect(Math.floor(firstOptionRight))
-            .toEqual(Math.floor(triggerRight + 44),
-                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
-      }));
-    });
-
-    describe('x-axis positioning with groups', () => {
-      let groupFixture: ComponentFixture<SelectWithGroups>;
-
-      beforeEach(fakeAsync(() => {
-        groupFixture = TestBed.createComponent(SelectWithGroups);
-        groupFixture.detectChanges();
-        formField = groupFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-        trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(true, 'Placeholder should be able to float');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(true, 'Placeholder should be floating');
+    }));
 
-        formField.style.position = 'fixed';
-        formField.style.left = '60px';
-      }));
+    it ('should default to global floating placeholder type', fakeAsync(() => {
+      fixture.destroy();
 
-      it('should adjust for the group padding in ltr', fakeAsync(() => {
-        groupFixture.componentInstance.control.setValue('oddish-1');
-        groupFixture.detectChanges();
+      TestBed.resetTestingModule();
+      TestBed.configureTestingModule({
+        imports: [
+          MatFormFieldModule,
+          MatSelectModule,
+          ReactiveFormsModule,
+          FormsModule,
+          NoopAnimationsModule
+        ],
+        declarations: [
+          FloatPlaceholderSelect
+        ],
+        providers: [{ provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
+      });
 
-        trigger.click();
-        groupFixture.detectChanges();
+      fixture = TestBed.createComponent(FloatPlaceholderSelect);
+      fixture.componentInstance.floatPlaceholder = null;
+      fixture.detectChanges();
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
-        groupFixture.whenStable().then(() => {
-          const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
-          const triggerLeft = trigger.getBoundingClientRect().left;
-          const selectedOptionLeft = group.querySelector('mat-option.mat-selected')!
-              .getBoundingClientRect().left;
+      expect(formField.classList.contains('mat-form-field-can-float'))
+          .toBe(true, 'Placeholder should be able to float');
+      expect(formField.classList.contains('mat-form-field-should-float'))
+          .toBe(true, 'Placeholder should be floating');
+    }));
+  });
 
-          // 32px is the 16px default padding plus 16px of padding when an option is in a group.
-          expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 32),
-              `Expected trigger label to align along x-axis, accounting for the padding in ltr.`);
-        });
-      }));
+  describe('with a sibling component that throws an error', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([
+      SelectWithErrorSibling,
+      ThrowsErrorOnInit,
+    ])));
 
-      it('should adjust for the group padding in rtl', fakeAsync(() => {
-        dir.value = 'rtl';
-        groupFixture.componentInstance.control.setValue('oddish-1');
-        groupFixture.detectChanges();
+    it('should not crash the browser when a sibling throws an error on init', fakeAsync(() => {
+      // Note that this test can be considered successful if the error being thrown didn't
+      // end up crashing the testing setup altogether.
+      expect(() => {
+        TestBed.createComponent(SelectWithErrorSibling).detectChanges();
+      }).toThrowError(new RegExp('Oh no!', 'g'));
+    }));
+  });
 
-        trigger.click();
-        groupFixture.detectChanges();
-        flush();
+  describe('with tabindex', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([SelectWithPlainTabindex])));
 
-        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
-        const triggerRight = trigger.getBoundingClientRect().right;
-        const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
-            .getBoundingClientRect().right;
+    it('should be able to set the tabindex via the native attribute', fakeAsync(() => {
+      const fixture = TestBed.createComponent(SelectWithPlainTabindex);
+      fixture.detectChanges();
 
-        // 32px is the 16px default padding plus 16px of padding when an option is in a group.
-        expect(Math.floor(selectedOptionRight)).toEqual(Math.floor(triggerRight + 32),
-            `Expected trigger label to align along x-axis, accounting for the padding in rtl.`);
-      }));
+      const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      expect(select.getAttribute('tabindex')).toBe('5');
+    }));
+  });
 
-      it('should not adjust if all options are within a group, except the selected one',
-          fakeAsync(() => {
-            groupFixture.componentInstance.control.setValue('mime-11');
-            groupFixture.detectChanges();
+  describe('when initially hidden', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([BasicSelectInitiallyHidden])));
 
-            trigger.click();
-            groupFixture.detectChanges();
-            flush();
+    it('should set the width of the overlay if the element was hidden initially', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectInitiallyHidden);
+      fixture.detectChanges();
 
-            const selected = document.querySelector('.cdk-overlay-pane mat-option.mat-selected')!;
-            const selectedOptionLeft = selected.getBoundingClientRect().left;
-            const triggerLeft = trigger.getBoundingClientRect().left;
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      trigger.style.width = '200px';
+      fixture.componentInstance.isVisible = true;
+      fixture.detectChanges();
 
-            // 16px is the default option padding
-            expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 16));
-          }));
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-      it('should align the first option to the trigger, if nothing is selected', fakeAsync(() => {
-        // Push down the form field so there is space for the item to completely align.
-        formField.style.top = '100px';
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(pane.style.minWidth).toBe('200px');
+    }));
+  });
 
-        const menuItemHeight = 48;
-        const triggerFontSize = 16;
-        const triggerLineHeightEm = 1.125;
-        const triggerHeight = triggerFontSize * triggerLineHeightEm;
+  describe('with no placeholder', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([BasicSelectNoPlaceholder])));
 
-        trigger.click();
-        groupFixture.detectChanges();
-        flush();
+    it('should set the width of the overlay if there is no placeholder', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectNoPlaceholder);
 
-        const triggerTop = trigger.getBoundingClientRect().top;
+      fixture.detectChanges();
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-        const option = overlayContainerElement.querySelector('.cdk-overlay-pane mat-option');
-        const optionTop = option ? option.getBoundingClientRect().top : 0;
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-        // There appears to be a small rounding error on IE, so we verify that the value is close,
-        // not exact.
-        if (platform.TRIDENT) {
-          let difference =
-              Math.abs(optionTop + (menuItemHeight - triggerHeight) / 2 - triggerTop);
-          expect(difference)
-              .toBeLessThan(0.1, 'Expected trigger to align with the first option.');
-        } else {
-          expect(Math.floor(optionTop + (menuItemHeight - triggerHeight) / 2))
-              .toBe(Math.floor(triggerTop), 'Expected trigger to align with the first option.');
-        }
-      }));
-    });
+      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+      expect(parseInt(pane.style.minWidth as string)).toBeGreaterThan(0);
+    }));
   });
 
-  describe('accessibility', () => {
-    describe('for select', () => {
-      let fixture: ComponentFixture<BasicSelect>;
-      let select: HTMLElement;
-
-      beforeEach(fakeAsync(() => {
-        fixture = TestBed.createComponent(BasicSelect);
-        fixture.detectChanges();
-        select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-      }));
+  describe('with theming', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([BasicSelectWithTheming])));
 
-      it('should set the role of the select to listbox', fakeAsync(() => {
-        expect(select.getAttribute('role')).toEqual('listbox');
-      }));
+    let fixture: ComponentFixture<BasicSelectWithTheming>;
 
-      it('should set the aria label of the select to the placeholder', fakeAsync(() => {
-        expect(select.getAttribute('aria-label')).toEqual('Food');
-      }));
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(BasicSelectWithTheming);
+      fixture.detectChanges();
+    }));
 
-      it('should support setting a custom aria-label', fakeAsync(() => {
-        fixture.componentInstance.ariaLabel = 'Custom Label';
-        fixture.detectChanges();
+    it('should transfer the theme to the select panel', fakeAsync(() => {
+      fixture.componentInstance.theme = 'warn';
+      fixture.detectChanges();
 
-        expect(select.getAttribute('aria-label')).toEqual('Custom Label');
-      }));
+      fixture.componentInstance.select.open();
+      fixture.detectChanges();
 
-      it('should not set an aria-label if aria-labelledby is specified', fakeAsync(() => {
-        fixture.componentInstance.ariaLabelledby = 'myLabelId';
-        fixture.detectChanges();
+      const panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
+      expect(panel.classList).toContain('mat-warn');
+    }));
+  });
 
-        expect(select.getAttribute('aria-label')).toBeFalsy('Expected no aria-label to be set.');
-        expect(select.getAttribute('aria-labelledby')).toBe('myLabelId');
-      }));
+  describe('when invalid inside a form', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([InvalidSelectInForm])));
 
-      it('should not have aria-labelledby in the DOM if it`s not specified', fakeAsync(() => {
-        fixture.detectChanges();
-        expect(select.hasAttribute('aria-labelledby')).toBeFalsy();
-      }));
+    it('should not throw SelectionModel errors in addition to ngModel errors', fakeAsync(() => {
+      const fixture = TestBed.createComponent(InvalidSelectInForm);
 
-      it('should set the tabindex of the select to 0 by default', fakeAsync(() => {
-        expect(select.getAttribute('tabindex')).toEqual('0');
-      }));
+      // The first change detection run will throw the "ngModel is missing a name" error.
+      expect(() => fixture.detectChanges()).toThrowError(/the name attribute must be set/g);
 
-      it('should be able to override the tabindex', fakeAsync(() => {
-        fixture.componentInstance.tabIndexOverride = 3;
-        fixture.detectChanges();
+      // The second run shouldn't throw selection-model related errors.
+      expect(() => fixture.detectChanges()).not.toThrow();
+    }));
+  });
 
-        expect(select.getAttribute('tabindex')).toBe('3');
-      }));
+  describe('with ngModel using compareWith', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([NgModelCompareWithSelect])));
 
-      it('should be able to set the tabindex via the native attribute', fakeAsync(() => {
-        fixture.destroy();
+    let fixture: ComponentFixture<NgModelCompareWithSelect>;
+    let instance: NgModelCompareWithSelect;
 
-        const plainTabindexFixture = TestBed.createComponent(SelectWithPlainTabindex);
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(NgModelCompareWithSelect);
+      instance = fixture.componentInstance;
+      fixture.detectChanges();
+    }));
 
-        plainTabindexFixture.detectChanges();
-        select = plainTabindexFixture.debugElement.query(By.css('mat-select')).nativeElement;
+    describe('comparing by value', () => {
 
-        expect(select.getAttribute('tabindex')).toBe('5');
+      it('should have a selection', fakeAsync(() => {
+        const selectedOption = instance.select.selected as MatOption;
+        expect(selectedOption.value.value).toEqual('pizza-1');
       }));
 
-      it('should set aria-required for required selects', fakeAsync(() => {
-        expect(select.getAttribute('aria-required'))
-            .toEqual('false', `Expected aria-required attr to be false for normal selects.`);
-
-        fixture.componentInstance.isRequired = true;
+      it('should update when making a new selection', fakeAsync(() => {
+        instance.options.last._selectViaInteraction();
         fixture.detectChanges();
+        flush();
 
-        expect(select.getAttribute('aria-required'))
-            .toEqual('true', `Expected aria-required attr to be true for required selects.`);
+        const selectedOption = instance.select.selected as MatOption;
+        expect(instance.selectedFood.value).toEqual('tacos-2');
+        expect(selectedOption.value.value).toEqual('tacos-2');
       }));
+    });
 
-      it('should set the mat-select-required class for required selects', fakeAsync(() => {
-        expect(select.classList).not.toContain(
-            'mat-select-required', `Expected the mat-select-required class not to be set.`);
-
-        fixture.componentInstance.isRequired = true;
+    describe('comparing by reference', () => {
+      beforeEach(fakeAsync(() => {
+        spyOn(instance, 'compareByReference').and.callThrough();
+        instance.useCompareByReference();
         fixture.detectChanges();
-
-        expect(select.classList).toContain(
-            'mat-select-required', `Expected the mat-select-required class to be set.`);
       }));
 
-      it('should set aria-invalid for selects that are invalid and touched', fakeAsync(() => {
-        expect(select.getAttribute('aria-invalid'))
-            .toEqual('false', `Expected aria-invalid attr to be false for valid selects.`);
-
-        fixture.componentInstance.isRequired = true;
-        fixture.componentInstance.control.markAsTouched();
-        fixture.detectChanges();
-
-        expect(select.getAttribute('aria-invalid'))
-            .toEqual('true', `Expected aria-invalid attr to be true for invalid selects.`);
+      it('should use the comparator', fakeAsync(() => {
+        expect(instance.compareByReference).toHaveBeenCalled();
       }));
 
-      it('should set aria-disabled for disabled selects', fakeAsync(() => {
-        expect(select.getAttribute('aria-disabled')).toEqual('false');
+      it('should initialize with no selection despite having a value', fakeAsync(() => {
+        expect(instance.selectedFood.value).toBe('pizza-1');
+        expect(instance.select.selected).toBeUndefined();
+      }));
 
-        fixture.componentInstance.control.disable();
+      it('should not update the selection if value is copied on change', fakeAsync(() => {
+        instance.options.first._selectViaInteraction();
         fixture.detectChanges();
+        flush();
 
-        expect(select.getAttribute('aria-disabled')).toEqual('true');
+        expect(instance.selectedFood.value).toEqual('steak-0');
+        expect(instance.select.selected).toBeUndefined();
       }));
 
-      it('should set the tabindex of the select to -1 if disabled', fakeAsync(() => {
-        fixture.componentInstance.control.disable();
-        fixture.detectChanges();
-        expect(select.getAttribute('tabindex')).toEqual('-1');
+      it('should throw an error when using a non-function comparator', fakeAsync(() => {
+        instance.useNullComparator();
 
-        fixture.componentInstance.control.enable();
-        fixture.detectChanges();
-        expect(select.getAttribute('tabindex')).toEqual('0');
+        expect(() => {
+          fixture.detectChanges();
+        }).toThrowError(wrappedErrorMessage(getMatSelectNonFunctionValueError()));
       }));
+    });
+  });
 
-      it('should be able to select options via the arrow keys on a closed select', fakeAsync(() => {
-        const formControl = fixture.componentInstance.control;
-        const options = fixture.componentInstance.options.toArray();
+  describe(`when the select's value is accessed on initialization`, () => {
+    beforeEach(async(() => configureMatSelectTestingModule([SelectEarlyAccessSibling])));
 
-        expect(formControl.value).toBeFalsy('Expected no initial value.');
+    it('should not throw when trying to access the selected value on init', fakeAsync(() => {
+      expect(() => {
+        TestBed.createComponent(SelectEarlyAccessSibling).detectChanges();
+      }).not.toThrow();
+    }));
+  });
 
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+  describe('inside of a form group', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([SelectInsideFormGroup])));
 
-        expect(options[0].selected).toBe(true, 'Expected first option to be selected.');
-        expect(formControl.value).toBe(options[0].value,
-            'Expected value from first option to have been set on the model.');
-
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-
-        // Note that the third option is skipped, because it is disabled.
-        expect(options[3].selected).toBe(true, 'Expected fourth option to be selected.');
-        expect(formControl.value).toBe(options[3].value,
-            'Expected value from fourth option to have been set on the model.');
+    let fixture: ComponentFixture<SelectInsideFormGroup>;
+    let testComponent: SelectInsideFormGroup;
+    let select: HTMLElement;
 
-        dispatchKeyboardEvent(select, 'keydown', UP_ARROW);
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(SelectInsideFormGroup);
+      fixture.detectChanges();
+      testComponent = fixture.componentInstance;
+      select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+    }));
 
-        expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
-        expect(formControl.value).toBe(options[1].value,
-            'Expected value from second option to have been set on the model.');
-      }));
+    it('should not set the invalid class on a clean select', fakeAsync(() => {
+      expect(testComponent.formGroup.untouched).toBe(true, 'Expected the form to be untouched.');
+      expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid.');
+      expect(select.classList)
+          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('false', 'Expected aria-invalid to be set to false.');
+    }));
 
-      it('should be able to select options by typing on a closed select', fakeAsync(() => {
-        const formControl = fixture.componentInstance.control;
-        const options = fixture.componentInstance.options.toArray();
+    it('should appear as invalid if it becomes touched', fakeAsync(() => {
+      expect(select.classList)
+          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('false', 'Expected aria-invalid to be set to false.');
 
-        expect(formControl.value).toBeFalsy('Expected no initial value.');
+      testComponent.formControl.markAsTouched();
+      fixture.detectChanges();
 
-        dispatchEvent(select, createKeyboardEvent('keydown', 80, undefined, 'p'));
-        tick(200);
+      expect(select.classList)
+          .toContain('mat-select-invalid', 'Expected select to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('true', 'Expected aria-invalid to be set to true.');
+    }));
 
-        expect(options[1].selected).toBe(true, 'Expected second option to be selected.');
-        expect(formControl.value).toBe(options[1].value,
-          'Expected value from second option to have been set on the model.');
+    it('should not have the invalid class when the select becomes valid', fakeAsync(() => {
+      testComponent.formControl.markAsTouched();
+      fixture.detectChanges();
 
-        dispatchEvent(select, createKeyboardEvent('keydown', 69, undefined, 'e'));
-        tick(200);
+      expect(select.classList)
+          .toContain('mat-select-invalid', 'Expected select to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('true', 'Expected aria-invalid to be set to true.');
 
-        expect(options[5].selected).toBe(true, 'Expected sixth option to be selected.');
-        expect(formControl.value).toBe(options[5].value,
-          'Expected value from sixth option to have been set on the model.');
-      }));
+      testComponent.formControl.setValue('pizza-1');
+      fixture.detectChanges();
 
-      it('should open the panel when pressing the arrow keys on a closed multiple select',
-          fakeAsync(() => {
-            fixture.destroy();
+      expect(select.classList)
+          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('false', 'Expected aria-invalid to be set to false.');
+    }));
 
-            const multiFixture = TestBed.createComponent(MultiSelect);
-            const instance = multiFixture.componentInstance;
+    it('should appear as invalid when the parent form group is submitted', fakeAsync(() => {
+      expect(select.classList)
+          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('false', 'Expected aria-invalid to be set to false.');
 
-            multiFixture.detectChanges();
-            select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
+      fixture.detectChanges();
 
-            const initialValue = instance.control.value;
+      expect(select.classList)
+          .toContain('mat-select-invalid', 'Expected select to appear invalid.');
+      expect(select.getAttribute('aria-invalid'))
+          .toBe('true', 'Expected aria-invalid to be set to true.');
+    }));
 
-            expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
+    it('should render the error messages when the parent form is submitted', fakeAsync(() => {
+      const debugEl = fixture.debugElement.nativeElement;
 
-            const event = dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+      expect(debugEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error messages');
 
-            expect(instance.select.panelOpen).toBe(true, 'Expected panel to be open.');
-            expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
-            expect(event.defaultPrevented).toBe(true, 'Expected default to be prevented.');
-          }));
+      dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
+      fixture.detectChanges();
 
-      it('should do nothing when typing on a closed multi-select', fakeAsync(() => {
-        fixture.destroy();
+      expect(debugEl.querySelectorAll('mat-error').length).toBe(1, 'Expected one error message');
+    }));
 
-        const multiFixture = TestBed.createComponent(MultiSelect);
-        const instance = multiFixture.componentInstance;
+    it('should override error matching behavior via injection token', fakeAsync(() => {
+      const errorStateMatcher: ErrorStateMatcher = {
+        isErrorState: jasmine.createSpy('error state matcher').and.returnValue(true)
+      };
 
-        multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      fixture.destroy();
 
-        const initialValue = instance.control.value;
+      TestBed.resetTestingModule().configureTestingModule({
+        imports: [MatSelectModule, ReactiveFormsModule, FormsModule, NoopAnimationsModule],
+        declarations: [SelectInsideFormGroup],
+        providers: [{ provide: ErrorStateMatcher, useValue: errorStateMatcher }],
+      });
 
-        expect(instance.select.panelOpen).toBe(false, 'Expected panel to be closed.');
+      const errorFixture = TestBed.createComponent(SelectInsideFormGroup);
+      const component = errorFixture.componentInstance;
 
-        dispatchEvent(select, createKeyboardEvent('keydown', 80, undefined, 'p'));
+      errorFixture.detectChanges();
 
-        expect(instance.select.panelOpen).toBe(false, 'Expected panel to stay closed.');
-        expect(instance.control.value).toBe(initialValue, 'Expected value to stay the same.');
-      }));
+      expect(component.select.errorState).toBe(true);
+      expect(errorStateMatcher.isErrorState).toHaveBeenCalled();
+    }));
+  });
 
-      it('should do nothing if the key manager did not change the active item', fakeAsync(() => {
-        const formControl = fixture.componentInstance.control;
+  describe('with custom error behavior', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([CustomErrorBehaviorSelect])));
 
-        expect(formControl.value).toBeNull('Expected form control value to be empty.');
-        expect(formControl.pristine).toBe(true, 'Expected form control to be clean.');
+    it('should be able to override the error matching behavior via an @Input', fakeAsync(() => {
+      const fixture = TestBed.createComponent(CustomErrorBehaviorSelect);
+      const component = fixture.componentInstance;
+      const matcher = jasmine.createSpy('error state matcher').and.returnValue(true);
 
-        dispatchKeyboardEvent(select, 'keydown', 16); // Press a random key.
+      fixture.detectChanges();
 
-        expect(formControl.value).toBeNull('Expected form control value to stay empty.');
-        expect(formControl.pristine).toBe(true, 'Expected form control to stay clean.');
-      }));
+      expect(component.control.invalid).toBe(false);
+      expect(component.select.errorState).toBe(false);
 
-      it('should continue from the selected option when the value is set programmatically',
-          fakeAsync(() => {
-            const formControl = fixture.componentInstance.control;
+      fixture.componentInstance.errorStateMatcher = { isErrorState: matcher };
+      fixture.detectChanges();
 
-            formControl.setValue('eggs-5');
-            fixture.detectChanges();
+      expect(component.select.errorState).toBe(true);
+      expect(matcher).toHaveBeenCalled();
+    }));
+  });
 
-            dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+  describe('with preselected array values', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([
+      SingleSelectWithPreselectedArrayValues,
+    ])));
 
-            expect(formControl.value).toBe('pasta-6');
-            expect(fixture.componentInstance.options.toArray()[6].selected).toBe(true);
-          }));
+    it('should be able to preselect an array value in single-selection mode', fakeAsync(() => {
+      const fixture = TestBed.createComponent(SingleSelectWithPreselectedArrayValues);
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
 
-      it('should not shift focus when the selected options are updated programmatically ' +
-          'in a multi select', fakeAsync(() => {
-        fixture.destroy();
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-        const multiFixture = TestBed.createComponent(MultiSelect);
+      expect(trigger.textContent).toContain('Pizza');
+      expect(fixture.componentInstance.options.toArray()[1].selected).toBe(true);
+    }));
+  });
 
-        multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
-        multiFixture.componentInstance.select.open();
-        multiFixture.detectChanges();
+  describe('with custom value accessor', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([
+      CompWithCustomSelect,
+      CustomSelectAccessor,
+    ])));
 
-        const options =
-            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+    it('should support use inside a custom value accessor', fakeAsync(() => {
+      const fixture = TestBed.createComponent(CompWithCustomSelect);
+      spyOn(fixture.componentInstance.customAccessor, 'writeValue');
+      fixture.detectChanges();
 
-        options[3].focus();
-        expect(document.activeElement).toBe(options[3], 'Expected fourth option to be focused.');
+      expect(fixture.componentInstance.customAccessor.select.ngControl)
+          .toBeFalsy('Expected mat-select NOT to inherit control from parent value accessor.');
+      expect(fixture.componentInstance.customAccessor.writeValue).toHaveBeenCalled();
+    }));
+  });
 
-        multiFixture.componentInstance.control.setValue(['steak-0', 'sushi-7']);
-        multiFixture.detectChanges();
+  describe('with a falsy value', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([FalsyValueSelect])));
 
-        expect(document.activeElement)
-            .toBe(options[3], 'Expected fourth option to remain focused.');
-      }));
+    it('should be able to programmatically select a falsy option', fakeAsync(() => {
+      const fixture = TestBed.createComponent(FalsyValueSelect);
 
-      it('should not cycle through the options if the control is disabled', fakeAsync(() => {
-        const formControl = fixture.componentInstance.control;
+      fixture.detectChanges();
+      fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
+      fixture.componentInstance.control.setValue(0);
+      fixture.detectChanges();
+      flush();
 
-        formControl.setValue('eggs-5');
-        formControl.disable();
+      expect(fixture.componentInstance.options.first.selected)
+          .toBe(true, 'Expected first option to be selected');
+      expect(overlayContainerElement.querySelectorAll('mat-option')[0].classList)
+          .toContain('mat-selected', 'Expected first option to be selected');
+    }));
+  });
 
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+  describe('with OnPush', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([
+      BasicSelectOnPush,
+      BasicSelectOnPushPreselected,
+    ])));
 
-        expect(formControl.value).toBe('eggs-5', 'Expected value to remain unchaged.');
-      }));
+    it('should set the trigger text based on the value when initialized', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectOnPushPreselected);
 
-      it('should not wrap selection around after reaching the end of the options', fakeAsync(() => {
-        const lastOption = fixture.componentInstance.options.last;
+      fixture.detectChanges();
+      flush();
 
-        fixture.componentInstance.options.forEach(() => {
-          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        });
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-        expect(lastOption.selected).toBe(true, 'Expected last option to be selected.');
+      fixture.detectChanges();
 
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+      expect(trigger.textContent).toContain('Pizza');
+    }));
 
-        expect(lastOption.selected).toBe(true, 'Expected last option to stay selected.');
-      }));
+    it('should update the trigger based on the value', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectOnPush);
+      fixture.detectChanges();
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-      it('should not open a multiple select when tabbing through', fakeAsync(() => {
-        fixture.destroy();
+      fixture.componentInstance.control.setValue('pizza-1');
+      fixture.detectChanges();
 
-        const multiFixture = TestBed.createComponent(MultiSelect);
+      expect(trigger.textContent).toContain('Pizza');
 
-        multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      fixture.componentInstance.control.reset();
+      fixture.detectChanges();
 
-        expect(multiFixture.componentInstance.select.panelOpen)
-            .toBe(false, 'Expected panel to be closed initially.');
+      expect(trigger.textContent).not.toContain('Pizza');
+    }));
+  });
 
-        dispatchKeyboardEvent(select, 'keydown', TAB);
+  describe('with custom trigger', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([SelectWithCustomTrigger])));
 
-        expect(multiFixture.componentInstance.select.panelOpen)
-            .toBe(false, 'Expected panel to stay closed.');
-      }));
+    it('should allow the user to customize the label', fakeAsync(() => {
+      const fixture = TestBed.createComponent(SelectWithCustomTrigger);
+      fixture.detectChanges();
 
-      it('should prevent the default action when pressing space', fakeAsync(() => {
-        const event = dispatchKeyboardEvent(select, 'keydown', SPACE);
-        expect(event.defaultPrevented).toBe(true);
-      }));
+      fixture.componentInstance.control.setValue('pizza-1');
+      fixture.detectChanges();
 
-      it('should consider the selection a result of a user action when closed', fakeAsync(() => {
-        const option = fixture.componentInstance.options.first;
-        const spy = jasmine.createSpy('option selection spy');
-        const subscription = option.onSelectionChange.pipe(map(e => e.isUserInput)).subscribe(spy);
+      const label = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
 
-        dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
-        expect(spy).toHaveBeenCalledWith(true);
+      expect(label.textContent).toContain('azziP',
+          'Expected the displayed text to be "Pizza" in reverse.');
+    }));
+  });
 
-        subscription.unsubscribe();
-      }));
+  describe('when reseting the value by setting null or undefined', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([ResetValuesSelect])));
 
-      it('should be able to focus the select trigger', fakeAsync(() => {
-        document.body.focus(); // ensure that focus isn't on the trigger already
+    let fixture: ComponentFixture<ResetValuesSelect>;
+    let trigger: HTMLElement;
+    let formField: HTMLElement;
+    let options: NodeListOf<HTMLElement>;
 
-        fixture.componentInstance.select.focus();
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(ResetValuesSelect);
+      fixture.detectChanges();
+      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
-        expect(document.activeElement).toBe(select, 'Expected select element to be focused.');
-      }));
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-      // Having `aria-hidden` on the trigger avoids issues where
-      // screen readers read out the wrong amount of options.
-      it('should set aria-hidden on the trigger element', fakeAsync(() => {
-        const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
+      options[0].click();
+      fixture.detectChanges();
+      flush();
+    }));
 
-        expect(trigger.getAttribute('aria-hidden'))
-            .toBe('true', 'Expected aria-hidden to be true when the select is open.');
-      }));
+    it('should reset when an option with an undefined value is selected', fakeAsync(() => {
+      options[4].click();
+      fixture.detectChanges();
+      flush();
 
-      it('should set `aria-multiselectable` to true on multi-select instances', fakeAsync(() => {
-        fixture.destroy();
+      expect(fixture.componentInstance.control.value).toBeUndefined();
+      expect(fixture.componentInstance.select.selected).toBeFalsy();
+      expect(formField.classList).not.toContain('mat-form-field-should-float');
+      expect(trigger.textContent).not.toContain('Undefined');
+    }));
 
-        const multiFixture = TestBed.createComponent(MultiSelect);
+    it('should reset when an option with a null value is selected', fakeAsync(() => {
+      options[5].click();
+      fixture.detectChanges();
+      flush();
 
-        multiFixture.detectChanges();
-        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+      expect(fixture.componentInstance.control.value).toBeNull();
+      expect(fixture.componentInstance.select.selected).toBeFalsy();
+      expect(formField.classList).not.toContain('mat-form-field-should-float');
+      expect(trigger.textContent).not.toContain('Null');
+    }));
 
-        expect(select.getAttribute('aria-multiselectable')).toBe('true');
-      }));
+    it('should reset when a blank option is selected', fakeAsync(() => {
+      options[6].click();
+      fixture.detectChanges();
+      flush();
 
-      it('should set `aria-multiselectable` false on single-selection instances', fakeAsync(() => {
-        expect(select.getAttribute('aria-multiselectable')).toBe('false');
-      }));
+      expect(fixture.componentInstance.control.value).toBeUndefined();
+      expect(fixture.componentInstance.select.selected).toBeFalsy();
+      expect(formField.classList).not.toContain('mat-form-field-should-float');
+      expect(trigger.textContent).not.toContain('None');
+    }));
 
-      it('should set aria-activedescendant only while the panel is open', fakeAsync(() => {
-        fixture.componentInstance.control.setValue('chips-4');
-        fixture.detectChanges();
+    it('should not reset when any other falsy option is selected', fakeAsync(() => {
+      options[3].click();
+      fixture.detectChanges();
+      flush();
 
-        const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      expect(fixture.componentInstance.control.value).toBe(false);
+      expect(fixture.componentInstance.select.selected).toBeTruthy();
+      expect(formField.classList).toContain('mat-form-field-should-float');
+      expect(trigger.textContent).toContain('Falsy');
+    }));
 
-        expect(host.hasAttribute('aria-activedescendant'))
-            .toBe(false, 'Expected no aria-activedescendant on init.');
+    it('should not consider the reset values as selected when resetting the form control',
+        fakeAsync(() => {
+          expect(formField.classList).toContain('mat-form-field-should-float');
 
-        fixture.componentInstance.select.open();
-        fixture.detectChanges();
-        flush();
+          fixture.componentInstance.control.reset();
+          fixture.detectChanges();
 
-        const options = overlayContainerElement.querySelectorAll('mat-option');
+          expect(fixture.componentInstance.control.value).toBeNull();
+          expect(fixture.componentInstance.select.selected).toBeFalsy();
+          expect(formField.classList).not.toContain('mat-formf-field-should-float');
+          expect(trigger.textContent).not.toContain('Null');
+          expect(trigger.textContent).not.toContain('Undefined');
+        }));
+  });
 
-        expect(host.getAttribute('aria-activedescendant'))
-            .toBe(options[4].id, 'Expected aria-activedescendant to match the active option.');
+  describe('without Angular forms', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([
+      BasicSelectWithoutForms,
+      BasicSelectWithoutFormsPreselected,
+      BasicSelectWithoutFormsMultiple,
+    ])));
 
-        fixture.componentInstance.select.close();
-        fixture.detectChanges();
-        flush();
+    it('should set the value when options are clicked', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
-        expect(host.hasAttribute('aria-activedescendant'))
-            .toBe(false, 'Expected no aria-activedescendant when closed.');
-      }));
+      fixture.detectChanges();
+      expect(fixture.componentInstance.selectedFood).toBeFalsy();
 
-      it('should set aria-activedescendant based on the focused option', fakeAsync(() => {
-        const host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-        fixture.componentInstance.select.open();
-        fixture.detectChanges();
-        flush();
-
-        const options = overlayContainerElement.querySelectorAll('mat-option');
-
-        expect(host.getAttribute('aria-activedescendant')).toBe(options[0].id);
-
-        [1, 2, 3].forEach(() => {
-          dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-          fixture.detectChanges();
-        });
-
-        expect(host.getAttribute('aria-activedescendant')).toBe(options[4].id);
-
-        dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
-        fixture.detectChanges();
-
-        expect(host.getAttribute('aria-activedescendant')).toBe(options[3].id);
-      }));
-
-    });
-
-    describe('for options', () => {
-      let fixture: ComponentFixture<BasicSelect>;
-      let trigger: HTMLElement;
-      let options: NodeListOf<HTMLElement>;
-
-      beforeEach(fakeAsync(() => {
-        fixture = TestBed.createComponent(BasicSelect);
-        fixture.detectChanges();
-        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        trigger.click();
-        fixture.detectChanges();
-
-        options =
-            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      }));
-
-      it('should set the role of mat-option to option', fakeAsync(() => {
-        expect(options[0].getAttribute('role')).toEqual('option');
-        expect(options[1].getAttribute('role')).toEqual('option');
-        expect(options[2].getAttribute('role')).toEqual('option');
-      }));
-
-      it('should set aria-selected on each option', fakeAsync(() => {
-        expect(options[0].getAttribute('aria-selected')).toEqual('false');
-        expect(options[1].getAttribute('aria-selected')).toEqual('false');
-        expect(options[2].getAttribute('aria-selected')).toEqual('false');
-
-        options[1].click();
-        fixture.detectChanges();
-
-        trigger.click();
-        fixture.detectChanges();
-        flush();
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-        expect(options[0].getAttribute('aria-selected')).toEqual('false');
-        expect(options[1].getAttribute('aria-selected')).toEqual('true');
-        expect(options[2].getAttribute('aria-selected')).toEqual('false');
-      }));
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
+      fixture.detectChanges();
+      flush();
 
-      it('should set the tabindex of each option according to disabled state', fakeAsync(() => {
-        expect(options[0].getAttribute('tabindex')).toEqual('0');
-        expect(options[1].getAttribute('tabindex')).toEqual('0');
-        expect(options[2].getAttribute('tabindex')).toEqual('-1');
-      }));
+      expect(fixture.componentInstance.selectedFood).toBe('steak-0');
+      expect(fixture.componentInstance.select.value).toBe('steak-0');
+      expect(trigger.textContent).toContain('Steak');
 
-      it('should set aria-disabled for disabled options', fakeAsync(() => {
-        expect(options[0].getAttribute('aria-disabled')).toEqual('false');
-        expect(options[1].getAttribute('aria-disabled')).toEqual('false');
-        expect(options[2].getAttribute('aria-disabled')).toEqual('true');
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-        fixture.componentInstance.foods[2]['disabled'] = false;
-        fixture.detectChanges();
+      (overlayContainerElement.querySelectorAll('mat-option')[2] as HTMLElement).click();
+      fixture.detectChanges();
+      flush();
 
-        expect(options[0].getAttribute('aria-disabled')).toEqual('false');
-        expect(options[1].getAttribute('aria-disabled')).toEqual('false');
-        expect(options[2].getAttribute('aria-disabled')).toEqual('false');
-      }));
-    });
+      expect(fixture.componentInstance.selectedFood).toBe('sandwich-2');
+      expect(fixture.componentInstance.select.value).toBe('sandwich-2');
+      expect(trigger.textContent).toContain('Sandwich');
+    }));
 
-    describe('for option groups', () => {
-      let fixture: ComponentFixture<SelectWithGroups>;
-      let trigger: HTMLElement;
-      let groups: NodeListOf<HTMLElement>;
+    it('should mark options as selected when the value is set', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
-      beforeEach(fakeAsync(() => {
-        fixture = TestBed.createComponent(SelectWithGroups);
-        fixture.detectChanges();
-        trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-        trigger.click();
-        fixture.detectChanges();
-        groups =
-            overlayContainerElement.querySelectorAll('mat-optgroup') as NodeListOf<HTMLElement>;
-      }));
+      fixture.detectChanges();
+      fixture.componentInstance.selectedFood = 'sandwich-2';
+      fixture.detectChanges();
 
-      it('should set the appropriate role', fakeAsync(() => {
-        expect(groups[0].getAttribute('role')).toBe('group');
-      }));
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      expect(trigger.textContent).toContain('Sandwich');
 
-      it('should set the `aria-labelledby` attribute', fakeAsync(() => {
-        let group = groups[0];
-        let label = group.querySelector('label')!;
+      trigger.click();
+      fixture.detectChanges();
 
-        expect(label.getAttribute('id')).toBeTruthy('Expected label to have an id.');
-        expect(group.getAttribute('aria-labelledby'))
-            .toBe(label.getAttribute('id'), 'Expected `aria-labelledby` to match the label id.');
-      }));
+      const option = overlayContainerElement.querySelectorAll('mat-option')[2];
 
-      it('should set the `aria-disabled` attribute if the group is disabled', fakeAsync(() => {
-        expect(groups[1].getAttribute('aria-disabled')).toBe('true');
-      }));
-    });
+      expect(option.classList).toContain('mat-selected');
+      expect(fixture.componentInstance.select.value).toBe('sandwich-2');
+    }));
 
-    describe('aria-owns', () => {
-      let fixture: ComponentFixture<ManySelects>;
-      let triggers: DebugElement[];
-      let options: NodeListOf<HTMLElement>;
+    it('should reset the placeholder when a null value is set', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
-      beforeEach(fakeAsync(() => {
-        fixture = TestBed.createComponent(ManySelects);
-        fixture.detectChanges();
-        triggers = fixture.debugElement.queryAll(By.css('.mat-select-trigger'));
+      fixture.detectChanges();
+      expect(fixture.componentInstance.selectedFood).toBeFalsy();
 
-        triggers[0].nativeElement.click();
-        fixture.detectChanges();
-        flush();
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
 
-        options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      }));
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-      it('should set aria-owns properly', fakeAsync(() => {
-        const selects = fixture.debugElement.queryAll(By.css('mat-select'));
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
+      fixture.detectChanges();
+      flush();
 
-        expect(selects[0].nativeElement.getAttribute('aria-owns'))
-            .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
-        expect(selects[0].nativeElement.getAttribute('aria-owns'))
-            .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
+      expect(fixture.componentInstance.selectedFood).toBe('steak-0');
+      expect(fixture.componentInstance.select.value).toBe('steak-0');
+      expect(trigger.textContent).toContain('Steak');
 
-        const backdrop =
-            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
-        backdrop.click();
-        fixture.detectChanges();
-        flush();
+      fixture.componentInstance.selectedFood = null;
+      fixture.detectChanges();
 
-        triggers[1].nativeElement.click();
-        fixture.detectChanges();
-        flush();
+      expect(fixture.componentInstance.select.value).toBeNull();
+      expect(trigger.textContent).not.toContain('Steak');
+    }));
 
-        options =
-            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-        expect(selects[1].nativeElement.getAttribute('aria-owns'))
-            .toContain(options[0].id, `Expected aria-owns to contain IDs of its child options.`);
-        expect(selects[1].nativeElement.getAttribute('aria-owns'))
-            .toContain(options[1].id, `Expected aria-owns to contain IDs of its child options.`);
-      }));
+    it('should reflect the preselected value', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutFormsPreselected);
 
-      it('should set the option id properly', fakeAsync(() => {
-        let firstOptionID = options[0].id;
+      fixture.detectChanges();
+      flush();
 
-        expect(options[0].id)
-            .toContain('mat-option', `Expected option ID to have the correct prefix.`);
-        expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
+      const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      fixture.detectChanges();
+      expect(trigger.textContent).toContain('Pizza');
 
-        const backdrop =
-            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
-        backdrop.click();
-        fixture.detectChanges();
-        flush();
+      trigger.click();
+      fixture.detectChanges();
 
-        triggers[1].nativeElement.click();
-        fixture.detectChanges();
-        flush();
+      const option = overlayContainerElement.querySelectorAll('mat-option')[1];
 
-        options =
-            overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-        expect(options[0].id)
-            .toContain('mat-option', `Expected option ID to have the correct prefix.`);
-        expect(options[0].id).not.toEqual(firstOptionID, `Expected option IDs to be unique.`);
-        expect(options[0].id).not.toEqual(options[1].id, `Expected option IDs to be unique.`);
-      }));
-    });
-  });
+      expect(option.classList).toContain('mat-selected');
+      expect(fixture.componentInstance.select.value).toBe('pizza-1');
+    }));
 
-  describe('special cases', () => {
-    it('should handle nesting in an ngIf', fakeAsync(() => {
-      const fixture = TestBed.createComponent(NgIfSelect);
-      fixture.detectChanges();
+    it('should be able to select multiple values', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutFormsMultiple);
 
-      fixture.componentInstance.isShowing = true;
       fixture.detectChanges();
+      expect(fixture.componentInstance.selectedFoods).toBeFalsy();
 
       const trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      trigger.style.width = '300px';
 
       trigger.click();
       fixture.detectChanges();
-      flush();
-
-      const value = fixture.debugElement.query(By.css('.mat-select-value'));
-      expect(value.nativeElement.textContent)
-          .toContain('Pizza', `Expected trigger to be populated by the control's initial value.`);
-
-      const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
-      expect(pane.style.minWidth).toEqual('300px');
 
-      expect(fixture.componentInstance.select.panelOpen).toBe(true);
-      expect(overlayContainerElement.textContent).toContain('Steak');
-      expect(overlayContainerElement.textContent).toContain('Pizza');
-      expect(overlayContainerElement.textContent).toContain('Tacos');
-    }));
+      const options =
+          overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
 
-    it('should not crash the browser when a sibling throws an error on init', fakeAsync(() => {
-      // Note that this test can be considered successful if the error being thrown didn't
-      // end up crashing the testing setup altogether.
-      expect(() => {
-        TestBed.createComponent(SelectWithErrorSibling).detectChanges();
-      }).toThrowError(new RegExp('Oh no!', 'g'));
-    }));
+      options[0].click();
+      fixture.detectChanges();
 
-    it('should not throw when trying to access the selected value on init', fakeAsync(() => {
-      expect(() => {
-        TestBed.createComponent(SelectEarlyAccessSibling).detectChanges();
-      }).not.toThrow();
-    }));
+      expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0']);
+      expect(fixture.componentInstance.select.value).toEqual(['steak-0']);
+      expect(trigger.textContent).toContain('Steak');
 
-    it('should not throw selection model-related errors in addition to the errors from ngModel',
-        fakeAsync(() => {
-          const fixture = TestBed.createComponent(InvalidSelectInForm);
+      options[2].click();
+      fixture.detectChanges();
 
-          // The first change detection run will throw the "ngModel is missing a name" error.
-          expect(() => fixture.detectChanges()).toThrowError(/the name attribute must be set/g);
+      expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0', 'sandwich-2']);
+      expect(fixture.componentInstance.select.value).toEqual(['steak-0', 'sandwich-2']);
+      expect(trigger.textContent).toContain('Steak, Sandwich');
 
-          // The second run shouldn't throw selection-model related errors.
-          expect(() => fixture.detectChanges()).not.toThrow();
-        }));
+      options[1].click();
+      fixture.detectChanges();
 
-    it('should not throw when the triggerValue is accessed when there is no selected value',
-        fakeAsync(() => {
-          const fixture = TestBed.createComponent(BasicSelect);
-          fixture.detectChanges();
+      expect(fixture.componentInstance.selectedFoods).toEqual(['steak-0', 'pizza-1', 'sandwich-2']);
+      expect(fixture.componentInstance.select.value).toEqual(['steak-0', 'pizza-1', 'sandwich-2']);
+      expect(trigger.textContent).toContain('Steak, Pizza, Sandwich');
+    }));
 
-          expect(() => fixture.componentInstance.select.triggerValue).not.toThrow();
-        }));
+    it('should restore focus to the host element', fakeAsync(() => {
+      const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
-    it('should allow the user to customize the label', fakeAsync(() => {
-      const fixture = TestBed.createComponent(SelectWithCustomTrigger);
       fixture.detectChanges();
+      fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement.click();
+      fixture.detectChanges();
+      flush();
 
-      fixture.componentInstance.control.setValue('pizza-1');
+      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
       fixture.detectChanges();
+      flush();
 
-      const label = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
+      const select = fixture.debugElement.nativeElement.querySelector('mat-select');
 
-      expect(label.textContent).toContain('azziP',
-          'Expected the displayed text to be "Pizza" in reverse.');
+      expect(document.activeElement).toBe(select, 'Expected trigger to be focused.');
     }));
-
-    it('should not throw when attempting to open too early', () => {
-      const fixture = TestBed.createComponent(BasicSelect);
-      expect(() => fixture.componentInstance.select.open()).not.toThrow();
-    });
   });
 
-  describe('change event', () => {
-    let fixture: ComponentFixture<SelectWithChangeEvent>;
+  describe('positioning', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([
+      BasicSelect,
+      MultiSelect,
+      SelectWithGroups,
+    ])));
+
+    beforeEach((inject([ViewportRuler], (vr: ViewportRuler) => {
+      viewportRuler = vr;
+    })));
+
+    let fixture: ComponentFixture<BasicSelect>;
     let trigger: HTMLElement;
+    let select: HTMLElement;
+    let formField: HTMLElement;
 
     beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(SelectWithChangeEvent);
+      fixture = TestBed.createComponent(BasicSelect);
       fixture.detectChanges();
-
       trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
+      formField = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
     }));
 
-    it('should emit an event when the selected option has changed', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+    /**
+     * Asserts that the given option is aligned with the trigger.
+     * @param index The index of the option.
+     * @param selectInstance Instance of the `mat-select` component to check against.
+     */
+    function checkTriggerAlignedWithOption(index: number, selectInstance =
+        fixture.componentInstance.select): void {
 
-      (overlayContainerElement.querySelector('mat-option') as HTMLElement).click();
+      const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+      const triggerTop = trigger.getBoundingClientRect().top;
+      const overlayTop = overlayPane.getBoundingClientRect().top;
+      const options = overlayPane.querySelectorAll('mat-option');
+      const optionTop = options[index].getBoundingClientRect().top;
+      const triggerFontSize = parseInt(window.getComputedStyle(trigger)['font-size']);
+      const triggerLineHeightEm = 1.125;
 
-      expect(fixture.componentInstance.changeListener).toHaveBeenCalled();
-    }));
+      // Extra trigger height beyond the font size caused by the fact that the line-height is
+      // greater than 1em.
+      const triggerExtraLineSpaceAbove = (1 - triggerLineHeightEm) * triggerFontSize / 2;
+      const topDifference = Math.floor(optionTop) -
+          Math.floor(triggerTop - triggerFontSize - triggerExtraLineSpaceAbove);
 
-    it('should not emit multiple change events for the same option', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+      // Expect the coordinates to be within a pixel of each other. We can't rely on comparing
+      // the exact value, because different browsers report the various sizes with slight (< 1px)
+      // deviations.
+      expect(Math.abs(topDifference) < 2)
+          .toBe(true, `Expected trigger to align with option ${index}.`);
 
-      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+      // For the animation to start at the option's center, its origin must be the distance
+      // from the top of the overlay to the option top + half the option height (48/2 = 24).
+      const expectedOrigin = Math.floor(optionTop - overlayTop + 24);
+      const rawYOrigin = selectInstance._transformOrigin.split(' ')[1].trim();
+      const origin = Math.floor(parseInt(rawYOrigin));
 
-      option.click();
-      option.click();
+      expect(origin).toBe(expectedOrigin,
+          `Expected panel animation to originate in the center of option ${index}.`);
+    }
 
-      expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
-    }));
+    describe('ample space to open', () => {
+      beforeEach(fakeAsync(() => {
+        // these styles are necessary because we are first testing the overlay's position
+        // if there is room for it to open to its full extent in either direction.
+        formField.style.position = 'fixed';
+        formField.style.top = '285px';
+        formField.style.left = '20px';
+      }));
 
-    it('should only emit one event when pressing the arrow keys on a closed select',
-        fakeAsync(() => {
-          const select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-          dispatchKeyboardEvent(select, 'keydown', DOWN_ARROW);
+      it('should align the first option with trigger text if no option is selected',
+          fakeAsync(() => {
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-          expect(fixture.componentInstance.changeListener).toHaveBeenCalledTimes(1);
-        }));
-  });
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-  describe('floatPlaceholder option', () => {
-    let fixture: ComponentFixture<FloatPlaceholderSelect>;
-    let formField: HTMLElement;
+            // The panel should be scrolled to 0 because centering the option is not possible.
+            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+            checkTriggerAlignedWithOption(0);
+          }));
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(FloatPlaceholderSelect);
-      fixture.detectChanges();
-      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
-    }));
+      it('should align a selected option too high to be centered with the trigger text',
+          fakeAsync(() => {
+            // Select the second option, because it can't be scrolled any further downward
+            fixture.componentInstance.control.setValue('pizza-1');
+            fixture.detectChanges();
 
-    it('should be able to disable the floating placeholder', fakeAsync(() => {
-      fixture.componentInstance.floatPlaceholder = 'never';
-      fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-      expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(false, 'Floating placeholder should be disabled');
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+            // The panel should be scrolled to 0 because centering the option is not possible.
+            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
+            checkTriggerAlignedWithOption(1);
+          }));
 
-      expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(false, 'Floating placeholder should be disabled');
-    }));
+      it('should align a selected option in the middle with the trigger text', fakeAsync(() => {
+        // Select the fifth option, which has enough space to scroll to the center
+        fixture.componentInstance.control.setValue('chips-4');
+        fixture.detectChanges();
+        flush();
 
-    it('should be able to always float the placeholder', fakeAsync(() => {
-      expect(fixture.componentInstance.control.value).toBeFalsy();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      fixture.componentInstance.floatPlaceholder = 'always';
-      fixture.detectChanges();
+        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-      expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(true, 'Placeholder should be able to float');
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(true, 'Placeholder should be floating');
-    }));
+        // The selected option should be scrolled to the center of the panel.
+        // This will be its original offset from the scrollTop - half the panel height + half
+        // the option height. 4 (index) * 48 (option height) = 192px offset from scrollTop
+        // 192 - 256/2 + 48/2 = 88px
+        expect(scrollContainer.scrollTop)
+            .toEqual(88, `Expected overlay panel to be scrolled to center the selected option.`);
 
-    it ('should default to global floating placeholder type', fakeAsync(() => {
-      fixture.destroy();
+        checkTriggerAlignedWithOption(4);
+      }));
 
-      TestBed.resetTestingModule();
-      TestBed.configureTestingModule({
-        imports: [
-          MatFormFieldModule,
-          MatSelectModule,
-          ReactiveFormsModule,
-          FormsModule,
-          NoopAnimationsModule
-        ],
-        declarations: [
-          FloatPlaceholderSelect
-        ],
-        providers: [{ provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
-      });
+      it('should align a selected option at the scroll max with the trigger text', fakeAsync(() => {
+        // Select the last option in the list
+        fixture.componentInstance.control.setValue('sushi-7');
+        fixture.detectChanges();
+        flush();
 
-      fixture = TestBed.createComponent(FloatPlaceholderSelect);
-      fixture.componentInstance.floatPlaceholder = null;
-      fixture.detectChanges();
-      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(true, 'Placeholder should be able to float');
-      expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(true, 'Placeholder should be floating');
-    }));
-  });
+        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-  describe('with OnPush change detection', () => {
-    it('should set the trigger text based on the value when initialized', fakeAsync(() => {
-      let fixture = TestBed.createComponent(BasicSelectOnPushPreselected);
+        // The selected option should be scrolled to the max scroll position.
+        // This will be the height of the scrollContainer - the panel height.
+        // 8 options * 48px = 384 scrollContainer height, 384 - 256 = 128px max scroll
+        expect(scrollContainer.scrollTop)
+            .toEqual(128, `Expected overlay panel to be scrolled to its maximum position.`);
 
-      fixture.detectChanges();
-      flush();
+        checkTriggerAlignedWithOption(7);
+      }));
 
-      let trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+      it('should account for preceding label groups when aligning the option', fakeAsync(() => {
+        // Test is off-by-one on edge for some reason, but verified that it looks correct through
+        // manual testing.
+        if (platform.EDGE) {
+          return;
+        }
 
-      fixture.detectChanges();
+        fixture.destroy();
 
-      expect(trigger.textContent).toContain('Pizza');
-    }));
+        let groupFixture = TestBed.createComponent(SelectWithGroups);
+        groupFixture.detectChanges();
+        trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
+        formField = groupFixture.debugElement.query(By.css('mat-form-field')).nativeElement;
 
-    it('should update the trigger based on the value', fakeAsync(() => {
-      let fixture = TestBed.createComponent(BasicSelectOnPush);
-      fixture.detectChanges();
-      let trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        formField.style.position = 'fixed';
+        formField.style.top = '200px';
+        formField.style.left = '100px';
 
-      fixture.componentInstance.control.setValue('pizza-1');
-      fixture.detectChanges();
+        // Select an option in the third group, which has a couple of group labels before it.
+        groupFixture.componentInstance.control.setValue('vulpix-7');
+        groupFixture.detectChanges();
 
-      expect(trigger.textContent).toContain('Pizza');
+        trigger.click();
+        groupFixture.detectChanges();
+        flush();
 
-      fixture.componentInstance.control.reset();
-      fixture.detectChanges();
+        const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-      expect(trigger.textContent).not.toContain('Pizza');
-    }));
-  });
+        // The selected option should be scrolled to the center of the panel.
+        // This will be its original offset from the scrollTop - half the panel height + half the
+        // option height. 10 (option index + 3 group labels before it) * 48 (option height) = 480
+        // 480 (offset from scrollTop) - 256/2 + 48/2 = 376px
+        expect(Math.floor(scrollContainer.scrollTop))
+            .toBe(376, `Expected overlay panel to be scrolled to center the selected option.`);
 
-  describe('multiple selection', () => {
-    let fixture: ComponentFixture<MultiSelect>;
-    let testInstance: MultiSelect;
-    let trigger: HTMLElement;
+        checkTriggerAlignedWithOption(7, groupFixture.componentInstance.select);
+      }));
+    });
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(MultiSelect);
-      testInstance = fixture.componentInstance;
-      fixture.detectChanges();
+    describe('limited space to open vertically', () => {
+      beforeEach(fakeAsync(() => {
+        formField.style.position = 'fixed';
+        formField.style.left = '20px';
+      }));
 
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-    }));
+      it('should adjust position of centered option if there is little space above',
+          fakeAsync(() => {
+            const selectMenuHeight = 256;
+            const selectMenuViewportPadding = 8;
+            const selectItemHeight = 48;
+            const selectedIndex = 4;
+            const fontSize = 16;
+            const lineHeightEm = 1.125;
+            const expectedExtraScroll = 5;
 
-    it('should be able to select multiple values', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+            // Trigger element height.
+            const triggerHeight = fontSize * lineHeightEm;
 
-      const options = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            // Ideal space above selected item in order to center it.
+            const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
 
-      options[0].click();
-      options[2].click();
-      options[5].click();
-      fixture.detectChanges();
+            // Actual space above selected item.
+            const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
 
-      expect(testInstance.control.value).toEqual(['steak-0', 'tacos-2', 'eggs-5']);
-    }));
-
-    it('should be able to toggle an option on and off', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+            // Ideal scroll position to center.
+            const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
 
-      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
+            // Top-most select-position that allows for perfect centering.
+            const topMostPositionForPerfectCentering =
+                idealSpaceAboveSelectedItem + selectMenuViewportPadding +
+                (selectItemHeight - triggerHeight) / 2;
 
-      option.click();
-      fixture.detectChanges();
+            // Position of select relative to top edge of mat-form-field.
+            const formFieldTopSpace =
+                trigger.getBoundingClientRect().top - formField.getBoundingClientRect().top;
 
-      expect(testInstance.control.value).toEqual(['steak-0']);
+            const formFieldTop =
+                topMostPositionForPerfectCentering - formFieldTopSpace - expectedExtraScroll;
 
-      option.click();
-      fixture.detectChanges();
+            formField.style.top = `${formFieldTop}px`;
 
-      expect(testInstance.control.value).toEqual([]);
-    }));
+            // Select an option in the middle of the list
+            fixture.componentInstance.control.setValue('chips-4');
+            fixture.detectChanges();
+            flush();
 
-    it('should update the label', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-      const options = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-      options[0].click();
-      options[2].click();
-      options[5].click();
-      fixture.detectChanges();
+            expect(Math.ceil(scrollContainer.scrollTop))
+                .toEqual(Math.ceil(idealScrollTop + 5),
+                    `Expected panel to adjust scroll position to fit in viewport.`);
 
-      expect(trigger.textContent).toContain('Steak, Tacos, Eggs');
+            checkTriggerAlignedWithOption(4);
+          }));
 
-      options[2].click();
-      fixture.detectChanges();
+      it('should adjust position of centered option if there is little space below',
+          fakeAsync(() => {
+            const selectMenuHeight = 256;
+            const selectMenuViewportPadding = 8;
+            const selectItemHeight = 48;
+            const selectedIndex = 4;
+            const fontSize = 16;
+            const lineHeightEm = 1.125;
+            const expectedExtraScroll = 5;
 
-      expect(trigger.textContent).toContain('Steak, Eggs');
-    }));
+            // Trigger element height.
+            const triggerHeight = fontSize * lineHeightEm;
 
-    it('should be able to set the selected value by taking an array', fakeAsync(() => {
-      trigger.click();
-      testInstance.control.setValue(['steak-0', 'eggs-5']);
-      fixture.detectChanges();
+            // Ideal space above selected item in order to center it.
+            const idealSpaceAboveSelectedItem = (selectMenuHeight - selectItemHeight) / 2;
 
-      const optionNodes = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            // Actual space above selected item.
+            const actualSpaceAboveSelectedItem = selectItemHeight * selectedIndex;
 
-      const optionInstances = testInstance.options.toArray();
+            // Ideal scroll position to center.
+            const idealScrollTop = actualSpaceAboveSelectedItem - idealSpaceAboveSelectedItem;
 
-      expect(optionNodes[0].classList).toContain('mat-selected');
-      expect(optionNodes[5].classList).toContain('mat-selected');
+            // Bottom-most select-position that allows for perfect centering.
+            const bottomMostPositionForPerfectCentering =
+                idealSpaceAboveSelectedItem + selectMenuViewportPadding +
+                (selectItemHeight - triggerHeight) / 2;
 
-      expect(optionInstances[0].selected).toBe(true);
-      expect(optionInstances[5].selected).toBe(true);
-    }));
+            // Position of select relative to bottom edge of mat-form-field:
+            const formFieldBottomSpace =
+                formField.getBoundingClientRect().bottom - trigger.getBoundingClientRect().bottom;
 
-    it('should override the previously-selected value when setting an array', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+            const formFieldBottom =
+                bottomMostPositionForPerfectCentering - formFieldBottomSpace - expectedExtraScroll;
 
-      const options = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            // Push the select to a position with not quite enough space on the bottom to open
+            // with the option completely centered (needs 113px at least: 256/2 - 48/2 + 9)
+            formField.style.bottom = `${formFieldBottom}px`;
 
-      options[0].click();
-      fixture.detectChanges();
+            // Select an option in the middle of the list
+            fixture.componentInstance.control.setValue('chips-4');
+            fixture.detectChanges();
+            flush();
 
-      expect(options[0].classList).toContain('mat-selected');
+            fixture.detectChanges();
 
-      testInstance.control.setValue(['eggs-5']);
-      fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-      expect(options[0].classList).not.toContain('mat-selected');
-      expect(options[5].classList).toContain('mat-selected');
-    }));
+            const scrollContainer = document.querySelector('.cdk-overlay-pane .mat-select-panel')!;
 
-    it('should not close the panel when clicking on options', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
+            // Scroll should adjust by the difference between the bottom space available
+            // (56px from the bottom of the screen - 8px padding = 48px)
+            // and the height of the panel below the option (113px).
+            // 113px - 48px = 75px difference. Original scrollTop 88px - 75px = 23px
+            const difference = Math.ceil(scrollContainer.scrollTop) -
+                Math.ceil(idealScrollTop - expectedExtraScroll);
 
-      expect(testInstance.select.panelOpen).toBe(true);
+            // Note that different browser/OS combinations report the different dimensions with
+            // slight deviations (< 1px). We round the expectation and check that the values
+            // are within a pixel of each other to avoid flakes.
+            expect(Math.abs(difference) < 2)
+                .toBe(true, `Expected panel to adjust scroll position to fit in viewport.`);
 
-      const options = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            checkTriggerAlignedWithOption(4);
+          }));
 
-      options[0].click();
-      options[1].click();
-      fixture.detectChanges();
+      it('should fall back to "above" positioning if scroll adjustment will not help',
+          fakeAsync(() => {
+            // Push the select to a position with not enough space on the bottom to open
+            formField.style.bottom = '56px';
+            fixture.detectChanges();
 
-      expect(testInstance.select.panelOpen).toBe(true);
-    }));
+            // Select an option that cannot be scrolled any farther upward
+            fixture.componentInstance.control.setValue('coke-0');
+            fixture.detectChanges();
 
-    it('should sort the selected options based on their order in the panel', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-      const options = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            const overlayPane = document.querySelector('.cdk-overlay-pane')!;
+            const triggerBottom = trigger.getBoundingClientRect().bottom;
+            const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+            const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
 
-      options[2].click();
-      options[0].click();
-      options[1].click();
-      fixture.detectChanges();
+            // Expect no scroll to be attempted
+            expect(scrollContainer.scrollTop).toEqual(0, `Expected panel not to be scrolled.`);
 
-      expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
-      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
-    }));
+            const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
 
-    it('should sort the selected options in reverse in rtl', fakeAsync(() => {
-      dir.value = 'rtl';
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+            // Check that the values are within a pixel of each other. This avoids sub-pixel
+            // deviations between OS and browser versions.
+            expect(Math.abs(difference) < 2)
+                .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
 
-      const options = overlayContainerElement.querySelectorAll('mat-option') as
-          NodeListOf<HTMLElement>;
+            expect(fixture.componentInstance.select._transformOrigin)
+                .toContain(`bottom`, `Expected panel animation to originate at the bottom.`);
+          }));
 
-      options[2].click();
-      options[0].click();
-      options[1].click();
-      fixture.detectChanges();
+      it('should fall back to "below" positioning if scroll adjustment won\'t help',
+          fakeAsync(() => {
+            // Push the select to a position with not enough space on the top to open
+            formField.style.top = '85px';
 
-      expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
-      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
-    }));
+            // Select an option that cannot be scrolled any farther downward
+            fixture.componentInstance.control.setValue('sushi-7');
+            fixture.detectChanges();
+            flush();
 
-    it('should sort the values, that get set via the model, based on the panel order',
-        fakeAsync(() => {
-          trigger.click();
-          fixture.detectChanges();
+            trigger.click();
+            fixture.detectChanges();
+            flush();
 
-          testInstance.control.setValue(['tacos-2', 'steak-0', 'pizza-1']);
-          fixture.detectChanges();
+            const overlayPane = document.querySelector('.cdk-overlay-pane')!;
+            const triggerTop = trigger.getBoundingClientRect().top;
+            const overlayTop = overlayPane.getBoundingClientRect().top;
+            const scrollContainer = overlayPane.querySelector('.mat-select-panel')!;
 
-          expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
-        }));
+            // Expect scroll to remain at the max scroll position
+            expect(scrollContainer.scrollTop).toEqual(128, `Expected panel to be at max scroll.`);
 
-    it('should reverse sort the values, that get set via the model in rtl', fakeAsync(() => {
-      dir.value = 'rtl';
-      trigger.click();
-      fixture.detectChanges();
+            expect(Math.floor(overlayTop))
+                .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
 
-      testInstance.control.setValue(['tacos-2', 'steak-0', 'pizza-1']);
-      fixture.detectChanges();
+            expect(fixture.componentInstance.select._transformOrigin)
+                .toContain(`top`, `Expected panel animation to originate at the top.`);
+          }));
 
-      expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
-    }));
+    });
 
-    it('should throw an exception when trying to set a non-array value', fakeAsync(() => {
-      expect(() => {
-        testInstance.control.setValue('not-an-array');
-      }).toThrowError(wrappedErrorMessage(getMatSelectNonArrayValueError()));
-    }));
+    describe('limited space to open horizontally', () => {
+      beforeEach(fakeAsync(() => {
+        formField.style.position = 'absolute';
+        formField.style.top = '200px';
+      }));
 
-    it('should throw an exception when trying to change multiple mode after init', fakeAsync(() => {
-      expect(() => {
-        testInstance.select.multiple = false;
-      }).toThrowError(wrappedErrorMessage(getMatSelectDynamicMultipleError()));
-    }));
+      it('should stay within the viewport when overflowing on the left in ltr', fakeAsync(() => {
+        formField.style.left = '-100px';
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-    it('should pass the `multiple` value to all of the option instances', fakeAsync(() => {
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-      expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
-          'Expected `multiple` to have been added to initial set of options.');
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in ltr.`);
+      }));
 
-      testInstance.foods.push({ value: 'cake-8', viewValue: 'Cake' });
-      fixture.detectChanges();
+      it('should stay within the viewport when overflowing on the left in rtl', fakeAsync(() => {
+        dir.value = 'rtl';
+        formField.style.left = '-100px';
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
-          'Expected `multiple` to have been set on dynamically-added option.');
-    }));
-  });
+        const panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-  describe('theming', () => {
-    let fixture: ComponentFixture<BasicSelectWithTheming>;
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in rtl.`);
+      }));
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelectWithTheming);
-      fixture.detectChanges();
-    }));
+      it('should stay within the viewport when overflowing on the right in ltr', fakeAsync(() => {
+        formField.style.right = '-100px';
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-    it('should transfer the theme to the select panel', fakeAsync(() => {
-      fixture.componentInstance.theme = 'warn';
-      fixture.detectChanges();
+        const viewportRect = viewportRuler.getViewportRect().right;
+        const panelRight = document.querySelector('.mat-select-panel')!
+            .getBoundingClientRect().right;
 
-      fixture.componentInstance.select.open();
-      fixture.detectChanges();
+        expect(viewportRect - panelRight).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in ltr.`);
+      }));
 
-      const panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
-      expect(panel.classList).toContain('mat-warn');
-    }));
-  });
+      it('should stay within the viewport when overflowing on the right in rtl', fakeAsync(() => {
+        dir.value = 'rtl';
+        formField.style.right = '-100px';
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-  describe('reset values', () => {
-    let fixture: ComponentFixture<ResetValuesSelect>;
-    let trigger: HTMLElement;
-    let formField: HTMLElement;
-    let options: NodeListOf<HTMLElement>;
+        const viewportRect = viewportRuler.getViewportRect().right;
+        const panelRight = document.querySelector('.mat-select-panel')!
+            .getBoundingClientRect().right;
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(ResetValuesSelect);
-      fixture.detectChanges();
-      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
-      formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+        expect(viewportRect - panelRight).toBeGreaterThan(0,
+            `Expected select panel to be inside the viewport in rtl.`);
+      }));
 
-      trigger.click();
-      fixture.detectChanges();
-      flush();
+      it('should keep the position within the viewport on repeat openings', fakeAsync(() => {
+        formField.style.left = '-100px';
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      options = overlayContainerElement.querySelectorAll('mat-option') as NodeListOf<HTMLElement>;
-      options[0].click();
-      fixture.detectChanges();
-      flush();
-    }));
+        let panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-    it('should reset when an option with an undefined value is selected', fakeAsync(() => {
-      options[4].click();
-      fixture.detectChanges();
-      flush();
+        expect(panelLeft).toBeGreaterThan(0, `Expected select panel to be inside the viewport.`);
 
-      expect(fixture.componentInstance.control.value).toBeUndefined();
-      expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(formField.classList).not.toContain('mat-form-field-should-float');
-      expect(trigger.textContent).not.toContain('Undefined');
-    }));
+        fixture.componentInstance.select.close();
+        fixture.detectChanges();
+        flush();
 
-    it('should reset when an option with a null value is selected', fakeAsync(() => {
-      options[5].click();
-      fixture.detectChanges();
-      flush();
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-      expect(fixture.componentInstance.control.value).toBeNull();
-      expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(formField.classList).not.toContain('mat-form-field-should-float');
-      expect(trigger.textContent).not.toContain('Null');
-    }));
+        panelLeft = document.querySelector('.mat-select-panel')!.getBoundingClientRect().left;
 
-    it('should reset when a blank option is selected', fakeAsync(() => {
-      options[6].click();
-      fixture.detectChanges();
-      flush();
+        expect(panelLeft).toBeGreaterThan(0,
+            `Expected select panel continue being inside the viewport.`);
+      }));
+    });
 
-      expect(fixture.componentInstance.control.value).toBeUndefined();
-      expect(fixture.componentInstance.select.selected).toBeFalsy();
-      expect(formField.classList).not.toContain('mat-form-field-should-float');
-      expect(trigger.textContent).not.toContain('None');
-    }));
+    describe('when scrolled', () => {
+      const startingWindowHeight = window.innerHeight;
 
-    it('should not reset when any other falsy option is selected', fakeAsync(() => {
-      options[3].click();
-      fixture.detectChanges();
-      flush();
+      // Need to set the scrollTop two different ways to support
+      // both Chrome and Firefox.
+      function setScrollTop(num: number) {
+        document.body.scrollTop = num;
+        document.documentElement.scrollTop = num;
+      }
 
-      expect(fixture.componentInstance.control.value).toBe(false);
-      expect(fixture.componentInstance.select.selected).toBeTruthy();
-      expect(formField.classList).toContain('mat-form-field-should-float');
-      expect(trigger.textContent).toContain('Falsy');
-    }));
+      beforeEach(fakeAsync(() => {
+        // Make the div above the select very tall, so the page will scroll
+        fixture.componentInstance.heightAbove = 2000;
+        fixture.detectChanges();
+        setScrollTop(0);
 
-    it('should not consider the reset values as selected when resetting the form control',
-        fakeAsync(() => {
-          expect(formField.classList).toContain('mat-form-field-should-float');
+        // Give the select enough horizontal space to open
+        formField.style.marginLeft = '20px';
+        formField.style.marginRight = '20px';
+      }));
 
-          fixture.componentInstance.control.reset();
-          fixture.detectChanges();
+      it('should align the first option properly when scrolled', fakeAsync(() => {
+        // Give the select enough space to open
+        fixture.componentInstance.heightBelow = 400;
+        fixture.detectChanges();
 
-          expect(fixture.componentInstance.control.value).toBeNull();
-          expect(fixture.componentInstance.select.selected).toBeFalsy();
-          expect(formField.classList).not.toContain('mat-formf-field-should-float');
-          expect(trigger.textContent).not.toContain('Null');
-          expect(trigger.textContent).not.toContain('Undefined');
-        }));
-  });
+        // Scroll the select into view
+        setScrollTop(1700);
 
-  describe('error state', () => {
-    let fixture: ComponentFixture<SelectInsideFormGroup>;
-    let testComponent: SelectInsideFormGroup;
-    let select: HTMLElement;
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
+        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
+        // successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(SelectInsideFormGroup);
-      fixture.detectChanges();
-      testComponent = fixture.componentInstance;
-      select = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-    }));
+        trigger.click();
+        fixture.detectChanges();
+        flush();
 
-    it('should not set the invalid class on a clean select', fakeAsync(() => {
-      expect(testComponent.formGroup.untouched).toBe(true, 'Expected the form to be untouched.');
-      expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid.');
-      expect(select.classList)
-          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('false', 'Expected aria-invalid to be set to false.');
-    }));
+        checkTriggerAlignedWithOption(0);
+      }));
 
-    it('should appear as invalid if it becomes touched', fakeAsync(() => {
-      expect(select.classList)
-          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('false', 'Expected aria-invalid to be set to false.');
+      it('should align a centered option properly when scrolled', fakeAsync(() => {
+        // Give the select enough space to open
+        fixture.componentInstance.heightBelow = 400;
+        fixture.detectChanges();
 
-      testComponent.formControl.markAsTouched();
-      fixture.detectChanges();
+        fixture.componentInstance.control.setValue('chips-4');
+        fixture.detectChanges();
+        flush();
 
-      expect(select.classList)
-          .toContain('mat-select-invalid', 'Expected select to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('true', 'Expected aria-invalid to be set to true.');
-    }));
+        // Scroll the select into view
+        setScrollTop(1700);
+
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt
+        // to scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does
+        // not successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
+
+        trigger.click();
+        fixture.detectChanges();
+        flush();
+
+        checkTriggerAlignedWithOption(4);
+      }));
+
+      it('should align a centered option properly when scrolling while the panel is open',
+          fakeAsync(() => {
+            fixture.componentInstance.heightBelow = 400;
+            fixture.componentInstance.heightAbove = 400;
+            fixture.componentInstance.control.setValue('chips-4');
+            fixture.detectChanges();
+            flush();
+
+            trigger.click();
+            fixture.detectChanges();
+            flush();
+
+            setScrollTop(100);
+            scrolledSubject.next();
+            fixture.detectChanges();
+
+            checkTriggerAlignedWithOption(4);
+          }));
+
+      it('should fall back to "above" positioning properly when scrolled', fakeAsync(() => {
+        // Give the select insufficient space to open below the trigger
+        fixture.componentInstance.heightAbove = 0;
+        fixture.componentInstance.heightBelow = 100;
+        trigger.style.marginTop = '2000px';
+        fixture.detectChanges();
+
+        // Scroll the select into view
+        setScrollTop(1400);
+
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
+        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
+        // successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
+
+        trigger.click();
+        fixture.detectChanges();
+        flush();
+
+        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+        const triggerBottom = trigger.getBoundingClientRect().bottom;
+        const overlayBottom = overlayPane.getBoundingClientRect().bottom;
+        const difference = Math.floor(overlayBottom) - Math.floor(triggerBottom);
+
+        // Check that the values are within a pixel of each other. This avoids sub-pixel
+        // deviations between OS and browser versions.
+        expect(Math.abs(difference) < 2)
+            .toEqual(true, `Expected trigger bottom to align with overlay bottom.`);
+      }));
+
+      it('should fall back to "below" positioning properly when scrolled', fakeAsync(() => {
+        // Give plenty of space for the select to open below the trigger
+        fixture.componentInstance.heightBelow = 650;
+        fixture.detectChanges();
+
+        // Select an option too low in the list to fit in limited space above
+        fixture.componentInstance.control.setValue('sushi-7');
+        fixture.detectChanges();
+
+        // Scroll the select so that it has insufficient space to open above the trigger
+        setScrollTop(1950);
+
+        // In the iOS simulator (BrowserStack & SauceLabs), adding the content to the
+        // body causes karma's iframe for the test to stretch to fit that content once we attempt to
+        // scroll the page. Setting width / height / maxWidth / maxHeight on the iframe does not
+        // successfully constrain its size. As such, skip assertions in environments where the
+        // window size has changed since the start of the test.
+        if (window.innerHeight > startingWindowHeight) {
+          return;
+        }
+
+        trigger.click();
+        fixture.detectChanges();
+        flush();
+
+        const overlayPane = overlayContainerElement.querySelector('.cdk-overlay-pane')!;
+        const triggerTop = trigger.getBoundingClientRect().top;
+        const overlayTop = overlayPane.getBoundingClientRect().top;
+
+        expect(Math.floor(overlayTop))
+            .toEqual(Math.floor(triggerTop), `Expected trigger top to align with overlay top.`);
+      }));
+    });
+
+    describe('x-axis positioning', () => {
+      beforeEach(fakeAsync(() => {
+        formField.style.position = 'fixed';
+        formField.style.left = '30px';
+      }));
+
+      it('should align the trigger and the selected option on the x-axis in ltr', fakeAsync(() => {
+        trigger.click();
+        fixture.detectChanges();
+        flush();
+
+        const triggerLeft = trigger.getBoundingClientRect().left;
+        const firstOptionLeft = document.querySelector('.cdk-overlay-pane mat-option')!
+            .getBoundingClientRect().left;
+
+        // Each option is 32px wider than the trigger, so it must be adjusted 16px
+        // to ensure the text overlaps correctly.
+        expect(Math.floor(firstOptionLeft)).toEqual(Math.floor(triggerLeft - 16),
+            `Expected trigger to align with the selected option on the x-axis in LTR.`);
+      }));
+
+      it('should align the trigger and the selected option on the x-axis in rtl', fakeAsync(() => {
+        dir.value = 'rtl';
+        fixture.detectChanges();
+
+        trigger.click();
+        fixture.detectChanges();
+        flush();
+
+        const triggerRight = trigger.getBoundingClientRect().right;
+        const firstOptionRight =
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+
+        // Each option is 32px wider than the trigger, so it must be adjusted 16px
+        // to ensure the text overlaps correctly.
+        expect(Math.floor(firstOptionRight))
+            .toEqual(Math.floor(triggerRight + 16),
+                `Expected trigger to align with the selected option on the x-axis in RTL.`);
+      }));
+    });
+
+    describe('x-axis positioning in multi select mode', () => {
+      let multiFixture: ComponentFixture<MultiSelect>;
+
+      beforeEach(fakeAsync(() => {
+        multiFixture = TestBed.createComponent(MultiSelect);
+        multiFixture.detectChanges();
+        formField = multiFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+        trigger = multiFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        select = multiFixture.debugElement.query(By.css('mat-select')).nativeElement;
+
+        formField.style.position = 'fixed';
+        formField.style.left = '60px';
+      }));
+
+      it('should adjust for the checkbox in ltr', fakeAsync(() => {
+        trigger.click();
+        multiFixture.detectChanges();
+        flush();
+
+        const triggerLeft = trigger.getBoundingClientRect().left;
+        const firstOptionLeft =
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().left;
+
+        // 44px accounts for the checkbox size, margin and the panel's padding.
+        expect(Math.floor(firstOptionLeft))
+            .toEqual(Math.floor(triggerLeft - 44),
+                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
+      }));
+
+      it('should adjust for the checkbox in rtl', fakeAsync(() => {
+        dir.value = 'rtl';
+        trigger.click();
+        multiFixture.detectChanges();
+        flush();
+
+        const triggerRight = trigger.getBoundingClientRect().right;
+        const firstOptionRight =
+            document.querySelector('.cdk-overlay-pane mat-option')!.getBoundingClientRect().right;
+
+        // 44px accounts for the checkbox size, margin and the panel's padding.
+        expect(Math.floor(firstOptionRight))
+            .toEqual(Math.floor(triggerRight + 44),
+                `Expected trigger label to align along x-axis, accounting for the checkbox.`);
+      }));
+    });
+
+    describe('x-axis positioning with groups', () => {
+      let groupFixture: ComponentFixture<SelectWithGroups>;
+
+      beforeEach(fakeAsync(() => {
+        groupFixture = TestBed.createComponent(SelectWithGroups);
+        groupFixture.detectChanges();
+        formField = groupFixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
+        trigger = groupFixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
+        select = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
+
+        formField.style.position = 'fixed';
+        formField.style.left = '60px';
+      }));
+
+      it('should adjust for the group padding in ltr', fakeAsync(() => {
+        groupFixture.componentInstance.control.setValue('oddish-1');
+        groupFixture.detectChanges();
+
+        trigger.click();
+        groupFixture.detectChanges();
+
+        groupFixture.whenStable().then(() => {
+          const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
+          const triggerLeft = trigger.getBoundingClientRect().left;
+          const selectedOptionLeft = group.querySelector('mat-option.mat-selected')!
+              .getBoundingClientRect().left;
+
+          // 32px is the 16px default padding plus 16px of padding when an option is in a group.
+          expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 32),
+              `Expected trigger label to align along x-axis, accounting for the padding in ltr.`);
+        });
+      }));
+
+      it('should adjust for the group padding in rtl', fakeAsync(() => {
+        dir.value = 'rtl';
+        groupFixture.componentInstance.control.setValue('oddish-1');
+        groupFixture.detectChanges();
+
+        trigger.click();
+        groupFixture.detectChanges();
+        flush();
+
+        const group = document.querySelector('.cdk-overlay-pane mat-optgroup')!;
+        const triggerRight = trigger.getBoundingClientRect().right;
+        const selectedOptionRight = group.querySelector('mat-option.mat-selected')!
+            .getBoundingClientRect().right;
+
+        // 32px is the 16px default padding plus 16px of padding when an option is in a group.
+        expect(Math.floor(selectedOptionRight)).toEqual(Math.floor(triggerRight + 32),
+            `Expected trigger label to align along x-axis, accounting for the padding in rtl.`);
+      }));
+
+      it('should not adjust if all options are within a group, except the selected one',
+          fakeAsync(() => {
+            groupFixture.componentInstance.control.setValue('mime-11');
+            groupFixture.detectChanges();
+
+            trigger.click();
+            groupFixture.detectChanges();
+            flush();
+
+            const selected = document.querySelector('.cdk-overlay-pane mat-option.mat-selected')!;
+            const selectedOptionLeft = selected.getBoundingClientRect().left;
+            const triggerLeft = trigger.getBoundingClientRect().left;
+
+            // 16px is the default option padding
+            expect(Math.floor(selectedOptionLeft)).toEqual(Math.floor(triggerLeft - 16));
+          }));
+
+      it('should align the first option to the trigger, if nothing is selected', fakeAsync(() => {
+        // Push down the form field so there is space for the item to completely align.
+        formField.style.top = '100px';
+
+        const menuItemHeight = 48;
+        const triggerFontSize = 16;
+        const triggerLineHeightEm = 1.125;
+        const triggerHeight = triggerFontSize * triggerLineHeightEm;
+
+        trigger.click();
+        groupFixture.detectChanges();
+        flush();
+
+        const triggerTop = trigger.getBoundingClientRect().top;
+
+        const option = overlayContainerElement.querySelector('.cdk-overlay-pane mat-option');
+        const optionTop = option ? option.getBoundingClientRect().top : 0;
+
+        // There appears to be a small rounding error on IE, so we verify that the value is close,
+        // not exact.
+        if (platform.TRIDENT) {
+          let difference =
+              Math.abs(optionTop + (menuItemHeight - triggerHeight) / 2 - triggerTop);
+          expect(difference)
+              .toBeLessThan(0.1, 'Expected trigger to align with the first option.');
+        } else {
+          expect(Math.floor(optionTop + (menuItemHeight - triggerHeight) / 2))
+              .toBe(Math.floor(triggerTop), 'Expected trigger to align with the first option.');
+        }
+      }));
+    });
+  });
 
-    it('should not have the invalid class when the select becomes valid', fakeAsync(() => {
-      testComponent.formControl.markAsTouched();
-      fixture.detectChanges();
+  describe('with multiple selection', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([MultiSelect])));
 
-      expect(select.classList)
-          .toContain('mat-select-invalid', 'Expected select to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('true', 'Expected aria-invalid to be set to true.');
+    let fixture: ComponentFixture<MultiSelect>;
+    let testInstance: MultiSelect;
+    let trigger: HTMLElement;
 
-      testComponent.formControl.setValue('pizza-1');
+    beforeEach(fakeAsync(() => {
+      fixture = TestBed.createComponent(MultiSelect);
+      testInstance = fixture.componentInstance;
       fixture.detectChanges();
 
-      expect(select.classList)
-          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('false', 'Expected aria-invalid to be set to false.');
+      trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
     }));
 
-    it('should appear as invalid when the parent form group is submitted', fakeAsync(() => {
-      expect(select.classList)
-          .not.toContain('mat-select-invalid', 'Expected select not to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('false', 'Expected aria-invalid to be set to false.');
-
-      dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
+    it('should be able to select multiple values', fakeAsync(() => {
+      trigger.click();
       fixture.detectChanges();
 
-      expect(select.classList)
-          .toContain('mat-select-invalid', 'Expected select to appear invalid.');
-      expect(select.getAttribute('aria-invalid'))
-          .toBe('true', 'Expected aria-invalid to be set to true.');
-    }));
-
-    it('should render the error messages when the parent form is submitted', fakeAsync(() => {
-      const debugEl = fixture.debugElement.nativeElement;
-
-      expect(debugEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error messages');
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-      dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
+      options[0].click();
+      options[2].click();
+      options[5].click();
       fixture.detectChanges();
 
-      expect(debugEl.querySelectorAll('mat-error').length).toBe(1, 'Expected one error message');
+      expect(testInstance.control.value).toEqual(['steak-0', 'tacos-2', 'eggs-5']);
     }));
 
-    it('should be able to override the error matching behavior via an @Input', fakeAsync(() => {
-      fixture.destroy();
+    it('should be able to toggle an option on and off', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
 
-      const customErrorFixture = TestBed.createComponent(CustomErrorBehaviorSelect);
-      const component = customErrorFixture.componentInstance;
-      const matcher = jasmine.createSpy('error state matcher').and.returnValue(true);
+      const option = overlayContainerElement.querySelector('mat-option') as HTMLElement;
 
-      customErrorFixture.detectChanges();
+      option.click();
+      fixture.detectChanges();
 
-      expect(component.control.invalid).toBe(false);
-      expect(component.select.errorState).toBe(false);
+      expect(testInstance.control.value).toEqual(['steak-0']);
 
-      customErrorFixture.componentInstance.errorStateMatcher = { isErrorState: matcher };
-      customErrorFixture.detectChanges();
+      option.click();
+      fixture.detectChanges();
 
-      expect(component.select.errorState).toBe(true);
-      expect(matcher).toHaveBeenCalled();
+      expect(testInstance.control.value).toEqual([]);
     }));
 
-    it('should be able to override the error matching behavior via the injection token',
-        fakeAsync(() => {
-          const errorStateMatcher: ErrorStateMatcher = {
-            isErrorState: jasmine.createSpy('error state matcher').and.returnValue(true)
-          };
-
-          fixture.destroy();
-
-          TestBed.resetTestingModule().configureTestingModule({
-            imports: [MatSelectModule, ReactiveFormsModule, FormsModule, NoopAnimationsModule],
-            declarations: [SelectInsideFormGroup],
-            providers: [{ provide: ErrorStateMatcher, useValue: errorStateMatcher }],
-          });
-
-          const errorFixture = TestBed.createComponent(SelectInsideFormGroup);
-          const component = errorFixture.componentInstance;
+    it('should update the label', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-          errorFixture.detectChanges();
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-          expect(component.select.errorState).toBe(true);
-          expect(errorStateMatcher.isErrorState).toHaveBeenCalled();
-        }));
-  });
+      options[0].click();
+      options[2].click();
+      options[5].click();
+      fixture.detectChanges();
 
-  describe('compareWith behavior', () => {
-    let fixture: ComponentFixture<NgModelCompareWithSelect>;
-    let instance: NgModelCompareWithSelect;
+      expect(trigger.textContent).toContain('Steak, Tacos, Eggs');
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(NgModelCompareWithSelect);
-      instance = fixture.componentInstance;
+      options[2].click();
       fixture.detectChanges();
+
+      expect(trigger.textContent).toContain('Steak, Eggs');
     }));
 
-    describe('when comparing by value', () => {
+    it('should be able to set the selected value by taking an array', fakeAsync(() => {
+      trigger.click();
+      testInstance.control.setValue(['steak-0', 'eggs-5']);
+      fixture.detectChanges();
 
-      it('should have a selection', fakeAsync(() => {
-        const selectedOption = instance.select.selected as MatOption;
-        expect(selectedOption.value.value).toEqual('pizza-1');
-      }));
+      const optionNodes = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-      it('should update when making a new selection', fakeAsync(() => {
-        instance.options.last._selectViaInteraction();
-        fixture.detectChanges();
-        flush();
+      const optionInstances = testInstance.options.toArray();
 
-        const selectedOption = instance.select.selected as MatOption;
-        expect(instance.selectedFood.value).toEqual('tacos-2');
-        expect(selectedOption.value.value).toEqual('tacos-2');
-      }));
+      expect(optionNodes[0].classList).toContain('mat-selected');
+      expect(optionNodes[5].classList).toContain('mat-selected');
 
-    });
+      expect(optionInstances[0].selected).toBe(true);
+      expect(optionInstances[5].selected).toBe(true);
+    }));
 
-    describe('when comparing by reference', () => {
-      beforeEach(fakeAsync(() => {
-        spyOn(instance, 'compareByReference').and.callThrough();
-        instance.useCompareByReference();
-        fixture.detectChanges();
-      }));
+    it('should override the previously-selected value when setting an array', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
 
-      it('should use the comparator', fakeAsync(() => {
-        expect(instance.compareByReference).toHaveBeenCalled();
-      }));
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-      it('should initialize with no selection despite having a value', fakeAsync(() => {
-        expect(instance.selectedFood.value).toBe('pizza-1');
-        expect(instance.select.selected).toBeUndefined();
-      }));
+      options[0].click();
+      fixture.detectChanges();
 
-      it('should not update the selection if value is copied on change', fakeAsync(() => {
-        instance.options.first._selectViaInteraction();
-        fixture.detectChanges();
-        flush();
+      expect(options[0].classList).toContain('mat-selected');
 
-        expect(instance.selectedFood.value).toEqual('steak-0');
-        expect(instance.select.selected).toBeUndefined();
-      }));
+      testInstance.control.setValue(['eggs-5']);
+      fixture.detectChanges();
 
-      it('should throw an error when using a non-function comparator', fakeAsync(() => {
-        instance.useNullComparator();
+      expect(options[0].classList).not.toContain('mat-selected');
+      expect(options[5].classList).toContain('mat-selected');
+    }));
 
-        expect(() => {
-          fixture.detectChanges();
-        }).toThrowError(wrappedErrorMessage(getMatSelectNonFunctionValueError()));
-      }));
-    });
-  });
+    it('should not close the panel when clicking on options', fakeAsync(() => {
+      trigger.click();
+      fixture.detectChanges();
 
-  describe('keyboard scrolling', () => {
-    let fixture: ComponentFixture<BasicSelect>;
-    let host: HTMLElement;
-    let panel: HTMLElement;
+      expect(testInstance.select.panelOpen).toBe(true);
 
-    beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(BasicSelect);
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-      fixture.componentInstance.foods = [];
+      options[0].click();
+      options[1].click();
+      fixture.detectChanges();
 
-      for (let i = 0; i < 30; i++) {
-        fixture.componentInstance.foods.push({value: `value-${i}`, viewValue: `Option ${i}`});
-      }
+      expect(testInstance.select.panelOpen).toBe(true);
+    }));
 
-      fixture.detectChanges();
-      fixture.componentInstance.select.open();
+    it('should sort the selected options based on their order in the panel', fakeAsync(() => {
+      trigger.click();
       fixture.detectChanges();
       flush();
 
-      host = fixture.debugElement.query(By.css('mat-select')).nativeElement;
-      panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
-    }));
-
-    it('should not scroll to options that are completely in the view', fakeAsync(() => {
-      const initialScrollPosition = panel.scrollTop;
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-      [1, 2, 3].forEach(() => {
-        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-      });
+      options[2].click();
+      options[0].click();
+      options[1].click();
+      fixture.detectChanges();
 
-      expect(panel.scrollTop).toBe(initialScrollPosition, 'Expected scroll position not to change');
+      expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
+      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
     }));
 
-    it('should scroll down to the active option', fakeAsync(() => {
-      for (let i = 0; i < 15; i++) {
-        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-      }
-
-      // <option index * height> - <panel height> = 16 * 48 - 256 = 512
-      expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
-    }));
+    it('should sort the selected options in reverse in rtl', fakeAsync(() => {
+      dir.value = 'rtl';
+      trigger.click();
+      fixture.detectChanges();
+      flush();
 
-    it('should scroll up to the active option', fakeAsync(() => {
-      // Scroll to the bottom.
-      for (let i = 0; i < fixture.componentInstance.foods.length; i++) {
-        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-      }
+      const options = overlayContainerElement.querySelectorAll('mat-option') as
+          NodeListOf<HTMLElement>;
 
-      for (let i = 0; i < 20; i++) {
-        dispatchKeyboardEvent(host, 'keydown', UP_ARROW);
-      }
+      options[2].click();
+      options[0].click();
+      options[1].click();
+      fixture.detectChanges();
 
-      // <option index * height> = 9 * 48 = 432
-      expect(panel.scrollTop).toBe(432, 'Expected scroll to be at the 9th option.');
+      expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
+      expect(fixture.componentInstance.control.value).toEqual(['steak-0', 'pizza-1', 'tacos-2']);
     }));
 
-    it('should skip option group labels', fakeAsync(() => {
-      fixture.destroy();
+    it('should sort the values that get set via the model based on the panel order',
+        fakeAsync(() => {
+          trigger.click();
+          fixture.detectChanges();
 
-      const groupFixture = TestBed.createComponent(SelectWithGroups);
+          testInstance.control.setValue(['tacos-2', 'steak-0', 'pizza-1']);
+          fixture.detectChanges();
 
-      groupFixture.detectChanges();
-      groupFixture.componentInstance.select.open();
-      groupFixture.detectChanges();
-      flush();
+          expect(trigger.textContent).toContain('Steak, Pizza, Tacos');
+        }));
 
-      host = groupFixture.debugElement.query(By.css('mat-select')).nativeElement;
-      panel = overlayContainerElement.querySelector('.mat-select-panel')! as HTMLElement;
+    it('should reverse sort the values, that get set via the model in rtl', fakeAsync(() => {
+      dir.value = 'rtl';
+      trigger.click();
+      fixture.detectChanges();
 
-      for (let i = 0; i < 5; i++) {
-        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-      }
+      testInstance.control.setValue(['tacos-2', 'steak-0', 'pizza-1']);
+      fixture.detectChanges();
 
-      // Note that we press down 5 times, but it will skip
-      // 3 options because the second group is disabled.
-      // <(option index + group labels) * height> - <panel height> = (9 + 3) * 48 - 256 = 320
-      expect(panel.scrollTop).toBe(320, 'Expected scroll to be at the 9th option.');
+      expect(trigger.textContent).toContain('Tacos, Pizza, Steak');
     }));
 
-    it('should scroll top the top when pressing HOME', fakeAsync(() => {
-      for (let i = 0; i < 20; i++) {
-        dispatchKeyboardEvent(host, 'keydown', DOWN_ARROW);
-        fixture.detectChanges();
-      }
-
-      expect(panel.scrollTop).toBeGreaterThan(0, 'Expected panel to be scrolled down.');
-
-      dispatchKeyboardEvent(host, 'keydown', HOME);
-      fixture.detectChanges();
+    it('should throw an exception when trying to set a non-array value', fakeAsync(() => {
+      expect(() => {
+        testInstance.control.setValue('not-an-array');
+      }).toThrowError(wrappedErrorMessage(getMatSelectNonArrayValueError()));
+    }));
 
-      expect(panel.scrollTop).toBe(0, 'Expected panel to be scrolled to the top');
+    it('should throw an exception when trying to change multiple mode after init', fakeAsync(() => {
+      expect(() => {
+        testInstance.select.multiple = false;
+      }).toThrowError(wrappedErrorMessage(getMatSelectDynamicMultipleError()));
     }));
 
-    it('should scroll to the bottom of the panel when pressing END', fakeAsync(() => {
-      dispatchKeyboardEvent(host, 'keydown', END);
+    it('should pass the `multiple` value to all of the option instances', fakeAsync(() => {
+      trigger.click();
       fixture.detectChanges();
+      flush();
 
-      // <option amount> * <option height> - <panel height> = 30 * 48 - 256 = 1184
-      expect(panel.scrollTop).toBe(1184, 'Expected panel to be scrolled to the bottom');
-    }));
+      expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
+          'Expected `multiple` to have been added to initial set of options.');
 
-    it('should scroll to the active option when typing', fakeAsync(() => {
-      for (let i = 0; i < 15; i++) {
-        // Press the letter 'o' 15 times since all the options are named 'Option <index>'
-        dispatchEvent(host, createKeyboardEvent('keydown', 79, undefined, 'o'));
-        fixture.detectChanges();
-        tick(LETTER_KEY_DEBOUNCE_INTERVAL);
-      }
-      flush();
+      testInstance.foods.push({ value: 'cake-8', viewValue: 'Cake' });
+      fixture.detectChanges();
 
-      // <option index * height> - <panel height> = 16 * 48 - 256 = 512
-      expect(panel.scrollTop).toBe(512, 'Expected scroll to be at the 16th option.');
+      expect(testInstance.options.toArray().every(option => !!option.multiple)).toBe(true,
+          'Expected `multiple` to have been set on dynamically-added option.');
     }));
 
   });
 });
 
+
 @Component({
   selector: 'basic-select',
   template: `
@@ -3637,7 +3722,6 @@ class BasicSelectWithTheming {
   theme: string;
 }
 
-
 @Component({
   selector: 'reset-values-select',
   template: `
@@ -3685,7 +3769,6 @@ class FalsyValueSelect {
   @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
-
 @Component({
   selector: 'select-with-groups',
   template: `
@@ -3743,7 +3826,6 @@ class SelectWithGroups {
   @ViewChildren(MatOption) options: QueryList<MatOption>;
 }
 
-
 @Component({
   template: `
     <form>
@@ -3757,7 +3839,6 @@ class InvalidSelectInForm {
   value: any;
 }
 
-
 @Component({
   template: `
     <form [formGroup]="formGroup">
@@ -3781,7 +3862,6 @@ class SelectInsideFormGroup {
   });
 }
 
-
 @Component({
   template: `
     <mat-form-field>
@@ -3847,7 +3927,6 @@ class BasicSelectWithoutFormsMultiple {
   @ViewChild(MatSelect) select: MatSelect;
 }
 
-
 @Component({
   selector: 'select-with-custom-trigger',
   template: `
@@ -3871,7 +3950,6 @@ class SelectWithCustomTrigger {
   control = new FormControl();
 }
 
-
 @Component({
   selector: 'ng-model-compare-with',
   template: `
@@ -3929,7 +4007,6 @@ class CustomErrorBehaviorSelect {
   errorStateMatcher: ErrorStateMatcher;
 }
 
-
 @Component({
   template: `
     <mat-form-field>

From 86b375d0a81ccfef8bdadebc4c7cefd3c3d01741 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 14 Nov 2017 20:22:41 +0100
Subject: [PATCH 477/575] build: update sauce connect (#8438)

Manually updates SauceConnect to v4.4.10
---
 scripts/saucelabs/start-tunnel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/saucelabs/start-tunnel.sh b/scripts/saucelabs/start-tunnel.sh
index 611bfdfc901d..5c24b5facaee 100755
--- a/scripts/saucelabs/start-tunnel.sh
+++ b/scripts/saucelabs/start-tunnel.sh
@@ -2,7 +2,7 @@
 
 set -e -o pipefail
 
-TUNNEL_FILE="sc-4.4.9-linux.tar.gz"
+TUNNEL_FILE="sc-4.4.10-linux.tar.gz"
 TUNNEL_URL="https://saucelabs.com/downloads/${TUNNEL_FILE}"
 TUNNEL_DIR="/tmp/saucelabs-connect"
 

From 262c23b8402587a0137e88d79c2da177841c2ebc Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 14 Nov 2017 12:59:25 -0800
Subject: [PATCH 478/575] chore: add license to demo-app (#8440)

---
 src/demo-app/a11y/a11y-module.ts                          | 8 ++++++++
 src/demo-app/a11y/a11y.ts                                 | 8 ++++++++
 src/demo-app/a11y/autocomplete/autocomplete-a11y.ts       | 8 ++++++++
 src/demo-app/a11y/button-toggle/button-toggle-a11y.ts     | 8 ++++++++
 src/demo-app/a11y/button/button-a11y.ts                   | 8 ++++++++
 src/demo-app/a11y/card/card-a11y.ts                       | 8 ++++++++
 src/demo-app/a11y/checkbox/checkbox-a11y.ts               | 8 ++++++++
 src/demo-app/a11y/chips/chips-a11y.ts                     | 8 ++++++++
 src/demo-app/a11y/datepicker/datepicker-a11y.ts           | 8 ++++++++
 src/demo-app/a11y/dialog/dialog-a11y.ts                   | 8 ++++++++
 src/demo-app/a11y/expansion/expansion-a11y.ts             | 8 ++++++++
 src/demo-app/a11y/grid-list/grid-list-a11y.ts             | 8 ++++++++
 src/demo-app/a11y/icon/icon-a11y.ts                       | 8 ++++++++
 src/demo-app/a11y/input/input-a11y.ts                     | 8 ++++++++
 src/demo-app/a11y/menu/menu-a11y.ts                       | 8 ++++++++
 src/demo-app/a11y/progress-bar/progress-bar-a11y.ts       | 8 ++++++++
 .../a11y/progress-spinner/progress-spinner-a11y.ts        | 8 ++++++++
 src/demo-app/a11y/radio/radio-a11y.ts                     | 8 ++++++++
 src/demo-app/a11y/routes.ts                               | 8 ++++++++
 src/demo-app/a11y/select/select-a11y.ts                   | 8 ++++++++
 src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts           | 8 ++++++++
 src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts            | 8 ++++++++
 src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts          | 8 ++++++++
 src/demo-app/a11y/sidenav/sidenav-a11y.ts                 | 8 ++++++++
 src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts       | 8 ++++++++
 src/demo-app/a11y/slider/slider-a11y.ts                   | 8 ++++++++
 src/demo-app/a11y/snack-bar/snack-bar-a11y.ts             | 8 ++++++++
 src/demo-app/a11y/table/table-a11y.ts                     | 8 ++++++++
 src/demo-app/a11y/tabs/routes.ts                          | 8 ++++++++
 src/demo-app/a11y/tabs/tabs-a11y.ts                       | 8 ++++++++
 src/demo-app/a11y/toolbar/toolbar-a11y.ts                 | 8 ++++++++
 src/demo-app/a11y/tooltip/tooltip-a11y.ts                 | 8 ++++++++
 src/demo-app/autocomplete/autocomplete-demo.ts            | 8 ++++++++
 src/demo-app/baseline/baseline-demo.ts                    | 8 ++++++++
 src/demo-app/button-toggle/button-toggle-demo.ts          | 8 ++++++++
 src/demo-app/button/button-demo.ts                        | 8 ++++++++
 src/demo-app/card/card-demo.ts                            | 8 ++++++++
 src/demo-app/checkbox/checkbox-demo.ts                    | 8 ++++++++
 src/demo-app/chips/chips-demo.ts                          | 8 ++++++++
 src/demo-app/dataset/colors.ts                            | 8 ++++++++
 src/demo-app/dataset/names.ts                             | 8 ++++++++
 src/demo-app/datepicker/datepicker-demo.ts                | 8 ++++++++
 src/demo-app/demo-app-module.ts                           | 8 ++++++++
 src/demo-app/demo-app-types.d.ts                          | 8 ++++++++
 src/demo-app/demo-app/demo-app.ts                         | 8 ++++++++
 src/demo-app/demo-app/demo-module.ts                      | 8 ++++++++
 src/demo-app/demo-app/routes.ts                           | 8 ++++++++
 src/demo-app/demo-material-module.ts                      | 8 ++++++++
 src/demo-app/dialog/dialog-demo.ts                        | 8 ++++++++
 src/demo-app/drawer/drawer-demo.ts                        | 8 ++++++++
 src/demo-app/expansion/expansion-demo.ts                  | 8 ++++++++
 src/demo-app/focus-origin/focus-origin-demo.ts            | 8 ++++++++
 src/demo-app/gestures/gestures-demo.ts                    | 8 ++++++++
 src/demo-app/grid-list/grid-list-demo.ts                  | 8 ++++++++
 src/demo-app/icon/icon-demo.ts                            | 8 ++++++++
 src/demo-app/input/input-demo.ts                          | 8 ++++++++
 src/demo-app/list/list-demo.ts                            | 8 ++++++++
 src/demo-app/live-announcer/live-announcer-demo.ts        | 8 ++++++++
 src/demo-app/main-aot.ts                                  | 8 ++++++++
 src/demo-app/main.ts                                      | 8 ++++++++
 src/demo-app/menu/menu-demo.ts                            | 8 ++++++++
 src/demo-app/overlay/overlay-demo.ts                      | 8 ++++++++
 src/demo-app/platform/platform-demo.ts                    | 8 ++++++++
 src/demo-app/portal/portal-demo.ts                        | 8 ++++++++
 src/demo-app/progress-bar/progress-bar-demo.ts            | 8 ++++++++
 src/demo-app/progress-spinner/progress-spinner-demo.ts    | 8 ++++++++
 src/demo-app/radio/radio-demo.ts                          | 8 ++++++++
 src/demo-app/ripple/ripple-demo.ts                        | 8 ++++++++
 src/demo-app/screen-type/screen-type-demo.ts              | 8 ++++++++
 src/demo-app/select/select-demo.ts                        | 8 ++++++++
 src/demo-app/sidenav/sidenav-demo.ts                      | 8 ++++++++
 src/demo-app/slide-toggle/slide-toggle-demo.ts            | 8 ++++++++
 src/demo-app/slider/slider-demo.ts                        | 8 ++++++++
 src/demo-app/snack-bar/snack-bar-demo.ts                  | 8 ++++++++
 src/demo-app/stepper/stepper-demo.ts                      | 8 ++++++++
 src/demo-app/system-config.ts                             | 8 ++++++++
 src/demo-app/table/people-database.ts                     | 8 ++++++++
 src/demo-app/table/person-data-source.ts                  | 8 ++++++++
 src/demo-app/table/person-detail-data-source.ts           | 8 ++++++++
 src/demo-app/table/table-demo.ts                          | 8 ++++++++
 src/demo-app/table/table-header-demo.ts                   | 8 ++++++++
 src/demo-app/tabs/routes.ts                               | 8 ++++++++
 src/demo-app/tabs/tabs-demo.ts                            | 8 ++++++++
 src/demo-app/toolbar/toolbar-demo.ts                      | 8 ++++++++
 src/demo-app/tooltip/tooltip-demo.ts                      | 8 ++++++++
 src/demo-app/typography/typography-demo.ts                | 8 ++++++++
 tslint.json                                               | 2 +-
 87 files changed, 689 insertions(+), 1 deletion(-)

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index 7b3e86775222..b27f2c0f89e6 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 907e2458932a..3ac3cd80d39d 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ElementRef, OnDestroy, ViewChild, ViewEncapsulation} from '@angular/core';
 import {NavigationEnd, Router} from '@angular/router';
 import {Subscription} from 'rxjs/Subscription';
diff --git a/src/demo-app/a11y/autocomplete/autocomplete-a11y.ts b/src/demo-app/a11y/autocomplete/autocomplete-a11y.ts
index a11b7a7cdc81..c4dc3ba355a3 100644
--- a/src/demo-app/a11y/autocomplete/autocomplete-a11y.ts
+++ b/src/demo-app/a11y/autocomplete/autocomplete-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/button-toggle/button-toggle-a11y.ts b/src/demo-app/a11y/button-toggle/button-toggle-a11y.ts
index 9818274aff5f..7699f352340e 100644
--- a/src/demo-app/a11y/button-toggle/button-toggle-a11y.ts
+++ b/src/demo-app/a11y/button-toggle/button-toggle-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/button/button-a11y.ts b/src/demo-app/a11y/button/button-a11y.ts
index 8a9398858a89..6255fbeecf5e 100644
--- a/src/demo-app/a11y/button/button-a11y.ts
+++ b/src/demo-app/a11y/button/button-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {MatSnackBar} from '@angular/material';
 
diff --git a/src/demo-app/a11y/card/card-a11y.ts b/src/demo-app/a11y/card/card-a11y.ts
index 1794ec63212b..101422b96467 100644
--- a/src/demo-app/a11y/card/card-a11y.ts
+++ b/src/demo-app/a11y/card/card-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {MatSnackBar} from '@angular/material';
 
diff --git a/src/demo-app/a11y/checkbox/checkbox-a11y.ts b/src/demo-app/a11y/checkbox/checkbox-a11y.ts
index b401f065a98e..717dd406a823 100644
--- a/src/demo-app/a11y/checkbox/checkbox-a11y.ts
+++ b/src/demo-app/a11y/checkbox/checkbox-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 export interface Task {
diff --git a/src/demo-app/a11y/chips/chips-a11y.ts b/src/demo-app/a11y/chips/chips-a11y.ts
index 19388f77ef77..e1b4eebea6dd 100644
--- a/src/demo-app/a11y/chips/chips-a11y.ts
+++ b/src/demo-app/a11y/chips/chips-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {MatChipInputEvent, MatSnackBar} from '@angular/material';
 
diff --git a/src/demo-app/a11y/datepicker/datepicker-a11y.ts b/src/demo-app/a11y/datepicker/datepicker-a11y.ts
index 718aecf5455f..330c7ba3037d 100644
--- a/src/demo-app/a11y/datepicker/datepicker-a11y.ts
+++ b/src/demo-app/a11y/datepicker/datepicker-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/a11y/dialog/dialog-a11y.ts b/src/demo-app/a11y/dialog/dialog-a11y.ts
index 4798798d45ae..36065397e3fa 100644
--- a/src/demo-app/a11y/dialog/dialog-a11y.ts
+++ b/src/demo-app/a11y/dialog/dialog-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {MatDialog} from '@angular/material';
 
diff --git a/src/demo-app/a11y/expansion/expansion-a11y.ts b/src/demo-app/a11y/expansion/expansion-a11y.ts
index 19d2f9b1e0a8..511e61c654ce 100644
--- a/src/demo-app/a11y/expansion/expansion-a11y.ts
+++ b/src/demo-app/a11y/expansion/expansion-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/a11y/grid-list/grid-list-a11y.ts b/src/demo-app/a11y/grid-list/grid-list-a11y.ts
index 033c3b207107..de3da59c0008 100644
--- a/src/demo-app/a11y/grid-list/grid-list-a11y.ts
+++ b/src/demo-app/a11y/grid-list/grid-list-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 export interface Dog {
diff --git a/src/demo-app/a11y/icon/icon-a11y.ts b/src/demo-app/a11y/icon/icon-a11y.ts
index 9d5d92acee14..aabf76cd3602 100644
--- a/src/demo-app/a11y/icon/icon-a11y.ts
+++ b/src/demo-app/a11y/icon/icon-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 import {MatSnackBar} from '@angular/material';
 
diff --git a/src/demo-app/a11y/input/input-a11y.ts b/src/demo-app/a11y/input/input-a11y.ts
index c1782d33bd9e..0f33b3f93816 100644
--- a/src/demo-app/a11y/input/input-a11y.ts
+++ b/src/demo-app/a11y/input/input-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 const USD_TO_JPY = 110.29;
diff --git a/src/demo-app/a11y/menu/menu-a11y.ts b/src/demo-app/a11y/menu/menu-a11y.ts
index 2d7c5d900ec3..60b6fd319cda 100644
--- a/src/demo-app/a11y/menu/menu-a11y.ts
+++ b/src/demo-app/a11y/menu/menu-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts b/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts
index 38251b9f030a..5cb3297b5170 100644
--- a/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts
+++ b/src/demo-app/a11y/progress-bar/progress-bar-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.ts b/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.ts
index 9cb0a66f8018..5502b9854fa1 100644
--- a/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.ts
+++ b/src/demo-app/a11y/progress-spinner/progress-spinner-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/a11y/radio/radio-a11y.ts b/src/demo-app/a11y/radio/radio-a11y.ts
index 093dfabf3be3..3f2e6a172fdd 100644
--- a/src/demo-app/a11y/radio/radio-a11y.ts
+++ b/src/demo-app/a11y/radio/radio-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index 081d2f4dd03f..6d729336e2c5 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Routes} from '@angular/router';
 import {AutocompleteAccessibilityDemo} from './autocomplete/autocomplete-a11y';
 import {ButtonAccessibilityDemo} from './button/button-a11y';
diff --git a/src/demo-app/a11y/select/select-a11y.ts b/src/demo-app/a11y/select/select-a11y.ts
index 21e4fd72744b..ced37285c640 100644
--- a/src/demo-app/a11y/select/select-a11y.ts
+++ b/src/demo-app/a11y/select/select-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
index 431a84f341e1..fa6d1741a98d 100644
--- a/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
+++ b/src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
index 7d8271242a94..4075ed3577ab 100644
--- a/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
+++ b/src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 import {MatSnackBar} from '@angular/material/snack-bar';
 
diff --git a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
index 7dca39aca930..0c9a72f6a678 100644
--- a/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
+++ b/src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {MediaMatcher} from '@angular/cdk/layout';
 import {ChangeDetectorRef, Component, OnDestroy, ViewEncapsulation} from '@angular/core';
 
diff --git a/src/demo-app/a11y/sidenav/sidenav-a11y.ts b/src/demo-app/a11y/sidenav/sidenav-a11y.ts
index af217e747617..529ae262d1ab 100644
--- a/src/demo-app/a11y/sidenav/sidenav-a11y.ts
+++ b/src/demo-app/a11y/sidenav/sidenav-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts b/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts
index 58c3ff2c6a3f..f97be6e8159e 100644
--- a/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts
+++ b/src/demo-app/a11y/slide-toggle/slide-toggle-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {MatSnackBar} from '@angular/material';
 
diff --git a/src/demo-app/a11y/slider/slider-a11y.ts b/src/demo-app/a11y/slider/slider-a11y.ts
index 2ab15ff5e0cd..2d72c0bc02da 100644
--- a/src/demo-app/a11y/slider/slider-a11y.ts
+++ b/src/demo-app/a11y/slider/slider-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts b/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts
index b36ad0bc69b1..d8378fd3df2f 100644
--- a/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts
+++ b/src/demo-app/a11y/snack-bar/snack-bar-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {MatSnackBar} from '@angular/material';
 
diff --git a/src/demo-app/a11y/table/table-a11y.ts b/src/demo-app/a11y/table/table-a11y.ts
index 1db8734f5d7e..50fcc2c94114 100644
--- a/src/demo-app/a11y/table/table-a11y.ts
+++ b/src/demo-app/a11y/table/table-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewChild} from '@angular/core';
 import {DataSource} from '@angular/cdk/table';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
diff --git a/src/demo-app/a11y/tabs/routes.ts b/src/demo-app/a11y/tabs/routes.ts
index 9071cf76be1a..f99882d25f8f 100644
--- a/src/demo-app/a11y/tabs/routes.ts
+++ b/src/demo-app/a11y/tabs/routes.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Routes} from '@angular/router';
 
 import {SunnyTabContent, RainyTabContent, FoggyTabContent} from './tabs-a11y';
diff --git a/src/demo-app/a11y/tabs/tabs-a11y.ts b/src/demo-app/a11y/tabs/tabs-a11y.ts
index 6d6905ed1b7b..7d3da29c74a8 100644
--- a/src/demo-app/a11y/tabs/tabs-a11y.ts
+++ b/src/demo-app/a11y/tabs/tabs-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/a11y/toolbar/toolbar-a11y.ts b/src/demo-app/a11y/toolbar/toolbar-a11y.ts
index d4d213974f1f..659ad1d33332 100644
--- a/src/demo-app/a11y/toolbar/toolbar-a11y.ts
+++ b/src/demo-app/a11y/toolbar/toolbar-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/a11y/tooltip/tooltip-a11y.ts b/src/demo-app/a11y/tooltip/tooltip-a11y.ts
index b613fb3ac10f..074d6439f530 100644
--- a/src/demo-app/a11y/tooltip/tooltip-a11y.ts
+++ b/src/demo-app/a11y/tooltip/tooltip-a11y.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/autocomplete/autocomplete-demo.ts b/src/demo-app/autocomplete/autocomplete-demo.ts
index dc5a486e80f7..9a6dcf6efc63 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.ts
+++ b/src/demo-app/autocomplete/autocomplete-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewChild, ViewEncapsulation} from '@angular/core';
 import {FormControl, NgModel} from '@angular/forms';
 import 'rxjs/add/operator/startWith';
diff --git a/src/demo-app/baseline/baseline-demo.ts b/src/demo-app/baseline/baseline-demo.ts
index e5466fbba37c..d76fb57786ad 100644
--- a/src/demo-app/baseline/baseline-demo.ts
+++ b/src/demo-app/baseline/baseline-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/button-toggle/button-toggle-demo.ts b/src/demo-app/button-toggle/button-toggle-demo.ts
index f7824df5d932..9ef9d884d51b 100644
--- a/src/demo-app/button-toggle/button-toggle-demo.ts
+++ b/src/demo-app/button-toggle/button-toggle-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/button/button-demo.ts b/src/demo-app/button/button-demo.ts
index fa67d77380ca..c10962c132c9 100644
--- a/src/demo-app/button/button-demo.ts
+++ b/src/demo-app/button/button-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/card/card-demo.ts b/src/demo-app/card/card-demo.ts
index 590761f8a310..7a2bcbbf1282 100644
--- a/src/demo-app/card/card-demo.ts
+++ b/src/demo-app/card/card-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts
index e7331d047770..54a8e1104eb5 100644
--- a/src/demo-app/checkbox/checkbox-demo.ts
+++ b/src/demo-app/checkbox/checkbox-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/chips/chips-demo.ts b/src/demo-app/chips/chips-demo.ts
index a6703f1e1fdc..5d94abbc1a86 100644
--- a/src/demo-app/chips/chips-demo.ts
+++ b/src/demo-app/chips/chips-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ENTER, COMMA} from '@angular/cdk/keycodes';
 import {Component} from '@angular/core';
 import {MatChipInputEvent} from '@angular/material';
diff --git a/src/demo-app/dataset/colors.ts b/src/demo-app/dataset/colors.ts
index 05a0516fa8b1..1b9dee7d060d 100644
--- a/src/demo-app/dataset/colors.ts
+++ b/src/demo-app/dataset/colors.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
 export const COLORS = [
   'AliceBlue',
   'AntiqueWhite',
diff --git a/src/demo-app/dataset/names.ts b/src/demo-app/dataset/names.ts
index 22e7e8c83432..02bd859d53bc 100644
--- a/src/demo-app/dataset/names.ts
+++ b/src/demo-app/dataset/names.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
 export const NAMES: string[] = [
   'Abbott',
   'Acevedo',
diff --git a/src/demo-app/datepicker/datepicker-demo.ts b/src/demo-app/datepicker/datepicker-demo.ts
index 974ea3ec4e63..c97074be3f07 100644
--- a/src/demo-app/datepicker/datepicker-demo.ts
+++ b/src/demo-app/datepicker/datepicker-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ChangeDetectionStrategy, Component} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {MatDatepickerInputEvent} from '@angular/material/datepicker';
diff --git a/src/demo-app/demo-app-module.ts b/src/demo-app/demo-app-module.ts
index 11b9268e16bd..a60bcb9f2e4d 100644
--- a/src/demo-app/demo-app-module.ts
+++ b/src/demo-app/demo-app-module.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ApplicationRef, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {HttpClientModule} from '@angular/common/http';
diff --git a/src/demo-app/demo-app-types.d.ts b/src/demo-app/demo-app-types.d.ts
index 1c32e621291f..c92ee049c207 100644
--- a/src/demo-app/demo-app-types.d.ts
+++ b/src/demo-app/demo-app-types.d.ts
@@ -1 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
 declare var module: { id: string };
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index f95c0a7a731f..5fcfd9a1c685 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {OverlayContainer} from '@angular/cdk/overlay';
 import {Component, ElementRef, Renderer2, ViewEncapsulation} from '@angular/core';
 
diff --git a/src/demo-app/demo-app/demo-module.ts b/src/demo-app/demo-app/demo-module.ts
index edb4a5d06499..1e0002b5dd83 100644
--- a/src/demo-app/demo-app/demo-module.ts
+++ b/src/demo-app/demo-app/demo-module.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts
index db33beea133b..275f0161918b 100644
--- a/src/demo-app/demo-app/routes.ts
+++ b/src/demo-app/demo-app/routes.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Routes} from '@angular/router';
 import {AccessibilityDemo} from '../a11y/a11y';
 import {ACCESSIBILITY_DEMO_ROUTES} from '../a11y/routes';
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index c5903c2bbe35..e649fe88457e 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {NgModule} from '@angular/core';
 import {
   MatAutocompleteModule,
diff --git a/src/demo-app/dialog/dialog-demo.ts b/src/demo-app/dialog/dialog-demo.ts
index 1895b6e31f48..e857bd564766 100644
--- a/src/demo-app/dialog/dialog-demo.ts
+++ b/src/demo-app/dialog/dialog-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, Inject, ViewChild, TemplateRef} from '@angular/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
diff --git a/src/demo-app/drawer/drawer-demo.ts b/src/demo-app/drawer/drawer-demo.ts
index 87a740988f7e..4e944959c249 100644
--- a/src/demo-app/drawer/drawer-demo.ts
+++ b/src/demo-app/drawer/drawer-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 
 
diff --git a/src/demo-app/expansion/expansion-demo.ts b/src/demo-app/expansion/expansion-demo.ts
index e3ae3dee100d..c82169438bbc 100644
--- a/src/demo-app/expansion/expansion-demo.ts
+++ b/src/demo-app/expansion/expansion-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/focus-origin/focus-origin-demo.ts b/src/demo-app/focus-origin/focus-origin-demo.ts
index 3af33dbbce2b..fa82edc0b1e0 100644
--- a/src/demo-app/focus-origin/focus-origin-demo.ts
+++ b/src/demo-app/focus-origin/focus-origin-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {FocusMonitor} from '@angular/cdk/a11y';
 
diff --git a/src/demo-app/gestures/gestures-demo.ts b/src/demo-app/gestures/gestures-demo.ts
index 693a1b612cbc..330c15a0510e 100644
--- a/src/demo-app/gestures/gestures-demo.ts
+++ b/src/demo-app/gestures/gestures-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/grid-list/grid-list-demo.ts b/src/demo-app/grid-list/grid-list-demo.ts
index e52a0aa5e87e..803c48a82a4f 100644
--- a/src/demo-app/grid-list/grid-list-demo.ts
+++ b/src/demo-app/grid-list/grid-list-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/icon/icon-demo.ts b/src/demo-app/icon/icon-demo.ts
index 1c66bb8b557e..3dc295156a81 100644
--- a/src/demo-app/icon/icon-demo.ts
+++ b/src/demo-app/icon/icon-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 import {DomSanitizer} from '@angular/platform-browser';
 import {MatIconRegistry} from '@angular/material';
diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts
index d107aaf996cc..8545e3c0c71c 100644
--- a/src/demo-app/input/input-demo.ts
+++ b/src/demo-app/input/input-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ChangeDetectionStrategy} from '@angular/core';
 import {FormControl, Validators} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material';
diff --git a/src/demo-app/list/list-demo.ts b/src/demo-app/list/list-demo.ts
index 320126c4e3e8..a9b6420e7099 100644
--- a/src/demo-app/list/list-demo.ts
+++ b/src/demo-app/list/list-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/live-announcer/live-announcer-demo.ts b/src/demo-app/live-announcer/live-announcer-demo.ts
index 45988580e121..5ac00de1807f 100644
--- a/src/demo-app/live-announcer/live-announcer-demo.ts
+++ b/src/demo-app/live-announcer/live-announcer-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
 
diff --git a/src/demo-app/main-aot.ts b/src/demo-app/main-aot.ts
index 91b718e8cc34..a5c9db6df722 100644
--- a/src/demo-app/main-aot.ts
+++ b/src/demo-app/main-aot.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
 /**
  * This is the main entry-point for the AOT compilation. File will be used to test AOT support.
  */
diff --git a/src/demo-app/main.ts b/src/demo-app/main.ts
index 96fcced7e34c..44ce4e6d9280 100644
--- a/src/demo-app/main.ts
+++ b/src/demo-app/main.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {DemoAppModule} from './demo-app-module';
 
diff --git a/src/demo-app/menu/menu-demo.ts b/src/demo-app/menu/menu-demo.ts
index 3d38c16b7db4..20e3fee415a6 100644
--- a/src/demo-app/menu/menu-demo.ts
+++ b/src/demo-app/menu/menu-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index f0142a383732..c88a93ecaf47 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Overlay, CdkOverlayOrigin, OverlayConfig} from '@angular/cdk/overlay';
 import {
   ComponentPortal,
diff --git a/src/demo-app/platform/platform-demo.ts b/src/demo-app/platform/platform-demo.ts
index d80dfd6c70d8..435063730c67 100644
--- a/src/demo-app/platform/platform-demo.ts
+++ b/src/demo-app/platform/platform-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {Platform, getSupportedInputTypes} from '@angular/cdk/platform';
 
diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts
index 8dd85a005c43..65588371bd06 100644
--- a/src/demo-app/portal/portal-demo.ts
+++ b/src/demo-app/portal/portal-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {ComponentPortal, Portal, CdkPortal} from '@angular/cdk/portal';
 import {Component, QueryList, ViewChildren} from '@angular/core';
 
diff --git a/src/demo-app/progress-bar/progress-bar-demo.ts b/src/demo-app/progress-bar/progress-bar-demo.ts
index a3eb4f1ca715..15aa2c0ef8e8 100644
--- a/src/demo-app/progress-bar/progress-bar-demo.ts
+++ b/src/demo-app/progress-bar/progress-bar-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.ts b/src/demo-app/progress-spinner/progress-spinner-demo.ts
index 9677e78e50d3..8ed811215bc5 100644
--- a/src/demo-app/progress-spinner/progress-spinner-demo.ts
+++ b/src/demo-app/progress-spinner/progress-spinner-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/radio/radio-demo.ts b/src/demo-app/radio/radio-demo.ts
index 9f586b7cf381..4db8f18b6832 100644
--- a/src/demo-app/radio/radio-demo.ts
+++ b/src/demo-app/radio/radio-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/ripple/ripple-demo.ts b/src/demo-app/ripple/ripple-demo.ts
index ec9a69b828e1..6ae6318e8628 100644
--- a/src/demo-app/ripple/ripple-demo.ts
+++ b/src/demo-app/ripple/ripple-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewChild} from '@angular/core';
 import {MatRipple} from '@angular/material';
 
diff --git a/src/demo-app/screen-type/screen-type-demo.ts b/src/demo-app/screen-type/screen-type-demo.ts
index f46cffdaa335..40491a89a0d7 100644
--- a/src/demo-app/screen-type/screen-type-demo.ts
+++ b/src/demo-app/screen-type/screen-type-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 import {BreakpointObserver, BreakpointState, Breakpoints} from '@angular/cdk/layout';
 import {Observable} from 'rxjs/Observable';
diff --git a/src/demo-app/select/select-demo.ts b/src/demo-app/select/select-demo.ts
index 1967e60f7c43..5ed9b2cd70b4 100644
--- a/src/demo-app/select/select-demo.ts
+++ b/src/demo-app/select/select-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {MatSelectChange} from '@angular/material';
diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts
index 5b4694dab24b..0af65025eb7f 100644
--- a/src/demo-app/sidenav/sidenav-demo.ts
+++ b/src/demo-app/sidenav/sidenav-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 
 
diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.ts b/src/demo-app/slide-toggle/slide-toggle-demo.ts
index 50650ca59329..c7cd8c094c19 100644
--- a/src/demo-app/slide-toggle/slide-toggle-demo.ts
+++ b/src/demo-app/slide-toggle/slide-toggle-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/slider/slider-demo.ts b/src/demo-app/slider/slider-demo.ts
index 780c6a61b0c2..1f6ff20c54fc 100644
--- a/src/demo-app/slider/slider-demo.ts
+++ b/src/demo-app/slider/slider-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 6b1160720fc2..920bc57c00a9 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Dir} from '@angular/cdk/bidi';
 import {Component, ViewEncapsulation} from '@angular/core';
 import {
diff --git a/src/demo-app/stepper/stepper-demo.ts b/src/demo-app/stepper/stepper-demo.ts
index 373c298c5fd4..22426f7c6af1 100644
--- a/src/demo-app/stepper/stepper-demo.ts
+++ b/src/demo-app/stepper/stepper-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 import {AbstractControl, FormBuilder, FormGroup, Validators} from '@angular/forms';
 
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 816b61771a32..c922840c0989 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
 /** Type declaration for ambient System. */
 declare const System: any;
 
diff --git a/src/demo-app/table/people-database.ts b/src/demo-app/table/people-database.ts
index 8cc070fbe3ab..4234899a5497 100644
--- a/src/demo-app/table/people-database.ts
+++ b/src/demo-app/table/people-database.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Injectable} from '@angular/core';
 import {NAMES} from '../dataset/names';
 import {COLORS} from '../dataset/colors';
diff --git a/src/demo-app/table/person-data-source.ts b/src/demo-app/table/person-data-source.ts
index cc74bb243afe..a0eabf217b5b 100644
--- a/src/demo-app/table/person-data-source.ts
+++ b/src/demo-app/table/person-data-source.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {MatPaginator, MatSort} from '@angular/material';
 import {DataSource} from '@angular/cdk/collections';
 import {Observable} from 'rxjs/Observable';
diff --git a/src/demo-app/table/person-detail-data-source.ts b/src/demo-app/table/person-detail-data-source.ts
index 864b49f69849..975fa1e8298b 100644
--- a/src/demo-app/table/person-detail-data-source.ts
+++ b/src/demo-app/table/person-detail-data-source.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {DataSource} from '@angular/cdk/collections';
 import {Observable} from 'rxjs/Observable';
 import {UserData} from './people-database';
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index faa0d978f4ff..2b73619f5716 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ElementRef, ViewChild} from '@angular/core';
 import {PeopleDatabase, UserData} from './people-database';
 import {PersonDataSource} from './person-data-source';
diff --git a/src/demo-app/table/table-header-demo.ts b/src/demo-app/table/table-header-demo.ts
index 3c6d1b5afc92..c0c7783777fc 100644
--- a/src/demo-app/table/table-header-demo.ts
+++ b/src/demo-app/table/table-header-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, EventEmitter, Output} from '@angular/core';
 
 @Component({
diff --git a/src/demo-app/tabs/routes.ts b/src/demo-app/tabs/routes.ts
index 34ce652f7e78..773b76404345 100644
--- a/src/demo-app/tabs/routes.ts
+++ b/src/demo-app/tabs/routes.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Routes} from '@angular/router';
 
 import {SunnyTabContent, RainyTabContent, FoggyTabContent} from '../tabs/tabs-demo';
diff --git a/src/demo-app/tabs/tabs-demo.ts b/src/demo-app/tabs/tabs-demo.ts
index 84e442de1e7a..fe7a952b8a7f 100644
--- a/src/demo-app/tabs/tabs-demo.ts
+++ b/src/demo-app/tabs/tabs-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 
diff --git a/src/demo-app/toolbar/toolbar-demo.ts b/src/demo-app/toolbar/toolbar-demo.ts
index 31af9c1cbcbb..55ddd8051cd5 100644
--- a/src/demo-app/toolbar/toolbar-demo.ts
+++ b/src/demo-app/toolbar/toolbar-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts
index 6839192a7118..39eef262023e 100644
--- a/src/demo-app/tooltip/tooltip-demo.ts
+++ b/src/demo-app/tooltip/tooltip-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component, ViewEncapsulation} from '@angular/core';
 import {TooltipPosition} from '@angular/material';
 
diff --git a/src/demo-app/typography/typography-demo.ts b/src/demo-app/typography/typography-demo.ts
index 15b893168f86..0186f289d51a 100644
--- a/src/demo-app/typography/typography-demo.ts
+++ b/src/demo-app/typography/typography-demo.ts
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
 
 
diff --git a/tslint.json b/tslint.json
index ee1512bb2f7d..6361be3d338b 100644
--- a/tslint.json
+++ b/tslint.json
@@ -100,7 +100,7 @@
     }, "src/+(lib|cdk)/**/!(*.spec).ts"],
     "require-license-banner": [
       true,
-      "src/+(lib|cdk)/**/!(*.spec).ts"
+      "src/+(lib|cdk|demo-app)/**/!(*.spec).ts"
     ],
     "no-rxjs-patch-imports": [
       true,

From cf39a419ff363ea889bf5673d7c0cdb32fd4b6e3 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 11:47:56 -0800
Subject: [PATCH 479/575] build(cdk): add bazel ng_module rules (#8370)

Part of #8369
---
 BUILD.bazel                     |   35 +
 WORKSPACE                       |   36 +
 angular.tsconfig.json           |   20 +
 package-lock.json               | 9463 ++++++++++++++++++++-----------
 package.json                    |    5 +
 src/cdk/BUILD.bazel             |   11 +
 src/cdk/a11y/BUILD.bazel        |   14 +
 src/cdk/a11y/a11y-module.ts     |   12 +-
 src/cdk/accordion/BUILD.bazel   |   13 +
 src/cdk/bidi/BUILD.bazel        |   10 +
 src/cdk/coercion/BUILD.bazel    |   11 +
 src/cdk/collections/BUILD.bazel |   10 +
 src/cdk/keycodes/BUILD.bazel    |   11 +
 src/cdk/layout/BUILD.bazel      |   13 +
 src/cdk/observers/BUILD.bazel   |   10 +
 src/cdk/overlay/BUILD.bazel     |   17 +
 src/cdk/platform/BUILD.bazel    |   10 +
 src/cdk/portal/BUILD.bazel      |   10 +
 src/cdk/scrolling/BUILD.bazel   |   12 +
 src/cdk/stepper/BUILD.bazel     |   14 +
 src/cdk/stepper/typings.d.ts    |    1 +
 src/cdk/table/BUILD.bazel       |   12 +
 src/cdk/table/typings.d.ts      |    1 +
 tools/bazel.rc                  |   48 +
 24 files changed, 6632 insertions(+), 3167 deletions(-)
 create mode 100644 BUILD.bazel
 create mode 100644 WORKSPACE
 create mode 100644 angular.tsconfig.json
 create mode 100644 src/cdk/BUILD.bazel
 create mode 100644 src/cdk/a11y/BUILD.bazel
 create mode 100644 src/cdk/accordion/BUILD.bazel
 create mode 100644 src/cdk/bidi/BUILD.bazel
 create mode 100644 src/cdk/coercion/BUILD.bazel
 create mode 100644 src/cdk/collections/BUILD.bazel
 create mode 100644 src/cdk/keycodes/BUILD.bazel
 create mode 100644 src/cdk/layout/BUILD.bazel
 create mode 100644 src/cdk/observers/BUILD.bazel
 create mode 100644 src/cdk/overlay/BUILD.bazel
 create mode 100644 src/cdk/platform/BUILD.bazel
 create mode 100644 src/cdk/portal/BUILD.bazel
 create mode 100644 src/cdk/scrolling/BUILD.bazel
 create mode 100644 src/cdk/stepper/BUILD.bazel
 create mode 100644 src/cdk/stepper/typings.d.ts
 create mode 100644 src/cdk/table/BUILD.bazel
 create mode 100644 src/cdk/table/typings.d.ts
 create mode 100644 tools/bazel.rc

diff --git a/BUILD.bazel b/BUILD.bazel
new file mode 100644
index 000000000000..c99090ea12ca
--- /dev/null
+++ b/BUILD.bazel
@@ -0,0 +1,35 @@
+package(default_visibility = ["//visibility:public"])
+
+# TODO(jelbourn): figure out if these workarounds are still needed
+
+# This rule belongs in node_modules/BUILD
+# It's here as a workaround for
+# https://github.com/bazelbuild/bazel/issues/374#issuecomment-296217940
+filegroup(
+  name = "node_modules",
+  # Performance workaround: list individual files
+  # Reduces the number of files as inputs to nodejs_binary:
+  # bazel query "deps(:node_modules)" | wc -l
+  # This won't scale in the general case.
+  # TODO(alexeagle): figure out what to do
+  srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
+    "@angular",
+    "jasmine",
+    "typescript",
+    "tslib",
+    "zone.js",
+    "rxjs",
+    "@types",
+    "tsickle",
+    "hammerjs",
+    "protobufjs",
+    "bytebuffer",
+    "reflect-metadata",
+    "minimist",
+    "moment",
+  ] for ext in [
+    "*.js",
+    "*.json",
+    "*.d.ts",
+  ]]),
+)
diff --git a/WORKSPACE b/WORKSPACE
new file mode 100644
index 000000000000..f3e0c392ef01
--- /dev/null
+++ b/WORKSPACE
@@ -0,0 +1,36 @@
+workspace(name = "angular_material_src")
+
+# Add nodejs rules
+git_repository(
+  name = "build_bazel_rules_nodejs",
+  remote = "https://github.com/bazelbuild/rules_nodejs.git",
+  # TODO(jelbourn): use the correct tag here.
+  commit = "31d36ff2acdf630d1e331f38006cf1a5d303d338",
+)
+
+# NOTE: this rule installs nodejs, npm, and yarn, but does NOT install
+# your npm dependencies. You must still run the package manager.
+load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
+node_repositories(package_json = ["//:package.json"])
+
+# Add sass rules
+git_repository(
+  name = "io_bazel_rules_sass",
+  remote = "https://github.com/bazelbuild/rules_sass.git",
+  tag = "0.0.2",
+)
+
+load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+sass_repositories()
+
+# Add TypeScript rules
+local_repository(
+  name = "build_bazel_rules_typescript",
+  path = "node_modules/@bazel/typescript",
+)
+
+# Add Angular rules
+local_repository(
+  name = "angular",
+  path = "node_modules/@angular/bazel",
+)
diff --git a/angular.tsconfig.json b/angular.tsconfig.json
new file mode 100644
index 000000000000..214ab3b67a11
--- /dev/null
+++ b/angular.tsconfig.json
@@ -0,0 +1,20 @@
+// WORKAROUND https://github.com/angular/angular/issues/18810
+// This file is required to run ngc on angular libraries, to write files like
+// node_modules/@angular/core/core.ngsummary.json
+{
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "es2015"
+    ],
+    "experimentalDecorators": true,
+    "types": []
+  },
+  "include": [
+    "node_modules/@angular/**/*"
+  ],
+  "exclude": [
+    "node_modules/@angular/bazel/**",
+    "node_modules/@angular/compiler-cli/**"
+  ]
+}
diff --git a/package-lock.json b/package-lock.json
index b166682cf923..65729e47f5d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,33 +5,97 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.1.tgz",
-      "integrity": "sha1-qSsrGGpuWjGp8VhJEd1qp+FsXeE=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
+      "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
-    "@angular/common": {
+    "@angular/bazel": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.1.tgz",
-      "integrity": "sha1-QwBas8i4/68Xaq+zuGupMcPkvfk=",
+      "resolved": "https://registry.npmjs.org/@angular/bazel/-/bazel-5.0.1.tgz",
+      "integrity": "sha1-08ua/X4PwC6KFc3igJJAGCyD1NU=",
+      "dev": true,
+      "requires": {
+        "@bazel/typescript": "0.2.2",
+        "@types/node": "6.0.84"
+      },
+      "dependencies": {
+        "@bazel/typescript": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.2.2.tgz",
+          "integrity": "sha1-Cg0JkkUIyUbeMuas2ytcwe4yxQY=",
+          "dev": true,
+          "requires": {
+            "@types/node": "7.0.18",
+            "@types/source-map": "0.5.2",
+            "protobufjs": "5.0.0",
+            "tsickle": "0.24.1",
+            "typescript": "2.4.2"
+          },
+          "dependencies": {
+            "@types/node": {
+              "version": "7.0.18",
+              "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz",
+              "integrity": "sha1-zWfyfT3Az7dG8L3V4IbExdVb4XM=",
+              "dev": true
+            }
+          }
+        },
+        "@types/node": {
+          "version": "6.0.84",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.84.tgz",
+          "integrity": "sha512-1SvEazClhUBRNroJM3oB3xf3u2r6xGmHDGbdigqNPHvNKLl8/BtATgO9eC04ZLuovpSh0B20BF1QJxdi+qmTlg==",
+          "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"
+          }
+        },
+        "protobufjs": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.0.tgz",
+          "integrity": "sha1-QiMGMjPqlqwGPKK1VANSBNtST6E=",
+          "dev": true,
+          "requires": {
+            "ascli": "1.0.1",
+            "bytebuffer": "5.0.1",
+            "glob": "5.0.15",
+            "yargs": "3.32.0"
+          }
+        }
+      }
+    },
+    "@angular/common": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
+      "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.1.tgz",
-      "integrity": "sha1-f9TH+ku770wUaWL6lGuCczCmyO0=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
+      "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.1.tgz",
-      "integrity": "sha1-Um3BuzlPsWrZFmAe6pqgDrRLT/8=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz",
+      "integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=",
       "dev": true,
       "requires": {
         "chokidar": "1.7.0",
@@ -41,51 +105,51 @@
       }
     },
     "@angular/core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.1.tgz",
-      "integrity": "sha1-pKdK/H4gWNMLgmPrbWbarOn0J7o=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
+      "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/forms": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.1.tgz",
-      "integrity": "sha1-afMDxME9o8qg3mNDdYg4i2rWKyE=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
+      "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/http": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.1.tgz",
-      "integrity": "sha1-NQy99jz6yJOWE9dT/wce1YpgVhs=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
+      "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.1.tgz",
-      "integrity": "sha1-FIld0w7Sow7nuZx2t2R0j0bBqGI=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
+      "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.1.tgz",
-      "integrity": "sha1-Fttn1S1FMVY6sVQpxr3+GLwb7cg=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
+      "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
     "@angular/platform-server": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.1.tgz",
-      "integrity": "sha1-AFpk62V+Zw0mX9+ulHPxmnZPhzc=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.0.tgz",
+      "integrity": "sha1-h30l74FK+S//x7C1I7lxpv8iIBg=",
       "dev": true,
       "requires": {
         "domino": "1.0.30",
@@ -94,82 +158,161 @@
       }
     },
     "@angular/router": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
+      "integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
+      "dev": true,
+      "requires": {
+        "tslib": "1.8.0"
+      }
+    },
+    "@angular/upgrade": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.1.tgz",
-      "integrity": "sha1-msCPKTAu9gzf08eBDZbCZd7EY9Y=",
+      "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-5.0.1.tgz",
+      "integrity": "sha1-HEVVGJu4iBQwb5c1IIQj3b1Y6o8=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
       }
     },
+    "@bazel/ibazel": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@bazel/ibazel/-/ibazel-0.0.1.tgz",
+      "integrity": "sha1-Ja9CrcbHVNsKxM5I7K3zdCaoQeI=",
+      "dev": true
+    },
+    "@bazel/typescript": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.3.1.tgz",
+      "integrity": "sha1-VDZ9+PMPoPsl5BEG63qlWFNMNt0=",
+      "dev": true,
+      "requires": {
+        "@types/node": "7.0.18",
+        "@types/source-map": "0.5.2",
+        "protobufjs": "5.0.0",
+        "tsickle": "0.25.5",
+        "typescript": "2.5.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "7.0.18",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz",
+          "integrity": "sha1-zWfyfT3Az7dG8L3V4IbExdVb4XM=",
+          "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"
+          }
+        },
+        "protobufjs": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.0.tgz",
+          "integrity": "sha1-QiMGMjPqlqwGPKK1VANSBNtST6E=",
+          "dev": true,
+          "requires": {
+            "ascli": "1.0.1",
+            "bytebuffer": "5.0.1",
+            "glob": "5.0.15",
+            "yargs": "3.32.0"
+          }
+        },
+        "tsickle": {
+          "version": "0.25.5",
+          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.25.5.tgz",
+          "integrity": "sha512-CgOT/1WqOKtE1fyvqB+kTJ7bizE33xj1TyUIzGbxJBGCbQmknCrZbb35DtxMiK6pJo4CrPyoS8iGFddfHKtSNA==",
+          "dev": true,
+          "requires": {
+            "minimist": "1.2.0",
+            "mkdirp": "0.5.1",
+            "source-map": "0.5.7",
+            "source-map-support": "0.4.18"
+          }
+        },
+        "typescript": {
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
+          "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
+          "dev": true
+        }
+      }
+    },
     "@firebase/app": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.2.tgz",
-      "integrity": "sha512-H2moN0Dl5LJn1AiRsCvwJsfE7PLKYYYJc+WKqAta+qIB/ZzBAay8NTVBYHiqsteLHc7gXofoi8zEUrGjbmz4OQ==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.1.1.tgz",
+      "integrity": "sha512-LoZj/Igo1PbfSorPRCozTlBhrFvOyxZsiMo2fLyDa2w/gdPbMucpWUi0vIBronR6T/yNJRWdZyyHOMieLtnjcw==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.1.2"
+        "@firebase/util": "0.1.1"
       }
     },
     "@firebase/auth": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.2.2.tgz",
-      "integrity": "sha512-/qUnCjil7Eb0KQVErkziuyIbG1FrszD6+ttGY7+DTTbN+/QGjyqwTizwGLQDF8Itvf29O7YWKEdsoJyiwn/F4Q==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.2.0.tgz",
+      "integrity": "sha512-02tAnE1KcorVJRjs+xf0AngsRyYRpdZ9yDVHX+J5x2Z9v4qNpp1FPkx3A8hmqznCAgqc4C0EbaxHg0BcUlQsWw==",
       "dev": true
     },
     "@firebase/database": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.1.3.tgz",
-      "integrity": "sha512-Uk9IRPYDmpDRBvnIZhs16iQX/7GxetslWD+7N6GKgEDmO9csPC+9hHmdXkcVc6cG7xHCePdRJGvhrVt3ax7Fcw==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.1.2.tgz",
+      "integrity": "sha512-60D08yaQJ6RVegxriC/VNpHE2+/4itTtxBbo15P8WkFfnsjjJVK8AkkFiCjOxj6TccpjzoAz69Xe2/p8po2fEg==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.1.2",
-        "faye-websocket": "0.11.1"
+        "@firebase/util": "0.1.1",
+        "faye-websocket": "0.9.3"
       }
     },
     "@firebase/firestore": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.1.4.tgz",
-      "integrity": "sha512-ltt3zvvZ6LE37oIfVm0zeNA0DPo75YKWkfIyEbFlXDWkeNIt3lunhB4L777weUzZOmcZhX8T6pHx6xZM+ysDkA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.1.2.tgz",
+      "integrity": "sha512-VqPLPKiSy0EzsQfA4w0qYT93KgkiL/NAIS6Ibajuuts2wbz2CBgsZM1nPvgJnaQCN8LPAT/Vvn2th7nMozFHag==",
       "dev": true,
       "requires": {
-        "@firebase/webchannel-wrapper": "0.2.4"
+        "@firebase/webchannel-wrapper": "0.2.3"
       }
     },
     "@firebase/messaging": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.1.3.tgz",
-      "integrity": "sha512-mQxG4y+wT7hCSsNzPGdFKjZ7/NLIdSJRYX59bLL3F0HMIuOlNtYXxKjN23vBGljwFufx3dQBtlX8beDBKbOv4Q==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.1.2.tgz",
+      "integrity": "sha512-fZHhO1FO2RHOVg8A0BhwF+Ay0A34AtMEyjo9csht+TQNEaG924Jkf2tUG13nqRda63tmjT5REeWnGv6qAZU4Jw==",
       "dev": true,
       "requires": {
-        "@firebase/util": "0.1.2"
+        "@firebase/util": "0.1.1"
       }
     },
     "@firebase/polyfill": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.1.2.tgz",
-      "integrity": "sha512-5oneu9nOYDZkZWyfvBXFa+ORWj9HeOYhwWy4HSJzCLKLnOvQSSZRcNBD2cVrysGR8tZCEfyKqq3fnwtODCvIQg==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.1.1.tgz",
+      "integrity": "sha512-XvZzppOmu5NZvWkvxZuWpD5VeMhyhhlrMvyFAwlOeYrJKcBFkIbmSX46Pe5ttuXYp6EjrVia/Bh1h2h0NYgE7g==",
       "dev": true,
       "requires": {
         "promise-polyfill": "6.0.2"
       }
     },
     "@firebase/storage": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.2.tgz",
-      "integrity": "sha512-Il1+R2BbFfhwq4H6OAF+hpxr5mAxoD3CK/i/78CiDATtKR5OU9kuQf7T3V3khMeFspK0H6r02Oe9gTbS2XhPkQ==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.1.1.tgz",
+      "integrity": "sha512-ccnANSW/Sun8/pFssCdOsVQrdyDb/ReKU/P0rbDdU0LvnWkYEckegJrYSoDliHuht19qHSl5C062q82ZxReVRQ==",
       "dev": true
     },
     "@firebase/util": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.2.tgz",
-      "integrity": "sha512-XzvnxTsPIukAJmBVpBOGTLVgz27Iyoudmum6Bqy8Czu2qhWjikhkE1UlND7Gh5BwTpBVr03axjovRXgh5xgIxw==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.1.1.tgz",
+      "integrity": "sha512-HtJ3UEecoy2qjoTXwtp0tN4pVR+zH6+pSMtxLHSxgkAAExKsPJUp5W91O6LivjRdiakRwjMZEE9bVPFUCHDhlQ==",
       "dev": true
     },
     "@firebase/webchannel-wrapper": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.4.tgz",
-      "integrity": "sha512-jEpglcwMlwdXc/JgvJaJtCSkPMktnFeI0gAZxPrmbJxKVzMZJ2zM582NbW/r6M22pSdNWjcWeg1I2LRg3jQGQA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.3.tgz",
+      "integrity": "sha512-EWSvoDVXmUwP1nP65ob1gEGiJi38Pv1e9dmL1DHBcupmYdST1cbYper6N2EVnCkzMIm2/EfZiGSL1nf8V4uiKg==",
       "dev": true
     },
     "@google-cloud/common": {
@@ -191,90 +334,82 @@
         "methmeth": "1.1.0",
         "modelo": "4.2.0",
         "request": "2.83.0",
-        "retry-request": "3.1.1",
+        "retry-request": "3.1.0",
         "split-array-stream": "1.0.3",
         "stream-events": "1.0.2",
         "string-format-obj": "1.1.0",
         "through2": "2.0.3"
       }
     },
-    "@google-cloud/common-grpc": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.2.tgz",
-      "integrity": "sha1-jPb7vkGZdueOtuD+aoGXTEYfMaw=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/common": "0.13.6",
-        "dot-prop": "2.4.0",
-        "duplexify": "3.5.1",
-        "extend": "3.0.1",
-        "grpc": "1.7.1",
-        "is": "3.2.1",
-        "modelo": "4.2.0",
-        "retry-request": "3.1.1",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "dot-prop": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
-          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
-          "dev": true,
-          "requires": {
-            "is-obj": "1.0.1"
-          }
-        }
-      }
-    },
-    "@google-cloud/firestore": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.9.0.tgz",
-      "integrity": "sha512-IoWsM1lkoBQffywJgbjJzzYMLPXSowOyrDRSx67u5kvPwTsYFl1AupPEOet48k/5tvaT4yhmhP2OsU+MSjrp5w==",
-      "dev": true,
-      "requires": {
-        "@google-cloud/common": "0.13.6",
-        "@google-cloud/common-grpc": "0.4.2",
-        "bun": "0.0.12",
-        "extend": "3.0.1",
-        "functional-red-black-tree": "1.0.1",
-        "google-gax": "0.14.2",
-        "grpc": "1.7.1",
-        "is": "3.2.1",
-        "safe-buffer": "5.1.1",
-        "through2": "2.0.3"
-      }
-    },
     "@google-cloud/functions-emulator": {
-      "version": "1.0.0-alpha.27",
-      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.27.tgz",
-      "integrity": "sha1-0iEKArtKCQN95jpRLn1amMKBI+c=",
+      "version": "1.0.0-alpha.25",
+      "resolved": "https://registry.npmjs.org/@google-cloud/functions-emulator/-/functions-emulator-1.0.0-alpha.25.tgz",
+      "integrity": "sha512-f1rn5SxjvUYeh/jibc4ccFFWgNK6qaE+eiFafgW/MlAsuGB+8DPYYIZ56ags80qtfCdL3j/ny40vmT1unO49HA==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@google-cloud/storage": "1.4.0",
+        "@google-cloud/storage": "1.2.1",
         "adm-zip": "0.4.7",
-        "ajv": "5.3.0",
-        "body-parser": "1.18.2",
+        "ajv": "5.2.2",
+        "body-parser": "1.17.2",
         "cli-table2": "0.2.0",
         "colors": "1.1.2",
         "configstore": "3.1.1",
-        "express": "4.16.2",
-        "google-proto-files": "0.14.1",
-        "googleapis": "22.2.0",
+        "express": "4.15.4",
+        "google-proto-files": "0.12.1",
+        "googleapis": "20.1.0",
         "got": "7.1.0",
-        "grpc": "1.7.1",
+        "grpc": "1.4.1",
         "http-proxy": "1.16.2",
         "lodash": "4.17.4",
         "prompt": "1.0.0",
-        "rimraf": "2.6.2",
+        "rimraf": "2.6.1",
         "semver": "5.4.1",
         "serializerr": "1.0.3",
         "tmp": "0.0.33",
         "uuid": "3.1.0",
-        "winston": "2.4.0",
-        "yargs": "10.0.3"
+        "winston": "2.3.1",
+        "yargs": "8.0.2"
       },
       "dependencies": {
+        "@google-cloud/storage": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+          "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@google-cloud/common": "0.13.6",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
+        },
+        "ajv": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -282,6 +417,13 @@
           "dev": true,
           "optional": 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,
+          "optional": true
+        },
         "colors": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -289,17 +431,6 @@
           "dev": true,
           "optional": true
         },
-        "google-proto-files": {
-          "version": "0.14.1",
-          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.14.1.tgz",
-          "integrity": "sha1-bl8V+L1mFdc8o/3QjN7DM2P5r4k=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "globby": "6.1.0",
-            "protobufjs": "6.8.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",
@@ -319,28 +450,6 @@
             "mem": "1.1.0"
           }
         },
-        "protobufjs": {
-          "version": "6.8.0",
-          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
-          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@protobufjs/aspromise": "1.1.2",
-            "@protobufjs/base64": "1.1.2",
-            "@protobufjs/codegen": "2.0.4",
-            "@protobufjs/eventemitter": "1.1.0",
-            "@protobufjs/fetch": "1.1.0",
-            "@protobufjs/float": "1.0.2",
-            "@protobufjs/inquire": "1.1.0",
-            "@protobufjs/path": "1.1.2",
-            "@protobufjs/pool": "1.1.0",
-            "@protobufjs/utf8": "1.1.0",
-            "@types/long": "3.0.32",
-            "@types/node": "7.0.46",
-            "long": "3.2.0"
-          }
-        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -372,25 +481,57 @@
             "os-tmpdir": "1.0.2"
           }
         },
+        "winston": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz",
+          "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=",
+          "dev": true,
+          "optional": 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,
+              "optional": true
+            },
+            "colors": {
+              "version": "1.0.3",
+              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
         "yargs": {
-          "version": "10.0.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz",
-          "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==",
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
           "dev": true,
           "optional": true,
           "requires": {
+            "camelcase": "4.1.0",
             "cliui": "3.2.0",
             "decamelize": "1.2.0",
-            "find-up": "2.1.0",
             "get-caller-file": "1.0.2",
             "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
             "require-directory": "2.1.1",
             "require-main-filename": "1.0.1",
             "set-blocking": "2.0.0",
             "string-width": "2.1.1",
             "which-module": "2.0.0",
             "y18n": "3.2.1",
-            "yargs-parser": "8.0.0"
+            "yargs-parser": "7.0.0"
           }
         }
       }
@@ -403,7 +544,7 @@
       "requires": {
         "@google-cloud/common": "0.13.6",
         "arrify": "1.0.1",
-        "async": "2.6.0",
+        "async": "2.5.0",
         "concat-stream": "1.6.0",
         "create-error-class": "3.0.2",
         "duplexify": "3.5.1",
@@ -421,70 +562,6 @@
         "through2": "2.0.3"
       }
     },
-    "@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
-      "dev": true
-    },
-    "@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "dev": true
-    },
-    "@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
-      "dev": true
-    },
-    "@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
-      "dev": true
-    },
-    "@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
-      "dev": true,
-      "requires": {
-        "@protobufjs/aspromise": "1.1.2",
-        "@protobufjs/inquire": "1.1.0"
-      }
-    },
-    "@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
-      "dev": true
-    },
-    "@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
-      "dev": true
-    },
-    "@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
-      "dev": true
-    },
-    "@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
-      "dev": true
-    },
-    "@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
-      "dev": true
-    },
     "@types/chalk": {
       "version": "0.4.31",
       "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz",
@@ -492,9 +569,9 @@
       "dev": true
     },
     "@types/fs-extra": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.5.tgz",
-      "integrity": "sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
+      "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
       "dev": true,
       "requires": {
         "@types/node": "7.0.46"
@@ -510,15 +587,6 @@
         "@types/node": "7.0.46"
       }
     },
-    "@types/google-cloud__storage": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.6.tgz",
-      "integrity": "sha512-X/hXFBpcnrfUjm6Q+9wTqVOlxKY5vC5aFMB4AIOnpuIhWmksJ5uVwry9Tr60buoYmeWbBGtx5JRWACJK9MhC+Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "7.0.46"
-      }
-    },
     "@types/gulp": {
       "version": "3.8.32",
       "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-3.8.32.tgz",
@@ -526,7 +594,7 @@
       "dev": true,
       "requires": {
         "@types/node": "7.0.46",
-        "@types/orchestrator": "0.3.2",
+        "@types/orchestrator": "0.3.0",
         "@types/vinyl": "2.0.1"
       }
     },
@@ -537,24 +605,9 @@
       "dev": true
     },
     "@types/jasmine": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.0.tgz",
-      "integrity": "sha512-NthRcmfDjp6PEevahmd3L5euekA/H2F7Xb+Mr9C5a8VYYA86pJIEMPqCDVUrJtVyFMY4Dv9XXnUYoSx9Nnxghg==",
-      "dev": true
-    },
-    "@types/jsonwebtoken": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
-      "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "7.0.46"
-      }
-    },
-    "@types/long": {
-      "version": "3.0.32",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
-      "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.3.tgz",
+      "integrity": "sha512-2dJf9//QxTnFBXHsCqLbB55jlMreJQie9HhgsZrSgHveOKCWVmgcXgRyvIi22Ndk/dJ/e2srLOstk2NgVbb7XA==",
       "dev": true
     },
     "@types/merge2": {
@@ -585,19 +638,19 @@
       "dev": true
     },
     "@types/orchestrator": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@types/orchestrator/-/orchestrator-0.3.2.tgz",
-      "integrity": "sha512-cKB4yTX0wGaRCSkdHDX2fkGQbMAA8UOshC2U7DQky1CE5o+5q2iQQ8VkbPbE/88uaTtsusvBPMcCX7dgmjxBhQ==",
+      "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": "7.0.46",
-        "@types/q": "1.0.6"
+        "@types/q": "0.0.37"
       }
     },
     "@types/q": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.0.6.tgz",
-      "integrity": "sha512-LSx7jkcXoXWB+kkfwG5zc9Okbgn51BrjLMtKwbmnqfQlCGttTnTxvDVwQanHxkK6CLKb9yEfxQ1ID6pqDpeURw==",
+      "version": "0.0.37",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.37.tgz",
+      "integrity": "sha512-vjFGX1zMTMz/kUp3xgfJcxMVLkMWVMrdlyc0RwVyve1y9jxwqNaT8wTcv6M51ylq2a/zn5lm8g7qPSoIS4uvZQ==",
       "dev": true
     },
     "@types/run-sequence": {
@@ -611,9 +664,15 @@
       }
     },
     "@types/selenium-webdriver": {
-      "version": "2.53.43",
-      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz",
-      "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
+      "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/source-map": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@types/source-map/-/source-map-0.5.2.tgz",
+      "integrity": "sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==",
       "dev": true
     },
     "@types/vinyl": {
@@ -625,6 +684,16 @@
         "@types/node": "7.0.46"
       }
     },
+    "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"
+      }
+    },
     "a-sync-waterfall": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz",
@@ -705,21 +774,21 @@
       }
     },
     "ajv": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz",
-      "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
       "dev": true,
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
+        "json-schema-traverse": "0.3.1",
+        "json-stable-stringify": "1.0.1"
       }
     },
     "ajv-keywords": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+      "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
       "dev": true
     },
     "align-text": {
@@ -795,19 +864,70 @@
       "dev": true
     },
     "archiver": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz",
-      "integrity": "sha1-0t8ujVdzqCwdzOklzMQUUOqZmv0=",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.16.0.tgz",
+      "integrity": "sha1-u1cDRomdCGXrd+1mcnqzxjT8GlA=",
       "dev": true,
       "requires": {
-        "archiver-utils": "1.3.0",
-        "async": "2.6.0",
+        "async": "1.4.2",
         "buffer-crc32": "0.2.13",
-        "glob": "7.1.2",
-        "lodash": "4.17.4",
-        "readable-stream": "2.3.3",
-        "tar-stream": "1.5.5",
-        "zip-stream": "1.2.0"
+        "glob": "5.0.15",
+        "lazystream": "0.1.0",
+        "lodash": "3.10.1",
+        "readable-stream": "1.0.34",
+        "tar-stream": "1.2.2",
+        "zip-stream": "0.6.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz",
+          "integrity": "sha1-bJ7csRztTw3S8tQNsNSaEJwIiqs=",
+          "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"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "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
+        }
       }
     },
     "archiver-utils": {
@@ -822,6 +942,17 @@
         "lodash": "4.17.4",
         "normalize-path": "2.1.1",
         "readable-stream": "2.3.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
       }
     },
     "archy": {
@@ -853,7 +984,8 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
       "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "arr-diff": {
       "version": "2.0.0",
@@ -998,9 +1130,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+      "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"
@@ -1031,7 +1163,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000764",
+        "caniuse-db": "1.0.30000748",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.18",
@@ -1051,9 +1183,9 @@
       "dev": true
     },
     "axe-core": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.5.0.tgz",
-      "integrity": "sha512-onOXxjT3lXT3FfIBH5AIDxug+28Xw4q4XY66v+2rTRWg9o8dSiKr58ZWlCveh1cmE2kL5bT1KlO9PsSr7pWClA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-2.4.2.tgz",
+      "integrity": "sha512-RyAyvCYPJ5y/Ov2mY67kuZG8SfxIAOAI0KuJ9nRXX/vDCL/RTcArGgtn5i2+uZjL23GC6eqMaJ6GjUEDEe11tw==",
       "dev": true
     },
     "axe-webdriverjs": {
@@ -1062,7 +1194,7 @@
       "integrity": "sha512-Nsb/6gyIGYFmQbo3NP14MZghNQff5m+v8D4ex4baad6DvtFzg6T843WZvbdb5F9oHCUWnXy5cgw4LhEpj4ffww==",
       "dev": true,
       "requires": {
-        "axe-core": "2.5.0"
+        "axe-core": "2.4.2"
       }
     },
     "babel-code-frame": {
@@ -1074,6 +1206,27 @@
         "chalk": "1.1.3",
         "esutils": "2.0.2",
         "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "babel-runtime": {
@@ -1230,21 +1383,29 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+      "version": "1.17.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz",
+      "integrity": "sha1-+IkqvI+eYn1Crtr7yma/WrmRBO4=",
       "dev": true,
       "requires": {
-        "bytes": "3.0.0",
+        "bytes": "2.4.0",
         "content-type": "1.0.4",
-        "debug": "2.6.9",
+        "debug": "2.6.7",
         "depd": "1.1.1",
         "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
+        "iconv-lite": "0.4.15",
         "on-finished": "2.3.0",
-        "qs": "6.5.1",
-        "raw-body": "2.3.2",
+        "qs": "6.4.0",
+        "raw-body": "2.2.0",
         "type-is": "1.6.15"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+          "dev": true
+        }
       }
     },
     "boom": {
@@ -1271,6 +1432,27 @@
         "repeating": "2.0.1",
         "string-width": "1.0.2",
         "widest-line": "1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "brace-expansion": {
@@ -1317,7 +1499,7 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000764",
+        "caniuse-db": "1.0.30000748",
         "electron-to-chromium": "1.3.27"
       }
     },
@@ -1390,41 +1572,6 @@
       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
-    "bun": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
-      "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
-      "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
-        }
-      }
-    },
     "bytebuffer": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
@@ -1435,9 +1582,9 @@
       }
     },
     "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
+      "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=",
       "dev": true
     },
     "callsite": {
@@ -1473,9 +1620,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000764",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000764.tgz",
-      "integrity": "sha1-1zqxGuYvap4vaYZ9bZwjrj8uXY0=",
+      "version": "1.0.30000748",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz",
+      "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=",
       "dev": true
     },
     "canonical-path": {
@@ -1585,7 +1732,6 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1751,9 +1897,9 @@
       "dev": true
     },
     "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "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.3"
@@ -1789,6 +1935,19 @@
         "yargs": "1.3.3"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -1810,6 +1969,12 @@
             "postcss": "5.2.18"
           }
         },
+        "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
+        },
         "yargs": {
           "version": "1.3.3",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
@@ -1909,15 +2074,41 @@
       "dev": true
     },
     "compress-commons": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
-      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.3.0.tgz",
+      "integrity": "sha1-lwk+Lhk/dWf6EyA9S43vzVlxpRk=",
       "dev": true,
       "requires": {
         "buffer-crc32": "0.2.13",
-        "crc32-stream": "2.0.0",
-        "normalize-path": "2.1.1",
-        "readable-stream": "2.3.3"
+        "crc32-stream": "0.3.4",
+        "node-int64": "0.4.0",
+        "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
+        }
       }
     },
     "compressible": {
@@ -1942,6 +2133,23 @@
         "on-headers": "1.0.1",
         "safe-buffer": "5.1.1",
         "vary": "1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "concat-map": {
@@ -1969,7 +2177,7 @@
       "requires": {
         "dot-prop": "4.2.0",
         "graceful-fs": "4.1.11",
-        "make-dir": "1.1.0",
+        "make-dir": "1.0.0",
         "unique-string": "1.0.0",
         "write-file-atomic": "2.3.0",
         "xdg-basedir": "3.0.0"
@@ -1987,25 +2195,19 @@
         "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "finalhandler": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
-          "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "1.0.1",
-            "escape-html": "1.0.3",
-            "on-finished": "2.3.0",
-            "parseurl": "1.3.2",
-            "statuses": "1.3.1",
-            "unpipe": "1.0.0"
+            "ms": "2.0.0"
           }
         },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
           "dev": true
         }
       }
@@ -2102,33 +2304,33 @@
       "dev": true
     },
     "content-type-parser": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
-      "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
+      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
       "dev": true
     },
     "conventional-changelog": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz",
-      "integrity": "sha1-kVGmKx2O2y2CcR2r9bfPcQQfgrE=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
+      "integrity": "sha512-AaQRALJYQVbfMs0UYJ3jf5yIAJwGnm/E7ETwzZMwF/3JDMyDaa4agLQomz94pcYiGH7zcrxFcwHApSODOYnunA==",
       "dev": true,
       "requires": {
-        "conventional-changelog-angular": "1.5.2",
-        "conventional-changelog-atom": "0.1.2",
-        "conventional-changelog-codemirror": "0.2.1",
-        "conventional-changelog-core": "1.9.3",
-        "conventional-changelog-ember": "0.2.9",
-        "conventional-changelog-eslint": "0.2.1",
-        "conventional-changelog-express": "0.2.1",
+        "conventional-changelog-angular": "1.5.1",
+        "conventional-changelog-atom": "0.1.1",
+        "conventional-changelog-codemirror": "0.2.0",
+        "conventional-changelog-core": "1.9.2",
+        "conventional-changelog-ember": "0.2.8",
+        "conventional-changelog-eslint": "0.2.0",
+        "conventional-changelog-express": "0.2.0",
         "conventional-changelog-jquery": "0.1.0",
         "conventional-changelog-jscs": "0.1.0",
-        "conventional-changelog-jshint": "0.2.1"
+        "conventional-changelog-jshint": "0.2.0"
       }
     },
     "conventional-changelog-angular": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.2.tgz",
-      "integrity": "sha1-Kzj2Zf6cWSCvGi+C9Uf0ur5t5Xw=",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
+      "integrity": "sha512-AnjnPyqHp8yR2IOWsXYOCv6Ly0WC2rLRK04fgAS/5QoA3ovYLSoz9PKB5pcSG3M9lAf40IqZwU3R3G6Hy7XCSA==",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2136,36 +2338,36 @@
       }
     },
     "conventional-changelog-atom": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz",
-      "integrity": "sha1-Ella1SZ6aTfDTPkAKBscZRmKTGM=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
+      "integrity": "sha512-6Nlu/+MiD4gi7k3Z+N1vMJWpaPSdvFPWzPGnH4OXewHAxiAl0L/TT9CGgA01fosPxmYr4hMNtD7kyN0tkg8vIA==",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-codemirror": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz",
-      "integrity": "sha1-KZpPcUe681DmyBWPxUlUopHFzAk=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
+      "integrity": "sha512-jUbY98JoKdAOR5k3pOBiKZ+Iz9t2F84hL7x4WjSRW6x7FdeCEUOjyfml+YClE2h/h62Tf3mwur5jSO8upxxc1g==",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-core": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.3.tgz",
-      "integrity": "sha1-KJn+d5OJoynw7EsnRsNt3vuY2i0=",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
+      "integrity": "sha512-L/boGKXaKWrlCU8bHa1QM36Pb/JopCPmekj5SFqqAuBfjya860xX2fAC5Ggelse++Bw39AZ2NrHwBnJrdwLlLw==",
       "dev": true,
       "requires": {
-        "conventional-changelog-writer": "2.0.2",
-        "conventional-commits-parser": "2.0.1",
+        "conventional-changelog-writer": "2.0.1",
+        "conventional-commits-parser": "2.0.0",
         "dateformat": "1.0.12",
         "get-pkg-repo": "1.4.0",
-        "git-raw-commits": "1.3.0",
+        "git-raw-commits": "1.2.0",
         "git-remote-origin-url": "2.0.0",
-        "git-semver-tags": "1.2.3",
+        "git-semver-tags": "1.2.2",
         "lodash": "4.17.4",
         "normalize-package-data": "2.4.0",
         "q": "1.4.1",
@@ -2183,31 +2385,104 @@
             "get-stdin": "4.0.1",
             "meow": "3.7.0"
           }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
         }
       }
     },
     "conventional-changelog-ember": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.9.tgz",
-      "integrity": "sha1-jsc8wFTjqwZGZ/sf61L+jvGxZDg=",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
+      "integrity": "sha512-smsh0o/S95n22lrQZrSHYjJrxIGoFl+OFHK+q2KGHA2zRFrW7QilYM7VUjgmB+emzwqFguPjrq+D2U8iPhMNJg==",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-eslint": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz",
-      "integrity": "sha1-LCoRvrIW+AZJunKDQYApO2h8BmI=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
+      "integrity": "sha512-WGKnC0bGPD6BHGiRBfYqNGfy6DZDn2jGs1yxPRT8I2796wYdGqsbDF4477o4fdsxUJvckoW2OFPqkmRMQaCHSA==",
       "dev": true,
       "requires": {
         "q": "1.4.1"
       }
     },
     "conventional-changelog-express": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz",
-      "integrity": "sha1-g42eHmyQmXA7FQucGaoteBdCvWw=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
+      "integrity": "sha512-ujSEmbWfozC1iIjH5Pl7AKtREowvAl10whs1q6c7nZLnoNZK5CmdB2PQ/V42O6rCgUzaLX+ACRW2+g0A/Htqvw==",
       "dev": true,
       "requires": {
         "q": "1.4.1"
@@ -2232,9 +2507,9 @@
       }
     },
     "conventional-changelog-jshint": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz",
-      "integrity": "sha1-hhObs6yZiZ8rF36WF+CbN9mbzzo=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
+      "integrity": "sha512-uUP4c0et6F2teapl+YY2JHFAHD401U5CkgI+P8PyU0y1zS8BdBy6EnhqgZEXhFOp9fPzUdic+Wv/9alOqw3agQ==",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
@@ -2242,13 +2517,13 @@
       }
     },
     "conventional-changelog-writer": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.2.tgz",
-      "integrity": "sha1-tYV97RsAHa+aeLnNQJJvRcE0lJs=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
+      "integrity": "sha512-X4qC758celQOKw0iUPAsH5sJX6fH6N5dboFc3elXb1/SIKhsYMukhhaxWmxRdtVUSqGt9rZg8giwBQG5B2GeKg==",
       "dev": true,
       "requires": {
         "compare-func": "1.3.2",
-        "conventional-commits-filter": "1.1.0",
+        "conventional-commits-filter": "1.0.0",
         "dateformat": "1.0.12",
         "handlebars": "4.0.11",
         "json-stringify-safe": "5.0.1",
@@ -2281,9 +2556,9 @@
       }
     },
     "conventional-commits-filter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.0.tgz",
-      "integrity": "sha1-H8Ka8wte2rdvVOIpxBGwxmPQ+es=",
+      "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",
@@ -2291,13 +2566,13 @@
       }
     },
     "conventional-commits-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.1.tgz",
-      "integrity": "sha1-HxXOa4RPfKQUlcgZDAgzwwuLFpM=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
+      "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==",
       "dev": true,
       "requires": {
-        "is-text-path": "1.0.1",
         "JSONStream": "1.3.1",
+        "is-text-path": "1.0.1",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "split2": "2.2.0",
@@ -2372,19 +2647,45 @@
       }
     },
     "crc": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
-      "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
+      "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
       "dev": true
     },
     "crc32-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
-      "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz",
+      "integrity": "sha1-c7wltF+sHbZjIjGnv86JJ+nwZVI=",
       "dev": true,
       "requires": {
-        "crc": "3.5.0",
-        "readable-stream": "2.3.3"
+        "buffer-crc32": "0.2.13",
+        "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
+        }
       }
     },
     "create-error-class": {
@@ -2715,9 +3016,9 @@
       "dev": true
     },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "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"
@@ -2764,13 +3065,13 @@
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
       "requires": {
-        "clone": "1.0.3"
+        "clone": "1.0.2"
       },
       "dependencies": {
         "clone": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
           "dev": true
         }
       }
@@ -2787,29 +3088,7 @@
         "object-assign": "4.1.1",
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.2"
-      },
-      "dependencies": {
-        "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.1.2",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
+        "rimraf": "2.6.1"
       }
     },
     "delayed-stream": {
@@ -2843,7 +3122,7 @@
       "dev": true,
       "requires": {
         "commander": "2.11.0",
-        "debug": "2.6.9",
+        "debug": "2.6.7",
         "filing-cabinet": "1.12.0",
         "precinct": "3.8.0"
       }
@@ -3094,7 +3373,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000764",
+        "caniuse-db": "1.0.30000748",
         "css-rule-stream": "1.1.0",
         "duplexer2": "0.0.2",
         "jsonfilter": "1.1.2",
@@ -3205,12 +3484,6 @@
         }
       }
     },
-    "dom-storage": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
-      "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
-      "dev": true
-    },
     "domelementtype": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
@@ -3780,48 +4053,56 @@
       }
     },
     "express": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
-      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+      "version": "4.15.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
+      "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
       "dev": true,
       "optional": true,
       "requires": {
         "accepts": "1.3.4",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
         "content-type": "1.0.4",
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
+        "debug": "2.6.8",
         "depd": "1.1.1",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
-        "finalhandler": "1.1.0",
-        "fresh": "0.5.2",
+        "finalhandler": "1.0.6",
+        "fresh": "0.5.0",
         "merge-descriptors": "1.0.1",
         "methods": "1.1.2",
         "on-finished": "2.3.0",
         "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.2",
-        "qs": "6.5.1",
+        "proxy-addr": "1.1.5",
+        "qs": "6.5.0",
         "range-parser": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "send": "0.16.1",
-        "serve-static": "1.13.1",
-        "setprototypeof": "1.1.0",
+        "send": "0.15.4",
+        "serve-static": "1.12.4",
+        "setprototypeof": "1.0.3",
         "statuses": "1.3.1",
         "type-is": "1.6.15",
-        "utils-merge": "1.0.1",
+        "utils-merge": "1.0.0",
         "vary": "1.1.2"
       },
       "dependencies": {
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "qs": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
+          "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==",
           "dev": true,
           "optional": true
         },
@@ -3857,12 +4138,6 @@
           "integrity": "sha1-5zSlwUF/zkctWu+Cw4HKu2TRpDU=",
           "dev": true
         },
-        "crc": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz",
-          "integrity": "sha1-+mIuG8OIvyVzCQgta2UgDOZwkLo=",
-          "dev": true
-        },
         "debug": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
@@ -3892,12 +4167,6 @@
           "requires": {
             "base64-url": "1.2.1"
           }
-        },
-        "utils-merge": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-          "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
-          "dev": true
         }
       }
     },
@@ -3936,6 +4205,27 @@
       "requires": {
         "chalk": "1.1.3",
         "time-stamp": "1.1.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "fast-deep-equal": {
@@ -3944,12 +4234,6 @@
       "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
       "dev": true
     },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
-    },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -3966,9 +4250,9 @@
       }
     },
     "faye-websocket": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-      "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+      "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
       "dev": true,
       "requires": {
         "websocket-driver": "0.7.0"
@@ -4020,13 +4304,13 @@
       "requires": {
         "app-module-path": "1.1.0",
         "commander": "2.11.0",
-        "debug": "2.6.9",
+        "debug": "2.6.7",
         "enhanced-resolve": "3.0.3",
         "is-relative-path": "1.0.2",
         "module-definition": "2.2.4",
         "module-lookup-amd": "4.0.5",
         "object-assign": "4.1.1",
-        "resolve": "1.5.0",
+        "resolve": "1.4.0",
         "resolve-dependency-path": "1.0.2",
         "sass-lookup": "1.1.0",
         "stylus-lookup": "1.0.2",
@@ -4053,11 +4337,10 @@
       "dev": true
     },
     "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "1.0.1",
@@ -4068,12 +4351,20 @@
         "unpipe": "1.0.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
           "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -4145,548 +4436,607 @@
       }
     },
     "firebase": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.2.tgz",
-      "integrity": "sha512-qI4qWZNO4/tS05goNaLYaxFd2/GgWVONPcqq+H1YyLi0ybWfF7oEVhw1dz8SY+7Xc5wc3S4jGSMi3apgINz1Zg==",
-      "dev": true,
-      "requires": {
-        "@firebase/app": "0.1.2",
-        "@firebase/auth": "0.2.2",
-        "@firebase/database": "0.1.3",
-        "@firebase/firestore": "0.1.4",
-        "@firebase/messaging": "0.1.3",
-        "@firebase/polyfill": "0.1.2",
-        "@firebase/storage": "0.1.2",
-        "dom-storage": "2.0.2",
-        "xmlhttprequest": "1.8.0"
-      }
-    },
-    "firebase-admin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.5.0.tgz",
-      "integrity": "sha1-wxLgfcLCEmEFEwkwokjIHn1ux6c=",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.6.0.tgz",
+      "integrity": "sha512-lfVXLQiCNcNsmG7ZxQapQRdE/kZOjheBZVZ1MNK80GTsuK9RO7DYO5Qdf4K9Om8r7OBZ4nRp438kGkf24x7sOg==",
       "dev": true,
       "requires": {
-        "@firebase/app": "0.1.2",
-        "@firebase/database": "0.1.3",
-        "@google-cloud/firestore": "0.9.0",
-        "@google-cloud/storage": "1.4.0",
-        "@types/google-cloud__storage": "1.1.6",
-        "@types/jsonwebtoken": "7.2.3",
-        "@types/node": "8.0.51",
-        "faye-websocket": "0.9.3",
-        "google-auth-library": "0.10.0",
-        "jsonwebtoken": "7.4.3",
-        "node-forge": "0.7.1"
+        "@firebase/app": "0.1.1",
+        "@firebase/auth": "0.2.0",
+        "@firebase/database": "0.1.2",
+        "@firebase/firestore": "0.1.2",
+        "@firebase/messaging": "0.1.2",
+        "@firebase/polyfill": "0.1.1",
+        "@firebase/storage": "0.1.1",
+        "dom-storage": "2.0.2",
+        "xmlhttprequest": "1.8.0"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "8.0.51",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.51.tgz",
-          "integrity": "sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==",
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
+        },
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+        },
+        "dom-storage": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz",
+          "integrity": "sha1-7RfL9oq9EOCu+BgnE+KXxeS1ALA=",
           "dev": true
         },
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+          "requires": {
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
+          }
+        },
         "faye-websocket": {
           "version": "0.9.3",
           "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
           "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-          "dev": true,
           "requires": {
-            "websocket-driver": "0.7.0"
+            "websocket-driver": "0.6.5"
           }
-        }
-      }
-    },
-    "firebase-tools": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.15.0.tgz",
-      "integrity": "sha1-H7qAH7N85D3Y0nA1MzSw5eaj/7M=",
-      "dev": true,
-      "requires": {
-        "@google-cloud/functions-emulator": "1.0.0-alpha.27",
-        "archiver": "2.1.0",
-        "chalk": "1.1.3",
-        "cjson": "0.3.3",
-        "cli-table": "0.3.1",
-        "commander": "2.11.0",
-        "configstore": "1.4.0",
-        "cross-spawn": "4.0.2",
-        "csv-streamify": "3.0.4",
-        "didyoumean": "1.2.1",
-        "es6-set": "0.1.5",
-        "exit-code": "1.0.2",
-        "filesize": "3.5.11",
-        "firebase": "2.4.2",
-        "fs-extra": "0.23.1",
-        "fstream-ignore": "1.0.5",
-        "glob": "7.1.2",
-        "google-auto-auth": "0.7.2",
-        "inquirer": "0.12.0",
-        "jsonschema": "1.2.0",
-        "JSONStream": "1.3.1",
-        "jsonwebtoken": "7.4.3",
-        "lodash": "4.17.4",
-        "open": "0.0.5",
-        "ora": "0.2.3",
-        "portfinder": "0.4.0",
-        "progress": "2.0.0",
-        "request": "2.83.0",
-        "rsvp": "3.6.2",
-        "semver": "5.4.1",
-        "superstatic": "5.0.1",
-        "tar": "3.2.1",
-        "tmp": "0.0.27",
-        "universal-analytics": "0.3.11",
-        "update-notifier": "0.5.0",
-        "user-home": "2.0.0",
-        "uuid": "3.1.0",
-        "winston": "1.1.2"
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+        },
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo="
+        },
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+          "requires": {
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          }
+        },
+        "jsonwebtoken": {
+          "version": "7.4.3",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
+          "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
+          "requires": {
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "2.0.0",
+            "xtend": "4.0.1"
+          }
+        },
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+          "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "promise-polyfill": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
+          "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "websocket-driver": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+          "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+          "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="
+        },
+        "xmlhttprequest": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+          "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+          "dev": true
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+        }
+      }
+    },
+    "firebase-admin": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-5.4.2.tgz",
+      "integrity": "sha1-AC9YvirYkBIp5SXsVfpybRL5BOs=",
+      "dev": true,
+      "requires": {
+        "@google-cloud/firestore": "0.8.2",
+        "@google-cloud/storage": "1.3.1",
+        "@types/google-cloud__storage": "1.1.5",
+        "@types/jsonwebtoken": "7.2.3",
+        "@types/node": "8.0.33",
+        "faye-websocket": "0.9.3",
+        "google-auth-library": "0.10.0",
+        "jsonwebtoken": "7.1.9",
+        "lodash": "4.17.4",
+        "node-forge": "0.7.1"
       },
       "dependencies": {
-        "async": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
-          "dev": true
+        "@google-cloud/common": {
+          "version": "0.13.6",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+          "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM=",
+          "dev": true,
+          "requires": {
+            "array-uniq": "1.0.3",
+            "arrify": "1.0.1",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "ent": "2.2.0",
+            "extend": "3.0.1",
+            "google-auto-auth": "0.7.2",
+            "is": "3.2.1",
+            "log-driver": "1.2.5",
+            "methmeth": "1.1.0",
+            "modelo": "4.2.0",
+            "request": "2.83.0",
+            "retry-request": "3.0.0",
+            "split-array-stream": "1.0.3",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
+          }
         },
-        "configstore": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
-          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+        "@google-cloud/common-grpc": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.1.tgz",
+          "integrity": "sha1-CSZGB++4k0MJr/1jhJmG+7gPkhg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "mkdirp": "0.5.1",
-            "object-assign": "4.1.1",
-            "os-tmpdir": "1.0.2",
-            "osenv": "0.1.4",
-            "uuid": "2.0.3",
-            "write-file-atomic": "1.3.4",
-            "xdg-basedir": "2.0.0"
-          },
-          "dependencies": {
-            "uuid": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-              "dev": true
-            }
+            "@google-cloud/common": "0.13.6",
+            "dot-prop": "2.4.0",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "grpc": "1.6.6",
+            "is": "3.2.1",
+            "modelo": "4.2.0",
+            "retry-request": "3.0.0",
+            "through2": "2.0.3"
           }
         },
-        "firebase": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
-          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+        "@google-cloud/firestore": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-0.8.2.tgz",
+          "integrity": "sha512-Z9hoiZIIn1MN7lUZE0pStvkrTdzJnSyFyxDJ4VojkzF/lL4EAUr9USyWXol6HZYcERPjXIasHSXXTYwuXx8tmA==",
           "dev": true,
           "requires": {
-            "faye-websocket": "0.9.3"
-          },
-          "dependencies": {
-            "faye-websocket": {
-              "version": "0.9.3",
-              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
-              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
-              "dev": true,
-              "requires": {
-                "websocket-driver": "0.5.2"
-              },
-              "dependencies": {
-                "websocket-driver": {
-                  "version": "0.5.2",
-                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
-                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
-                  "dev": true,
-                  "requires": {
-                    "websocket-extensions": "0.1.1"
-                  },
-                  "dependencies": {
-                    "websocket-extensions": {
-                      "version": "0.1.1",
-                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
-                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            }
+            "@google-cloud/common": "0.13.6",
+            "@google-cloud/common-grpc": "0.4.1",
+            "bun": "0.0.12",
+            "extend": "3.0.1",
+            "functional-red-black-tree": "1.0.1",
+            "google-gax": "0.14.1",
+            "grpc": "1.6.6",
+            "is": "3.2.1",
+            "through2": "2.0.3"
           }
         },
-        "fs-extra": {
-          "version": "0.23.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
-          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
+        "@google-cloud/storage": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.3.1.tgz",
+          "integrity": "sha512-tN2YttvQ33KwXuG2tpP3lEtxkZWV1yifc84YOusMjBCDoAal5GWXDPuCeFBI7cMs5LW+V2o3I9ZusOJZwYA8ug==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "jsonfile": "2.4.0",
-            "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.2"
+            "@google-cloud/common": "0.13.6",
+            "arrify": "1.0.1",
+            "async": "2.5.0",
+            "concat-stream": "1.6.0",
+            "create-error-class": "3.0.2",
+            "duplexify": "3.5.1",
+            "extend": "3.0.1",
+            "gcs-resumable-upload": "0.8.2",
+            "hash-stream-validation": "0.2.1",
+            "is": "3.2.1",
+            "mime-types": "2.1.17",
+            "once": "1.4.0",
+            "pumpify": "1.3.5",
+            "safe-buffer": "5.1.1",
+            "stream-events": "1.0.2",
+            "string-format-obj": "1.1.0",
+            "through2": "2.0.3"
           }
         },
-        "pkginfo": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+        "@protobufjs/aspromise": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+          "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=",
           "dev": true
         },
-        "winston": {
+        "@protobufjs/base64": {
           "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
-          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
+          "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+          "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+          "dev": true
+        },
+        "@protobufjs/codegen": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+          "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+          "dev": true
+        },
+        "@protobufjs/eventemitter": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+          "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=",
+          "dev": true
+        },
+        "@protobufjs/fetch": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+          "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
           "dev": true,
           "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
+            "@protobufjs/aspromise": "1.1.2",
+            "@protobufjs/inquire": "1.1.0"
           }
         },
-        "write-file-atomic": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
-          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+        "@protobufjs/float": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+          "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=",
+          "dev": true
+        },
+        "@protobufjs/inquire": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+          "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=",
+          "dev": true
+        },
+        "@protobufjs/path": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+          "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=",
+          "dev": true
+        },
+        "@protobufjs/pool": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+          "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=",
+          "dev": true
+        },
+        "@protobufjs/utf8": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+          "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=",
+          "dev": true
+        },
+        "@types/google-cloud__storage": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/@types/google-cloud__storage/-/google-cloud__storage-1.1.5.tgz",
+          "integrity": "sha512-c82GoxSyQZASfOTpyMx8nvpIwySR+vXnkzymya9MQR7L+60ckLQVzn6yUMnOWgTDFM7EUzk79X5p8uSDx9jDVw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "imurmurhash": "0.1.4",
-            "slide": "1.1.6"
+            "@types/node": "8.0.33"
           }
         },
-        "xdg-basedir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
-          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+        "@types/jsonwebtoken": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz",
+          "integrity": "sha512-cVhxZfVCyTZd1P+2a+xXSR9to7hZTulNRLLCQMVfAevUqx2Ee+EgsiD/7pX8qvdXWP3nWgSoTjKRLMrIpdPVjQ==",
           "dev": true,
           "requires": {
-            "os-homedir": "1.0.2"
+            "@types/node": "8.0.33"
           }
-        }
-      }
-    },
-    "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
-    },
-    "flat-arguments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
-      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "1.1.1",
-        "as-array": "1.0.0",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isobject": "3.0.2"
-      },
-      "dependencies": {
-        "as-array": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
-          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
+        },
+        "@types/long": {
+          "version": "3.0.32",
+          "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
+          "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==",
+          "dev": true
+        },
+        "@types/node": {
+          "version": "8.0.33",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.33.tgz",
+          "integrity": "sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
           "dev": true,
           "requires": {
-            "lodash.isarguments": "2.4.1",
-            "lodash.isobject": "2.4.1",
-            "lodash.values": "2.4.1"
-          },
-          "dependencies": {
-            "lodash.isarguments": {
-              "version": "2.4.1",
-              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
-              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
-              "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"
-              }
-            }
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
           }
         },
-        "lodash.isobject": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
-        }
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "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"
-      }
-    },
-    "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.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "dev": true,
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true,
-      "optional": true
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "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": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "jsonfile": "3.0.1",
-        "universalify": "0.1.1"
-      },
-      "dependencies": {
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11"
-          }
-        }
-      }
-    },
-    "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.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.39"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
         },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
+        "arguejs": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/arguejs/-/arguejs-0.2.3.tgz",
+          "integrity": "sha1-tvk59f4OPNHz+T4qqSYkJL8xKvc=",
+          "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,
-          "optional": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "array-uniq": "1.0.3"
           }
         },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
+        "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
         },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+          "dev": true
         },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
+        "ascli": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+          "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
+            "colour": "0.7.1",
+            "optjs": "3.2.2"
           }
         },
         "asn1": {
           "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+          "dev": true
         },
         "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        },
+        "async": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "lodash": "4.17.4"
+          }
         },
         "asynckit": {
           "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+          "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+          "dev": true
         },
         "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true
         },
         "aws4": {
           "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+          "dev": true
         },
         "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "dev": true
+        },
+        "base64url": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
+          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=",
           "dev": true
         },
         "bcrypt-pbkdf": {
           "version": "1.0.1",
-          "bundled": true,
+          "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"
           }
         },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
+        "boom": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3"
+            "hoek": "4.2.0"
           }
         },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
+        "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": {
-            "hoek": "2.16.3"
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
           }
         },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
+        "buffer-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+          "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+          "dev": true
+        },
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=",
+          "dev": true
+        },
+        "bun": {
+          "version": "0.0.12",
+          "resolved": "https://registry.npmjs.org/bun/-/bun-0.0.12.tgz",
+          "integrity": "sha512-Toms18J9DqnT+IfWkwxVTB2EaBprHvjlMWrTIsfX4xbu3ZBqVBwrERU0em1IgtRe04wT+wJxMlKHZok24hrcSQ==",
           "dev": true,
           "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
+            "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
+            }
+          }
+        },
+        "bytebuffer": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+          "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+          "dev": true,
+          "requires": {
+            "long": "3.2.0"
           }
         },
-        "buffer-shims": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        },
+        "capture-stack-trace": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+          "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
           "dev": true
         },
         "caseless": {
           "version": "0.12.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
+          }
         },
         "co": {
           "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "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",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "dev": true
+        },
+        "colour": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+          "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",
           "dev": true
         },
         "combined-stream": {
           "version": "1.0.5",
-          "bundled": true,
+          "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"
@@ -4694,176 +5044,258 @@
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true
         },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "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"
+          }
         },
-        "core-util-is": {
+        "configstore": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+          "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "4.2.0",
+            "graceful-fs": "4.1.11",
+            "make-dir": "1.0.0",
+            "unique-string": "1.0.0",
+            "write-file-atomic": "2.3.0",
+            "xdg-basedir": "3.0.0"
+          },
+          "dependencies": {
+            "dot-prop": {
+              "version": "4.2.0",
+              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+              "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+              "dev": true,
+              "requires": {
+                "is-obj": "1.0.1"
+              }
+            }
+          }
+        },
+        "core-util-is": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "dev": true
         },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
+        "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": {
-            "boom": "2.10.1"
+            "capture-stack-trace": "1.0.0"
           }
         },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
+        "cryptiles": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "assert-plus": "1.0.0"
+            "boom": "5.2.0"
           },
           "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
               "dev": true,
-              "optional": true
+              "requires": {
+                "hoek": "4.2.0"
+              }
             }
           }
         },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
+        "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
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "assert-plus": "1.0.0"
           }
         },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+          "dev": true
         },
         "delayed-stream": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+          "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
           "dev": true
         },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
+        "dot-prop": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
+          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "is-obj": "1.0.1"
+          }
         },
-        "detect-libc": {
-          "version": "1.0.2",
-          "bundled": true,
+        "duplexify": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
+          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "end-of-stream": "1.4.0",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.3",
+            "stream-shift": "1.0.0"
+          }
         },
         "ecc-jsbn": {
           "version": "0.1.1",
-          "bundled": true,
+          "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"
           }
         },
+        "ecdsa-sig-formatter": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
+          "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "end-of-stream": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+          "dev": true,
+          "requires": {
+            "once": "1.4.0"
+          }
+        },
+        "ent": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+          "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+          "dev": true
+        },
         "extend": {
           "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+          "dev": true
         },
         "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
           "dev": true
         },
+        "fast-deep-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+          "dev": true
+        },
+        "faye-websocket": {
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+          "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": "0.7.0"
+          }
+        },
         "forever-agent": {
           "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+          "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+          "dev": true
         },
         "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "asynckit": "0.4.0",
             "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
+            "mime-types": "2.1.17"
           }
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "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"
-          }
+        "functional-red-black-tree": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+          "dev": true
         },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
+        "gcp-metadata": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+          "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
+            "extend": "3.0.1",
+            "retry-request": "3.0.0"
           }
         },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
+        "gcs-resumable-upload": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+          "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
           "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"
+            "buffer-equal": "1.0.0",
+            "configstore": "3.1.1",
+            "google-auto-auth": "0.7.2",
+            "pumpify": "1.3.5",
+            "request": "2.83.0",
+            "stream-events": "1.0.2",
+            "through2": "2.0.3"
           }
         },
         "getpass": {
           "version": "0.1.7",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
           "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,
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
           "dev": true,
           "requires": {
             "fs.realpath": "1.0.0",
@@ -4874,2111 +5306,4161 @@
             "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,
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
+        "google-auth-library": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+          "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
+            "gtoken": "1.2.2",
+            "jws": "3.1.4",
+            "lodash.noop": "3.0.1",
+            "request": "2.83.0"
           }
         },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
+        "google-auto-auth": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+          "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
           "dev": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "async": "2.5.0",
+            "gcp-metadata": "0.3.1",
+            "google-auth-library": "0.10.0",
+            "request": "2.83.0"
           }
         },
-        "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,
+        "google-gax": {
+          "version": "0.14.1",
+          "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.1.tgz",
+          "integrity": "sha1-/oj7nVAw0mJ3xjUIp5r3s3F54Tk=",
           "dev": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "extend": "3.0.1",
+            "globby": "6.1.0",
+            "google-auto-auth": "0.5.4",
+            "google-proto-files": "0.13.1",
+            "grpc": "1.6.6",
+            "is-stream-ended": "0.1.3",
+            "lodash": "4.17.4",
+            "process-nextick-args": "1.0.7",
+            "protobufjs": "6.8.0",
+            "readable-stream": "2.3.3",
+            "through2": "2.0.3"
+          },
+          "dependencies": {
+            "@types/node": {
+              "version": "7.0.43",
+              "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
+              "integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==",
+              "dev": true
+            },
+            "google-auto-auth": {
+              "version": "0.5.4",
+              "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.5.4.tgz",
+              "integrity": "sha1-HYbHko1jPnWpwasDSlJ+/M5KQLE=",
+              "dev": true,
+              "requires": {
+                "async": "2.5.0",
+                "google-auth-library": "0.10.0",
+                "object-assign": "3.0.0",
+                "request": "2.83.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
+            },
+            "protobufjs": {
+              "version": "6.8.0",
+              "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
+              "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+              "dev": true,
+              "requires": {
+                "@protobufjs/aspromise": "1.1.2",
+                "@protobufjs/base64": "1.1.2",
+                "@protobufjs/codegen": "2.0.4",
+                "@protobufjs/eventemitter": "1.1.0",
+                "@protobufjs/fetch": "1.1.0",
+                "@protobufjs/float": "1.0.2",
+                "@protobufjs/inquire": "1.1.0",
+                "@protobufjs/path": "1.1.2",
+                "@protobufjs/pool": "1.1.0",
+                "@protobufjs/utf8": "1.1.0",
+                "@types/long": "3.0.32",
+                "@types/node": "7.0.43",
+                "long": "3.2.0"
+              }
+            }
           }
         },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
+        "google-p12-pem": {
           "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+          "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "node-forge": "0.7.1"
           }
         },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "google-proto-files": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
+          "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
+          "dev": true
         },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "graceful-fs": {
+          "version": "4.1.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+          "dev": true
         },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
+        "grpc": {
+          "version": "1.6.6",
+          "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.6.6.tgz",
+          "integrity": "sha1-IFF4T2vWE0aB+ixLXnXcgsbCP/o=",
           "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"
+            "arguejs": "0.2.3",
+            "lodash": "4.17.4",
+            "nan": "2.7.0",
+            "node-pre-gyp": "0.6.38",
+            "protobufjs": "5.0.2"
           },
           "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
+            "abbrev": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+              "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+              "dev": true
+            },
+            "ajv": {
+              "version": "4.11.8",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+              "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
               "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.39",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "1.0.2",
-            "hawk": "3.1.3",
-            "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": {
+              "requires": {
+                "co": "4.6.0",
+                "json-stable-stringify": "1.0.1"
+              }
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "aproba": {
               "version": "1.2.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+              "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+              "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,
-              "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,
-          "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": {
+              "requires": {
+                "delegates": "1.0.0",
+                "readable-stream": "2.3.3"
+              }
+            },
+            "asn1": {
+              "version": "0.2.3",
+              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+              "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+              "dev": true
+            },
             "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
+            },
+            "asynckit": {
+              "version": "0.4.0",
+              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+              "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+              "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
+            },
+            "balanced-match": {
               "version": "1.0.0",
-              "bundled": true,
+              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+              "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
-            }
-          }
-        },
-        "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.2"
-      }
-    },
-    "fstream-ignore": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-      "dev": true,
-      "requires": {
-        "fstream": "1.0.11",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4"
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "gather-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
-      "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.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
-      }
-    },
-    "gaze": {
-      "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"
-      }
-    },
-    "gcp-metadata": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
-      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.1",
-        "retry-request": "3.1.1"
-      }
-    },
-    "gcs-resumable-upload": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
-      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "1.0.0",
-        "configstore": "3.1.1",
-        "google-auto-auth": "0.7.2",
-        "pumpify": "1.3.5",
-        "request": "2.83.0",
-        "stream-events": "1.0.2",
-        "through2": "2.0.3"
-      }
-    },
-    "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-amd-module-type": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz",
-      "integrity": "sha1-5nHsWpatX79To6IqKJ6SOMdy3bA=",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "2.3.2",
-        "node-source-walk": "3.3.0"
-      }
-    },
-    "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.1",
-        "through2": "2.0.3"
-      }
-    },
-    "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"
-      }
-    },
-    "git-raw-commits": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz",
-      "integrity": "sha1-C8hZbpDV/+c29/VUa9LRL3OrqsY=",
-      "dev": true,
-      "requires": {
-        "dargs": "4.1.0",
-        "lodash.template": "4.4.0",
-        "meow": "3.7.0",
-        "split2": "2.2.0",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
-    "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"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "git-semver-tags": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz",
-      "integrity": "sha1-GItFOIK/nXojr9Mbq6U32rc4jV0=",
-      "dev": true,
-      "requires": {
-        "meow": "3.7.0",
-        "semver": "5.4.1"
-      }
-    },
-    "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"
-      }
-    },
-    "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-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-slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
-      "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U=",
-      "dev": true
-    },
-    "glob-slasher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
-      "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
-      "dev": true,
-      "requires": {
-        "glob-slash": "1.0.0",
-        "lodash.isobject": "2.4.1",
-        "toxic": "1.0.0"
-      }
-    },
-    "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=",
+              "optional": true,
+              "requires": {
+                "tweetnacl": "0.14.5"
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "caseless": {
+              "version": "0.12.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+              "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+              "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
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "extend": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+              "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+              "dev": true
+            },
+            "extsprintf": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+              "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+              "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
+            },
+            "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.17"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+              "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.2"
+              }
+            },
+            "fstream-ignore": {
+              "version": "1.0.5",
+              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+              "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+              "dev": true,
+              "requires": {
+                "fstream": "1.0.11",
+                "inherits": "2.0.3",
+                "minimatch": "3.0.4"
+              }
+            },
+            "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.2.0",
+                "console-control-strings": "1.1.0",
+                "has-unicode": "2.0.1",
+                "object-assign": "4.1.1",
+                "signal-exit": "3.0.2",
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wide-align": "1.1.2"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "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"
+              }
+            },
+            "graceful-fs": {
+              "version": "4.1.11",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+              "dev": true
+            },
+            "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": "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"
+              }
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            },
+            "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.1",
+                "sshpk": "1.13.1"
+              }
+            },
+            "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
+            },
+            "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-typedarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+              "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+              "dev": true
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+              "dev": true
+            },
+            "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
+            },
+            "jsbn": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+              "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+              "dev": true,
+              "optional": 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
+            },
+            "jsonify": {
+              "version": "0.0.0",
+              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+              "dev": true
+            },
+            "jsprim": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+              "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+              "dev": true,
+              "requires": {
+                "assert-plus": "1.0.0",
+                "extsprintf": "1.3.0",
+                "json-schema": "0.2.3",
+                "verror": "1.10.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
+                }
+              }
+            },
+            "mime-db": {
+              "version": "1.30.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+              "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+              "dev": true
+            },
+            "mime-types": {
+              "version": "2.1.17",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+              "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+              "dev": true,
+              "requires": {
+                "mime-db": "1.30.0"
+              }
+            },
+            "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=",
+              "dev": true
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "dev": true,
+              "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=",
+                  "dev": true
+                }
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            },
+            "node-pre-gyp": {
+              "version": "0.6.38",
+              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz",
+              "integrity": "sha1-6Sog+DQWQVu0CG9tH7eLPac9ET0=",
+              "dev": true,
+              "requires": {
+                "hawk": "3.1.3",
+                "mkdirp": "0.5.1",
+                "nopt": "4.0.1",
+                "npmlog": "4.1.2",
+                "rc": "1.2.1",
+                "request": "2.81.0",
+                "rimraf": "2.6.2",
+                "semver": "5.4.1",
+                "tar": "2.2.1",
+                "tar-pack": "3.4.0"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "dev": true,
+              "requires": {
+                "abbrev": "1.1.1",
+                "osenv": "0.1.4"
+              }
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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"
+              }
+            },
+            "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-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"
+              }
+            },
+            "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
+            },
+            "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
+            },
+            "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
+            },
+            "punycode": {
+              "version": "1.4.1",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+              "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
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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.17",
+                "oauth-sign": "0.8.2",
+                "performance-now": "0.2.0",
+                "qs": "6.4.0",
+                "safe-buffer": "5.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.3",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.2",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+              "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+              "dev": true,
+              "requires": {
+                "glob": "7.1.2"
+              }
+            },
+            "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
+            },
+            "semver": {
+              "version": "5.4.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+              "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+              "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
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+              "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+              "dev": true
+            },
+            "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"
+              }
+            },
+            "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
+                }
+              }
+            },
+            "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"
+              }
+            },
+            "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"
+              }
+            },
+            "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-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
+            },
+            "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"
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "dev": true,
+              "requires": {
+                "debug": "2.6.9",
+                "fstream": "1.0.11",
+                "fstream-ignore": "1.0.5",
+                "once": "1.4.0",
+                "readable-stream": "2.3.3",
+                "rimraf": "2.6.2",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              }
+            },
+            "tough-cookie": {
+              "version": "2.3.3",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+              "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+              "dev": true,
+              "requires": {
+                "punycode": "1.4.1"
+              }
+            },
+            "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"
+              }
+            },
+            "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
+            },
+            "uid-number": {
+              "version": "0.0.6",
+              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+              "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+              "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
+            },
+            "uuid": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+              "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+              "dev": true
+            },
+            "verror": {
+              "version": "1.10.0",
+              "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+              "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+              "dev": true,
+              "requires": {
+                "assert-plus": "1.0.0",
+                "core-util-is": "1.0.2",
+                "extsprintf": "1.3.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
+                }
+              }
+            },
+            "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"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+              "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+              "dev": true
+            }
+          }
+        },
+        "gtoken": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
+          "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "2.0.10",
-            "once": "1.4.0"
+            "google-p12-pem": "0.1.2",
+            "jws": "3.1.4",
+            "mime": "1.4.1",
+            "request": "2.83.0"
           }
         },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
           "dev": true
         },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.8"
+            "ajv": "5.2.3",
+            "har-schema": "2.0.0"
           }
         },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+        "hash-stream-validation": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
+          "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "through2": "2.0.3"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "hawk": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+          "dev": true,
+          "requires": {
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.0",
+            "sntp": "2.0.2"
+          }
+        },
+        "hoek": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
           "dev": true
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "http-parser-js": {
+          "version": "0.4.9",
+          "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+          "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.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"
-      }
-    },
-    "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.3.0"
-      }
-    },
-    "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+        },
+        "imurmurhash": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
           "dev": true
-        }
-      }
-    },
-    "globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "globs": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.3.tgz",
-      "integrity": "sha1-ZwA3ElKHy2VJqtlqRM+mhP18VQI=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2"
-      }
-    },
-    "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"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "3.1.21",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "requires": {
-            "graceful-fs": "1.2.3",
-            "inherits": "1.0.2",
-            "minimatch": "0.2.14"
+            "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
+        },
+        "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
+        },
+        "is": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
+          "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
+          "dev": true
+        },
+        "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"
           }
         },
-        "graceful-fs": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-          "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
+        "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-stream-ended": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz",
+          "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=",
           "dev": true
         },
-        "inherits": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
+        "is-typedarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+          "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
           "dev": true
         },
-        "lodash": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "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=",
+        "isemail": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz",
+          "integrity": "sha1-vgPfjMPineTSxd9lASY/H6RZXpo=",
           "dev": true
         },
-        "minimatch": {
-          "version": "0.2.14",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+        "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
+        },
+        "joi": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
+          "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
           "dev": true,
           "requires": {
-            "lru-cache": "2.7.3",
-            "sigmund": "1.0.1"
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            }
           }
-        }
-      }
-    },
-    "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"
-      }
-    },
-    "gm": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/gm/-/gm-1.21.1.tgz",
-      "integrity": "sha1-ftXtBds20wwZQ/OcO8HIObjyNh0=",
-      "dev": true,
-      "requires": {
-        "array-parallel": "0.1.3",
-        "array-series": "0.1.5",
-        "debug": "2.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+          "dev": true,
+          "optional": 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-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "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": {
-            "ms": "0.7.1"
+            "jsonify": "0.0.0"
           }
         },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+        "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
-        }
-      }
-    },
-    "gonzales-pe": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
-      "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
-      "dev": true,
-      "requires": {
-        "minimist": "1.1.3"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
-          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
           "dev": true
-        }
-      }
-    },
-    "google-auth-library": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
-      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
-      "dev": true,
-      "requires": {
-        "gtoken": "1.2.3",
-        "jws": "3.1.4",
-        "lodash.noop": "3.0.1",
-        "request": "2.83.0"
-      }
-    },
-    "google-auto-auth": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
-      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
-      "dev": true,
-      "requires": {
-        "async": "2.6.0",
-        "gcp-metadata": "0.3.1",
-        "google-auth-library": "0.10.0",
-        "request": "2.83.0"
-      }
-    },
-    "google-closure-compiler": {
-      "version": "20170409.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20170409.0.0.tgz",
-      "integrity": "sha1-3Bvimp9+74YRNkUzsnG5+sdXyXA=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "vinyl": "2.1.0",
-        "vinyl-sourcemaps-apply": "0.2.1"
-      }
-    },
-    "google-gax": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.14.2.tgz",
-      "integrity": "sha1-Kx8rhui+mKYgBBzucQ5PTOYbbis=",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.1",
-        "globby": "6.1.0",
-        "google-auto-auth": "0.7.2",
-        "google-proto-files": "0.13.1",
-        "grpc": "1.7.1",
-        "is-stream-ended": "0.1.3",
-        "lodash": "4.17.4",
-        "process-nextick-args": "1.0.7",
-        "protobufjs": "6.8.0",
-        "readable-stream": "2.3.3",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "protobufjs": {
-          "version": "6.8.0",
-          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.0.tgz",
-          "integrity": "sha512-47Y49f5JN5Qsbxas2TyI2zFO8j9GpQAQm5thf54fr2O8qcP/jkIXYxmYx1hN2WQFAhESU1xpVn5NWVDBB8WFnw==",
+        },
+        "jsonwebtoken": {
+          "version": "7.1.9",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz",
+          "integrity": "sha1-hHgE5SWL7FqUmajcSl56O64I1Yo=",
           "dev": true,
           "requires": {
-            "@protobufjs/aspromise": "1.1.2",
-            "@protobufjs/base64": "1.1.2",
-            "@protobufjs/codegen": "2.0.4",
-            "@protobufjs/eventemitter": "1.1.0",
-            "@protobufjs/fetch": "1.1.0",
-            "@protobufjs/float": "1.0.2",
-            "@protobufjs/inquire": "1.1.0",
-            "@protobufjs/path": "1.1.2",
-            "@protobufjs/pool": "1.1.0",
-            "@protobufjs/utf8": "1.1.0",
-            "@types/long": "3.0.32",
-            "@types/node": "7.0.46",
-            "long": "3.2.0"
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "0.7.3",
+            "xtend": "4.0.1"
           }
-        }
-      }
-    },
-    "google-p12-pem": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
-      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.7.1"
-      }
-    },
-    "google-proto-files": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.13.1.tgz",
-      "integrity": "sha512-CivI3rZ85dMPTCAyxq6lq9s7vDkeWEIFxweopC1vEjjRmFMJwOX/MOmFZ90a0BGal/Dsb63vq7Ael9ryeokz0g==",
-      "dev": true
-    },
-    "googleapis": {
-      "version": "22.2.0",
-      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-22.2.0.tgz",
-      "integrity": "sha1-/XnDwm5+caT1ouwafaX7EV2IU9I=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "async": "2.3.0",
-        "google-auth-library": "0.10.0",
-        "string-template": "1.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
-          "integrity": "sha1-EBPRBRBH3TIP4k5JTVxm7K9hR9k=",
+        },
+        "jsprim": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+          "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "lodash": "4.17.4"
-          }
-        }
-      }
-    },
-    "got": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
-      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "decompress-response": "3.3.0",
-        "duplexer3": "0.1.4",
-        "get-stream": "3.0.0",
-        "is-plain-obj": "1.1.0",
-        "is-retry-allowed": "1.1.0",
-        "is-stream": "1.1.0",
-        "isurl": "1.0.0",
-        "lowercase-keys": "1.0.0",
-        "p-cancelable": "0.3.0",
-        "p-timeout": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "timed-out": "4.0.1",
-        "url-parse-lax": "1.0.0",
-        "url-to-options": "1.0.1"
-      }
-    },
-    "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
-    },
-    "graphviz": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
-      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
-      "dev": true,
-      "requires": {
-        "temp": "0.4.0"
-      }
-    },
-    "grpc": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.1.tgz",
-      "integrity": "sha512-lMgjZUzJx09VL5iCfs7rFagE5htikdv/9VzX/ji3zuwlzAhijqcU47bi5N5lbVw/UB2fxneeYg8sBTfQfd0c4A==",
-      "dev": true,
-      "requires": {
-        "arguejs": "0.2.3",
-        "lodash": "4.17.4",
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.39",
-        "protobufjs": "5.0.2"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.3.0",
+            "json-schema": "0.2.3",
+            "verror": "1.10.0"
+          }
         },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
+        "jwa": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
+          "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
           "dev": true,
           "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
           }
         },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true
+        "jws": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
+          "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+          "dev": true,
+          "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+          }
         },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
+        "lcid": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
           "dev": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.3"
+            "invert-kv": "1.0.0"
           }
         },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
+        "lodash": {
+          "version": "4.17.4",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
           "dev": true
         },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
+        "lodash.noop": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz",
+          "integrity": "sha1-OBiPTWUKOkdCWEObluxFsyYXEzw=",
           "dev": true
         },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=",
           "dev": true
         },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
+        "log-driver": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz",
+          "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=",
           "dev": true
         },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
+        "long": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+          "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
           "dev": true
         },
-        "balanced-match": {
+        "make-dir": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+          "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "methmeth": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz",
+          "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=",
           "dev": true
         },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "tweetnacl": "0.14.5"
+            "mime-db": "1.30.0"
           }
         },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": 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": {
-            "inherits": "2.0.3"
+            "brace-expansion": "1.1.8"
           }
         },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
+        "modelo": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz",
+          "integrity": "sha1-O0tCACOmbKfjK9uhbnEJN+FNGws=",
+          "dev": true
+        },
+        "moment": {
+          "version": "2.18.1",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",
+          "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
+          "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=",
+          "dev": true
+        },
+        "nan": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+          "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+          "dev": true
+        },
+        "node-forge": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+          "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
+          "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
+        },
+        "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
+        },
+        "once": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
           "requires": {
-            "hoek": "2.16.3"
+            "wrappy": "1.0.2"
           }
         },
-        "brace-expansion": {
-          "version": "1.1.8",
-          "bundled": true,
+        "optjs": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
+          "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=",
+          "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": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
+            "lcid": "1.0.0"
           }
         },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
+        "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
         },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
           "dev": true
         },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": 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": {
-            "delayed-stream": "1.0.0"
+            "pinkie": "2.0.4"
           }
         },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": 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
         },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
+        "protobufjs": {
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
+          "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
+          "dev": true,
+          "requires": {
+            "ascli": "1.0.1",
+            "bytebuffer": "5.0.1",
+            "glob": "7.1.2",
+            "yargs": "3.32.0"
+          }
         },
-        "core-util-is": {
+        "pump": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+          "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "1.4.0",
+            "once": "1.4.0"
+          }
+        },
+        "pumpify": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz",
+          "integrity": "sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs=",
+          "dev": true,
+          "requires": {
+            "duplexify": "3.5.1",
+            "inherits": "2.0.3",
+            "pump": "1.0.2"
+          }
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
         },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        },
+        "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": {
-            "boom": "2.10.1"
+            "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"
           }
         },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
+        "request": {
+          "version": "2.83.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
           "dev": true,
           "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            }
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.1",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.1",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
           }
         },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
+        "retry-request": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.0.0.tgz",
+          "integrity": "sha1-i60rHc8Ek4uyEeLO2GLlkbgvGRc=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "request": "2.83.0",
+            "through2": "2.0.3"
           }
         },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": 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
         },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": 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
         },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
+        "sntp": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
         },
-        "detect-libc": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
+        "split-array-stream": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz",
+          "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
+          "dev": true,
+          "requires": {
+            "async": "2.5.0",
+            "is-stream-ended": "0.1.3"
+          }
         },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
+        "sshpk": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+          "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "jsbn": "0.1.1"
+            "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"
           }
         },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
+        "stream-events": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
+          "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=",
+          "dev": true,
+          "requires": {
+            "stubs": "3.0.0"
+          }
+        },
+        "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
         },
-        "extsprintf": {
-          "version": "1.3.0",
-          "bundled": true,
+        "string-format-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
+          "integrity": "sha1-djVhCx7zlwE+hHi+mKFw4EmD0Gg=",
           "dev": true
         },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": 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"
+          }
+        },
+        "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"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
           "dev": true
         },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": 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": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.17"
+            "ansi-regex": "2.1.1"
           }
         },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
+        "stubs": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+          "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
           "dev": true
         },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.2"
+            "readable-stream": "2.3.3",
+            "xtend": "4.0.1"
           }
         },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
+        "topo": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
+          "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
           "dev": true,
           "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
+            "hoek": "2.16.3"
+          },
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+              "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+              "dev": true
+            }
           }
         },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
           "dev": true,
           "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "punycode": "1.4.1"
           }
         },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
+        "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": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            }
+            "safe-buffer": "5.1.1"
           }
         },
-        "glob": {
-          "version": "7.1.1",
-          "bundled": 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
+        },
+        "typedarray": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+          "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": {
-            "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"
+            "crypto-random-string": "1.0.0"
           }
         },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": 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
         },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
           "dev": true
         },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
+        "verror": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+          "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
           "dev": true,
           "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
+            "assert-plus": "1.0.0",
+            "core-util-is": "1.0.2",
+            "extsprintf": "1.3.0"
           }
         },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
+        "websocket-driver": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+          "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
           "dev": true,
           "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "http-parser-js": "0.4.9",
+            "websocket-extensions": "0.1.2"
           }
         },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
+        "websocket-extensions": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+          "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
           "dev": true
         },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
+        "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
+        },
+        "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": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.1",
-            "sshpk": "1.13.1"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1"
           }
         },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
+        "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.3.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+          "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
           "dev": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "signal-exit": "3.0.2"
           }
         },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
+        "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
         },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "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": {
-            "number-is-nan": "1.0.1"
+            "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"
           }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isarray": {
+        }
+      }
+    },
+    "firebase-tools": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/firebase-tools/-/firebase-tools-3.13.1.tgz",
+      "integrity": "sha1-LKgqXN1eiHxf6WHNgBnkqYdiX1o=",
+      "dev": true,
+      "requires": {
+        "@google-cloud/functions-emulator": "1.0.0-alpha.25",
+        "JSONStream": "1.3.1",
+        "archiver": "0.16.0",
+        "chalk": "1.1.3",
+        "cjson": "0.3.3",
+        "cli-table": "0.3.1",
+        "commander": "2.11.0",
+        "configstore": "1.4.0",
+        "cross-spawn": "4.0.2",
+        "csv-streamify": "3.0.4",
+        "didyoumean": "1.2.1",
+        "es6-set": "0.1.5",
+        "exit-code": "1.0.2",
+        "filesize": "3.5.11",
+        "firebase": "2.4.2",
+        "fs-extra": "0.23.1",
+        "fstream-ignore": "1.0.5",
+        "glob": "7.1.2",
+        "google-auto-auth": "0.7.2",
+        "inquirer": "0.12.0",
+        "jsonschema": "1.2.0",
+        "jsonwebtoken": "7.4.3",
+        "lodash": "4.17.4",
+        "open": "0.0.5",
+        "ora": "0.2.3",
+        "portfinder": "0.4.0",
+        "progress": "2.0.0",
+        "request": "2.83.0",
+        "rsvp": "3.6.2",
+        "semver": "5.4.1",
+        "superstatic": "5.0.1",
+        "tar": "3.2.1",
+        "tmp": "0.0.27",
+        "universal-analytics": "0.3.11",
+        "update-notifier": "0.5.0",
+        "user-home": "2.0.0",
+        "uuid": "3.1.0",
+        "winston": "1.1.2"
+      },
+      "dependencies": {
+        "async": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
           "dev": true
         },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true
+        "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"
+          }
         },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
+        "configstore": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
+          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
           "dev": true,
-          "optional": true
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "os-tmpdir": "1.0.2",
+            "osenv": "0.1.4",
+            "uuid": "2.0.3",
+            "write-file-atomic": "1.3.4",
+            "xdg-basedir": "2.0.0"
+          },
+          "dependencies": {
+            "uuid": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+              "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+              "dev": true
+            }
+          }
         },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true
+        "firebase": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/firebase/-/firebase-2.4.2.tgz",
+          "integrity": "sha1-ThEZ7AOWylYdinrL/xYw/qxsCjE=",
+          "dev": true,
+          "requires": {
+            "faye-websocket": "0.9.3"
+          },
+          "dependencies": {
+            "faye-websocket": {
+              "version": "0.9.3",
+              "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz",
+              "integrity": "sha1-SCpQWw3wrmJrlphm0710DNuWLoM=",
+              "dev": true,
+              "requires": {
+                "websocket-driver": "0.5.2"
+              },
+              "dependencies": {
+                "websocket-driver": {
+                  "version": "0.5.2",
+                  "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.2.tgz",
+                  "integrity": "sha1-jHyF2gcTtAYFVrTXHAF3XuEmnrk=",
+                  "dev": true,
+                  "requires": {
+                    "websocket-extensions": "0.1.1"
+                  },
+                  "dependencies": {
+                    "websocket-extensions": {
+                      "version": "0.1.1",
+                      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+                      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+                      "dev": true
+                    }
+                  }
+                }
+              }
+            }
+          }
         },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
+        "fs-extra": {
+          "version": "0.23.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.23.1.tgz",
+          "integrity": "sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=",
           "dev": true,
           "requires": {
-            "jsonify": "0.0.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "path-is-absolute": "1.0.1",
+            "rimraf": "2.6.1"
           }
         },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
           "dev": true
         },
-        "jsprim": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.3.0",
-            "json-schema": "0.2.3",
-            "verror": "1.10.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.30.0",
-          "bundled": 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
         },
-        "mime-types": {
-          "version": "2.1.17",
-          "bundled": true,
+        "winston": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+          "integrity": "sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=",
           "dev": true,
           "requires": {
-            "mime-db": "1.30.0"
+            "async": "1.0.0",
+            "colors": "1.0.3",
+            "cycle": "1.0.3",
+            "eyes": "0.1.8",
+            "isstream": "0.1.2",
+            "pkginfo": "0.3.1",
+            "stack-trace": "0.0.10"
           }
         },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
+        "write-file-atomic": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
           "dev": true,
           "requires": {
-            "brace-expansion": "1.1.8"
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
+        "xdg-basedir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
           "dev": true,
           "requires": {
-            "minimist": "0.0.8"
+            "os-homedir": "1.0.2"
           }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.39",
-          "bundled": true,
+        }
+      }
+    },
+    "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
+    },
+    "flat-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flat-arguments/-/flat-arguments-1.0.2.tgz",
+      "integrity": "sha1-m6p4Ct8FAfKC1ybJxqA426ROp28=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "1.1.1",
+        "as-array": "1.0.0",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isobject": "3.0.2"
+      },
+      "dependencies": {
+        "as-array": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/as-array/-/as-array-1.0.0.tgz",
+          "integrity": "sha1-KKbu6qVynx9OyiBH316d4avaDtE=",
           "dev": true,
           "requires": {
-            "detect-libc": "1.0.2",
-            "hawk": "3.1.3",
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.2",
-            "rc": "1.2.2",
-            "request": "2.81.0",
-            "rimraf": "2.6.2",
-            "semver": "5.4.1",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.1"
+            "lodash.isarguments": "2.4.1",
+            "lodash.isobject": "2.4.1",
+            "lodash.values": "2.4.1"
           },
           "dependencies": {
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
+            "lodash.isarguments": {
+              "version": "2.4.1",
+              "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-2.4.1.tgz",
+              "integrity": "sha1-STGpwIJTrfCRrnyhkiWKlzh27Mo=",
+              "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": {
-                "abbrev": "1.0.9",
-                "osenv": "0.1.4"
+                "lodash._objecttypes": "2.4.1"
               }
             }
           }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
+        },
+        "lodash.isobject": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+          "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+          "dev": true
+        }
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "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"
+      }
+    },
+    "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.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true,
+      "optional": 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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          }
+        }
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "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"
+      }
+    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
+      }
+    },
+    "gather-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
+      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
+      "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.2.0",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      }
+    },
+    "gaze": {
+      "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"
+      }
+    },
+    "gcp-metadata": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz",
+      "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.1",
+        "retry-request": "3.1.0"
+      }
+    },
+    "gcs-resumable-upload": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/gcs-resumable-upload/-/gcs-resumable-upload-0.8.2.tgz",
+      "integrity": "sha512-PBl1OFABYxubxfYPh000I0+JLbQzBRtNqxzgxYboIQk2tdw7BvjJ2dVukk3YH4QM6GiUwqItyNqWBuxjLH8GhA==",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "1.0.0",
+        "configstore": "3.1.1",
+        "google-auto-auth": "0.7.2",
+        "pumpify": "1.3.5",
+        "request": "2.83.0",
+        "stream-events": "1.0.2",
+        "through2": "2.0.3"
+      }
+    },
+    "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-amd-module-type": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz",
+      "integrity": "sha1-5nHsWpatX79To6IqKJ6SOMdy3bA=",
+      "dev": true,
+      "requires": {
+        "ast-module-types": "2.3.2",
+        "node-source-walk": "3.3.0"
+      }
+    },
+    "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.1",
+        "through2": "2.0.3"
+      }
+    },
+    "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"
+      }
+    },
+    "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.2.0",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "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": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "lodash._reinterpolate": "3.0.0",
+            "lodash.templatesettings": "4.1.0"
           }
         },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
+        "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": {
-            "wrappy": "1.0.2"
+            "lodash._reinterpolate": "3.0.0"
           }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
+        }
+      }
+    },
+    "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.2",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
+      "integrity": "sha512-fhINopzKBQ8m6YlQt7gPf6T6hFnTF84O7U+8kYJmfjjKk7gbmKGj+BLcKNWi+japPbBwCeXXnfKwThpJpR9ZnQ==",
+      "dev": true,
+      "requires": {
+        "meow": "3.7.0",
+        "semver": "5.4.1"
+      }
+    },
+    "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"
+      }
+    },
+    "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-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-slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/glob-slash/-/glob-slash-1.0.0.tgz",
+      "integrity": "sha1-/lLvpDMjP3Si/mTHq7m8hIICq5U=",
+      "dev": true
+    },
+    "glob-slasher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/glob-slasher/-/glob-slasher-1.0.1.tgz",
+      "integrity": "sha1-dHoOW7IiZC7hDT4FRD4QlJPLD44=",
+      "dev": true,
+      "requires": {
+        "glob-slash": "1.0.0",
+        "lodash.isobject": "2.4.1",
+        "toxic": "1.0.0"
+      }
+    },
+    "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": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "2.0.10",
+            "once": "1.4.0"
           }
         },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         },
-        "rc": {
-          "version": "1.2.2",
-          "bundled": true,
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
           "dev": 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
-            }
+            "brace-expansion": "1.1.8"
           }
         },
         "readable-stream": {
-          "version": "2.3.3",
-          "bundled": true,
+          "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": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "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.17",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.1.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.1.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.1"
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.4.1",
-          "bundled": true,
-          "dev": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": 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
         },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.1",
-          "bundled": true,
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
           "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",
-              "bundled": true,
-              "dev": true
-            }
+            "readable-stream": "1.0.34",
+            "xtend": "4.0.1"
           }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "bundled": true,
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "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.3.0"
+      }
+    },
+    "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.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
+    "globs": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/globs/-/globs-0.1.3.tgz",
+      "integrity": "sha1-ZwA3ElKHy2VJqtlqRM+mhP18VQI=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "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"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "3.1.21",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+          "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "graceful-fs": "1.2.3",
+            "inherits": "1.0.2",
+            "minimatch": "0.2.14"
           }
         },
-        "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"
-          }
+        "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
         },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
+        "inherits": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+          "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
+        "lodash": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+          "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
+          "dev": true
         },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": 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
         },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
           "dev": true,
           "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
           }
-        },
-        "tar-pack": {
-          "version": "3.4.1",
-          "bundled": true,
+        }
+      }
+    },
+    "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"
+      }
+    },
+    "gm": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/gm/-/gm-1.21.1.tgz",
+      "integrity": "sha1-ftXtBds20wwZQ/OcO8HIObjyNh0=",
+      "dev": true,
+      "requires": {
+        "array-parallel": "0.1.3",
+        "array-series": "0.1.5",
+        "debug": "2.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
           "dev": true,
           "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.3.3",
-            "rimraf": "2.6.2",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
+            "ms": "0.7.1"
           }
         },
-        "tough-cookie": {
-          "version": "2.3.3",
-          "bundled": true,
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "gonzales-pe": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.4.7.tgz",
+      "integrity": "sha1-F8e+Z61sr/Ynej44esc26YPSgOw=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.1.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+          "dev": true
+        }
+      }
+    },
+    "google-auth-library": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
+      "integrity": "sha1-bhW6vuhf0d0U2NEoopW2g41SE24=",
+      "dev": true,
+      "requires": {
+        "gtoken": "1.2.2",
+        "jws": "3.1.4",
+        "lodash.noop": "3.0.1",
+        "request": "2.83.0"
+      }
+    },
+    "google-auto-auth": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.7.2.tgz",
+      "integrity": "sha512-ux2n2AE2g3+vcLXwL4dP/M12SFMRX5dzCzBfhAEkTeAB7dpyGdOIEj7nmUx0BHKaCcUQrRWg9kT63X/Mmtk1+A==",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "gcp-metadata": "0.3.1",
+        "google-auth-library": "0.10.0",
+        "request": "2.83.0"
+      }
+    },
+    "google-closure-compiler": {
+      "version": "20170409.0.0",
+      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20170409.0.0.tgz",
+      "integrity": "sha1-3Bvimp9+74YRNkUzsnG5+sdXyXA=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "vinyl": "2.1.0",
+        "vinyl-sourcemaps-apply": "0.2.1"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "punycode": "1.4.1"
+            "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"
           }
         },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": 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
+        }
+      }
+    },
+    "google-p12-pem": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz",
+      "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.1"
+      }
+    },
+    "google-proto-files": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.12.1.tgz",
+      "integrity": "sha512-d+BiTMpYP4/pN+Kgi0lWE+2/GaVN4jy8LCabjo2Wd16Ykm5oRO5bI40bo8u2U4rN/GpZkMyfxZAjWVPRjGe3nQ==",
+      "dev": true,
+      "optional": true
+    },
+    "googleapis": {
+      "version": "20.1.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-20.1.0.tgz",
+      "integrity": "sha512-UZYpUKPcwt28tZIvC+sT7yHtl56bMxnePNJBtZ3tG0OrQ1KegukirKRRuIxPavNCOcVC/ka5j/RRDhEIrYf5UA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "2.3.0",
+        "google-auth-library": "0.10.0",
+        "string-template": "1.0.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
+          "integrity": "sha1-EBPRBRBH3TIP4k5JTVxm7K9hR9k=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "lodash": "4.17.4"
           }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "verror": {
-          "version": "1.10.0",
-          "bundled": true,
+        }
+      }
+    },
+    "got": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "decompress-response": "3.3.0",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-plain-obj": "1.1.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "isurl": "1.0.0",
+        "lowercase-keys": "1.0.0",
+        "p-cancelable": "0.3.0",
+        "p-timeout": "1.2.0",
+        "safe-buffer": "5.1.1",
+        "timed-out": "4.0.1",
+        "url-parse-lax": "1.0.0",
+        "url-to-options": "1.0.1"
+      }
+    },
+    "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
+    },
+    "graphviz": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
+      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
+      "dev": true,
+      "requires": {
+        "temp": "0.4.0"
+      }
+    },
+    "grpc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.4.1.tgz",
+      "integrity": "sha1-PuSoNGphPygjkoyfj5kIG2No7Hw=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "arguejs": "0.2.3",
+        "lodash": "4.17.4",
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.36",
+        "protobufjs": "5.0.2"
+      },
+      "dependencies": {
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz",
+          "integrity": "sha1-22BBEst04NR3VU6bUFsXq936t4Y=",
           "dev": true,
+          "optional": true,
           "requires": {
-            "assert-plus": "1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "1.3.0"
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.2",
+            "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"
           },
           "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
+            "mkdirp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "dev": true,
+              "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=",
+                  "dev": true
+                }
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1.1.0",
+                "osenv": "0.1.4"
+              },
+              "dependencies": {
+                "abbrev": {
+                  "version": "1.1.0",
+                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+                  "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+                  "dev": true,
+                  "optional": true
+                },
+                "osenv": {
+                  "version": "0.1.4",
+                  "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+                  "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "os-homedir": "1.0.2",
+                    "os-tmpdir": "1.0.2"
+                  },
+                  "dependencies": {
+                    "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,
+                      "optional": true
+                    },
+                    "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,
+                      "optional": true
+                    }
+                  }
+                }
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+              "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+              "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"
+              },
+              "dependencies": {
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "delegates": "1.0.0",
+                    "readable-stream": "2.3.2"
+                  },
+                  "dependencies": {
+                    "delegates": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+                      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "readable-stream": {
+                      "version": "2.3.2",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
+                      "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
+                      "dev": true,
+                      "optional": 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"
+                      },
+                      "dependencies": {
+                        "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,
+                          "optional": true
+                        },
+                        "inherits": {
+                          "version": "2.0.3",
+                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                          "dev": true,
+                          "optional": true
+                        },
+                        "isarray": {
+                          "version": "1.0.0",
+                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+                          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+                          "dev": true,
+                          "optional": 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,
+                          "optional": true
+                        },
+                        "safe-buffer": {
+                          "version": "5.1.1",
+                          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+                          "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+                          "dev": true
+                        },
+                        "string_decoder": {
+                          "version": "1.0.3",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+                          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+                          "dev": true,
+                          "optional": true,
+                          "requires": {
+                            "safe-buffer": "5.1.1"
+                          }
+                        },
+                        "util-deprecate": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+                          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+                          "dev": true,
+                          "optional": true
+                        }
+                      }
+                    }
+                  }
+                },
+                "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
+                },
+                "gauge": {
+                  "version": "2.7.4",
+                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+                  "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+                  "dev": true,
+                  "optional": 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"
+                  },
+                  "dependencies": {
+                    "aproba": {
+                      "version": "1.1.2",
+                      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+                      "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "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,
+                      "optional": 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,
+                      "optional": 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,
+                      "optional": 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"
+                      },
+                      "dependencies": {
+                        "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
+                        },
+                        "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"
+                          },
+                          "dependencies": {
+                            "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
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "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"
+                      },
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.1.1",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+                          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+                          "dev": true
+                        }
+                      }
+                    },
+                    "wide-align": {
+                      "version": "1.1.2",
+                      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+                      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "string-width": "1.0.2"
+                      }
+                    }
+                  }
+                },
+                "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,
+                  "optional": true
+                }
+              }
+            },
+            "rc": {
+              "version": "1.2.1",
+              "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
+              "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
+              "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": {
+                "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,
+                  "optional": true
+                },
+                "ini": {
+                  "version": "1.3.4",
+                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+                  "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+                  "dev": true,
+                  "optional": true
+                },
+                "minimist": {
+                  "version": "1.2.0",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                  "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                  "dev": true,
+                  "optional": true
+                },
+                "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,
+                  "optional": true
+                }
+              }
+            },
+            "request": {
+              "version": "2.81.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+              "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+              "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.1.1",
+                "stringstream": "0.0.5",
+                "tough-cookie": "2.3.2",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.1.0"
+              },
+              "dependencies": {
+                "aws-sign2": {
+                  "version": "0.6.0",
+                  "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+                  "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+                  "dev": true,
+                  "optional": true
+                },
+                "aws4": {
+                  "version": "1.6.0",
+                  "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+                  "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+                  "dev": true,
+                  "optional": true
+                },
+                "caseless": {
+                  "version": "0.12.0",
+                  "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+                  "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+                  "dev": true,
+                  "optional": true
+                },
+                "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"
+                  },
+                  "dependencies": {
+                    "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
+                    }
+                  }
+                },
+                "extend": {
+                  "version": "3.0.1",
+                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+                  "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+                  "dev": true,
+                  "optional": 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,
+                  "optional": 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,
+                  "optional": true,
+                  "requires": {
+                    "asynckit": "0.4.0",
+                    "combined-stream": "1.0.5",
+                    "mime-types": "2.1.15"
+                  },
+                  "dependencies": {
+                    "asynckit": {
+                      "version": "0.4.0",
+                      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+                      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "ajv": "4.11.8",
+                    "har-schema": "1.0.5"
+                  },
+                  "dependencies": {
+                    "ajv": {
+                      "version": "4.11.8",
+                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+                      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "co": "4.6.0",
+                        "json-stable-stringify": "1.0.1"
+                      },
+                      "dependencies": {
+                        "co": {
+                          "version": "4.6.0",
+                          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+                          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+                          "dev": true,
+                          "optional": 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,
+                          "optional": true,
+                          "requires": {
+                            "jsonify": "0.0.0"
+                          },
+                          "dependencies": {
+                            "jsonify": {
+                              "version": "0.0.0",
+                              "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+                              "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+                              "dev": true,
+                              "optional": true
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "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,
+                      "optional": true
+                    }
+                  }
+                },
+                "hawk": {
+                  "version": "3.1.3",
+                  "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+                  "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "boom": "2.10.1",
+                    "cryptiles": "2.0.5",
+                    "hoek": "2.16.3",
+                    "sntp": "1.0.9"
+                  },
+                  "dependencies": {
+                    "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"
+                      }
+                    },
+                    "cryptiles": {
+                      "version": "2.0.5",
+                      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+                      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "boom": "2.10.1"
+                      }
+                    },
+                    "hoek": {
+                      "version": "2.16.3",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+                      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+                      "dev": true
+                    },
+                    "sntp": {
+                      "version": "1.0.9",
+                      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+                      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "hoek": "2.16.3"
+                      }
+                    }
+                  }
+                },
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "assert-plus": "0.2.0",
+                    "jsprim": "1.4.0",
+                    "sshpk": "1.13.1"
+                  },
+                  "dependencies": {
+                    "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,
+                      "optional": true
+                    },
+                    "jsprim": {
+                      "version": "1.4.0",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+                      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+                      "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",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                          "dev": true,
+                          "optional": true
+                        },
+                        "extsprintf": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+                          "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+                          "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,
+                          "optional": 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,
+                          "optional": true,
+                          "requires": {
+                            "extsprintf": "1.0.2"
+                          }
+                        }
+                      }
+                    },
+                    "sshpk": {
+                      "version": "1.13.1",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+                      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+                      "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",
+                        "jsbn": "0.1.1",
+                        "tweetnacl": "0.14.5"
+                      },
+                      "dependencies": {
+                        "asn1": {
+                          "version": "0.2.3",
+                          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+                          "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+                          "dev": true,
+                          "optional": true
+                        },
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                          "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"
+                          }
+                        },
+                        "dashdash": {
+                          "version": "1.14.1",
+                          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+                          "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+                          "dev": true,
+                          "optional": true,
+                          "requires": {
+                            "assert-plus": "1.0.0"
+                          }
+                        },
+                        "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"
+                          }
+                        },
+                        "getpass": {
+                          "version": "0.1.7",
+                          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+                          "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+                          "dev": true,
+                          "optional": true,
+                          "requires": {
+                            "assert-plus": "1.0.0"
+                          }
+                        },
+                        "jsbn": {
+                          "version": "0.1.1",
+                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+                          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+                          "dev": true,
+                          "optional": 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
+                        }
+                      }
+                    }
+                  }
+                },
+                "is-typedarray": {
+                  "version": "1.0.0",
+                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+                  "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+                  "dev": true,
+                  "optional": true
+                },
+                "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,
+                  "optional": true
+                },
+                "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,
+                  "optional": 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"
+                  },
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.27.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+                      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+                      "dev": true
+                    }
+                  }
+                },
+                "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,
+                  "optional": 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,
+                  "optional": 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,
+                  "optional": true
+                },
+                "safe-buffer": {
+                  "version": "5.1.1",
+                  "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+                  "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+                  "dev": true
+                },
+                "stringstream": {
+                  "version": "0.0.5",
+                  "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+                  "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+                  "dev": true,
+                  "optional": true
+                },
+                "tough-cookie": {
+                  "version": "2.3.2",
+                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+                  "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "punycode": "1.4.1"
+                  },
+                  "dependencies": {
+                    "punycode": {
+                      "version": "1.4.1",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+                      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "tunnel-agent": {
+                  "version": "0.6.0",
+                  "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+                  "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "safe-buffer": "5.1.1"
+                  }
+                },
+                "uuid": {
+                  "version": "3.1.0",
+                  "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+                  "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "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.1.2"
+              },
+              "dependencies": {
+                "glob": {
+                  "version": "7.1.2",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+                  "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+                  "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"
+                  },
+                  "dependencies": {
+                    "fs.realpath": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+                      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+                      "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"
+                      },
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                          "dev": true
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true
+                    },
+                    "minimatch": {
+                      "version": "3.0.4",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+                      "dev": true,
+                      "requires": {
+                        "brace-expansion": "1.1.8"
+                      },
+                      "dependencies": {
+                        "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"
+                          },
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "1.0.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+                              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+                              "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
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "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"
+                      },
+                      "dependencies": {
+                        "wrappy": {
+                          "version": "1.0.2",
+                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                          "dev": true
+                        }
+                      }
+                    },
+                    "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
+                    }
+                  }
+                }
+              }
+            },
+            "semver": {
+              "version": "5.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+              "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+              "dev": true,
+              "optional": 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"
+              },
+              "dependencies": {
+                "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"
+                  }
+                },
+                "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"
+                  },
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.11",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                      "dev": true
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.3",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                  "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                  "dev": true
+                }
+              }
+            },
+            "tar-pack": {
+              "version": "3.4.0",
+              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
+              "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
+              "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.3.2",
+                "rimraf": "2.6.1",
+                "tar": "2.2.1",
+                "uid-number": "0.0.6"
+              },
+              "dependencies": {
+                "debug": {
+                  "version": "2.6.8",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+                  "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "ms": "2.0.0"
+                  },
+                  "dependencies": {
+                    "ms": {
+                      "version": "2.0.0",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                      "dev": true,
+                      "optional": 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"
+                  },
+                  "dependencies": {
+                    "graceful-fs": {
+                      "version": "4.1.11",
+                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+                      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                      "dev": true
+                    },
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true
+                    }
+                  }
+                },
+                "fstream-ignore": {
+                  "version": "1.0.5",
+                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+                  "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "fstream": "1.0.11",
+                    "inherits": "2.0.3",
+                    "minimatch": "3.0.4"
+                  },
+                  "dependencies": {
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "minimatch": {
+                      "version": "3.0.4",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+                      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "brace-expansion": "1.1.8"
+                      },
+                      "dependencies": {
+                        "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,
+                          "optional": true,
+                          "requires": {
+                            "balanced-match": "1.0.0",
+                            "concat-map": "0.0.1"
+                          },
+                          "dependencies": {
+                            "balanced-match": {
+                              "version": "1.0.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+                              "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+                              "dev": true,
+                              "optional": 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,
+                              "optional": true
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "once": {
+                  "version": "1.4.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+                  "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+                  "dev": true,
+                  "optional": true,
+                  "requires": {
+                    "wrappy": "1.0.2"
+                  },
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.2",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "readable-stream": {
+                  "version": "2.3.2",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz",
+                  "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=",
+                  "dev": true,
+                  "optional": 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"
+                  },
+                  "dependencies": {
+                    "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,
+                      "optional": true
+                    },
+                    "inherits": {
+                      "version": "2.0.3",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+                      "dev": true,
+                      "optional": true
+                    },
+                    "isarray": {
+                      "version": "1.0.0",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+                      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+                      "dev": true,
+                      "optional": 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,
+                      "optional": true
+                    },
+                    "safe-buffer": {
+                      "version": "5.1.1",
+                      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+                      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
+                      "dev": true
+                    },
+                    "string_decoder": {
+                      "version": "1.0.3",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+                      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+                      "dev": true,
+                      "optional": true,
+                      "requires": {
+                        "safe-buffer": "5.1.1"
+                      }
+                    },
+                    "util-deprecate": {
+                      "version": "1.0.2",
+                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+                      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+                      "dev": true,
+                      "optional": true
+                    }
+                  }
+                },
+                "uid-number": {
+                  "version": "0.0.6",
+                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
+                  "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
+                  "dev": true,
+                  "optional": true
+                }
+              }
             }
           }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
         }
       }
     },
     "gtoken": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz",
-      "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.2.tgz",
+      "integrity": "sha1-Fyd2oanZasCfwioA9b6DzubeiCA=",
       "dev": true,
       "requires": {
         "google-p12-pem": "0.1.2",
@@ -7008,11 +9490,30 @@
         "vinyl-fs": "0.3.14"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "semver": {
           "version": "4.3.6",
           "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
           "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
         }
       }
     },
@@ -7023,7 +9524,7 @@
       "dev": true,
       "requires": {
         "gulp-util": "2.2.20",
-        "rimraf": "2.6.2",
+        "rimraf": "2.6.1",
         "through2": "0.4.2"
       },
       "dependencies": {
@@ -7266,6 +9767,27 @@
         "v8flags": "2.1.1",
         "wreck": "6.3.0",
         "yargs": "3.32.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "gulp-connect": {
@@ -7568,12 +10090,6 @@
             }
           }
         },
-        "utils-merge": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
-          "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
-          "dev": true
-        },
         "vary": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz",
@@ -7583,14 +10099,14 @@
       }
     },
     "gulp-conventional-changelog": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.7.tgz",
-      "integrity": "sha1-Azf2hLSeKTWOYj4W6UtJ8FotK/E=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/gulp-conventional-changelog/-/gulp-conventional-changelog-1.1.6.tgz",
+      "integrity": "sha512-zJ3ZfEukUqzLmFTWA5r8k9D4UAsymq+zsgINJmTRhw+H6Q1O9iCgREeye0gxicmusm6z6jI0fz5wLvlS66cmFg==",
       "dev": true,
       "requires": {
         "add-stream": "1.0.0",
         "concat-stream": "1.6.0",
-        "conventional-changelog": "1.1.7",
+        "conventional-changelog": "1.1.6",
         "gulp-util": "3.0.8",
         "object-assign": "4.1.1",
         "through2": "2.0.3"
@@ -7607,10 +10123,23 @@
         "through2": "2.0.1"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "clone": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
           "dev": true
         },
         "clone-stats": {
@@ -7687,6 +10216,12 @@
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "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
+        },
         "through2": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
@@ -7703,7 +10238,7 @@
           "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
           "dev": true,
           "requires": {
-            "clone": "1.0.3",
+            "clone": "1.0.2",
             "clone-stats": "0.0.1",
             "replace-ext": "0.0.1"
           }
@@ -7790,7 +10325,7 @@
       "requires": {
         "gulp-util": "3.0.8",
         "lodash.clonedeep": "4.5.0",
-        "node-sass": "4.6.1",
+        "node-sass": "4.5.3",
         "through2": "2.0.3",
         "vinyl-sourcemaps-apply": "0.2.1"
       }
@@ -7831,10 +10366,23 @@
         "vinyl": "0.5.3"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "clone": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-          "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
           "dev": true
         },
         "clone-stats": {
@@ -7855,13 +10403,19 @@
           "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
           "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
+        },
         "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.3",
+            "clone": "1.0.2",
             "clone-stats": "0.0.1",
             "replace-ext": "0.0.1"
           }
@@ -7924,7 +10478,7 @@
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "5.3.0",
+        "ajv": "5.2.3",
         "har-schema": "2.0.0"
       }
     },
@@ -8016,7 +10570,7 @@
         "boom": "4.3.1",
         "cryptiles": "3.1.2",
         "hoek": "4.2.0",
-        "sntp": "2.1.0"
+        "sntp": "2.0.2"
       }
     },
     "he": {
@@ -8069,12 +10623,12 @@
       "dev": true
     },
     "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz",
+      "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=",
       "dev": true,
       "requires": {
-        "whatwg-encoding": "1.0.3"
+        "whatwg-encoding": "1.0.1"
       }
     },
     "html-minifier": {
@@ -8090,7 +10644,7 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.1.9"
+        "uglify-js": "3.1.4"
       },
       "dependencies": {
         "source-map": {
@@ -8100,9 +10654,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "3.1.9",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.9.tgz",
-          "integrity": "sha512-ari2E89bD7f+fMU173NgF12JBcOhgoxeyuCs97h5K58IBENrnG9eVj2lFadrOPdqf0KifsxVmUQfzA2cHNxCZQ==",
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.4.tgz",
+          "integrity": "sha512-DcbkPg11Lw2lAWpwCmQDX+qoR4JiII6ypsQmF6tscZtlxGPFAmSRUGuMoVT3/0EHqypVik/TpkH4ITiMJeQqQA==",
           "dev": true,
           "requires": {
             "commander": "2.11.0",
@@ -8183,7 +10737,7 @@
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
-        "debug": "2.6.9",
+        "debug": "2.6.7",
         "extend": "3.0.1"
       }
     },
@@ -8195,15 +10749,15 @@
       "optional": true
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
       "dev": true
     },
     "ignore": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
+      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
       "dev": true
     },
     "image-diff": {
@@ -8335,6 +10889,27 @@
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1",
         "through": "2.3.8"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "interpret": {
@@ -8350,9 +10925,9 @@
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
-      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz",
+      "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=",
       "dev": true,
       "optional": true
     },
@@ -8394,9 +10969,9 @@
       }
     },
     "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "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": {
@@ -8880,7 +11455,7 @@
       "requires": {
         "hoek": "2.16.3",
         "isemail": "1.2.0",
-        "moment": "2.19.2",
+        "moment": "2.19.1",
         "topo": "1.1.0"
       },
       "dependencies": {
@@ -8950,12 +11525,12 @@
         "acorn": "2.7.0",
         "acorn-globals": "1.0.9",
         "array-equal": "1.0.0",
-        "content-type-parser": "1.0.2",
+        "content-type-parser": "1.0.1",
         "cssom": "0.3.2",
         "cssstyle": "0.2.37",
         "escodegen": "1.9.0",
-        "html-encoding-sniffer": "1.0.2",
-        "iconv-lite": "0.4.19",
+        "html-encoding-sniffer": "1.0.1",
+        "iconv-lite": "0.4.15",
         "nwmatcher": "1.4.3",
         "parse5": "1.5.1",
         "request": "2.83.0",
@@ -8963,9 +11538,17 @@
         "symbol-tree": "3.2.2",
         "tough-cookie": "2.3.3",
         "webidl-conversions": "3.0.1",
-        "whatwg-encoding": "1.0.3",
+        "whatwg-encoding": "1.0.1",
         "whatwg-url": "3.1.0",
         "xml-name-validator": "2.0.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
+          "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
+          "dev": true
+        }
       }
     },
     "json-parse-helpfulerror": {
@@ -8989,6 +11572,15 @@
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
       "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",
@@ -9022,6 +11614,16 @@
         "through2": "0.6.5"
       },
       "dependencies": {
+        "JSONStream": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
+          "dev": true,
+          "requires": {
+            "jsonparse": "0.0.5",
+            "through": "2.3.8"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -9034,16 +11636,6 @@
           "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=",
           "dev": true
         },
-        "JSONStream": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-          "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=",
-          "dev": true,
-          "requires": {
-            "jsonparse": "0.0.5",
-            "through": "2.3.8"
-          }
-        },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
@@ -9084,6 +11676,12 @@
         }
       }
     },
+    "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",
@@ -9102,16 +11700,6 @@
       "integrity": "sha512-XDJApzBauMg0TinJNP4iVcJl99PQ4JbWKK7nwzpOIkAOVveDKgh/2xm41T3x7Spu4PWMhnnQpNJmUSIUgl6sKg==",
       "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"
-      }
-    },
     "jsonwebtoken": {
       "version": "7.4.3",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
@@ -9138,9 +11726,9 @@
       }
     },
     "jszip": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
-      "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz",
+      "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==",
       "dev": true,
       "requires": {
         "core-js": "2.3.0",
@@ -9208,7 +11796,7 @@
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
-        "body-parser": "1.18.2",
+        "body-parser": "1.17.2",
         "chokidar": "1.7.0",
         "colors": "1.1.2",
         "combine-lists": "1.0.1",
@@ -9228,7 +11816,7 @@
         "optimist": "0.6.1",
         "qjobs": "1.1.5",
         "range-parser": "1.2.0",
-        "rimraf": "2.6.2",
+        "rimraf": "2.6.1",
         "safe-buffer": "5.1.1",
         "socket.io": "1.7.3",
         "source-map": "0.5.7",
@@ -9338,7 +11926,7 @@
       "dev": true,
       "requires": {
         "q": "1.5.1",
-        "sauce-connect-launcher": "1.2.3",
+        "sauce-connect-launcher": "1.2.2",
         "saucelabs": "1.4.0",
         "wd": "1.4.1"
       },
@@ -9366,7 +11954,7 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "dev": true,
       "requires": {
-        "is-buffer": "1.1.6"
+        "is-buffer": "1.1.5"
       }
     },
     "klaw": {
@@ -9406,12 +11994,38 @@
       "dev": true
     },
     "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
+      "integrity": "sha1-GyXWPHcqTCDwpe0KnXf0hLbhaSA=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "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
+        }
       }
     },
     "lcid": {
@@ -9511,7 +12125,7 @@
         "lodash.isstring": "4.0.1",
         "lodash.mapvalues": "4.6.0",
         "rechoir": "0.6.2",
-        "resolve": "1.5.0"
+        "resolve": "1.4.0"
       }
     },
     "livereload-js": {
@@ -9521,33 +12135,16 @@
       "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=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
       "dev": true,
+      "optional": 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"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "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": "3.0.0"
       }
     },
     "locate-path": {
@@ -9867,6 +12464,27 @@
       "dev": true,
       "requires": {
         "chalk": "1.1.3"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "log4js": {
@@ -9984,6 +12602,19 @@
         "walkdir": "0.0.11"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "cli-cursor": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -10023,6 +12654,17 @@
           "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
           "dev": true
         },
+        "mz": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mz/-/mz-2.4.0.tgz",
+          "integrity": "sha1-mHupYk2JOVOIw3y0dB4sr03ROxo=",
+          "dev": true,
+          "requires": {
+            "any-promise": "1.3.0",
+            "object-assign": "4.1.1",
+            "thenify-all": "1.6.0"
+          }
+        },
         "onetime": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -10044,6 +12686,12 @@
             "log-symbols": "1.0.2"
           }
         },
+        "pluralize": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+          "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
+          "dev": true
+        },
         "rc": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
@@ -10071,6 +12719,12 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
           "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
           "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
         }
       }
     },
@@ -10084,12 +12738,12 @@
       }
     },
     "make-dir": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
-      "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
       "dev": true,
       "requires": {
-        "pify": "3.0.0"
+        "pify": "2.3.0"
       }
     },
     "make-error": {
@@ -10254,6 +12908,81 @@
         "read-pkg-up": "1.0.1",
         "redent": "1.0.0",
         "trim-newlines": "1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        }
       }
     },
     "merge-descriptors": {
@@ -10288,6 +13017,17 @@
         "methods": "1.1.2",
         "parseurl": "1.3.2",
         "vary": "1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "methods": {
@@ -10463,9 +13203,9 @@
       }
     },
     "moment": {
-      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz",
-      "integrity": "sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA==",
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
+      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=",
       "dev": true
     },
     "morgan": {
@@ -10479,6 +13219,17 @@
         "depd": "1.1.1",
         "on-finished": "2.3.0",
         "on-headers": "1.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "ms": {
@@ -10593,9 +13344,9 @@
       "optional": true
     },
     "mz": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.4.0.tgz",
-      "integrity": "sha1-mHupYk2JOVOIw3y0dB4sr03ROxo=",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
       "dev": true,
       "requires": {
         "any-promise": "1.3.0",
@@ -10702,7 +13453,7 @@
         "npmlog": "4.1.2",
         "osenv": "0.1.4",
         "request": "2.83.0",
-        "rimraf": "2.6.2",
+        "rimraf": "2.6.1",
         "semver": "5.3.0",
         "tar": "2.2.1",
         "which": "1.3.0"
@@ -10733,10 +13484,16 @@
       "integrity": "sha1-iXNhjXJ9pVJqgwtH0HwNgD4KFcY=",
       "dev": true
     },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
     "node-sass": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.6.1.tgz",
-      "integrity": "sha512-0zQQ7tjEK5W8RfW9LiQrkzfo7uLZ0QtZGV69rdKn5cFzdweHLJ14lR6xLPvI6UimkXMO8m0qDsXwUCNdnqV3sA==",
+      "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",
@@ -10759,6 +13516,19 @@
         "stdout-stream": "1.4.0"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "cross-spawn": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -10788,6 +13558,12 @@
             "lodash": "4.17.4",
             "minimatch": "3.0.4"
           }
+        },
+        "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
         }
       }
     },
@@ -11096,6 +13872,27 @@
         "cli-cursor": "1.0.2",
         "cli-spinners": "0.1.2",
         "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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
+        }
       }
     },
     "orchestrator": {
@@ -11320,12 +14117,6 @@
       "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
       "dev": true
     },
-    "parse5": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-      "dev": true
-    },
     "parsejson": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
@@ -11432,22 +14223,13 @@
       "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=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
+        "pify": "2.3.0"
       }
     },
     "pause": {
@@ -11472,9 +14254,9 @@
       "dev": true
     },
     "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
     "pinkie": {
@@ -11515,12 +14297,6 @@
       "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
       "dev": true
     },
-    "pluralize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
-      "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
-      "dev": true
-    },
     "portfinder": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz",
@@ -11549,6 +14325,29 @@
         "js-base64": "2.3.2",
         "source-map": "0.5.7",
         "supports-color": "3.2.3"
+      },
+      "dependencies": {
+        "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": {
+            "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
+            }
+          }
+        }
       }
     },
     "postcss-less": {
@@ -11777,6 +14576,7 @@
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz",
       "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "ascli": "1.0.1",
         "bytebuffer": "5.0.1",
@@ -11799,7 +14599,7 @@
       "requires": {
         "@types/node": "6.0.90",
         "@types/q": "0.0.32",
-        "@types/selenium-webdriver": "2.53.43",
+        "@types/selenium-webdriver": "2.53.42",
         "blocking-proxy": "0.0.5",
         "chalk": "1.1.3",
         "glob": "7.1.2",
@@ -11826,6 +14626,19 @@
           "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
           "dev": true
         },
+        "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"
+          }
+        },
         "saucelabs": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz",
@@ -11835,6 +14648,12 @@
             "https-proxy-agent": "1.0.0"
           }
         },
+        "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
+        },
         "webdriver-manager": {
           "version": "12.0.6",
           "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz",
@@ -11849,7 +14668,7 @@
             "minimist": "1.2.0",
             "q": "1.4.1",
             "request": "2.83.0",
-            "rimraf": "2.6.2",
+            "rimraf": "2.6.1",
             "semver": "5.4.1",
             "xml2js": "0.4.19"
           }
@@ -11857,14 +14676,14 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
-      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz",
+      "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=",
       "dev": true,
       "optional": true,
       "requires": {
         "forwarded": "0.1.2",
-        "ipaddr.js": "1.5.2"
+        "ipaddr.js": "1.4.0"
       }
     },
     "prr": {
@@ -11993,7 +14812,7 @@
               "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "is-buffer": "1.1.6"
+                "is-buffer": "1.1.5"
               }
             }
           }
@@ -12004,7 +14823,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "1.1.5"
           }
         }
       }
@@ -12016,14 +14835,13 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz",
+      "integrity": "sha1-mUl2z2pQlqQRYoQEkvC9xdbn+5Y=",
       "dev": true,
       "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
+        "bytes": "2.4.0",
+        "iconv-lite": "0.4.15",
         "unpipe": "1.0.0"
       }
     },
@@ -12069,45 +14887,26 @@
       }
     },
     "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "load-json-file": "1.1.0",
+        "load-json-file": "2.0.0",
         "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
+        "path-type": "2.0.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=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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"
-          }
-        }
+        "find-up": "2.1.0",
+        "read-pkg": "2.0.0"
       }
     },
     "readable-stream": {
@@ -12162,7 +14961,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "1.5.0"
+        "resolve": "1.4.0"
       }
     },
     "redent": {
@@ -12282,6 +15081,17 @@
         "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        }
       }
     },
     "require-directory": {
@@ -12370,9 +15180,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
+      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
       "dev": true,
       "requires": {
         "path-parse": "1.0.5"
@@ -12430,9 +15240,9 @@
       }
     },
     "retry-request": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.1.tgz",
-      "integrity": "sha512-Sj3M3bC8ODJT+jfVxbTwvORRkFtc/AlDhhiMch5RJalLMAjz6+lIf5Q/Ox2esAM4tXcAYfG4ecNHPtaGNWIqvQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.1.0.tgz",
+      "integrity": "sha512-jOwZQlWR/boHhbAfzfOoUn28EDDotW2A7YxV2o5mfBb07H0k/zZAgbxRcckW08GKl/aT0JtPk1NViuk2BfHqVg==",
       "dev": true,
       "requires": {
         "request": "2.83.0",
@@ -12456,9 +15266,9 @@
       }
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
       "dev": true,
       "requires": {
         "glob": "7.1.2"
@@ -12497,7 +15307,7 @@
         "browser-resolve": "1.11.2",
         "builtin-modules": "1.1.1",
         "is-module": "1.0.0",
-        "resolve": "1.5.0"
+        "resolve": "1.4.0"
       }
     },
     "router": {
@@ -12521,11 +15331,26 @@
           "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
           "dev": true
         },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
           "dev": true
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+          "dev": true
         }
       }
     },
@@ -12561,9 +15386,9 @@
       "dev": true
     },
     "rxjs": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz",
-      "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.0.tgz",
+      "integrity": "sha512-vmvP5y/oJIJmXKHY36PIjVeI/46Sny6BMBa7/ou2zsNz1PiqU/Gtcz1GujnHz5Qlxncv+J9VlWmttnshqFj3Kg==",
       "requires": {
         "symbol-observable": "1.0.4"
       }
@@ -12583,7 +15408,7 @@
         "es6-promise": "3.3.1",
         "graceful-fs": "4.1.11",
         "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "rimraf": "2.6.1"
       },
       "dependencies": {
         "es6-promise": {
@@ -12612,6 +15437,79 @@
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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"
+          }
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
         "which-module": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -12672,16 +15570,16 @@
       }
     },
     "sauce-connect-launcher": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.3.tgz",
-      "integrity": "sha1-0vkxrXro/avxlopEDnsgQXrKf4Y=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-1.2.2.tgz",
+      "integrity": "sha1-c0bMj73EQxkTI0ObBzNFH181IfI=",
       "dev": true,
       "requires": {
         "adm-zip": "0.4.7",
-        "async": "2.6.0",
+        "async": "2.5.0",
         "https-proxy-agent": "1.0.0",
         "lodash": "4.17.4",
-        "rimraf": "2.6.2"
+        "rimraf": "2.6.1"
       }
     },
     "saucelabs": {
@@ -12709,7 +15607,7 @@
         "globs": "0.1.3",
         "mkdirp": "0.5.1",
         "mz": "2.7.0",
-        "node-sass": "4.6.1",
+        "node-sass": "4.5.3",
         "pretty-bytes": "4.0.2",
         "promise": "7.3.1",
         "yargs": "7.1.0"
@@ -12721,15 +15619,77 @@
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
-        "mz": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-          "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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": {
-            "any-promise": "1.3.0",
-            "object-assign": "4.1.1",
-            "thenify-all": "1.6.0"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "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"
+          }
+        },
+        "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"
           }
         },
         "which-module": {
@@ -12797,8 +15757,8 @@
       "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
-        "jszip": "3.1.5",
-        "rimraf": "2.6.2",
+        "jszip": "3.1.4",
+        "rimraf": "2.6.1",
         "tmp": "0.0.30",
         "xml2js": "0.4.19"
       },
@@ -12839,26 +15799,41 @@
       }
     },
     "send": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
-      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz",
+      "integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
+        "debug": "2.6.8",
         "depd": "1.1.1",
         "destroy": "1.0.4",
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
-        "fresh": "0.5.2",
+        "fresh": "0.5.0",
         "http-errors": "1.6.2",
-        "mime": "1.4.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.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "mime": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+          "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
+          "dev": true
+        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -12984,16 +15959,16 @@
       }
     },
     "serve-static": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
-      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+      "version": "1.12.4",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz",
+      "integrity": "sha1-m2qpjutyU8Tu3Ewfb9vKYJkBqWE=",
       "dev": true,
       "optional": true,
       "requires": {
         "encodeurl": "1.0.1",
         "escape-html": "1.0.3",
         "parseurl": "1.3.2",
-        "send": "0.16.1"
+        "send": "0.15.4"
       }
     },
     "set-blocking": {
@@ -13140,9 +16115,9 @@
       "dev": true
     },
     "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
       "dev": true,
       "requires": {
         "hoek": "4.2.0"
@@ -13378,7 +16353,7 @@
       "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=",
       "dev": true,
       "requires": {
-        "async": "2.6.0",
+        "async": "2.5.0",
         "is-stream-ended": "0.1.3"
       }
     },
@@ -13499,15 +16474,6 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "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-format-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz",
@@ -13541,6 +16507,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "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"
+      }
+    },
     "stringify-object": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-0.1.8.tgz",
@@ -13569,14 +16544,10 @@
       }
     },
     "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"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
     },
     "strip-eof": {
       "version": "1.0.0",
@@ -13631,6 +16602,19 @@
         "write-file-stdout": "0.0.2"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "plur": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
@@ -13651,6 +16635,12 @@
             "log-symbols": "1.0.2",
             "postcss": "5.2.18"
           }
+        },
+        "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
         }
       }
     },
@@ -13662,10 +16652,10 @@
       "requires": {
         "autoprefixer": "6.7.7",
         "balanced-match": "0.4.2",
-        "chalk": "2.3.0",
+        "chalk": "2.2.0",
         "colorguard": "1.2.0",
         "cosmiconfig": "2.2.2",
-        "debug": "2.6.9",
+        "debug": "2.6.7",
         "doiuse": "2.6.0",
         "execall": "1.0.0",
         "file-entry-cache": "2.0.0",
@@ -13673,7 +16663,7 @@
         "globby": "6.1.0",
         "globjoin": "0.1.4",
         "html-tags": "2.0.0",
-        "ignore": "3.3.7",
+        "ignore": "3.3.5",
         "imurmurhash": "0.1.4",
         "known-css-properties": "0.2.0",
         "lodash": "4.17.4",
@@ -13713,7 +16703,7 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.0"
           }
         },
         "balanced-match": {
@@ -13723,9 +16713,9 @@
           "dev": true
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -13739,6 +16729,19 @@
           "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
           "dev": true
         },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
         "has-flag": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
@@ -13751,12 +16754,6 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -13871,6 +16868,19 @@
           "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
           "dev": true
         },
+        "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"
+          }
+        },
         "configstore": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
@@ -13907,7 +16917,7 @@
             "jsonfile": "2.4.0",
             "klaw": "1.3.1",
             "path-is-absolute": "1.0.1",
-            "rimraf": "2.6.2"
+            "rimraf": "2.6.1"
           }
         },
         "isarray": {
@@ -13925,6 +16935,12 @@
             "isarray": "0.0.1"
           }
         },
+        "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
+        },
         "update-notifier": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
@@ -14038,9 +17054,9 @@
       "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
-        "ajv": "5.3.0",
-        "ajv-keywords": "2.1.1",
-        "chalk": "2.3.0",
+        "ajv": "5.2.3",
+        "ajv-keywords": "2.1.0",
+        "chalk": "2.2.0",
         "lodash": "4.17.4",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1"
@@ -14058,13 +17074,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.0"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -14142,9 +17158,9 @@
       }
     },
     "tar-stream": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
-      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.2.2.tgz",
+      "integrity": "sha1-ljLyPZj9M9QWYbvewFSJEg3sYCg=",
       "dev": true,
       "requires": {
         "bl": "1.2.1",
@@ -14469,7 +17485,7 @@
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
-        "chalk": "2.3.0",
+        "chalk": "2.2.0",
         "diff": "3.4.0",
         "make-error": "1.3.0",
         "minimist": "1.2.0",
@@ -14486,13 +17502,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.0"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -14534,14 +17550,6 @@
       "requires": {
         "strip-bom": "3.0.0",
         "strip-json-comments": "2.0.1"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        }
       }
     },
     "tsconfig-paths": {
@@ -14600,15 +17608,15 @@
       "requires": {
         "babel-code-frame": "6.26.0",
         "builtin-modules": "1.1.1",
-        "chalk": "2.3.0",
+        "chalk": "2.2.0",
         "commander": "2.11.0",
         "diff": "3.4.0",
         "glob": "7.1.2",
         "minimatch": "3.0.4",
-        "resolve": "1.5.0",
+        "resolve": "1.4.0",
         "semver": "5.4.1",
         "tslib": "1.8.0",
-        "tsutils": "2.12.2"
+        "tsutils": "2.12.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -14617,13 +17625,13 @@
           "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.0"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
+          "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.0",
@@ -14655,9 +17663,9 @@
       "dev": true
     },
     "tsutils": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz",
-      "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.1.tgz",
+      "integrity": "sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ=",
       "dev": true,
       "requires": {
         "tslib": "1.8.0"
@@ -14909,7 +17917,7 @@
             "graceful-fs": "3.0.11",
             "inherits": "2.0.3",
             "mkdirp": "0.5.1",
-            "rimraf": "2.6.2"
+            "rimraf": "2.6.1"
           }
         },
         "graceful-fs": {
@@ -14968,6 +17976,19 @@
         "string-length": "1.0.1"
       },
       "dependencies": {
+        "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"
+          }
+        },
         "configstore": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
@@ -15038,6 +18059,12 @@
             "is-finite": "1.0.2"
           }
         },
+        "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
+        },
         "timed-out": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
@@ -15154,7 +18181,7 @@
         "i": "0.3.6",
         "mkdirp": "0.5.1",
         "ncp": "1.0.1",
-        "rimraf": "2.6.2"
+        "rimraf": "2.6.1"
       },
       "dependencies": {
         "async": {
@@ -15167,9 +18194,9 @@
       }
     },
     "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
       "dev": true
     },
     "uuid": {
@@ -15321,6 +18348,16 @@
           "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",
@@ -15398,7 +18435,7 @@
             "glob": "7.1.2",
             "lodash": "4.16.2",
             "readable-stream": "2.3.3",
-            "tar-stream": "1.5.5",
+            "tar-stream": "1.5.4",
             "walkdir": "0.0.11",
             "zip-stream": "1.2.0"
           }
@@ -15439,6 +18476,47 @@
           "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
           "dev": true
         },
+        "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"
+          }
+        },
+        "compress-commons": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+          "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
+          "dev": true,
+          "requires": {
+            "buffer-crc32": "0.2.13",
+            "crc32-stream": "2.0.0",
+            "normalize-path": "2.1.1",
+            "readable-stream": "2.3.3"
+          }
+        },
+        "crc": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+          "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
+          "dev": true
+        },
+        "crc32-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
+          "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
+          "dev": true,
+          "requires": {
+            "crc": "3.5.0",
+            "readable-stream": "2.3.3"
+          }
+        },
         "cryptiles": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -15549,11 +18627,41 @@
             "hoek": "2.16.3"
           }
         },
+        "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
+        },
+        "tar-stream": {
+          "version": "1.5.4",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
+          "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=",
+          "dev": true,
+          "requires": {
+            "bl": "1.2.1",
+            "end-of-stream": "1.4.0",
+            "readable-stream": "2.3.3",
+            "xtend": "4.0.1"
+          }
+        },
         "tunnel-agent": {
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
           "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
           "dev": true
+        },
+        "zip-stream": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
+          "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
+          "dev": true,
+          "requires": {
+            "archiver-utils": "1.3.0",
+            "compress-commons": "1.2.2",
+            "lodash": "4.16.2",
+            "readable-stream": "2.3.3"
+          }
         }
       }
     },
@@ -15569,7 +18677,7 @@
       "integrity": "sha1-gcUzqeM9W/tZe05j4s2yW1R3dRU=",
       "dev": true,
       "requires": {
-        "@types/selenium-webdriver": "2.53.43",
+        "@types/selenium-webdriver": "2.53.42",
         "selenium-webdriver": "2.53.3"
       },
       "dependencies": {
@@ -15592,7 +18700,7 @@
           "dev": true,
           "requires": {
             "adm-zip": "0.4.4",
-            "rimraf": "2.6.2",
+            "rimraf": "2.6.1",
             "tmp": "0.0.24",
             "ws": "1.1.2",
             "xml2js": "0.4.4"
@@ -15629,22 +18737,30 @@
       "dev": true,
       "requires": {
         "http-parser-js": "0.4.9",
-        "websocket-extensions": "0.1.3"
+        "websocket-extensions": "0.1.2"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
       "dev": true
     },
     "whatwg-encoding": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz",
-      "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz",
+      "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.19"
+        "iconv-lite": "0.4.13"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.13",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
+          "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
+          "dev": true
+        }
       }
     },
     "whatwg-url": {
@@ -15855,12 +18971,6 @@
       "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
       "dev": true
     },
-    "xmlhttprequest": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
-      "dev": true
-    },
     "xmlhttprequest-ssl": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
@@ -15901,9 +19011,9 @@
       }
     },
     "yargs-parser": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz",
-      "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -15932,15 +19042,46 @@
       "dev": true
     },
     "zip-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
-      "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.6.0.tgz",
+      "integrity": "sha1-7pM67ZlvsYs0SpGuO10mTOxegSs=",
       "dev": true,
       "requires": {
-        "archiver-utils": "1.3.0",
-        "compress-commons": "1.2.2",
-        "lodash": "4.17.4",
-        "readable-stream": "2.3.3"
+        "compress-commons": "0.3.0",
+        "lodash": "3.10.1",
+        "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
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "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
+        }
       }
     },
     "zone.js": {
diff --git a/package.json b/package.json
index 84fa85760cd8..530924e32152 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "url": "https://github.com/angular/material2.git"
   },
   "scripts": {
+    "postinstall": "ngc -p angular.tsconfig.json",
     "build": "gulp :publish:build-releases",
     "demo-app": "gulp serve:devapp",
     "test": "gulp test",
@@ -39,11 +40,15 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
+    "@angular/bazel": "^5.0.1",
     "@angular/compiler-cli": "^5.0.0",
     "@angular/http": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
     "@angular/platform-server": "^5.0.0",
     "@angular/router": "^5.0.0",
+    "@angular/upgrade": "^5.0.1",
+    "@bazel/ibazel": "0.0.1",
+    "@bazel/typescript": "^0.3.1",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
diff --git a/src/cdk/BUILD.bazel b/src/cdk/BUILD.bazel
new file mode 100644
index 000000000000..c7d068323422
--- /dev/null
+++ b/src/cdk/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility=["//visibility:public"])
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+
+ts_library(
+  name = "cdk",
+  srcs = glob(["*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/a11y/BUILD.bazel b/src/cdk/a11y/BUILD.bazel
new file mode 100644
index 000000000000..e13a5c02b6aa
--- /dev/null
+++ b/src/cdk/a11y/BUILD.bazel
@@ -0,0 +1,14 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "a11y",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/a11y",
+  deps = [
+    "//src/cdk/coercion",
+    "//src/cdk/keycodes",
+    "//src/cdk/platform",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/a11y/a11y-module.ts b/src/cdk/a11y/a11y-module.ts
index 27b754af6a43..cc2942625942 100644
--- a/src/cdk/a11y/a11y-module.ts
+++ b/src/cdk/a11y/a11y-module.ts
@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {FocusTrapDeprecatedDirective, CdkTrapFocus, FocusTrapFactory} from './focus-trap';
-import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer';
-import {InteractivityChecker} from './interactivity-checker';
-import {CommonModule} from '@angular/common';
 import {PlatformModule} from '@angular/cdk/platform';
-import {AriaDescriber, ARIA_DESCRIBER_PROVIDER} from './aria-describer';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {ARIA_DESCRIBER_PROVIDER, AriaDescriber} from './aria-describer';
 import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor';
+import {CdkTrapFocus, FocusTrapDeprecatedDirective, FocusTrapFactory} from './focus-trap';
+import {InteractivityChecker} from './interactivity-checker';
+import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer';
 
 @NgModule({
   imports: [CommonModule, PlatformModule],
diff --git a/src/cdk/accordion/BUILD.bazel b/src/cdk/accordion/BUILD.bazel
new file mode 100644
index 000000000000..768e16cdd168
--- /dev/null
+++ b/src/cdk/accordion/BUILD.bazel
@@ -0,0 +1,13 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "accordion",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/accordion",
+  deps = [
+    "//src/cdk/coercion",
+    "//src/cdk/collections",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/bidi/BUILD.bazel b/src/cdk/bidi/BUILD.bazel
new file mode 100644
index 000000000000..521ece864c55
--- /dev/null
+++ b/src/cdk/bidi/BUILD.bazel
@@ -0,0 +1,10 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "bidi",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/bidi",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/coercion/BUILD.bazel b/src/cdk/coercion/BUILD.bazel
new file mode 100644
index 000000000000..dea79534da7d
--- /dev/null
+++ b/src/cdk/coercion/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility=["//visibility:public"])
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+# Note: this will need to ng_module if any Angular-specific stuff is added to coercion.
+ts_library(
+  name = "coercion",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/coercion",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/collections/BUILD.bazel b/src/cdk/collections/BUILD.bazel
new file mode 100644
index 000000000000..8653318e0862
--- /dev/null
+++ b/src/cdk/collections/BUILD.bazel
@@ -0,0 +1,10 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "collections",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/collections",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/keycodes/BUILD.bazel b/src/cdk/keycodes/BUILD.bazel
new file mode 100644
index 000000000000..f4857161e958
--- /dev/null
+++ b/src/cdk/keycodes/BUILD.bazel
@@ -0,0 +1,11 @@
+package(default_visibility=["//visibility:public"])
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+# Note: this will need to ng_module if any Angular-specific stuff is added to coercion.
+ts_library(
+  name = "keycodes",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/keycodes",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/layout/BUILD.bazel b/src/cdk/layout/BUILD.bazel
new file mode 100644
index 000000000000..2d74d18ad3ac
--- /dev/null
+++ b/src/cdk/layout/BUILD.bazel
@@ -0,0 +1,13 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "layout",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/layout",
+  deps = [
+    "//src/cdk/coercion",
+    "//src/cdk/platform",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/observers/BUILD.bazel b/src/cdk/observers/BUILD.bazel
new file mode 100644
index 000000000000..ff3e7cbb28a6
--- /dev/null
+++ b/src/cdk/observers/BUILD.bazel
@@ -0,0 +1,10 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "observers",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/observers",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel
new file mode 100644
index 000000000000..03f7d8383a16
--- /dev/null
+++ b/src/cdk/overlay/BUILD.bazel
@@ -0,0 +1,17 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "overlay",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/overlay",
+  deps = [
+    "//src/cdk/bidi",
+    "//src/cdk/coercion",
+    "//src/cdk/keycodes",
+    "//src/cdk/platform",
+    "//src/cdk/portal",
+    "//src/cdk/scrolling",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/platform/BUILD.bazel b/src/cdk/platform/BUILD.bazel
new file mode 100644
index 000000000000..1f70a13a27d6
--- /dev/null
+++ b/src/cdk/platform/BUILD.bazel
@@ -0,0 +1,10 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "platform",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/platform",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/portal/BUILD.bazel b/src/cdk/portal/BUILD.bazel
new file mode 100644
index 000000000000..c999ae0ec337
--- /dev/null
+++ b/src/cdk/portal/BUILD.bazel
@@ -0,0 +1,10 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "portal",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/portal",
+  deps = [],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/scrolling/BUILD.bazel b/src/cdk/scrolling/BUILD.bazel
new file mode 100644
index 000000000000..505982ca2591
--- /dev/null
+++ b/src/cdk/scrolling/BUILD.bazel
@@ -0,0 +1,12 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "scrolling",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/scrolling",
+  deps = [
+    "//src/cdk/platform",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/stepper/BUILD.bazel b/src/cdk/stepper/BUILD.bazel
new file mode 100644
index 000000000000..29671b76ae03
--- /dev/null
+++ b/src/cdk/stepper/BUILD.bazel
@@ -0,0 +1,14 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "stepper",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/stepper",
+  deps = [
+    "//src/cdk/bidi",
+    "//src/cdk/coercion",
+    "//src/cdk/keycodes",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/stepper/typings.d.ts b/src/cdk/stepper/typings.d.ts
new file mode 100644
index 000000000000..ce4ae9b66cf0
--- /dev/null
+++ b/src/cdk/stepper/typings.d.ts
@@ -0,0 +1 @@
+declare var module: {id: string};
diff --git a/src/cdk/table/BUILD.bazel b/src/cdk/table/BUILD.bazel
new file mode 100644
index 000000000000..e4ca2a79723b
--- /dev/null
+++ b/src/cdk/table/BUILD.bazel
@@ -0,0 +1,12 @@
+package(default_visibility=["//visibility:public"])
+load("@angular//:index.bzl", "ng_module")
+
+ng_module(
+  name = "table",
+  srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
+  module_name = "@angular/cdk/table",
+  deps = [
+    "//src/cdk/collections",
+  ],
+  tsconfig = ":tsconfig-build.json",
+)
diff --git a/src/cdk/table/typings.d.ts b/src/cdk/table/typings.d.ts
new file mode 100644
index 000000000000..ce4ae9b66cf0
--- /dev/null
+++ b/src/cdk/table/typings.d.ts
@@ -0,0 +1 @@
+declare var module: {id: string};
diff --git a/tools/bazel.rc b/tools/bazel.rc
new file mode 100644
index 000000000000..024b4d3c6870
--- /dev/null
+++ b/tools/bazel.rc
@@ -0,0 +1,48 @@
+###############################
+# Directory structure         #
+###############################
+
+# Don't create bazel-* symlinks in the WORKSPACE directory.
+# These require .gitignore and may scare users.
+# Also, it's a workaround for https://github.com/bazelbuild/rules_typescript/issues/12
+# which affects the common case of having `tsconfig.json` in the WORKSPACE directory.
+#
+# Instead, you should run `bazel info bazel-bin` to find out where the outputs went.
+build --symlink_prefix=/
+
+# Another good choice is to create a dist/ directory. Then you can use
+# build --symlink_prefix=dist/
+# to get folders like dist/bin
+# But be aware, this will still create a bazel-out symlink in your project directory.
+# You may still need to exclude that, eg. from the editor's search path.
+
+###############################
+# Output                      #
+###############################
+
+# A more useful default output mode for bazel query
+# Prints eg. "ng_module rule //foo:bar" rather than just "//foo:bar"
+query --output=label_kind
+
+# Don't print every dependency in :node_modules, for example
+query --noimplicit_deps
+
+# By default, failing tests don't print any output, it goes to the log file
+test --test_output=errors
+
+# Show which actions are run under workers,
+# and print all the actions running in parallel.
+# Helps to demonstrate that bazel uses all the cores on the machine.
+build --experimental_ui
+test --experimental_ui
+
+###############################
+# Typescript / Angular / Sass #
+###############################
+# Make TypeScript and Angular compilation fast, by keeping a few copies of the compiler
+# running as daemons, and cache SourceFile AST's to reduce parse time.
+build --strategy=TypeScriptCompile=worker --strategy=AngularTemplateCompile=worker
+
+# Workaround rules_sass still using old 'set' constructor
+# This is an error in bazel >= 0.6 unless this flag is set
+build --incompatible_disallow_set_constructor=false

From 7f34a35d34ca82fc96f47a7b3784fadde1f74392 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 13:53:07 -0800
Subject: [PATCH 480/575] build(ci): add config for circleci (#8460)

---
 .circleci/config.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000000..5fc386ce3c42
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,43 @@
+# Configuration file for https://circleci.com/gh/angular/material2
+
+# Note: YAML anchors allow an object to be re-used, reducing duplication.
+# The ampersand declares an alias for an object, then later the `<<: *name`
+# syntax dereferences it.
+# See http://blog.daemonl.com/2016/02/yaml.html
+# To validate changes, use an online parser, eg.
+# http://yaml-online-parser.appspot.com/
+
+# Settings common to each job
+anchor_1: &job_defaults
+  working_directory: ~/ng
+  docker:
+    - image: angular/ngcontainer:0.0.4
+
+# After checkout, rebase on top of master.
+# Similar to travis behavior, but not quite the same.
+# By default, PRs are not rebased on top of master, which we want.
+# See https://discuss.circleci.com/t/1662
+anchor_2: &post_checkout
+  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
+
+version: 2
+jobs:
+  build:
+    <<: *job_defaults
+    steps:
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
+
+      - run: bazel build src/cdk/...
+      - save_cache:
+          key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          paths:
+            - "node_modules"
+
+workflows:
+  version: 2
+  default_workflow:
+    jobs:
+      - build

From ebbbcbb91d9e473f07f346f17922928ae7262245 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 13:59:19 -0800
Subject: [PATCH 481/575] build(circleci): npm install on circleci (#8461)

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5fc386ce3c42..32e578d5fce8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,6 +30,7 @@ jobs:
       - restore_cache:
           key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
 
+      - run: bazel run @nodejs//:npm install
       - run: bazel build src/cdk/...
       - save_cache:
           key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}

From 353f58620266aae361baf663ffc686d47ef7aa2e Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 14:38:16 -0800
Subject: [PATCH 482/575] build: use typescript 2.5 (#8462)

---
 package-lock.json | 22 ++++++++++++++++++----
 package.json      |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 65729e47f5d6..d146e9fe3548 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,6 +40,12 @@
               "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz",
               "integrity": "sha1-zWfyfT3Az7dG8L3V4IbExdVb4XM=",
               "dev": true
+            },
+            "typescript": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+              "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+              "dev": true
             }
           }
         },
@@ -3346,6 +3352,14 @@
         "spdx-license-list": "2.1.0",
         "stringmap": "0.2.2",
         "typescript": "2.4.2"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+          "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+          "dev": true
+        }
       }
     },
     "di": {
@@ -4314,7 +4328,7 @@
         "resolve-dependency-path": "1.0.2",
         "sass-lookup": "1.1.0",
         "stylus-lookup": "1.0.2",
-        "typescript": "2.4.2"
+        "typescript": "2.5.3"
       }
     },
     "fill-range": {
@@ -17713,9 +17727,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
-      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
+      "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
       "dev": true
     },
     "typescript-eslint-parser": {
diff --git a/package.json b/package.json
index 530924e32152..1fd589cea932 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "tsconfig-paths": "^2.3.0",
     "tslint": "^5.8.0",
     "tsutils": "^2.6.0",
-    "typescript": "~2.4.2",
+    "typescript": "~2.5.3",
     "uglify-js": "^2.8.14",
     "web-animations-js": "^2.2.5"
   }

From fe511acc1473e31c75874f3a086a58d45d03b980 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 14:55:06 -0800
Subject: [PATCH 483/575] chore: add circleci dir to code owners (#8463)

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 246d1b5a4fe6..01fa90356e08 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -165,6 +165,7 @@
 /src/universal-app/**                              @jelbourn
 
 # Tooling
+/.circleci/**                                      @jelbourn
 /scripts/**                                        @devversion @jelbourn
 /test/**                                           @devversion @jelbourn
 /tools/**                                          @devversion @jelbourn

From 8af8590d4db79354d082cb238bc8c5618080fcea Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 15:25:32 -0800
Subject: [PATCH 484/575] build: align versions of @bazel/typescript and
 typescript (#8464)

---
 package-lock.json | 36 +++++++++---------------------------
 package.json      |  4 ++--
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d146e9fe3548..2b8e6197c4ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -188,16 +188,16 @@
       "dev": true
     },
     "@bazel/typescript": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.3.1.tgz",
-      "integrity": "sha1-VDZ9+PMPoPsl5BEG63qlWFNMNt0=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.2.2.tgz",
+      "integrity": "sha1-Cg0JkkUIyUbeMuas2ytcwe4yxQY=",
       "dev": true,
       "requires": {
         "@types/node": "7.0.18",
         "@types/source-map": "0.5.2",
         "protobufjs": "5.0.0",
-        "tsickle": "0.25.5",
-        "typescript": "2.5.3"
+        "tsickle": "0.24.1",
+        "typescript": "2.4.2"
       },
       "dependencies": {
         "@types/node": {
@@ -230,24 +230,6 @@
             "glob": "5.0.15",
             "yargs": "3.32.0"
           }
-        },
-        "tsickle": {
-          "version": "0.25.5",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.25.5.tgz",
-          "integrity": "sha512-CgOT/1WqOKtE1fyvqB+kTJ7bizE33xj1TyUIzGbxJBGCbQmknCrZbb35DtxMiK6pJo4CrPyoS8iGFddfHKtSNA==",
-          "dev": true,
-          "requires": {
-            "minimist": "1.2.0",
-            "mkdirp": "0.5.1",
-            "source-map": "0.5.7",
-            "source-map-support": "0.4.18"
-          }
-        },
-        "typescript": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
-          "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
-          "dev": true
         }
       }
     },
@@ -4328,7 +4310,7 @@
         "resolve-dependency-path": "1.0.2",
         "sass-lookup": "1.1.0",
         "stylus-lookup": "1.0.2",
-        "typescript": "2.5.3"
+        "typescript": "2.4.2"
       }
     },
     "fill-range": {
@@ -17727,9 +17709,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
-      "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
       "dev": true
     },
     "typescript-eslint-parser": {
diff --git a/package.json b/package.json
index 1fd589cea932..bdaa35a0b910 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@angular/router": "^5.0.0",
     "@angular/upgrade": "^5.0.1",
     "@bazel/ibazel": "0.0.1",
-    "@bazel/typescript": "^0.3.1",
+    "@bazel/typescript": "0.2.x",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
@@ -123,7 +123,7 @@
     "tsconfig-paths": "^2.3.0",
     "tslint": "^5.8.0",
     "tsutils": "^2.6.0",
-    "typescript": "~2.5.3",
+    "typescript": "~2.4.2",
     "uglify-js": "^2.8.14",
     "web-animations-js": "^2.2.5"
   }

From 541a95eebad36062976fc188b2120e7995367a68 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 15 Nov 2017 16:34:59 -0800
Subject: [PATCH 485/575] build: manually invoke postinstall for circleci
 (#8466)

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32e578d5fce8..58094fc3e716 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,6 +31,9 @@ jobs:
           key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
 
       - run: bazel run @nodejs//:npm install
+      # For some reason, circleci needs the postinstall to be run explicitly.
+      # This may be unnecessary once ngcontainer uses nodejs 8
+      - run: bazel run @nodejs//:npm run postinstall
       - run: bazel build src/cdk/...
       - save_cache:
           key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}

From 0f954a09c02564be108112b935c88b2aa180c361 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Sat, 18 Nov 2017 16:15:10 +0100
Subject: [PATCH 486/575] build: fix travis required tests not running (#8437)

* build: fix travis required tests not running

* Fixes that the `travis_required` CI mode isn't running. This mode is important for Firefox and Chrome testing.
---
 .travis.yml                 | 2 +-
 src/lib/input/input.spec.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ccfabb5dd866..068c2197309c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ jobs:
     - env: "MODE=saucelabs_required"
     - env: "MODE=browserstack_required"
     - env: "MODE=travis_required"
-      env: "DEPLOY_MODE=build-artifacts"
+    - env: "DEPLOY_MODE=build-artifacts"
     - env: "DEPLOY_MODE=docs-content"
     - env: "DEPLOY_MODE=screenshot-tool"
     - env: "DEPLOY_MODE=dashboard"
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index f1b84b2675ad..033a9292b375 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -110,7 +110,7 @@ describe('MatInput without forms', function () {
 
   it('should not be treated as empty if type is date',
       inject([Platform], (platform: Platform) => {
-        if (!(platform.TRIDENT || platform.FIREFOX || (platform.SAFARI && !platform.IOS))) {
+        if (!(platform.TRIDENT || (platform.SAFARI && !platform.IOS))) {
           let fixture = TestBed.createComponent(MatInputDateTestController);
           fixture.detectChanges();
 
@@ -120,10 +120,10 @@ describe('MatInput without forms', function () {
         }
       }));
 
-  // Firefox, Safari Desktop and IE don't support type="date" and fallback to type="text".
-  it('should be treated as empty if type is date on Firefox and IE',
+  // Safari Desktop and IE don't support type="date" and fallback to type="text".
+  it('should be treated as empty if type is date in Safari Desktop or IE',
       inject([Platform], (platform: Platform) => {
-        if (platform.TRIDENT || platform.FIREFOX || (platform.SAFARI && !platform.IOS)) {
+        if (platform.TRIDENT || (platform.SAFARI && !platform.IOS)) {
           let fixture = TestBed.createComponent(MatInputDateTestController);
           fixture.detectChanges();
 

From fbf2987483b8e5fe7317bca358480035b3489983 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Mon, 20 Nov 2017 09:28:15 -0800
Subject: [PATCH 487/575] fix(tabs): detach tab portal when tab hides from view
 (#8486)

---
 src/lib/tabs/tab-body.ts       | 23 ++++++++++++++---------
 src/lib/tabs/tab-group.spec.ts | 13 +++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts
index e08eb716b14f..9b5e906e55a0 100644
--- a/src/lib/tabs/tab-body.ts
+++ b/src/lib/tabs/tab-body.ts
@@ -81,15 +81,19 @@ export class MatTabBodyPortal extends _MatTabBodyPortalBaseClass implements OnIn
   ngOnInit(): void {
     if (this._host._isCenterPosition(this._host._position)) {
       this.attach(this._host._content);
-    } else {
-      this._centeringSub = this._host._beforeCentering.subscribe(() => {
-        this.attach(this._host._content);
-        this._centeringSub.unsubscribe();
-      });
     }
+    this._centeringSub = this._host._beforeCentering.subscribe((isCentering: boolean) => {
+      if (isCentering) {
+        if (!this.hasAttached()) {
+          this.attach(this._host._content);
+        }
+      } else {
+        this.detach();
+      }
+    });
   }
 
-  /** Clean up subscription if necessary. */
+  /** Clean up centering subscription. */
   ngOnDestroy(): void {
     if (this._centeringSub && !this._centeringSub.closed) {
       this._centeringSub.unsubscribe();
@@ -136,7 +140,7 @@ export class MatTabBody implements OnInit {
   @Output() _onCentering: EventEmitter<number> = new EventEmitter<number>();
 
   /** Event emitted before the centering of the tab begins. */
-  @Output() _beforeCentering: EventEmitter<number> = new EventEmitter<number>();
+  @Output() _beforeCentering: EventEmitter<boolean> = new EventEmitter<boolean>();
 
   /** Event emitted when the tab completes its animation towards the center. */
   @Output() _onCentered: EventEmitter<void> = new EventEmitter<void>(true);
@@ -185,8 +189,9 @@ export class MatTabBody implements OnInit {
   }
 
   _onTranslateTabStarted(e: AnimationEvent): void {
-    if (this._isCenterPosition(e.toState)) {
-      this._beforeCentering.emit();
+    const isCentering = this._isCenterPosition(e.toState);
+    this._beforeCentering.emit(isCentering);
+    if (isCentering) {
       this._onCentering.emit(this._elementRef.nativeElement.clientHeight);
     }
   }
diff --git a/src/lib/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
index 03780b818d27..16aa2266ef04 100644
--- a/src/lib/tabs/tab-group.spec.ts
+++ b/src/lib/tabs/tab-group.spec.ts
@@ -350,6 +350,19 @@ describe('MatTabGroup', () => {
       expect(fixture.componentInstance.legumes).toBeTruthy();
     });
 
+    it('should only have the active tab in the DOM', async(() => {
+      expect(fixture.nativeElement.textContent).toContain('Pizza, fries');
+      expect(fixture.nativeElement.textContent).not.toContain('Peanuts');
+
+      tabGroup.selectedIndex = 3;
+      fixture.detectChanges();
+      // Use whenStable to wait for async observables and change detection to run in content.
+      fixture.whenStable().then(() => {
+        expect(fixture.nativeElement.textContent).not.toContain('Pizza, fries');
+        expect(fixture.nativeElement.textContent).toContain('Peanuts');
+      });
+    }));
+
     it('should support setting the header position', () => {
       let tabGroupNode = fixture.debugElement.query(By.css('mat-tab-group')).nativeElement;
 

From f6cb2c69e306dad2fd0848bc725947083c48e4ba Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 18:37:32 +0100
Subject: [PATCH 488/575] refactor(aria-describer): better server-side
 rendering support (#8523)

Refactors the ARIA describer to work when running on the server. Previously it was inert because the renderer was missing some APIs.
---
 src/cdk/a11y/aria-describer.ts | 183 +++++++++++++++++----------------
 1 file changed, 95 insertions(+), 88 deletions(-)

diff --git a/src/cdk/a11y/aria-describer.ts b/src/cdk/a11y/aria-describer.ts
index 7e7bc63c40d7..e3eadd39d7fc 100644
--- a/src/cdk/a11y/aria-describer.ts
+++ b/src/cdk/a11y/aria-describer.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional, SkipSelf} from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
+import {Injectable, Inject, InjectionToken, Optional, SkipSelf} from '@angular/core';
+import {DOCUMENT} from '@angular/common';
 import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from './aria-reference';
 
 /**
@@ -45,7 +45,11 @@ let messagesContainer: HTMLElement | null = null;
  */
 @Injectable()
 export class AriaDescriber {
-  constructor(private _platform: Platform) { }
+  private _document: Document;
+
+  constructor(@Inject(DOCUMENT) _document: any) {
+    this._document = _document;
+  }
 
   /**
    * Adds to the host element an aria-describedby reference to a hidden element that contains
@@ -53,143 +57,146 @@ export class AriaDescriber {
    * message element.
    */
   describe(hostElement: Element, message: string) {
-    if (!this._platform.isBrowser || !message.trim()) { return; }
+    if (!message.trim()) {
+      return;
+    }
 
     if (!messageRegistry.has(message)) {
-      createMessageElement(message);
+      this._createMessageElement(message);
     }
 
-    if (!isElementDescribedByMessage(hostElement, message)) {
-      addMessageReference(hostElement, message);
+    if (!this._isElementDescribedByMessage(hostElement, message)) {
+      this._addMessageReference(hostElement, message);
     }
   }
 
   /** Removes the host element's aria-describedby reference to the message element. */
   removeDescription(hostElement: Element, message: string) {
-    if (!this._platform.isBrowser || !message.trim()) {
+    if (!message.trim()) {
       return;
     }
 
-    if (isElementDescribedByMessage(hostElement, message)) {
-      removeMessageReference(hostElement, message);
+    if (this._isElementDescribedByMessage(hostElement, message)) {
+      this._removeMessageReference(hostElement, message);
     }
 
     const registeredMessage = messageRegistry.get(message);
     if (registeredMessage && registeredMessage.referenceCount === 0) {
-      deleteMessageElement(message);
+      this._deleteMessageElement(message);
     }
 
     if (messagesContainer && messagesContainer.childNodes.length === 0) {
-      deleteMessagesContainer();
+      this._deleteMessagesContainer();
     }
   }
 
   /** Unregisters all created message elements and removes the message container. */
   ngOnDestroy() {
-    if (!this._platform.isBrowser) { return; }
+    const describedElements =
+        this._document.querySelectorAll(`[${CDK_DESCRIBEDBY_HOST_ATTRIBUTE}]`);
 
-    const describedElements = document.querySelectorAll(`[${CDK_DESCRIBEDBY_HOST_ATTRIBUTE}]`);
     for (let i = 0; i < describedElements.length; i++) {
-      removeCdkDescribedByReferenceIds(describedElements[i]);
+      this._removeCdkDescribedByReferenceIds(describedElements[i]);
       describedElements[i].removeAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE);
     }
 
     if (messagesContainer) {
-      deleteMessagesContainer();
+      this._deleteMessagesContainer();
     }
 
     messageRegistry.clear();
   }
-}
 
-/**
- * Creates a new element in the visually hidden message container element with the message
- * as its content and adds it to the message registry.
- */
-function createMessageElement(message: string) {
-  const messageElement = document.createElement('div');
-  messageElement.setAttribute('id', `${CDK_DESCRIBEDBY_ID_PREFIX}-${nextId++}`);
-  messageElement.appendChild(document.createTextNode(message)!);
+  /**
+   * Creates a new element in the visually hidden message container element with the message
+   * as its content and adds it to the message registry.
+   */
+  private _createMessageElement(message: string) {
+    const messageElement = this._document.createElement('div');
+    messageElement.setAttribute('id', `${CDK_DESCRIBEDBY_ID_PREFIX}-${nextId++}`);
+    messageElement.appendChild(this._document.createTextNode(message)!);
 
-  if (!messagesContainer) { createMessagesContainer(); }
-  messagesContainer!.appendChild(messageElement);
+    if (!messagesContainer) { this._createMessagesContainer(); }
+    messagesContainer!.appendChild(messageElement);
 
-  messageRegistry.set(message, {messageElement, referenceCount: 0});
-}
+    messageRegistry.set(message, {messageElement, referenceCount: 0});
+  }
 
-/** Deletes the message element from the global messages container. */
-function deleteMessageElement(message: string) {
-  const registeredMessage = messageRegistry.get(message);
-  const messageElement = registeredMessage && registeredMessage.messageElement;
-  if (messagesContainer && messageElement) {
-    messagesContainer.removeChild(messageElement);
+  /** Deletes the message element from the global messages container. */
+  private _deleteMessageElement(message: string) {
+    const registeredMessage = messageRegistry.get(message);
+    const messageElement = registeredMessage && registeredMessage.messageElement;
+    if (messagesContainer && messageElement) {
+      messagesContainer.removeChild(messageElement);
+    }
+    messageRegistry.delete(message);
   }
-  messageRegistry.delete(message);
-}
 
-/** Creates the global container for all aria-describedby messages. */
-function createMessagesContainer() {
-  messagesContainer = document.createElement('div');
+  /** Creates the global container for all aria-describedby messages. */
+  private _createMessagesContainer() {
+    messagesContainer = this._document.createElement('div');
 
-  messagesContainer.setAttribute('id', MESSAGES_CONTAINER_ID);
-  messagesContainer.setAttribute('aria-hidden', 'true');
-  messagesContainer.style.display = 'none';
-  document.body.appendChild(messagesContainer);
-}
+    messagesContainer.setAttribute('id', MESSAGES_CONTAINER_ID);
+    messagesContainer.setAttribute('aria-hidden', 'true');
+    messagesContainer.style.display = 'none';
+    this._document.body.appendChild(messagesContainer);
+  }
 
-/** Deletes the global messages container. */
-function deleteMessagesContainer() {
-  document.body.removeChild(messagesContainer!);
-  messagesContainer = null;
-}
+  /** Deletes the global messages container. */
+  private _deleteMessagesContainer() {
+    this._document.body.removeChild(messagesContainer!);
+    messagesContainer = null;
+  }
 
-/** Removes all cdk-describedby messages that are hosted through the element. */
-function removeCdkDescribedByReferenceIds(element: Element) {
-  // Remove all aria-describedby reference IDs that are prefixed by CDK_DESCRIBEDBY_ID_PREFIX
-  const originalReferenceIds = getAriaReferenceIds(element, 'aria-describedby')
-      .filter(id => id.indexOf(CDK_DESCRIBEDBY_ID_PREFIX) != 0);
-  element.setAttribute('aria-describedby', originalReferenceIds.join(' '));
-}
+  /** Removes all cdk-describedby messages that are hosted through the element. */
+  private _removeCdkDescribedByReferenceIds(element: Element) {
+    // Remove all aria-describedby reference IDs that are prefixed by CDK_DESCRIBEDBY_ID_PREFIX
+    const originalReferenceIds = getAriaReferenceIds(element, 'aria-describedby')
+        .filter(id => id.indexOf(CDK_DESCRIBEDBY_ID_PREFIX) != 0);
+    element.setAttribute('aria-describedby', originalReferenceIds.join(' '));
+  }
 
-/**
- * Adds a message reference to the element using aria-describedby and increments the registered
- * message's reference count.
- */
-function addMessageReference(element: Element, message: string) {
-  const registeredMessage = messageRegistry.get(message)!;
+  /**
+   * Adds a message reference to the element using aria-describedby and increments the registered
+   * message's reference count.
+   */
+  private _addMessageReference(element: Element, message: string) {
+    const registeredMessage = messageRegistry.get(message)!;
 
-  // Add the aria-describedby reference and set the describedby_host attribute to mark the element.
-  addAriaReferencedId(element, 'aria-describedby', registeredMessage.messageElement.id);
-  element.setAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE, '');
+    // Add the aria-describedby reference and set the
+    // describedby_host attribute to mark the element.
+    addAriaReferencedId(element, 'aria-describedby', registeredMessage.messageElement.id);
+    element.setAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE, '');
 
-  registeredMessage.referenceCount++;
-}
+    registeredMessage.referenceCount++;
+  }
 
-/**
- * Removes a message reference from the element using aria-describedby and decrements the registered
- * message's reference count.
- */
-function removeMessageReference(element: Element, message: string) {
-  const registeredMessage = messageRegistry.get(message)!;
-  registeredMessage.referenceCount--;
+  /**
+   * Removes a message reference from the element using aria-describedby
+   * and decrements the registered message's reference count.
+   */
+  private _removeMessageReference(element: Element, message: string) {
+    const registeredMessage = messageRegistry.get(message)!;
+    registeredMessage.referenceCount--;
 
-  removeAriaReferencedId(element, 'aria-describedby', registeredMessage.messageElement.id);
-  element.removeAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE);
-}
+    removeAriaReferencedId(element, 'aria-describedby', registeredMessage.messageElement.id);
+    element.removeAttribute(CDK_DESCRIBEDBY_HOST_ATTRIBUTE);
+  }
+
+  /** Returns true if the element has been described by the provided message ID. */
+  private _isElementDescribedByMessage(element: Element, message: string): boolean {
+    const referenceIds = getAriaReferenceIds(element, 'aria-describedby');
+    const registeredMessage = messageRegistry.get(message);
+    const messageId = registeredMessage && registeredMessage.messageElement.id;
 
-/** Returns true if the element has been described by the provided message ID. */
-function isElementDescribedByMessage(element: Element, message: string): boolean {
-  const referenceIds = getAriaReferenceIds(element, 'aria-describedby');
-  const registeredMessage = messageRegistry.get(message);
-  const messageId = registeredMessage && registeredMessage.messageElement.id;
+    return !!messageId && referenceIds.indexOf(messageId) != -1;
+  }
 
-  return !!messageId && referenceIds.indexOf(messageId) != -1;
 }
 
 /** @docs-private */
-export function ARIA_DESCRIBER_PROVIDER_FACTORY(
-    parentDispatcher: AriaDescriber, platform: Platform) {
-  return parentDispatcher || new AriaDescriber(platform);
+export function ARIA_DESCRIBER_PROVIDER_FACTORY(parentDispatcher: AriaDescriber, _document: any) {
+  return parentDispatcher || new AriaDescriber(_document);
 }
 
 /** @docs-private */
@@ -198,7 +205,7 @@ export const ARIA_DESCRIBER_PROVIDER = {
   provide: AriaDescriber,
   deps: [
     [new Optional(), new SkipSelf(), AriaDescriber],
-    Platform
+    DOCUMENT as InjectionToken<any>
   ],
   useFactory: ARIA_DESCRIBER_PROVIDER_FACTORY
 };

From 560f1b6f8edd0918974f14d4a60c8fb0198e26ef Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 18:41:14 +0100
Subject: [PATCH 489/575] refactor(focus-trap): better handling of server-side
 rendering (#8519)

Now that Angular is using Domino, we don't have to completely shut off the focus trap when rendering on the server. These changes remove all the old checks and use the correct document injection token.
---
 src/cdk/a11y/focus-trap.ts                    | 41 +++++++++----------
 .../kitchen-sink/kitchen-sink.html            |  6 +++
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index f6e217133c6e..a1205cdf58a2 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -14,11 +14,12 @@ import {
   OnDestroy,
   AfterContentInit,
   Injectable,
+  Inject,
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {Platform} from '@angular/cdk/platform';
 import {first} from 'rxjs/operators/first';
 import {InteractivityChecker} from './interactivity-checker';
+import {DOCUMENT} from '@angular/common';
 
 
 /**
@@ -45,9 +46,9 @@ export class FocusTrap {
 
   constructor(
     private _element: HTMLElement,
-    private _platform: Platform,
     private _checker: InteractivityChecker,
     private _ngZone: NgZone,
+    private _document: Document,
     deferAnchors = false) {
 
     if (!deferAnchors) {
@@ -73,11 +74,6 @@ export class FocusTrap {
    * in the constructor, but can be deferred for cases like directives with `*ngIf`.
    */
   attachAnchors(): void {
-    // If we're not on the browser, there can be no focus to trap.
-    if (!this._platform.isBrowser) {
-      return;
-    }
-
     if (!this._startAnchor) {
       this._startAnchor = this._createAnchor();
     }
@@ -144,10 +140,6 @@ export class FocusTrap {
    * @returns The boundary element.
    */
   private _getRegionBoundary(bound: 'start' | 'end'): HTMLElement | null {
-    if (!this._platform.isBrowser) {
-      return null;
-    }
-
     // Contains the deprecated version of selector, for temporary backwards comparability.
     let markers = this._element.querySelectorAll(`[cdk-focus-region-${bound}], ` +
                                                  `[cdkFocusRegion${bound}], ` +
@@ -175,10 +167,6 @@ export class FocusTrap {
    * @returns Whether focus was moved successfuly.
    */
   focusInitialElement(): boolean {
-    if (!this._platform.isBrowser) {
-      return false;
-    }
-
     // Contains the deprecated version of selector, for temporary backwards comparability.
     const redirectToElement = this._element.querySelector(`[cdk-focus-initial], ` +
                                                           `[cdkFocusInitial]`) as HTMLElement;
@@ -271,7 +259,7 @@ export class FocusTrap {
 
   /** Creates an anchor element. */
   private _createAnchor(): HTMLElement {
-    let anchor = document.createElement('div');
+    const anchor = this._document.createElement('div');
     anchor.tabIndex = this._enabled ? 0 : -1;
     anchor.classList.add('cdk-visually-hidden');
     anchor.classList.add('cdk-focus-trap-anchor');
@@ -292,10 +280,15 @@ export class FocusTrap {
 /** Factory that allows easy instantiation of focus traps. */
 @Injectable()
 export class FocusTrapFactory {
+  private _document: Document;
+
   constructor(
       private _checker: InteractivityChecker,
-      private _platform: Platform,
-      private _ngZone: NgZone) { }
+      private _ngZone: NgZone,
+      @Inject(DOCUMENT) _document: any) {
+
+    this._document = _document;
+  }
 
   /**
    * Creates a focus-trapped region around the given element.
@@ -306,7 +299,7 @@ export class FocusTrapFactory {
    */
   create(element: HTMLElement, deferCaptureElements: boolean = false): FocusTrap {
     return new FocusTrap(
-        element, this._platform, this._checker, this._ngZone, deferCaptureElements);
+        element, this._checker, this._ngZone, this._document, deferCaptureElements);
   }
 }
 
@@ -349,6 +342,8 @@ export class FocusTrapDeprecatedDirective implements OnDestroy, AfterContentInit
   exportAs: 'cdkTrapFocus',
 })
 export class CdkTrapFocus implements OnDestroy, AfterContentInit {
+  private _document: Document;
+
   /** Underlying FocusTrap instance. */
   focusTrap: FocusTrap;
 
@@ -372,7 +367,9 @@ export class CdkTrapFocus implements OnDestroy, AfterContentInit {
   constructor(
       private _elementRef: ElementRef,
       private _focusTrapFactory: FocusTrapFactory,
-      private _platform: Platform) {
+      @Inject(DOCUMENT) _document: any) {
+
+    this._document = _document;
     this.focusTrap = this._focusTrapFactory.create(this._elementRef.nativeElement, true);
   }
 
@@ -390,8 +387,8 @@ export class CdkTrapFocus implements OnDestroy, AfterContentInit {
   ngAfterContentInit() {
     this.focusTrap.attachAnchors();
 
-    if (this.autoCapture && this._platform.isBrowser) {
-      this._previouslyFocusedElement = document.activeElement as HTMLElement;
+    if (this.autoCapture) {
+      this._previouslyFocusedElement = this._document.activeElement as HTMLElement;
       this.focusTrap.focusInitialElementWhenReady();
     }
   }
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 6330e55cfc8d..1a504ebcb28a 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -313,3 +313,9 @@ <h2>Horizontal Stepper</h2>
   <mat-step label="Step 1">Content 1</mat-step>
   <mat-step label="Step 2">Content 2</mat-step>
 </mat-horizontal-stepper>
+
+<h2>Focus trap</h2>
+
+<div cdkTrapFocus cdkTrapFocusAutoCapture>
+  <button>Oh no, I'm trapped!</button>
+</div>

From 81db650f9fb27fda4751b1d8116bb21ed99037ae Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 20 Nov 2017 09:42:09 -0800
Subject: [PATCH 490/575] fix(chip): fix placeholder and text overlap (#8468)

---
 src/lib/chips/chip-input.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 6e3ec4ca6613..1bc9492a1e1e 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -29,6 +29,7 @@ export interface MatChipInputEvent {
     '(keydown)': '_keydown($event)',
     '(blur)': '_blur()',
     '(focus)': '_focus()',
+    '(input)': '_onInput()',
   }
 })
 export class MatChipInput {
@@ -68,7 +69,7 @@ export class MatChipInput {
 
   get empty(): boolean {
     let value: string | null = this._inputElement.value;
-    return value == null || value === '';
+    return (value == null || value === '');
   }
 
   /** The native input element to which this directive is attached. */
@@ -115,5 +116,10 @@ export class MatChipInput {
     }
   }
 
+  _onInput() {
+    // Let chip list know whenever the value changes.
+    this._chipList.stateChanges.next();
+  }
+
   focus() { this._inputElement.focus(); }
 }

From d2aa774a9933c0b285a6ff63e11132d882645c69 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 18:42:36 +0100
Subject: [PATCH 491/575] chore(overlay): remove duplicate ComponentType
 interface (#8450)

* Removes a duplicated `ComponentType` interface from the `@angular/cdk/overlay`. The `ComponentType` interface should live in the portal entry point.
---
 src/cdk/overlay/generic-component-type.ts | 11 -----------
 src/cdk/portal/portal.ts                  |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 src/cdk/overlay/generic-component-type.ts

diff --git a/src/cdk/overlay/generic-component-type.ts b/src/cdk/overlay/generic-component-type.ts
deleted file mode 100644
index 200256516ee8..000000000000
--- a/src/cdk/overlay/generic-component-type.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-export interface ComponentType<T> {
-  new (...args: any[]): T;
-}
diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts
index ebec03010f3f..697e0f95ac81 100644
--- a/src/cdk/portal/portal.ts
+++ b/src/cdk/portal/portal.ts
@@ -23,7 +23,7 @@ import {
     throwUnknownPortalTypeError
 } from './portal-errors';
 
-
+/** Interface that can be used to generically type a class. */
 export interface ComponentType<T> {
   new (...args: any[]): T;
 }

From 43217ef42297ac794854a8a1107f4cb06403dc3d Mon Sep 17 00:00:00 2001
From: Elad Bezalel <Elad.bezalel@gmail.com>
Date: Mon, 20 Nov 2017 19:43:11 +0200
Subject: [PATCH 492/575] fix(fab-buttons): vertically align icons inside fab
 buttons (#8442)

Adds `.mat-fab` & `.mat-mini-fab`to the vertical align definition of buttons
---
 src/lib/button/button.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index f698b24bbeea..952889dd9a34 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -51,7 +51,7 @@
 }
 
 // The text and icon should be vertical aligned inside a button
-.mat-button, .mat-raised-button, .mat-icon-button {
+.mat-button, .mat-raised-button, .mat-icon-button, .mat-fab, .mat-mini-fab {
   color: currentColor;
   .mat-button-wrapper > * {
     vertical-align: middle;

From 47055a74e3752123369a520f4c0655a3e6a0776e Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 18:43:28 +0100
Subject: [PATCH 493/575] fix(input): remove native IE reveal icon (#8439)

Removes the password reveal icon, that IE adds by default on inputs, for cross-browser consistency.

Fixes #8390.
---
 src/lib/input/input.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/input/input.scss b/src/lib/input/input.scss
index 6fe27e42aee2..df6f32feacc0 100644
--- a/src/lib/input/input.scss
+++ b/src/lib/input/input.scss
@@ -32,8 +32,8 @@
     box-shadow: none;
   }
 
-  // Remove IE's default clear icon.
-  &::-ms-clear {
+  // Remove IE's default clear and reveal icons.
+  &::-ms-clear, &::-ms-reveal {
     display: none;
   }
 

From c7ab8779b583ce67c0e46143daf2a2217af27674 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 18:44:08 +0100
Subject: [PATCH 494/575] fix(form-field): jumping underline in Edge and
 Firefox (#8480)

* In Edge and Firefox the underline jumps due to the `transform: perspective`. Also due to the `transform` the underline is getting slightly taller which isn't aligning with the specs.
* Improves rendering of the ripple underline by always setting the 2px height. Since the element only uses `1px` if there are form-field errors the height can be adjusted on errors instead of on every focus/blur.

Fixes #8395
---
 src/lib/form-field/form-field.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 9f1b72717736..1f3ace6279d8 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -150,8 +150,6 @@ $mat-form-field-default-infix-width: 180px !default;
   position: absolute;
   height: $mat-form-field-underline-height;
   width: 100%;
-  // Prevents underline from disappearing at lower zoom levels.
-  transform: perspective(1px);
 
   .mat-form-field-disabled & {
     background-position: 0;
@@ -160,17 +158,17 @@ $mat-form-field-default-infix-width: 180px !default;
 
   .mat-form-field-ripple {
     position: absolute;
-    height: $mat-form-field-underline-height;
     top: 0;
     left: 0;
     width: 100%;
+    height: $mat-form-field-underline-height * 2;
     transform-origin: 50%;
     transform: scaleX(0.5);
     visibility: hidden;
     transition: background-color $swift-ease-in-duration $swift-ease-in-timing-function;
 
-    .mat-focused & {
-      height: $mat-form-field-underline-height * 2;
+    .mat-form-field-invalid:not(.mat-focused) & {
+      height: $mat-form-field-underline-height;
     }
 
     .mat-focused &,

From 0f83b2001e25c792cc449ffaf503d4f542f53f63 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 18:44:42 +0100
Subject: [PATCH 495/575] fix(overlay): better handling of server-side
 rendering (#8422)

Fixes multiple server-side rendering issues in the overlay that were causing errors when an overlay is opened in Universal.

Fixes #8412.
---
 src/cdk/a11y/live-announcer.ts                | 26 +++++++++----------
 src/cdk/bidi/bidi-module.ts                   |  2 +-
 .../keyboard/overlay-keyboard-dispatcher.ts   | 19 ++++++++++----
 src/cdk/overlay/overlay-container.ts          | 21 ++++++++++-----
 src/cdk/overlay/overlay.ts                    |  7 +++--
 .../connected-position-strategy.spec.ts       | 20 +++++++-------
 .../position/connected-position-strategy.ts   |  7 ++---
 .../position/global-position-strategy.spec.ts |  2 +-
 .../position/global-position-strategy.ts      | 10 ++++---
 .../position/overlay-position-builder.ts      | 13 ++++++----
 src/demo-app/dialog/dialog-demo.ts            |  2 +-
 src/lib/autocomplete/autocomplete-trigger.ts  |  2 +-
 src/lib/datepicker/datepicker.ts              |  2 +-
 src/lib/dialog/dialog-container.ts            |  2 +-
 src/lib/sidenav/drawer.ts                     |  2 +-
 .../kitchen-sink/kitchen-sink.ts              | 11 +++++---
 16 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/src/cdk/a11y/live-announcer.ts b/src/cdk/a11y/live-announcer.ts
index 9c30e63c3f15..7bf205f031e4 100644
--- a/src/cdk/a11y/live-announcer.ts
+++ b/src/cdk/a11y/live-announcer.ts
@@ -14,7 +14,7 @@ import {
   SkipSelf,
   OnDestroy,
 } from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
+import {DOCUMENT} from '@angular/common';
 
 
 export const LIVE_ANNOUNCER_ELEMENT_TOKEN = new InjectionToken<HTMLElement>('liveAnnouncerElement');
@@ -28,14 +28,12 @@ export class LiveAnnouncer implements OnDestroy {
 
   constructor(
       @Optional() @Inject(LIVE_ANNOUNCER_ELEMENT_TOKEN) elementToken: any,
-      platform: Platform) {
-    // Only do anything if we're on the browser platform.
-    if (platform.isBrowser) {
-      // We inject the live element as `any` because the constructor signature cannot reference
-      // browser globals (HTMLElement) on non-browser environments, since having a class decorator
-      // causes TypeScript to preserve the constructor signature types.
-      this._liveElement = elementToken || this._createLiveElement();
-    }
+      @Inject(DOCUMENT) private _document: any) {
+
+    // We inject the live element as `any` because the constructor signature cannot reference
+    // browser globals (HTMLElement) on non-browser environments, since having a class decorator
+    // causes TypeScript to preserve the constructor signature types.
+    this._liveElement = elementToken || this._createLiveElement();
   }
 
   /**
@@ -64,13 +62,13 @@ export class LiveAnnouncer implements OnDestroy {
   }
 
   private _createLiveElement(): Element {
-    let liveEl = document.createElement('div');
+    let liveEl = this._document.createElement('div');
 
     liveEl.classList.add('cdk-visually-hidden');
     liveEl.setAttribute('aria-atomic', 'true');
     liveEl.setAttribute('aria-live', 'polite');
 
-    document.body.appendChild(liveEl);
+    this._document.body.appendChild(liveEl);
 
     return liveEl;
   }
@@ -79,8 +77,8 @@ export class LiveAnnouncer implements OnDestroy {
 
 /** @docs-private */
 export function LIVE_ANNOUNCER_PROVIDER_FACTORY(
-    parentDispatcher: LiveAnnouncer, liveElement: any, platform: Platform) {
-  return parentDispatcher || new LiveAnnouncer(liveElement, platform);
+    parentDispatcher: LiveAnnouncer, liveElement: any, _document: any) {
+  return parentDispatcher || new LiveAnnouncer(liveElement, _document);
 }
 
 /** @docs-private */
@@ -90,7 +88,7 @@ export const LIVE_ANNOUNCER_PROVIDER = {
   deps: [
     [new Optional(), new SkipSelf(), LiveAnnouncer],
     [new Optional(), new Inject(LIVE_ANNOUNCER_ELEMENT_TOKEN)],
-    Platform,
+    DOCUMENT,
   ],
   useFactory: LIVE_ANNOUNCER_PROVIDER_FACTORY
 };
diff --git a/src/cdk/bidi/bidi-module.ts b/src/cdk/bidi/bidi-module.ts
index de5f96118d94..84c482f100d7 100644
--- a/src/cdk/bidi/bidi-module.ts
+++ b/src/cdk/bidi/bidi-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 import {Dir} from './dir';
 import {DIR_DOCUMENT, Directionality} from './directionality';
 
diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
index 55c1f2c87d91..d7327788d635 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
+import {Injectable, Inject, InjectionToken, Optional, SkipSelf, OnDestroy} from '@angular/core';
 import {OverlayRef} from '../overlay-ref';
 import {Subscription} from 'rxjs/Subscription';
 import {filter} from 'rxjs/operators/filter';
 import {fromEvent} from 'rxjs/observable/fromEvent';
+import {DOCUMENT} from '@angular/common';
 
 /**
  * Service for dispatching keyboard events that land on the body to appropriate overlay ref,
@@ -25,6 +26,8 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
 
   private _keydownEventSubscription: Subscription | null;
 
+  constructor(@Inject(DOCUMENT) private _document: any) {}
+
   ngOnDestroy() {
     if (this._keydownEventSubscription) {
       this._keydownEventSubscription.unsubscribe();
@@ -55,7 +58,7 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
    * events to the appropriate overlay.
    */
   private _subscribeToKeydownEvents(): void {
-    const bodyKeydownEvents = fromEvent<KeyboardEvent>(document.body, 'keydown');
+    const bodyKeydownEvents = fromEvent<KeyboardEvent>(this._document.body, 'keydown');
 
     this._keydownEventSubscription = bodyKeydownEvents.pipe(
       filter(() => !!this._attachedOverlays.length)
@@ -81,8 +84,8 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
 
 /** @docs-private */
 export function OVERLAY_KEYBOARD_DISPATCHER_PROVIDER_FACTORY(
-    dispatcher: OverlayKeyboardDispatcher) {
-  return dispatcher || new OverlayKeyboardDispatcher();
+    dispatcher: OverlayKeyboardDispatcher, _document: any) {
+  return dispatcher || new OverlayKeyboardDispatcher(_document);
 }
 
 /** @docs-private */
@@ -90,6 +93,12 @@ export const OVERLAY_KEYBOARD_DISPATCHER_PROVIDER = {
   // If there is already an OverlayKeyboardDispatcher available, use that.
   // Otherwise, provide a new one.
   provide: OverlayKeyboardDispatcher,
-  deps: [[new Optional(), new SkipSelf(), OverlayKeyboardDispatcher]],
+  deps: [
+    [new Optional(), new SkipSelf(), OverlayKeyboardDispatcher],
+
+    // Coerce to `InjectionToken` so that the `deps` match the "shape"
+    // of the type expected by Angular
+    DOCUMENT as InjectionToken<any>
+  ],
   useFactory: OVERLAY_KEYBOARD_DISPATCHER_PROVIDER_FACTORY
 };
diff --git a/src/cdk/overlay/overlay-container.ts b/src/cdk/overlay/overlay-container.ts
index 25aea7618478..5579b73dc632 100644
--- a/src/cdk/overlay/overlay-container.ts
+++ b/src/cdk/overlay/overlay-container.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
+import {Injectable, InjectionToken, Inject, Optional, SkipSelf, OnDestroy} from '@angular/core';
+import {DOCUMENT} from '@angular/common';
 
 
 /** Container inside which all overlays will render. */
@@ -14,6 +15,8 @@ import {Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
 export class OverlayContainer implements OnDestroy {
   protected _containerElement: HTMLElement;
 
+  constructor(@Inject(DOCUMENT) private _document: any) {}
+
   ngOnDestroy() {
     if (this._containerElement && this._containerElement.parentNode) {
       this._containerElement.parentNode.removeChild(this._containerElement);
@@ -36,23 +39,27 @@ export class OverlayContainer implements OnDestroy {
    * with the 'cdk-overlay-container' class on the document body.
    */
   protected _createContainer(): void {
-    let container = document.createElement('div');
-    container.classList.add('cdk-overlay-container');
+    const container = this._document.createElement('div');
 
-    document.body.appendChild(container);
+    container.classList.add('cdk-overlay-container');
+    this._document.body.appendChild(container);
     this._containerElement = container;
   }
 }
 
 /** @docs-private */
-export function OVERLAY_CONTAINER_PROVIDER_FACTORY(parentContainer: OverlayContainer) {
-  return parentContainer || new OverlayContainer();
+export function OVERLAY_CONTAINER_PROVIDER_FACTORY(parentContainer: OverlayContainer,
+  _document: any) {
+  return parentContainer || new OverlayContainer(_document);
 }
 
 /** @docs-private */
 export const OVERLAY_CONTAINER_PROVIDER = {
   // If there is already an OverlayContainer available, use that. Otherwise, provide a new one.
   provide: OverlayContainer,
-  deps: [[new Optional(), new SkipSelf(), OverlayContainer]],
+  deps: [
+    [new Optional(), new SkipSelf(), OverlayContainer],
+    DOCUMENT as InjectionToken<any> // We need to use the InjectionToken somewhere to keep TS happy
+  ],
   useFactory: OVERLAY_CONTAINER_PROVIDER_FACTORY
 };
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 8b3e1601bb76..c6e75901f13e 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -12,6 +12,7 @@ import {
   ApplicationRef,
   Injector,
   NgZone,
+  Inject,
 } from '@angular/core';
 import {DomPortalOutlet} from '@angular/cdk/portal';
 import {OverlayConfig} from './overlay-config';
@@ -20,6 +21,7 @@ import {OverlayPositionBuilder} from './position/overlay-position-builder';
 import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {OverlayContainer} from './overlay-container';
 import {ScrollStrategyOptions} from './scroll/index';
+import {DOCUMENT} from '@angular/common';
 
 
 /** Next overlay unique ID. */
@@ -48,7 +50,8 @@ export class Overlay {
               private _keyboardDispatcher: OverlayKeyboardDispatcher,
               private _appRef: ApplicationRef,
               private _injector: Injector,
-              private _ngZone: NgZone) { }
+              private _ngZone: NgZone,
+              @Inject(DOCUMENT) private _document: any) { }
 
   /**
    * Creates an overlay.
@@ -75,7 +78,7 @@ export class Overlay {
    * @returns Newly-created pane element
    */
   private _createPaneElement(): HTMLElement {
-    let pane = document.createElement('div');
+    const pane = this._document.createElement('div');
 
     pane.id = `cdk-overlay-${nextUniqueId++}`;
     pane.classList.add('cdk-overlay-pane');
diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index 93c3630e7a9e..bf205a59f654 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -58,7 +58,7 @@ describe('ConnectedPositionStrategy', () => {
       overlayContainerElement.appendChild(overlayElement);
 
       fakeElementRef = new FakeElementRef(originElement);
-      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
     });
 
     afterEach(() => {
@@ -177,7 +177,7 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should reposition the overlay if it would go off the bottom of the screen', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler);
+        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
 
         originElement.style.bottom = '25px';
         originElement.style.left = '200px';
@@ -200,7 +200,7 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should reposition the overlay if it would go off the right of the screen', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler);
+        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
 
         originElement.style.top = '200px';
         originElement.style.right = '25px';
@@ -224,7 +224,7 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should recalculate and set the last position with recalculateLastPosition()', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler);
+        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
 
         // Push the trigger down so the overlay doesn't have room to open on the bottom.
         originElement.style.bottom = '25px';
@@ -254,7 +254,7 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should default to the initial position, if no positions fit in the viewport', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler);
+        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
 
         // Make the origin element taller than the viewport.
         originElement.style.height = '1000px';
@@ -353,7 +353,7 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should emit onPositionChange event when position changes', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       originElement.style.top = '200px';
       originElement.style.right = '25px';
 
@@ -390,7 +390,7 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should emit the onPositionChange event even if none of the positions fit', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       originElement.style.bottom = '25px';
       originElement.style.right = '25px';
 
@@ -414,7 +414,7 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should pick the fallback position that shows the largest area of the element', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
 
       originElement.style.top = '200px';
       originElement.style.right = '25px';
@@ -561,7 +561,7 @@ describe('ConnectedPositionStrategy', () => {
       scrollable.appendChild(originElement);
 
       // Create a strategy with knowledge of the scrollable container
-      let positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      let positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       let fakeElementRef = new FakeElementRef(originElement);
       strategy = positionBuilder.connectedTo(
           fakeElementRef,
@@ -655,7 +655,7 @@ describe('ConnectedPositionStrategy', () => {
       overlayContainerElement.appendChild(overlayElement);
 
       fakeElementRef = new FakeElementRef(originElement);
-      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
     });
 
     afterEach(() => {
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 10dcbdfe4320..9d5f860718e2 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -80,7 +80,8 @@ export class ConnectedPositionStrategy implements PositionStrategy {
       originPos: OriginConnectionPosition,
       overlayPos: OverlayConnectionPosition,
       private _connectedTo: ElementRef,
-      private _viewportRuler: ViewportRuler) {
+      private _viewportRuler: ViewportRuler,
+      private _document: any) {
     this._origin = this._connectedTo.nativeElement;
     this.withFallbackPosition(originPos, overlayPos);
   }
@@ -359,7 +360,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
     // from the bottom of the viewport rather than the top.
     let y = verticalStyleProperty === 'top' ?
         overlayPoint.y :
-        document.documentElement.clientHeight - (overlayPoint.y + overlayRect.height);
+        this._document.documentElement.clientHeight - (overlayPoint.y + overlayRect.height);
 
     // We want to set either `left` or `right` based on whether the overlay wants to appear "before"
     // or "after" the origin, which determines the direction in which the element will expand.
@@ -376,7 +377,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
     // from the right edge of the viewport rather than the left edge.
     let x = horizontalStyleProperty === 'left' ?
       overlayPoint.x :
-      document.documentElement.clientWidth - (overlayPoint.x + overlayRect.width);
+      this._document.documentElement.clientWidth - (overlayPoint.x + overlayRect.width);
 
 
     // Reset any existing styles. This is necessary in case the preferred position has
diff --git a/src/cdk/overlay/position/global-position-strategy.spec.ts b/src/cdk/overlay/position/global-position-strategy.spec.ts
index 6a3fe36dc886..5954a769731e 100644
--- a/src/cdk/overlay/position/global-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/global-position-strategy.spec.ts
@@ -8,7 +8,7 @@ describe('GlobalPositonStrategy', () => {
 
   beforeEach(() => {
     element = document.createElement('div');
-    strategy = new GlobalPositionStrategy();
+    strategy = new GlobalPositionStrategy(document);
     document.body.appendChild(element);
     strategy.attach({overlayElement: element} as OverlayRef);
   });
diff --git a/src/cdk/overlay/position/global-position-strategy.ts b/src/cdk/overlay/position/global-position-strategy.ts
index 9e8840a55a7a..d5b3fce50105 100644
--- a/src/cdk/overlay/position/global-position-strategy.ts
+++ b/src/cdk/overlay/position/global-position-strategy.ts
@@ -33,6 +33,8 @@ export class GlobalPositionStrategy implements PositionStrategy {
   /* A lazily-created wrapper for the overlay element that is used as a flex container.  */
   private _wrapper: HTMLElement | null = null;
 
+  constructor(private _document: any) {}
+
   attach(overlayRef: OverlayRef): void {
     this._overlayRef = overlayRef;
   }
@@ -147,10 +149,10 @@ export class GlobalPositionStrategy implements PositionStrategy {
     const element = this._overlayRef.overlayElement;
 
     if (!this._wrapper && element.parentNode) {
-      this._wrapper = document.createElement('div');
-      this._wrapper.classList.add('cdk-global-overlay-wrapper');
-      element.parentNode.insertBefore(this._wrapper, element);
-      this._wrapper.appendChild(element);
+      this._wrapper = this._document.createElement('div');
+      this._wrapper!.classList.add('cdk-global-overlay-wrapper');
+      element.parentNode.insertBefore(this._wrapper!, element);
+      this._wrapper!.appendChild(element);
     }
 
     let styles = element.style;
diff --git a/src/cdk/overlay/position/overlay-position-builder.ts b/src/cdk/overlay/position/overlay-position-builder.ts
index 07eda8bd61db..19059e4ac6ca 100644
--- a/src/cdk/overlay/position/overlay-position-builder.ts
+++ b/src/cdk/overlay/position/overlay-position-builder.ts
@@ -6,24 +6,25 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ElementRef, Injectable} from '@angular/core';
+import {ElementRef, Injectable, Inject} from '@angular/core';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {ConnectedPositionStrategy} from './connected-position-strategy';
 import {GlobalPositionStrategy} from './global-position-strategy';
 import {OverlayConnectionPosition, OriginConnectionPosition} from './connected-position';
-
+import {DOCUMENT} from '@angular/common';
 
 
 /** Builder for overlay position strategy. */
 @Injectable()
 export class OverlayPositionBuilder {
-  constructor(private _viewportRuler: ViewportRuler) { }
+  constructor(private _viewportRuler: ViewportRuler,
+              @Inject(DOCUMENT) private _document: any) { }
 
   /**
    * Creates a global position strategy.
    */
   global(): GlobalPositionStrategy {
-    return new GlobalPositionStrategy();
+    return new GlobalPositionStrategy(this._document);
   }
 
   /**
@@ -36,6 +37,8 @@ export class OverlayPositionBuilder {
       elementRef: ElementRef,
       originPos: OriginConnectionPosition,
       overlayPos: OverlayConnectionPosition): ConnectedPositionStrategy {
-    return new ConnectedPositionStrategy(originPos, overlayPos, elementRef, this._viewportRuler);
+
+    return new ConnectedPositionStrategy(originPos, overlayPos, elementRef,
+        this._viewportRuler, this._document);
   }
 }
diff --git a/src/demo-app/dialog/dialog-demo.ts b/src/demo-app/dialog/dialog-demo.ts
index e857bd564766..8e4ba9e3bd7a 100644
--- a/src/demo-app/dialog/dialog-demo.ts
+++ b/src/demo-app/dialog/dialog-demo.ts
@@ -7,7 +7,7 @@
  */
 
 import {Component, Inject, ViewChild, TemplateRef} from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 import {MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
 
 const defaultDialogConfig = new MatDialogConfig();
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index e92e2dd44143..58d145dde1ea 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -39,7 +39,7 @@ import {
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
 import {MatOption, MatOptionSelectionChange} from '@angular/material/core';
 import {MatFormField} from '@angular/material/form-field';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {fromEvent} from 'rxjs/observable/fromEvent';
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index ae0bd02aab63..d84436266626 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -38,7 +38,7 @@ import {
 } from '@angular/core';
 import {DateAdapter} from '@angular/material/core';
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {MatCalendar} from './calendar';
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 5753f2d57169..42a10c95c8a4 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -20,7 +20,7 @@ import {
   ChangeDetectionStrategy,
 } from '@angular/core';
 import {animate, AnimationEvent, state, style, transition, trigger} from '@angular/animations';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 import {
   BasePortalOutlet,
   ComponentPortal,
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 6a9b4410b062..d60409ec7ef2 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -30,7 +30,7 @@ import {
   Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 import {merge} from 'rxjs/observable/merge';
 import {filter} from 'rxjs/operators/filter';
 import {first} from 'rxjs/operators/first';
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index 63f16c1ada0e..3eb7b301f771 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -35,6 +35,7 @@ import {
   MatToolbarModule,
   MatTooltipModule,
   MatStepperModule,
+  MatSnackBar,
 } from '@angular/material';
 import {
   CdkTableModule,
@@ -55,13 +56,15 @@ export class KitchenSink {
 
   /** Data source for the CDK and Material table. */
   tableDataSource: DataSource<any> = {
-    connect: () => Observable.of([
-      { userId: 1 },
-      { userId: 2 }
-    ]),
+    connect: () => Observable.of([{userId: 1}, {userId: 2}]),
     disconnect: () => {}
   };
 
+  constructor(snackBar: MatSnackBar) {
+    // Open a snack bar to do a basic sanity check of the overlays.
+    snackBar.open('Hello there');
+  }
+
 }
 
 

From d6f287e33d44b37f9589f3a4bfae5b47e3c9074c Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 18:45:07 +0100
Subject: [PATCH 496/575] fix(slide-toggle): drag not working in edge (#8421)

Some browsers like Edge or IE11 emit `click` events differently than other browsers like Chrome. For example does Edge still emit a `click` event if the pointer drags something around and is being released over the `<label>` element. This doesn't happen on Chrome.

Right now this means that the new checked state from the drag is being reverted by the `click` event that then causes a `change` event on the underlying input element. To ensure that the behavior is the same across all supported browsers, the checked state from the `click` event is being ignored while dragging.

Fixes #8391
---
 src/lib/slide-toggle/slide-toggle.spec.ts | 23 ++++++++++++++++
 src/lib/slide-toggle/slide-toggle.ts      | 33 +++++++++++------------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
index 3c360b656ec4..b95bf06c96e3 100644
--- a/src/lib/slide-toggle/slide-toggle.spec.ts
+++ b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -475,6 +475,29 @@ describe('MatSlideToggle without forms', () => {
           .toBeFalsy('Expected the slide-toggle to not emit a change event.');
     }));
 
+    it('should ignore clicks on the label element while dragging', fakeAsync(() => {
+      expect(slideToggle.checked).toBe(false);
+
+      gestureConfig.emitEventForElement('slidestart', slideThumbContainer);
+      gestureConfig.emitEventForElement('slide', slideThumbContainer, {
+        deltaX: 200 // Arbitrary, large delta that will be clamped to the end of the slide-toggle.
+      });
+      gestureConfig.emitEventForElement('slideend', slideThumbContainer);
+
+      expect(slideToggle.checked).toBe(true);
+
+      // Fake a change event that has been fired after dragging through the click on pointer
+      // release (noticeable on IE11, Edge)
+      inputElement.checked = false;
+      dispatchFakeEvent(inputElement, 'change');
+
+      // Flush the timeout for the slide ending.
+      tick();
+
+      expect(slideThumbContainer.classList).not.toContain('mat-dragging');
+      expect(slideToggle.checked).toBe(true);
+    }));
+
     it('should update the checked property of the input', fakeAsync(() => {
       expect(inputElement.checked).toBe(false);
 
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 7d0110bbde97..786e3227af3d 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -161,32 +161,31 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
     this._focusMonitor.stopMonitoring(this._inputElement.nativeElement);
   }
 
-  /**
-   * This function will called if the underlying input changed its value through user interaction.
-   */
+  /** Method being called whenever the underlying input emits a change event. */
   _onChangeEvent(event: Event) {
     // We always have to stop propagation on the change event.
     // Otherwise the change event, from the input element, will bubble up and
     // emit its event object to the component's `change` output.
     event.stopPropagation();
 
-    // Sync the value from the underlying input element with the slide-toggle component.
+    // Releasing the pointer over the `<label>` element while dragging triggers another
+    // click event on the `<label>` element. This means that the checked state of the underlying
+    // input changed unintentionally and needs to be changed back.
+    if (this._slideRenderer.dragging) {
+      this._inputElement.nativeElement.checked = this.checked;
+      return;
+    }
+
+    // Sync the value from the underlying input element with the component instance.
     this.checked = this._inputElement.nativeElement.checked;
 
-    // Emit our custom change event if the native input emitted one.
-    // It is important to only emit it, if the native input triggered one, because we don't want
-    // to trigger a change event, when the `checked` variable changes programmatically.
+    // Emit our custom change event only if the underlying input emitted one. This ensures that
+    // there is no change event, when the checked state changes programmatically.
     this._emitChangeEvent();
   }
 
+  /** Method being called whenever the slide-toggle has been clicked. */
   _onInputClick(event: Event) {
-    // In some situations the user will release the mouse on the label element. The label element
-    // redirects the click to the underlying input element and will result in a value change.
-    // Prevent the default behavior if dragging, because the value will be set after drag.
-    if (this._slideRenderer.dragging) {
-      event.preventDefault();
-    }
-
     // We have to stop propagation for click events on the visual hidden input element.
     // By default, when a user clicks on a label element, a generated click event will be
     // dispatched on the associated input element. Since we are using a label element as our
@@ -269,10 +268,10 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
 
   _onDragEnd() {
     if (this._slideRenderer.dragging) {
-      let _previousChecked = this.checked;
-      this.checked = this._slideRenderer.dragPercentage > 50;
+      const newCheckedValue = this._slideRenderer.dragPercentage > 50;
 
-      if (_previousChecked !== this.checked) {
+      if (newCheckedValue !== this.checked) {
+        this.checked = newCheckedValue;
         this._emitChangeEvent();
       }
 

From f6bd9b03c0c8377d242ffe0ddbc85a2ea4560d93 Mon Sep 17 00:00:00 2001
From: Anthon Nilsson <anthon.nilsson@gmail.com>
Date: Mon, 20 Nov 2017 19:04:09 +0100
Subject: [PATCH 497/575] fix(expansion): prevent memory leak by calling parent
 ngOnDestroy (#8410)

---
 src/lib/expansion/expansion-panel.ts |  1 +
 src/lib/expansion/expansion.spec.ts  | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index f04cb2cdc44a..6e6144a004b3 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -142,6 +142,7 @@ export class MatExpansionPanel extends _MatExpansionPanelMixinBase
   }
 
   ngOnDestroy() {
+    super.ngOnDestroy();
     this._inputChanges.complete();
   }
 }
diff --git a/src/lib/expansion/expansion.spec.ts b/src/lib/expansion/expansion.spec.ts
index 53a0cae367c4..c9c0c8b59079 100644
--- a/src/lib/expansion/expansion.spec.ts
+++ b/src/lib/expansion/expansion.spec.ts
@@ -14,6 +14,7 @@ describe('MatExpansionPanel', () => {
       ],
       declarations: [
         PanelWithContent,
+        PanelWithContentInNgIf,
         PanelWithCustomMargin
       ],
     });
@@ -138,6 +139,16 @@ describe('MatExpansionPanel', () => {
       expect(arrow.style.transform).toBe('rotate(180deg)', 'Expected 180 degree rotation.');
     }));
 
+    it('make sure accordion item runs ngOnDestroy when expansion panel is destroyed', () => {
+      let fixture = TestBed.createComponent(PanelWithContentInNgIf);
+      fixture.detectChanges();
+      let destroyedOk = false;
+      fixture.componentInstance.panel.destroyed.subscribe(() => destroyedOk = true);
+      fixture.componentInstance.expansionShown = false;
+      fixture.detectChanges();
+      expect(destroyedOk).toBe(true);
+    });
+
   describe('disabled state', () => {
     let fixture: ComponentFixture<PanelWithContent>;
     let panel: HTMLElement;
@@ -221,6 +232,18 @@ class PanelWithContent {
   @ViewChild(MatExpansionPanel) panel: MatExpansionPanel;
 }
 
+@Component({
+  template: `
+  <div *ngIf="expansionShown">
+    <mat-expansion-panel>
+      <mat-expansion-panel-header>Panel Title</mat-expansion-panel-header>
+    </mat-expansion-panel>
+  </div>`
+})
+class PanelWithContentInNgIf {
+  expansionShown = true;
+  @ViewChild(MatExpansionPanel) panel: MatExpansionPanel;
+}
 
 @Component({
   styles: [

From 2bc0b41dbf544fb923d919879d9d0c03d223887a Mon Sep 17 00:00:00 2001
From: Gabriel Schuster <actra-gschuster@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:06:42 +0100
Subject: [PATCH 498/575] fix(stepper): update state when steps change (#8398)

---
 src/cdk/stepper/stepper.ts | 12 +++++++++++-
 src/lib/stepper/stepper.ts |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 8d6db9dc481b..2846b882509d 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -28,12 +28,14 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   OnChanges,
+  OnDestroy
 } from '@angular/core';
 import {LEFT_ARROW, RIGHT_ARROW, ENTER, SPACE} from '@angular/cdk/keycodes';
 import {CdkStepLabel} from './step-label';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {AbstractControl} from '@angular/forms';
 import {Direction, Directionality} from '@angular/cdk/bidi';
+import {Subject} from 'rxjs/Subject';
 
 /** Used to generate unique ID for each stepper component. */
 let nextId = 0;
@@ -132,7 +134,10 @@ export class CdkStep implements OnChanges {
   selector: '[cdkStepper]',
   exportAs: 'cdkStepper',
 })
-export class CdkStepper {
+export class CdkStepper implements OnDestroy {
+  /** Emits when the component is destroyed. */
+  protected _destroyed = new Subject<void>();
+
   /** The list of step components that the stepper is holding. */
   @ContentChildren(CdkStep) _steps: QueryList<CdkStep>;
 
@@ -186,6 +191,11 @@ export class CdkStepper {
     this._groupId = nextId++;
   }
 
+  ngOnDestroy() {
+    this._destroyed.next();
+    this._destroyed.complete();
+  }
+
   /** Selects and focuses the next step in list. */
   next(): void {
     this.selectedIndex = Math.min(this._selectedIndex + 1, this._steps.length - 1);
diff --git a/src/lib/stepper/stepper.ts b/src/lib/stepper/stepper.ts
index 173d2d472604..fad6059712d6 100644
--- a/src/lib/stepper/stepper.ts
+++ b/src/lib/stepper/stepper.ts
@@ -9,6 +9,7 @@
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {CdkStep, CdkStepper} from '@angular/cdk/stepper';
 import {
+  AfterContentInit,
   Component,
   ContentChild,
   ContentChildren,
@@ -26,6 +27,7 @@ import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material/core';
 import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
+import {takeUntil} from 'rxjs/operators/takeUntil';
 
 /** Workaround for https://github.com/angular/angular/issues/17849 */
 export const _MatStep = CdkStep;
@@ -66,12 +68,17 @@ export class MatStep extends _MatStep implements ErrorStateMatcher {
 @Directive({
   selector: '[matStepper]'
 })
-export class MatStepper extends _MatStepper {
+export class MatStepper extends _MatStepper implements AfterContentInit {
   /** The list of step headers of the steps in the stepper. */
   @ViewChildren(MatStepHeader, {read: ElementRef}) _stepHeader: QueryList<ElementRef>;
 
   /** Steps that the stepper holds. */
   @ContentChildren(MatStep) _steps: QueryList<MatStep>;
+
+  ngAfterContentInit() {
+    // Mark the component for change detection whenever the content children query changes
+    this._steps.changes.pipe(takeUntil(this._destroyed)).subscribe(() => this._stateChanged());
+  }
 }
 
 @Component({

From 131272a7f1dd25608ff912fd17354323a4a0fcad Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:07:11 +0100
Subject: [PATCH 499/575] fix(overlay): remove global keydown listener when
 there are no open overlays (#8389)

Removes the global `keydown` listener from the overlay dispatcher once all overlays are closed.
---
 .../keyboard/overlay-keyboard-dispatcher.ts   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
index d7327788d635..d8597a46c6f2 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.ts
@@ -29,10 +29,7 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
   constructor(@Inject(DOCUMENT) private _document: any) {}
 
   ngOnDestroy() {
-    if (this._keydownEventSubscription) {
-      this._keydownEventSubscription.unsubscribe();
-      this._keydownEventSubscription = null;
-    }
+    this._unsubscribeFromKeydownEvents();
   }
 
   /** Add a new overlay to the list of attached overlay refs. */
@@ -48,9 +45,15 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
   /** Remove an overlay from the list of attached overlay refs. */
   remove(overlayRef: OverlayRef): void {
     const index = this._attachedOverlays.indexOf(overlayRef);
+
     if (index > -1) {
       this._attachedOverlays.splice(index, 1);
     }
+
+    // Remove the global listener once there are no more overlays.
+    if (this._attachedOverlays.length === 0) {
+      this._unsubscribeFromKeydownEvents();
+    }
   }
 
   /**
@@ -68,6 +71,14 @@ export class OverlayKeyboardDispatcher implements OnDestroy {
     });
   }
 
+  /** Removes the global keydown subscription. */
+  private _unsubscribeFromKeydownEvents(): void {
+    if (this._keydownEventSubscription) {
+      this._keydownEventSubscription.unsubscribe();
+      this._keydownEventSubscription = null;
+    }
+  }
+
   /** Select the appropriate overlay from a keydown event. */
   private _selectOverlayFromEvent(event: KeyboardEvent): OverlayRef {
     // Check if any overlays contain the event

From ce23395ba766f3e662ca74516dafb54fe14d894b Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:07:49 +0100
Subject: [PATCH 500/575] feat(menu): allow disabling ripples on items (#8388)

Closes #8261
---
 src/lib/menu/menu-item.html |  4 +++-
 src/lib/menu/menu-item.ts   | 15 ++++++++++-----
 src/lib/menu/menu.scss      |  6 ++++++
 src/lib/menu/menu.spec.ts   | 32 +++++++++++++++++++++++---------
 4 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/lib/menu/menu-item.html b/src/lib/menu/menu-item.html
index ab3465eb526b..a025ff57a01e 100644
--- a/src/lib/menu/menu-item.html
+++ b/src/lib/menu/menu-item.html
@@ -1,3 +1,5 @@
 <ng-content></ng-content>
-<div class="mat-menu-ripple" *ngIf="!disabled" mat-ripple [matRippleTrigger]="_getHostElement()">
+<div class="mat-menu-ripple" matRipple
+     [matRippleDisabled]="disableRipple || disabled"
+     [matRippleTrigger]="_getHostElement()">
 </div>
diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts
index e985c43dabd2..20ca05dd323c 100644
--- a/src/lib/menu/menu-item.ts
+++ b/src/lib/menu/menu-item.ts
@@ -14,13 +14,18 @@ import {
   OnDestroy,
   ViewEncapsulation,
 } from '@angular/core';
-import {CanDisable, mixinDisabled} from '@angular/material/core';
+import {
+  CanDisable,
+  CanDisableRipple,
+  mixinDisabled,
+  mixinDisableRipple
+} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
 // Boilerplate for applying mixins to MatMenuItem.
 /** @docs-private */
 export class MatMenuItemBase {}
-export const _MatMenuItemMixinBase = mixinDisabled(MatMenuItemBase);
+export const _MatMenuItemMixinBase = mixinDisableRipple(mixinDisabled(MatMenuItemBase));
 
 /**
  * This directive is intended to be used inside an mat-menu tag.
@@ -30,7 +35,7 @@ export const _MatMenuItemMixinBase = mixinDisabled(MatMenuItemBase);
   moduleId: module.id,
   selector: '[mat-menu-item]',
   exportAs: 'matMenuItem',
-  inputs: ['disabled'],
+  inputs: ['disabled', 'disableRipple'],
   host: {
     'role': 'menuitem',
     'class': 'mat-menu-item',
@@ -47,8 +52,8 @@ export const _MatMenuItemMixinBase = mixinDisabled(MatMenuItemBase);
   preserveWhitespaces: false,
   templateUrl: 'menu-item.html',
 })
-export class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOption, CanDisable,
-  OnDestroy {
+export class MatMenuItem extends _MatMenuItemMixinBase
+    implements FocusableOption, CanDisable, CanDisableRipple, OnDestroy {
 
   /** Stream that emits when the menu item is hovered. */
   _hovered: Subject<MatMenuItem> = new Subject();
diff --git a/src/lib/menu/menu.scss b/src/lib/menu/menu.scss
index a78f594df93c..9b5b149242e7 100644
--- a/src/lib/menu/menu.scss
+++ b/src/lib/menu/menu.scss
@@ -82,4 +82,10 @@ button.mat-menu-item {
 
 .mat-menu-ripple {
   @include mat-fill;
+
+  // Prevent any pointer events on the ripple container for a menu item. The ripple container is
+  // not the trigger element for the ripples and can be therefore disabled like that. Disabling
+  // the pointer events ensures that there is no `click` event that can bubble up and cause
+  // the menu panel to close.
+  pointer-events: none;
 }
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 39945f0c238a..f6d6cf8d56a3 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -26,7 +26,7 @@ import {
   MatMenuItem,
 } from './index';
 import {MENU_PANEL_TOP_PADDING} from './menu-trigger';
-import {extendObject} from '@angular/material/core';
+import {extendObject, MatRipple} from '@angular/material/core';
 import {
   dispatchKeyboardEvent,
   dispatchMouseEvent,
@@ -490,29 +490,43 @@ describe('MatMenu', () => {
   });
 
   describe('animations', () => {
-    it('should include the ripple on items by default', () => {
+    it('should enable ripples on items by default', () => {
       const fixture = TestBed.createComponent(SimpleMenu);
       fixture.detectChanges();
 
       fixture.componentInstance.trigger.openMenu();
+
       const item = fixture.debugElement.query(By.css('.mat-menu-item'));
-      const ripple = item.query(By.css('.mat-ripple'));
+      const ripple = item.query(By.css('.mat-ripple')).injector.get<MatRipple>(MatRipple);
 
-      expect(ripple).not.toBeNull();
+      expect(ripple.disabled).toBe(false);
     });
 
-    it('should remove the ripple on disabled items', () => {
+    it('should disable ripples on disabled items', () => {
       const fixture = TestBed.createComponent(SimpleMenu);
       fixture.detectChanges();
 
       fixture.componentInstance.trigger.openMenu();
+
+      // The second menu item in the `SimpleMenu` component is disabled.
       const items = fixture.debugElement.queryAll(By.css('.mat-menu-item'));
+      const ripple = items[1].query(By.css('.mat-ripple')).injector.get<MatRipple>(MatRipple);
 
-      // items[1] is disabled, so the ripple should not be present
-      const ripple = items[1].query(By.css('.mat-ripple'));
-      expect(ripple).toBeNull();
+      expect(ripple.disabled).toBe(true);
     });
 
+    it('should disable ripples if disableRipple is set', () => {
+      const fixture = TestBed.createComponent(SimpleMenu);
+      fixture.detectChanges();
+
+      fixture.componentInstance.trigger.openMenu();
+
+      // The third menu item in the `SimpleMenu` component has ripples disabled.
+      const items = fixture.debugElement.queryAll(By.css('.mat-menu-item'));
+      const ripple = items[2].query(By.css('.mat-ripple')).injector.get<MatRipple>(MatRipple);
+
+      expect(ripple.disabled).toBe(true);
+    });
   });
 
   describe('close event', () => {
@@ -1115,7 +1129,7 @@ describe('MatMenu default overrides', () => {
     <mat-menu class="custom-one custom-two" #menu="matMenu" (closed)="closeCallback($event)">
       <button mat-menu-item> Item </button>
       <button mat-menu-item disabled> Disabled </button>
-      <button mat-menu-item>
+      <button mat-menu-item disableRipple>
         <fake-icon>unicorn</fake-icon>
         Item with an icon
       </button>

From b0756a295f0fb9889b772bc226afc08508b18999 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:08:24 +0100
Subject: [PATCH 501/575] fix(drawer): missing elevation shadow (#8387)

Fixes the elevation box shadow not being applied to drawers.

Fixes #8386
---
 src/lib/sidenav/drawer.scss | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index 290e0098d5a8..f4b945c28ee6 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -131,12 +131,10 @@ $mat-drawer-over-drawer-z-index: 4;
     }
   }
 
-  &.mat-drawer-opening, &.mat-drawer-opened {
-    &:not(.mat-drawer-side) {
-      // The elevation of z-16 is noted in the design specifications.
-      // See https://material.io/guidelines/patterns/navigation-drawer.html#
-      @include mat-elevation(16);
-    }
+  &:not(.mat-drawer-side) {
+    // The elevation of z-16 is noted in the design specifications.
+    // See https://material.io/guidelines/patterns/navigation-drawer.html#
+    @include mat-elevation(16);
   }
 }
 

From b085dc6580e06b4844fc98a273d489b20513b13d Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:09:30 +0100
Subject: [PATCH 502/575] fix(menu): return focus to root trigger when closed
 by mouse (#8348)

Previously we only restored focus to the trigger if the user opened the menu using a keyboard, however that means that focus can be lost when closing by clicking on the backdrop. These changes switch to also restoring focus when clicking away, but only if the trigger is a top-level trigger.

Fixes #8290.
---
 src/lib/menu/menu-trigger.ts |  7 +++--
 src/lib/menu/menu.spec.ts    | 59 ++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index cb2e4fc85b2b..303bf557329d 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -273,9 +273,10 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
   private _resetMenu(): void {
     this._setIsMenuOpen(false);
 
-    // Focus only needs to be reset to the host element if the menu was opened
-    // by the keyboard and manually shifted to the first menu item.
-    if (!this._openedByMouse) {
+    // We should reset focus if the user is navigating using a keyboard or
+    // if we have a top-level trigger which might cause focus to be lost
+    // when clicking on the backdrop.
+    if (!this._openedByMouse || !this.triggersSubmenu()) {
       this.focus();
     }
 
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index f6d6cf8d56a3..76827f68f261 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -104,6 +104,43 @@ describe('MatMenu', () => {
     expect(overlayContainerElement.textContent).toBe('');
   }));
 
+  it('should restore focus to the trigger when the menu was opened by keyboard', fakeAsync(() => {
+    const fixture = TestBed.createComponent(SimpleMenu);
+    fixture.detectChanges();
+
+    const triggerEl = fixture.componentInstance.triggerEl.nativeElement;
+
+    // A click without a mousedown before it is considered a keyboard open.
+    triggerEl.click();
+    fixture.detectChanges();
+
+    expect(overlayContainerElement.querySelector('.mat-menu-panel')).toBeTruthy();
+
+    fixture.componentInstance.trigger.closeMenu();
+    fixture.detectChanges();
+    tick(500);
+
+    expect(document.activeElement).toBe(triggerEl);
+  }));
+
+  it('should restore focus to the root trigger when the menu was opened by mouse', fakeAsync(() => {
+    const fixture = TestBed.createComponent(SimpleMenu);
+    fixture.detectChanges();
+
+    const triggerEl = fixture.componentInstance.triggerEl.nativeElement;
+    dispatchFakeEvent(triggerEl, 'mousedown');
+    triggerEl.click();
+    fixture.detectChanges();
+
+    expect(overlayContainerElement.querySelector('.mat-menu-panel')).toBeTruthy();
+
+    fixture.componentInstance.trigger.closeMenu();
+    fixture.detectChanges();
+    tick(500);
+
+    expect(document.activeElement).toBe(triggerEl);
+  }));
+
   it('should close the menu when pressing ESCAPE', fakeAsync(() => {
     const fixture = TestBed.createComponent(SimpleMenu);
     fixture.detectChanges();
@@ -1096,6 +1133,28 @@ describe('MatMenu', () => {
       expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(2, 'Expected two open menus');
     }));
 
+    it('should not re-focus a child menu trigger when hovering another trigger', fakeAsync(() => {
+      compileTestComponent();
+
+      dispatchFakeEvent(instance.rootTriggerEl.nativeElement, 'mousedown');
+      instance.rootTriggerEl.nativeElement.click();
+      fixture.detectChanges();
+
+      const items = Array.from(overlay.querySelectorAll('.mat-menu-panel [mat-menu-item]'));
+      const levelOneTrigger = overlay.querySelector('#level-one-trigger')!;
+
+      dispatchMouseEvent(levelOneTrigger, 'mouseenter');
+      fixture.detectChanges();
+      expect(overlay.querySelectorAll('.mat-menu-panel').length).toBe(2, 'Expected two open menus');
+
+      dispatchMouseEvent(items[items.indexOf(levelOneTrigger) + 1], 'mouseenter');
+      fixture.detectChanges();
+      tick(500);
+
+      expect(document.activeElement)
+          .not.toBe(levelOneTrigger, 'Expected focus not to be returned to the initial trigger.');
+    }));
+
   });
 
 });

From b437b457703a255f68c2d3170469deaa061377ae Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:10:08 +0100
Subject: [PATCH 503/575] fix(overlay): complete key event stream on dispose
 (#8341)

Fixes the `keydownEvents` stream not being completed on dispose.
---
 .../keyboard/overlay-keyboard-dispatcher.spec.ts      | 11 +++++++++++
 src/cdk/overlay/overlay-ref.ts                        |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
index 33fbcc3ef5fa..ee56850e42cd 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
@@ -94,4 +94,15 @@ describe('OverlayKeyboardDispatcher', () => {
     expect(overlayTwoSpy).not.toHaveBeenCalled();
   });
 
+  it('should complete the keydown stream on dispose', () => {
+    const overlayRef = overlay.create();
+    const completeSpy = jasmine.createSpy('keydown complete spy');
+
+    overlayRef.keydownEvents().subscribe(undefined, undefined, completeSpy);
+
+    overlayRef.dispose();
+
+    expect(completeSpy).toHaveBeenCalled();
+  });
+
 });
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index c5b71dee498f..6b26825dc23e 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -151,6 +151,7 @@ export class OverlayRef implements PortalOutlet {
     this._portalOutlet.dispose();
     this._attachments.complete();
     this._backdropClick.complete();
+    this._keydownEvents.complete();
 
     if (isAttached) {
       this._detachments.next();

From bb504ad07b6dddea4d749f156c759e27247260d5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:10:43 +0100
Subject: [PATCH 504/575] fix(list): multi-line list item spacing (#8339)

* Fixes the spacing on multi-line list items being off.
* Fixes a couple of declarations with the exact same styles being duplicated, adding some bloat to the final output.

Fixes #8333
---
 src/lib/list/list.scss | 40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
index 056bdda78c55..9dd42f8e72e6 100644
--- a/src/lib/list/list.scss
+++ b/src/lib/list/list.scss
@@ -15,6 +15,7 @@ $mat-list-avatar-height: 56px;
 // spec requires two- and three-line lists be taller
 $mat-list-two-line-height: 72px;
 $mat-list-three-line-height: 88px;
+$mat-list-multi-line-padding: 16px;
 $mat-list-icon-size: 24px;
 
 // Dense list variables
@@ -23,12 +24,13 @@ $mat-dense-base-height: 40px;
 $mat-dense-avatar-height: 48px;
 $mat-dense-two-line-height: 60px;
 $mat-dense-three-line-height: 76px;
+$mat-dense-multi-line-padding: 16px;
 $mat-dense-list-icon-size: 20px;
 
 // This mixin provides all list-item styles, changing font size and height
 // based on whether the list is in dense mode.
-@mixin mat-list-item-base($base-height, $avatar-height,
-  $two-line-height, $three-line-height, $icon-size) {
+@mixin mat-list-item-base($base-height, $avatar-height, $two-line-height,
+  $three-line-height, $multi-line-padding, $icon-size) {
 
   // Prevents the wrapper `mat-list-item-content` from collapsing due to it
   // being `inline` by default.
@@ -78,8 +80,12 @@ $mat-dense-list-icon-size: 20px;
   // list items with more than 3 lines should expand to match
   // the height of its contained text
   &.mat-multi-line {
-    height: 100%;
-    padding: 8px $mat-list-side-padding;
+    height: auto;
+
+    .mat-list-item-content {
+      padding-top: $multi-line-padding;
+      padding-bottom: $multi-line-padding;
+    }
   }
 
   .mat-list-text {
@@ -145,22 +151,13 @@ $mat-dense-list-icon-size: 20px;
     @include mat-subheader-spacing($mat-list-top-padding, $mat-list-base-height);
   }
 
-  .mat-list-item {
-    @include mat-list-item-base(
-      $mat-list-base-height,
-      $mat-list-avatar-height,
-      $mat-list-two-line-height,
-      $mat-list-three-line-height,
-      $mat-list-icon-size
-    );
-  }
-
-  .mat-list-option {
+  .mat-list-item, .mat-list-option {
     @include mat-list-item-base(
       $mat-list-base-height,
       $mat-list-avatar-height,
       $mat-list-two-line-height,
       $mat-list-three-line-height,
+      $mat-list-multi-line-padding,
       $mat-list-icon-size
     );
   }
@@ -176,22 +173,13 @@ $mat-dense-list-icon-size: 20px;
     @include mat-subheader-spacing($mat-dense-top-padding, $mat-dense-base-height);
   }
 
-  .mat-list-item {
-    @include mat-list-item-base(
-      $mat-dense-base-height,
-      $mat-dense-avatar-height,
-      $mat-dense-two-line-height,
-      $mat-dense-three-line-height,
-      $mat-dense-list-icon-size
-    );
-  }
-
-  .mat-list-option {
+  .mat-list-item, .mat-list-option {
     @include mat-list-item-base(
       $mat-dense-base-height,
       $mat-dense-avatar-height,
       $mat-dense-two-line-height,
       $mat-dense-three-line-height,
+      $mat-dense-multi-line-padding,
       $mat-dense-list-icon-size
     );
   }

From 5600b80897c7d4fea3b3b5b3d50503b8d37f43d2 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:11:06 +0100
Subject: [PATCH 505/575] fix(drawer): invalid margin declaration when
 rendering server-side (#8324)

Fixes the margins of a drawer container being declared as `marginLeft` and `marginRight` when rendering on the server side.
---
 src/lib/sidenav/drawer.ts  | 4 ++--
 src/lib/sidenav/sidenav.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index d60409ec7ef2..e444a96ca824 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -62,8 +62,8 @@ export class MatDrawerToggleResult {
   template: '<ng-content></ng-content>',
   host: {
     'class': 'mat-drawer-content',
-    '[style.marginLeft.px]': '_margins.left',
-    '[style.marginRight.px]': '_margins.right',
+    '[style.margin-left.px]': '_margins.left',
+    '[style.margin-right.px]': '_margins.right',
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
index e9e32927a339..24b88086db4e 100644
--- a/src/lib/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -23,8 +23,8 @@ import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion
   template: '<ng-content></ng-content>',
   host: {
     'class': 'mat-drawer-content mat-sidenav-content',
-    '[style.marginLeft.px]': '_margins.left',
-    '[style.marginRight.px]': '_margins.right',
+    '[style.margin-left.px]': '_margins.left',
+    '[style.margin-right.px]': '_margins.right',
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,

From f69c8e6d71bede5e4adeb0f6f523b15edc481907 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 20 Nov 2017 10:13:34 -0800
Subject: [PATCH 506/575] fix(datepicker): correct overlay broad style selector
 (#8130)

---
 src/lib/datepicker/datepicker-content.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/datepicker/datepicker-content.scss b/src/lib/datepicker/datepicker-content.scss
index 386ec6dac95e..077311434a86 100644
--- a/src/lib/datepicker/datepicker-content.scss
+++ b/src/lib/datepicker/datepicker-content.scss
@@ -28,11 +28,11 @@ $mat-datepicker-touch-max-height: 788px;
   @include mat-elevation(8);
 
   display: block;
-}
 
-.mat-calendar {
-  width: $mat-datepicker-non-touch-calendar-width;
-  height: $mat-datepicker-non-touch-calendar-height;
+  .mat-calendar {
+    width: $mat-datepicker-non-touch-calendar-width;
+    height: $mat-datepicker-non-touch-calendar-height;
+  }
 }
 
 .mat-datepicker-content-touch {

From f2a02066911a9cfef76cba9014977dc64ab599e6 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:14:05 +0100
Subject: [PATCH 507/575] feat(gestures): add injection token for specifying
 Hammer.js options (#8106)

Adds the `MAT_HAMMER_OPTIONS` injection token that allows users to pass in options to the Hammer.js constructor.

Fixes #7097.
---
 src/lib/core/gestures/gesture-annotations.ts | 15 +++++-
 src/lib/core/gestures/gesture-config.spec.ts | 55 ++++++++++++++++++++
 src/lib/core/gestures/gesture-config.ts      | 32 ++++++++----
 3 files changed, 92 insertions(+), 10 deletions(-)
 create mode 100644 src/lib/core/gestures/gesture-config.spec.ts

diff --git a/src/lib/core/gestures/gesture-annotations.ts b/src/lib/core/gestures/gesture-annotations.ts
index c7193f31b9eb..81d56172a564 100644
--- a/src/lib/core/gestures/gesture-annotations.ts
+++ b/src/lib/core/gestures/gesture-annotations.ts
@@ -9,7 +9,7 @@
 /**
  * Stripped-down HammerJS annotations to be used within Material, which are necessary,
  * because HammerJS is an optional dependency. For the full annotations see:
- * https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/hammerjs
+ * https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/hammerjs/index.d.ts
  */
 
 /** @docs-private */
@@ -54,3 +54,16 @@ export interface HammerManager {
   off(events: string, handler?: Function): void;
   on(events: string, handler: Function): void;
 }
+
+/** @docs-private */
+export interface HammerOptions {
+  cssProps?: {[key: string]: string};
+  domEvents?: boolean;
+  enable?: boolean | ((manager: HammerManager) => boolean);
+  preset?: any[];
+  touchAction?: string;
+  recognizers?: any[];
+
+  inputClass?: HammerInput;
+  inputTarget?: EventTarget;
+}
diff --git a/src/lib/core/gestures/gesture-config.spec.ts b/src/lib/core/gestures/gesture-config.spec.ts
new file mode 100644
index 000000000000..40abf09d9031
--- /dev/null
+++ b/src/lib/core/gestures/gesture-config.spec.ts
@@ -0,0 +1,55 @@
+import {TestBed, async} from '@angular/core/testing';
+import {Component} from '@angular/core';
+import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {GestureConfig, MAT_HAMMER_OPTIONS} from './gesture-config';
+
+describe('GestureConfig', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [TestApp],
+      providers: [{provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig}]
+    }).compileComponents();
+  }));
+
+  it('should instantiate HammerJS', () => {
+    spyOn(window, 'Hammer' as any).and.callThrough();
+
+    const fixture = TestBed.createComponent(TestApp);
+    fixture.detectChanges();
+
+    expect(window['Hammer']).toHaveBeenCalled();
+  });
+
+  it('should be able to pass options to HammerJS', () => {
+    TestBed
+      .resetTestingModule()
+      .configureTestingModule({
+        declarations: [TestApp],
+        providers: [
+          {provide: HAMMER_GESTURE_CONFIG, useClass: GestureConfig},
+          {provide: MAT_HAMMER_OPTIONS, useValue: {cssProps: {touchAction: 'auto'}}}
+        ]
+      })
+      .compileComponents();
+
+    spyOn(window, 'Hammer' as any).and.callThrough();
+
+    const fixture = TestBed.createComponent(TestApp);
+    fixture.detectChanges();
+
+    const button = fixture.debugElement.nativeElement.querySelector('button');
+    const firstCallArgs = window['Hammer'].calls.first().args;
+
+    expect(firstCallArgs[0]).toBe(button);
+    expect(firstCallArgs[1].cssProps.touchAction).toBe('auto');
+  });
+
+});
+
+
+@Component({
+  template: `<button (longpress)="noop()">Long press me</button>`
+})
+class TestApp {
+  noop() {}
+}
diff --git a/src/lib/core/gestures/gesture-config.ts b/src/lib/core/gestures/gesture-config.ts
index 2299daede94f..02a692430ebf 100644
--- a/src/lib/core/gestures/gesture-config.ts
+++ b/src/lib/core/gestures/gesture-config.ts
@@ -6,10 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, Optional} from '@angular/core';
+import {Injectable, InjectionToken, Inject, Optional} from '@angular/core';
 import {HammerGestureConfig} from '@angular/platform-browser';
 import {MatCommonModule} from '../common-behaviors/common-module';
-import {HammerInstance, HammerStatic, Recognizer, RecognizerStatic} from './gesture-annotations';
+import {
+  HammerStatic,
+  HammerInstance,
+  Recognizer,
+  RecognizerStatic,
+  HammerOptions,
+} from './gesture-annotations';
+
+/**
+ * Injection token that can be used to provide options to the Hammerjs instance.
+ * More info at http://hammerjs.github.io/api/.
+ */
+export const MAT_HAMMER_OPTIONS = new InjectionToken<HammerOptions>('MAT_HAMMER_OPTIONS');
 
 /* Adjusts configuration of our gesture library, Hammer. */
 @Injectable()
@@ -26,7 +38,9 @@ export class GestureConfig extends HammerGestureConfig {
     'slideleft'
   ] : [];
 
-  constructor(@Optional() commonModule?: MatCommonModule) {
+  constructor(
+    @Optional() @Inject(MAT_HAMMER_OPTIONS) private _hammerOptions?: HammerOptions,
+    @Optional() commonModule?: MatCommonModule) {
     super();
     if (commonModule) {
       commonModule._checkHammerIsAvailable();
@@ -47,18 +61,18 @@ export class GestureConfig extends HammerGestureConfig {
    * @returns Newly-created HammerJS instance.
    */
   buildHammer(element: HTMLElement): HammerInstance {
-    const mc = new this._hammer(element);
+    const mc = new this._hammer(element, this._hammerOptions || undefined);
 
     // Default Hammer Recognizers.
-    let pan = new this._hammer.Pan();
-    let swipe = new this._hammer.Swipe();
-    let press = new this._hammer.Press();
+    const pan = new this._hammer.Pan();
+    const swipe = new this._hammer.Swipe();
+    const press = new this._hammer.Press();
 
     // Notice that a HammerJS recognizer can only depend on one other recognizer once.
     // Otherwise the previous `recognizeWith` will be dropped.
     // TODO: Confirm threshold numbers with Material Design UX Team
-    let slide = this._createRecognizer(pan, {event: 'slide', threshold: 0}, swipe);
-    let longpress = this._createRecognizer(press, {event: 'longpress', time: 500});
+    const slide = this._createRecognizer(pan, {event: 'slide', threshold: 0}, swipe);
+    const longpress = this._createRecognizer(press, {event: 'longpress', time: 500});
 
     // Overwrite the default `pan` event to use the swipe event.
     pan.recognizeWith(swipe);

From 3037a900ed8363c3642ad600319f1cd63c458e38 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Mon, 20 Nov 2017 10:15:19 -0800
Subject: [PATCH 508/575] fix(checkbox): Set aria-checkbox to mixed for
 indeterminate checkbox (#8089)

---
 src/lib/checkbox/checkbox.html    | 1 +
 src/lib/checkbox/checkbox.spec.ts | 6 ++++++
 src/lib/checkbox/checkbox.ts      | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index e706b5c2940f..bd0d794a4ab1 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -13,6 +13,7 @@
            [indeterminate]="indeterminate"
            [attr.aria-label]="ariaLabel"
            [attr.aria-labelledby]="ariaLabelledby"
+           [attr.aria-checked]="_getAriaChecked()"
            (change)="_onInteractionEvent($event)"
            (click)="_onInputClick($event)">
     <div matRipple class="mat-checkbox-ripple"
diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
index 7be933c085cb..6df5d53ed4eb 100644
--- a/src/lib/checkbox/checkbox.spec.ts
+++ b/src/lib/checkbox/checkbox.spec.ts
@@ -87,6 +87,8 @@ describe('MatCheckbox', () => {
       expect(checkboxNativeElement.classList).not.toContain('mat-checkbox-checked');
       expect(inputElement.checked).toBe(false);
       expect(inputElement.indeterminate).toBe(false);
+      expect(inputElement.getAttribute('aria-checked'))
+          .toBe('false', 'Expect aria-checked to be false');
 
       testComponent.isIndeterminate = true;
       fixture.detectChanges();
@@ -94,6 +96,8 @@ describe('MatCheckbox', () => {
       expect(checkboxNativeElement.classList).toContain('mat-checkbox-indeterminate');
       expect(inputElement.checked).toBe(false);
       expect(inputElement.indeterminate).toBe(true);
+      expect(inputElement.getAttribute('aria-checked'))
+          .toBe('mixed', 'Expect aria checked to be mixed for indeterminate checkbox');
 
       testComponent.isIndeterminate = false;
       fixture.detectChanges();
@@ -133,6 +137,8 @@ describe('MatCheckbox', () => {
       expect(inputElement.indeterminate).toBe(true);
       expect(inputElement.checked).toBe(true);
       expect(testComponent.isIndeterminate).toBe(true);
+      expect(inputElement.getAttribute('aria-checked'))
+          .toBe('true', 'Expect aria checked to be true');
 
       inputElement.click();
       fixture.detectChanges();
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 2d4b7db7c66b..331504286d00 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -303,6 +303,10 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
     this._changeDetectorRef.markForCheck();
   }
 
+  _getAriaChecked(): 'true' | 'false' | 'mixed' {
+    return this.checked ? 'true' : (this.indeterminate ? 'mixed' : 'false');
+  }
+
   private _transitionCheckState(newState: TransitionCheckState) {
     let oldState = this._currentCheckState;
     let renderer = this._renderer;

From ad7cb4a726023fa9c3508375a7ca92e5d699eaa3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:15:49 +0100
Subject: [PATCH 509/575] fix(autosize): incorrect height with long
 placeholders (#8024)

Long placeholders can cause the `scrollHeight` to be bigger than the actual content is. To ensure the `scrollHeight` is correct, the placeholders need to be removed temporarily.

Fixes #8013
---
 src/lib/input/autosize.spec.ts | 47 ++++++++++++++++++++++++++++++++--
 src/lib/input/autosize.ts      |  7 +++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/lib/input/autosize.spec.ts b/src/lib/input/autosize.spec.ts
index b984be03340f..3156435410b3 100644
--- a/src/lib/input/autosize.spec.ts
+++ b/src/lib/input/autosize.spec.ts
@@ -28,7 +28,8 @@ describe('MatTextareaAutosize', () => {
         AutosizeTextareaInATab,
         AutosizeTextAreaWithContent,
         AutosizeTextAreaWithValue,
-        AutosizeTextareaWithNgModel
+        AutosizeTextareaWithNgModel,
+        AutosizeTextareaWithLongPlaceholder
       ],
     });
 
@@ -176,6 +177,27 @@ describe('MatTextareaAutosize', () => {
       .toBe(textarea.scrollHeight, 'Expected textarea height to match its scrollHeight');
   });
 
+  it('should not calculate wrong content height due to long placeholders', () => {
+    const fixtureWithPlaceholder = TestBed.createComponent(AutosizeTextareaWithLongPlaceholder);
+    fixtureWithPlaceholder.detectChanges();
+
+    textarea = fixtureWithPlaceholder.nativeElement.querySelector('textarea');
+    autosize = fixtureWithPlaceholder.debugElement.query(
+      By.directive(MatTextareaAutosize)).injector.get<MatTextareaAutosize>(MatTextareaAutosize);
+
+    triggerTextareaResize();
+
+    const heightWithLongPlaceholder = textarea.clientHeight;
+
+    fixtureWithPlaceholder.componentInstance.placeholder = 'Short';
+    fixtureWithPlaceholder.detectChanges();
+
+    triggerTextareaResize();
+
+    expect(textarea.clientHeight).toBe(heightWithLongPlaceholder,
+        'Expected the textarea height to be the same with a long placeholder.');
+  });
+
   it('should resize when an associated form control value changes', fakeAsync(() => {
     const fixtureWithForms = TestBed.createComponent(AutosizeTextareaWithNgModel);
     textarea = fixtureWithForms.nativeElement.querySelector('textarea');
@@ -227,8 +249,18 @@ describe('MatTextareaAutosize', () => {
     textarea = fixtureWithForms.nativeElement.querySelector('textarea');
     expect(textarea.getBoundingClientRect().height).toBeGreaterThan(1);
   });
-});
 
+  /** Triggers a textarea resize to fit the content. */
+  function triggerTextareaResize() {
+    // To be able to trigger a new calculation of the height with a short placeholder, the
+    // textarea value needs to be changed.
+    textarea.value = '1';
+    autosize.resizeToFitContent();
+
+    textarea.value = '';
+    autosize.resizeToFitContent();
+  }
+});
 
 // Styles to reset padding and border to make measurement comparisons easier.
 const textareaStyleReset = `
@@ -269,6 +301,17 @@ class AutosizeTextareaWithNgModel {
   model = '';
 }
 
+@Component({
+  template: `
+    <mat-form-field style="width: 100px">
+      <textarea matInput matTextareaAutosize [placeholder]="placeholder"></textarea>
+    </mat-form-field>`,
+  styles: [textareaStyleReset],
+})
+class AutosizeTextareaWithLongPlaceholder {
+  placeholder = 'Long Long Long Long Long Long Long Long Placeholder';
+}
+
 @Component({
   template: `
     <mat-tab-group>
diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts
index 02e6d1756f6b..0bfc6abe0560 100644
--- a/src/lib/input/autosize.ts
+++ b/src/lib/input/autosize.ts
@@ -150,14 +150,21 @@ export class MatTextareaAutosize implements AfterViewInit, DoCheck {
       return;
     }
 
+    const placeholderText = textarea.placeholder;
+
     // Reset the textarea height to auto in order to shrink back to its default size.
     // Also temporarily force overflow:hidden, so scroll bars do not interfere with calculations.
+    // Long placeholders that are wider than the textarea width may lead to a bigger scrollHeight
+    // value. To ensure that the scrollHeight is not bigger than the content, the placeholders
+    // need to be removed temporarily.
     textarea.style.height = 'auto';
     textarea.style.overflow = 'hidden';
+    textarea.placeholder = '';
 
     // Use the scrollHeight to know how large the textarea *would* be if fit its entire value.
     textarea.style.height = `${textarea.scrollHeight}px`;
     textarea.style.overflow = '';
+    textarea.placeholder = placeholderText;
 
     this._previousValue = value;
   }

From 8e9dade6b26cbf65316c23dbae07cd8faea989eb Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:17:30 +0100
Subject: [PATCH 510/575] feat(slider): support specifying tabindex (#7848)

* Provides a consistent API for developers to specify the tabIndex for the slider
* Disabled sliders are no longer tabbable (for accessibility reasons)
---
 src/lib/slider/slider.spec.ts | 49 +++++++++++++++++++++++++++++++++++
 src/lib/slider/slider.ts      | 17 ++++++++----
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index 4846abddebe9..6d213bda19ce 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -39,6 +39,8 @@ describe('MatSlider without forms', () => {
         SliderWithValueGreaterThanMax,
         SliderWithChangeHandler,
         SliderWithDirAndInvert,
+        SliderWithTabIndexBinding,
+        SliderWithNativeTabindexAttr,
         VerticalSlider,
       ],
       providers: [
@@ -268,6 +270,10 @@ describe('MatSlider without forms', () => {
     it ('should leave thumb gap', () => {
       expect(trackFillElement.style.transform).toContain('translateX(-7px)');
     });
+
+    it('should disable tabbing to the slider', () => {
+      expect(sliderNativeElement.tabIndex).toBe(-1);
+    });
   });
 
   describe('slider with set min and max', () => {
@@ -1163,6 +1169,33 @@ describe('MatSlider without forms', () => {
       expect(sliderNativeElement.getAttribute('aria-orientation')).toEqual('vertical');
     });
   });
+
+  describe('tabindex', () => {
+
+    it('should allow setting the tabIndex through binding', () => {
+      const fixture = TestBed.createComponent(SliderWithTabIndexBinding);
+      fixture.detectChanges();
+
+      const slider = fixture.debugElement.query(By.directive(MatSlider)).componentInstance;
+
+      expect(slider.tabIndex).toBe(0, 'Expected the tabIndex to be set to 0 by default.');
+
+      fixture.componentInstance.tabIndex = 3;
+      fixture.detectChanges();
+
+      expect(slider.tabIndex).toBe(3, 'Expected the tabIndex to have been changed.');
+    });
+
+    it('should detect the native tabindex attribute', () => {
+      const fixture = TestBed.createComponent(SliderWithNativeTabindexAttr);
+      fixture.detectChanges();
+
+      const slider = fixture.debugElement.query(By.directive(MatSlider)).componentInstance;
+
+      expect(slider.tabIndex)
+        .toBe(5, 'Expected the tabIndex to be set to the value of the native attribute.');
+    });
+  });
 });
 
 describe('MatSlider with forms module', () => {
@@ -1465,6 +1498,22 @@ class VerticalSlider {
   invert = false;
 }
 
+@Component({
+  template: `<mat-slider [tabIndex]="tabIndex"></mat-slider>`,
+  styles: [styles],
+})
+class SliderWithTabIndexBinding {
+  tabIndex: number;
+}
+
+@Component({
+  template: `<mat-slider tabindex="5"></mat-slider>`,
+  styles: [styles],
+})
+class SliderWithNativeTabindexAttr {
+  tabIndex: number;
+}
+
 /**
  * Dispatches a click event sequence (consisting of moueseenter, click) from an element.
  * Note: The mouse event truncates the position for the click.
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 15a675235fcd..50de5eafb2e8 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -20,6 +20,7 @@ import {
   UP_ARROW,
 } from '@angular/cdk/keycodes';
 import {
+  Attribute,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -40,8 +41,10 @@ import {
   CanColor,
   CanDisable,
   HammerInput,
+  HasTabIndex,
   mixinColor,
   mixinDisabled,
+  mixinTabIndex,
 } from '@angular/material/core';
 import {Subscription} from 'rxjs/Subscription';
 
@@ -85,7 +88,8 @@ export class MatSliderChange {
 export class MatSliderBase {
   constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
 }
-export const _MatSliderMixinBase = mixinColor(mixinDisabled(MatSliderBase), 'accent');
+export const _MatSliderMixinBase =
+  mixinTabIndex(mixinColor(mixinDisabled(MatSliderBase), 'accent'));
 
 /**
  * Allows users to select from a range of values by moving the slider thumb. It is similar in
@@ -108,7 +112,7 @@ export const _MatSliderMixinBase = mixinColor(mixinDisabled(MatSliderBase), 'acc
     '(slidestart)': '_onSlideStart($event)',
     'class': 'mat-slider',
     'role': 'slider',
-    'tabindex': '0',
+    '[tabIndex]': 'tabIndex',
     '[attr.aria-disabled]': 'disabled',
     '[attr.aria-valuemax]': 'max',
     '[attr.aria-valuemin]': 'min',
@@ -126,13 +130,13 @@ export const _MatSliderMixinBase = mixinColor(mixinDisabled(MatSliderBase), 'acc
   },
   templateUrl: 'slider.html',
   styleUrls: ['slider.css'],
-  inputs: ['disabled', 'color'],
+  inputs: ['disabled', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatSlider extends _MatSliderMixinBase
-    implements ControlValueAccessor, OnDestroy, CanDisable, CanColor, OnInit {
+    implements ControlValueAccessor, OnDestroy, CanDisable, CanColor, OnInit, HasTabIndex {
   /** Whether the slider is inverted. */
   @Input()
   get invert() { return this._invert; }
@@ -418,8 +422,11 @@ export class MatSlider extends _MatSliderMixinBase
               elementRef: ElementRef,
               private _focusMonitor: FocusMonitor,
               private _changeDetectorRef: ChangeDetectorRef,
-              @Optional() private _dir: Directionality) {
+              @Optional() private _dir: Directionality,
+              @Attribute('tabindex') tabIndex: string) {
     super(renderer, elementRef);
+
+    this.tabIndex = parseInt(tabIndex) || 0;
   }
 
   ngOnInit() {

From a041253f922b4e475be9396efa2f58d033a9ac85 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:17:46 +0100
Subject: [PATCH 511/575] feat(tab-nav-bar): allow setting tabindex for links
 (#7809)

* For navigation bars, navigation through the arrow keys is not supported. Since every element needs to be tabbable for accessibility reasons, the tabindex should be changeable.
* Also uses the tabindex mixin to reduce payload size.
---
 src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts | 52 ++++++++++++++++++--
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts      | 21 ++++----
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index f0956b4a2a72..a1ef4c1eb796 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -4,7 +4,7 @@ import {By} from '@angular/platform-browser';
 import {dispatchFakeEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 import {Direction, Directionality} from '@angular/cdk/bidi';
 import {Subject} from 'rxjs/Subject';
-import {MatTabNav, MatTabsModule, MatTabLink} from '../index';
+import {MatTabLink, MatTabNav, MatTabsModule} from '../index';
 
 
 describe('MatTabNavBar', () => {
@@ -17,6 +17,8 @@ describe('MatTabNavBar', () => {
       declarations: [
         SimpleTabNavBarTestApp,
         TabLinkWithNgIf,
+        TabLinkWithTabIndexBinding,
+        TabLinkWithNativeTabindexAttr,
       ],
       providers: [
         {provide: Directionality, useFactory: () => ({
@@ -119,9 +121,7 @@ describe('MatTabNavBar', () => {
       fixture.componentInstance.disabled = true;
       fixture.detectChanges();
 
-      expect(tabLinkElements.every(tabLink => {
-        return tabLink.getAttribute('tabIndex') === null;
-      }))
+      expect(tabLinkElements.every(tabLink => tabLink.tabIndex === -1))
         .toBe(true, 'Expected element to no longer be keyboard focusable if disabled.');
     });
 
@@ -212,6 +212,30 @@ describe('MatTabNavBar', () => {
     expect(link.querySelector('.mat-ripple-element'))
       .toBeFalsy('Expected no ripple to be created when ripple target is destroyed.');
   });
+
+  it('should support the native tabindex attribute', () => {
+      const fixture = TestBed.createComponent(TabLinkWithNativeTabindexAttr);
+    fixture.detectChanges();
+
+    const tabLink = fixture.debugElement.query(By.directive(MatTabLink)).injector.get(MatTabLink);
+
+    expect(tabLink.tabIndex)
+      .toBe(5, 'Expected the tabIndex to be set from the native tabindex attribute.');
+  });
+
+  it('should support binding to the tabIndex', () => {
+    const fixture = TestBed.createComponent(TabLinkWithTabIndexBinding);
+    fixture.detectChanges();
+
+    const tabLink = fixture.debugElement.query(By.directive(MatTabLink)).injector.get(MatTabLink);
+
+    expect(tabLink.tabIndex).toBe(0, 'Expected the tabIndex to be set to 0 by default.');
+
+    fixture.componentInstance.tabIndex = 3;
+    fixture.detectChanges();
+
+    expect(tabLink.tabIndex).toBe(3, 'Expected the tabIndex to be have been set to 3.');
+  });
 });
 
 @Component({
@@ -249,3 +273,23 @@ class SimpleTabNavBarTestApp {
 class TabLinkWithNgIf {
   isDestroyed = false;
 }
+
+@Component({
+  template: `
+    <nav mat-tab-nav-bar>
+      <a mat-tab-link [tabIndex]="tabIndex">TabIndex Link</a>
+    </nav>
+  `
+})
+class TabLinkWithTabIndexBinding {
+  tabIndex = 0;
+}
+
+@Component({
+  template: `
+    <nav mat-tab-nav-bar>
+      <a mat-tab-link tabindex="5">Link</a>
+    </nav>
+  `
+})
+class TabLinkWithNativeTabindexAttr {}
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index c9eca0bda256..95b4f7843b61 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -12,6 +12,7 @@ import {takeUntil} from 'rxjs/operators/takeUntil';
 import {ViewportRuler} from '@angular/cdk/scrolling';
 import {
   AfterContentInit,
+  Attribute,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -33,11 +34,13 @@ import {
   CanColor,
   CanDisable,
   CanDisableRipple,
+  HasTabIndex,
   MAT_RIPPLE_GLOBAL_OPTIONS,
   MatRipple,
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
+  mixinTabIndex,
   RippleGlobalOptions,
   ThemePalette,
 } from '@angular/material/core';
@@ -170,7 +173,7 @@ export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit,
 
 // Boilerplate for applying mixins to MatTabLink.
 export class MatTabLinkBase {}
-export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
+export const _MatTabLinkMixinBase = mixinTabIndex(mixinDisabled(MatTabLinkBase));
 
 /**
  * Link inside of a `mat-tab-nav-bar`.
@@ -178,7 +181,7 @@ export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
 @Directive({
   selector: '[mat-tab-link], [matTabLink]',
   exportAs: 'matTabLink',
-  inputs: ['disabled'],
+  inputs: ['disabled', 'tabIndex'],
   host: {
     'class': 'mat-tab-link',
     '[attr.aria-disabled]': 'disabled.toString()',
@@ -187,7 +190,9 @@ export const _MatTabLinkMixinBase = mixinDisabled(MatTabLinkBase);
     '[class.mat-tab-label-active]': 'active',
   }
 })
-export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDisable {
+export class MatTabLink extends _MatTabLinkMixinBase
+    implements OnDestroy, CanDisable, HasTabIndex {
+
   /** Whether the tab link is active or not. */
   private _isActive: boolean = false;
 
@@ -215,21 +220,19 @@ export class MatTabLink extends _MatTabLinkMixinBase implements OnDestroy, CanDi
     this._tabLinkRipple._updateRippleRenderer();
   }
 
-  /** @docs-private */
-  get tabIndex(): number | null {
-    return this.disabled ? null : 0;
-  }
-
   constructor(private _tabNavBar: MatTabNav,
               private _elementRef: ElementRef,
               ngZone: NgZone,
               platform: Platform,
-              @Optional() @Inject(MAT_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions) {
+              @Optional() @Inject(MAT_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions,
+              @Attribute('tabindex') tabIndex: string) {
     super();
 
     // Manually create a ripple instance that uses the tab link element as trigger element.
     // Notice that the lifecycle hooks for the ripple config won't be called anymore.
     this._tabLinkRipple = new MatRipple(_elementRef, ngZone, platform, globalOptions);
+
+    this.tabIndex = parseInt(tabIndex) || 0;
   }
 
   ngOnDestroy() {

From f83beb8214aed199e52a125b0dd131b0cac90906 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:18:12 +0100
Subject: [PATCH 512/575] feat(overlay): add option to re-use last preferred
 position when re-applying to open connected overlay (#7805)

Currently when updating the position of an open connected overlay (e.g. when the user is scrolling) we go through the same process for determining the preferred position as when the overlay was attached. This means that the preferred position could change, causing the overlay to jump. With these changes the consumer can decide to lock an overlay into its initial position, preventing it from jumping.

This PR is a resubmit of #5471.
---
 .../connected-position-strategy.spec.ts       | 23 +++++++++++++
 .../position/connected-position-strategy.ts   | 34 ++++++++++++++++---
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index bf205a59f654..6af7f157f9a6 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -440,6 +440,29 @@ describe('ConnectedPositionStrategy', () => {
       expect(Math.floor(overlayRect.left)).toBe(Math.floor(originRect.left));
     });
 
+    it('should re-use the preferred position when re-applying while locked in', () => {
+      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      strategy = positionBuilder.connectedTo(
+          fakeElementRef,
+          {originX: 'end', originY: 'center'},
+          {overlayX: 'start', overlayY: 'center'})
+          .withLockedPosition(true)
+          .withFallbackPosition(
+              {originX: 'start', originY: 'bottom'},
+              {overlayX: 'end', overlayY: 'top'});
+
+      const recalcSpy = spyOn(strategy, 'recalculateLastPosition');
+
+      strategy.attach(fakeOverlayRef(overlayElement));
+      strategy.apply();
+
+      expect(recalcSpy).not.toHaveBeenCalled();
+
+      strategy.apply();
+
+      expect(recalcSpy).toHaveBeenCalled();
+    });
+
     /**
      * Run all tests for connecting the overlay to the origin such that first preferred
      * position does not go off-screen. We do this because there are several cases where we
diff --git a/src/cdk/overlay/position/connected-position-strategy.ts b/src/cdk/overlay/position/connected-position-strategy.ts
index 9d5f860718e2..6f106c2ade40 100644
--- a/src/cdk/overlay/position/connected-position-strategy.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.ts
@@ -68,8 +68,13 @@ export class ConnectedPositionStrategy implements PositionStrategy {
   /** The last position to have been calculated as the best fit position. */
   private _lastConnectedPosition: ConnectionPositionPair;
 
-  _onPositionChange:
-      Subject<ConnectedOverlayPositionChange> = new Subject<ConnectedOverlayPositionChange>();
+  /** Whether the position strategy is applied currently. */
+  private _applied = false;
+
+  /** Whether the overlay position is locked. */
+  private _positionLocked = false;
+
+  private _onPositionChange = new Subject<ConnectedOverlayPositionChange>();
 
   /** Emits an event when the connection point changes. */
   get onPositionChange(): Observable<ConnectedOverlayPositionChange> {
@@ -101,11 +106,13 @@ export class ConnectedPositionStrategy implements PositionStrategy {
 
   /** Disposes all resources used by the position strategy. */
   dispose() {
+    this._applied = false;
     this._resizeSubscription.unsubscribe();
   }
 
   /** @docs-private */
   detach() {
+    this._applied = false;
     this._resizeSubscription.unsubscribe();
   }
 
@@ -113,10 +120,18 @@ export class ConnectedPositionStrategy implements PositionStrategy {
    * Updates the position of the overlay element, using whichever preferred position relative
    * to the origin fits on-screen.
    * @docs-private
-   *
-   * @returns Resolves when the styles have been applied.
    */
   apply(): void {
+    // If the position has been applied already (e.g. when the overlay was opened) and the
+    // consumer opted into locking in the position, re-use the  old position, in order to
+    // prevent the overlay from jumping around.
+    if (this._applied && this._positionLocked && this._lastConnectedPosition) {
+      this.recalculateLastPosition();
+      return;
+    }
+
+    this._applied = true;
+
     // We need the bounding rects for the origin and the overlay to determine how to position
     // the overlay relative to the origin.
     const element = this._pane;
@@ -230,6 +245,17 @@ export class ConnectedPositionStrategy implements PositionStrategy {
     return this;
   }
 
+  /**
+   * Sets whether the overlay's position should be locked in after it is positioned
+   * initially. When an overlay is locked in, it won't attempt to reposition itself
+   * when the position is re-applied (e.g. when the user scrolls away).
+   * @param isLocked Whether the overlay should locked in.
+   */
+  withLockedPosition(isLocked: boolean): this {
+    this._positionLocked = isLocked;
+    return this;
+  }
+
   /**
    * Gets the horizontal (x) "start" dimension based on whether the overlay is in an RTL context.
    * @param rect

From c72524933075fa6312847b7fd8a1a77f74118a44 Mon Sep 17 00:00:00 2001
From: Philip Pham <phillypham@google.com>
Date: Mon, 20 Nov 2017 10:19:01 -0800
Subject: [PATCH 513/575] fix(chips): use all available space for the input
 (#7462)

Currently, an input inside a chips list is limited to 150px, so it looks like this.

![Cutoff Name](https://user-images.githubusercontent.com/1882729/31061451-6eb3a072-a6d6-11e7-9dac-67b41d1d3087.png).

Adding flex lets the input use all available space and still wrap correctly.

![Using all avaible space](https://user-images.githubusercontent.com/1882729/31061470-a0e783d8-a6d6-11e7-8919-848e1c4cb10a.png)

![Wrapping](https://user-images.githubusercontent.com/1882729/31061487-cdbfb10a-a6d6-11e7-89c9-a5fe1cf38c41.png)
---
 src/lib/chips/chips.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/chips/chips.scss b/src/lib/chips/chips.scss
index 4fda74c06a9f..541e9cc2bb13 100644
--- a/src/lib/chips/chips.scss
+++ b/src/lib/chips/chips.scss
@@ -97,4 +97,5 @@ $mat-chip-input-margin: 3px;
 input.mat-chip-input {
   width: $mat-chip-input-width;
   margin: $mat-chip-input-margin;
+  flex: 1 0 $mat-chip-input-width;
 }

From ea54edb7ef1c5338120c3991acbe325ad7c27764 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 20 Nov 2017 10:19:37 -0800
Subject: [PATCH 514/575] fix: replace extendObject utility w/ object spread
 (#7372)

---
 src/lib/core/datetime/native-date-adapter.ts |  4 +-
 src/lib/core/public-api.ts                   |  2 -
 src/lib/core/util/object-extend.spec.ts      | 50 --------------------
 src/lib/core/util/object-extend.ts           | 32 -------------
 src/lib/dialog/dialog.ts                     | 13 +++--
 src/lib/snack-bar/snack-bar.ts               |  9 ++--
 tslint.json                                  |  3 +-
 7 files changed, 13 insertions(+), 100 deletions(-)
 delete mode 100644 src/lib/core/util/object-extend.spec.ts
 delete mode 100644 src/lib/core/util/object-extend.ts

diff --git a/src/lib/core/datetime/native-date-adapter.ts b/src/lib/core/datetime/native-date-adapter.ts
index 4b9b9af46243..cd0a1082e437 100644
--- a/src/lib/core/datetime/native-date-adapter.ts
+++ b/src/lib/core/datetime/native-date-adapter.ts
@@ -7,10 +7,8 @@
  */
 
 import {Inject, Injectable, Optional} from '@angular/core';
-import {extendObject} from '../util/object-extend';
 import {DateAdapter, MAT_DATE_LOCALE} from './date-adapter';
 
-
 // TODO(mmalerba): Remove when we no longer support safari 9.
 /** Whether the browser supports the Intl API. */
 const SUPPORTS_INTL_API = typeof Intl != 'undefined';
@@ -186,7 +184,7 @@ export class NativeDateAdapter extends DateAdapter<Date> {
         date = new Date(Date.UTC(
             date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(),
             date.getMinutes(), date.getSeconds(), date.getMilliseconds()));
-        displayFormat = extendObject({}, displayFormat, {timeZone: 'utc'});
+        displayFormat = {...displayFormat, timeZone: 'utc'};
       }
       let dtf = new Intl.DateTimeFormat(this.locale, displayFormat);
       return this._stripDirectionalityCharacters(dtf.format(date));
diff --git a/src/lib/core/public-api.ts b/src/lib/core/public-api.ts
index 9e4fdd29cf84..688cf9199f01 100644
--- a/src/lib/core/public-api.ts
+++ b/src/lib/core/public-api.ts
@@ -18,8 +18,6 @@ export * from './placeholder/placeholder-options';
 export * from './ripple/index';
 export * from './selection/index';
 export * from './style/index';
-export * from './util/object-extend';
-
 
 // TODO: don't have this
 export * from './testing/month-constants';
diff --git a/src/lib/core/util/object-extend.spec.ts b/src/lib/core/util/object-extend.spec.ts
deleted file mode 100644
index 1cb0b329b08b..000000000000
--- a/src/lib/core/util/object-extend.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import {extendObject} from './object-extend';
-
-
-describe('extendObject', () => {
-  it('should extend an object', () => {
-    let extended = extendObject({}, {x: 123});
-
-    expect(extended).toEqual({x: 123});
-  });
-
-  it('should overwrite existing properties', () => {
-    let extended = extendObject({x: 456}, {x: 123});
-
-    expect(extended).toEqual({x: 123});
-  });
-
-  it('should add additional properties', () => {
-    let extended = extendObject({x: 456}, {y: 123});
-
-    expect(extended).toEqual({x: 456, y: 123});
-  });
-
-  it('should extend from multiple sources', () => {
-    let extended = extendObject({}, {x: 123}, {y: 456});
-
-    expect(extended).toEqual({x: 123, y: 456});
-  });
-
-  it('should overwrite properties from the later source', () => {
-    let extended = extendObject({}, {x: 123}, {x: 456});
-
-    expect(extended).toEqual({x: 456});
-  });
-
-  it('should treat null and undefined sources as empty objects', () => {
-    let extended = extendObject({}, null, {x: 123}, undefined, {y: 456});
-
-    expect(extended).toEqual({x: 123, y: 456});
-  });
-
-  it('should throw an error when the dest object is null', () => {
-    expect(() => extendObject(null, {x: 123}))
-        .toThrowError('Cannot convert undefined or null to object');
-  });
-
-  it('should throw an error when the dest object is undefined', () => {
-    expect(() => extendObject(undefined, {x: 123}))
-        .toThrowError('Cannot convert undefined or null to object');
-  });
-});
diff --git a/src/lib/core/util/object-extend.ts b/src/lib/core/util/object-extend.ts
deleted file mode 100644
index aeb48f9fdd84..000000000000
--- a/src/lib/core/util/object-extend.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-/**
- * Extends an object with the *enumerable* and *own* properties of one or more source objects,
- * similar to Object.assign.
- *
- * @param dest The object which will have properties copied to it.
- * @param sources The source objects from which properties will be copied.
- */
-export function extendObject(dest: any, ...sources: any[]): any {
-  if (dest == null) {
-    throw TypeError('Cannot convert undefined or null to object');
-  }
-
-  for (let source of sources) {
-    if (source != null) {
-      for (let key in source) {
-        if (source.hasOwnProperty(key)) {
-          dest[key] = source[key];
-        }
-      }
-    }
-  }
-
-  return dest;
-}
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 1dc4cbd9b484..ab9c92fe46ce 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -6,17 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Directionality} from '@angular/cdk/bidi';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {
   BlockScrollStrategy,
   Overlay,
-  OverlayRef,
   OverlayConfig,
+  OverlayRef,
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
-import {filter} from 'rxjs/operators/filter';
-import {startWith} from 'rxjs/operators/startWith';
 import {Location} from '@angular/common';
 import {
   ComponentRef,
@@ -28,15 +27,15 @@ import {
   SkipSelf,
   TemplateRef,
 } from '@angular/core';
-import {extendObject} from '@angular/material/core';
-import {Directionality} from '@angular/cdk/bidi';
 import {Observable} from 'rxjs/Observable';
 import {defer} from 'rxjs/observable/defer';
+import {of as observableOf} from 'rxjs/observable/of';
+import {filter} from 'rxjs/operators/filter';
+import {startWith} from 'rxjs/operators/startWith';
 import {Subject} from 'rxjs/Subject';
 import {MatDialogConfig} from './dialog-config';
 import {MatDialogContainer} from './dialog-container';
 import {MatDialogRef} from './dialog-ref';
-import {of as observableOf} from 'rxjs/observable/of';
 
 
 export const MAT_DIALOG_DATA = new InjectionToken<any>('MatDialogData');
@@ -313,5 +312,5 @@ export class MatDialog {
  * @returns The new configuration object.
  */
 function _applyConfigDefaults(config?: MatDialogConfig): MatDialogConfig {
-  return extendObject(new MatDialogConfig(), config);
+  return {...new MatDialogConfig(), ...config};
 }
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index f321d5026c89..3ac13aa8a111 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -7,17 +7,16 @@
  */
 
 import {LiveAnnouncer} from '@angular/cdk/a11y';
+import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
 import {Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/portal';
 import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
-import {extendObject} from '@angular/material/core';
+import {first} from 'rxjs/operators/first';
+import {takeUntil} from 'rxjs/operators/takeUntil';
 import {SimpleSnackBar} from './simple-snack-bar';
 import {MAT_SNACK_BAR_DATA, MatSnackBarConfig} from './snack-bar-config';
 import {MatSnackBarContainer} from './snack-bar-container';
 import {MatSnackBarRef} from './snack-bar-ref';
-import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
-import {takeUntil} from 'rxjs/operators/takeUntil';
-import {first} from 'rxjs/operators/first';
 
 
 /**
@@ -224,5 +223,5 @@ export class MatSnackBar {
  * @returns The new configuration object with defaults applied.
  */
 function _applyConfigDefaults(config?: MatSnackBarConfig): MatSnackBarConfig {
-  return extendObject(new MatSnackBarConfig(), config);
+  return {...new MatSnackBarConfig(), ...config};
 }
diff --git a/tslint.json b/tslint.json
index 6361be3d338b..d9d8c2440fa9 100644
--- a/tslint.json
+++ b/tslint.json
@@ -75,7 +75,8 @@
       ["fit"],
       ["fdescribe"],
       ["xit"],
-      ["xdescribe"]
+      ["xdescribe"],
+      {"name": "Object.assign", "message": "Use the spread operator instead."}
     ],
     // Disallows importing the whole RxJS library. Submodules can be still imported.
     "import-blacklist": [true, "rxjs", "rxjs/operators"],

From dad592202566ca54938cf259d2c470841b00f210 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:20:20 +0100
Subject: [PATCH 515/575] feat(dialog): add ariaLabel and focusOnOpen config
 options (#6558)

Based on the discussion on https://github.com/angular/material2/pull/6360#discussion_r133581835, these changes add the ability to set the `aria-label` of a dialog, as well as the element that should be focus when the dialog is opened.
---
 src/lib/dialog/dialog-config.ts    |  5 ++++
 src/lib/dialog/dialog-container.ts |  7 ++++--
 src/lib/dialog/dialog.spec.ts      | 38 ++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
index 71ff36ad6621..64318cb7ea31 100644
--- a/src/lib/dialog/dialog-config.ts
+++ b/src/lib/dialog/dialog-config.ts
@@ -81,6 +81,11 @@ export class MatDialogConfig<D = any> {
   /** ID of the element that describes the dialog.  */
   ariaDescribedBy?: string | null = null;
 
+  /** Aria label to assign to the dialog element */
+  ariaLabel?: string | null = null;
+
+  /** Whether the dialog should focus the first focusable element on open. */
+  autoFocus?: boolean = true;
 
   // TODO(jelbourn): add configuration for lifecycle hooks, ARIA labelling.
 }
diff --git a/src/lib/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
index 42a10c95c8a4..afc437a9e9ad 100644
--- a/src/lib/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -71,7 +71,8 @@ export function throwMatDialogContentAlreadyAttachedError() {
     'class': 'mat-dialog-container',
     'tabindex': '-1',
     '[attr.role]': '_config?.role',
-    '[attr.aria-labelledby]': '_ariaLabelledBy',
+    '[attr.aria-labelledby]': '_config?.ariaLabel ? null : _ariaLabelledBy',
+    '[attr.aria-label]': '_config?.ariaLabel',
     '[attr.aria-describedby]': '_config?.ariaDescribedBy || null',
     '[@slideDialog]': '_state',
     '(@slideDialog.start)': '_onAnimationStart($event)',
@@ -144,7 +145,9 @@ export class MatDialogContainer extends BasePortalOutlet {
     // If were to attempt to focus immediately, then the content of the dialog would not yet be
     // ready in instances where change detection has to run first. To deal with this, we simply
     // wait for the microtask queue to be empty.
-    this._focusTrap.focusInitialElementWhenReady();
+    if (this._config.autoFocus) {
+      this._focusTrap.focusInitialElementWhenReady();
+    }
   }
 
   /** Restores focus to the element that was focused before the dialog opened. */
diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 66f6a86004e2..3670d44f61ce 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -788,6 +788,18 @@ describe('MatDialog', () => {
           .toBe('INPUT', 'Expected first tabbable element (input) in the dialog to be focused.');
     }));
 
+    it('should allow disabling focus of the first tabbable element', fakeAsync(() => {
+      dialog.open(PizzaMsg, {
+        viewContainerRef: testViewContainerRef,
+        autoFocus: false
+      });
+
+      viewContainerFixture.detectChanges();
+      flushMicrotasks();
+
+      expect(document.activeElement.tagName).not.toBe('INPUT');
+    }));
+
     it('should re-focus trigger element when dialog closes', fakeAsync(() => {
       // Create a element that has focus before the dialog is opened.
       let button = document.createElement('button');
@@ -930,6 +942,32 @@ describe('MatDialog', () => {
     }));
 
   });
+
+  describe('aria-label', () => {
+    it('should be able to set a custom aria-label', () => {
+      dialog.open(PizzaMsg, {
+        ariaLabel: 'Hello there',
+        viewContainerRef: testViewContainerRef
+      });
+      viewContainerFixture.detectChanges();
+
+      const container = overlayContainerElement.querySelector('mat-dialog-container')!;
+      expect(container.getAttribute('aria-label')).toBe('Hello there');
+    });
+
+    it('should not set the aria-labelledby automatically if it has an aria-label', fakeAsync(() => {
+      dialog.open(ContentElementDialog, {
+        ariaLabel: 'Hello there',
+        viewContainerRef: testViewContainerRef
+      });
+      viewContainerFixture.detectChanges();
+      tick();
+      viewContainerFixture.detectChanges();
+
+      const container = overlayContainerElement.querySelector('mat-dialog-container')!;
+      expect(container.hasAttribute('aria-labelledby')).toBe(false);
+    }));
+  });
 });
 
 describe('MatDialog with a parent MatDialog', () => {

From 58598c457fdc5f032f12fbd6655a7265d88fa2f4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:54:01 +0100
Subject: [PATCH 516/575] feat(reposition-scroll-strategy): add option for
 closing once the user scrolls away (#8233)

Adds an option to the `RepositionScrollStrategy` that tells it to close the overlay once the user has scrolled away. This is a steps towards moving the scroll clipping logic away from the `ConnectedPositionStrategy`.
---
 .../scroll/reposition-scroll-strategy.spec.ts | 45 +++++++++++++++++--
 .../scroll/reposition-scroll-strategy.ts      | 27 ++++++++++-
 .../overlay/scroll/scroll-strategy-options.ts |  4 +-
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
index 0969222af312..91f7e3a436a7 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
@@ -14,6 +14,7 @@ import {
 
 describe('RepositionScrollStrategy', () => {
   let overlayRef: OverlayRef;
+  let overlay: Overlay;
   let componentPortal: ComponentPortal<PastaMsg>;
   let scrolledSubject = new Subject();
 
@@ -30,9 +31,8 @@ describe('RepositionScrollStrategy', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([Overlay], (overlay: Overlay) => {
-    let overlayConfig = new OverlayConfig({scrollStrategy: overlay.scrollStrategies.reposition()});
-    overlayRef = overlay.create(overlayConfig);
+  beforeEach(inject([Overlay], (o: Overlay) => {
+    overlay = o;
     componentPortal = new ComponentPortal(PastaMsg);
   }));
 
@@ -42,6 +42,11 @@ describe('RepositionScrollStrategy', () => {
   }));
 
   it('should update the overlay position when the page is scrolled', () => {
+    const overlayConfig = new OverlayConfig({
+      scrollStrategy: overlay.scrollStrategies.reposition()
+    });
+
+    overlayRef = overlay.create(overlayConfig);
     overlayRef.attach(componentPortal);
     spyOn(overlayRef, 'updatePosition');
 
@@ -53,6 +58,11 @@ describe('RepositionScrollStrategy', () => {
   });
 
   it('should not be updating the position after the overlay is detached', () => {
+    const overlayConfig = new OverlayConfig({
+      scrollStrategy: overlay.scrollStrategies.reposition()
+    });
+
+    overlayRef = overlay.create(overlayConfig);
     overlayRef.attach(componentPortal);
     spyOn(overlayRef, 'updatePosition');
 
@@ -63,6 +73,11 @@ describe('RepositionScrollStrategy', () => {
   });
 
   it('should not be updating the position after the overlay is destroyed', () => {
+    const overlayConfig = new OverlayConfig({
+      scrollStrategy: overlay.scrollStrategies.reposition()
+    });
+
+    overlayRef = overlay.create(overlayConfig);
     overlayRef.attach(componentPortal);
     spyOn(overlayRef, 'updatePosition');
 
@@ -72,6 +87,30 @@ describe('RepositionScrollStrategy', () => {
     expect(overlayRef.updatePosition).not.toHaveBeenCalled();
   });
 
+  it('should be able to close the overlay once it is out of view', () => {
+    const overlayConfig = new OverlayConfig({
+      scrollStrategy: overlay.scrollStrategies.reposition({
+        autoClose: true
+      })
+    });
+
+    overlayRef = overlay.create(overlayConfig);
+    overlayRef.attach(componentPortal);
+    spyOn(overlayRef, 'updatePosition');
+    spyOn(overlayRef, 'detach');
+    spyOn(overlayRef.overlayElement, 'getBoundingClientRect').and.returnValue({
+      top: -1000,
+      bottom: -900,
+      left: 0,
+      right: 100,
+      width: 100,
+      height: 100
+    });
+
+    scrolledSubject.next();
+    expect(overlayRef.detach).toHaveBeenCalledTimes(1);
+  });
+
 });
 
 
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
index 716adec4c2c3..457f649c2844 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
@@ -6,16 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {NgZone} from '@angular/core';
 import {Subscription} from 'rxjs/Subscription';
 import {ScrollStrategy, getMatScrollStrategyAlreadyAttachedError} from './scroll-strategy';
 import {OverlayRef} from '../overlay-ref';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
+import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
+import {isElementScrolledOutsideView} from '../position/scroll-clip';
 
 /**
  * Config options for the RepositionScrollStrategy.
  */
 export interface RepositionScrollStrategyConfig {
+  /** Time in milliseconds to throttle the scroll events. */
   scrollThrottle?: number;
+
+  /** Whether to close the overlay once the user has scrolled away completely. */
+  autoClose?: boolean;
 }
 
 /**
@@ -27,6 +33,8 @@ export class RepositionScrollStrategy implements ScrollStrategy {
 
   constructor(
     private _scrollDispatcher: ScrollDispatcher,
+    private _viewportRuler: ViewportRuler,
+    private _ngZone: NgZone,
     private _config?: RepositionScrollStrategyConfig) { }
 
   /** Attaches this scroll strategy to an overlay. */
@@ -41,10 +49,25 @@ export class RepositionScrollStrategy implements ScrollStrategy {
   /** Enables repositioning of the attached overlay on scroll. */
   enable() {
     if (!this._scrollSubscription) {
-      let throttle = this._config ? this._config.scrollThrottle : 0;
+      const throttle = this._config ? this._config.scrollThrottle : 0;
 
       this._scrollSubscription = this._scrollDispatcher.scrolled(throttle).subscribe(() => {
         this._overlayRef.updatePosition();
+
+        // TODO(crisbeto): make `close` on by default once all components can handle it.
+        if (this._config && this._config.autoClose) {
+          const overlayRect = this._overlayRef.overlayElement.getBoundingClientRect();
+          const {width, height} = this._viewportRuler.getViewportSize();
+
+          // TODO(crisbeto): include all ancestor scroll containers here once
+          // we have a way of exposing the trigger element to the scroll strategy.
+          const parentRects = [{width, height, bottom: height, right: width, top: 0, left: 0}];
+
+          if (isElementScrolledOutsideView(overlayRect, parentRects)) {
+            this.disable();
+            this._ngZone.run(() => this._overlayRef.detach());
+          }
+        }
       });
     }
   }
diff --git a/src/cdk/overlay/scroll/scroll-strategy-options.ts b/src/cdk/overlay/scroll/scroll-strategy-options.ts
index 07473fd51ef4..1185da1544e1 100644
--- a/src/cdk/overlay/scroll/scroll-strategy-options.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy-options.ts
@@ -45,6 +45,6 @@ export class ScrollStrategyOptions {
    * @param config Configuration to be used inside the scroll strategy.
    * Allows debouncing the reposition calls.
    */
-  reposition = (config?: RepositionScrollStrategyConfig) =>
-      new RepositionScrollStrategy(this._scrollDispatcher, config)
+  reposition = (config?: RepositionScrollStrategyConfig) => new RepositionScrollStrategy(
+      this._scrollDispatcher, this._viewportRuler, this._ngZone, config)
 }

From e5bf7df625624a64aa1fa597dad5c380b51cd19b Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:56:48 +0100
Subject: [PATCH 517/575] chore(checkbox): remove fake viewport ruler tests
 (#8537)

The fake viewport ruler was unused
---
 src/lib/checkbox/checkbox.spec.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
index 6df5d53ed4eb..62c67dafd841 100644
--- a/src/lib/checkbox/checkbox.spec.ts
+++ b/src/lib/checkbox/checkbox.spec.ts
@@ -9,8 +9,7 @@ import {
 import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {dispatchFakeEvent, FakeViewportRuler} from '@angular/cdk/testing';
+import {dispatchFakeEvent} from '@angular/cdk/testing';
 import {MatCheckbox, MatCheckboxChange, MatCheckboxModule} from './index';
 import {RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from '@angular/material/core';
 
@@ -34,9 +33,6 @@ describe('MatCheckbox', () => {
         CheckboxWithFormControl,
         CheckboxWithoutLabel,
         CheckboxWithTabindexAttr,
-      ],
-      providers: [
-        {provide: ViewportRuler, useClass: FakeViewportRuler}
       ]
     });
 

From c7afd8ebefb8e7bd67d3754440170d701619dab4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:57:05 +0100
Subject: [PATCH 518/575] chore: clear out mat-input-container references
 (#8535)

Clears out all the leftover `mat-input-container` usages inside the demo app and unit tests in order to avoid any potential confusion and to make removing the selector easier in the future.
---
 src/demo-app/autocomplete/autocomplete-demo.html |  4 ++--
 src/demo-app/dialog/dialog-demo.html             |  4 ++--
 src/demo-app/stepper/stepper-demo.html           | 12 ++++++------
 src/lib/autocomplete/autocomplete.spec.ts        |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/demo-app/autocomplete/autocomplete-demo.html b/src/demo-app/autocomplete/autocomplete-demo.html
index 3a844aa81a8a..ea1486b288a6 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.html
+++ b/src/demo-app/autocomplete/autocomplete-demo.html
@@ -55,14 +55,14 @@
   <mat-card>
     <div>Option groups (currentGroupedState): {{ currentGroupedState }}</div>
 
-    <mat-input-container>
+    <mat-form-field>
       <input
         matInput
         placeholder="State"
         [matAutocomplete]="groupedAuto"
         [(ngModel)]="currentGroupedState"
         (ngModelChange)="filteredGroupedStates = filterStateGroups(currentGroupedState)">
-    </mat-input-container>
+    </mat-form-field>
   </mat-card>
 </div>
 
diff --git a/src/demo-app/dialog/dialog-demo.html b/src/demo-app/dialog/dialog-demo.html
index b54508cf30b0..dcb68eb03872 100644
--- a/src/demo-app/dialog/dialog-demo.html
+++ b/src/demo-app/dialog/dialog-demo.html
@@ -103,9 +103,9 @@ <h2>Other options</h2>
 
   <p>It's Jazz!</p>
 
-  <mat-input-container>
+  <mat-form-field>
     <input matInput placeholder="How much?" #howMuch>
-  </mat-input-container>
+  </mat-form-field>
 
   <p> {{ data.message }} </p>
   <button type="button" (click)="dialogRef.close(lastCloseResult = howMuch.value)">Close dialog</button>
diff --git a/src/demo-app/stepper/stepper-demo.html b/src/demo-app/stepper/stepper-demo.html
index 4db3278b2977..0dd4274921ba 100644
--- a/src/demo-app/stepper/stepper-demo.html
+++ b/src/demo-app/stepper/stepper-demo.html
@@ -5,15 +5,15 @@ <h3>Linear Vertical Stepper Demo using a single form</h3>
   <mat-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
     <mat-step formGroupName="0" [stepControl]="formArray?.get([0])">
       <ng-template matStepLabel>Fill out your name</ng-template>
-      <mat-input-container>
+      <mat-form-field>
         <input matInput placeholder="First Name" formControlName="firstNameFormCtrl" required>
         <mat-error>This field is required</mat-error>
-      </mat-input-container>
+      </mat-form-field>
 
-      <mat-input-container>
+      <mat-form-field>
         <input matInput placeholder="Last Name" formControlName="lastNameFormCtrl" required>
         <mat-error>This field is required</mat-error>
-      </mat-input-container>
+      </mat-form-field>
       <div>
         <button mat-button matStepperNext type="button">Next</button>
       </div>
@@ -23,10 +23,10 @@ <h3>Linear Vertical Stepper Demo using a single form</h3>
       <ng-template matStepLabel>
         <div>Fill out your email address</div>
       </ng-template>
-      <mat-input-container>
+      <mat-form-field>
         <input matInput placeholder="Email address" formControlName="emailFormCtrl">
         <mat-error>The input is invalid.</mat-error>
-      </mat-input-container>
+      </mat-form-field>
       <div>
         <button mat-button matStepperPrevious type="button">Back</button>
         <button mat-button matStepperNext type="button">Next</button>
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index ef03944435da..7d5bc2abe538 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1901,9 +1901,9 @@ class AutocompleteWithFormsAndNonfloatingPlaceholder {
 
 @Component({
   template: `
-    <mat-input-container>
+    <mat-form-field>
       <input matInput placeholder="State" [matAutocomplete]="auto" [(ngModel)]="selectedState">
-    </mat-input-container>
+    </mat-form-field>
 
     <mat-autocomplete #auto="matAutocomplete">
       <mat-optgroup *ngFor="let group of stateGroups" [label]="group.label">
@@ -1935,9 +1935,9 @@ class AutocompleteWithGroups {
 
 @Component({
   template: `
-    <mat-input-container>
+    <mat-form-field>
       <input matInput placeholder="State" [matAutocomplete]="auto" [(ngModel)]="selectedState">
-    </mat-input-container>
+    </mat-form-field>
 
     <mat-autocomplete #auto="matAutocomplete" (optionSelected)="optionSelected($event)">
       <mat-option *ngFor="let state of states" [value]="state">

From 405f6c700433771429d5d796ee478c224cbdf8da Mon Sep 17 00:00:00 2001
From: Sean <swreeser@users.noreply.github.com>
Date: Mon, 20 Nov 2017 10:57:45 -0800
Subject: [PATCH 519/575] chore: fix typo in chips example (#8500)

---
 src/material-examples/chips-input/chips-input-example.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material-examples/chips-input/chips-input-example.ts b/src/material-examples/chips-input/chips-input-example.ts
index 19ce1dc68eb0..e90a5e6e1daf 100644
--- a/src/material-examples/chips-input/chips-input-example.ts
+++ b/src/material-examples/chips-input/chips-input-example.ts
@@ -30,7 +30,7 @@ export class ChipsInputExample {
     let input = event.input;
     let value = event.value;
 
-    // Add our person
+    // Add our fruit
     if ((value || '').trim()) {
       this.fruits.push({ name: value.trim() });
     }

From a4779d195433d2d125bbc573b62f2342aa810011 Mon Sep 17 00:00:00 2001
From: Arthur Bogaart <arthur.bogaart@bloomreach.com>
Date: Mon, 20 Nov 2017 19:58:16 +0100
Subject: [PATCH 520/575] docs: add 'input' level to typography (#8477)

---
 guides/typography.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guides/typography.md b/guides/typography.md
index 98263e2d5b6b..fe117bf5fa50 100644
--- a/guides/typography.md
+++ b/guides/typography.md
@@ -16,6 +16,7 @@ at the top of the page (e.g. a hero header).
 * `body-2` - Bolder body text.
 * `caption` - Smaller body and hint text.
 * `button` - Buttons and anchors.
+* `input` - Form input fields.
 
 The typography levels are collected into a typography config which is used to generate the CSS.
 

From 1f1aeeb92d29eca4afc8de6eeff818ec7935da61 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 19:58:29 +0100
Subject: [PATCH 521/575] refactor(snack-bar): switch to fakeAsync tests
 (#8459)

Switches all of the snack bar tests that were running in `async` to `fakeAsync` in order to make them run faster, avoid some unnecessary nesting and help with browsers timing out.
---
 src/lib/snack-bar/snack-bar.spec.ts | 353 ++++++++++++++--------------
 1 file changed, 170 insertions(+), 183 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 81c27cd01614..c03f7cc34edd 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -1,10 +1,10 @@
 import {
   inject,
-  async,
   ComponentFixture,
   TestBed,
   fakeAsync,
   tick,
+  flush,
 } from '@angular/core/testing';
 import {NgModule, Component, Directive, ViewChild, ViewContainerRef, Inject} from '@angular/core';
 import {CommonModule} from '@angular/common';
@@ -32,11 +32,10 @@ describe('MatSnackBar', () => {
   let simpleMessage = 'Burritos are here!';
   let simpleActionLabel = 'pickup';
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
-    });
-    TestBed.compileComponents();
+    }).compileComponents();
   }));
 
   beforeEach(inject([MatSnackBar, LiveAnnouncer, OverlayContainer],
@@ -67,21 +66,20 @@ describe('MatSnackBar', () => {
         .toBe('alert', 'Expected snack bar container to have role="alert"');
    });
 
-   it('should open and close a snackbar without a ViewContainerRef', async(() => {
-     let snackBarRef = snackBar.open('Snack time!', 'Chew');
-     viewContainerFixture.detectChanges();
+   it('should open and close a snackbar without a ViewContainerRef', fakeAsync(() => {
+      let snackBarRef = snackBar.open('Snack time!', 'Chew');
+      viewContainerFixture.detectChanges();
 
-     let messageElement = overlayContainerElement.querySelector('snack-bar-container')!;
-     expect(messageElement.textContent).toContain('Snack time!',
+      let messageElement = overlayContainerElement.querySelector('snack-bar-container')!;
+      expect(messageElement.textContent).toContain('Snack time!',
          'Expected snack bar to show a message without a ViewContainerRef');
 
-     snackBarRef.dismiss();
-     viewContainerFixture.detectChanges();
+      snackBarRef.dismiss();
+      viewContainerFixture.detectChanges();
+      flush();
 
-     viewContainerFixture.whenStable().then(() => {
-       expect(overlayContainerElement.childNodes.length)
+      expect(overlayContainerElement.childNodes.length)
           .toBe(0, 'Expected snack bar to be dismissed without a ViewContainerRef');
-     });
    }));
 
   it('should open a simple message with a button', () => {
@@ -126,7 +124,7 @@ describe('MatSnackBar', () => {
         .toBeNull('Expected the query selection for action label to be null');
   });
 
-  it('should dismiss the snack bar and remove itself from the view', async(() => {
+  it('should dismiss the snack bar and remove itself from the view', fakeAsync(() => {
     let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
 
@@ -139,39 +137,36 @@ describe('MatSnackBar', () => {
 
     snackBarRef.dismiss();
     viewContainerFixture.detectChanges();  // Run through animations for dismissal
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(dismissCompleteSpy).toHaveBeenCalled();
-      expect(overlayContainerElement.childElementCount)
-          .toBe(0, 'Expected the overlay container element to have no child elements');
-    });
+    expect(dismissCompleteSpy).toHaveBeenCalled();
+    expect(overlayContainerElement.childElementCount)
+        .toBe(0, 'Expected the overlay container element to have no child elements');
   }));
 
-  it('should be able to get dismissed through the service', async(() => {
+  it('should be able to get dismissed through the service', fakeAsync(() => {
     snackBar.open(simpleMessage);
     viewContainerFixture.detectChanges();
     expect(overlayContainerElement.childElementCount).toBeGreaterThan(0);
 
     snackBar.dismiss();
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.childElementCount).toBe(0);
-    });
+    expect(overlayContainerElement.childElementCount).toBe(0);
   }));
 
-  it('should clean itself up when the view container gets destroyed', async(() => {
+  it('should clean itself up when the view container gets destroyed', fakeAsync(() => {
     snackBar.open(simpleMessage, undefined, { viewContainerRef: testViewContainerRef });
     viewContainerFixture.detectChanges();
     expect(overlayContainerElement.childElementCount).toBeGreaterThan(0);
 
     viewContainerFixture.componentInstance.childComponentExists = false;
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.childElementCount)
-          .toBe(0, 'Expected snack bar to be removed after the view container was destroyed');
-    });
+    expect(overlayContainerElement.childElementCount)
+        .toBe(0, 'Expected snack bar to be removed after the view container was destroyed');
   }));
 
   it('should set the animation state to visible on entry', () => {
@@ -199,7 +194,7 @@ describe('MatSnackBar', () => {
   });
 
   it(`should set the old snack bar animation state to complete and the new snack bar animation
-      state to visible on entry of new snack bar`, async(() => {
+      state to visible on entry of new snack bar`, fakeAsync(() => {
     let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, undefined, config);
     let dismissCompleteSpy = jasmine.createSpy('dismiss complete spy');
@@ -213,17 +208,16 @@ describe('MatSnackBar', () => {
 
     viewContainerFixture.detectChanges();
     snackBarRef.afterDismissed().subscribe(undefined, undefined, dismissCompleteSpy);
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(dismissCompleteSpy).toHaveBeenCalled();
-      expect(snackBarRef.containerInstance._animationState)
-          .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
-      expect(snackBarRef2.containerInstance._animationState)
-          .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
-    });
+    expect(dismissCompleteSpy).toHaveBeenCalled();
+    expect(snackBarRef.containerInstance._animationState)
+        .toBe('hidden-bottom', `Expected the animation state would be 'hidden-bottom'.`);
+    expect(snackBarRef2.containerInstance._animationState)
+        .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
   }));
 
-  it('should open a new snackbar after dismissing a previous snackbar', async(() => {
+  it('should open a new snackbar after dismissing a previous snackbar', fakeAsync(() => {
     let config: MatSnackBarConfig = {viewContainerRef: testViewContainerRef};
     let snackBarRef = snackBar.open(simpleMessage, 'Dismiss', config);
 
@@ -233,33 +227,29 @@ describe('MatSnackBar', () => {
     viewContainerFixture.detectChanges();
 
     // Wait for the snackbar dismiss animation to finish.
-    viewContainerFixture.whenStable().then(() => {
-      snackBarRef = snackBar.open('Second snackbar', 'Dismiss', config);
-      viewContainerFixture.detectChanges();
+    flush();
+    snackBarRef = snackBar.open('Second snackbar', 'Dismiss', config);
+    viewContainerFixture.detectChanges();
 
-      // Wait for the snackbar open animation to finish.
-      viewContainerFixture.whenStable().then(() => {
-        expect(snackBarRef.containerInstance._animationState)
-            .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
-      });
-    });
+    // Wait for the snackbar open animation to finish.
+    flush();
+    expect(snackBarRef.containerInstance._animationState)
+        .toBe('visible-bottom', `Expected the animation state would be 'visible-bottom'.`);
   }));
 
-  it('should remove past snackbars when opening new snackbars', async(() => {
+  it('should remove past snackbars when opening new snackbars', fakeAsync(() => {
     snackBar.open('First snackbar');
     viewContainerFixture.detectChanges();
 
     snackBar.open('Second snackbar');
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      snackBar.open('Third snackbar');
-      viewContainerFixture.detectChanges();
+    snackBar.open('Third snackbar');
+    viewContainerFixture.detectChanges();
+    flush();
 
-      viewContainerFixture.whenStable().then(() => {
-        expect(overlayContainerElement.textContent!.trim()).toBe('Third snackbar');
-      });
-    });
+    expect(overlayContainerElement.textContent!.trim()).toBe('Third snackbar');
   }));
 
   it('should remove snackbar if another is shown while its still animating open', fakeAsync(() => {
@@ -442,13 +432,11 @@ describe('MatSnackBar with parent MatSnackBar', () => {
   let fixture: ComponentFixture<ComponentThatProvidesMatSnackBar>;
   let liveAnnouncer: LiveAnnouncer;
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
       declarations: [ComponentThatProvidesMatSnackBar],
-    });
-
-    TestBed.compileComponents();
+    }).compileComponents();
   }));
 
   beforeEach(inject([MatSnackBar, LiveAnnouncer, OverlayContainer],
@@ -514,11 +502,10 @@ describe('MatSnackBar Positioning', () => {
   let simpleMessage = 'Burritos are here!';
   let simpleActionLabel = 'pickup';
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [MatSnackBarModule, SnackBarTestModule, NoopAnimationsModule],
-    });
-    TestBed.compileComponents();
+    }).compileComponents();
   }));
 
   beforeEach(inject([MatSnackBar, LiveAnnouncer, OverlayContainer],
@@ -540,145 +527,145 @@ describe('MatSnackBar Positioning', () => {
     testViewContainerRef = viewContainerFixture.componentInstance.childViewContainer;
   });
 
-  it('should default to bottom center', async(() => {
+  it('should default to bottom center', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel);
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
 
-      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
   }));
 
-  it('should be in the bottom left corner', async(() => {
+  it('should be in the bottom left corner', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'bottom',
       horizontalPosition: 'left'
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
    }));
 
-   it('should be in the bottom right corner', async(() => {
+   it('should be in the bottom right corner', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'bottom',
       horizontalPosition: 'right'
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
    }));
 
-   it('should be in the bottom center', async(() => {
+   it('should be in the bottom center', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'bottom',
       horizontalPosition: 'center'
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
-      expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
-      expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeFalsy();
+    expect(overlayPaneEl.style.marginBottom).toBe('0px', 'Expected margin-bottom to be "0px"');
+    expect(overlayPaneEl.style.marginTop).toBe('', 'Expected margin-top to be ""');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
    }));
 
-   it('should be in the top left corner', async(() => {
+   it('should be in the top left corner', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'left'
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
    }));
 
-   it('should be in the top right corner', async(() => {
+   it('should be in the top right corner', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'right'
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
    }));
 
-   it('should be in the top center', async(() => {
+   it('should be in the top center', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'center'
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeTruthy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
    }));
 
-   it('should handle start based on direction (rtl)', async(() => {
+   it('should handle start based on direction (rtl)', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'start',
@@ -686,20 +673,20 @@ describe('MatSnackBar Positioning', () => {
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
   }));
 
-  it('should handle start based on direction (ltr)', async(() => {
+  it('should handle start based on direction (ltr)', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'start',
@@ -707,20 +694,20 @@ describe('MatSnackBar Positioning', () => {
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
   }));
 
-  it('should handle end based on direction (rtl)', async(() => {
+  it('should handle end based on direction (rtl)', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'end',
@@ -728,20 +715,20 @@ describe('MatSnackBar Positioning', () => {
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
-      expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('', 'Expected margin-right to be ""');
+    expect(overlayPaneEl.style.marginLeft).toBe('0px', 'Expected margin-left  to be "0px"');
   }));
 
-  it('should handle end based on direction (ltr)', async(() => {
+  it('should handle end based on direction (ltr)', fakeAsync(() => {
     snackBar.open(simpleMessage, simpleActionLabel, {
       verticalPosition: 'top',
       horizontalPosition: 'end',
@@ -749,17 +736,17 @@ describe('MatSnackBar Positioning', () => {
     });
 
     viewContainerFixture.detectChanges();
-    viewContainerFixture.whenStable().then(() => {
-      const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
-      const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+    flush();
 
-      expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
-      expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
-      expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
-      expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
-      expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
-      expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
-    });
+    const containerEl = overlayContainerEl.querySelector('snack-bar-container') as HTMLElement;
+    const overlayPaneEl = overlayContainerEl.querySelector('.cdk-overlay-pane') as HTMLElement;
+
+    expect(containerEl.classList.contains('mat-snack-bar-center')).toBeFalsy();
+    expect(containerEl.classList.contains('mat-snack-bar-top')).toBeTruthy();
+    expect(overlayPaneEl.style.marginBottom).toBe('', 'Expected margin-bottom to be ""');
+    expect(overlayPaneEl.style.marginTop).toBe('0px', 'Expected margin-top to be "0px"');
+    expect(overlayPaneEl.style.marginRight).toBe('0px', 'Expected margin-right to be "0px"');
+    expect(overlayPaneEl.style.marginLeft).toBe('', 'Expected margin-left  to be ""');
   }));
 
 });

From 0bacebf3f8a7943c27b9ba8f9c5040b518052d53 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:59:07 +0100
Subject: [PATCH 522/575] docs: add table-selection example (#8377)

---
 src/material-examples/example-module.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 1fd0719e1055..9413d147d9d8 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -112,6 +112,7 @@ import {TableFilteringExample} from './table-filtering/table-filtering-example';
 import {TableHttpExample} from './table-http/table-http-example';
 import {TableOverviewExample} from './table-overview/table-overview-example';
 import {TablePaginationExample} from './table-pagination/table-pagination-example';
+import {TableSelectionExample} from './table-selection/table-selection-example';
 import {TableSortingExample} from './table-sorting/table-sorting-example';
 import {TabsOverviewExample} from './tabs-overview/tabs-overview-example';
 import {TabsTemplateLabelExample} from './tabs-template-label/tabs-template-label-example';
@@ -715,6 +716,12 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
+  'table-selection': {
+    title: 'Table with selection',
+    component: TableSelectionExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'table-sorting': {
     title: 'Table with sorting',
     component: TableSortingExample,
@@ -859,6 +866,7 @@ export const EXAMPLE_LIST = [
   TableHttpExample,
   TableOverviewExample,
   TablePaginationExample,
+  TableSelectionExample,
   TableSortingExample,
   TabsOverviewExample,
   TabsTemplateLabelExample,

From 3b4100528986de0a740d4e388573ca0fffec893f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 19:59:41 +0100
Subject: [PATCH 523/575] docs: show interfaces (#8376)

Also adds documentation for the `RippleGlobalOptions`

Closes #8298
---
 src/lib/core/ripple/ripple-renderer.ts        |  2 +-
 src/lib/core/ripple/ripple.md                 |  7 +-
 src/lib/core/ripple/ripple.ts                 | 10 +++
 tools/dgeni/common/dgeni-definitions.ts       | 37 +++++++++
 tools/dgeni/common/sort-members.ts            |  2 +-
 tools/dgeni/processors/categorizer.ts         | 80 ++++++++-----------
 tools/dgeni/processors/component-grouper.ts   | 30 +++----
 .../templates/componentGroup.template.html    | 14 ++++
 tools/dgeni/templates/interface.template.html | 16 ++++
 9 files changed, 129 insertions(+), 69 deletions(-)
 create mode 100644 tools/dgeni/common/dgeni-definitions.ts
 create mode 100644 tools/dgeni/templates/interface.template.html

diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
index bb5f61aafd0e..b9ad40f6883f 100644
--- a/src/lib/core/ripple/ripple-renderer.ts
+++ b/src/lib/core/ripple/ripple-renderer.ts
@@ -85,7 +85,7 @@ export class RippleRenderer {
     }
 
     const radius = config.radius || distanceToFurthestCorner(x, y, containerRect);
-    const duration = RIPPLE_FADE_IN_DURATION * (1 / (config.speedFactor || 1));
+    const duration = RIPPLE_FADE_IN_DURATION / (config.speedFactor || 1);
     const offsetX = x - containerRect.left;
     const offsetY = y - containerRect.top;
 
diff --git a/src/lib/core/ripple/ripple.md b/src/lib/core/ripple/ripple.md
index 9338ab4b2418..c0aaf9850846 100644
--- a/src/lib/core/ripple/ripple.md
+++ b/src/lib/core/ripple/ripple.md
@@ -85,9 +85,4 @@ const globalRippleConfig: RippleGlobalOptions = {
 })
 ```
 
-All currently available global options are shown here:
-
-| Name            | Type    | Description                               |
-| --------------- | ------- | ----------------------------------------- |
-| disabled        | boolean | Whether ripples should show or not.       |
-| baseSpeedFactor | number  | Factor to adjust ripple speed.            |
+All available global options can be seen in the `RippleGlobalOptions` interface.
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index 4ff85f98ee50..d35f4d32dbd2 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -23,7 +23,17 @@ import {RippleConfig, RippleRenderer} from './ripple-renderer';
 import {RippleRef} from './ripple-ref';
 
 export interface RippleGlobalOptions {
+  /**
+   * Whether ripples should be disabled. Ripples can be still launched manually by using
+   * the `launch()` method. Therefore focus indicators will still show up.
+   */
   disabled?: boolean;
+
+  /**
+   * If set, the default duration of the fade-in animation is divided by this value. For example,
+   * setting it to 0.5 will cause the ripple fade-in animation to take twice as long.
+   * A changed speedFactor will not affect the fade-out duration of the ripples.
+   */
   baseSpeedFactor?: number;
 }
 
diff --git a/tools/dgeni/common/dgeni-definitions.ts b/tools/dgeni/common/dgeni-definitions.ts
new file mode 100644
index 000000000000..473e7a63f013
--- /dev/null
+++ b/tools/dgeni/common/dgeni-definitions.ts
@@ -0,0 +1,37 @@
+import {ClassExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassExportDoc';
+import {ClassLikeExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassLikeExportDoc';
+import {PropertyMemberDoc} from 'dgeni-packages/typescript/api-doc-types/PropertyMemberDoc';
+import {NormalizedMethodMemberDoc} from './normalize-method-parameters';
+
+/** Extended Dgeni class-like document that includes separated class members. */
+export interface CategorizedClassLikeDoc extends ClassLikeExportDoc {
+  methods: CategorizedMethodMemberDoc[];
+  properties: CategorizedPropertyMemberDoc[];
+  isDeprecated: boolean;
+}
+
+/** Extended Dgeni class document that includes extracted Angular metadata. */
+export interface CategorizedClassDoc extends ClassExportDoc, CategorizedClassLikeDoc {
+  isDirective: boolean;
+  isService: boolean;
+  isNgModule: boolean;
+  directiveExportAs?: string | null;
+  directiveSelectors?: string[];
+  extendedDoc: ClassLikeExportDoc | null;
+}
+
+/** Extended Dgeni property-member document that includes extracted Angular metadata. */
+export interface CategorizedPropertyMemberDoc extends PropertyMemberDoc {
+  description: string;
+  isDeprecated: boolean;
+  isDirectiveInput: boolean;
+  isDirectiveOutput: boolean;
+  directiveInputAlias: string;
+  directiveOutputAlias: string;
+}
+
+/** Extended Dgeni method-member document that simplifies logic for the Dgeni template. */
+export interface CategorizedMethodMemberDoc extends NormalizedMethodMemberDoc {
+  showReturns: boolean;
+  isDeprecated: boolean;
+}
diff --git a/tools/dgeni/common/sort-members.ts b/tools/dgeni/common/sort-members.ts
index 67e06a20ee57..0a2798c04cfc 100644
--- a/tools/dgeni/common/sort-members.ts
+++ b/tools/dgeni/common/sort-members.ts
@@ -1,5 +1,5 @@
-import {CategorizedMethodMemberDoc, CategorizedPropertyMemberDoc} from '../processors/categorizer';
 import {isDirectiveInput, isDirectiveOutput} from './decorators';
+import {CategorizedMethodMemberDoc, CategorizedPropertyMemberDoc} from './dgeni-definitions';
 
 /** Combined type for a categorized method member document. */
 type CategorizedMemberDoc = CategorizedMethodMemberDoc & CategorizedPropertyMemberDoc;
diff --git a/tools/dgeni/processors/categorizer.ts b/tools/dgeni/processors/categorizer.ts
index c6c2b85aa706..8c6faedb7bcc 100644
--- a/tools/dgeni/processors/categorizer.ts
+++ b/tools/dgeni/processors/categorizer.ts
@@ -1,10 +1,5 @@
-import {Processor, DocCollection} from 'dgeni';
-import {ClassExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassExportDoc';
-import {PropertyMemberDoc} from 'dgeni-packages/typescript/api-doc-types/PropertyMemberDoc';
-import {
-  NormalizedMethodMemberDoc,
-  normalizeMethodParameters
-} from '../common/normalize-method-parameters';
+import {DocCollection, Processor} from 'dgeni';
+import {MethodMemberDoc} from 'dgeni-packages/typescript/api-doc-types/MethodMemberDoc';
 import {
   decorateDeprecatedDoc,
   getDirectiveInputAlias,
@@ -19,35 +14,15 @@ import {
   isProperty,
   isService
 } from '../common/decorators';
-import {ClassLikeExportDoc} from 'dgeni-packages/typescript/api-doc-types/ClassLikeExportDoc';
-import {MethodMemberDoc} from 'dgeni-packages/typescript/api-doc-types/MethodMemberDoc';
+import {
+  CategorizedClassDoc,
+  CategorizedClassLikeDoc,
+  CategorizedMethodMemberDoc,
+  CategorizedPropertyMemberDoc
+} from '../common/dgeni-definitions';
+import {normalizeMethodParameters} from '../common/normalize-method-parameters';
 import {sortCategorizedMembers} from '../common/sort-members';
 
-export interface CategorizedClassDoc extends ClassExportDoc {
-  methods: CategorizedMethodMemberDoc[];
-  properties: CategorizedPropertyMemberDoc[];
-  isDirective: boolean;
-  isService: boolean;
-  isNgModule: boolean;
-  isDeprecated: boolean;
-  directiveExportAs?: string | null;
-  directiveSelectors?: string[];
-  extendedDoc: ClassLikeExportDoc | null;
-}
-
-export interface CategorizedPropertyMemberDoc extends PropertyMemberDoc {
-  description: string;
-  isDeprecated: boolean;
-  isDirectiveInput: boolean;
-  isDirectiveOutput: boolean;
-  directiveInputAlias: string;
-  directiveOutputAlias: string;
-}
-
-export interface CategorizedMethodMemberDoc extends NormalizedMethodMemberDoc {
-  showReturns: boolean;
-  isDeprecated: boolean;
-}
 
 /**
  * Processor to add properties to docs objects.
@@ -62,34 +37,47 @@ export class Categorizer implements Processor {
   $runBefore = ['docs-processed'];
 
   $process(docs: DocCollection) {
-    docs.filter(doc => doc.docType === 'class').forEach(doc => this.decorateClassDoc(doc));
+    docs
+      .filter(doc => doc.docType === 'class' || doc.docType === 'interface')
+      .forEach(doc => this.decorateClassLikeDoc(doc));
   }
 
   /**
-   * Decorates all class docs inside of the dgeni pipeline.
-   * - Methods and properties of a class-doc will be extracted into separate variables.
-   * - Identifies directives, services or NgModules and marks them them in class-doc.
+   * Decorates all class and interface docs inside of the dgeni pipeline.
+   * - Members of a class and interface document will be extracted into separate variables.
    */
-  private decorateClassDoc(classDoc: CategorizedClassDoc) {
+  private decorateClassLikeDoc(classLikeDoc: CategorizedClassLikeDoc) {
     // Resolve all methods and properties from the classDoc.
-    classDoc.methods = classDoc.members
+    classLikeDoc.methods = classLikeDoc.members
       .filter(isMethod)
       .filter(filterDuplicateMembers) as CategorizedMethodMemberDoc[];
 
-    classDoc.properties = classDoc.members
+    classLikeDoc.properties = classLikeDoc.members
       .filter(isProperty)
       .filter(filterDuplicateMembers) as CategorizedPropertyMemberDoc[];
 
     // Call decorate hooks that can modify the method and property docs.
-    classDoc.methods.forEach(doc => this.decorateMethodDoc(doc));
-    classDoc.properties.forEach(doc => this.decoratePropertyDoc(doc));
+    classLikeDoc.methods.forEach(doc => this.decorateMethodDoc(doc));
+    classLikeDoc.properties.forEach(doc => this.decoratePropertyDoc(doc));
 
-    decorateDeprecatedDoc(classDoc);
+    decorateDeprecatedDoc(classLikeDoc);
 
     // Sort members
-    classDoc.methods.sort(sortCategorizedMembers);
-    classDoc.properties.sort(sortCategorizedMembers);
+    classLikeDoc.methods.sort(sortCategorizedMembers);
+    classLikeDoc.properties.sort(sortCategorizedMembers);
+
+    // Special decorations for real class documents that don't apply for interfaces.
+    if (classLikeDoc.docType === 'class') {
+      this.decorateClassDoc(classLikeDoc as CategorizedClassDoc);
+    }
+  }
 
+  /**
+   * Decorates all Dgeni class documents for a simpler use inside of the template.
+   * - Identifies directives, services or NgModules and marks them them inside of the doc.
+   * - Links the Dgeni document to the Dgeni document that the current class extends from.
+   */
+  private decorateClassDoc(classDoc: CategorizedClassDoc) {
     // Classes can only extend a single class. This means that there can't be multiple extend
     // clauses for the Dgeni document. To make the template syntax simpler and more readable,
     // store the extended class in a variable.
diff --git a/tools/dgeni/processors/component-grouper.ts b/tools/dgeni/processors/component-grouper.ts
index e1f89b84ab98..2b33c77f627d 100644
--- a/tools/dgeni/processors/component-grouper.ts
+++ b/tools/dgeni/processors/component-grouper.ts
@@ -1,10 +1,14 @@
-import {CategorizedClassDoc} from './categorizer';
 import {DocCollection, Document, Processor} from 'dgeni';
+import {InterfaceExportDoc} from 'dgeni-packages/typescript/api-doc-types/InterfaceExportDoc';
 import * as path from 'path';
+import {CategorizedClassDoc} from '../common/dgeni-definitions';
 
 /** Component group data structure. */
 export class ComponentGroup {
 
+  /** Unique document type for Dgeni. */
+  docType = 'componentGroup';
+
   /** Name of the component group. */
   name: string;
 
@@ -24,32 +28,26 @@ export class ComponentGroup {
   id: string;
 
   /** Known aliases for the component group. */
-  aliases: string[];
-
-  /** Unique document type for Dgeni. */
-  docType: string;
+  aliases: string[] = [];
 
   /** List of categorized class docs that are defining a directive. */
-  directives: CategorizedClassDoc[];
+  directives: CategorizedClassDoc[] = [];
 
   /** List of categorized class docs that are defining a service. */
-  services: CategorizedClassDoc[];
+  services: CategorizedClassDoc[] = [];
 
   /** Additional classes that belong to the component group. */
-  additionalClasses: CategorizedClassDoc[];
+  additionalClasses: CategorizedClassDoc[] = [];
+
+  /** Additional interfaces that belong to the component group. */
+  additionalInterfaces: InterfaceExportDoc[] = [];
 
   /** NgModule that defines the current component group. */
-  ngModule: CategorizedClassDoc | null;
+  ngModule: CategorizedClassDoc | null = null;
 
   constructor(name: string) {
     this.name = name;
     this.id = `component-group-${name}`;
-    this.aliases = [];
-    this.docType = 'componentGroup';
-    this.directives = [];
-    this.services = [];
-    this.additionalClasses = [];
-    this.ngModule = null;
   }
 }
 
@@ -97,6 +95,8 @@ export class ComponentGrouper implements Processor {
         group.ngModule = doc;
       } else if (doc.docType == 'class') {
         group.additionalClasses.push(doc);
+      } else if (doc.docType == 'interface') {
+        group.additionalInterfaces.push(doc);
       }
     });
 
diff --git a/tools/dgeni/templates/componentGroup.template.html b/tools/dgeni/templates/componentGroup.template.html
index c6d703cf367d..3e218eb38bff 100644
--- a/tools/dgeni/templates/componentGroup.template.html
+++ b/tools/dgeni/templates/componentGroup.template.html
@@ -19,6 +19,10 @@
   {% include 'class.template.html' %}
 {% endmacro %}
 
+{% macro interface(interface) -%}
+  {% include 'interface.template.html' %}
+{% endmacro %}
+
 <div class="docs-api">
   <h2>
     API reference for Angular {$ doc.packageDisplayName $} {$ doc.displayName $}
@@ -60,4 +64,14 @@ <h3 id="additional_classes" class="docs-header-link docs-api-h3">
       {$ class(other) $}
     {% endfor %}
   {%- endif -%}
+
+  {%- if doc.additionalInterfaces.length -%}
+    <h3 id="additional_interfaces" class="docs-header-link docs-api-h3">
+      <span header-link="additional_interfaces"></span>
+      Additional interfaces
+    </h3>
+    {% for item in doc.additionalInterfaces %}
+      {$ interface(item) $}
+    {% endfor %}
+  {%- endif -%}
 </div>
diff --git a/tools/dgeni/templates/interface.template.html b/tools/dgeni/templates/interface.template.html
new file mode 100644
index 000000000000..36637c4d6857
--- /dev/null
+++ b/tools/dgeni/templates/interface.template.html
@@ -0,0 +1,16 @@
+<h4 id="{$ interface.name $}" class="docs-header-link docs-api-h4 docs-api-interface-name">
+  <span header-link="{$ interface.name $}"></span>
+  <code>{$ interface.name $}</code>
+</h4>
+
+{%- if interface.description -%}
+<p class="docs-api-interface-description">{$ interface.description | marked | safe $}</p>
+{%- endif -%}
+
+{%- if interface.isDeprecated -%}
+<div class="docs-api-interface-deprecated-marker">Deprecated</div>
+{%- endif -%}
+
+{$ propertyList(interface.properties) $}
+
+{$ methodList(interface.methods) $}

From 4c45c79b41dc471359e5208faa2ee8da6cb25ab2 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 20:00:00 +0100
Subject: [PATCH 524/575] build: enable noUnusedParameters check in aot.
 (#8188)

---
 src/demo-app/tsconfig-aot.json            | 3 +--
 src/e2e-app/tsconfig-build.json           | 3 +--
 src/universal-app/tsconfig-build.json     | 3 +--
 src/universal-app/tsconfig-prerender.json | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/demo-app/tsconfig-aot.json b/src/demo-app/tsconfig-aot.json
index bf6136c9d33a..761c961b954a 100644
--- a/src/demo-app/tsconfig-aot.json
+++ b/src/demo-app/tsconfig-aot.json
@@ -7,8 +7,7 @@
     // Needed for Moment.js since it doesn't have a default export.
     "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,
-    // TODO(paul): Remove once Angular has been upgraded and supports noUnusedParameters in AOT.
-    "noUnusedParameters": false,
+    "noUnusedParameters": true,
     "strictNullChecks": true,
     "outDir": ".",
     "paths": {
diff --git a/src/e2e-app/tsconfig-build.json b/src/e2e-app/tsconfig-build.json
index c6942221368c..d91a6e786b97 100644
--- a/src/e2e-app/tsconfig-build.json
+++ b/src/e2e-app/tsconfig-build.json
@@ -5,8 +5,7 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    // TODO(paul): Remove once Angular has been upgraded and supports noUnusedParameters in AOT.
-    "noUnusedParameters": false,
+    "noUnusedParameters": true,
     // Don't use strict nulls for the e2e-app because the material-examples are not
     // strict-null compliant.
     "strictNullChecks": false,
diff --git a/src/universal-app/tsconfig-build.json b/src/universal-app/tsconfig-build.json
index d18f63191f01..adf897b7aba4 100644
--- a/src/universal-app/tsconfig-build.json
+++ b/src/universal-app/tsconfig-build.json
@@ -5,8 +5,7 @@
     "declaration": true,
     "stripInternal": false,
     "experimentalDecorators": true,
-    // TODO(crisbeto): disabled due to https://github.com/angular/angular/issues/17131
-    "noUnusedParameters": false,
+    "noUnusedParameters": true,
     "strictNullChecks": true,
     "module": "commonjs",
     "moduleResolution": "node",
diff --git a/src/universal-app/tsconfig-prerender.json b/src/universal-app/tsconfig-prerender.json
index 1d43000eef9e..60998deea014 100644
--- a/src/universal-app/tsconfig-prerender.json
+++ b/src/universal-app/tsconfig-prerender.json
@@ -4,8 +4,7 @@
     "declaration": false,
     "stripInternal": false,
     "experimentalDecorators": true,
-    // TODO(paul): Remove once Angular has been upgraded and supports noUnusedParameters in AOT.
-    "noUnusedParameters": false,
+    "noUnusedParameters": true,
     "strictNullChecks": true,
     "module": "commonjs",
     "moduleResolution": "node",

From 49c6cbcab0fa45cefe5f1f586cb45553a0860f49 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 20:02:13 +0100
Subject: [PATCH 525/575] chore: fix test compilation error (#8559)

Fixes a compilation error due to the constructor changing between PRs.
---
 src/cdk/overlay/position/connected-position-strategy.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index 6af7f157f9a6..2d6b9572c1d8 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -441,7 +441,7 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should re-use the preferred position when re-applying while locked in', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler);
+      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       strategy = positionBuilder.connectedTo(
           fakeElementRef,
           {originX: 'end', originY: 'center'},

From 192e6b3e4ca59f0c19b6b4c20e3383e79ebab54a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 20:02:49 +0100
Subject: [PATCH 526/575] docs(scroll-dispatcher): add note about callback
 being run outside the NgZone (#8545)

Since the `scrolled` events are being run outside the NgZone, it might be confusing if people decide to update their view as a result of a scroll event. These changes add a note on the method docs to avoid some of the confusion.

Relates to #8279.
---
 src/cdk/scrolling/scroll-dispatcher.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index 4301730314c8..5d5c3949777e 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -73,6 +73,11 @@ export class ScrollDispatcher {
    * Returns an observable that emits an event whenever any of the registered Scrollable
    * references (or window, document, or body) fire a scrolled event. Can provide a time in ms
    * to override the default "throttle" time.
+   *
+   * **Note:** in order to avoid hitting change detection for every scroll event,
+   * all of the events emitted from this stream will be run outside the Angular zone.
+   * If you need to update any data bindings as a result of a scroll event, you have
+   * to run the callback using `NgZone.run`.
    */
   scrolled(auditTimeInMs: number = DEFAULT_SCROLL_TIME): Observable<CdkScrollable|void> {
     return this._platform.isBrowser ? Observable.create(observer => {

From 05084e97c9eddac109fa246a5af1ad80c84ace9b Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 20:03:22 +0100
Subject: [PATCH 527/575] refactor(input): switch to fakeAsync tests (#8490)

Moves all of the input tests away from the `async` zone either to the default one or to `fakeAsync`.
---
 src/lib/input/input.spec.ts | 350 ++++++++++++++++++------------------
 1 file changed, 172 insertions(+), 178 deletions(-)

diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 033a9292b375..22d2b4cbba66 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -1,7 +1,7 @@
 import {Platform, PlatformModule} from '@angular/cdk/platform';
 import {createFakeEvent, dispatchFakeEvent, wrappedErrorMessage} from '@angular/cdk/testing';
 import {ChangeDetectionStrategy, Component, ViewChild} from '@angular/core';
-import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
+import {ComponentFixture, inject, TestBed, fakeAsync, flush} from '@angular/core/testing';
 import {
   FormControl,
   FormGroup,
@@ -29,7 +29,7 @@ import {MatInputModule} from './index';
 import {MatInput} from './input';
 
 describe('MatInput without forms', function () {
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
@@ -74,7 +74,7 @@ describe('MatInput without forms', function () {
     TestBed.compileComponents();
   }));
 
-  it('should default to floating placeholders', () => {
+  it('should default to floating placeholders', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
@@ -82,9 +82,9 @@ describe('MatInput without forms', function () {
         .componentInstance as MatFormField;
     expect(formField.floatPlaceholder).toBe('auto',
         'Expected MatInput to set floatingLabel to auto by default.');
-  });
+  }));
 
-  it('should default to global floating placeholder type', () => {
+  it('should default to global floating placeholder type', fakeAsync(() => {
     TestBed.resetTestingModule();
     TestBed.configureTestingModule({
       imports: [
@@ -106,10 +106,10 @@ describe('MatInput without forms', function () {
         .componentInstance as MatFormField;
     expect(formField.floatPlaceholder).toBe('always',
         'Expected MatInput to set floatingLabel to always from global option.');
-  });
+  }));
 
   it('should not be treated as empty if type is date',
-      inject([Platform], (platform: Platform) => {
+      fakeAsync(inject([Platform], (platform: Platform) => {
         if (!(platform.TRIDENT || (platform.SAFARI && !platform.IOS))) {
           let fixture = TestBed.createComponent(MatInputDateTestController);
           fixture.detectChanges();
@@ -118,11 +118,11 @@ describe('MatInput without forms', function () {
           expect(el).not.toBeNull();
           expect(el.classList.contains('mat-form-field-empty')).toBe(false);
         }
-      }));
+      })));
 
   // Safari Desktop and IE don't support type="date" and fallback to type="text".
   it('should be treated as empty if type is date in Safari Desktop or IE',
-      inject([Platform], (platform: Platform) => {
+      fakeAsync(inject([Platform], (platform: Platform) => {
         if (platform.TRIDENT || (platform.SAFARI && !platform.IOS)) {
           let fixture = TestBed.createComponent(MatInputDateTestController);
           fixture.detectChanges();
@@ -131,36 +131,36 @@ describe('MatInput without forms', function () {
           expect(el).not.toBeNull();
           expect(el.classList.contains('mat-form-field-empty')).toBe(true);
         }
-      }));
+      })));
 
-  it('should treat text input type as empty at init', () => {
+  it('should treat text input type as empty at init', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label')).nativeElement;
     expect(el).not.toBeNull();
     expect(el.classList.contains('mat-form-field-empty')).toBe(true);
-  });
+  }));
 
-  it('should treat password input type as empty at init', () => {
+  it('should treat password input type as empty at init', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputPasswordTestController);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label')).nativeElement;
     expect(el).not.toBeNull();
     expect(el.classList.contains('mat-form-field-empty')).toBe(true);
-  });
+  }));
 
-  it('should treat number input type as empty at init', () => {
+  it('should treat number input type as empty at init', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputNumberTestController);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label')).nativeElement;
     expect(el).not.toBeNull();
     expect(el.classList.contains('mat-form-field-empty')).toBe(true);
-  });
+  }));
 
-  it('should not be empty after input entered', async(() => {
+  it('should not be empty after input entered', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
@@ -178,7 +178,7 @@ describe('MatInput without forms', function () {
     expect(el.classList.contains('mat-form-field-empty')).toBe(false, 'should not be empty');
   }));
 
-  it('should update the placeholder when input entered', async(() => {
+  it('should update the placeholder when input entered', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithStaticPlaceholder);
     fixture.detectChanges();
 
@@ -198,7 +198,7 @@ describe('MatInput without forms', function () {
     expect(labelEl.classList).not.toContain('mat-form-field-float');
   }));
 
-  it('should not be empty when the value set before view init', async(() => {
+  it('should not be empty when the value set before view init', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithValueBinding);
     fixture.detectChanges();
 
@@ -213,7 +213,7 @@ describe('MatInput without forms', function () {
     expect(placeholderEl.classList).toContain('mat-form-field-empty');
   }));
 
-  it('should add id', () => {
+  it('should add id', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
@@ -224,9 +224,9 @@ describe('MatInput without forms', function () {
 
     expect(inputElement.id).toBeTruthy();
     expect(inputElement.id).toEqual(labelElement.getAttribute('for')!);
-  });
+  }));
 
-  it('should add aria-owns to the label for the associated control', () => {
+  it('should add aria-owns to the label for the associated control', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
@@ -236,9 +236,9 @@ describe('MatInput without forms', function () {
         fixture.debugElement.query(By.css('label')).nativeElement;
 
     expect(labelElement.getAttribute('aria-owns')).toBe(inputElement.id);
-  });
+  }));
 
-  it('should add aria-required reflecting the required state', () => {
+  it('should add aria-required reflecting the required state', fakeAsync(() => {
     const fixture = TestBed.createComponent(MatInputWithRequired);
     fixture.detectChanges();
 
@@ -253,9 +253,9 @@ describe('MatInput without forms', function () {
 
     expect(inputElement.getAttribute('aria-required'))
         .toBe('true', 'Expected aria-required to reflect required state of true');
-  });
+  }));
 
-  it('should not overwrite existing id', () => {
+  it('should not overwrite existing id', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
@@ -266,37 +266,37 @@ describe('MatInput without forms', function () {
 
     expect(inputElement.id).toBe('test-id');
     expect(labelElement.getAttribute('for')).toBe('test-id');
-  });
+  }));
 
-  it('validates there\'s only one hint label per side', () => {
+  it('validates there\'s only one hint label per side', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputInvalidHintTestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
         wrappedErrorMessage(getMatFormFieldDuplicatedHintError('start')));
-  });
+  }));
 
-  it('validates there\'s only one hint label per side (attribute)', () => {
+  it('validates there\'s only one hint label per side (attribute)', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputInvalidHint2TestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
         wrappedErrorMessage(getMatFormFieldDuplicatedHintError('start')));
-  });
+  }));
 
-  it('validates there\'s only one placeholder', () => {
+  it('validates there\'s only one placeholder', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputInvalidPlaceholderTestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
         wrappedErrorMessage(getMatFormFieldPlaceholderConflictError()));
-  });
+  }));
 
-  it('validates that matInput child is present', () => {
+  it('validates that matInput child is present', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputMissingMatInputTestController);
 
     expect(() => fixture.detectChanges()).toThrowError(
         wrappedErrorMessage(getMatFormFieldMissingControlError()));
-  });
+  }));
 
-  it('validates that matInput child is present after initialization', async(() => {
+  it('validates that matInput child is present after initialization', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithNgIf);
 
     expect(() => fixture.detectChanges()).not.toThrowError(
@@ -308,7 +308,7 @@ describe('MatInput without forms', function () {
         wrappedErrorMessage(getMatFormFieldMissingControlError()));
   }));
 
-  it('validates the type', () => {
+  it('validates the type', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputInvalidTypeTestController);
 
     // Technically this throws during the OnChanges detection phase,
@@ -317,9 +317,9 @@ describe('MatInput without forms', function () {
     // We just check for any exception in this case.
     expect(() => fixture.detectChanges()).toThrow(
         /* new MatInputUnsupportedTypeError('file') */);
-  });
+  }));
 
-  it('supports hint labels attribute', () => {
+  it('supports hint labels attribute', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputHintLabelTestController);
     fixture.detectChanges();
 
@@ -329,9 +329,9 @@ describe('MatInput without forms', function () {
     fixture.componentInstance.label = 'label';
     fixture.detectChanges();
     expect(fixture.debugElement.query(By.css('.mat-hint'))).not.toBeNull();
-  });
+  }));
 
-  it('sets an id on hint labels', () => {
+  it('sets an id on hint labels', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputHintLabelTestController);
 
     fixture.componentInstance.label = 'label';
@@ -340,9 +340,9 @@ describe('MatInput without forms', function () {
     let hint = fixture.debugElement.query(By.css('.mat-hint')).nativeElement;
 
     expect(hint.getAttribute('id')).toBeTruthy();
-  });
+  }));
 
-  it('supports hint labels elements', () => {
+  it('supports hint labels elements', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputHintLabel2TestController);
     fixture.detectChanges();
 
@@ -354,9 +354,9 @@ describe('MatInput without forms', function () {
     fixture.detectChanges();
     el = fixture.debugElement.query(By.css('mat-hint')).nativeElement;
     expect(el.textContent).toBe('label');
-  });
+  }));
 
-  it('sets an id on the hint element', () => {
+  it('sets an id on the hint element', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputHintLabel2TestController);
 
     fixture.componentInstance.label = 'label';
@@ -365,9 +365,9 @@ describe('MatInput without forms', function () {
     let hint = fixture.debugElement.query(By.css('mat-hint')).nativeElement;
 
     expect(hint.getAttribute('id')).toBeTruthy();
-  });
+  }));
 
-  it('supports placeholder attribute', async(() => {
+  it('supports placeholder attribute', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputPlaceholderAttrTestComponent);
     fixture.detectChanges();
 
@@ -387,7 +387,7 @@ describe('MatInput without forms', function () {
     expect(labelEl.nativeElement.textContent).not.toMatch(/\*/g);
   }));
 
-  it('supports placeholder element', async(() => {
+  it('supports placeholder element', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputPlaceholderElementTestComponent);
     fixture.detectChanges();
 
@@ -404,25 +404,25 @@ describe('MatInput without forms', function () {
     expect(el.nativeElement.textContent).not.toMatch(/\*/g);
   }));
 
-  it('supports placeholder required star', () => {
+  it('supports placeholder required star', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputPlaceholderRequiredTestComponent);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('label'));
     expect(el).not.toBeNull();
     expect(el.nativeElement.textContent).toMatch(/hello\s+\*/g);
-  });
+  }));
 
-  it('should hide the required star from screen readers', () => {
+  it('should hide the required star from screen readers', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputPlaceholderRequiredTestComponent);
     fixture.detectChanges();
 
     let el = fixture.debugElement.query(By.css('.mat-form-field-required-marker')).nativeElement;
 
     expect(el.getAttribute('aria-hidden')).toBe('true');
-  });
+  }));
 
-  it('hide placeholder required star when set to hide the required marker', () => {
+  it('hide placeholder required star when set to hide the required marker', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputPlaceholderRequiredTestComponent);
     fixture.detectChanges();
 
@@ -434,9 +434,9 @@ describe('MatInput without forms', function () {
     fixture.detectChanges();
 
     expect(el.nativeElement.textContent).toMatch(/hello/g);
-  });
+  }));
 
-  it('supports the disabled attribute as binding', async(() => {
+  it('supports the disabled attribute as binding', fakeAsync(() => {
     const fixture = TestBed.createComponent(MatInputWithDisabled);
     fixture.detectChanges();
 
@@ -456,7 +456,7 @@ describe('MatInput without forms', function () {
     expect(inputEl.disabled).toBe(true);
   }));
 
-  it('supports the required attribute as binding', async(() => {
+  it('supports the required attribute as binding', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithRequired);
     fixture.detectChanges();
 
@@ -470,7 +470,7 @@ describe('MatInput without forms', function () {
     expect(inputEl.required).toBe(true);
   }));
 
-  it('supports the type attribute as binding', async(() => {
+  it('supports the type attribute as binding', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithType);
     fixture.detectChanges();
 
@@ -484,15 +484,15 @@ describe('MatInput without forms', function () {
     expect(inputEl.type).toBe('password');
   }));
 
-  it('supports textarea', () => {
+  it('supports textarea', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextareaWithBindings);
     fixture.detectChanges();
 
     const textarea: HTMLTextAreaElement = fixture.nativeElement.querySelector('textarea');
     expect(textarea).not.toBeNull();
-  });
+  }));
 
-  it('sets the aria-describedby when a hintLabel is set', () => {
+  it('sets the aria-describedby when a hintLabel is set', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputHintLabelTestController);
 
     fixture.componentInstance.label = 'label';
@@ -502,9 +502,9 @@ describe('MatInput without forms', function () {
     let input = fixture.debugElement.query(By.css('input')).nativeElement;
 
     expect(input.getAttribute('aria-describedby')).toBe(hint.getAttribute('id'));
-  });
+  }));
 
-  it('sets the aria-describedby to the id of the mat-hint', () => {
+  it('sets the aria-describedby to the id of the mat-hint', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputHintLabel2TestController);
 
     fixture.componentInstance.label = 'label';
@@ -514,9 +514,9 @@ describe('MatInput without forms', function () {
     let input = fixture.debugElement.query(By.css('input')).nativeElement;
 
     expect(input.getAttribute('aria-describedby')).toBe(hint.getAttribute('id'));
-  });
+  }));
 
-  it('sets the aria-describedby with multiple mat-hint instances', () => {
+  it('sets the aria-describedby with multiple mat-hint instances', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputMultipleHintTestController);
 
     fixture.componentInstance.startId = 'start';
@@ -526,22 +526,23 @@ describe('MatInput without forms', function () {
     let input = fixture.debugElement.query(By.css('input')).nativeElement;
 
     expect(input.getAttribute('aria-describedby')).toBe('start end');
-  });
+  }));
 
-  it('sets the aria-describedby when a hintLabel is set, in addition to a mat-hint', () => {
-    let fixture = TestBed.createComponent(MatInputMultipleHintMixedTestController);
+  it('sets the aria-describedby when a hintLabel is set, in addition to a mat-hint',
+    fakeAsync(() => {
+      let fixture = TestBed.createComponent(MatInputMultipleHintMixedTestController);
 
-    fixture.detectChanges();
+      fixture.detectChanges();
 
-    let hintLabel = fixture.debugElement.query(By.css('.mat-hint:not(.mat-right)')).nativeElement;
-    let endLabel = fixture.debugElement.query(By.css('.mat-hint.mat-right')).nativeElement;
-    let input = fixture.debugElement.query(By.css('input')).nativeElement;
-    let ariaValue = input.getAttribute('aria-describedby');
+      let hintLabel = fixture.debugElement.query(By.css('.mat-hint:not(.mat-right)')).nativeElement;
+      let endLabel = fixture.debugElement.query(By.css('.mat-hint.mat-right')).nativeElement;
+      let input = fixture.debugElement.query(By.css('input')).nativeElement;
+      let ariaValue = input.getAttribute('aria-describedby');
 
-    expect(ariaValue).toBe(`${hintLabel.getAttribute('id')} ${endLabel.getAttribute('id')}`);
-  });
+      expect(ariaValue).toBe(`${hintLabel.getAttribute('id')} ${endLabel.getAttribute('id')}`);
+    }));
 
-  it('should float when floatPlaceholder is set to default and text is entered', () => {
+  it('should float when floatPlaceholder is set to default and text is entered', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
     fixture.detectChanges();
 
@@ -565,9 +566,9 @@ describe('MatInput without forms', function () {
 
     expect(formFieldEl.classList).toContain('mat-form-field-can-float');
     expect(formFieldEl.classList).toContain('mat-form-field-should-float');
-  });
+  }));
 
-  it('should always float the placeholder when floatPlaceholder is set to true', () => {
+  it('should always float the placeholder when floatPlaceholder is set to true', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
     fixture.detectChanges();
 
@@ -587,10 +588,10 @@ describe('MatInput without forms', function () {
 
     expect(formFieldEl.classList).toContain('mat-form-field-can-float');
     expect(formFieldEl.classList).toContain('mat-form-field-should-float');
-  });
+  }));
 
 
-  it('should never float the placeholder when floatPlaceholder is set to false', () => {
+  it('should never float the placeholder when floatPlaceholder is set to false', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
 
     fixture.componentInstance.shouldFloat = 'never';
@@ -610,9 +611,9 @@ describe('MatInput without forms', function () {
 
     expect(labelEl.classList).not.toContain('mat-form-field-empty');
     expect(labelEl.classList).not.toContain('mat-form-field-float');
-  });
+  }));
 
-  it('should be able to toggle the floating placeholder programmatically', () => {
+  it('should be able to toggle the floating placeholder programmatically', fakeAsync(() => {
     const fixture = TestBed.createComponent(MatInputWithId);
 
     fixture.detectChanges();
@@ -630,9 +631,9 @@ describe('MatInput without forms', function () {
 
     expect(placeholder.classList)
         .not.toContain('mat-form-field-empty', 'Expected input to be considered not empty.');
-  });
+  }));
 
-  it('should not have prefix and suffix elements when none are specified', () => {
+  it('should not have prefix and suffix elements when none are specified', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
@@ -641,22 +642,22 @@ describe('MatInput without forms', function () {
 
     expect(prefixEl).toBeNull();
     expect(suffixEl).toBeNull();
-  });
+  }));
 
-  it('should add prefix and suffix elements when specified', () => {
-    let fixture = TestBed.createComponent(MatInputWithPrefixAndSuffix);
+  it('should add prefix and suffix elements when specified', fakeAsync(() => {
+    const fixture = TestBed.createComponent(MatInputWithPrefixAndSuffix);
     fixture.detectChanges();
 
-    let prefixEl = fixture.debugElement.query(By.css('.mat-form-field-prefix'));
-    let suffixEl = fixture.debugElement.query(By.css('.mat-form-field-suffix'));
+    const prefixEl = fixture.debugElement.query(By.css('.mat-form-field-prefix'));
+    const suffixEl = fixture.debugElement.query(By.css('.mat-form-field-suffix'));
 
     expect(prefixEl).not.toBeNull();
     expect(suffixEl).not.toBeNull();
     expect(prefixEl.nativeElement.innerText.trim()).toEqual('Prefix');
     expect(suffixEl.nativeElement.innerText.trim()).toEqual('Suffix');
-  });
+  }));
 
-  it('should update empty class when value changes programmatically and OnPush', () => {
+  it('should update empty class when value changes programmatically and OnPush', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputOnPush);
     fixture.detectChanges();
 
@@ -670,9 +671,9 @@ describe('MatInput without forms', function () {
     fixture.detectChanges();
 
     expect(placeholder.classList).not.toContain('mat-form-field-empty', 'Input no longer empty');
-  });
+  }));
 
-  it('should set the focused class when the input is focused', () => {
+  it('should set the focused class when the input is focused', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
@@ -686,9 +687,9 @@ describe('MatInput without forms', function () {
     fixture.detectChanges();
 
     expect(container.classList).toContain('mat-focused');
-  });
+  }));
 
-  it('should be able to animate the placeholder up and lock it in position', () => {
+  it('should be able to animate the placeholder up and lock it in position', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
@@ -713,9 +714,9 @@ describe('MatInput without forms', function () {
 
     expect(inputContainer._shouldAlwaysFloat).toBe(true);
     expect(inputContainer.floatPlaceholder).toBe('always');
-  });
+  }));
 
-  it('should not highlight when focusing a readonly input', () => {
+  it('should not highlight when focusing a readonly input', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithReadonlyInput);
     fixture.detectChanges();
 
@@ -729,12 +730,12 @@ describe('MatInput without forms', function () {
 
     expect(input.focused).toBe(false);
     expect(container.classList).not.toContain('mat-focused');
-  });
+  }));
 });
 
 describe('MatInput with forms', () => {
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
@@ -762,58 +763,56 @@ describe('MatInput with forms', () => {
     let containerEl: HTMLElement;
     let inputEl: HTMLElement;
 
-    beforeEach(() => {
+    beforeEach(fakeAsync(() => {
       fixture = TestBed.createComponent(MatInputWithFormErrorMessages);
       fixture.detectChanges();
       testComponent = fixture.componentInstance;
       containerEl = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
       inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
-    });
+    }));
 
-    it('should not show any errors if the user has not interacted', () => {
+    it('should not show any errors if the user has not interacted', fakeAsync(() => {
       expect(testComponent.formControl.untouched).toBe(true, 'Expected untouched form control');
       expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
       expect(inputEl.getAttribute('aria-invalid'))
         .toBe('false', 'Expected aria-invalid to be set to "false".');
-    });
+    }));
 
-    it('should display an error message when the input is touched and invalid', async(() => {
+    it('should display an error message when the input is touched and invalid', fakeAsync(() => {
       expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid');
       expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
 
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        expect(containerEl.classList)
-          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('mat-error').length)
-          .toBe(1, 'Expected one error message to have been rendered.');
-        expect(inputEl.getAttribute('aria-invalid'))
-          .toBe('true', 'Expected aria-invalid to be set to "true".');
-      });
+      expect(containerEl.classList)
+        .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+      expect(containerEl.querySelectorAll('mat-error').length)
+        .toBe(1, 'Expected one error message to have been rendered.');
+      expect(inputEl.getAttribute('aria-invalid'))
+        .toBe('true', 'Expected aria-invalid to be set to "true".');
     }));
 
-    it('should display an error message when the parent form is submitted', async(() => {
+    it('should display an error message when the parent form is submitted', fakeAsync(() => {
       expect(testComponent.form.submitted).toBe(false, 'Expected form not to have been submitted');
       expect(testComponent.formControl.invalid).toBe(true, 'Expected form control to be invalid');
       expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
 
       dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        expect(testComponent.form.submitted).toBe(true, 'Expected form to have been submitted');
-        expect(containerEl.classList)
-          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('mat-error').length)
-          .toBe(1, 'Expected one error message to have been rendered.');
-        expect(inputEl.getAttribute('aria-invalid'))
-          .toBe('true', 'Expected aria-invalid to be set to "true".');
-      });
+      expect(testComponent.form.submitted).toBe(true, 'Expected form to have been submitted');
+      expect(containerEl.classList)
+        .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+      expect(containerEl.querySelectorAll('mat-error').length)
+        .toBe(1, 'Expected one error message to have been rendered.');
+      expect(inputEl.getAttribute('aria-invalid'))
+        .toBe('true', 'Expected aria-invalid to be set to "true".');
     }));
 
-    it('should display an error message when the parent form group is submitted', async(() => {
+    it('should display an error message when the parent form group is submitted', fakeAsync(() => {
       fixture.destroy();
 
       let groupFixture = TestBed.createComponent(MatInputWithFormGroupErrorMessages);
@@ -833,46 +832,43 @@ describe('MatInput with forms', () => {
 
       dispatchFakeEvent(groupFixture.debugElement.query(By.css('form')).nativeElement, 'submit');
       groupFixture.detectChanges();
+      flush();
 
-      groupFixture.whenStable().then(() => {
-        expect(component.formGroupDirective.submitted)
-          .toBe(true, 'Expected form to have been submitted');
-        expect(containerEl.classList)
-          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('mat-error').length)
-          .toBe(1, 'Expected one error message to have been rendered.');
-        expect(inputEl.getAttribute('aria-invalid'))
-          .toBe('true', 'Expected aria-invalid to be set to "true".');
-      });
+      expect(component.formGroupDirective.submitted)
+        .toBe(true, 'Expected form to have been submitted');
+      expect(containerEl.classList)
+        .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+      expect(containerEl.querySelectorAll('mat-error').length)
+        .toBe(1, 'Expected one error message to have been rendered.');
+      expect(inputEl.getAttribute('aria-invalid'))
+        .toBe('true', 'Expected aria-invalid to be set to "true".');
     }));
 
-    it('should hide the errors and show the hints once the input becomes valid', async(() => {
+    it('should hide the errors and show the hints once the input becomes valid', fakeAsync(() => {
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        expect(containerEl.classList)
-          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
-        expect(containerEl.querySelectorAll('mat-error').length)
-          .toBe(1, 'Expected one error message to have been rendered.');
-        expect(containerEl.querySelectorAll('mat-hint').length)
-          .toBe(0, 'Expected no hints to be shown.');
-
-        testComponent.formControl.setValue('something');
-        fixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-          expect(containerEl.classList).not.toContain('mat-form-field-invalid',
-            'Expected container not to have the invalid class when valid.');
-          expect(containerEl.querySelectorAll('mat-error').length)
-            .toBe(0, 'Expected no error messages when the input is valid.');
-          expect(containerEl.querySelectorAll('mat-hint').length)
-            .toBe(1, 'Expected one hint to be shown once the input is valid.');
-        });
-      });
+      expect(containerEl.classList)
+        .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+      expect(containerEl.querySelectorAll('mat-error').length)
+        .toBe(1, 'Expected one error message to have been rendered.');
+      expect(containerEl.querySelectorAll('mat-hint').length)
+        .toBe(0, 'Expected no hints to be shown.');
+
+      testComponent.formControl.setValue('something');
+      fixture.detectChanges();
+      flush();
+
+      expect(containerEl.classList).not.toContain('mat-form-field-invalid',
+        'Expected container not to have the invalid class when valid.');
+      expect(containerEl.querySelectorAll('mat-error').length)
+        .toBe(0, 'Expected no error messages when the input is valid.');
+      expect(containerEl.querySelectorAll('mat-hint').length)
+        .toBe(1, 'Expected one hint to be shown once the input is valid.');
     }));
 
-    it('should not hide the hint if there are no error messages', async(() => {
+    it('should not hide the hint if there are no error messages', fakeAsync(() => {
       testComponent.renderError = false;
       fixture.detectChanges();
 
@@ -881,21 +877,20 @@ describe('MatInput with forms', () => {
 
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        expect(containerEl.querySelectorAll('mat-hint').length)
-          .toBe(1, 'Expected one hint to still be shown.');
-      });
+      expect(containerEl.querySelectorAll('mat-hint').length)
+        .toBe(1, 'Expected one hint to still be shown.');
     }));
 
-    it('should set the proper role on the error messages', () => {
+    it('should set the proper role on the error messages', fakeAsync(() => {
       testComponent.formControl.markAsTouched();
       fixture.detectChanges();
 
       expect(containerEl.querySelector('mat-error')!.getAttribute('role')).toBe('alert');
-    });
+    }));
 
-    it('sets the aria-describedby to reference errors when in error state', () => {
+    it('sets the aria-describedby to reference errors when in error state', fakeAsync(() => {
       let hintId = fixture.debugElement.query(By.css('.mat-hint')).nativeElement.getAttribute('id');
       let describedBy = inputEl.getAttribute('aria-describedby');
 
@@ -911,12 +906,12 @@ describe('MatInput with forms', () => {
 
       expect(errorIds).toBeTruthy('errors should be shown');
       expect(describedBy).toBe(errorIds);
-    });
+    }));
   });
 
   describe('custom error behavior', () => {
 
-    it('should display an error message when a custom error matcher returns true', () => {
+    it('should display an error message when a custom error matcher returns true', fakeAsync(() => {
       let fixture = TestBed.createComponent(MatInputWithCustomErrorStateMatcher);
       fixture.detectChanges();
 
@@ -940,9 +935,9 @@ describe('MatInput with forms', () => {
 
       expect(containerEl.querySelectorAll('mat-error').length)
         .toBe(1, 'Expected one error messages to have been rendered.');
-    });
+    }));
 
-    it('should display an error message when global error matcher returns true', () => {
+    it('should display an error message when global error matcher returns true', fakeAsync(() => {
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
         imports: [
@@ -968,9 +963,9 @@ describe('MatInput with forms', () => {
       // Expect the control to still be untouched but the error to show due to the global setting
       expect(testComponent.formControl.untouched).toBe(true, 'Expected untouched form control');
       expect(containerEl.querySelectorAll('mat-error').length).toBe(1, 'Expected an error message');
-    });
+    }));
 
-    it('should display an error message when using ShowOnDirtyErrorStateMatcher', async(() => {
+    it('should display an error message when using ShowOnDirtyErrorStateMatcher', fakeAsync(() => {
       TestBed.resetTestingModule();
       TestBed.configureTestingModule({
         imports: [
@@ -1009,7 +1004,7 @@ describe('MatInput with forms', () => {
     }));
   });
 
-  it('should update the value when using FormControl.setValue', () => {
+  it('should update the value when using FormControl.setValue', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithFormControl);
     fixture.detectChanges();
 
@@ -1021,9 +1016,9 @@ describe('MatInput with forms', () => {
     fixture.componentInstance.formControl.setValue('something');
 
     expect(input.value).toBe('something');
-  });
+  }));
 
-  it('should display disabled styles when using FormControl.disable()', () => {
+  it('should display disabled styles when using FormControl.disable()', fakeAsync(() => {
     const fixture = TestBed.createComponent(MatInputWithFormControl);
     fixture.detectChanges();
 
@@ -1041,19 +1036,18 @@ describe('MatInput with forms', () => {
     expect(formFieldEl.classList).toContain('mat-form-field-disabled',
       `Expected form field to look disabled after disable() is called.`);
     expect(inputEl.disabled).toBe(true);
-  });
+  }));
 
-  it('should not treat the number 0 as empty', async(() => {
+  it('should not treat the number 0 as empty', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputZeroTestController);
     fixture.detectChanges();
+    flush();
 
-    fixture.whenStable().then(() => {
-      fixture.detectChanges();
+    fixture.detectChanges();
 
-      let el = fixture.debugElement.query(By.css('label')).nativeElement;
-      expect(el).not.toBeNull();
-      expect(el.classList.contains('mat-form-field-empty')).toBe(false);
-    });
+    let el = fixture.debugElement.query(By.css('label')).nativeElement;
+    expect(el).not.toBeNull();
+    expect(el.classList.contains('mat-form-field-empty')).toBe(false);
   }));
 });
 

From b788a09853a58a05ef484138aeeedd28e59e5b27 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 20 Nov 2017 11:19:41 -0800
Subject: [PATCH 528/575] docs(changelog): mention callback removal from
 ScrollDispatcher (#8426)

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8514d6f7d89..6bf469d0b628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@
   behaviors are stable and mature enough to exit beta. Please continue to file issues that
   help us eliminate more bugs from the forthcoming 5.0.0 release. Moving forward, the _major_
   version number of Angular Material and CDK will update alongside Angular itself.
-* A [moment.js](http://momentjs.com/) implementation of the `DateAdapter` for `MatDatepicker` is now available as `@angular/material-moment-adapter`
+* A [moment.js](http://momentjs.com/) implementation of the `DateAdapter` for `MatDatepicker` is
+  now available as `@angular/material-moment-adapter`
 * Based on Angular 5.0
 * More consistent naming conventions across the board
 * 60+ bug fixes
@@ -42,6 +43,15 @@
   - The `ScrollDispatcher.scrollableReferences` property has been renamed to `scrollContainers`.
   - The `ScrollDispatcher.scrollableContainsElement` method has been removed.
   - The `Scrollable` class has been renamed to `CdkScrollable` for consistency.
+  - Any uses of the `ScrollDispatcher.scrolled` method have to be refactored to subscribe to the
+    returned Observable, instead of passing in the `callback`. Example
+    ```ts
+    // Before
+    scrollDispatcher.scrolled(50, () => ...);
+    
+    // After
+    scrollDispatcher.scrolled(50).subscribe(() => ...);
+    ```
 * **unique-selection:** move UniqueSelectionDispatcher to `@angular/cdk/collections`
   (`UniqueSelectionDispatcher`, `UniqueSelectionDispatcherListener`, and
    `UNIQUE_SELECTION_DISPATCHER_PROVIDER`)

From 2a3baa1a6f16d241c9bf23ff95f869c99dd515f4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 20:22:07 +0100
Subject: [PATCH 529/575] build: remove unused tslint rule (#8453)

Since the `noViewEncapsulation` rule logic is now in the `validateDecorators`, we don't have to keep the file around anymore.
---
 tools/tslint-rules/noViewEncapsulationRule.ts | 59 -------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 tools/tslint-rules/noViewEncapsulationRule.ts

diff --git a/tools/tslint-rules/noViewEncapsulationRule.ts b/tools/tslint-rules/noViewEncapsulationRule.ts
deleted file mode 100644
index 196aa37ae34b..000000000000
--- a/tools/tslint-rules/noViewEncapsulationRule.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as path from 'path';
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import * as minimatch from 'minimatch';
-
-const ERROR_MESSAGE = 'Components must turn off view encapsulation.';
-
-// TODO(crisbeto): combine this with the OnPush rule when it gets in.
-
-/**
- * Rule that enforces that view encapsulation is turned off on all components.
- * Files can be whitelisted via `"no-view-encapsulation": [true, "\.spec\.ts$"]`.
- */
-export class Rule extends Lint.Rules.AbstractRule {
-  apply(sourceFile: ts.SourceFile) {
-    return this.applyWithWalker(new Walker(sourceFile, this.getOptions()));
-  }
-}
-
-class Walker extends Lint.RuleWalker {
-
-  /** Whether the walker should check the current source file. */
-  private _enabled: boolean;
-
-  constructor(sourceFile: ts.SourceFile, options: Lint.IOptions) {
-    super(sourceFile, options);
-
-    // Globs that are used to determine which files to lint.
-    const fileGlobs = options.ruleArguments || [];
-
-    // Relative path for the current TypeScript source file.
-    const relativeFilePath = path.relative(process.cwd(), sourceFile.fileName);
-
-    // Whether the file should be checked at all.
-    this._enabled = fileGlobs.some(p => minimatch(relativeFilePath, p));
-  }
-
-  visitClassDeclaration(node: ts.ClassDeclaration) {
-    if (!this._enabled || !node.decorators) {
-      return;
-    }
-
-    node.decorators
-      .map(decorator => decorator.expression as any)
-      .filter(expression => expression.expression.getText() === 'Component')
-      .filter(expression => expression.arguments.length && expression.arguments[0].properties)
-      .forEach(expression => {
-        const hasTurnedOffEncapsulation = expression.arguments[0].properties.some((prop: any) => {
-          const value = prop.initializer.getText();
-          return prop.name.getText() === 'encapsulation' && value.endsWith('.None');
-        });
-
-        if (!hasTurnedOffEncapsulation) {
-          this.addFailureAtNode(expression.parent, ERROR_MESSAGE);
-        }
-      });
-  }
-
-}

From a5b0872e07ac6653408a5b84d76dbddd2439a77d Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 20 Nov 2017 11:22:51 -0800
Subject: [PATCH 530/575] chore(prerender): output prerendered index.html for
 debugging (#8483)

---
 src/universal-app/prerender.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/universal-app/prerender.ts b/src/universal-app/prerender.ts
index faee2fe8764b..a19a93377be3 100644
--- a/src/universal-app/prerender.ts
+++ b/src/universal-app/prerender.ts
@@ -1,11 +1,10 @@
-import 'reflect-metadata';
-import 'zone.js';
-
 import {enableProdMode} from '@angular/core';
 import {renderModuleFactory} from '@angular/platform-server';
-import {join} from 'path';
-import {readFileSync} from 'fs-extra';
+import {readFileSync, writeFileSync} from 'fs-extra';
 import {log} from 'gulp-util';
+import {join} from 'path';
+import 'reflect-metadata';
+import 'zone.js';
 import {KitchenSinkServerModuleNgFactory} from './kitchen-sink/kitchen-sink.ngfactory';
 
 enableProdMode();
@@ -15,7 +14,10 @@ const result = renderModuleFactory(KitchenSinkServerModuleNgFactory, {
 });
 
 result
-  .then(() => log('Prerender done.'))
+  .then(content => {
+    writeFileSync(join(__dirname, 'index-prerendered.html'), content, 'utf-8');
+    log('Prerender done.');
+  })
   // If rendering the module factory fails, exit the process with an error code because otherwise
   // the CI task will not recognize the failure and will show as "success". The error message
   // will be printed automatically by the `renderModuleFactory` method.

From 40be1f26e57ed39faf2d0865f6895be340ca13c1 Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Tue, 21 Nov 2017 03:35:34 +0800
Subject: [PATCH 531/575] fix: using correct global name in bundle (#8407)

---
 tools/package-tools/build-bundles.ts  | 4 ++--
 tools/package-tools/rollup-globals.ts | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index a68eba62e713..676770132a19 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -3,7 +3,7 @@ import {uglifyJsFile} from './minify-sources';
 import {buildConfig} from './build-config';
 import {BuildPackage} from './build-package';
 import {rollupRemoveLicensesPlugin} from './rollup-remove-licenses';
-import {rollupGlobals} from './rollup-globals';
+import {rollupGlobals, dashCaseToCamelCase} from './rollup-globals';
 
 // There are no type definitions available for these imports.
 const rollup = require('rollup');
@@ -51,7 +51,7 @@ export class PackageBundler {
     return this.bundleEntryPoint({
       entryFile,
       esm5EntryFile,
-      moduleName: `ng.${packageName}.${entryPoint}`,
+      moduleName: `ng.${packageName}.${dashCaseToCamelCase(entryPoint)}`,
       esm2015Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.js`),
       esm5Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.es5.js`),
       umdDest: join(bundlesDir, `${packageName}-${entryPoint}.umd.js`),
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index c9222cbe77fd..1d08c970d5aa 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -3,7 +3,8 @@ import {getSubdirectoryNames} from './secondary-entry-points';
 import {buildConfig} from './build-config';
 
 /** Method that converts dash-case strings to a camel-based string. */
-const dashCaseToCamelCase = (str: string) => str.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+export const dashCaseToCamelCase =
+  (str: string) => str.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
 
 /** List of potential secondary entry-points for the cdk package. */
 const cdkSecondaryEntryPoints = getSubdirectoryNames(join(buildConfig.packagesDir, 'cdk'));

From 7bcb0d8b940fb745c88ed113cbc7be685728ae2f Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 20 Nov 2017 20:36:00 +0100
Subject: [PATCH 532/575] chore: remove tslint type workaround (#8451)

Due to a TSLint issue (https://github.com/palantir/tslint/issues/2470) imports that were used as a type argument were treated as unused. This has been fixed with TypeScript ^2.4.0 and the workaround (using `//tslint:disable` comments)  can be removed.
---
 src/cdk/overlay/overlay-directives.ts    | 15 ++++++---------
 src/cdk/stepper/stepper.ts               |  3 ---
 src/demo-app/overlay/overlay-demo.ts     | 13 +++----------
 tools/dashboard/src/app/dashboard-app.ts |  6 +-----
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index ae6e5a1b1ad9..ebd5dc7e5ea5 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -6,6 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ESCAPE} from '@angular/cdk/keycodes';
+import {TemplatePortal} from '@angular/cdk/portal';
 import {
   Directive,
   ElementRef,
@@ -22,23 +26,16 @@ import {
   TemplateRef,
   ViewContainerRef,
 } from '@angular/core';
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {ESCAPE} from '@angular/cdk/keycodes';
-import {TemplatePortal} from '@angular/cdk/portal';
+import {Subscription} from 'rxjs/Subscription';
 import {Overlay} from './overlay';
-import {OverlayRef} from './overlay-ref';
 import {OverlayConfig} from './overlay-config';
+import {OverlayRef} from './overlay-ref';
 import {
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
   ConnectedOverlayPositionChange,
   ConnectionPositionPair,
 } from './position/connected-position';
 import {ConnectedPositionStrategy} from './position/connected-position-strategy';
 import {RepositionScrollStrategy, ScrollStrategy} from './scroll/index';
-import {Subscription} from 'rxjs/Subscription';
 
 
 /** Default set of positions for the overlay. Follows the behavior of a dropdown. */
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 2846b882509d..e842ff3a7b02 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -13,9 +13,6 @@ import {
   Output,
   QueryList,
   Directive,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
   ElementRef,
   Component,
   ContentChild,
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index c88a93ecaf47..1203d94bb495 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -6,15 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Overlay, CdkOverlayOrigin, OverlayConfig} from '@angular/cdk/overlay';
-import {
-  ComponentPortal,
-  // This import is only used to define a generic type. The current TypeScript version incorrectly
-  // considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-  // tslint:disable-next-line:no-unused-variable
-  Portal,
-  CdkPortal
-} from '@angular/cdk/portal';
+import {CdkOverlayOrigin, Overlay, OverlayConfig} from '@angular/cdk/overlay';
+import {CdkPortal, ComponentPortal, Portal} from '@angular/cdk/portal';
 import {
   Component,
   QueryList,
@@ -23,8 +16,8 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/filter';
 
 
 @Component({
diff --git a/tools/dashboard/src/app/dashboard-app.ts b/tools/dashboard/src/app/dashboard-app.ts
index e9c336bc42d2..49baf62d56cc 100644
--- a/tools/dashboard/src/app/dashboard-app.ts
+++ b/tools/dashboard/src/app/dashboard-app.ts
@@ -1,11 +1,7 @@
 import {Component} from '@angular/core';
 import {AngularFireDatabase} from 'angularfire2/database';
 import {Observable} from 'rxjs/Observable';
-
-// This import is only used to define a generic type. The current TypeScript version incorrectly
-// considers such imports as unused (https://github.com/Microsoft/TypeScript/issues/14953)
-// tslint:disable-next-line:no-unused-variable
-import {PayloadResult, CoverageResult} from './data-definitions';
+import {CoverageResult, PayloadResult} from './data-definitions';
 
 @Component({
   selector: 'dashboard-app',

From 40d6bcb60ac59c59c304600f66c268cf0b045df3 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 20 Nov 2017 21:00:07 +0100
Subject: [PATCH 533/575] chore: fix test compilation errors (#8560)

Fixes some more test compilation issues after removing the `extendObject`.
---
 src/lib/menu/menu.spec.ts     | 14 +++++---------
 src/lib/select/select.spec.ts |  3 +--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 76827f68f261..96ceede4320a 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -26,7 +26,7 @@ import {
   MatMenuItem,
 } from './index';
 import {MENU_PANEL_TOP_PADDING} from './menu-trigger';
-import {extendObject, MatRipple} from '@angular/material/core';
+import {MatRipple} from '@angular/material/core';
 import {
   dispatchKeyboardEvent,
   dispatchMouseEvent,
@@ -438,11 +438,11 @@ describe('MatMenu', () => {
      */
     class OverlapSubject<T extends TestableMenu> {
       readonly fixture: ComponentFixture<T>;
-      readonly trigger: any;
+      readonly trigger: HTMLElement;
 
       constructor(ctor: {new(): T; }, inputs: {[key: string]: any} = {}) {
         this.fixture = TestBed.createComponent(ctor);
-        extendObject(this.fixture.componentInstance, inputs);
+        Object.keys(inputs).forEach(key => this.fixture.componentInstance[key] = inputs[key]);
         this.fixture.detectChanges();
         this.trigger = this.fixture.componentInstance.triggerEl.nativeElement;
       }
@@ -452,11 +452,6 @@ describe('MatMenu', () => {
         this.fixture.detectChanges();
       }
 
-      updateTriggerStyle(style: any) {
-        return extendObject(this.trigger.style, style);
-      }
-
-
       get overlayRect() {
         return this.overlayPane.getBoundingClientRect();
       }
@@ -507,7 +502,8 @@ describe('MatMenu', () => {
       it('supports above position fall back', () => {
         // Push trigger to the bottom part of viewport, so it doesn't have space to open
         // in its default "below" position below the trigger.
-        subject.updateTriggerStyle({position: 'fixed', bottom: '0'});
+        subject.trigger.style.position = 'fixed';
+        subject.trigger.style.bottom = '0';
         subject.openMenu();
 
         // Since the menu is above the trigger, the overlay bottom should be the trigger top.
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 985a25735d48..f4b0d8c79114 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -40,7 +40,6 @@ import {
 } from '@angular/forms';
 import {
   ErrorStateMatcher,
-  extendObject,
   FloatPlaceholderType,
   MAT_PLACEHOLDER_GLOBAL_OPTIONS,
   MatOption,
@@ -3984,7 +3983,7 @@ class NgModelCompareWithSelect {
   compareByReference(f1: any, f2: any) { return f1 === f2; }
 
   setFoodByCopy(newValue: {value: string, viewValue: string}) {
-    this.selectedFood = extendObject({}, newValue);
+    this.selectedFood = {...{}, ...newValue};
   }
 }
 

From 8f3a025632a2479cdd95559328b4119781553b50 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Mon, 20 Nov 2017 16:29:37 -0800
Subject: [PATCH 534/575] docs: add jsdoc to public interfaces (#8568)

---
 src/cdk/a11y/activedescendant-key-manager.ts    |  3 +++
 src/cdk/a11y/aria-describer.ts                  |  5 ++++-
 src/cdk/a11y/focus-key-manager.ts               |  1 +
 src/cdk/a11y/list-key-manager.ts                |  3 +++
 src/cdk/collections/collection-viewer.ts        |  4 ++++
 src/cdk/layout/breakpoints-observer.ts          |  1 +
 src/cdk/overlay/scroll/scroll-strategy.ts       |  8 ++++++--
 src/cdk/portal/portal.ts                        |  8 +++++---
 src/lib/chips/chip-input.ts                     |  4 ++++
 src/lib/chips/chip.ts                           |  2 ++
 src/lib/core/placeholder/placeholder-options.ts |  5 +++++
 src/lib/core/ripple/ripple.ts                   |  1 +
 src/lib/dialog/dialog-config.ts                 |  7 +++++++
 src/lib/menu/menu-directive.ts                  |  5 +++++
 src/lib/menu/menu-panel.ts                      |  4 ++++
 src/lib/sort/sort.ts                            | 10 ++++++++++
 16 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/src/cdk/a11y/activedescendant-key-manager.ts b/src/cdk/a11y/activedescendant-key-manager.ts
index 39c524a598ba..b02bf6fbbd8c 100644
--- a/src/cdk/a11y/activedescendant-key-manager.ts
+++ b/src/cdk/a11y/activedescendant-key-manager.ts
@@ -14,7 +14,10 @@ import {ListKeyManager, ListKeyManagerOption} from './list-key-manager';
  * currently disabled.
  */
 export interface Highlightable extends ListKeyManagerOption {
+  /** Applies the styles for an active item to this item. */
   setActiveStyles(): void;
+
+  /** Applies the styles for an inactive item to this item. */
   setInactiveStyles(): void;
 }
 
diff --git a/src/cdk/a11y/aria-describer.ts b/src/cdk/a11y/aria-describer.ts
index e3eadd39d7fc..54cc1f7fb72a 100644
--- a/src/cdk/a11y/aria-describer.ts
+++ b/src/cdk/a11y/aria-describer.ts
@@ -12,10 +12,13 @@ import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from '
 
 /**
  * Interface used to register message elements and keep a count of how many registrations have
- * the same message and the reference to the message element used for the aria-describedby.
+ * the same message and the reference to the message element used for the `aria-describedby`.
  */
 export interface RegisteredMessage {
+  /** The element containing the message. */
   messageElement: Element;
+
+  /** The number of elements that reference this message element via `aria-describedby`. */
   referenceCount: number;
 }
 
diff --git a/src/cdk/a11y/focus-key-manager.ts b/src/cdk/a11y/focus-key-manager.ts
index 451440753289..154bfcea2dc3 100644
--- a/src/cdk/a11y/focus-key-manager.ts
+++ b/src/cdk/a11y/focus-key-manager.ts
@@ -14,6 +14,7 @@ import {ListKeyManager, ListKeyManagerOption} from './list-key-manager';
  * and be able to supply it's label.
  */
 export interface FocusableOption extends ListKeyManagerOption {
+  /** Focuses the `FocusableOption`. */
   focus(): void;
 }
 
diff --git a/src/cdk/a11y/list-key-manager.ts b/src/cdk/a11y/list-key-manager.ts
index ff54c0d08513..4452852261c0 100644
--- a/src/cdk/a11y/list-key-manager.ts
+++ b/src/cdk/a11y/list-key-manager.ts
@@ -17,7 +17,10 @@ import {tap} from 'rxjs/operators/tap';
 
 /** This interface is for items that can be passed to a ListKeyManager. */
 export interface ListKeyManagerOption {
+  /** Whether the option is disabled. */
   disabled?: boolean;
+
+  /** Gets the label for this option. */
   getLabel?(): string;
 }
 
diff --git a/src/cdk/collections/collection-viewer.ts b/src/cdk/collections/collection-viewer.ts
index 031d488720aa..63543da18a45 100644
--- a/src/cdk/collections/collection-viewer.ts
+++ b/src/cdk/collections/collection-viewer.ts
@@ -13,5 +13,9 @@ import {Observable} from 'rxjs/Observable';
  * information regarding the view and any changes made.
  */
 export interface CollectionViewer {
+  /**
+   * A stream that emits whenever the `CollectionViewer` starts looking at a new portion of the
+   * data. The `start` index is inclusive, while the `end` is exclusive.
+   */
   viewChange: Observable<{start: number, end: number}>;
 }
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
index b5d2c2c9a277..13dd3ac6f008 100644
--- a/src/cdk/layout/breakpoints-observer.ts
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -18,6 +18,7 @@ import {fromEventPattern} from 'rxjs/observable/fromEventPattern';
 
 /** The current state of a layout breakpoint. */
 export interface BreakpointState {
+  /** Whether the breakpoint is currently matching. */
   matches: boolean;
 }
 
diff --git a/src/cdk/overlay/scroll/scroll-strategy.ts b/src/cdk/overlay/scroll/scroll-strategy.ts
index b5a5c8c62026..f96d94522773 100644
--- a/src/cdk/overlay/scroll/scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy.ts
@@ -9,12 +9,16 @@
 import {OverlayRef} from '../overlay-ref';
 
 /**
- * Describes a strategy that will be used by an overlay
- * to handle scroll events while it is open.
+ * Describes a strategy that will be used by an overlay to handle scroll events while it is open.
  */
 export interface ScrollStrategy {
+  /** Enable this scroll strategy (called when the attached overlay is attached to a portal). */
   enable: () => void;
+
+  /** Disable this scroll strategy (called when the attached overlay is detached from a portal). */
   disable: () => void;
+
+  /** Attaches this `ScrollStrategy` to an overlay. */
   attach: (overlayRef: OverlayRef) => void;
 }
 
diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts
index 697e0f95ac81..911d01a6484c 100644
--- a/src/cdk/portal/portal.ts
+++ b/src/cdk/portal/portal.ts
@@ -146,16 +146,18 @@ export class TemplatePortal<C> extends Portal<C> {
 }
 
 
-/**
- * A `PortalOutlet` is an space that can contain a single `Portal`.
- */
+/** A `PortalOutlet` is an space that can contain a single `Portal`. */
 export interface PortalOutlet {
+  /** Attaches a portal to this outlet. */
   attach(portal: Portal<any>): any;
 
+  /** Detaches the currently attached portal from this outlet. */
   detach(): any;
 
+  /** Performs cleanup before the outlet is destroyed. */
   dispose(): void;
 
+  /** Whether there is currently a portal attached to this outlet. */
   hasAttached(): boolean;
 }
 
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 1bc9492a1e1e..dd3e8ddc7d0e 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -12,8 +12,12 @@ import {Directive, ElementRef, EventEmitter, Input, Output} from '@angular/core'
 import {MatChipList} from './chip-list';
 
 
+/** Represents an input event on a `matChipInput`. */
 export interface MatChipInputEvent {
+  /** The native `<input>` element that the event is being fired for. */
   input: HTMLInputElement;
+
+  /** The value of the input. */
   value: string;
 }
 
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index 03d99ff0f8bc..fb3e268e55b1 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -22,7 +22,9 @@ import {CanColor, CanDisable, mixinColor, mixinDisabled} from '@angular/material
 import {Subject} from 'rxjs/Subject';
 
 
+/** Represents an event fired on an individual `mat-chip`. */
 export interface MatChipEvent {
+  /** The chip the event was fired on. */
   chip: MatChip;
 }
 
diff --git a/src/lib/core/placeholder/placeholder-options.ts b/src/lib/core/placeholder/placeholder-options.ts
index 66a3c1257f69..6808ac43114b 100644
--- a/src/lib/core/placeholder/placeholder-options.ts
+++ b/src/lib/core/placeholder/placeholder-options.ts
@@ -15,6 +15,11 @@ export const MAT_PLACEHOLDER_GLOBAL_OPTIONS =
 /** Type for the available floatPlaceholder values. */
 export type FloatPlaceholderType = 'always' | 'never' | 'auto';
 
+/** Configurable options for floating placeholders. */
 export interface PlaceholderOptions {
+  /**
+   * Whether the placeholder should float `always`, `never`, or `auto` (only when necessary).
+   * Default behavior is assumed to be `auto`.
+   */
   float?: FloatPlaceholderType;
 }
diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
index d35f4d32dbd2..93ef4b6dc0a0 100644
--- a/src/lib/core/ripple/ripple.ts
+++ b/src/lib/core/ripple/ripple.ts
@@ -22,6 +22,7 @@ import {Platform} from '@angular/cdk/platform';
 import {RippleConfig, RippleRenderer} from './ripple-renderer';
 import {RippleRef} from './ripple-ref';
 
+/** Configurable options for `matRipple`. */
 export interface RippleGlobalOptions {
   /**
    * Whether ripples should be disabled. Ripples can be still launched manually by using
diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
index 64318cb7ea31..79d898938f8c 100644
--- a/src/lib/dialog/dialog-config.ts
+++ b/src/lib/dialog/dialog-config.ts
@@ -14,9 +14,16 @@ export type DialogRole = 'dialog' | 'alertdialog';
 
 /** Possible overrides for a dialog's position. */
 export interface DialogPosition {
+  /** Override for the dialog's top position. */
   top?: string;
+
+  /** Override for the dialog's bottom position. */
   bottom?: string;
+
+  /** Override for the dialog's left position. */
   left?: string;
+
+  /** Override for the dialog's right position. */
   right?: string;
 }
 
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index c3ef87da5242..b63afba0c689 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -44,8 +44,13 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
 
 /** Default `mat-menu` options that can be overridden. */
 export interface MatMenuDefaultOptions {
+  /** The x-axis position of the menu. */
   xPosition: MenuPositionX;
+
+  /** The y-axis position of the menu. */
   yPosition: MenuPositionY;
+
+  /** Whether the menu should overlap the menu trigger. */
   overlapTrigger: boolean;
 }
 
diff --git a/src/lib/menu/menu-panel.ts b/src/lib/menu/menu-panel.ts
index fa05e8c34f1a..6a7e47b0ba63 100644
--- a/src/lib/menu/menu-panel.ts
+++ b/src/lib/menu/menu-panel.ts
@@ -10,6 +10,10 @@ import {EventEmitter, TemplateRef} from '@angular/core';
 import {MenuPositionX, MenuPositionY} from './menu-positions';
 import {Direction} from '@angular/cdk/bidi';
 
+/**
+ * Interface for a custom menu panel that can be used with `matMenuTriggerFor`.
+ * @docs-private
+ */
 export interface MatMenuPanel {
   xPosition: MenuPositionX;
   yPosition: MenuPositionY;
diff --git a/src/lib/sort/sort.ts b/src/lib/sort/sort.ts
index 05f63c264985..355df422c7b5 100644
--- a/src/lib/sort/sort.ts
+++ b/src/lib/sort/sort.ts
@@ -15,14 +15,24 @@ import {
   getSortHeaderMissingIdError
 } from './sort-errors';
 
+/** Interface for a directive that holds sorting state consumed by `MatSortHeader`. */
 export interface MatSortable {
+  /** The id of the column being sorted. */
   id: string;
+
+  /** Starting sort direction. */
   start: 'asc' | 'desc';
+
+  /** Whether to disable clearing the sorting state. */
   disableClear: boolean;
 }
 
+/** The current sort state. */
 export interface Sort {
+  /** The id of the column being sorted. */
   active: string;
+
+  /** The sort direction. */
   direction: SortDirection;
 }
 

From 6a9fbfef035c03a4468c0060d97517e1107b8b22 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 20 Nov 2017 16:49:03 -0800
Subject: [PATCH 535/575] chore: bump version w/ changelog for rc.1 (#8569)

---
 CHANGELOG.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bf469d0b628..b14c62af4c9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,60 @@
+<a name="5.0.0-rc.1 felt-photon"></a>
+# [5.0.0-rc.1](https://github.com/angular/material2/compare/5.0.0-rc0...5.0.0-rc.1) (2017-11-20)
+
+
+### Bug Fixes
+
+* **autosize:** incorrect height with long placeholders ([#8024](https://github.com/angular/material2/issues/8024)) ([ad7cb4a](https://github.com/angular/material2/commit/ad7cb4a)), closes [#8013](https://github.com/angular/material2/issues/8013)
+* **cdk-observers:**  prevent attribute renaming in closure compilers advanced optimizations  ([#7894](https://github.com/angular/material2/issues/7894)) ([8dfe470](https://github.com/angular/material2/commit/8dfe470))
+* **checkbox:** Set aria-checkbox to mixed for indeterminate checkbox ([#8089](https://github.com/angular/material2/issues/8089)) ([3037a90](https://github.com/angular/material2/commit/3037a90))
+* **chip:** fix placeholder and text overlap ([#8468](https://github.com/angular/material2/issues/8468)) ([81db650](https://github.com/angular/material2/commit/81db650))
+* **chips:** remove chip bottom margin in sibling chips ([#8198](https://github.com/angular/material2/issues/8198)) ([d79903a](https://github.com/angular/material2/commit/d79903a))
+* **chips:** use all available space for the input ([#7462](https://github.com/angular/material2/issues/7462)) ([c725249](https://github.com/angular/material2/commit/c725249))
+* **datepicker:** add missing exportAs ([#7782](https://github.com/angular/material2/issues/7782)) ([d6d9ff8](https://github.com/angular/material2/commit/d6d9ff8))
+* **datepicker:** correct DST issues on IE 11 ([#7858](https://github.com/angular/material2/issues/7858)) ([2f2325a](https://github.com/angular/material2/commit/2f2325a))
+* **datepicker:** correct overlay broad style selector ([#8130](https://github.com/angular/material2/issues/8130)) ([f69c8e6](https://github.com/angular/material2/commit/f69c8e6))
+* **datepicker:** prevent `matInput` from clobbering date value ([#7831](https://github.com/angular/material2/issues/7831)) ([4b59ca1](https://github.com/angular/material2/commit/4b59ca1))
+* **drawer:** invalid margin declaration when rendering server-side ([#8324](https://github.com/angular/material2/issues/8324)) ([5600b80](https://github.com/angular/material2/commit/5600b80))
+* **drawer:** missing elevation shadow ([#8387](https://github.com/angular/material2/issues/8387)) ([b0756a2](https://github.com/angular/material2/commit/b0756a2)), closes [#8386](https://github.com/angular/material2/issues/8386)
+* **drawer:** re-add openedStart and closedStart events ([#7747](https://github.com/angular/material2/issues/7747)) ([7610c7c](https://github.com/angular/material2/commit/7610c7c))
+* **expansion:** prevent memory leak by calling parent ngOnDestroy ([#8410](https://github.com/angular/material2/issues/8410)) ([f6bd9b0](https://github.com/angular/material2/commit/f6bd9b0))
+* **fab-buttons:** vertically align icons inside fab buttons ([#8442](https://github.com/angular/material2/issues/8442)) ([43217ef](https://github.com/angular/material2/commit/43217ef))
+* **form-field:** jumping underline in Edge and Firefox ([#8480](https://github.com/angular/material2/issues/8480)) ([c7ab877](https://github.com/angular/material2/commit/c7ab877)), closes [#8395](https://github.com/angular/material2/issues/8395)
+* **icon:** remove IDs from source icon set from rendered output ([#8266](https://github.com/angular/material2/issues/8266)) ([76806e3](https://github.com/angular/material2/commit/76806e3))
+* **input:** add aria-required to inputs ([#8034](https://github.com/angular/material2/issues/8034)) ([8178d6f](https://github.com/angular/material2/commit/8178d6f))
+* **input:** remove native IE reveal icon ([#8439](https://github.com/angular/material2/issues/8439)) ([47055a7](https://github.com/angular/material2/commit/47055a7)), closes [#8390](https://github.com/angular/material2/issues/8390)
+* **select:** error when attempting to open before init ([#8242](https://github.com/angular/material2/issues/8242)) ([ba36d3a](https://github.com/angular/material2/commit/ba36d3a))
+* **progress-spinner:** coerceNumber values ([#7791](https://github.com/angular/material2/issues/7791)) ([b6712f8](https://github.com/angular/material2/commit/b6712f8))
+* **list:** multi-line list item spacing ([#8339](https://github.com/angular/material2/issues/8339)) ([bb504ad](https://github.com/angular/material2/commit/bb504ad)), closes [#8333](https://github.com/angular/material2/issues/8333)
+* **menu:** return focus to root trigger when closed by mouse ([#8348](https://github.com/angular/material2/issues/8348)) ([b085dc6](https://github.com/angular/material2/commit/b085dc6)), closes [#8290](https://github.com/angular/material2/issues/8290)
+* **overlay:** better handling of server-side rendering ([#8422](https://github.com/angular/material2/issues/8422)) ([0f83b20](https://github.com/angular/material2/commit/0f83b20)), closes [#8412](https://github.com/angular/material2/issues/8412)
+* **overlay:** complete key event stream on dispose ([#8341](https://github.com/angular/material2/issues/8341)) ([b437b45](https://github.com/angular/material2/commit/b437b45))
+* **overlay:** remove global keydown listener when there are no open overlays ([#8389](https://github.com/angular/material2/issues/8389)) ([131272a](https://github.com/angular/material2/commit/131272a))
+* **progress-spinner:** default strokeWidth to 10% of the diameter ([#7746](https://github.com/angular/material2/issues/7746)) ([b997353](https://github.com/angular/material2/commit/b997353))
+* **slide-toggle:** drag not working in edge ([#8421](https://github.com/angular/material2/issues/8421)) ([d6f287e](https://github.com/angular/material2/commit/d6f287e)), closes [#8391](https://github.com/angular/material2/issues/8391)
+* **snack-bar:** complete onAction observable on close ([#8183](https://github.com/angular/material2/issues/8183)) ([bc8560e](https://github.com/angular/material2/commit/bc8560e))
+* **stepper:** update state when steps change ([#8398](https://github.com/angular/material2/issues/8398)) ([2bc0b41](https://github.com/angular/material2/commit/2bc0b41))
+* **tabs:** detach tab portal when tab hides from view ([#8486](https://github.com/angular/material2/issues/8486)) ([fbf2987](https://github.com/angular/material2/commit/fbf2987))
+* **tooltip:** allow toolip to reopen when closed by detaching overlay ([#8232](https://github.com/angular/material2/issues/8232)) ([0719c38](https://github.com/angular/material2/commit/0719c38))
+* consistently coerce boolean and number properties ([#7283](https://github.com/angular/material2/issues/7283)) ([3ca801a](https://github.com/angular/material2/commit/3ca801a))
+* replace extendObject utility w/ object spread ([#7372](https://github.com/angular/material2/issues/7372)) ([ea54edb](https://github.com/angular/material2/commit/ea54edb))
+* using correct global name in rollup bundle ([#8407](https://github.com/angular/material2/issues/8407)) ([40be1f2](https://github.com/angular/material2/commit/40be1f2))
+* TypeScript interfaces are now documented on https://material.angular.io
+
+### Features
+
+* **a11y:** add autoCapture option to cdkTrapFocus ([#7641](https://github.com/angular/material2/issues/7641)) ([20b47d7](https://github.com/angular/material2/commit/20b47d7))
+* **datepicker:** dispatch events when datepicker is opened and closed ([#7792](https://github.com/angular/material2/issues/7792)) ([998153a](https://github.com/angular/material2/commit/998153a))
+* **dialog:** add ariaLabel and focusOnOpen config options ([#6558](https://github.com/angular/material2/issues/6558)) ([dad5922](https://github.com/angular/material2/commit/dad5922))
+* **gestures:** add injection token for specifying Hammer.js options ([#8106](https://github.com/angular/material2/issues/8106)) ([f2a0206](https://github.com/angular/material2/commit/f2a0206)), closes [#7097](https://github.com/angular/material2/issues/7097)
+* **menu:** allow disabling ripples on items ([#8388](https://github.com/angular/material2/issues/8388)) ([ce23395](https://github.com/angular/material2/commit/ce23395)), closes [#8261](https://github.com/angular/material2/issues/8261)
+* **overlay:** add option to re-use last preferred position when re-applying to open connected overlay ([#7805](https://github.com/angular/material2/issues/7805)) ([f83beb8](https://github.com/angular/material2/commit/f83beb8))
+* **reposition-scroll-strategy:** add option for closing once the user scrolls away ([#8233](https://github.com/angular/material2/issues/8233)) ([58598c4](https://github.com/angular/material2/commit/58598c4))
+* **slider:** support specifying tabindex ([#7848](https://github.com/angular/material2/issues/7848)) ([8e9dade](https://github.com/angular/material2/commit/8e9dade))
+* **tab-nav-bar:** allow setting tabindex for links ([#7809](https://github.com/angular/material2/issues/7809)) ([a041253](https://github.com/angular/material2/commit/a041253))
+
+
+
 <a name="5.0.0-rc0"></a>
 # [5.0.0-rc0 cesium-cephalopod](https://github.com/angular/material2/compare/2.0.0-beta.12...5.0.0-rc0) (2017-11-06)
 
diff --git a/package.json b/package.json
index bdaa35a0b910..cbd876171d88 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "docs": "gulp docs",
     "api": "gulp api-docs"
   },
-  "version": "5.0.0-rc0",
+  "version": "5.0.0-rc.1",
   "license": "MIT",
   "engines": {
     "node": ">= 5.4.1"

From 2cf3860e591896103c9980e28635948b71ec7a85 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 21 Nov 2017 17:59:04 +0100
Subject: [PATCH 536/575] refactor: remove renderer usages (#8235)

Removes any usages of the Renderer2 from the codebase. They're no longer necessary after Angular switched to Domino which is closer to the native DOM API.
---
 .../creating-a-custom-form-field-control.md   | 11 ++++----
 src/cdk/a11y/focus-monitor.spec.ts            |  6 ++---
 src/cdk/overlay/overlay-directives.ts         | 25 ++++++++-----------
 .../connected-position-strategy.spec.ts       |  2 +-
 src/cdk/scrolling/scrollable.ts               | 16 +++++-------
 src/cdk/table/cell.ts                         | 10 ++++----
 src/cdk/table/table.ts                        |  5 ++--
 src/demo-app/demo-app/demo-app.ts             |  7 +++---
 src/lib/button/button.ts                      | 13 ++++------
 src/lib/checkbox/checkbox.ts                  | 16 +++++-------
 src/lib/chips/chip-list.ts                    |  6 ++---
 src/lib/chips/chip.ts                         |  8 +++---
 src/lib/core/common-behaviors/color.spec.ts   |  8 +-----
 src/lib/core/common-behaviors/color.ts        | 13 +++++-----
 src/lib/core/line/line.ts                     |  8 +++---
 src/lib/datepicker/datepicker-input.ts        |  6 ++---
 src/lib/form-field/form-field.ts              |  7 +++---
 src/lib/grid-list/grid-list.ts                |  8 ++----
 src/lib/grid-list/grid-tile.ts                |  9 +++----
 src/lib/icon/icon.ts                          | 24 ++++++++----------
 src/lib/input/input.ts                        |  8 +++---
 src/lib/list/list.ts                          | 14 +++++------
 src/lib/list/selection-list.ts                |  6 ++---
 src/lib/progress-spinner/progress-spinner.ts  | 20 +++++++--------
 src/lib/radio/radio.ts                        |  9 +++----
 src/lib/select/select.ts                      |  6 ++---
 src/lib/sidenav/drawer.ts                     | 10 +++-----
 src/lib/slide-toggle/slide-toggle.ts          |  9 +++----
 src/lib/slider/slider.ts                      |  8 +++---
 src/lib/snack-bar/snack-bar-container.ts      | 19 +++++---------
 src/lib/stepper/step-header.ts                |  8 +++---
 src/lib/table/cell.ts                         | 16 ++++++------
 src/lib/tabs/ink-bar.ts                       | 14 +++++------
 src/lib/tabs/tab-group.ts                     | 24 ++++++++----------
 src/lib/tabs/tab-header.ts                    |  5 +---
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts       | 14 +++++------
 src/lib/toolbar/toolbar.ts                    |  7 +++---
 src/lib/tooltip/tooltip.ts                    | 21 ++++++++--------
 38 files changed, 176 insertions(+), 250 deletions(-)

diff --git a/guides/creating-a-custom-form-field-control.md b/guides/creating-a-custom-form-field-control.md
index e421d9a28cd7..479670ec5082 100644
--- a/guides/creating-a-custom-form-field-control.md
+++ b/guides/creating-a-custom-form-field-control.md
@@ -58,7 +58,7 @@ class MyTelInput {
     tel = tel || new MyTel('', '', '');
     this.parts.setValue({area: tel.area, exchange: tel.exchange, subscriber: tel.subscriber});
   }
-  
+
   constructor(fb: FormBuilder) {
     this.parts =  fb.group({
       'area': '',
@@ -98,7 +98,7 @@ the `MatFormFieldControl` interface, see the
 #### `value`
 
 This property allows someone to set or get the value of our control. Its type should be the same
-type we used for the type parameter when we implemented `MatFormFieldControl`. Since our component 
+type we used for the type parameter when we implemented `MatFormFieldControl`. Since our component
 already has a value property, we don't need to do anything for this one.
 
 #### `stateChanges`
@@ -185,10 +185,9 @@ need to remember to emit on the `stateChanges` stream so change detection can ha
 ```ts
 focused = false;
 
-constructor(fb: FormBuilder, private fm: FocusMonitor, private elRef: ElementRef,
-            renderer: Renderer2) {
+constructor(fb: FormBuilder, private fm: FocusMonitor, private elRef: ElementRef) {
   ...
-  fm.monitor(elRef.nativeElement, renderer, true).subscribe(origin => {
+  fm.monitor(elRef.nativeElement, true).subscribe(origin => {
     this.focused = !!origin;
     this.stateChanges.next();
   });
@@ -307,7 +306,7 @@ just need to apply the given IDs to our host element.
 
 ```ts
 @HostBinding('attr.aria-describedby') describedBy = '';
-  
+
 setDescribedByIds(ids: string[]) {
   this.describedBy = ids.join(' ');
 }
diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts
index 7cb6b426c6f0..1b53d56be5d3 100644
--- a/src/cdk/a11y/focus-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor.spec.ts
@@ -1,6 +1,6 @@
 import {TAB} from '@angular/cdk/keycodes';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
-import {Component, Renderer2} from '@angular/core';
+import {Component} from '@angular/core';
 import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
@@ -378,9 +378,7 @@ describe('cdkMonitorFocus', () => {
 @Component({
   template: `<button>focus me!</button>`
 })
-class PlainButton {
-  constructor(public renderer: Renderer2) {}
-}
+class PlainButton {}
 
 
 @Component({
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index ebd5dc7e5ea5..d9261639d29b 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -21,7 +21,6 @@ import {
   OnDestroy,
   Optional,
   Output,
-  Renderer2,
   SimpleChanges,
   TemplateRef,
   ViewContainerRef,
@@ -36,6 +35,7 @@ import {
 } from './position/connected-position';
 import {ConnectedPositionStrategy} from './position/connected-position-strategy';
 import {RepositionScrollStrategy, ScrollStrategy} from './scroll/index';
+import {DOCUMENT} from '@angular/common';
 
 
 /** Default set of positions for the overlay. Follows the behavior of a dropdown. */
@@ -97,7 +97,6 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
   private _offsetX: number = 0;
   private _offsetY: number = 0;
   private _position: ConnectedPositionStrategy;
-  private _escapeListener = () => {};
 
   /** Origin for the connected overlay. */
   @Input('cdkConnectedOverlayOrigin') origin: CdkOverlayOrigin;
@@ -230,11 +229,11 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
 
   constructor(
       private _overlay: Overlay,
-      private _renderer: Renderer2,
       templateRef: TemplateRef<any>,
       viewContainerRef: ViewContainerRef,
       @Inject(CDK_CONNECTED_OVERLAY_SCROLL_STRATEGY) private _scrollStrategy,
-      @Optional() private _dir: Directionality) {
+      @Optional() private _dir: Directionality,
+      @Optional() @Inject(DOCUMENT) private _document: any) {
     this._templatePortal = new TemplatePortal(templateRef, viewContainerRef);
   }
 
@@ -335,7 +334,7 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
 
     this._position.withDirection(this.dir);
     this._overlayRef.getConfig().direction = this.dir;
-    this._initEscapeListener();
+    this._document.addEventListener('keydown', this._escapeListener);
 
     if (!this._overlayRef.hasAttached()) {
       this._overlayRef.attach(this._templatePortal);
@@ -357,7 +356,7 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
     }
 
     this._backdropSubscription.unsubscribe();
-    this._escapeListener();
+    this._document.removeEventListener('keydown', this._escapeListener);
   }
 
   /** Destroys the overlay created by this directive. */
@@ -368,15 +367,13 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
 
     this._backdropSubscription.unsubscribe();
     this._positionSubscription.unsubscribe();
-    this._escapeListener();
+    this._document.removeEventListener('keydown', this._escapeListener);
   }
 
-  /** Sets the event listener that closes the overlay when pressing Escape. */
-  private _initEscapeListener() {
-    this._escapeListener = this._renderer.listen('document', 'keydown', (event: KeyboardEvent) => {
-      if (event.keyCode === ESCAPE) {
-        this._detachOverlay();
-      }
-    });
+  /** Event listener that will close the overlay when the user presses escape. */
+  private _escapeListener = (event: KeyboardEvent) => {
+    if (event.keyCode === ESCAPE) {
+      this._detachOverlay();
+    }
   }
 }
diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index 2d6b9572c1d8..ad3c99137eb4 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -592,7 +592,7 @@ describe('ConnectedPositionStrategy', () => {
           {overlayX: 'start', overlayY: 'top'});
 
       strategy.withScrollableContainers([
-          new CdkScrollable(new FakeElementRef(scrollable), null!, null!, null!)]);
+          new CdkScrollable(new FakeElementRef(scrollable), null!, null!)]);
       strategy.attach(fakeOverlayRef(overlayElement));
       positionChangeHandler = jasmine.createSpy('positionChangeHandler');
       onPositionChangeSubscription = strategy.onPositionChange.subscribe(positionChangeHandler);
diff --git a/src/cdk/scrolling/scrollable.ts b/src/cdk/scrolling/scrollable.ts
index 7c4ff9d55286..3d9fb8a6d0b5 100644
--- a/src/cdk/scrolling/scrollable.ts
+++ b/src/cdk/scrolling/scrollable.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, OnInit, OnDestroy, NgZone, Renderer2} from '@angular/core';
+import {Directive, ElementRef, OnInit, OnDestroy, NgZone} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
 import {ScrollDispatcher} from './scroll-dispatcher';
@@ -22,18 +22,15 @@ import {ScrollDispatcher} from './scroll-dispatcher';
 })
 export class CdkScrollable implements OnInit, OnDestroy {
   private _elementScrolled: Subject<Event> = new Subject();
-  private _scrollListener: Function | null;
+  private _scrollListener = (event: Event) => this._elementScrolled.next(event);
 
   constructor(private _elementRef: ElementRef,
               private _scroll: ScrollDispatcher,
-              private _ngZone: NgZone,
-              private _renderer: Renderer2) {}
+              private _ngZone: NgZone) {}
 
   ngOnInit() {
-    this._scrollListener = this._ngZone.runOutsideAngular(() => {
-      return this._renderer.listen(this.getElementRef().nativeElement, 'scroll', (event: Event) => {
-        this._elementScrolled.next(event);
-      });
+    this._ngZone.runOutsideAngular(() => {
+      this.getElementRef().nativeElement.addEventListener('scroll', this._scrollListener);
     });
 
     this._scroll.register(this);
@@ -43,8 +40,7 @@ export class CdkScrollable implements OnInit, OnDestroy {
     this._scroll.deregister(this);
 
     if (this._scrollListener) {
-      this._scrollListener();
-      this._scrollListener = null;
+      this.getElementRef().nativeElement.removeEventListener('scroll', this._scrollListener);
     }
   }
 
diff --git a/src/cdk/table/cell.ts b/src/cdk/table/cell.ts
index d0d735e30176..5c5edba081a0 100644
--- a/src/cdk/table/cell.ts
+++ b/src/cdk/table/cell.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ContentChild, Directive, ElementRef, Input, Renderer2, TemplateRef} from '@angular/core';
+import {ContentChild, Directive, ElementRef, Input, TemplateRef} from '@angular/core';
 
 /**
  * Cell definition for a CDK table.
@@ -64,8 +64,8 @@ export class CdkColumnDef {
   },
 })
 export class CdkHeaderCell {
-  constructor(columnDef: CdkColumnDef, elementRef: ElementRef, renderer: Renderer2) {
-    renderer.addClass(elementRef.nativeElement, `cdk-column-${columnDef.cssClassFriendlyName}`);
+  constructor(columnDef: CdkColumnDef, elementRef: ElementRef) {
+    elementRef.nativeElement.classList.add(`cdk-column-${columnDef.cssClassFriendlyName}`);
   }
 }
 
@@ -78,7 +78,7 @@ export class CdkHeaderCell {
   },
 })
 export class CdkCell {
-  constructor(columnDef: CdkColumnDef, elementRef: ElementRef, renderer: Renderer2) {
-    renderer.addClass(elementRef.nativeElement, `cdk-column-${columnDef.cssClassFriendlyName}`);
+  constructor(columnDef: CdkColumnDef, elementRef: ElementRef) {
+    elementRef.nativeElement.classList.add(`cdk-column-${columnDef.cssClassFriendlyName}`);
   }
 }
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index cbc944fa0580..76c3cb412db4 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -23,7 +23,6 @@ import {
   IterableDiffers,
   NgIterable,
   QueryList,
-  Renderer2,
   TrackByFunction,
   ViewChild,
   ViewContainerRef,
@@ -170,10 +169,10 @@ export class CdkTable<T> implements CollectionViewer {
   constructor(private readonly _differs: IterableDiffers,
               private readonly _changeDetectorRef: ChangeDetectorRef,
               elementRef: ElementRef,
-              renderer: Renderer2,
               @Attribute('role') role: string) {
+
     if (!role) {
-      renderer.setAttribute(elementRef.nativeElement, 'role', 'grid');
+      elementRef.nativeElement.setAttribute('role', 'grid');
     }
   }
 
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index 5fcfd9a1c685..579efc8966ee 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -7,7 +7,7 @@
  */
 
 import {OverlayContainer} from '@angular/cdk/overlay';
-import {Component, ElementRef, Renderer2, ViewEncapsulation} from '@angular/core';
+import {Component, ElementRef, ViewEncapsulation} from '@angular/core';
 
 /**
  * The entry app for demo site. Routes under `accessibility` will use AccessibilityDemo component,
@@ -91,7 +91,6 @@ export class DemoApp {
 
   constructor(
     private _element: ElementRef,
-    private _renderer: Renderer2,
     private _overlayContainer: OverlayContainer) {}
 
   toggleFullscreen() {
@@ -113,10 +112,10 @@ export class DemoApp {
     this.dark = !this.dark;
 
     if (this.dark) {
-      this._renderer.addClass(this._element.nativeElement, darkThemeClass);
+      this._element.nativeElement.classList.add(darkThemeClass);
       this._overlayContainer.getContainerElement().classList.add(darkThemeClass);
     } else {
-      this._renderer.removeClass(this._element.nativeElement, darkThemeClass);
+      this._element.nativeElement.classList.remove(darkThemeClass);
       this._overlayContainer.getContainerElement().classList.remove(darkThemeClass);
     }
   }
diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
index d3300a14fb79..f4d29fc28b4d 100644
--- a/src/lib/button/button.ts
+++ b/src/lib/button/button.ts
@@ -17,7 +17,6 @@ import {
   Inject,
   OnDestroy,
   Optional,
-  Renderer2,
   Self,
   ViewEncapsulation,
 } from '@angular/core';
@@ -104,7 +103,7 @@ export class MatMiniFab {
 // Boilerplate for applying mixins to MatButton.
 /** @docs-private */
 export class MatButtonBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(MatButtonBase)));
 
@@ -136,11 +135,10 @@ export class MatButton extends _MatButtonMixinBase
   /** Whether the button is icon button. */
   _isIconButton: boolean = this._hasHostAttributes('mat-icon-button');
 
-  constructor(renderer: Renderer2,
-              elementRef: ElementRef,
+  constructor(elementRef: ElementRef,
               private _platform: Platform,
               private _focusMonitor: FocusMonitor) {
-    super(renderer, elementRef);
+    super(elementRef);
     this._focusMonitor.monitor(this._elementRef.nativeElement, true);
   }
 
@@ -198,9 +196,8 @@ export class MatAnchor extends MatButton {
   constructor(
       platform: Platform,
       focusMonitor: FocusMonitor,
-      elementRef: ElementRef,
-      renderer: Renderer2) {
-    super(renderer, elementRef, platform, focusMonitor);
+      elementRef: ElementRef) {
+    super(elementRef, platform, focusMonitor);
   }
 
   _haltDisabledEvents(event: Event) {
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index 331504286d00..aabeb801ea63 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -20,7 +20,6 @@ import {
   Input,
   OnDestroy,
   Output,
-  Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -79,7 +78,7 @@ export class MatCheckboxChange {
 // Boilerplate for applying mixins to MatCheckbox.
 /** @docs-private */
 export class MatCheckboxBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatCheckboxMixinBase =
   mixinTabIndex(mixinColor(mixinDisableRipple(mixinDisabled(MatCheckboxBase)), 'accent'));
@@ -197,13 +196,11 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   /** Reference to the focused state ripple. */
   private _focusRipple: RippleRef | null;
 
-  constructor(renderer: Renderer2,
-              elementRef: ElementRef,
+  constructor(elementRef: ElementRef,
               private _changeDetectorRef: ChangeDetectorRef,
               private _focusMonitor: FocusMonitor,
               @Attribute('tabindex') tabIndex: string) {
-    super(renderer, elementRef);
-
+    super(elementRef);
     this.tabIndex = parseInt(tabIndex) || 0;
   }
 
@@ -309,14 +306,13 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
 
   private _transitionCheckState(newState: TransitionCheckState) {
     let oldState = this._currentCheckState;
-    let renderer = this._renderer;
-    let elementRef = this._elementRef;
+    let element: HTMLElement = this._elementRef.nativeElement;
 
     if (oldState === newState) {
       return;
     }
     if (this._currentAnimationClass.length > 0) {
-      renderer.removeClass(elementRef.nativeElement, this._currentAnimationClass);
+      element.classList.remove(this._currentAnimationClass);
     }
 
     this._currentAnimationClass = this._getAnimationClassForCheckStateTransition(
@@ -324,7 +320,7 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
     this._currentCheckState = newState;
 
     if (this._currentAnimationClass.length > 0) {
-      renderer.addClass(elementRef.nativeElement, this._currentAnimationClass);
+      element.classList.add(this._currentAnimationClass);
     }
   }
 
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index a0a94d46164b..c5e0451731a0 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -26,7 +26,6 @@ import {
   Optional,
   Output,
   QueryList,
-  Renderer2,
   Self,
   ViewEncapsulation,
 } from '@angular/core';
@@ -311,8 +310,7 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   /** The chip components contained within this chip list. */
   @ContentChildren(MatChip) chips: QueryList<MatChip>;
 
-  constructor(protected _renderer: Renderer2,
-              protected _elementRef: ElementRef,
+  constructor(protected _elementRef: ElementRef,
               private _changeDetectorRef: ChangeDetectorRef,
               @Optional() private _dir: Directionality,
               @Optional() private _parentForm: NgForm,
@@ -392,7 +390,7 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   // Implemented as part of ControlValueAccessor
   setDisabledState(disabled: boolean): void {
     this.disabled = disabled;
-    this._renderer.setProperty(this._elementRef.nativeElement, 'disabled', disabled);
+    this._elementRef.nativeElement.disabled = disabled;
     this.stateChanges.next();
   }
 
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index fb3e268e55b1..38106026beba 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -16,7 +16,6 @@ import {
   Input,
   OnDestroy,
   Output,
-  Renderer2,
 } from '@angular/core';
 import {CanColor, CanDisable, mixinColor, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
@@ -37,8 +36,7 @@ export class MatChipSelectionChange {
 // Boilerplate for applying mixins to MatChip.
 /** @docs-private */
 export class MatChipBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {
-  }
+  constructor(public _elementRef: ElementRef) {}
 }
 
 export const _MatChipMixinBase = mixinColor(mixinDisabled(MatChipBase), 'primary');
@@ -171,8 +169,8 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
     return this.selectable ? this.selected.toString() : null;
   }
 
-  constructor(renderer: Renderer2, public _elementRef: ElementRef) {
-    super(renderer, _elementRef);
+  constructor(public _elementRef: ElementRef) {
+    super(_elementRef);
   }
 
   ngOnDestroy(): void {
diff --git a/src/lib/core/common-behaviors/color.spec.ts b/src/lib/core/common-behaviors/color.spec.ts
index 0b7a86a235f4..2e3bcbca6bc1 100644
--- a/src/lib/core/common-behaviors/color.spec.ts
+++ b/src/lib/core/common-behaviors/color.spec.ts
@@ -1,5 +1,5 @@
 import {mixinColor} from './color';
-import {ElementRef, Renderer2} from '@angular/core';
+import {ElementRef} from '@angular/core';
 
 describe('MixinColor', () => {
 
@@ -72,12 +72,6 @@ describe('MixinColor', () => {
 class TestClass {
   testElement: HTMLElement = document.createElement('div');
 
-  /** Mock of a RendererV2 for the color mixin. */
-  _renderer: Renderer2 = {
-    addClass: (element: HTMLElement, className: string) => element.classList.add(className),
-    removeClass: (element: HTMLElement, className: string) => element.classList.remove(className)
-  } as any;
-
   /** Fake instance of an ElementRef. */
   _elementRef = new ElementRef(this.testElement);
 }
diff --git a/src/lib/core/common-behaviors/color.ts b/src/lib/core/common-behaviors/color.ts
index 026d8fd6b83a..c96f1d41d418 100644
--- a/src/lib/core/common-behaviors/color.ts
+++ b/src/lib/core/common-behaviors/color.ts
@@ -7,7 +7,7 @@
  */
 
 import {Constructor} from './constructor';
-import {ElementRef, Renderer2} from '@angular/core';
+import {ElementRef} from '@angular/core';
 
 /** @docs-private */
 export interface CanColor {
@@ -15,8 +15,7 @@ export interface CanColor {
 }
 
 /** @docs-private */
-export interface HasRenderer {
-  _renderer: Renderer2;
+export interface HasElementRef {
   _elementRef: ElementRef;
 }
 
@@ -24,8 +23,8 @@ export interface HasRenderer {
 export type ThemePalette = 'primary' | 'accent' | 'warn' | undefined;
 
 /** Mixin to augment a directive with a `color` property. */
-export function mixinColor<T extends Constructor<HasRenderer>>(base: T, defaultColor?: ThemePalette)
-    : Constructor<CanColor> & T {
+export function mixinColor<T extends Constructor<HasElementRef>>(base: T,
+    defaultColor?: ThemePalette): Constructor<CanColor> & T {
   return class extends base {
     private _color: ThemePalette;
 
@@ -35,10 +34,10 @@ export function mixinColor<T extends Constructor<HasRenderer>>(base: T, defaultC
 
       if (colorPalette !== this._color) {
         if (this._color) {
-          this._renderer.removeClass(this._elementRef.nativeElement, `mat-${this._color}`);
+          this._elementRef.nativeElement.classList.remove(`mat-${this._color}`);
         }
         if (colorPalette) {
-          this._renderer.addClass(this._elementRef.nativeElement, `mat-${colorPalette}`);
+          this._elementRef.nativeElement.classList.add(`mat-${colorPalette}`);
         }
 
         this._color = colorPalette;
diff --git a/src/lib/core/line/line.ts b/src/lib/core/line/line.ts
index 3bcfb3d6f593..f840efde8e51 100644
--- a/src/lib/core/line/line.ts
+++ b/src/lib/core/line/line.ts
@@ -9,7 +9,6 @@
 import {
   NgModule,
   Directive,
-  Renderer2,
   ElementRef,
   QueryList,
 } from '@angular/core';
@@ -32,8 +31,7 @@ export class MatLine {}
  * @docs-private
  */
 export class MatLineSetter {
-  constructor(private _lines: QueryList<MatLine>, private _renderer: Renderer2,
-              private _element: ElementRef) {
+  constructor(private _lines: QueryList<MatLine>, private _element: ElementRef) {
     this._setLineClass(this._lines.length);
 
     this._lines.changes.subscribe(() => {
@@ -58,9 +56,9 @@ export class MatLineSetter {
 
   private _setClass(className: string, isAdd: boolean): void {
     if (isAdd) {
-      this._renderer.addClass(this._element.nativeElement, className);
+      this._element.nativeElement.classList.add(className);
     } else {
-      this._renderer.removeClass(this._element.nativeElement, className);
+      this._element.nativeElement.classList.remove(className);
     }
   }
 
diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index 4b06adaf9581..f659cbce5cba 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -19,7 +19,6 @@ import {
   OnDestroy,
   Optional,
   Output,
-  Renderer2
 } from '@angular/core';
 import {
   AbstractControl,
@@ -122,8 +121,8 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
     value = this._getValidDateOrNull(value);
     let oldDate = this.value;
     this._value = value;
-    this._renderer.setProperty(this._elementRef.nativeElement, 'value',
-        value ? this._dateAdapter.format(value, this._dateFormats.display.dateInput) : '');
+    this._elementRef.nativeElement.value =
+        value ? this._dateAdapter.format(value, this._dateFormats.display.dateInput) : '';
     if (!this._dateAdapter.sameDate(oldDate, value)) {
       this._valueChange.emit(value);
     }
@@ -222,7 +221,6 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
 
   constructor(
       private _elementRef: ElementRef,
-      private _renderer: Renderer2,
       @Optional() private _dateAdapter: DateAdapter<D>,
       @Optional() @Inject(MAT_DATE_FORMATS) private _dateFormats: MatDateFormats,
       @Optional() private _formField: MatFormField) {
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 1397b95c4d6c..c3fda637f185 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -23,7 +23,7 @@ import {
   Inject,
   Input,
   Optional,
-  QueryList, Renderer2,
+  QueryList,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -163,7 +163,6 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
 
   constructor(
       public _elementRef: ElementRef,
-      private _renderer: Renderer2,
       private _changeDetectorRef: ChangeDetectorRef,
       @Optional() @Inject(MAT_PLACEHOLDER_GLOBAL_OPTIONS) placeholderOptions: PlaceholderOptions) {
     this._placeholderOptions = placeholderOptions ? placeholderOptions : {};
@@ -173,8 +172,8 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
   ngAfterContentInit() {
     this._validateControlChild();
     if (this._control.controlType) {
-      this._renderer.addClass(
-          this._elementRef.nativeElement, `mat-form-field-type-${this._control.controlType}`);
+      this._elementRef.nativeElement.classList
+          .add(`mat-form-field-type-${this._control.controlType}`);
     }
 
     // Subscribe to changes in the child control state in order to update the form field UI.
diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
index 185f18fd543b..e99d54ef6214 100644
--- a/src/lib/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -14,7 +14,6 @@ import {
   Input,
   ContentChildren,
   QueryList,
-  Renderer2,
   ElementRef,
   Optional,
   ChangeDetectionStrategy,
@@ -69,10 +68,7 @@ export class MatGridList implements OnInit, AfterContentChecked {
   /** Query list of tiles that are being rendered. */
   @ContentChildren(MatGridTile) _tiles: QueryList<MatGridTile>;
 
-  constructor(
-      private _renderer: Renderer2,
-      private _element: ElementRef,
-      @Optional() private _dir: Directionality) {}
+  constructor(private _element: ElementRef, @Optional() private _dir: Directionality) {}
 
   /** Amount of columns in the grid list. */
   @Input()
@@ -155,7 +151,7 @@ export class MatGridList implements OnInit, AfterContentChecked {
   /** Sets style on the main grid-list element, given the style name and value. */
   _setListStyle(style: [string, string | null] | null): void {
     if (style) {
-      this._renderer.setStyle(this._element.nativeElement, style[0], style[1]);
+      this._element.nativeElement.style[style[0]] = style[1];
     }
   }
 }
diff --git a/src/lib/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
index d1708c0a1a3f..6d79b5a177c8 100644
--- a/src/lib/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -9,7 +9,6 @@
 import {
   Component,
   ViewEncapsulation,
-  Renderer2,
   ElementRef,
   Input,
   ContentChildren,
@@ -38,7 +37,7 @@ export class MatGridTile {
   _rowspan: number = 1;
   _colspan: number = 1;
 
-  constructor(private _renderer: Renderer2, private _element: ElementRef) {}
+  constructor(private _element: ElementRef) {}
 
   /** Amount of rows that the grid tile takes up. */
   @Input()
@@ -55,7 +54,7 @@ export class MatGridTile {
    * "Changed after checked" errors that would occur with HostBinding.
    */
   _setStyle(property: string, value: any): void {
-    this._renderer.setStyle(this._element.nativeElement, property, value);
+    this._element.nativeElement.style[property] = value;
   }
 }
 
@@ -75,10 +74,10 @@ export class MatGridTileText implements AfterContentInit {
   _lineSetter: MatLineSetter;
   @ContentChildren(MatLine) _lines: QueryList<MatLine>;
 
-  constructor(private _renderer: Renderer2, private _element: ElementRef) {}
+  constructor(private _element: ElementRef) {}
 
   ngAfterContentInit() {
-    this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
+    this._lineSetter = new MatLineSetter(this._lines, this._element);
   }
 }
 
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index 2781befbdba6..e99a4449b3ea 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -15,7 +15,6 @@ import {
   Input,
   OnChanges,
   OnInit,
-  Renderer2,
   SimpleChanges,
   ViewEncapsulation,
 } from '@angular/core';
@@ -26,7 +25,7 @@ import {MatIconRegistry} from './icon-registry';
 // Boilerplate for applying mixins to MatIcon.
 /** @docs-private */
 export class MatIconBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatIconMixinBase = mixinColor(MatIconBase);
 
@@ -88,16 +87,15 @@ export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, Can
   private _previousFontIconClass: string;
 
   constructor(
-      renderer: Renderer2,
       elementRef: ElementRef,
       private _iconRegistry: MatIconRegistry,
       @Attribute('aria-hidden') ariaHidden: string) {
-    super(renderer, elementRef);
+    super(elementRef);
 
     // If the user has not explicitly set aria-hidden, mark the icon as hidden, as this is
     // the right thing to do for the majority of icon use-cases.
     if (!ariaHidden) {
-      renderer.setAttribute(elementRef.nativeElement, 'aria-hidden', 'true');
+      elementRef.nativeElement.setAttribute('aria-hidden', 'true');
     }
   }
 
@@ -160,17 +158,17 @@ export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, Can
 
   private _setSvgElement(svg: SVGElement) {
     this._clearSvgElement();
-    this._renderer.appendChild(this._elementRef.nativeElement, svg);
+    this._elementRef.nativeElement.appendChild(svg);
   }
 
   private _clearSvgElement() {
-    const layoutElement = this._elementRef.nativeElement;
+    const layoutElement: HTMLElement = this._elementRef.nativeElement;
     const childCount = layoutElement.childNodes.length;
 
     // Remove existing child nodes and add the new SVG element. Note that we can't
     // use innerHTML, because IE will throw if the element has a data binding.
     for (let i = 0; i < childCount; i++) {
-      this._renderer.removeChild(layoutElement, layoutElement.childNodes[i]);
+      layoutElement.removeChild(layoutElement.childNodes[i]);
     }
   }
 
@@ -179,27 +177,27 @@ export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, Can
       return;
     }
 
-    const elem = this._elementRef.nativeElement;
+    const elem: HTMLElement = this._elementRef.nativeElement;
     const fontSetClass = this.fontSet ?
         this._iconRegistry.classNameForFontAlias(this.fontSet) :
         this._iconRegistry.getDefaultFontSetClass();
 
     if (fontSetClass != this._previousFontSetClass) {
       if (this._previousFontSetClass) {
-        this._renderer.removeClass(elem, this._previousFontSetClass);
+        elem.classList.remove(this._previousFontSetClass);
       }
       if (fontSetClass) {
-        this._renderer.addClass(elem, fontSetClass);
+        elem.classList.add(fontSetClass);
       }
       this._previousFontSetClass = fontSetClass;
     }
 
     if (this.fontIcon != this._previousFontIconClass) {
       if (this._previousFontIconClass) {
-        this._renderer.removeClass(elem, this._previousFontIconClass);
+        elem.classList.remove(this._previousFontIconClass);
       }
       if (this.fontIcon) {
-        this._renderer.addClass(elem, this.fontIcon);
+        elem.classList.add(this.fontIcon);
       }
       this._previousFontIconClass = this.fontIcon;
     }
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index cc4f82bc7875..4f5667c77828 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -17,8 +17,7 @@ import {
   OnChanges,
   OnDestroy,
   Optional,
-  Renderer2,
-  Self
+  Self,
 } from '@angular/core';
 import {FormControl, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
 import {ErrorStateMatcher} from '@angular/material/core';
@@ -124,7 +123,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
     // input element. To ensure that bindings for `type` work, we need to sync the setter
     // with the native property. Textarea elements don't support the type property or attribute.
     if (!this._isTextarea() && getSupportedInputTypes().has(this._type)) {
-      this._renderer.setProperty(this._elementRef.nativeElement, 'type', this._type);
+      this._elementRef.nativeElement.type = this._type;
     }
   }
 
@@ -156,7 +155,6 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   ].filter(t => getSupportedInputTypes().has(t));
 
   constructor(protected _elementRef: ElementRef,
-              protected _renderer: Renderer2,
               protected _platform: Platform,
               @Optional() @Self() public ngControl: NgControl,
               @Optional() protected _parentForm: NgForm,
@@ -176,7 +174,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
     // key. In order to get around this we need to "jiggle" the caret loose. Since this bug only
     // exists on iOS, we only bother to install the listener on iOS.
     if (_platform.IOS) {
-      _renderer.listen(_elementRef.nativeElement, 'keyup', (event: Event) => {
+      _elementRef.nativeElement.addEventListener('keyup', (event: Event) => {
         let el = event.target as HTMLInputElement;
         if (!el.value && !el.selectionStart && !el.selectionEnd) {
           // Note: Just setting `0, 0` doesn't fix the issue. Setting `1, 1` fixes it for the first
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index b132d9893235..6cd9efcd0f9a 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -16,7 +16,6 @@ import {
   ElementRef,
   Optional,
   QueryList,
-  Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
 import {CanDisableRipple, MatLine, MatLineSetter, mixinDisableRipple} from '@angular/material/core';
@@ -144,14 +143,13 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
   @ContentChild(MatListAvatarCssMatStyler)
   set _hasAvatar(avatar: MatListAvatarCssMatStyler) {
     if (avatar != null) {
-      this._renderer.addClass(this._element.nativeElement, 'mat-list-item-avatar');
+      this._element.nativeElement.classList.add('mat-list-item-avatar');
     } else {
-      this._renderer.removeClass(this._element.nativeElement, 'mat-list-item-avatar');
+      this._element.nativeElement.classList.remove('mat-list-item-avatar');
     }
   }
 
-  constructor(private _renderer: Renderer2,
-              private _element: ElementRef,
+  constructor(private _element: ElementRef,
               @Optional() private _list: MatList,
               @Optional() navList: MatNavListCssMatStyler) {
     super();
@@ -159,7 +157,7 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
   }
 
   ngAfterContentInit() {
-    this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
+    this._lineSetter = new MatLineSetter(this._lines, this._element);
   }
 
   /** Whether this list item should show a ripple effect when clicked.  */
@@ -168,11 +166,11 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
   }
 
   _handleFocus() {
-    this._renderer.addClass(this._element.nativeElement, 'mat-list-item-focus');
+    this._element.nativeElement.classList.add('mat-list-item-focus');
   }
 
   _handleBlur() {
-    this._renderer.removeClass(this._element.nativeElement, 'mat-list-item-focus');
+    this._element.nativeElement.classList.remove('mat-list-item-focus');
   }
 
   /** Retrieves the DOM element of the component host. */
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 26b8d0146732..def298abe634 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -27,7 +27,6 @@ import {
   Optional,
   Output,
   QueryList,
-  Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
 import {
@@ -125,8 +124,7 @@ export class MatListOption extends _MatListOptionMixinBase
   /** Emitted when the option is selected or deselected. */
   @Output() selectionChange = new EventEmitter<MatListOptionChange>();
 
-  constructor(private _renderer: Renderer2,
-              private _element: ElementRef,
+  constructor(private _element: ElementRef,
               private _changeDetector: ChangeDetectorRef,
               @Optional() @Inject(forwardRef(() => MatSelectionList))
               public selectionList: MatSelectionList) {
@@ -140,7 +138,7 @@ export class MatListOption extends _MatListOptionMixinBase
   }
 
   ngAfterContentInit() {
-    this._lineSetter = new MatLineSetter(this._lines, this._renderer, this._element);
+    this._lineSetter = new MatLineSetter(this._lines, this._element);
   }
 
   ngOnDestroy(): void {
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index c4db3d0016ef..f0d3b6fb9f67 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -11,7 +11,6 @@ import {
   ChangeDetectionStrategy,
   Input,
   ElementRef,
-  Renderer2,
   SimpleChanges,
   OnChanges,
   ViewEncapsulation,
@@ -41,7 +40,7 @@ const BASE_STROKE_WIDTH = 10;
 // Boilerplate for applying mixins to MatProgressSpinner.
 /** @docs-private */
 export class MatProgressSpinnerBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatProgressSpinnerMixinBase = mixinColor(MatProgressSpinnerBase, 'primary');
 
@@ -151,10 +150,11 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     }
   }
 
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef,
-              platform: Platform, @Optional() @Inject(DOCUMENT) private _document: any) {
-    super(_renderer, _elementRef);
+  constructor(public _elementRef: ElementRef,
+              platform: Platform,
+              @Optional() @Inject(DOCUMENT) private _document: any) {
 
+    super(_elementRef);
     this._fallbackAnimation = platform.EDGE || platform.TRIDENT;
 
     // On IE and Edge, we can't animate the `stroke-dashoffset`
@@ -162,7 +162,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     const animationClass =
       `mat-progress-spinner-indeterminate${this._fallbackAnimation ? '-fallback' : ''}-animation`;
 
-    _renderer.addClass(_elementRef.nativeElement, animationClass);
+    _elementRef.nativeElement.classList.add(animationClass);
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -211,8 +211,8 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     let styleTag = MatProgressSpinner.styleTag;
 
     if (!styleTag) {
-      styleTag = this._renderer.createElement('style');
-      this._renderer.appendChild(this._document.head, styleTag);
+      styleTag = this._document.createElement('style');
+      this._document.head.appendChild(styleTag);
       MatProgressSpinner.styleTag = styleTag;
     }
 
@@ -258,9 +258,9 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
   preserveWhitespaces: false,
 })
 export class MatSpinner extends MatProgressSpinner {
-  constructor(renderer: Renderer2, elementRef: ElementRef, platform: Platform,
+  constructor(elementRef: ElementRef, platform: Platform,
               @Optional() @Inject(DOCUMENT) document: any) {
-    super(renderer, elementRef, platform, document);
+    super(elementRef, platform, document);
     this.mode = 'indeterminate';
   }
 }
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index 2d675060b090..f7e2b72b4c07 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -26,7 +26,6 @@ import {
   Optional,
   Output,
   QueryList,
-  Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -315,7 +314,7 @@ export class MatRadioGroup extends _MatRadioGroupMixinBase
 // Boilerplate for applying mixins to MatRadioButton.
 /** @docs-private */
 export class MatRadioButtonBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 // As per Material design specifications the selection control radio should use the accent color
 // palette by default. https://material.io/guidelines/components/selection-controls.html
@@ -494,11 +493,10 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
 
   constructor(@Optional() radioGroup: MatRadioGroup,
               elementRef: ElementRef,
-              renderer: Renderer2,
               private _changeDetector: ChangeDetectorRef,
               private _focusMonitor: FocusMonitor,
               private _radioDispatcher: UniqueSelectionDispatcher) {
-    super(renderer, elementRef);
+    super(elementRef);
 
     // Assertions. Ideally these should be stripped out by the compiler.
     // TODO(jelbourn): Assert that there's no name binding AND a parent radio group.
@@ -538,7 +536,8 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
   }
 
   ngAfterViewInit() {
-    this._focusMonitor.monitor(this._inputElement.nativeElement, false)
+    this._focusMonitor
+      .monitor(this._inputElement.nativeElement, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 5688af37e37f..f7c8c668b2f7 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -46,7 +46,6 @@ import {
   Optional,
   Output,
   QueryList,
-  Renderer2,
   Self,
   SimpleChanges,
   ViewChild,
@@ -143,7 +142,7 @@ export class MatSelectChange {
 // Boilerplate for applying mixins to MatSelect.
 /** @docs-private */
 export class MatSelectBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatSelectMixinBase = mixinTabIndex(mixinDisabled(MatSelectBase));
 
@@ -453,7 +452,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     private _changeDetectorRef: ChangeDetectorRef,
     private _ngZone: NgZone,
     private _defaultErrorStateMatcher: ErrorStateMatcher,
-    renderer: Renderer2,
     elementRef: ElementRef,
     @Optional() private _dir: Directionality,
     @Optional() private _parentForm: NgForm,
@@ -463,7 +461,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     @Attribute('tabindex') tabIndex: string,
     @Inject(MAT_SELECT_SCROLL_STRATEGY) private _scrollStrategyFactory) {
 
-    super(renderer, elementRef);
+    super(elementRef);
 
     if (this.ngControl) {
       this.ngControl.valueAccessor = this;
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index e444a96ca824..934eb5795b6b 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -27,7 +27,6 @@ import {
   Optional,
   Output,
   QueryList,
-  Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
 import {DOCUMENT} from '@angular/common';
@@ -435,8 +434,7 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   _contentMargins = new Subject<{left: number, right: number}>();
 
   constructor(@Optional() private _dir: Directionality, private _element: ElementRef,
-              private _renderer: Renderer2, private _ngZone: NgZone,
-              private _changeDetectorRef: ChangeDetectorRef) {
+              private _ngZone: NgZone, private _changeDetectorRef: ChangeDetectorRef) {
     // If a `Dir` directive exists up the tree, listen direction changes and update the left/right
     // properties to point to the proper start/end.
     if (_dir != null) {
@@ -493,7 +491,7 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
       // Set the transition class on the container so that the animations occur. This should not
       // be set initially because animations should only be triggered via a change in state.
       if (event.toState !== 'open-instant') {
-        this._renderer.addClass(this._element.nativeElement, 'mat-drawer-transition');
+        this._element.nativeElement.classList.add('mat-drawer-transition');
       }
 
       this._updateContentMargins();
@@ -537,9 +535,9 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
   /** Toggles the 'mat-drawer-opened' class on the main 'mat-drawer-container' element. */
   private _setContainerClass(isAdd: boolean): void {
     if (isAdd) {
-      this._renderer.addClass(this._element.nativeElement, 'mat-drawer-opened');
+      this._element.nativeElement.classList.add('mat-drawer-opened');
     } else {
-      this._renderer.removeClass(this._element.nativeElement, 'mat-drawer-opened');
+      this._element.nativeElement.classList.remove('mat-drawer-opened');
     }
   }
 
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 786e3227af3d..3d525f5265e5 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -21,7 +21,6 @@ import {
   Input,
   OnDestroy,
   Output,
-  Renderer2,
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
@@ -59,7 +58,7 @@ export class MatSlideToggleChange {
 // Boilerplate for applying mixins to MatSlideToggle.
 /** @docs-private */
 export class MatSlideToggleBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatSlideToggleMixinBase =
   mixinTabIndex(mixinColor(mixinDisableRipple(mixinDisabled(MatSlideToggleBase)), 'accent'));
@@ -140,20 +139,20 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
   @ViewChild(MatRipple) _ripple: MatRipple;
 
   constructor(elementRef: ElementRef,
-              renderer: Renderer2,
               private _platform: Platform,
               private _focusMonitor: FocusMonitor,
               private _changeDetectorRef: ChangeDetectorRef,
               @Attribute('tabindex') tabIndex: string) {
-    super(renderer, elementRef);
 
+    super(elementRef);
     this.tabIndex = parseInt(tabIndex) || 0;
   }
 
   ngAfterContentInit() {
     this._slideRenderer = new SlideToggleRenderer(this._elementRef, this._platform);
 
-    this._focusMonitor.monitor(this._inputElement.nativeElement, false)
+    this._focusMonitor
+      .monitor(this._inputElement.nativeElement, false)
       .subscribe(focusOrigin => this._onInputFocusChange(focusOrigin));
   }
 
diff --git a/src/lib/slider/slider.ts b/src/lib/slider/slider.ts
index 50de5eafb2e8..ace527ba1b4c 100644
--- a/src/lib/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -32,7 +32,6 @@ import {
   OnInit,
   Optional,
   Output,
-  Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -86,7 +85,7 @@ export class MatSliderChange {
 // Boilerplate for applying mixins to MatSlider.
 /** @docs-private */
 export class MatSliderBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatSliderMixinBase =
   mixinTabIndex(mixinColor(mixinDisabled(MatSliderBase), 'accent'));
@@ -418,13 +417,12 @@ export class MatSlider extends _MatSliderMixinBase
     return (this._dir && this._dir.value == 'rtl') ? 'rtl' : 'ltr';
   }
 
-  constructor(renderer: Renderer2,
-              elementRef: ElementRef,
+  constructor(elementRef: ElementRef,
               private _focusMonitor: FocusMonitor,
               private _changeDetectorRef: ChangeDetectorRef,
               @Optional() private _dir: Directionality,
               @Attribute('tabindex') tabIndex: string) {
-    super(renderer, elementRef);
+    super(elementRef);
 
     this.tabIndex = parseInt(tabIndex) || 0;
   }
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index cf544a10d2bd..42e8b8135097 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -13,7 +13,6 @@ import {
   ViewChild,
   NgZone,
   OnDestroy,
-  Renderer2,
   ElementRef,
   ChangeDetectionStrategy,
   ViewEncapsulation,
@@ -92,7 +91,6 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
 
   constructor(
     private _ngZone: NgZone,
-    private _renderer: Renderer2,
     private _elementRef: ElementRef,
     private _changeDetectorRef: ChangeDetectorRef) {
     super();
@@ -104,24 +102,19 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
       throw Error('Attempting to attach snack bar content after content is already attached');
     }
 
+    const element: HTMLElement = this._elementRef.nativeElement;
+
     if (this.snackBarConfig.panelClass || this.snackBarConfig.extraClasses) {
-      const classes = [
-        ...this._getCssClasses(this.snackBarConfig.panelClass),
-        ...this._getCssClasses(this.snackBarConfig.extraClasses)
-      ];
-      // Not the most efficient way of adding classes, but the renderer doesn't allow us
-      // to pass in an array or a space-separated list.
-      for (let cssClass of classes) {
-        this._renderer.addClass(this._elementRef.nativeElement, cssClass);
-      }
+      element.classList.add(...this._getCssClasses(this.snackBarConfig.panelClass),
+                            ...this._getCssClasses(this.snackBarConfig.extraClasses));
     }
 
     if (this.snackBarConfig.horizontalPosition === 'center') {
-      this._renderer.addClass(this._elementRef.nativeElement, 'mat-snack-bar-center');
+      element.classList.add('mat-snack-bar-center');
     }
 
     if (this.snackBarConfig.verticalPosition === 'top') {
-      this._renderer.addClass(this._elementRef.nativeElement, 'mat-snack-bar-top');
+      element.classList.add('mat-snack-bar-top');
     }
 
     return this._portalOutlet.attachComponentPortal(portal);
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index d629665835b5..37e1f331e39a 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -77,10 +77,10 @@ export class MatStepHeader implements OnDestroy {
   private _optional: boolean;
 
   constructor(
-      public _intl: MatStepperIntl,
-      private _focusMonitor: FocusMonitor,
-      private _element: ElementRef,
-      changeDetectorRef: ChangeDetectorRef) {
+    public _intl: MatStepperIntl,
+    private _focusMonitor: FocusMonitor,
+    private _element: ElementRef,
+    changeDetectorRef: ChangeDetectorRef) {
     _focusMonitor.monitor(_element.nativeElement, true);
     this._intlSubscription = _intl.changes.subscribe(() => changeDetectorRef.markForCheck());
   }
diff --git a/src/lib/table/cell.ts b/src/lib/table/cell.ts
index ed1b02964492..e6f4c662fb1a 100644
--- a/src/lib/table/cell.ts
+++ b/src/lib/table/cell.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Input, Renderer2} from '@angular/core';
+import {Directive, ElementRef, Input} from '@angular/core';
 import {
   CdkCell,
   CdkCellDef,
@@ -65,10 +65,9 @@ export class MatColumnDef extends _MatColumnDef {
 })
 export class MatHeaderCell extends _MatHeaderCell {
   constructor(columnDef: CdkColumnDef,
-              elementRef: ElementRef,
-              renderer: Renderer2) {
-    super(columnDef, elementRef, renderer);
-    renderer.addClass(elementRef.nativeElement, `mat-column-${columnDef.cssClassFriendlyName}`);
+              elementRef: ElementRef) {
+    super(columnDef, elementRef);
+    elementRef.nativeElement.classList.add(`mat-column-${columnDef.cssClassFriendlyName}`);
   }
 }
 
@@ -82,9 +81,8 @@ export class MatHeaderCell extends _MatHeaderCell {
 })
 export class MatCell extends _MatCell {
   constructor(columnDef: CdkColumnDef,
-              elementRef: ElementRef,
-              renderer: Renderer2) {
-    super(columnDef, elementRef, renderer);
-    renderer.addClass(elementRef.nativeElement, `mat-column-${columnDef.cssClassFriendlyName}`);
+              elementRef: ElementRef) {
+    super(columnDef, elementRef);
+    elementRef.nativeElement.classList.add(`mat-column-${columnDef.cssClassFriendlyName}`);
   }
 }
diff --git a/src/lib/tabs/ink-bar.ts b/src/lib/tabs/ink-bar.ts
index 75c4b6bb8154..4e3c677d8496 100644
--- a/src/lib/tabs/ink-bar.ts
+++ b/src/lib/tabs/ink-bar.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Renderer2, ElementRef, NgZone} from '@angular/core';
+import {Directive, ElementRef, NgZone} from '@angular/core';
 
 
 /**
@@ -21,7 +21,6 @@ import {Directive, Renderer2, ElementRef, NgZone} from '@angular/core';
 })
 export class MatInkBar {
   constructor(
-    private _renderer: Renderer2,
     private _elementRef: ElementRef,
     private _ngZone: NgZone) {}
 
@@ -44,12 +43,12 @@ export class MatInkBar {
 
   /** Shows the ink bar. */
   show(): void {
-    this._renderer.setStyle(this._elementRef.nativeElement, 'visibility', 'visible');
+    this._elementRef.nativeElement.style.visibility = 'visible';
   }
 
   /** Hides the ink bar. */
   hide(): void {
-    this._renderer.setStyle(this._elementRef.nativeElement, 'visibility', 'hidden');
+    this._elementRef.nativeElement.style.visibility = 'hidden';
   }
 
   /**
@@ -57,10 +56,9 @@ export class MatInkBar {
    * @param element
    */
   private _setStyles(element: HTMLElement) {
-    const left = element ? (element.offsetLeft || 0) + 'px' : '0';
-    const width = element ? (element.offsetWidth || 0) + 'px' : '0';
+    const inkBar: HTMLElement = this._elementRef.nativeElement;
 
-    this._renderer.setStyle(this._elementRef.nativeElement, 'left', left);
-    this._renderer.setStyle(this._elementRef.nativeElement, 'width', width);
+    inkBar.style.left = element ? (element.offsetLeft || 0) + 'px' : '0';
+    inkBar.style.top = element ? (element.offsetWidth || 0) + 'px' : '0';
   }
 }
diff --git a/src/lib/tabs/tab-group.ts b/src/lib/tabs/tab-group.ts
index da581c60b5bb..b526f1deb819 100644
--- a/src/lib/tabs/tab-group.ts
+++ b/src/lib/tabs/tab-group.ts
@@ -19,7 +19,6 @@ import {
   OnDestroy,
   Output,
   QueryList,
-  Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -52,7 +51,7 @@ export type MatTabHeaderPosition = 'above' | 'below';
 // Boilerplate for applying mixins to MatTabGroup.
 /** @docs-private */
 export class MatTabGroupBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatTabGroupMixinBase = mixinColor(mixinDisableRipple(MatTabGroupBase), 'primary');
 
@@ -122,12 +121,12 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
   @Input()
   get backgroundColor(): ThemePalette { return this._backgroundColor; }
   set backgroundColor(value: ThemePalette) {
-    let nativeElement = this._elementRef.nativeElement;
+    const nativeElement: HTMLElement = this._elementRef.nativeElement;
 
-    this._renderer.removeClass(nativeElement, `mat-background-${this.backgroundColor}`);
+    nativeElement.classList.remove(`mat-background-${this.backgroundColor}`);
 
     if (value) {
-      this._renderer.addClass(nativeElement, `mat-background-${value}`);
+      nativeElement.classList.add(`mat-background-${value}`);
     }
 
     this._backgroundColor = value;
@@ -152,10 +151,9 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
 
   private _groupId: number;
 
-  constructor(_renderer: Renderer2,
-              elementRef: ElementRef,
+  constructor(elementRef: ElementRef,
               private _changeDetectorRef: ChangeDetectorRef) {
-    super(_renderer, elementRef);
+    super(elementRef);
     this._groupId = nextId++;
   }
 
@@ -265,21 +263,21 @@ export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentIn
   _setTabBodyWrapperHeight(tabHeight: number): void {
     if (!this._dynamicHeight || !this._tabBodyWrapperHeight) { return; }
 
-    this._renderer.setStyle(this._tabBodyWrapper.nativeElement, 'height',
-        this._tabBodyWrapperHeight + 'px');
+    const wrapper: HTMLElement = this._tabBodyWrapper.nativeElement;
+
+    wrapper.style.height = this._tabBodyWrapperHeight + 'px';
 
     // This conditional forces the browser to paint the height so that
     // the animation to the new height can have an origin.
     if (this._tabBodyWrapper.nativeElement.offsetHeight) {
-      this._renderer.setStyle(this._tabBodyWrapper.nativeElement, 'height',
-          tabHeight + 'px');
+      wrapper.style.height = tabHeight + 'px';
     }
   }
 
   /** Removes the height of the tab body wrapper. */
   _removeTabBodyWrapperHeight(): void {
     this._tabBodyWrapperHeight = this._tabBodyWrapper.nativeElement.clientHeight;
-    this._renderer.setStyle(this._tabBodyWrapper.nativeElement, 'height', '');
+    this._tabBodyWrapper.nativeElement.style.height = '';
   }
 
   /** Handle click events, setting new selected index if appropriate. */
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index 31b62051ba24..7fe8d25be64e 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -23,7 +23,6 @@ import {
   Optional,
   Output,
   QueryList,
-  Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -134,7 +133,6 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
   @Output() indexFocused = new EventEmitter();
 
   constructor(private _elementRef: ElementRef,
-              private _renderer: Renderer2,
               private _changeDetectorRef: ChangeDetectorRef,
               private _viewportRuler: ViewportRuler,
               @Optional() private _dir: Directionality) {
@@ -305,8 +303,7 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
     const scrollDistance = this.scrollDistance;
     const translateX = this._getLayoutDirection() === 'ltr' ? -scrollDistance : scrollDistance;
 
-    this._renderer.setStyle(this._tabList.nativeElement, 'transform',
-        `translate3d(${translateX}px, 0, 0)`);
+    this._tabList.nativeElement.style.transform = `translate3d(${translateX}px, 0, 0)`;
   }
 
   /** Sets the distance in pixels that the tab header should be transformed in the X-axis. */
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 95b4f7843b61..da9c40358dcc 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -26,7 +26,6 @@ import {
   OnDestroy,
   Optional,
   QueryList,
-  Renderer2,
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
@@ -53,7 +52,7 @@ import {MatInkBar} from '../ink-bar';
 // Boilerplate for applying mixins to MatTabNav.
 /** @docs-private */
 export class MatTabNavBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatTabNavMixinBase = mixinDisableRipple(mixinColor(MatTabNavBase, 'primary'));
 
@@ -92,12 +91,12 @@ export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit,
   @Input()
   get backgroundColor(): ThemePalette { return this._backgroundColor; }
   set backgroundColor(value: ThemePalette) {
-    let nativeElement = this._elementRef.nativeElement;
+    const nativeElement: HTMLElement = this._elementRef.nativeElement;
 
-    this._renderer.removeClass(nativeElement, `mat-background-${this.backgroundColor}`);
+    nativeElement.classList.remove(`mat-background-${this.backgroundColor}`);
 
     if (value) {
-      this._renderer.addClass(nativeElement, `mat-background-${value}`);
+      nativeElement.classList.add(`mat-background-${value}`);
     }
 
     this._backgroundColor = value;
@@ -112,13 +111,12 @@ export class MatTabNav extends _MatTabNavMixinBase implements AfterContentInit,
   }
   private _disableRipple: boolean = false;
 
-  constructor(renderer: Renderer2,
-              elementRef: ElementRef,
+  constructor(elementRef: ElementRef,
               @Optional() private _dir: Directionality,
               private _ngZone: NgZone,
               private _changeDetectorRef: ChangeDetectorRef,
               private _viewportRuler: ViewportRuler) {
-    super(renderer, elementRef);
+    super(elementRef);
   }
 
   /** Notifies the component that the active link has been changed. */
diff --git a/src/lib/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
index e9781cedf324..2da02fbf50af 100644
--- a/src/lib/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -15,7 +15,6 @@ import {
   ElementRef,
   isDevMode,
   QueryList,
-  Renderer2,
   ViewEncapsulation
 } from '@angular/core';
 import {CanColor, mixinColor} from '@angular/material/core';
@@ -24,7 +23,7 @@ import {Platform} from '@angular/cdk/platform';
 // Boilerplate for applying mixins to MatToolbar.
 /** @docs-private */
 export class MatToolbarBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef) {}
 }
 export const _MatToolbarMixinBase = mixinColor(MatToolbarBase);
 
@@ -56,8 +55,8 @@ export class MatToolbar extends _MatToolbarMixinBase implements CanColor, AfterV
   /** Reference to all toolbar row elements that have been projected. */
   @ContentChildren(MatToolbarRow) _toolbarRows: QueryList<MatToolbarRow>;
 
-  constructor(renderer: Renderer2, elementRef: ElementRef, private _platform: Platform) {
-    super(renderer, elementRef);
+  constructor(elementRef: ElementRef, private _platform: Platform) {
+    super(elementRef);
   }
 
   ngAfterViewInit() {
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index d1c243b532a3..c41a731f46a5 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -39,7 +39,6 @@ import {
   NgZone,
   OnDestroy,
   Optional,
-  Renderer2,
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
@@ -163,11 +162,9 @@ export class MatTooltip implements OnDestroy {
     }
   }
 
-  private _enterListener: Function;
-  private _leaveListener: Function;
+  private _manualListeners = new Map<string, Function>();
 
   constructor(
-    renderer: Renderer2,
     private _overlay: Overlay,
     private _elementRef: ElementRef,
     private _scrollDispatcher: ScrollDispatcher,
@@ -182,10 +179,11 @@ export class MatTooltip implements OnDestroy {
     // The mouse events shouldn't be bound on iOS devices, because
     // they can prevent the first tap from firing its click event.
     if (!_platform.IOS) {
-      this._enterListener =
-        renderer.listen(_elementRef.nativeElement, 'mouseenter', () => this.show());
-      this._leaveListener =
-        renderer.listen(_elementRef.nativeElement, 'mouseleave', () => this.hide());
+      this._manualListeners.set('mouseenter', () => this.show());
+      this._manualListeners.set('mouseleave', () => this.hide());
+
+      this._manualListeners
+        .forEach((listener, event) => _elementRef.nativeElement.addEventListener(event, listener));
     }
 
     _focusMonitor.monitor(_elementRef.nativeElement, false).subscribe(origin => {
@@ -208,8 +206,11 @@ export class MatTooltip implements OnDestroy {
 
     // Clean up the event listeners set in the constructor
     if (!this._platform.IOS) {
-      this._enterListener();
-      this._leaveListener();
+      this._manualListeners.forEach((listener, event) => {
+        this._elementRef.nativeElement.removeEventListener(event, listener);
+      });
+
+      this._manualListeners.clear();
     }
 
     this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this.message);

From 623be22e58d0074a109ac03bdf00afa7c60291ac Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 21 Nov 2017 17:59:50 +0100
Subject: [PATCH 537/575] refactor: replace first operator usages (#8352)

Replaces all usages of the `first` operator with `take(1)` in order to avoid some cryptic errors that `first` throws when the observable completes before it has emitted a value.
---
 src/cdk/a11y/focus-trap.ts                   | 4 ++--
 src/cdk/a11y/list-key-manager.spec.ts        | 4 ++--
 src/cdk/overlay/overlay-ref.ts               | 4 ++--
 src/lib/autocomplete/autocomplete-trigger.ts | 6 +++---
 src/lib/datepicker/calendar.ts               | 4 ++--
 src/lib/datepicker/datepicker.ts             | 4 ++--
 src/lib/dialog/dialog-ref.ts                 | 8 ++++----
 src/lib/form-field/form-field.ts             | 4 ++--
 src/lib/icon/icon.ts                         | 4 ++--
 src/lib/menu/menu-directive.ts               | 4 ++--
 src/lib/select/select.ts                     | 6 +++---
 src/lib/sidenav/drawer.ts                    | 6 +++---
 src/lib/snack-bar/snack-bar-container.ts     | 4 ++--
 src/lib/snack-bar/snack-bar.ts               | 4 ++--
 src/lib/tooltip/tooltip.ts                   | 4 ++--
 tools/package-tools/rollup-globals.ts        | 1 +
 16 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/cdk/a11y/focus-trap.ts b/src/cdk/a11y/focus-trap.ts
index a1205cdf58a2..4bcb4bec0548 100644
--- a/src/cdk/a11y/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap.ts
@@ -17,7 +17,7 @@ import {
   Inject,
 } from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {InteractivityChecker} from './interactivity-checker';
 import {DOCUMENT} from '@angular/common';
 
@@ -271,7 +271,7 @@ export class FocusTrap {
     if (this._ngZone.isStable) {
       fn();
     } else {
-      this._ngZone.onStable.asObservable().pipe(first()).subscribe(fn);
+      this._ngZone.onStable.asObservable().pipe(take(1)).subscribe(fn);
     }
   }
 }
diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index 742b93990276..507a7cb0d513 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -1,5 +1,5 @@
 import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {QueryList} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
 import {createKeyboardEvent} from '../testing/event-objects';
@@ -196,7 +196,7 @@ describe('Key managers', () => {
 
       it('should emit tabOut when the tab key is pressed', () => {
         let spy = jasmine.createSpy('tabOut spy');
-        keyManager.tabOut.pipe(first()).subscribe(spy);
+        keyManager.tabOut.pipe(take(1)).subscribe(spy);
         keyManager.onKeydown(fakeKeyEvents.tab);
 
         expect(spy).toHaveBeenCalled();
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 6b26825dc23e..bf27da133022 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -12,7 +12,7 @@ import {OverlayConfig} from './overlay-config';
 import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 
 
 /**
@@ -69,7 +69,7 @@ export class OverlayRef implements PortalOutlet {
     // Update the position once the zone is stable so that the overlay will be fully rendered
     // before attempting to position it, as the position may depend on the size of the rendered
     // content.
-    this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
+    this._ngZone.onStable.asObservable().pipe(take(1)).subscribe(() => {
       this.updatePosition();
     });
 
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 58d145dde1ea..f848074a695b 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -18,7 +18,7 @@ import {
 } from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
 import {filter} from 'rxjs/operators/filter';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {switchMap} from 'rxjs/operators/switchMap';
 import {tap} from 'rxjs/operators/tap';
 import {delay} from 'rxjs/operators/delay';
@@ -368,7 +368,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
    * stream every time the option list changes.
    */
   private _subscribeToClosingActions(): Subscription {
-    const firstStable = this._zone.onStable.asObservable().pipe(first());
+    const firstStable = this._zone.onStable.asObservable().pipe(take(1));
     const optionChanges = this.autocomplete.options.changes.pipe(
       tap(() => this._positionStrategy.recalculateLastPosition()),
       // Defer emitting to the stream until the next tick, because changing
@@ -387,7 +387,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
           return this.panelClosingActions;
         }),
         // when the first closing event occurs...
-        first()
+        take(1)
       )
       // set the value, close the panel, and complete.
       .subscribe(event => this._setValueAndClose(event));
diff --git a/src/lib/datepicker/calendar.ts b/src/lib/datepicker/calendar.ts
index 591b317e7976..aeef7512aab2 100644
--- a/src/lib/datepicker/calendar.ts
+++ b/src/lib/datepicker/calendar.ts
@@ -36,7 +36,7 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {Subscription} from 'rxjs/Subscription';
 import {createMissingDateImplError} from './datepicker-errors';
 import {MatDatepickerIntl} from './datepicker-intl';
@@ -261,7 +261,7 @@ export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {
   /** Focuses the active cell after the microtask queue is empty. */
   _focusActiveCell() {
     this._ngZone.runOutsideAngular(() => {
-      this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
+      this._ngZone.onStable.asObservable().pipe(take(1)).subscribe(() => {
         this._elementRef.nativeElement.querySelector('.mat-calendar-body-active').focus();
       });
     });
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index d84436266626..cc3bcbb5ec3b 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -18,7 +18,7 @@ import {
   ScrollStrategy,
 } from '@angular/cdk/overlay';
 import {ComponentPortal} from '@angular/cdk/portal';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -345,7 +345,7 @@ export class MatDatepicker<D> implements OnDestroy {
       componentRef.instance.datepicker = this;
 
       // Update the position once the calendar has rendered.
-      this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
+      this._ngZone.onStable.asObservable().pipe(take(1)).subscribe(() => {
         this._popupRef.updatePosition();
       });
     }
diff --git a/src/lib/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
index 76e22a0e8ae2..e3b37957847c 100644
--- a/src/lib/dialog/dialog-ref.ts
+++ b/src/lib/dialog/dialog-ref.ts
@@ -8,7 +8,7 @@
 
 import {OverlayRef, GlobalPositionStrategy} from '@angular/cdk/overlay';
 import {filter} from 'rxjs/operators/filter';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {DialogPosition} from './dialog-config';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
@@ -50,7 +50,7 @@ export class MatDialogRef<T> {
     // Emit when opening animation completes
     _containerInstance._animationStateChanged.pipe(
       filter(event => event.phaseName === 'done' && event.toState === 'enter'),
-      first()
+      take(1)
     )
     .subscribe(() => {
       this._afterOpen.next();
@@ -60,7 +60,7 @@ export class MatDialogRef<T> {
     // Dispose overlay when closing animation is complete
     _containerInstance._animationStateChanged.pipe(
       filter(event => event.phaseName === 'done' && event.toState === 'exit'),
-      first()
+      take(1)
     )
     .subscribe(() => {
       this._overlayRef.dispose();
@@ -80,7 +80,7 @@ export class MatDialogRef<T> {
     // Transition the backdrop in parallel to the dialog.
     this._containerInstance._animationStateChanged.pipe(
       filter(event => event.phaseName === 'start'),
-      first()
+      take(1)
     )
     .subscribe(() => {
       this._beforeClose.next(dialogResult);
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index c3fda637f185..c1046cfa3e52 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -8,7 +8,7 @@
 
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {startWith} from 'rxjs/operators/startWith';
 import {
   AfterContentChecked,
@@ -236,7 +236,7 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
       this._showAlwaysAnimate = true;
       this._floatPlaceholder = 'always';
 
-      fromEvent(this._placeholder.nativeElement, 'transitionend').pipe(first()).subscribe(() => {
+      fromEvent(this._placeholder.nativeElement, 'transitionend').pipe(take(1)).subscribe(() => {
         this._showAlwaysAnimate = false;
       });
 
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index e99a4449b3ea..6022a85e27a6 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {
   Attribute,
   ChangeDetectionStrategy,
@@ -130,7 +130,7 @@ export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, Can
       if (this.svgIcon) {
         const [namespace, iconName] = this._splitIconName(this.svgIcon);
 
-        this._iconRegistry.getNamedSvgIcon(iconName, namespace).pipe(first()).subscribe(
+        this._iconRegistry.getNamedSvgIcon(iconName, namespace).pipe(take(1)).subscribe(
           svg => this._setSvgElement(svg),
           (err: Error) => console.log(`Error retrieving icon: ${err.message}`)
         );
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index b63afba0c689..3a473e117346 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -12,7 +12,7 @@ import {Direction} from '@angular/cdk/bidi';
 import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
 import {startWith} from 'rxjs/operators/startWith';
 import {switchMap} from 'rxjs/operators/switchMap';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -202,7 +202,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel, OnDestroy {
 
     return this._ngZone.onStable
       .asObservable()
-      .pipe(first(), switchMap(() => this._hovered()));
+      .pipe(take(1), switchMap(() => this._hovered()));
   }
 
   /** Handle a keyboard event from the menu, delegating to the appropriate action. */
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index f7c8c668b2f7..1e652f7f94e7 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -19,7 +19,7 @@ import {
   ViewportRuler,
 } from '@angular/cdk/overlay';
 import {filter} from 'rxjs/operators/filter';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {map} from 'rxjs/operators/map';
 import {startWith} from 'rxjs/operators/startWith';
 import {takeUntil} from 'rxjs/operators/takeUntil';
@@ -528,7 +528,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     this._changeDetectorRef.markForCheck();
 
     // Set the font size on the panel element once it exists.
-    this._ngZone.onStable.asObservable().pipe(first()).subscribe(() => {
+    this._ngZone.onStable.asObservable().pipe(take(1)).subscribe(() => {
       if (this._triggerFontSize && this.overlayDir.overlayRef &&
           this.overlayDir.overlayRef.overlayElement) {
         this.overlayDir.overlayRef.overlayElement.style.fontSize = `${this._triggerFontSize}px`;
@@ -712,7 +712,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
    * Callback that is invoked when the overlay panel has been attached.
    */
   _onAttached(): void {
-    this.overlayDir.positionChange.pipe(first()).subscribe(() => {
+    this.overlayDir.positionChange.pipe(take(1)).subscribe(() => {
       this._changeDetectorRef.detectChanges();
       this._calculateOverlayOffsetX();
       this.panel.nativeElement.scrollTop = this._scrollTop;
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 934eb5795b6b..e41b45fb317c 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -32,7 +32,7 @@ import {
 import {DOCUMENT} from '@angular/common';
 import {merge} from 'rxjs/observable/merge';
 import {filter} from 'rxjs/operators/filter';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {startWith} from 'rxjs/operators/startWith';
 import {takeUntil} from 'rxjs/operators/takeUntil';
 import {map} from 'rxjs/operators/map';
@@ -345,7 +345,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
     // TODO(crisbeto): This promise is here for backwards-compatibility.
     // It should be removed next time we do breaking changes in the drawer.
     return new Promise<any>(resolve => {
-      this.openedChange.pipe(first()).subscribe(open => {
+      this.openedChange.pipe(take(1)).subscribe(open => {
         resolve(new MatDrawerToggleResult(open ? 'open' : 'close', true));
       });
     });
@@ -515,7 +515,7 @@ export class MatDrawerContainer implements AfterContentInit, OnDestroy {
     // NOTE: We need to wait for the microtask queue to be empty before validating,
     // since both drawers may be swapping positions at the same time.
     drawer.onPositionChanged.pipe(takeUntil(this._drawers.changes)).subscribe(() => {
-      this._ngZone.onMicrotaskEmpty.asObservable().pipe(first()).subscribe(() => {
+      this._ngZone.onMicrotaskEmpty.asObservable().pipe(take(1)).subscribe(() => {
         this._validateDrawers();
       });
     });
diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index 42e8b8135097..bbefc940aa5b 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -31,7 +31,7 @@ import {
   ComponentPortal,
   CdkPortalOutlet,
 } from '@angular/cdk/portal';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {AnimationCurves, AnimationDurations} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';
@@ -170,7 +170,7 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
    * errors where we end up removing an element which is in the middle of an animation.
    */
   private _completeExit() {
-    this._ngZone.onMicrotaskEmpty.asObservable().pipe(first()).subscribe(() => {
+    this._ngZone.onMicrotaskEmpty.asObservable().pipe(take(1)).subscribe(() => {
       this._onExit.next();
       this._onExit.complete();
     });
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 3ac13aa8a111..16c101d9557f 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -11,7 +11,7 @@ import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
 import {Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
 import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/portal';
 import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {takeUntil} from 'rxjs/operators/takeUntil';
 import {SimpleSnackBar} from './simple-snack-bar';
 import {MAT_SNACK_BAR_DATA, MatSnackBarConfig} from './snack-bar-config';
@@ -152,7 +152,7 @@ export class MatSnackBar {
     // appropriate. This class is applied to the overlay element because the overlay must expand to
     // fill the width of the screen for full width snackbars.
     this._breakpointObserver.observe(Breakpoints.Handset).pipe(
-      takeUntil(overlayRef.detachments().pipe(first()))
+      takeUntil(overlayRef.detachments().pipe(take(1)))
     ).subscribe(state => {
       if (state.matches) {
         overlayRef.overlayElement.classList.add('mat-snack-bar-handset');
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index c41a731f46a5..7c2a1edddf13 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -24,7 +24,7 @@ import {
 } from '@angular/cdk/overlay';
 import {Platform} from '@angular/cdk/platform';
 import {ComponentPortal} from '@angular/cdk/portal';
-import {first} from 'rxjs/operators/first';
+import {take} from 'rxjs/operators/take';
 import {merge} from 'rxjs/observable/merge';
 import {ScrollDispatcher} from '@angular/cdk/scrolling';
 import {
@@ -389,7 +389,7 @@ export class MatTooltip implements OnDestroy {
       this._tooltipInstance.message = this.message;
       this._tooltipInstance._markForCheck();
 
-      this._ngZone.onMicrotaskEmpty.asObservable().pipe(first()).subscribe(() => {
+      this._ngZone.onMicrotaskEmpty.asObservable().pipe(take(1)).subscribe(() => {
         if (this._tooltipInstance) {
           this._overlayRef!.updatePosition();
         }
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 1d08c970d5aa..701b2c5c76cb 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -74,6 +74,7 @@ export const rollupGlobals = {
   'rxjs/operators/debounceTime': 'Rx.Observable',
   'rxjs/operators/takeUntil': 'Rx.Observable',
   'rxjs/operators/first': 'Rx.Observable',
+  'rxjs/operators/take': 'Rx.Observable',
   'rxjs/operators/filter': 'Rx.Observable',
   'rxjs/operators/map': 'Rx.Observable',
   'rxjs/operators/tap': 'Rx.Observable',

From 1fd833af41e96878e51e1cc6f97737190ae911c5 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 21 Nov 2017 18:00:38 +0100
Subject: [PATCH 538/575] refactor(dialog): switch to fakeAsync tests (#8564)

Refactors all the `async` dialog tests to run in the `fakeAsync` zone, making them faster and more reliable (10sec runtime down to ~2.7sec).
---
 src/lib/dialog/dialog.spec.ts | 178 ++++++++++++++++------------------
 1 file changed, 83 insertions(+), 95 deletions(-)

diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 3670d44f61ce..3027969b375a 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -1,11 +1,11 @@
 import {
-  async,
   ComponentFixture,
   fakeAsync,
   flushMicrotasks,
   inject,
   TestBed,
   tick,
+  flush,
 } from '@angular/core/testing';
 import {
   ChangeDetectionStrategy,
@@ -38,7 +38,7 @@ describe('MatDialog', () => {
   let viewContainerFixture: ComponentFixture<ComponentWithChildViewContainer>;
   let mockLocation: SpyLocation;
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [MatDialogModule, DialogTestModule],
       providers: [
@@ -165,21 +165,20 @@ describe('MatDialog', () => {
     expect(dialogContainerElement.getAttribute('aria-describedby')).toBe('description-element');
   });
 
-  it('should close a dialog and get back a result', async(() => {
+  it('should close a dialog and get back a result', fakeAsync(() => {
     let dialogRef = dialog.open(PizzaMsg, { viewContainerRef: testViewContainerRef });
     let afterCloseCallback = jasmine.createSpy('afterClose callback');
 
     dialogRef.afterClosed().subscribe(afterCloseCallback);
     dialogRef.close('Charmander');
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(afterCloseCallback).toHaveBeenCalledWith('Charmander');
-      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
-    });
+    expect(afterCloseCallback).toHaveBeenCalledWith('Charmander');
+    expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
   }));
 
-  it('should close a dialog and get back a result before it is closed', async(() => {
+  it('should close a dialog and get back a result before it is closed', fakeAsync(() => {
     const dialogRef = dialog.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
 
     // beforeClose should emit before dialog container is destroyed
@@ -191,24 +190,22 @@ describe('MatDialog', () => {
     dialogRef.beforeClose().subscribe(beforeCloseHandler);
     dialogRef.close('Bulbasaurus');
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(beforeCloseHandler).toHaveBeenCalledWith('Bulbasaurus');
-      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
-    });
+    expect(beforeCloseHandler).toHaveBeenCalledWith('Bulbasaurus');
+    expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
   }));
 
-  it('should close a dialog via the escape key', async(() => {
+  it('should close a dialog via the escape key', fakeAsync(() => {
     dialog.open(PizzaMsg, {
       viewContainerRef: testViewContainerRef
     });
 
     dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
-    });
+    expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
   }));
 
   it('should close from a ViewContainerRef with OnPush change detection', fakeAsync(() => {
@@ -236,7 +233,7 @@ describe('MatDialog', () => {
         .toBe(0, 'Expected no open dialogs.');
   }));
 
-  it('should close when clicking on the overlay backdrop', async(() => {
+  it('should close when clicking on the overlay backdrop', fakeAsync(() => {
     dialog.open(PizzaMsg, {
       viewContainerRef: testViewContainerRef
     });
@@ -247,13 +244,12 @@ describe('MatDialog', () => {
 
     backdrop.click();
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeFalsy();
-    });
+    expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeFalsy();
   }));
 
-  it('should emit the backdropClick stream when clicking on the overlay backdrop', async(() => {
+  it('should emit the backdropClick stream when clicking on the overlay backdrop', fakeAsync(() => {
     const dialogRef = dialog.open(PizzaMsg, {
       viewContainerRef: testViewContainerRef
     });
@@ -269,15 +265,14 @@ describe('MatDialog', () => {
     expect(spy).toHaveBeenCalledTimes(1);
 
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      // Additional clicks after the dialog has closed should not be emitted
-      backdrop.click();
-      expect(spy).toHaveBeenCalledTimes(1);
-    });
+    // Additional clicks after the dialog has closed should not be emitted
+    backdrop.click();
+    expect(spy).toHaveBeenCalledTimes(1);
   }));
 
-  it('should emit the keyboardEvent stream when key events target the overlay', async(() => {
+  it('should emit the keyboardEvent stream when key events target the overlay', fakeAsync(() => {
     const dialogRef = dialog.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
 
     const spy = jasmine.createSpy('keyboardEvent spy');
@@ -302,7 +297,7 @@ describe('MatDialog', () => {
     });
   });
 
-  it('should notify the observers if all open dialogs have finished closing', async(() => {
+  it('should notify the observers if all open dialogs have finished closing', fakeAsync(() => {
     const ref1 = dialog.open(PizzaMsg, { viewContainerRef: testViewContainerRef });
     const ref2 = dialog.open(ContentElementDialog, { viewContainerRef: testViewContainerRef });
     const spy = jasmine.createSpy('afterAllClosed spy');
@@ -311,14 +306,14 @@ describe('MatDialog', () => {
 
     ref1.close();
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(spy).not.toHaveBeenCalled();
+    expect(spy).not.toHaveBeenCalled();
 
-      ref2.close();
-      viewContainerFixture.detectChanges();
-      viewContainerFixture.whenStable().then(() => expect(spy).toHaveBeenCalled());
-    });
+    ref2.close();
+    viewContainerFixture.detectChanges();
+    flush();
+    expect(spy).toHaveBeenCalled();
   }));
 
   it('should emit the afterAllClosed stream on subscribe if there are no open dialogs', () => {
@@ -522,7 +517,7 @@ describe('MatDialog', () => {
     expect(dialogRef.componentInstance.directionality.value).toBe('rtl');
   });
 
-  it('should close all of the dialogs', async(() => {
+  it('should close all of the dialogs', fakeAsync(() => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
@@ -531,10 +526,9 @@ describe('MatDialog', () => {
 
     dialog.closeAll();
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
-    });
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
   }));
 
   it('should set the proper animation states', () => {
@@ -549,7 +543,7 @@ describe('MatDialog', () => {
     expect(dialogContainer._state).toBe('exit');
   });
 
-  it('should close all dialogs when the user goes forwards/backwards in history', async(() => {
+  it('should close all dialogs when the user goes forwards/backwards in history', fakeAsync(() => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
 
@@ -557,13 +551,12 @@ describe('MatDialog', () => {
 
     mockLocation.simulateUrlPop('');
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
-    });
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
   }));
 
-  it('should close all open dialogs when the location hash changes', async(() => {
+  it('should close all open dialogs when the location hash changes', fakeAsync(() => {
     dialog.open(PizzaMsg);
     dialog.open(PizzaMsg);
 
@@ -571,10 +564,9 @@ describe('MatDialog', () => {
 
     mockLocation.simulateHashChange('');
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
-    });
+    expect(overlayContainerElement.querySelectorAll('mat-dialog-container').length).toBe(0);
   }));
 
   it('should have the componentInstance available in the afterClosed callback', fakeAsync(() => {
@@ -623,17 +615,16 @@ describe('MatDialog', () => {
     });
   });
 
-  it('should not keep a reference to the component after the dialog is closed', async(() => {
+  it('should not keep a reference to the component after the dialog is closed', fakeAsync(() => {
     let dialogRef = dialog.open(PizzaMsg);
 
     expect(dialogRef.componentInstance).toBeTruthy();
 
     dialogRef.close();
     viewContainerFixture.detectChanges();
+    flush();
 
-    viewContainerFixture.whenStable().then(() => {
-      expect(dialogRef.componentInstance).toBeFalsy('Expected reference to have been cleared.');
-    });
+    expect(dialogRef.componentInstance).toBeFalsy('Expected reference to have been cleared.');
   }));
 
   it('should assign a unique id to each dialog', () => {
@@ -687,7 +678,7 @@ describe('MatDialog', () => {
       expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeTruthy();
     });
 
-    it('should allow for the disableClose option to be updated while open', async(() => {
+    it('should allow for the disableClose option to be updated while open', fakeAsync(() => {
       let dialogRef = dialog.open(PizzaMsg, {
         disableClose: true,
         viewContainerRef: testViewContainerRef
@@ -702,11 +693,10 @@ describe('MatDialog', () => {
 
       dialogRef.disableClose = false;
       backdrop.click();
-
       viewContainerFixture.detectChanges();
-      viewContainerFixture.whenStable().then(() => {
-        expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeFalsy();
-      });
+      flush();
+
+      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeFalsy();
     }));
   });
 
@@ -877,20 +867,20 @@ describe('MatDialog', () => {
   describe('dialog content elements', () => {
     let dialogRef: MatDialogRef<ContentElementDialog>;
 
-    beforeEach(() => {
-      dialogRef = dialog.open(ContentElementDialog);
+    beforeEach(fakeAsync(() => {
+      dialogRef = dialog.open(ContentElementDialog, {viewContainerRef: testViewContainerRef});
       viewContainerFixture.detectChanges();
-    });
+      flush();
+    }));
 
-    it('should close the dialog when clicking on the close button', async(() => {
+    it('should close the dialog when clicking on the close button', fakeAsync(() => {
       expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(1);
 
       (overlayContainerElement.querySelector('button[mat-dialog-close]') as HTMLElement).click();
       viewContainerFixture.detectChanges();
+      flush();
 
-      viewContainerFixture.whenStable().then(() => {
-        expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(0);
-      });
+      expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(0);
     }));
 
     it('should not close the dialog if [mat-dialog-close] is applied on a non-button node', () => {
@@ -901,15 +891,14 @@ describe('MatDialog', () => {
       expect(overlayContainerElement.querySelectorAll('.mat-dialog-container').length).toBe(1);
     });
 
-    it('should allow for a user-specified aria-label on the close button', async(() => {
+    it('should allow for a user-specified aria-label on the close button', fakeAsync(() => {
       let button = overlayContainerElement.querySelector('button[mat-dialog-close]')!;
 
       dialogRef.componentInstance.closeButtonAriaLabel = 'Best close button ever';
       viewContainerFixture.detectChanges();
+      flush();
 
-      viewContainerFixture.whenStable().then(() => {
-        expect(button.getAttribute('aria-label')).toBe('Best close button ever');
-      });
+      expect(button.getAttribute('aria-label')).toBe('Best close button ever');
     }));
 
     it('should override the "type" attribute of the close button', () => {
@@ -918,27 +907,28 @@ describe('MatDialog', () => {
       expect(button.getAttribute('type')).toBe('button');
     });
 
-    it('should return the [mat-dialog-close] result when clicking the close button', async(() => {
-      let afterCloseCallback = jasmine.createSpy('afterClose callback');
-      dialogRef.afterClosed().subscribe(afterCloseCallback);
+    it('should return the [mat-dialog-close] result when clicking the close button',
+      fakeAsync(() => {
+        let afterCloseCallback = jasmine.createSpy('afterClose callback');
+        dialogRef.afterClosed().subscribe(afterCloseCallback);
 
-      (overlayContainerElement.querySelector('button.close-with-true') as HTMLElement).click();
-      viewContainerFixture.detectChanges();
+        (overlayContainerElement.querySelector('button.close-with-true') as HTMLElement).click();
+        viewContainerFixture.detectChanges();
+        flush();
 
-      viewContainerFixture.whenStable().then(() => {
         expect(afterCloseCallback).toHaveBeenCalledWith(true);
-      });
-    }));
+      }));
 
-    it('should set the aria-labelledby attribute to the id of the title', async(() => {
+    it('should set the aria-labelledby attribute to the id of the title', fakeAsync(() => {
       let title = overlayContainerElement.querySelector('[mat-dialog-title]')!;
       let container = overlayContainerElement.querySelector('mat-dialog-container')!;
 
-      viewContainerFixture.whenStable().then(() => {
-        expect(title.id).toBeTruthy('Expected title element to have an id.');
-        expect(container.getAttribute('aria-labelledby'))
-            .toBe(title.id, 'Expected the aria-labelledby to match the title id.');
-      });
+      flush();
+      viewContainerFixture.detectChanges();
+
+      expect(title.id).toBeTruthy('Expected title element to have an id.');
+      expect(container.getAttribute('aria-labelledby'))
+          .toBe(title.id, 'Expected the aria-labelledby to match the title id.');
     }));
 
   });
@@ -976,7 +966,7 @@ describe('MatDialog with a parent MatDialog', () => {
   let overlayContainerElement: HTMLElement;
   let fixture: ComponentFixture<ComponentThatProvidesMatDialog>;
 
-  beforeEach(async(() => {
+  beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [MatDialogModule, DialogTestModule],
       declarations: [ComponentThatProvidesMatDialog],
@@ -1005,24 +995,24 @@ describe('MatDialog with a parent MatDialog', () => {
   });
 
   it('should close dialogs opened by a parent when calling closeAll on a child MatDialog',
-    async(() => {
+    fakeAsync(() => {
       parentDialog.open(PizzaMsg);
       fixture.detectChanges();
+      flush();
 
       expect(overlayContainerElement.textContent)
           .toContain('Pizza', 'Expected a dialog to be opened');
 
       childDialog.closeAll();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        expect(overlayContainerElement.textContent!.trim())
-            .toBe('', 'Expected closeAll on child MatDialog to close dialog opened by parent');
-      });
+      expect(overlayContainerElement.textContent!.trim())
+          .toBe('', 'Expected closeAll on child MatDialog to close dialog opened by parent');
     }));
 
   it('should close dialogs opened by a child when calling closeAll on a parent MatDialog',
-    async(() => {
+    fakeAsync(() => {
       childDialog.open(PizzaMsg);
       fixture.detectChanges();
 
@@ -1031,22 +1021,20 @@ describe('MatDialog with a parent MatDialog', () => {
 
       parentDialog.closeAll();
       fixture.detectChanges();
+      flush();
 
-      fixture.whenStable().then(() => {
-        expect(overlayContainerElement.textContent!.trim())
-            .toBe('', 'Expected closeAll on parent MatDialog to close dialog opened by child');
-      });
+      expect(overlayContainerElement.textContent!.trim())
+          .toBe('', 'Expected closeAll on parent MatDialog to close dialog opened by child');
     }));
 
-  it('should close the top dialog via the escape key', async(() => {
+  it('should close the top dialog via the escape key', fakeAsync(() => {
     childDialog.open(PizzaMsg);
 
     dispatchKeyboardEvent(document.body, 'keydown', ESCAPE);
     fixture.detectChanges();
+    flush();
 
-    fixture.whenStable().then(() => {
-      expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
-    });
+    expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
   }));
 });
 

From e055b9f13c0fba0654abf6cb4e803930ec631efe Mon Sep 17 00:00:00 2001
From: Austin <amcdaniel2@gmail.com>
Date: Tue, 21 Nov 2017 11:01:05 -0600
Subject: [PATCH 539/575] docs: convert demos to stackblitz (#8546)

---
 scripts/deploy/publish-docs-content.sh | 6 +++---
 src/material-examples/example-data.ts  | 2 +-
 tools/gulp/tasks/docs.ts               | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/deploy/publish-docs-content.sh b/scripts/deploy/publish-docs-content.sh
index df470f4ae1f7..64b3c45c099c 100755
--- a/scripts/deploy/publish-docs-content.sh
+++ b/scripts/deploy/publish-docs-content.sh
@@ -40,7 +40,7 @@ git clone $repoUrl $repoPath --depth 1
 rm -rf $repoPath/*
 
 # Create folders that will contain docs content files.  
-mkdir $repoPath/{overview,guides,api,examples,plunker,examples-package}
+mkdir $repoPath/{overview,guides,api,examples,stackblitz,examples-package}
 
 # Copy api files over to $repoPath/api
 cp -r $docsPath/api/* $repoPath/api
@@ -75,8 +75,8 @@ done
 # Copy highlighted examples into $repoPath
 cp -r $examplesSource/* $repoPath/examples
 
-# Copy example plunker assets
-cp -r $docsPath/plunker/* $repoPath/plunker
+# Copy example stackblitz assets
+cp -r $docsPath/stackblitz/* $repoPath/stackblitz
 
 # Copies assets over to the docs-content repository.
 cp LICENSE $repoPath/
diff --git a/src/material-examples/example-data.ts b/src/material-examples/example-data.ts
index f053682199e4..78ebe29b6bb8 100644
--- a/src/material-examples/example-data.ts
+++ b/src/material-examples/example-data.ts
@@ -19,7 +19,7 @@ export class ExampleData {
 
   constructor(example: string) {
     if (example && EXAMPLE_COMPONENTS[example]) {
-      this.examplePath = `/assets/plunker/examples/${example}/`;
+      this.examplePath = `/assets/stackblitz/examples/${example}/`;
       // TODO(tinayuangao): Do not hard-code extensions
       this.exampleFiles = ['html', 'ts', 'css']
         .map((extension) => `${example}-example.${extension}`);
diff --git a/tools/gulp/tasks/docs.ts b/tools/gulp/tasks/docs.ts
index 0e381c95bb80..c043ba06dacf 100644
--- a/tools/gulp/tasks/docs.ts
+++ b/tools/gulp/tasks/docs.ts
@@ -80,7 +80,7 @@ task('docs', [
   'api-docs',
   'minified-api-docs',
   'build-examples-module',
-  'plunker-example-assets',
+  'stackblitz-example-assets',
 ]);
 
 /** Generates html files from the markdown overviews and guides for material. */
@@ -151,10 +151,10 @@ task('minified-api-docs', ['api-docs'], () => {
     .pipe(dest('dist/docs/api/'));
 });
 
-/** Copies example sources to be used as plunker assets for the docs site. */
-task('plunker-example-assets', () => {
+/** Copies example sources to be used as stackblitz assets for the docs site. */
+task('stackblitz-example-assets', () => {
   src(path.join(packagesDir, 'material-examples', '**/*'))
-      .pipe(dest(path.join(DIST_DOCS, 'plunker', 'examples')));
+      .pipe(dest(path.join(DIST_DOCS, 'stackblitz', 'examples')));
 });
 
 /** Updates the markdown file's content to work inside of the docs app. */

From 179445c6aba1fb03999b165e7fbb73946f59325c Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Tue, 21 Nov 2017 12:01:52 -0500
Subject: [PATCH 540/575] chore(demo-app): fix aligned menu triggers and add
 make page scrollable (#8280)

---
 src/demo-app/menu/menu-demo.html | 2 ++
 src/demo-app/menu/menu-demo.scss | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/demo-app/menu/menu-demo.html b/src/demo-app/menu/menu-demo.html
index 86c9baf2849d..2117fa4bc653 100644
--- a/src/demo-app/menu/menu-demo.html
+++ b/src/demo-app/menu/menu-demo.html
@@ -167,3 +167,5 @@
     </mat-menu>
   </div>
 </div>
+
+<div style="height: 500px">This div is for testing scrolled menus.</div>
diff --git a/src/demo-app/menu/menu-demo.scss b/src/demo-app/menu/menu-demo.scss
index f6757b40da9a..d86325747ecb 100644
--- a/src/demo-app/menu/menu-demo.scss
+++ b/src/demo-app/menu/menu-demo.scss
@@ -8,6 +8,6 @@
   }
 
   .end-icon {
-    align-items: flex-end;
+    justify-content: flex-end;
   }
 }

From 70aa3c2fa684f3915e013f3f0dd34e7e1cbd83b9 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 21 Nov 2017 09:02:14 -0800
Subject: [PATCH 541/575] chore: add guidance on getters/setters to coding
 standards (#7977)

---
 CODING_STANDARDS.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
index 46a16b6b31c7..e0b9da487df4 100644
--- a/CODING_STANDARDS.md
+++ b/CODING_STANDARDS.md
@@ -154,6 +154,24 @@ be part of the user-facing API. This typically applies to symbols used in templa
 Additionally, the `@docs-private` JsDoc annotation can be used to hide any symbol from the public
 API docs.
 
+
+#### Getters and Setters
+* Avoid long or complex getters and setters. If the logic of an accessor would take more than
+three lines, introduce a new method to contain the logic.
+* A getter should immediately precede its corresponding setter.
+* Decorators such as `@Input` should be applied to the getter and not the setter.
+* Always use a `readonly` property instead of a getter (with no setter) when possible.
+  ```ts
+  /** YES */
+  readonly active: boolean;
+
+  /** NO */
+  get active(): boolean {
+    // Using a getter solely to make the property read-only.
+    return this._active;
+  }
+  ```
+
 #### JsDoc comments
 
 All public APIs must have user-facing comments. These are extracted and shown in the documentation

From bd26e2ac227d734a66fd906e907306553dcc3c54 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 21 Nov 2017 09:02:57 -0800
Subject: [PATCH 542/575] docs(sidenav): update docs and add examples (#7775)

---
 src/lib/sidenav/README.md                     | 167 +-------------
 src/lib/sidenav/sidenav.md                    | 213 +++++++++++++-----
 src/material-examples/example-module.ts       |  60 ++++-
 .../sidenav-disable-close-example.css         |   7 +
 .../sidenav-disable-close-example.html        |  13 ++
 .../sidenav-disable-close-example.ts          |  21 ++
 .../sidenav-drawer-overview-example.css       |   6 +
 .../sidenav-drawer-overview-example.html      |   4 +
 .../sidenav-drawer-overview-example.ts        |   9 +
 .../sidenav-fab/sidenav-fab-example.css       |  26 ---
 .../sidenav-fab/sidenav-fab-example.html      |  32 ---
 .../sidenav-fab/sidenav-fab-example.ts        |  13 --
 .../sidenav-fixed/sidenav-fixed-example.css   |  29 +++
 .../sidenav-fixed/sidenav-fixed-example.html  |  26 +++
 .../sidenav-fixed/sidenav-fixed-example.ts    |  22 ++
 .../sidenav-mode/sidenav-mode-example.css     |  14 ++
 .../sidenav-mode/sidenav-mode-example.html    |  27 +++
 .../sidenav-mode/sidenav-mode-example.ts      |  14 ++
 .../sidenav-open-close-example.css            |  14 ++
 .../sidenav-open-close-example.html           |  17 ++
 .../sidenav-open-close-example.ts             |  13 ++
 .../sidenav-overview-example.css              |  19 +-
 .../sidenav-overview-example.html             |  16 +-
 .../sidenav-overview-example.ts               |   8 +-
 .../sidenav-position-example.css              |   7 +
 .../sidenav-position-example.html             |   7 +
 .../sidenav-position-example.ts               |  11 +
 .../sidenav-responsive-example.css            |  31 +++
 .../sidenav-responsive-example.html           |  22 ++
 .../sidenav-responsive-example.ts             |  35 +++
 30 files changed, 575 insertions(+), 328 deletions(-)
 create mode 100644 src/material-examples/sidenav-disable-close/sidenav-disable-close-example.css
 create mode 100644 src/material-examples/sidenav-disable-close/sidenav-disable-close-example.html
 create mode 100644 src/material-examples/sidenav-disable-close/sidenav-disable-close-example.ts
 create mode 100644 src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.css
 create mode 100644 src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.html
 create mode 100644 src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.ts
 delete mode 100644 src/material-examples/sidenav-fab/sidenav-fab-example.css
 delete mode 100644 src/material-examples/sidenav-fab/sidenav-fab-example.html
 delete mode 100644 src/material-examples/sidenav-fab/sidenav-fab-example.ts
 create mode 100644 src/material-examples/sidenav-fixed/sidenav-fixed-example.css
 create mode 100644 src/material-examples/sidenav-fixed/sidenav-fixed-example.html
 create mode 100644 src/material-examples/sidenav-fixed/sidenav-fixed-example.ts
 create mode 100644 src/material-examples/sidenav-mode/sidenav-mode-example.css
 create mode 100644 src/material-examples/sidenav-mode/sidenav-mode-example.html
 create mode 100644 src/material-examples/sidenav-mode/sidenav-mode-example.ts
 create mode 100644 src/material-examples/sidenav-open-close/sidenav-open-close-example.css
 create mode 100644 src/material-examples/sidenav-open-close/sidenav-open-close-example.html
 create mode 100644 src/material-examples/sidenav-open-close/sidenav-open-close-example.ts
 create mode 100644 src/material-examples/sidenav-position/sidenav-position-example.css
 create mode 100644 src/material-examples/sidenav-position/sidenav-position-example.html
 create mode 100644 src/material-examples/sidenav-position/sidenav-position-example.ts
 create mode 100644 src/material-examples/sidenav-responsive/sidenav-responsive-example.css
 create mode 100644 src/material-examples/sidenav-responsive/sidenav-responsive-example.html
 create mode 100644 src/material-examples/sidenav-responsive/sidenav-responsive-example.ts

diff --git a/src/lib/sidenav/README.md b/src/lib/sidenav/README.md
index 0601c9e29ef3..d9e0e12aab51 100644
--- a/src/lib/sidenav/README.md
+++ b/src/lib/sidenav/README.md
@@ -1,166 +1 @@
-**NOTE: The <code>mat-sidenav-layout</code> element is deprecated. <code>mat-sidenav-container</code>
-should be used instead.**
-
-
-# MatSidenav
-
-MatSidenav is the side navigation component for Angular Material. It is composed of two components: `<mat-sidenav-container>` and `<mat-sidenav>`.
-
-## Screenshots
-
-<img src="https://material.angularjs.org/material2_assets/sidenav-example.png">
-
-
-## `<mat-sidenav-container>`
-
-The parent component. Contains the code necessary to coordinate one or two sidenav and the backdrop.
-
-## `<mat-sidenav>`
-
-The sidenav panel.
-
-### Bound Properties
-
-| Name | Type | Description |
-| --- | --- | --- |
-| `position` | `"start"\|"end"` | The position of this sidenav. In LTR direction, `"start"` will be shown on the left, `"end"` on the right. In RTL, it is reversed. `"start"` is used by default. If there is more than 1 sidenav on either side the container will be considered invalid and none of the sidenavs will be visible or toggleable until the container is valid again. |
-| `mode` | `"over"\|"push"\|"side"` | The mode or styling of the sidenav, default being `"over"`. With `"over"` the sidenav will appear above the content, and a backdrop will be shown. With `"push"` the sidenav will push the content of the `<mat-sidenav-container>` to the side, and show a backdrop over it. `"side"` will resize the content and keep the sidenav opened. Clicking the backdrop will close sidenavs that do not have `mode="side"`. |
-| `opened` | `boolean` | Whether or not the sidenav is opened. Use this binding to open/close the sidenav. |
-
-### Events
-
-| Name | Description |
-| --- | --- |
-| `open-start` | Emitted when the sidenav is starting opening. This should only be used to coordinate animations. |
-| `close-start` | Emitted when the sidenav is starting closing. This should only be used to coordinate animations. |
-| `open` | Emitted when the sidenav is done opening. Use this for, e.g., setting focus on controls or updating state. |
-| `close` | Emitted when the sidenav is done closing. |
-
-### Methods
-
-| Signature | Description |
-| --- | --- |
-| `open(): Promise<void>` | Open the sidenav. Equivalent to `opened = true`. Returns a promise that will resolve when the animation completes, or be rejected if the animation was cancelled. |
-| `close(): Promise<void>` | Close the sidenav. Equivalent to `opened = false`. Returns a promise that will resolve when the animation completes, or be rejected if the animation was cancelled. |
-| `toggle(): Promise<void>` | Toggle the sidenav. This is equivalent to `opened = !opened`. Returns a promise that will resolve when the animation completes, or be rejected if the animation was cancelled. |
-
-### Notes
-
-The `<mat-sidenav>` will resize based on its content. You can also set its width in CSS, like so:
-
-```css
-mat-sidenav {
-  width: 200px;
-}
-```
-
-Try to avoid percent based width as `resize` events are not (yet) supported.
-
-## Examples
-
-Here's a simple example of using the sidenav:
-
-```html
-<app>
-  <mat-sidenav-container>
-    <mat-sidenav #start (open)="closeStartButton.focus()">
-      Start Sidenav.
-      <br>
-      <button mat-button #closeStartButton (click)="start.close()">Close</button>
-    </mat-sidenav>
-    <mat-sidenav #end position="end">
-      End Sidenav.
-      <button mat-button (click)="end.close()">Close</button>
-    </mat-sidenav>
-
-    My regular content. This will be moved into the proper DOM at runtime.
-    <button mat-button (click)="start.open()">Open start sidenav</button>
-    <button mat-button (click)="end.open()">Open end sidenav</button>
-
-  </mat-sidenav-container>
-</app>
-```
-
-For a fullscreen sidenav, the recommended approach is set up the DOM such that the
-`mat-sidenav-container` can naturally take up the full space:
-
-```html
-<app>
-  <mat-sidenav-container>
-    <mat-sidenav mode="side" opened="true">Drawer content</mat-sidenav>
-    <div class="my-content">Main content</div>
-  </mat-sidenav-container>
-</app>
-```
-```css
-html, body, material-app, mat-sidenav-container, .my-content {
-  margin: 0;
-  width: 100%;
-  height: 100%;
-}
-```
-
-For a sidenav with a FAB (or other floating element), the recommended approach is to place the FAB
-outside of the scrollable region and absolutely position it.
-
-```html
-<app>
-  <mat-sidenav-container class="my-container">
-    <mat-sidenav mode="side" opened="true">
-      <button mat-mini-fab class="my-fab">
-        <mat-icon>add</mat-icon>
-      </button>
-      <div class="my-scrolling-content">
-        Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus,
-        fusce vel in pellentesque. Nisl rutrum etiam morbi consectetuer tempor magna, aenean nullam
-        nunc id, neque vivamus interdum sociis nulla scelerisque sem, dolor id wisi turpis magna
-        aliquam magna. Risus accumsan hac eget etiam donec sed, senectus erat mattis quam, tempor
-        vel urna occaecat cras, metus urna augue nec at. Et morbi amet dui praesent, nec eu at,
-        ligula ipsum dui sollicitudin, quis nisl massa viverra ligula, mauris fermentum orci arcu
-        enim fringilla. Arcu erat nulla in aenean lacinia ullamcorper, urna ante nam et sagittis,
-        tristique vehicula nibh ipsum vivamus, proin proin. Porta commodo nibh quis libero amet.
-        Taciti dui, sapien consectetuer.
-      </div>
-    </mat-sidenav>
-    <button mat-mini-fab class="my-fab">
-      <mat-icon>add</mat-icon>
-    </button>
-    <div class="my-scrolling-content">
-      Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus, fusce
-      vel in pellentesque. Nisl rutrum etiam morbi consectetuer tempor magna, aenean nullam nunc id,
-      neque vivamus interdum sociis nulla scelerisque sem, dolor id wisi turpis magna aliquam magna.
-      Risus accumsan hac eget etiam donec sed, senectus erat mattis quam, tempor vel urna occaecat
-      cras, metus urna augue nec at. Et morbi amet dui praesent, nec eu at, ligula ipsum dui
-      sollicitudin, quis nisl massa viverra ligula, mauris fermentum orci arcu enim fringilla. Arcu
-      erat nulla in aenean lacinia ullamcorper, urna ante nam et sagittis, tristique vehicula nibh
-      ipsum vivamus, proin proin. Porta commodo nibh quis libero amet. Taciti dui, sapien
-      consectetuer.
-    </div>
-  </mat-sidenav-container>
-</app>
-```
-```css
-.my-container {
-  width: 500px;
-  height: 300px;
-}
-
-.my-container .mat-sidenav {
-  max-width: 200px;
-}
-
-.my-container .mat-sidenav-content,
-.my-container mat-sidenav {
-  display: flex;
-}
-
-.my-scrolling-content {
-  overflow: auto;
-}
-
-button.my-fab {
-  position: absolute;
-  right: 20px;
-  bottom: 10px;
-}
-```
+Please see the official documentation at https://material.angular.io/components/component/sidenav
diff --git a/src/lib/sidenav/sidenav.md b/src/lib/sidenav/sidenav.md
index cdbcaff0baa8..139c40616ece 100644
--- a/src/lib/sidenav/sidenav.md
+++ b/src/lib/sidenav/sidenav.md
@@ -1,44 +1,140 @@
-`<mat-sidenav>` is a panel that can be placed next to or above some primary content. A sidenav is
-typically used for navigation, but can contain any content.
+Angular Material provides two sets of components designed to add collapsible side content (often
+navigation, though it can be any content) alongside some primary content. These are the sidenav and
+drawer components.
+
+The sidenav components are designed to add side content to a fullscreen app. To set up a sidenav we
+use three components: `<mat-sidenav-container>` which acts as a structural container for our content
+and sidenav, `<mat-sidenav-content>` which represents the main content, and `<mat-sidenav>` which
+represents the added side content.
 
 <!-- example(sidenav-overview) -->
 
-The sidenav and its associated content live inside of an `<mat-sidenav-container>`:
+The drawer component is designed to add side content to a small section of your app. This is
+accomplished using the `<mat-drawer-container>`, `<mat-drawer-content>`, and `<mat-drawer>`
+components, which are analogous to their sidenav equivalents. Rather than adding side content to the
+app as a whole, these are designed to add side content to a small section of your app. They support
+almost all of the same features, but do not support fixed positioning.
+
+<!-- example(sidenav-drawer-overview) -->
+
+### Specifying the main and side content
+
+Both the main and side content should be placed inside of the `<mat-sidenav-container>`, content
+that you don't want to be affected by the sidenav, such as a header or footer, can be placed outside
+of the container.
+
+The side content should be wrapped in a `<mat-sidenav>` element. The `position` property can be used
+to specify which end of the main content to place the side content on. `position` can be either
+`start` or `end` which places the side content on the left or right respectively in left-to-right
+languages. If the `position` is not set, the default value of `start` will be assumed. A
+`<mat-sidenav-container>` can have up to two `<mat-sidenav>` elements total, but only one for any
+given side.
+
+The main content should be wrapped in a `<mat-sidenav-content>`. If no `<mat-sidenav-content>` is
+specified for a `<mat-sidenav-container>`, one will be created implicitly and all of the content
+inside the `<mat-sidenav-container>` other than the `<mat-sidenav>` elements will be placed inside
+of it.
+
+<!-- example(sidenav-position) -->
+
+The following are examples of valid sidenav layouts:
+
 ```html
+<!-- Creates a layout with a left-positioned sidenav and explicit content. -->
 <mat-sidenav-container>
-  <mat-sidenav>
-    <!-- sidenav content -->
-  </mat-sidenav>
+  <mat-sidenav>Start</mat-sidenav>
+  <mat-sidenav-content>Main</mat-sidenav-content>
+</mat-sidenav-container>
+```
 
-  <!-- primary content -->
+```html
+<!-- Creates a layout with a left and right sidenav and implicit content. -->
+<mat-sidenav-container>
+  <mat-sidenav>Start</mat-sidenav>
+  <mat-sidenav position="end">End</mat-sidenav>
+  <section>Main</section>
 </mat-sidenav-container>
 ```
 
-A sidenav container may contain one or two `<mat-sidenav>` elements. When there are two 
-`<mat-sidenav>` elements, each must be placed on a different side of the container.
-See the section on positioning below.
+```html
+<!-- Creates an empty sidenav container with no sidenavs and implicit empty content. -->
+<mat-sidenav-container></mat-sidenav-container>
+```
+
+And these are examples of invalid sidenav layouts:
+
+```html
+<!-- Invalid because there are two `start` position sidenavs. -->
+<mat-sidenav-container>
+  <mat-sidenav>Start</mat-sidenav>
+  <mat-sidenav position="start">Start 2</mat-sidenav>
+</mat-sidenav-container>
+```
+
+```html
+<!-- Invalid because there are multiple `<mat-sidenav-content>` elements. -->
+<mat-sidenav-container>
+  <mat-sidenav-content>Main</mat-sidenav-content>
+  <mat-sidenav-content>Main 2</mat-sidenav-content>
+</mat-sidenav-container>
+```
+
+```html
+<!-- Invalid because the `<mat-sidenav>` is outside of the `<mat-sidenav-container>`. -->
+<mat-sidenav-container></mat-sidenav-container>
+<mat-sidenav></mat-sidenav>
+```
+
+These same rules all apply to the drawer components as well.
+
+### Opening and closing a sidenav
+
+A `<mat-sidenav>` can be opened or closed using the `open()`, `close()` and `toggle()` methods. Each
+of these methods returns a `Promise<boolean>` that will be resolved with `true` when the sidenav
+finishes opening or `false` when it finishes closing.
+
+The opened state can also be set via a property binding in the template using the `opened` property.
+The property supports 2-way binding.
+
+`<mat-sidenav>` also supports output properties for just open and just close events, The `(opened)`
+and `(closed)` properties respectively.
+
+<!-- example(sidenav-open-close) -->
+
+All of these properties and methods work on `<mat-drawer>` as well.
+
+### Changing the sidenav's behavior
 
-### Sidenav mode
-The sidenav can render in one of three different ways based on the `mode` property.
+The `<mat-sidenav>` can render in one of three different ways based on the `mode` property.
 
-| Mode | Description                                                                               |
-|------|-------------------------------------------------------------------------------------------|
-| over | Sidenav floats _over_ the primary content, which is covered by a backdrop                 |
-| push | Sidenav _pushes_ the primary content out of its way, also covering it with a backdrop     |
-| side | Sidenav appears _side-by-side_ with the primary content                                   |
+| Mode   | Description                                                                             |
+|--------|-----------------------------------------------------------------------------------------|
+| `over` | Sidenav floats over the primary content, which is covered by a backdrop               |
+| `push` | Sidenav pushes the primary content out of its way, also covering it with a backdrop   |
+| `side` | Sidenav appears side-by-side with the main content, shrinking the main content's width to make space for the sidenav. |
 
-Using the `side` mode on mobile devices can affect the performance and is also not recommended by the
-[Material Design specification](https://material.io/guidelines/patterns/navigation-drawer.html#navigation-drawer-behavior).
+If no `mode` is specified, `over` is used by default.
 
-### Positioning the sidenav
-The `position` property determines whether the sidenav appears at the `"start"` or `"end"` of the
-container. This is affected by the current text direction ("ltr" or "rtl"). By default, the sidenav
-appears at the start of the container.
+<!-- example(sidenav-mode) -->
 
+`<mat-drawer>` also supports all of these same modes.
 
-### Sizing the sidenav
-The `<mat-sidenav>` will, by default, fit the size of its content. The width can be explicitly set
-via CSS:
+### Disabling automatic close
+
+Clicking on the backdrop or pressing the <kbd>Esc</kbd> key will normally close an open sidenav.
+However, this automatic closing behavior can be disabled by setting the `disableClose` property on
+the `<mat-sidenav>` or `<mat-drawer>` that you want to disable the behavior for.
+
+Custom handling for <kbd>Esc</kbd> can be done by adding a keydown listener to the `<mat-sidenav>`.
+Custom handling for backdrop clicks can be done via the `(backdropClick)` output property on
+`<mat-sidenav-container>`.
+
+<!-- example(sidenav-disable-close) -->
+
+### Setting the sidenav's size
+
+The `<mat-sidenav>` and `<mat-drawer>` will, by default, fit the size of its content. The width can
+be explicitly set via CSS:
 
 ```css
 mat-sidenav {
@@ -48,37 +144,42 @@ mat-sidenav {
 
 Try to avoid percent based width as `resize` events are not (yet) supported.
 
-For a fullscreen sidenav, the recommended approach is set up the DOM such that the
-`<mat-sidenav-container>` can naturally take up the full space:
+### Fixed position sidenavs
 
-```html
-<app>
-  <mat-sidenav-container>
-    <mat-sidenav mode="side" opened="true">Drawer content</mat-sidenav>
-    <div class="my-content">Main content</div>
-  </mat-sidenav-container>
-</app>
-```
-```css
-html, body, material-app, mat-sidenav-container, .my-content {
-  margin: 0;
-  width: 100%;
-  height: 100%;
-}
-```
+For `<mat-sidenav>` only (not `<mat-drawer>`) fixed positioning is supported. It can be enabled by
+setting the `fixedInViewport` property. Additionally, top and bottom space can be set via the
+`fixedTopGap` and `fixedBottomGap`. These properties accept a pixel value amount of space to add at
+the top or bottom.
 
-### FABs inside sidenav
-For a sidenav with a FAB (Floating Action Button) or other floating element, the recommended approach is to place the FAB
-outside of the scrollable region and absolutely position it.
+<!-- example(sidenav-fixed) -->
 
+### Creating a responsive layout for mobile & desktop
 
-### Disabling closing of sidenav
-By default, sidenav can be closed either by clicking on the backdrop or by pressing <kbd>ESCAPE</kbd>.
-The `disableClose` attribute can be set on `mat-sidenav` to disable automatic closing when the backdrop
-is clicked or <kbd>ESCAPE</kbd> is pressed. To add custom logic on backdrop click, add a `(backdropClick)` listener to
-`mat-sidenav-container`. For custom <kbd>ESCAPE</kbd> logic, a standard `(keydown)` listener will suffice.
-```html
-<mat-sidenav-container (backdropClick)="customBackdropClickHandler()">
-  <mat-sidenav disableClose (keydown)="customKeydownHandler($event)"></mat-sidenav>
-</mat-sidenav-container>
-```
+A sidenav often needs to behave differently on a mobile vs a desktop display. On a desktop, it may
+make sense to have just the content section scroll. However, on mobile you often want the body to be
+the element that scrolls; this allows the address bar to auto-hide. The sidenav can be styled with
+CSS to adjust to either type of device. 
+
+<!-- example(sidenav-responsive) -->
+
+### Accessibility
+
+The `<mat-sidenav>` an `<mat-sidenav-content>` should each be given an appropriate `role` attribute
+depending on the context in which they are used.
+
+For example, a `<mat-sidenav>` that contains links
+to other pages might be marked `role="navigation"`, whereas one that contains a table of
+contents about might be marked as `role="directory"`. If there is no more specific role that
+describes your sidenav, `role="region"` is recommended.
+
+Similarly, the `<mat-sidenav-content>` should be given a role based on what it contains. If it
+represents the primary content of the page, it may make sense to mark it `role="main"`. If no more
+specific role makes sense, `role="region"` is again a good fallback. 
+
+### Troubleshooting
+
+#### Error: A drawer was already declared for 'position="..."'
+
+This error is thrown if you have more than one sidenav or drawer in a given container with the same
+`position`. The `position` property defaults to `start`, so the issue may just be that you forgot to
+mark the `end` sidenav with `position="end"`.
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 9413d147d9d8..868749123e63 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -96,8 +96,14 @@ import {SelectOverviewExample} from './select-overview/select-overview-example';
 import {SelectPanelClassExample} from './select-panel-class/select-panel-class-example';
 import {SelectResetExample} from './select-reset/select-reset-example';
 import {SelectValueBindingExample} from './select-value-binding/select-value-binding-example';
-import {SidenavFabExample} from './sidenav-fab/sidenav-fab-example';
+import {SidenavDisableCloseExample} from './sidenav-disable-close/sidenav-disable-close-example';
+import {SidenavDrawerOverviewExample} from './sidenav-drawer-overview/sidenav-drawer-overview-example';
+import {SidenavFixedExample} from './sidenav-fixed/sidenav-fixed-example';
+import {SidenavModeExample} from './sidenav-mode/sidenav-mode-example';
+import {SidenavOpenCloseExample} from './sidenav-open-close/sidenav-open-close-example';
 import {SidenavOverviewExample} from './sidenav-overview/sidenav-overview-example';
+import {SidenavPositionExample} from './sidenav-position/sidenav-position-example';
+import {SidenavResponsiveExample} from './sidenav-responsive/sidenav-responsive-example';
 import {SlideToggleConfigurableExample} from './slide-toggle-configurable/slide-toggle-configurable-example';
 import {SlideToggleFormsExample} from './slide-toggle-forms/slide-toggle-forms-example';
 import {SlideToggleOverviewExample} from './slide-toggle-overview/slide-toggle-overview-example';
@@ -620,18 +626,54 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
-  'sidenav-fab': {
-    title: 'Sidenav with a FAB',
-    component: SidenavFabExample,
+  'sidenav-disable-close': {
+    title: 'Sidenav with custom escape and backdrop click behavior ',
+    component: SidenavDisableCloseExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'sidenav-drawer-overview': {
+    title: 'Basic drawer ',
+    component: SidenavDrawerOverviewExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'sidenav-fixed': {
+    title: 'Fixed sidenav ',
+    component: SidenavFixedExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'sidenav-mode': {
+    title: 'Sidenav with configurable mode ',
+    component: SidenavModeExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'sidenav-open-close': {
+    title: 'Sidenav open & close behavior ',
+    component: SidenavOpenCloseExample,
     additionalFiles: null,
     selectorName: null
   },
   'sidenav-overview': {
-    title: 'Basic sidenav',
+    title: 'Basic sidenav ',
     component: SidenavOverviewExample,
     additionalFiles: null,
     selectorName: null
   },
+  'sidenav-position': {
+    title: 'Implicit main content with two sidenavs ',
+    component: SidenavPositionExample,
+    additionalFiles: null,
+    selectorName: null
+  },
+  'sidenav-responsive': {
+    title: 'Responsive sidenav ',
+    component: SidenavResponsiveExample,
+    additionalFiles: null,
+    selectorName: null
+  },
   'slide-toggle-configurable': {
     title: 'Configurable slide-toggle',
     component: SlideToggleConfigurableExample,
@@ -850,8 +892,14 @@ export const EXAMPLE_LIST = [
   SelectPanelClassExample,
   SelectResetExample,
   SelectValueBindingExample,
-  SidenavFabExample,
+  SidenavDisableCloseExample,
+  SidenavDrawerOverviewExample,
+  SidenavFixedExample,
+  SidenavModeExample,
+  SidenavOpenCloseExample,
   SidenavOverviewExample,
+  SidenavPositionExample,
+  SidenavResponsiveExample,
   SlideToggleConfigurableExample,
   SlideToggleFormsExample,
   SlideToggleOverviewExample,
diff --git a/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.css b/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.css
new file mode 100644
index 000000000000..bbb6e4d125d5
--- /dev/null
+++ b/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.css
@@ -0,0 +1,7 @@
+.example-container {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
diff --git a/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.html b/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.html
new file mode 100644
index 000000000000..3e31d7906011
--- /dev/null
+++ b/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.html
@@ -0,0 +1,13 @@
+<mat-sidenav-container
+    class="example-container" (backdropClick)="close('backdrop')" *ngIf="shouldRun">
+  <mat-sidenav #sidenav (keydown.escape)="close('escape')" disableClose>
+    <p><button mat-button (click)="close('toggle button')">Toggle</button></p>
+  </mat-sidenav>
+
+  <mat-sidenav-content>
+    <p><button mat-button (click)="sidenav.open()">Open</button></p>
+    <p>Closed due to: {{reason}}</p>
+  </mat-sidenav-content>
+</mat-sidenav-container>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.ts b/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.ts
new file mode 100644
index 000000000000..db846639fc6e
--- /dev/null
+++ b/src/material-examples/sidenav-disable-close/sidenav-disable-close-example.ts
@@ -0,0 +1,21 @@
+import {Component, ViewChild} from '@angular/core';
+import {MatSidenav} from '@angular/material/sidenav';
+
+/** @title Sidenav with custom escape and backdrop click behavior */
+@Component({
+  selector: 'sidenav-disable-close-example',
+  templateUrl: 'sidenav-disable-close-example.html',
+  styleUrls: ['sidenav-disable-close-example.css'],
+})
+export class SidenavDisableCloseExample {
+  @ViewChild('sidenav') sidenav: MatSidenav;
+
+  reason = '';
+
+  close(reason: string) {
+    this.reason = reason;
+    this.sidenav.close();
+  }
+
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}
diff --git a/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.css b/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.css
new file mode 100644
index 000000000000..d0bcca980f2f
--- /dev/null
+++ b/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.css
@@ -0,0 +1,6 @@
+.example-container {
+  width: 400px;
+  height: 200px;
+  margin: 10px;
+  border: 1px solid #555;
+}
diff --git a/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.html b/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.html
new file mode 100644
index 000000000000..2dca0fd6723a
--- /dev/null
+++ b/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.html
@@ -0,0 +1,4 @@
+<mat-drawer-container class="example-container">
+  <mat-drawer mode="side" opened="true">Drawer content</mat-drawer>
+  <mat-drawer-content>Main content</mat-drawer-content>
+</mat-drawer-container>
diff --git a/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.ts b/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.ts
new file mode 100644
index 000000000000..e60b6f300883
--- /dev/null
+++ b/src/material-examples/sidenav-drawer-overview/sidenav-drawer-overview-example.ts
@@ -0,0 +1,9 @@
+import {Component} from '@angular/core';
+
+/** @title Basic drawer */
+@Component({
+  selector: 'sidenav-drawer-overview-example',
+  templateUrl: 'sidenav-drawer-overview-example.html',
+  styleUrls: ['sidenav-drawer-overview-example.css'],
+})
+export class SidenavDrawerOverviewExample {}
diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.css b/src/material-examples/sidenav-fab/sidenav-fab-example.css
deleted file mode 100644
index 80b88561b599..000000000000
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.example-sidenav-fab-container {
-  width: 500px;
-  height: 300px;
-  border: 1px solid rgba(0, 0, 0, 0.5);
-}
-
-.example-sidenav-fab-container mat-sidenav {
-  max-width: 200px;
-}
-
-.example-sidenav-fab-container .mat-sidenav-content,
-.example-sidenav-fab-container mat-sidenav {
-  display: flex;
-  overflow: visible;
-}
-
-.example-scrolling-content {
-  overflow: auto;
-  height: 100%;
-}
-
-.example-fab.mat-mini-fab {
-  position: absolute;
-  right: 20px;
-  bottom: 10px;
-}
diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.html b/src/material-examples/sidenav-fab/sidenav-fab-example.html
deleted file mode 100644
index 9053ced258a3..000000000000
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<mat-sidenav-container class="example-sidenav-fab-container">
-  <mat-sidenav #sidenav mode="side" opened="true">
-    <button mat-mini-fab class="example-fab" (click)="sidenav.toggle()">
-      <mat-icon>add</mat-icon>
-    </button>
-    <div class="example-scrolling-content">
-      Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus,
-      fusce vel in pellentesque. Nisl rutrum etiam morbi consectetuer tempor magna, aenean nullam
-      nunc id, neque vivamus interdum sociis nulla scelerisque sem, dolor id wisi turpis magna
-      aliquam magna. Risus accumsan hac eget etiam donec sed, senectus erat mattis quam, tempor
-      vel urna occaecat cras, metus urna augue nec at. Et morbi amet dui praesent, nec eu at,
-      ligula ipsum dui sollicitudin, quis nisl massa viverra ligula, mauris fermentum orci arcu
-      enim fringilla. Arcu erat nulla in aenean lacinia ullamcorper, urna ante nam et sagittis,
-      tristique vehicula nibh ipsum vivamus, proin proin. Porta commodo nibh quis libero amet.
-      Taciti dui, sapien consectetuer.
-    </div>
-  </mat-sidenav>
-  <button mat-mini-fab class="example-fab" (click)="sidenav.toggle()">
-    <mat-icon>add</mat-icon>
-  </button>
-  <div class="example-scrolling-content">
-    Lorem ipsum dolor sit amet, pede a libero aenean phasellus, lectus metus sint ut risus, fusce
-    vel in pellentesque. Nisl rutrum etiam morbi consectetuer tempor magna, aenean nullam nunc id,
-    neque vivamus interdum sociis nulla scelerisque sem, dolor id wisi turpis magna aliquam magna.
-    Risus accumsan hac eget etiam donec sed, senectus erat mattis quam, tempor vel urna occaecat
-    cras, metus urna augue nec at. Et morbi amet dui praesent, nec eu at, ligula ipsum dui
-    sollicitudin, quis nisl massa viverra ligula, mauris fermentum orci arcu enim fringilla. Arcu
-    erat nulla in aenean lacinia ullamcorper, urna ante nam et sagittis, tristique vehicula nibh
-    ipsum vivamus, proin proin. Porta commodo nibh quis libero amet. Taciti dui, sapien
-    consectetuer.
-  </div>
-</mat-sidenav-container>
diff --git a/src/material-examples/sidenav-fab/sidenav-fab-example.ts b/src/material-examples/sidenav-fab/sidenav-fab-example.ts
deleted file mode 100644
index 4af25f478ac0..000000000000
--- a/src/material-examples/sidenav-fab/sidenav-fab-example.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {Component, ViewEncapsulation} from '@angular/core';
-
-/**
- * @title Sidenav with a FAB
- */
-@Component({
-  selector: 'sidenav-fab-example',
-  templateUrl: 'sidenav-fab-example.html',
-  styleUrls: ['sidenav-fab-example.css'],
-  encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
-})
-export class SidenavFabExample {}
diff --git a/src/material-examples/sidenav-fixed/sidenav-fixed-example.css b/src/material-examples/sidenav-fixed/sidenav-fixed-example.css
new file mode 100644
index 000000000000..80ee151fecae
--- /dev/null
+++ b/src/material-examples/sidenav-fixed/sidenav-fixed-example.css
@@ -0,0 +1,29 @@
+.example-container {
+  position: absolute;
+  top: 60px;
+  bottom: 60px;
+  left: 0;
+  right: 0;
+}
+
+.example-sidenav {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 200px;
+  background: rgba(255, 0, 0, 0.5);
+}
+
+.example-header {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+}
+
+.example-footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
diff --git a/src/material-examples/sidenav-fixed/sidenav-fixed-example.html b/src/material-examples/sidenav-fixed/sidenav-fixed-example.html
new file mode 100644
index 000000000000..34ae66792f69
--- /dev/null
+++ b/src/material-examples/sidenav-fixed/sidenav-fixed-example.html
@@ -0,0 +1,26 @@
+<ng-container *ngIf="shouldRun">
+  <mat-toolbar class="example-header">Header</mat-toolbar>
+
+  <mat-sidenav-container class="example-container">
+    <mat-sidenav #sidenav mode="side" opened="true" class="example-sidenav"
+                 [fixedInViewport]="options.value.fixed" [fixedTopGap]="options.value.top"
+                 [fixedBottomGap]="options.value.bottom">
+      {{options.value.fixed ? 'Fixed' : 'Non-fixed'}} Sidenav
+    </mat-sidenav>
+
+    <mat-sidenav-content [formGroup]="options">
+      <p><mat-checkbox formControlName="fixed">Fixed</mat-checkbox></p>
+      <p><mat-form-field>
+        <input matInput type="number" formControlName="top" placeholder="Top gap">
+      </mat-form-field></p>
+      <p><mat-form-field>
+        <input matInput type="number" formControlName="bottom" placeholder="Bottom gap">
+      </mat-form-field></p>
+      <p><button mat-button (click)="sidenav.toggle()">Toggle</button></p>
+    </mat-sidenav-content>
+  </mat-sidenav-container>
+
+  <mat-toolbar class="example-footer">Footer</mat-toolbar>
+</ng-container>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-fixed/sidenav-fixed-example.ts b/src/material-examples/sidenav-fixed/sidenav-fixed-example.ts
new file mode 100644
index 000000000000..910987f44e14
--- /dev/null
+++ b/src/material-examples/sidenav-fixed/sidenav-fixed-example.ts
@@ -0,0 +1,22 @@
+import {Component} from '@angular/core';
+import {FormBuilder, FormGroup} from '@angular/forms';
+
+/** @title Fixed sidenav */
+@Component({
+  selector: 'sidenav-fixed-example',
+  templateUrl: 'sidenav-fixed-example.html',
+  styleUrls: ['sidenav-fixed-example.css'],
+})
+export class SidenavFixedExample {
+  options: FormGroup;
+
+  constructor(fb: FormBuilder) {
+    this.options = fb.group({
+      'fixed': false,
+      'top': 0,
+      'bottom': 0,
+    });
+  }
+
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}
diff --git a/src/material-examples/sidenav-mode/sidenav-mode-example.css b/src/material-examples/sidenav-mode/sidenav-mode-example.css
new file mode 100644
index 000000000000..cd425d420f9c
--- /dev/null
+++ b/src/material-examples/sidenav-mode/sidenav-mode-example.css
@@ -0,0 +1,14 @@
+.example-container {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+.example-radio-group {
+  display: block;
+  border: 1px solid #555;
+  margin: 20px;
+  padding: 10px;
+}
diff --git a/src/material-examples/sidenav-mode/sidenav-mode-example.html b/src/material-examples/sidenav-mode/sidenav-mode-example.html
new file mode 100644
index 000000000000..914beb053760
--- /dev/null
+++ b/src/material-examples/sidenav-mode/sidenav-mode-example.html
@@ -0,0 +1,27 @@
+<mat-sidenav-container class="example-container" *ngIf="shouldRun">
+  <mat-sidenav #sidenav [mode]="mode.value">
+    <p><button mat-button (click)="sidenav.toggle()">Toggle</button></p>
+    <p>
+      <mat-radio-group class="example-radio-group" [formControl]="mode">
+        <label>Mode:</label>
+        <mat-radio-button value="over">Over</mat-radio-button>
+        <mat-radio-button value="side">Side</mat-radio-button>
+        <mat-radio-button value="push">Push</mat-radio-button>
+      </mat-radio-group>
+    </p>
+  </mat-sidenav>
+
+  <mat-sidenav-content>
+    <p><button mat-button (click)="sidenav.toggle()">Toggle</button></p>
+    <p>
+      <mat-radio-group class="example-radio-group" [formControl]="mode">
+        <label>Mode:</label>
+        <mat-radio-button value="over">Over</mat-radio-button>
+        <mat-radio-button value="side">Side</mat-radio-button>
+        <mat-radio-button value="push">Push</mat-radio-button>
+      </mat-radio-group>
+    </p>
+  </mat-sidenav-content>
+</mat-sidenav-container>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-mode/sidenav-mode-example.ts b/src/material-examples/sidenav-mode/sidenav-mode-example.ts
new file mode 100644
index 000000000000..790ba5d2641c
--- /dev/null
+++ b/src/material-examples/sidenav-mode/sidenav-mode-example.ts
@@ -0,0 +1,14 @@
+import {Component} from '@angular/core';
+import {FormControl} from '@angular/forms';
+
+/** @title Sidenav with configurable mode */
+@Component({
+  selector: 'sidenav-mode-example',
+  templateUrl: 'sidenav-mode-example.html',
+  styleUrls: ['sidenav-mode-example.css'],
+})
+export class SidenavModeExample {
+  mode = new FormControl('over');
+
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}
diff --git a/src/material-examples/sidenav-open-close/sidenav-open-close-example.css b/src/material-examples/sidenav-open-close/sidenav-open-close-example.css
new file mode 100644
index 000000000000..5b1c758d33f9
--- /dev/null
+++ b/src/material-examples/sidenav-open-close/sidenav-open-close-example.css
@@ -0,0 +1,14 @@
+.example-container {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+.example-events {
+  width: 300px;
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #555;
+}
diff --git a/src/material-examples/sidenav-open-close/sidenav-open-close-example.html b/src/material-examples/sidenav-open-close/sidenav-open-close-example.html
new file mode 100644
index 000000000000..cbd4e985ccb1
--- /dev/null
+++ b/src/material-examples/sidenav-open-close/sidenav-open-close-example.html
@@ -0,0 +1,17 @@
+<mat-sidenav-container class="example-container" *ngIf="shouldRun">
+  <mat-sidenav #sidenav mode="side" [(opened)]="opened" (opened)="events.push('open!')"
+               (closed)="events.push('close!')">
+    Sidenav content
+  </mat-sidenav>
+
+  <mat-sidenav-content>
+    <p><mat-checkbox [(ngModel)]="opened">sidenav.opened</mat-checkbox></p>
+    <p><button mat-button (click)="sidenav.toggle()">sidenav.toggle()</button></p>
+    <p>Events:</p>
+    <div class="example-events">
+      <div *ngFor="let e of events">{{e}}</div>
+    </div>
+  </mat-sidenav-content>
+</mat-sidenav-container>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-open-close/sidenav-open-close-example.ts b/src/material-examples/sidenav-open-close/sidenav-open-close-example.ts
new file mode 100644
index 000000000000..05d50e563018
--- /dev/null
+++ b/src/material-examples/sidenav-open-close/sidenav-open-close-example.ts
@@ -0,0 +1,13 @@
+import {Component} from '@angular/core';
+
+/** @title Sidenav open & close behavior */
+@Component({
+  selector: 'sidenav-open-close-example',
+  templateUrl: 'sidenav-open-close-example.html',
+  styleUrls: ['sidenav-open-close-example.css'],
+})
+export class SidenavOpenCloseExample {
+  events = [];
+
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}
diff --git a/src/material-examples/sidenav-overview/sidenav-overview-example.css b/src/material-examples/sidenav-overview/sidenav-overview-example.css
index 8ab00588bb34..bbb6e4d125d5 100644
--- a/src/material-examples/sidenav-overview/sidenav-overview-example.css
+++ b/src/material-examples/sidenav-overview/sidenav-overview-example.css
@@ -1,16 +1,7 @@
 .example-container {
-  width: 500px;
-  height: 300px;
-  border: 1px solid rgba(0, 0, 0, 0.5);
-}
-
-.example-sidenav-content {
-  display: flex;
-  height: 100%;
-  align-items: center;
-  justify-content: center;
-}
-
-.example-sidenav {
-  padding: 20px;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
 }
diff --git a/src/material-examples/sidenav-overview/sidenav-overview-example.html b/src/material-examples/sidenav-overview/sidenav-overview-example.html
index 9069c886c896..ead38a51451e 100644
--- a/src/material-examples/sidenav-overview/sidenav-overview-example.html
+++ b/src/material-examples/sidenav-overview/sidenav-overview-example.html
@@ -1,12 +1,6 @@
-<mat-sidenav-container class="example-container">
-  <mat-sidenav #sidenav class="example-sidenav">
-    Jolly good!
-  </mat-sidenav>
-
-  <div class="example-sidenav-content">
-    <button type="button" mat-button (click)="sidenav.open()">
-      Open sidenav
-    </button>
-  </div>
-
+<mat-sidenav-container class="example-container" *ngIf="shouldRun">
+  <mat-sidenav mode="side" opened="true">Sidenav content</mat-sidenav>
+  <mat-sidenav-content>Main content</mat-sidenav-content>
 </mat-sidenav-container>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-overview/sidenav-overview-example.ts b/src/material-examples/sidenav-overview/sidenav-overview-example.ts
index 5496f3f45fee..8222f8b9e56c 100644
--- a/src/material-examples/sidenav-overview/sidenav-overview-example.ts
+++ b/src/material-examples/sidenav-overview/sidenav-overview-example.ts
@@ -1,11 +1,11 @@
 import {Component} from '@angular/core';
 
-/**
- * @title Basic sidenav
- */
+/** @title Basic sidenav */
 @Component({
   selector: 'sidenav-overview-example',
   templateUrl: 'sidenav-overview-example.html',
   styleUrls: ['sidenav-overview-example.css'],
 })
-export class SidenavOverviewExample {}
+export class SidenavOverviewExample {
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}
diff --git a/src/material-examples/sidenav-position/sidenav-position-example.css b/src/material-examples/sidenav-position/sidenav-position-example.css
new file mode 100644
index 000000000000..bbb6e4d125d5
--- /dev/null
+++ b/src/material-examples/sidenav-position/sidenav-position-example.css
@@ -0,0 +1,7 @@
+.example-container {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
diff --git a/src/material-examples/sidenav-position/sidenav-position-example.html b/src/material-examples/sidenav-position/sidenav-position-example.html
new file mode 100644
index 000000000000..9d2c7280df01
--- /dev/null
+++ b/src/material-examples/sidenav-position/sidenav-position-example.html
@@ -0,0 +1,7 @@
+<mat-sidenav-container class="example-container" *ngIf="shouldRun">
+  <mat-sidenav opened mode="side">Start content</mat-sidenav>
+  <mat-sidenav opened mode="side" position="end">End content</mat-sidenav>
+  Implicit main content
+</mat-sidenav-container>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-position/sidenav-position-example.ts b/src/material-examples/sidenav-position/sidenav-position-example.ts
new file mode 100644
index 000000000000..56d0373bb4db
--- /dev/null
+++ b/src/material-examples/sidenav-position/sidenav-position-example.ts
@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+
+/** @title Implicit main content with two sidenavs */
+@Component({
+  selector: 'sidenav-position-example',
+  templateUrl: 'sidenav-position-example.html',
+  styleUrls: ['sidenav-position-example.css'],
+})
+export class SidenavPositionExample {
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}
diff --git a/src/material-examples/sidenav-responsive/sidenav-responsive-example.css b/src/material-examples/sidenav-responsive/sidenav-responsive-example.css
new file mode 100644
index 000000000000..93a8e0114727
--- /dev/null
+++ b/src/material-examples/sidenav-responsive/sidenav-responsive-example.css
@@ -0,0 +1,31 @@
+.example-container {
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+.example-is-mobile .example-toolbar {
+  position: fixed;
+  /* Make sure the toolbar will stay on top of the content as it scrolls past. */
+  z-index: 2;
+}
+
+h1.example-app-name {
+  margin-left: 8px;
+}
+
+.example-sidenav-container {
+  /* When the sidenav is not fixed, stretch the sidenav container to fill the available space. This
+     causes `<mat-sidenav-content>` to act as our scrolling element for desktop layouts. */
+  flex: 1;
+}
+
+.example-is-mobile .example-sidenav-container {
+  /* When the sidenav is fixed, don't constrain the height of the sidenav container. This allows the
+     `<body>` to be our scrolling element for mobile layouts. */
+  flex: 1 0 auto;
+}
diff --git a/src/material-examples/sidenav-responsive/sidenav-responsive-example.html b/src/material-examples/sidenav-responsive/sidenav-responsive-example.html
new file mode 100644
index 000000000000..13df09bead06
--- /dev/null
+++ b/src/material-examples/sidenav-responsive/sidenav-responsive-example.html
@@ -0,0 +1,22 @@
+<div class="example-container" [class.example-is-mobile]="mobileQuery.matches" *ngIf="shouldRun">
+  <mat-toolbar color="primary" class="example-toolbar">
+    <button mat-icon-button (click)="snav.toggle()"><mat-icon>menu</mat-icon></button>
+    <h1 class="example-app-name">Responsive App</h1>
+  </mat-toolbar>
+
+  <mat-sidenav-container class="example-sidenav-container"
+                         [style.marginTop.px]="mobileQuery.matches ? 56 : 0">
+    <mat-sidenav #snav [mode]="mobileQuery.matches ? 'over' : 'side'"
+                 [fixedInViewport]="mobileQuery.matches" fixedTopGap="56">
+      <mat-nav-list>
+        <a mat-list-item routerLink="." *ngFor="let nav of fillerNav">{{nav}}</a>
+      </mat-nav-list>
+    </mat-sidenav>
+
+    <mat-sidenav-content>
+      <p *ngFor="let content of fillerContent">{{content}}</p>
+    </mat-sidenav-content>
+  </mat-sidenav-container>
+</div>
+
+<div *ngIf="!shouldRun">Please open in Plunker to see result</div>
diff --git a/src/material-examples/sidenav-responsive/sidenav-responsive-example.ts b/src/material-examples/sidenav-responsive/sidenav-responsive-example.ts
new file mode 100644
index 000000000000..964e3d051d36
--- /dev/null
+++ b/src/material-examples/sidenav-responsive/sidenav-responsive-example.ts
@@ -0,0 +1,35 @@
+import {MediaMatcher} from '@angular/cdk/layout';
+import {ChangeDetectorRef, Component} from '@angular/core';
+
+/** @title Responsive sidenav */
+@Component({
+  selector: 'sidenav-responsive-example',
+  templateUrl: 'sidenav-responsive-example.html',
+  styleUrls: ['sidenav-responsive-example.css'],
+})
+export class SidenavResponsiveExample {
+  mobileQuery: MediaQueryList;
+
+  fillerNav = Array(50).fill(0).map((_, i) => `Nav Item ${i + 1}`);
+
+  fillerContent = Array(50).fill(0).map(() =>
+      `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
+       labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
+       laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+       voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+       cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.`);
+
+  private _mobileQueryListener: () => void;
+
+  constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher) {
+    this.mobileQuery = media.matchMedia('(max-width: 600px)');
+    this._mobileQueryListener = () => changeDetectorRef.detectChanges();
+    this.mobileQuery.addListener(this._mobileQueryListener);
+  }
+
+  ngOnDestroy(): void {
+    this.mobileQuery.removeListener(this._mobileQueryListener);
+  }
+
+  shouldRun = [/(^|\.)plnkr\.co$/, /(^|\.)stackblitz\.io$/].some(h => h.test(window.location.host));
+}

From 461dfafa538c323affa3032665b91b7121424be4 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 21 Nov 2017 18:06:30 +0100
Subject: [PATCH 543/575] fix(overlay): disposed overlays not removed from the
 key event stack (#8226)

Fixes overlays that are removed via `dispose` without being `detached` first not being removed from the stack inside the `OverlayKeyboardDispatcher`, causing them to block events for any subsequent overlays.
---
 .../overlay-keyboard-dispatcher.spec.ts       | 53 ++++++++++++++++++-
 src/cdk/overlay/overlay-ref.ts                |  1 +
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
index ee56850e42cd..58e38158ea1b 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
@@ -1,10 +1,13 @@
 import {TestBed, inject} from '@angular/core/testing';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ESCAPE} from '@angular/cdk/keycodes';
+import {Component, NgModule} from '@angular/core';
 import {Overlay} from '../overlay';
 import {OverlayContainer} from '../overlay-container';
 import {OverlayModule} from '../index';
 import {OverlayKeyboardDispatcher} from './overlay-keyboard-dispatcher';
+import {ComponentPortal} from '@angular/cdk/portal';
+
 
 describe('OverlayKeyboardDispatcher', () => {
   let keyboardDispatcher: OverlayKeyboardDispatcher;
@@ -13,7 +16,7 @@ describe('OverlayKeyboardDispatcher', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [OverlayModule],
+      imports: [OverlayModule, TestComponentModule],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerElement = document.createElement('div');
@@ -105,4 +108,52 @@ describe('OverlayKeyboardDispatcher', () => {
     expect(completeSpy).toHaveBeenCalled();
   });
 
+  it('should stop emitting events to detached overlays', () => {
+    const instance = overlay.create();
+    const spy = jasmine.createSpy('keyboard event spy');
+
+    instance.attach(new ComponentPortal(TestComponent));
+    instance.keydownEvents().subscribe(spy);
+
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE, instance.overlayElement);
+    expect(spy).toHaveBeenCalledTimes(1);
+
+    instance.detach();
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE, instance.overlayElement);
+
+    expect(spy).toHaveBeenCalledTimes(1);
+  });
+
+  it('should stop emitting events to disposed overlays', () => {
+    const instance = overlay.create();
+    const spy = jasmine.createSpy('keyboard event spy');
+
+    instance.attach(new ComponentPortal(TestComponent));
+    instance.keydownEvents().subscribe(spy);
+
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE, instance.overlayElement);
+    expect(spy).toHaveBeenCalledTimes(1);
+
+    instance.dispose();
+    dispatchKeyboardEvent(document.body, 'keydown', ESCAPE, instance.overlayElement);
+
+    expect(spy).toHaveBeenCalledTimes(1);
+  });
+
 });
+
+
+@Component({
+  template: 'Hello'
+})
+class TestComponent { }
+
+
+// Create a real (non-test) NgModule as a workaround for
+// https://github.com/angular/angular/issues/10760
+@NgModule({
+  exports: [TestComponent],
+  declarations: [TestComponent],
+  entryComponents: [TestComponent],
+})
+class TestComponentModule { }
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index bf27da133022..6a0919addc36 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -148,6 +148,7 @@ export class OverlayRef implements PortalOutlet {
     }
 
     this.detachBackdrop();
+    this._keyboardDispatcher.remove(this);
     this._portalOutlet.dispose();
     this._attachments.complete();
     this._backdropClick.complete();

From 4dd8a315ca15489df90b4b8972c31176e00d4f29 Mon Sep 17 00:00:00 2001
From: CaerusKaru <caerus.karu@gmail.com>
Date: Tue, 21 Nov 2017 14:00:01 -0500
Subject: [PATCH 544/575] chore(demo-app): replace rxjs patch operators w/
 lettable operators (#8548)

Fixes #8501
---
 src/demo-app/a11y/table/table-a11y.ts         | 19 ++++++-----
 .../autocomplete/autocomplete-demo.ts         | 12 ++++---
 src/demo-app/overlay/overlay-demo.ts          | 11 ++++---
 src/demo-app/table/person-data-source.ts      |  8 ++---
 .../table/person-detail-data-source.ts        |  7 ++--
 src/demo-app/table/table-demo.ts              | 22 ++++++-------
 .../autocomplete-display-example.ts           | 12 ++++---
 .../autocomplete-filter-example.ts            | 24 +++++++-------
 .../autocomplete-overview-example.ts          | 16 ++++++---
 .../cdk-table-basic-example.ts                |  3 --
 .../table-http/table-http-example.ts          | 33 ++++++++++---------
 .../kitchen-sink/kitchen-sink.ts              |  5 ++-
 tools/package-tools/rollup-globals.ts         | 12 -------
 .../src/app/firebase.service.ts               |  1 -
 14 files changed, 92 insertions(+), 93 deletions(-)

diff --git a/src/demo-app/a11y/table/table-a11y.ts b/src/demo-app/a11y/table/table-a11y.ts
index 50fcc2c94114..ab7c48807422 100644
--- a/src/demo-app/a11y/table/table-a11y.ts
+++ b/src/demo-app/a11y/table/table-a11y.ts
@@ -11,6 +11,8 @@ import {DataSource} from '@angular/cdk/table';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
 import {MatSort, MatPaginator} from '@angular/material';
+import {merge} from 'rxjs/observable/merge';
+import {map} from 'rxjs/operators/map';
 
 export interface UserData {
   name: string;
@@ -78,9 +80,7 @@ export class SortDataSource extends DataSource<UserData> {
       this._sort.sortChange,
     ];
 
-    return Observable.merge(...displayDataChanges).map(() => {
-      return this.getSortedData();
-    });
+    return merge(...displayDataChanges).pipe(map(() => this.getSortedData()));
   }
 
   disconnect() {}
@@ -111,11 +111,14 @@ export class PaginatedDataSource extends DataSource<UserData> {
       this._paginator.page,
     ];
 
-    return Observable.merge(...displayDataChanges).map(() => {
-      const data = [...exampleData];
-      const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
-      return data.splice(startIndex, this._paginator.pageSize);
-    });
+    return merge(...displayDataChanges)
+      .pipe(
+        map(() => {
+          const data = [...exampleData];
+          const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
+          return data.splice(startIndex, this._paginator.pageSize);
+        })
+      );
   }
 
   disconnect() {}
diff --git a/src/demo-app/autocomplete/autocomplete-demo.ts b/src/demo-app/autocomplete/autocomplete-demo.ts
index 9a6dcf6efc63..3a70ab24a490 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.ts
+++ b/src/demo-app/autocomplete/autocomplete-demo.ts
@@ -8,8 +8,8 @@
 
 import {Component, ViewChild, ViewEncapsulation} from '@angular/core';
 import {FormControl, NgModel} from '@angular/forms';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/operator/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {map} from 'rxjs/operators/map';
 
 export interface State {
   code: string;
@@ -101,9 +101,11 @@ export class AutocompleteDemo {
     this.tdStates = this.states;
     this.stateCtrl = new FormControl({code: 'CA', name: 'California'});
     this.reactiveStates = this.stateCtrl.valueChanges
-        .startWith(this.stateCtrl.value)
-        .map(val => this.displayFn(val))
-        .map(name => this.filterStates(name));
+      .pipe(
+        startWith(this.stateCtrl.value),
+        map(val => this.displayFn(val)),
+        map(name => this.filterStates(name))
+      );
 
     this.filteredGroupedStates = this.groupedStates = this.states.reduce((groups, state) => {
       let group = groups.find(g => g.letter === state.name[0]);
diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts
index 1203d94bb495..54d2ed256cb0 100644
--- a/src/demo-app/overlay/overlay-demo.ts
+++ b/src/demo-app/overlay/overlay-demo.ts
@@ -16,8 +16,8 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import 'rxjs/add/operator/do';
-import 'rxjs/add/operator/filter';
+import {filter} from 'rxjs/operators/filter';
+import {tap} from 'rxjs/operators/tap';
 
 
 @Component({
@@ -122,9 +122,10 @@ export class OverlayDemo {
         .attach(new ComponentPortal(KeyboardTrackingPanel, this.viewContainerRef));
 
     overlayRef.keydownEvents()
-      .do(e => componentRef.instance.lastKeydown = e.key)
-      .filter(e => e.key === 'Escape')
-      .subscribe(() => overlayRef.detach());
+      .pipe(
+        tap(e => componentRef.instance.lastKeydown = e.key),
+        filter(e => e.key === 'Escape')
+      ).subscribe(() => overlayRef.detach());
   }
 
 }
diff --git a/src/demo-app/table/person-data-source.ts b/src/demo-app/table/person-data-source.ts
index a0eabf217b5b..d8caa57255cf 100644
--- a/src/demo-app/table/person-data-source.ts
+++ b/src/demo-app/table/person-data-source.ts
@@ -10,8 +10,8 @@ import {MatPaginator, MatSort} from '@angular/material';
 import {DataSource} from '@angular/cdk/collections';
 import {Observable} from 'rxjs/Observable';
 import {PeopleDatabase, UserData} from './people-database';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/operator/map';
+import {merge} from 'rxjs/observable/merge';
+import {map} from 'rxjs/operators/map';
 
 export class PersonDataSource extends DataSource<any> {
   constructor(private _peopleDatabase: PeopleDatabase,
@@ -26,13 +26,13 @@ export class PersonDataSource extends DataSource<any> {
       this._sort.sortChange,
       this._peopleDatabase.dataChange
     ];
-    return Observable.merge(...displayDataChanges).map(() => {
+    return merge(...displayDataChanges).pipe(map(() => {
       const data = this.getSortedData();
 
       // Grab the page's slice of data.
       const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
       return data.splice(startIndex, this._paginator.pageSize);
-    });
+    }));
   }
 
   disconnect() {
diff --git a/src/demo-app/table/person-detail-data-source.ts b/src/demo-app/table/person-detail-data-source.ts
index 975fa1e8298b..78666de2b43b 100644
--- a/src/demo-app/table/person-detail-data-source.ts
+++ b/src/demo-app/table/person-detail-data-source.ts
@@ -9,8 +9,7 @@
 import {DataSource} from '@angular/cdk/collections';
 import {Observable} from 'rxjs/Observable';
 import {UserData} from './people-database';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/operator/map';
+import {map} from 'rxjs/operators/map';
 import {PersonDataSource} from './person-data-source';
 
 export interface DetailRow {
@@ -24,7 +23,7 @@ export class PersonDetailDataSource extends DataSource<any> {
   }
 
   connect(): Observable<(UserData|DetailRow)[]> {
-    return this._personDataSource.connect().map(data => {
+    return this._personDataSource.connect().pipe(map(data => {
       const rows: (UserData|DetailRow)[] = [];
 
       // Interweave a detail data object for each row data object that will be used for displaying
@@ -32,7 +31,7 @@ export class PersonDetailDataSource extends DataSource<any> {
       data.forEach(person => rows.push(person, {detailRow: true, data: person}));
 
       return rows;
-    });
+    }));
   }
 
   disconnect() {
diff --git a/src/demo-app/table/table-demo.ts b/src/demo-app/table/table-demo.ts
index 2b73619f5716..6fd8d9f70a89 100644
--- a/src/demo-app/table/table-demo.ts
+++ b/src/demo-app/table/table-demo.ts
@@ -13,10 +13,9 @@ import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 import {DetailRow, PersonDetailDataSource} from './person-detail-data-source';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {SelectionModel} from '@angular/cdk/collections';
-import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/distinctUntilChanged';
-import 'rxjs/add/operator/debounceTime';
-import 'rxjs/add/observable/fromEvent';
+import {distinctUntilChanged} from 'rxjs/operators/distinctUntilChanged';
+import {debounceTime} from 'rxjs/operators/debounceTime';
+import {fromEvent} from 'rxjs/observable/fromEvent';
 
 export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
 
@@ -88,13 +87,14 @@ export class TableDemo {
 
   ngOnInit() {
     this.connect();
-    Observable.fromEvent(this.filter.nativeElement, 'keyup')
-        .debounceTime(150)
-        .distinctUntilChanged()
-        .subscribe(() => {
-          this.paginatorForDataSource.pageIndex = 0;
-          this.matTableDataSource.filter = this.filter.nativeElement.value;
-        });
+    fromEvent(this.filter.nativeElement, 'keyup')
+      .pipe(
+        debounceTime(150),
+        distinctUntilChanged()
+      ).subscribe(() => {
+        this.paginatorForDataSource.pageIndex = 0;
+        this.matTableDataSource.filter = this.filter.nativeElement.value;
+      });
   }
 
   /** Whether all filtered rows are selected. */
diff --git a/src/material-examples/autocomplete-display/autocomplete-display-example.ts b/src/material-examples/autocomplete-display/autocomplete-display-example.ts
index 97c722813d6a..acfc205c0abe 100644
--- a/src/material-examples/autocomplete-display/autocomplete-display-example.ts
+++ b/src/material-examples/autocomplete-display/autocomplete-display-example.ts
@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/operator/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {map} from 'rxjs/operators/map';
 
 export class User {
   constructor(public name: string) { }
@@ -30,9 +30,11 @@ export class AutocompleteDisplayExample {
 
   ngOnInit() {
     this.filteredOptions = this.myControl.valueChanges
-        .startWith(null)
-        .map(user => user && typeof user === 'object' ? user.name : user)
-        .map(name => name ? this.filter(name) : this.options.slice());
+      .pipe(
+        startWith({} as User),
+        map(user => user && typeof user === 'object' ? user.name : user),
+        map(name => name ? this.filter(name) : this.options.slice())
+      );
   }
 
   filter(name: string): User[] {
diff --git a/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts b/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts
index ffa103ae0cef..060ef241db3f 100644
--- a/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts
+++ b/src/material-examples/autocomplete-filter/autocomplete-filter-example.ts
@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/operator/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {map} from 'rxjs/operators/map';
 
 /**
  * @title Filter autocomplete
@@ -24,15 +24,17 @@ export class AutocompleteFilterExample {
 
   filteredOptions: Observable<string[]>;
 
-   ngOnInit() {
-      this.filteredOptions = this.myControl.valueChanges
-         .startWith('')
-         .map(val => this.filter(val));
-   }
+  ngOnInit() {
+    this.filteredOptions = this.myControl.valueChanges
+      .pipe(
+        startWith(''),
+        map(val => this.filter(val))
+      );
+  }
 
-    filter(val: string): string[] {
-      return this.options.filter(option =>
-        option.toLowerCase().indexOf(val.toLowerCase()) === 0);
-   }
+  filter(val: string): string[] {
+    return this.options.filter(option =>
+      option.toLowerCase().indexOf(val.toLowerCase()) === 0);
+  }
 
 }
diff --git a/src/material-examples/autocomplete-overview/autocomplete-overview-example.ts b/src/material-examples/autocomplete-overview/autocomplete-overview-example.ts
index ee2a166b91a0..b010728d83cd 100644
--- a/src/material-examples/autocomplete-overview/autocomplete-overview-example.ts
+++ b/src/material-examples/autocomplete-overview/autocomplete-overview-example.ts
@@ -2,8 +2,12 @@ import {Component} from '@angular/core';
 import {FormControl} from '@angular/forms';
 
 import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/operator/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {map} from 'rxjs/operators/map';
+
+export class State {
+  constructor(public name: string, public population: string, public flag: string) { }
+}
 
 /**
  * @title Autocomplete overview
@@ -17,7 +21,7 @@ export class AutocompleteOverviewExample {
   stateCtrl: FormControl;
   filteredStates: Observable<any[]>;
 
-  states: any[] = [
+  states: State[] = [
     {
       name: 'Arkansas',
       population: '2.978M',
@@ -47,8 +51,10 @@ export class AutocompleteOverviewExample {
   constructor() {
     this.stateCtrl = new FormControl();
     this.filteredStates = this.stateCtrl.valueChanges
-        .startWith(null)
-        .map(state => state ? this.filterStates(state) : this.states.slice());
+      .pipe(
+        startWith(''),
+        map(state => state ? this.filterStates(state) : this.states.slice())
+      );
   }
 
   filterStates(name: string) {
diff --git a/src/material-examples/cdk-table-basic/cdk-table-basic-example.ts b/src/material-examples/cdk-table-basic/cdk-table-basic-example.ts
index 80975595e08f..98fe4db30c73 100644
--- a/src/material-examples/cdk-table-basic/cdk-table-basic-example.ts
+++ b/src/material-examples/cdk-table-basic/cdk-table-basic-example.ts
@@ -2,9 +2,6 @@ import {Component} from '@angular/core';
 import {DataSource} from '@angular/cdk/collections';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/operator/map';
 
 /**
  * @title Basic CDK data-table
diff --git a/src/material-examples/table-http/table-http-example.ts b/src/material-examples/table-http/table-http-example.ts
index de864fce1d73..67f293a49978 100644
--- a/src/material-examples/table-http/table-http-example.ts
+++ b/src/material-examples/table-http/table-http-example.ts
@@ -2,12 +2,12 @@ import {Component, AfterViewInit, ViewChild} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {MatPaginator, MatSort, MatTableDataSource} from '@angular/material';
 import {Observable} from 'rxjs/Observable';
-import 'rxjs/add/observable/merge';
-import 'rxjs/add/observable/of';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/startWith';
-import 'rxjs/add/operator/switchMap';
+import {merge} from 'rxjs/observable/merge';
+import {of as observableOf} from 'rxjs/observable/of';
+import {catchError} from 'rxjs/operators/catchError';
+import {map} from 'rxjs/operators/map';
+import {startWith} from 'rxjs/operators/startWith';
+import {switchMap} from 'rxjs/operators/switchMap';
 
 /**
  * @title Table retrieving data through HTTP
@@ -37,28 +37,29 @@ export class TableHttpExample implements AfterViewInit {
     // If the user changes the sort order, reset back to the first page.
     this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
 
-    Observable.merge(this.sort.sortChange, this.paginator.page)
-        .startWith(null)
-        .switchMap(() => {
+    merge(this.sort.sortChange, this.paginator.page)
+      .pipe(
+        startWith({}),
+        switchMap(() => {
           this.isLoadingResults = true;
           return this.exampleDatabase!.getRepoIssues(
-              this.sort.active, this.sort.direction, this.paginator.pageIndex);
-        })
-        .map(data => {
+            this.sort.active, this.sort.direction, this.paginator.pageIndex);
+        }),
+        map(data => {
           // Flip flag to show that loading has finished.
           this.isLoadingResults = false;
           this.isRateLimitReached = false;
           this.resultsLength = data.total_count;
 
           return data.items;
-        })
-        .catch(() => {
+        }),
+        catchError(() => {
           this.isLoadingResults = false;
           // Catch if the GitHub API has reached its rate limit. Return empty data.
           this.isRateLimitReached = true;
-          return Observable.of([]);
+          return observableOf([]);
         })
-        .subscribe(data => this.dataSource.data = data);
+      ).subscribe(data => this.dataSource.data = data);
   }
 }
 
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts
index 3eb7b301f771..c04d46e12bf2 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.ts
+++ b/src/universal-app/kitchen-sink/kitchen-sink.ts
@@ -1,7 +1,6 @@
 import {Component, NgModule} from '@angular/core';
 import {ServerModule} from '@angular/platform-server';
 import {BrowserModule} from '@angular/platform-browser';
-import {Observable} from 'rxjs/Observable';
 import {
   MatAutocompleteModule,
   MatButtonModule,
@@ -42,7 +41,7 @@ import {
   DataSource
 } from '@angular/cdk/table';
 
-import 'rxjs/add/observable/of';
+import {of as observableOf} from 'rxjs/observable/of';
 
 @Component({
   selector: 'kitchen-sink',
@@ -56,7 +55,7 @@ export class KitchenSink {
 
   /** Data source for the CDK and Material table. */
   tableDataSource: DataSource<any> = {
-    connect: () => Observable.of([{userId: 1}, {userId: 2}]),
+    connect: () => observableOf([{userId: 1}, {userId: 2}]),
     disconnect: () => {}
   };
 
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 701b2c5c76cb..9fbf4106807b 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -86,16 +86,4 @@ export const rollupGlobals = {
   'rxjs/operators/share': 'Rx.Observable',
   'rxjs/operators/delay': 'Rx.Observable',
   'rxjs/operators/combineLatest': 'Rx.Observable',
-
-  'rxjs/add/observable/merge': 'Rx.Observable',
-  'rxjs/add/observable/fromEvent': 'Rx.Observable',
-  'rxjs/add/observable/of': 'Rx.Observable',
-  'rxjs/add/observable/interval': 'Rx.Observable',
-  'rxjs/add/operator/startWith': 'Rx.Observable.prototype',
-  'rxjs/add/operator/map': 'Rx.Observable.prototype',
-  'rxjs/add/operator/debounceTime': 'Rx.Observable.prototype',
-  'rxjs/add/operator/distinctUntilChanged': 'Rx.Observable.prototype',
-  'rxjs/add/operator/first': 'Rx.Observable.prototype',
-  'rxjs/add/operator/catch': 'Rx.Observable.prototype',
-  'rxjs/add/operator/switchMap': 'Rx.Observable.prototype'
 };
diff --git a/tools/screenshot-test/src/app/firebase.service.ts b/tools/screenshot-test/src/app/firebase.service.ts
index 3fcb235b2bb1..3315c7f416bb 100644
--- a/tools/screenshot-test/src/app/firebase.service.ts
+++ b/tools/screenshot-test/src/app/firebase.service.ts
@@ -1,7 +1,6 @@
 import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import * as firebase from 'firebase';
-import 'rxjs/add/operator/toPromise';
 
 const config = require('../config.json');
 

From 6e865b7ba402c826d57688b545f8f53e66e05e32 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Wed, 22 Nov 2017 14:09:31 -0800
Subject: [PATCH 545/575] fix(tabs): fix accidentally setting `top` instead of
 `width` after removing Renderer use (#8602)

---
 src/lib/tabs/ink-bar.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/tabs/ink-bar.ts b/src/lib/tabs/ink-bar.ts
index 4e3c677d8496..0dff8ce6a3c8 100644
--- a/src/lib/tabs/ink-bar.ts
+++ b/src/lib/tabs/ink-bar.ts
@@ -59,6 +59,6 @@ export class MatInkBar {
     const inkBar: HTMLElement = this._elementRef.nativeElement;
 
     inkBar.style.left = element ? (element.offsetLeft || 0) + 'px' : '0';
-    inkBar.style.top = element ? (element.offsetWidth || 0) + 'px' : '0';
+    inkBar.style.width = element ? (element.offsetWidth || 0) + 'px' : '0';
   }
 }

From 741378a3f257f5e2f6247bb0dec57a8649f2e82e Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Mon, 27 Nov 2017 16:16:08 -0800
Subject: [PATCH 546/575] chore: bump version to rc.2 with changelog (#8677)

---
 CHANGELOG.md      | 14 ++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b14c62af4c9d..06c114e8728f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+<a name="5.0.0-rc.2 wool-wish"></a>
+# [5.0.0-rc.2](https://github.com/angular/material2/compare/5.0.0-rc.1...5.0.0-rc.2) (2017-11-27)
+
+
+### Bug Fixes
+
+* **overlay:** disposed overlays not removed from the key event stack ([#8226](https://github.com/angular/material2/issues/8226)) ([461dfaf](https://github.com/angular/material2/commit/461dfaf))
+* **tabs:** fix accidentally setting `top` instead of `width` after removing Renderer use ([#8602](https://github.com/angular/material2/issues/8602)) ([6e865b7](https://github.com/angular/material2/commit/6e865b7))
+
+### Features
+* The examples on [material.angular.io](https://material.angular.io) are now opened externally via
+StackBlitz instead of Plunker.
+
+
 <a name="5.0.0-rc.1 felt-photon"></a>
 # [5.0.0-rc.1](https://github.com/angular/material2/compare/5.0.0-rc0...5.0.0-rc.1) (2017-11-20)
 
diff --git a/package-lock.json b/package-lock.json
index 2b8e6197c4ba..c5400a2ac67c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "material2-srcs",
-  "version": "5.0.0-rc0",
+  "version": "5.0.0-rc.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cbd876171d88..b9b8dfa8b159 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "docs": "gulp docs",
     "api": "gulp api-docs"
   },
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "license": "MIT",
   "engines": {
     "node": ">= 5.4.1"

From a6d08472c9ad57d378560105fef3e2013a9e9732 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 28 Nov 2017 19:26:30 +0100
Subject: [PATCH 547/575] fix(snack-bar): not applying all panel classes in IE
 (#8578)

Fixes a regression that was causing the snack bar only to apply the first class that was specified via `panelClass`.
---
 src/lib/snack-bar/snack-bar-container.ts | 26 ++++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar-container.ts b/src/lib/snack-bar/snack-bar-container.ts
index bbefc940aa5b..28dc26cced8d 100644
--- a/src/lib/snack-bar/snack-bar-container.ts
+++ b/src/lib/snack-bar/snack-bar-container.ts
@@ -105,8 +105,8 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
     const element: HTMLElement = this._elementRef.nativeElement;
 
     if (this.snackBarConfig.panelClass || this.snackBarConfig.extraClasses) {
-      element.classList.add(...this._getCssClasses(this.snackBarConfig.panelClass),
-                            ...this._getCssClasses(this.snackBarConfig.extraClasses));
+      this._setCssClasses(this.snackBarConfig.panelClass);
+      this._setCssClasses(this.snackBarConfig.extraClasses);
     }
 
     if (this.snackBarConfig.horizontalPosition === 'center') {
@@ -176,15 +176,19 @@ export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy
     });
   }
 
-  /** Convert the class list to a array of classes it can apply to the dom */
-  private _getCssClasses(classList: undefined | string | string[]) {
-    if (classList) {
-      if (Array.isArray(classList)) {
-        return classList;
-      } else {
-        return [classList];
-      }
+  /** Applies the user-specified list of CSS classes to the element. */
+  private _setCssClasses(classList: undefined|string|string[]) {
+    if (!classList) {
+      return;
+    }
+
+    const element = this._elementRef.nativeElement;
+
+    if (Array.isArray(classList)) {
+      // Note that we can't use a spread here, because IE doesn't support multiple arguments.
+      classList.forEach(cssClass => element.classList.add(cssClass));
+    } else {
+      element.classList.add(classList);
     }
-    return [];
   }
 }

From 1a7a61a3b0519fd69ffb3924bf0f7896e64ad1db Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 28 Nov 2017 10:28:22 -0800
Subject: [PATCH 548/575] fix(input): Add pure-CSS floating label logic that
 will work on... (#8491)

* fix(input): Add pure-CSS floating label logic that will work on...

...server-side-rendered pages.

* address comments
---
 src/lib/form-field/_form-field-theme.scss     | 40 ++++++++++---------
 src/lib/form-field/form-field.scss            | 12 ++++++
 src/lib/input/input.ts                        |  7 ++++
 .../kitchen-sink/kitchen-sink.html            |  4 ++
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 3277aac5bb81..1f815b4fb2cd 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -90,6 +90,12 @@
   }
 }
 
+// Used to make instances of the _mat-form-field-placeholder-floating mixin negligibly different,
+// and prevent Google's CSS Optimizer from collapsing the declarations. This is needed because some
+// of the selectors contain pseudo-classes not recognized in all browsers. If a browser encounters
+// an unknown pseudo-class it will discard the entire rule set.
+$dedupe: 0;
+
 // Applies a floating placeholder above the form field control itself.
 @mixin _mat-form-field-placeholder-floating($font-scale, $infix-padding, $infix-margin-top) {
   // We use perspective to fix the text blurriness as described here:
@@ -97,25 +103,14 @@
   // This results in a small jitter after the label floats on Firefox, which the
   // translateZ fixes.
   transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale) perspective(100px)
-             translateZ(0.001px);
+             translateZ(0.001px + $dedupe);
   // The tricks above used to smooth out the animation on chrome and firefox actually make things
   // worse on IE, so we don't include them in the IE version.
-  -ms-transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale);
+  -ms-transform: translateY(-$infix-margin-top - $infix-padding + $dedupe) scale($font-scale);
 
-  width: 100% / $font-scale;
-}
+  width: 100% / $font-scale + $dedupe;
 
-// This is a total duplicate of the mixin above with insignificant values added to the rules.
-// This exists because the mixin is used in two places. When Google's CSS Optimizer runs over this
-// css (after compiling from sass), it combines those two declarations into one. However, one of
-// those places uses `:-webkit-autofill`. When Firefox encounters this unknown pseuedo-class,
-// it ignores the entire rule. To work around this, we force one of the delcarations to be
-// technically different but still render the same by adding a tiny value to the transform / width.
-@mixin _mat-form-field-placeholder-float-nodedupe($font-scale, $infix-padding, $infix-margin-top) {
-  transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale) perspective(100px)
-             translateZ(0.002px);
-  -ms-transform: translateY(-$infix-margin-top - $infix-padding) scale($font-scale);
-  width: (100% / $font-scale) + 0.0001;
+  $dedupe: $dedupe + 0.00001 !global;
 }
 
 @mixin mat-form-field-typography($config) {
@@ -188,14 +183,23 @@
   }
 
   .mat-form-field-can-float {
-    &.mat-form-field-should-float .mat-form-field-placeholder {
+    &.mat-form-field-should-float .mat-form-field-placeholder,
+    .mat-input-server:focus + .mat-form-field-placeholder-wrapper .mat-form-field-placeholder {
       @include _mat-form-field-placeholder-floating(
-          $subscript-font-scale, $infix-padding, $infix-margin-top);
+              $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
 
     .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
         .mat-form-field-placeholder {
-      @include _mat-form-field-placeholder-float-nodedupe(
+      @include _mat-form-field-placeholder-floating(
+              $subscript-font-scale, $infix-padding, $infix-margin-top);
+    }
+
+    // Server-side rendered matInput with a placeholder attribute but placeholder not shown
+    // (used as a pure CSS stand-in for mat-form-field-should-float).
+    .mat-input-server[placeholder]:not(:placeholder-shown) + .mat-form-field-placeholder-wrapper
+        .mat-form-field-placeholder {
+      @include _mat-form-field-placeholder-floating(
               $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
   }
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 1f3ace6279d8..693ec33ea5c3 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -138,6 +138,18 @@ $mat-form-field-default-infix-width: 180px !default;
   }
 }
 
+// Server-side rendered matInput with focus or a placeholder attribute but placeholder not shown
+// (used as a pure CSS stand-in for mat-form-field-should-float).
+.mat-input-server:focus + .mat-form-field-placeholder-wrapper .mat-form-field-placeholder,
+.mat-input-server[placeholder]:not(:placeholder-shown) + .mat-form-field-placeholder-wrapper
+    .mat-form-field-placeholder {
+  display: none;
+
+  .mat-form-field-can-float & {
+    display: block;
+  }
+}
+
 // Disable the placeholder animation when the control is not empty (this prevents placeholder
 // animating up when the value is set programmatically).
 .mat-form-field-placeholder:not(.mat-form-field-empty) {
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 4f5667c77828..3491133ab338 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -26,6 +26,7 @@ import {Subject} from 'rxjs/Subject';
 import {getMatInputUnsupportedTypeError} from './input-errors';
 import {MAT_INPUT_VALUE_ACCESSOR} from './input-value-accessor';
 
+
 // Invalid input type. Using one of these will throw an MatInputUnsupportedTypeError.
 const MAT_INPUT_INVALID_TYPES = [
   'button',
@@ -49,6 +50,7 @@ let nextUniqueId = 0;
   exportAs: 'matInput',
   host: {
     'class': 'mat-input-element mat-form-field-autofill-control',
+    '[class.mat-input-server]': '_isServer',
     // Native input properties that are overwritten by Angular inputs need to be synced with
     // the native input element. Otherwise property bindings for those don't work.
     '[attr.id]': 'id',
@@ -85,6 +87,9 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   /** The aria-describedby attribute on the input for improved a11y. */
   _ariaDescribedby: string;
 
+  /** Whether the component is being rendered on the server. */
+  _isServer = false;
+
   /**
    * Stream that emits whenever the state of the input changes such that the wrapping `MatFormField`
    * needs to run change detection.
@@ -185,6 +190,8 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
         }
       });
     }
+
+    this._isServer = !this._platform.isBrowser;
   }
 
   ngOnChanges() {
diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html
index 1a504ebcb28a..06c4c0853548 100644
--- a/src/universal-app/kitchen-sink/kitchen-sink.html
+++ b/src/universal-app/kitchen-sink/kitchen-sink.html
@@ -103,6 +103,10 @@ <h2>Icon</h2>
 
 <h2>Input</h2>
 
+<mat-form-field floatPlaceholder="never">
+  <input matInput placeholder="name">
+</mat-form-field>
+
 <mat-form-field>
   <input type="number" matInput placeholder="amount">
   <span matPrefix>$&nbsp;</span>

From 3c3aadcf671adfdf5e150b6c38636b5ac21f9405 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 19:33:24 +0100
Subject: [PATCH 549/575] chore: update codeowners file (#8615)

* Adds`@devversion` as code owner for list and common-behaviors.
---
 .github/CODEOWNERS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 01fa90356e08..021ad34aef1a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,7 +13,7 @@
 /src/lib/grid-list/**                              @kara @jelbourn
 /src/lib/icon/**                                   @jelbourn
 /src/lib/input/**                                  @mmalerba
-/src/lib/list/**                                   @jelbourn @crisbeto
+/src/lib/list/**                                   @jelbourn @crisbeto @devversion
 /src/lib/menu/**                                   @kara @crisbeto
 /src/lib/paginator/**                              @andrewseguin
 /src/lib/progress-bar/**                           @jelbourn @crisbeto @josephperrott
@@ -34,7 +34,7 @@
 # Angular Material core
 /src/lib/core/*                                    @jelbourn
 /src/lib/core/animation/**                         @jelbourn
-/src/lib/core/common-behaviors/**                  @jelbourn
+/src/lib/core/common-behaviors/**                  @jelbourn @devversion
 /src/lib/core/datetime/**                          @mmalerba
 /src/lib/core/error/**                             @crisbeto @mmalerba
 /src/lib/core/gestures/**                          @jelbourn
@@ -96,7 +96,7 @@
 /src/demo-app/grid-list/**                         @kara @jelbourn
 /src/demo-app/icon/**                              @jelbourn
 /src/demo-app/input/**                             @mmalerba
-/src/demo-app/list/**                              @jelbourn @crisbeto
+/src/demo-app/list/**                              @jelbourn @crisbeto @devversion
 /src/demo-app/live-announcer/**                    @jelbourn
 /src/demo-app/menu/**                              @kara @crisbeto
 /src/demo-app/overlay/**                           @jelbourn @crisbeto
@@ -132,7 +132,7 @@
 /e2e/components/grid-list-e2e.spec.ts              @kara @jelbourn
 /e2e/components/icon-e2e.spec.ts                   @jelbourn
 /e2e/components/input-e2e.spec.ts                  @mmalerba
-/e2e/components/list-e2e.spec.ts                   @jelbourn @crisbeto
+/e2e/components/list-e2e.spec.ts                   @jelbourn @crisbeto @devversion
 /e2e/components/menu-e2e.spec.ts                   @kara @crisbeto
 /e2e/components/progress-bar-e2e.spec.ts           @jelbourn @crisbeto @josephperrott
 /e2e/components/progress-spinner-e2e.spec.ts       @jelbourn @crisbeto @josephperrott

From 2eab16cf8d519a7b323e25ece0997ac8d4599ced Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 19:33:51 +0100
Subject: [PATCH 550/575] build: fix dashboard typescript failures (#8616)

* Fixes TypeScript errors for the dashboard app.
---
 tools/dashboard/package.json                         |  4 ++--
 .../src/app/coverage-chart/coverage-chart.html       |  1 +
 tools/dashboard/src/app/dashboard-app.ts             |  4 ++--
 tools/dashboard/src/app/dashboard-module.ts          | 12 ++++++------
 .../src/app/payload-chart/payload-chart.html         |  1 +
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/dashboard/package.json b/tools/dashboard/package.json
index 65352373271d..66811fd386a1 100644
--- a/tools/dashboard/package.json
+++ b/tools/dashboard/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
     "@angular/router": "^5.0.0",
-    "@swimlane/ngx-charts": "^6.0.0",
+    "@swimlane/ngx-charts": "^7.0.1",
     "angularfire2": "^5.0.0-rc.2",
     "core-js": "^2.4.1",
     "d3": "^4.9.1",
@@ -35,6 +35,6 @@
     "@types/jasmine": "2.5.45",
     "@types/node": "~6.0.60",
     "ts-node": "~3.0.4",
-    "typescript": "^2.4.1"
+    "typescript": "~2.4.2"
   }
 }
diff --git a/tools/dashboard/src/app/coverage-chart/coverage-chart.html b/tools/dashboard/src/app/coverage-chart/coverage-chart.html
index 09bd71f98818..24f20199ced0 100644
--- a/tools/dashboard/src/app/coverage-chart/coverage-chart.html
+++ b/tools/dashboard/src/app/coverage-chart/coverage-chart.html
@@ -9,6 +9,7 @@
   [showXAxisLabel]="true"
   [showYAxisLabel]="true"
   [showGridLines]="true"
+  [timeline]="true"
   [xAxisLabel]="xAxisLabel"
   [yAxisLabel]="yAxisLabel"
   [autoScale]="true">
diff --git a/tools/dashboard/src/app/dashboard-app.ts b/tools/dashboard/src/app/dashboard-app.ts
index 49baf62d56cc..caddbc6240fc 100644
--- a/tools/dashboard/src/app/dashboard-app.ts
+++ b/tools/dashboard/src/app/dashboard-app.ts
@@ -17,8 +17,8 @@ export class DashboardApp {
   coverage: Observable<CoverageResult[]>;
 
   constructor(database: AngularFireDatabase) {
-    this.payloads = database.list(`payloads`).valueChanges();
-    this.coverage = database.list(`coverage-reports`).valueChanges();
+    this.payloads = database.list<PayloadResult>('payloads').valueChanges();
+    this.coverage = database.list<CoverageResult>('coverage-reports').valueChanges();
   }
 }
 
diff --git a/tools/dashboard/src/app/dashboard-module.ts b/tools/dashboard/src/app/dashboard-module.ts
index 7f7b55f679ce..06219d028262 100644
--- a/tools/dashboard/src/app/dashboard-module.ts
+++ b/tools/dashboard/src/app/dashboard-module.ts
@@ -1,14 +1,14 @@
+import {NgModule} from '@angular/core';
+import {MatCardModule, MatProgressSpinnerModule, MatToolbarModule} from '@angular/material';
 import {BrowserModule} from '@angular/platform-browser';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {NgxChartsModule} from '@swimlane/ngx-charts';
 import {AngularFireModule} from 'angularfire2';
 import {AngularFireDatabaseModule} from 'angularfire2/database';
-import {NgModule} from '@angular/core';
-import {DashboardApp} from './dashboard-app';
 import {environment} from '../environments/environment';
-import {MatCardModule, MatProgressSpinnerModule, MatToolbarModule} from '@angular/material';
-import {NgxChartsModule} from '@swimlane/ngx-charts';
-import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {PayloadChart} from './payload-chart/payload-chart';
 import {CoverageChart} from './coverage-chart/coverage-chart';
+import {DashboardApp} from './dashboard-app';
+import {PayloadChart} from './payload-chart/payload-chart';
 
 @NgModule({
   exports: [
diff --git a/tools/dashboard/src/app/payload-chart/payload-chart.html b/tools/dashboard/src/app/payload-chart/payload-chart.html
index 09bd71f98818..24f20199ced0 100644
--- a/tools/dashboard/src/app/payload-chart/payload-chart.html
+++ b/tools/dashboard/src/app/payload-chart/payload-chart.html
@@ -9,6 +9,7 @@
   [showXAxisLabel]="true"
   [showYAxisLabel]="true"
   [showGridLines]="true"
+  [timeline]="true"
   [xAxisLabel]="xAxisLabel"
   [yAxisLabel]="yAxisLabel"
   [autoScale]="true">

From 8009f1bf11bf7db991a2e856d479bfecd430e6dd Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 19:34:07 +0100
Subject: [PATCH 551/575] chore: update chromedriver version for e2e tests
 (#8635)

* No longer explicitly specifies the Chrome Driver version for the e2e tests. The chrome driver associated with the latest Chrome version will be used now.
---
 test/protractor.conf.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 64c3c146f66b..f42c3a2eff16 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -42,7 +42,6 @@ if (process.env['TRAVIS']) {
   config.capabilities = {
     'browserName': 'chrome',
     'version': 'latest',
-    'chromedriverVersion': '2.28',
     'tunnel-identifier': process.env['TRAVIS_JOB_ID'],
     'build': process.env['TRAVIS_JOB_ID'],
     'name': 'Material E2E Tests',

From 1a383ced5e000746594aa3db7aaafb43d6c829aa Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 28 Nov 2017 19:34:23 +0100
Subject: [PATCH 552/575] refactor(overlay): more robust testing setup (#8638)

Reworks the testing setup for the `ConnectedPositionStrategy` and `GlobalPositionStrategy` to avoid constructing the services ourselves and to prevent failures like #8559.
---
 .../connected-position-strategy.spec.ts       | 62 ++++++-------------
 .../position/global-position-strategy.spec.ts | 11 +++-
 2 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index ad3c99137eb4..d39924f41ccb 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -1,13 +1,15 @@
 import {ElementRef} from '@angular/core';
 import {TestBed, inject} from '@angular/core/testing';
-import {ConnectedPositionStrategy} from './connected-position-strategy';
-import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
 import {OverlayPositionBuilder} from './overlay-position-builder';
-import {ConnectedOverlayPositionChange} from './connected-position';
 import {CdkScrollable} from '@angular/cdk/scrolling';
 import {Subscription} from 'rxjs/Subscription';
-import {ScrollDispatchModule} from '@angular/cdk/scrolling';
-import {OverlayRef} from '../overlay-ref';
+import {
+  OverlayModule,
+  Overlay,
+  OverlayRef,
+  ConnectedPositionStrategy,
+  ConnectedOverlayPositionChange,
+} from '../index';
 
 
 // Default width and height of the overlay and origin panels throughout these tests.
@@ -19,17 +21,15 @@ const DEFAULT_WIDTH = 60;
 // for tests on CI (both SauceLabs and Browserstack).
 
 describe('ConnectedPositionStrategy', () => {
+  let positionBuilder: OverlayPositionBuilder;
 
-  let viewportRuler: ViewportRuler;
+  beforeEach(() => {
+    TestBed.configureTestingModule({imports: [OverlayModule]});
 
-  beforeEach(() => TestBed.configureTestingModule({
-    imports: [ScrollDispatchModule],
-    providers: [VIEWPORT_RULER_PROVIDER]
-  }));
-
-  beforeEach(inject([ViewportRuler], (_ruler: ViewportRuler) => {
-    viewportRuler = _ruler;
-  }));
+    inject([Overlay], (overlay: Overlay) => {
+      positionBuilder = overlay.position();
+    })();
+  });
 
   describe('with origin on document body', () => {
     const ORIGIN_HEIGHT = DEFAULT_HEIGHT;
@@ -42,7 +42,6 @@ describe('ConnectedPositionStrategy', () => {
     let overlayContainerElement: HTMLElement;
     let strategy: ConnectedPositionStrategy;
     let fakeElementRef: ElementRef;
-    let positionBuilder: OverlayPositionBuilder;
 
     let originRect: ClientRect | null;
     let originCenterX: number | null;
@@ -56,9 +55,7 @@ describe('ConnectedPositionStrategy', () => {
       document.body.appendChild(originElement);
       document.body.appendChild(overlayContainerElement);
       overlayContainerElement.appendChild(overlayElement);
-
-      fakeElementRef = new FakeElementRef(originElement);
-      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
+      fakeElementRef = new ElementRef(originElement);
     });
 
     afterEach(() => {
@@ -177,8 +174,6 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should reposition the overlay if it would go off the bottom of the screen', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
-
         originElement.style.bottom = '25px';
         originElement.style.left = '200px';
         originRect = originElement.getBoundingClientRect();
@@ -200,8 +195,6 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should reposition the overlay if it would go off the right of the screen', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
-
         originElement.style.top = '200px';
         originElement.style.right = '25px';
         originRect = originElement.getBoundingClientRect();
@@ -224,8 +217,6 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should recalculate and set the last position with recalculateLastPosition()', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
-
         // Push the trigger down so the overlay doesn't have room to open on the bottom.
         originElement.style.bottom = '25px';
         originRect = originElement.getBoundingClientRect();
@@ -254,8 +245,6 @@ describe('ConnectedPositionStrategy', () => {
       });
 
       it('should default to the initial position, if no positions fit in the viewport', () => {
-        positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
-
         // Make the origin element taller than the viewport.
         originElement.style.height = '1000px';
         originElement.style.top = '0';
@@ -353,7 +342,6 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should emit onPositionChange event when position changes', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       originElement.style.top = '200px';
       originElement.style.right = '25px';
 
@@ -390,7 +378,6 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should emit the onPositionChange event even if none of the positions fit', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       originElement.style.bottom = '25px';
       originElement.style.right = '25px';
 
@@ -414,8 +401,6 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should pick the fallback position that shows the largest area of the element', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
-
       originElement.style.top = '200px';
       originElement.style.right = '25px';
       originRect = originElement.getBoundingClientRect();
@@ -441,7 +426,6 @@ describe('ConnectedPositionStrategy', () => {
     });
 
     it('should re-use the preferred position when re-applying while locked in', () => {
-      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
       strategy = positionBuilder.connectedTo(
           fakeElementRef,
           {originX: 'end', originY: 'center'},
@@ -584,15 +568,14 @@ describe('ConnectedPositionStrategy', () => {
       scrollable.appendChild(originElement);
 
       // Create a strategy with knowledge of the scrollable container
-      let positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
-      let fakeElementRef = new FakeElementRef(originElement);
+      let fakeElementRef = new ElementRef(originElement);
       strategy = positionBuilder.connectedTo(
           fakeElementRef,
           {originX: 'start', originY: 'bottom'},
           {overlayX: 'start', overlayY: 'top'});
 
       strategy.withScrollableContainers([
-          new CdkScrollable(new FakeElementRef(scrollable), null!, null!)]);
+          new CdkScrollable(new ElementRef(scrollable), null!, null!)]);
       strategy.attach(fakeOverlayRef(overlayElement));
       positionChangeHandler = jasmine.createSpy('positionChangeHandler');
       onPositionChangeSubscription = strategy.onPositionChange.subscribe(positionChangeHandler);
@@ -666,7 +649,6 @@ describe('ConnectedPositionStrategy', () => {
     let overlayContainerElement: HTMLElement;
     let strategy: ConnectedPositionStrategy;
     let fakeElementRef: ElementRef;
-    let positionBuilder: OverlayPositionBuilder;
 
     beforeEach(() => {
       // The origin and overlay elements need to be in the document body in order to have geometry.
@@ -676,9 +658,7 @@ describe('ConnectedPositionStrategy', () => {
       document.body.appendChild(originElement);
       document.body.appendChild(overlayContainerElement);
       overlayContainerElement.appendChild(overlayElement);
-
-      fakeElementRef = new FakeElementRef(originElement);
-      positionBuilder = new OverlayPositionBuilder(viewportRuler, document);
+      fakeElementRef = new ElementRef(originElement);
     });
 
     afterEach(() => {
@@ -809,12 +789,6 @@ function createOverflowContainerElement() {
   return element;
 }
 
-
-/** Fake implementation of ElementRef that is just a simple container for nativeElement. */
-class FakeElementRef implements ElementRef {
-  constructor(public nativeElement: HTMLElement) { }
-}
-
 function fakeOverlayRef(overlayElement: HTMLElement) {
   return {overlayElement} as OverlayRef;
 }
diff --git a/src/cdk/overlay/position/global-position-strategy.spec.ts b/src/cdk/overlay/position/global-position-strategy.spec.ts
index 5954a769731e..4c804683993c 100644
--- a/src/cdk/overlay/position/global-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/global-position-strategy.spec.ts
@@ -1,5 +1,5 @@
-import {GlobalPositionStrategy} from './global-position-strategy';
-import {OverlayRef} from '../overlay-ref';
+import {TestBed, inject} from '@angular/core/testing';
+import {OverlayModule, Overlay, OverlayRef, GlobalPositionStrategy} from '../index';
 
 
 describe('GlobalPositonStrategy', () => {
@@ -7,8 +7,13 @@ describe('GlobalPositonStrategy', () => {
   let strategy: GlobalPositionStrategy;
 
   beforeEach(() => {
+    TestBed.configureTestingModule({imports: [OverlayModule]});
+
+    inject([Overlay], (overlay: Overlay) => {
+      strategy = overlay.position().global();
+    })();
+
     element = document.createElement('div');
-    strategy = new GlobalPositionStrategy(document);
     document.body.appendChild(element);
     strategy.attach({overlayElement: element} as OverlayRef);
   });

From a0075fff4c0522c1c1228c24f272d3b69f13da8d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 19:34:39 +0100
Subject: [PATCH 553/575] build: run tests in chrome headless local (#8651)

Runs local tests in Chrome Headless. This speeds up the tests and also ensures more test stability. On Windows there are a lot of pixel deviation failures because the tests seemed to be affected by the screen resolution or window frame.

By running the tests headless, the Chrome launcher has more control about the rendering and pixel deviations like before won't happen anymore. It's still the same Chrome that runs, just that the screen is kind of emulated like in XVFB.
---
 test/browser-providers.js |  2 +-
 test/karma.conf.js        |  2 +-
 test/remote_browsers.json | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/browser-providers.js b/test/browser-providers.js
index cc0c20584065..d475817c573f 100644
--- a/test/browser-providers.js
+++ b/test/browser-providers.js
@@ -5,7 +5,7 @@
  * Target can be either: BS (Browserstack) | SL (Saucelabs) | TC (Travis CI) | null (To not run)
  */
 const browserConfig = {
-  'ChromeHeadless_CI': { unitTest: {target: 'TC', required: true  }},
+  'ChromeHeadlessCI':  { unitTest: {target: 'TC', required: true  }},
   'FirefoxHeadless':   { unitTest: {target: 'TC', required: true  }},
   'ChromeBeta':        { unitTest: {target: null, required: false }},
   'FirefoxBeta':       { unitTest: {target: null, required: false }},
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 30399610d2ab..c1440ad28ec4 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -80,7 +80,7 @@ module.exports = (config) => {
     browserDisconnectTimeout: 20000,
     browserNoActivityTimeout: 240000,
     captureTimeout: 120000,
-    browsers: ['Chrome_1024x768'],
+    browsers: ['ChromeHeadlessLocal'],
 
     singleRun: false,
 
diff --git a/test/remote_browsers.json b/test/remote_browsers.json
index ae2c2cdce1c2..fc5f3f0c831d 100644
--- a/test/remote_browsers.json
+++ b/test/remote_browsers.json
@@ -1,22 +1,19 @@
 {
-  "ChromeHeadless_CI": {
+  "ChromeHeadlessLocal": {
     "base": "ChromeHeadless",
     "flags": [
       "--window-size=1024,768"
     ]
   },
-  "Chrome_1024x768": {
-    "base": "Chrome",
-    "flags": [
-      "--window-size=1024,768"
-    ]
-  },
   "FirefoxHeadless": {
     "base": "Firefox",
     "flags": [
       "-headless"
     ]
   },
+  "ChromeHeadlessCI": {
+    "base": "ChromeHeadlessLocal"
+  },
   "SL_CHROME": {
     "base": "SauceLabs",
     "browserName": "chrome",

From 23c09b488d3fdcad642d3b2e438c8a83ee0150a3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 19:34:54 +0100
Subject: [PATCH 554/575] build: fix invalid umd globals for rxjs operators
 (#8572)

Previously in `RxJS`, operators were part of the `Rx.Observable` namespace, but now since those will be imported separately from the `rxjs/operators` path, the UMD module name mapping needs to be updated to `Rx.operators` (https://unpkg.com/rxjs@5.5.2/bundles/Rx.js)

Fixes #8530
---
 package-lock.json                     | 31 ++++++---------------------
 tools/package-tools/rollup-globals.ts | 30 +++++++++++++-------------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c5400a2ac67c..676d2415afa8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12598,19 +12598,6 @@
         "walkdir": "0.0.11"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "cli-cursor": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -12682,12 +12669,6 @@
             "log-symbols": "1.0.2"
           }
         },
-        "pluralize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
-          "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
-          "dev": true
-        },
         "rc": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
@@ -12715,12 +12696,6 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
           "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
           "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
         }
       }
     },
@@ -14293,6 +14268,12 @@
       "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
       "dev": true
     },
+    "pluralize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+      "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
+      "dev": true
+    },
     "portfinder": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz",
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 9fbf4106807b..0707dfac8d40 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -71,19 +71,19 @@ export const rollupGlobals = {
   'rxjs/observable/fromEventPattern': 'Rx.Observable',
   'rxjs/observable/empty': 'Rx.Observable',
 
-  'rxjs/operators/debounceTime': 'Rx.Observable',
-  'rxjs/operators/takeUntil': 'Rx.Observable',
-  'rxjs/operators/first': 'Rx.Observable',
-  'rxjs/operators/take': 'Rx.Observable',
-  'rxjs/operators/filter': 'Rx.Observable',
-  'rxjs/operators/map': 'Rx.Observable',
-  'rxjs/operators/tap': 'Rx.Observable',
-  'rxjs/operators/startWith': 'Rx.Observable',
-  'rxjs/operators/auditTime': 'Rx.Observable',
-  'rxjs/operators/switchMap': 'Rx.Observable',
-  'rxjs/operators/finalize': 'Rx.Observable',
-  'rxjs/operators/catchError': 'Rx.Observable',
-  'rxjs/operators/share': 'Rx.Observable',
-  'rxjs/operators/delay': 'Rx.Observable',
-  'rxjs/operators/combineLatest': 'Rx.Observable',
+  'rxjs/operators/debounceTime': 'Rx.operators',
+  'rxjs/operators/takeUntil': 'Rx.operators',
+  'rxjs/operators/take': 'Rx.operators',
+  'rxjs/operators/first': 'Rx.operators',
+  'rxjs/operators/filter': 'Rx.operators',
+  'rxjs/operators/map': 'Rx.operators',
+  'rxjs/operators/tap': 'Rx.operators',
+  'rxjs/operators/startWith': 'Rx.operators',
+  'rxjs/operators/auditTime': 'Rx.operators',
+  'rxjs/operators/switchMap': 'Rx.operators',
+  'rxjs/operators/finalize': 'Rx.operators',
+  'rxjs/operators/catchError': 'Rx.operators',
+  'rxjs/operators/share': 'Rx.operators',
+  'rxjs/operators/delay': 'Rx.operators',
+  'rxjs/operators/combineLatest': 'Rx.operators',
 };

From 2dbc76631dd285ba5389bd030531d7e15191efe5 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Tue, 28 Nov 2017 10:37:30 -0800
Subject: [PATCH 555/575] fix(overlay): make config immutable for existing refs
 (#7376)

This changes makes the OverlayConfig instance in OverlatRef immutable.
Calling `getConfig` will now return a clone of the config to make clear
that it cannot be modified directly to change the state of the overlay.
This also updates the `updateSize` method to accept a partial config to
apply to the existing config (and make a new config instance).

This *also* tightens up the typings on Portal.attach

BREAKING CHANGE: OverlayRef.getConfig returns an immutable version of
the config object.

BREAKING CHANGE: OverlayRef.updateSize now accepts a OverlaySizeConfig
rather than being based on the existing config object.
---
 src/cdk/overlay/overlay-directives.ts        |  2 +-
 src/cdk/overlay/overlay-ref.ts               | 85 +++++++++++++-------
 src/cdk/portal/portal.ts                     |  4 +
 src/lib/autocomplete/autocomplete-trigger.ts |  3 +-
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index d9261639d29b..6123df74b630 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -333,7 +333,7 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
     }
 
     this._position.withDirection(this.dir);
-    this._overlayRef.getConfig().direction = this.dir;
+    this._overlayRef.setDirection(this.dir);
     this._document.addEventListener('keydown', this._escapeListener);
 
     if (!this._overlayRef.hasAttached()) {
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index 6a0919addc36..c1be7f8b78b2 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -6,14 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgZone} from '@angular/core';
-import {PortalOutlet, Portal} from '@angular/cdk/portal';
-import {OverlayConfig} from './overlay-config';
-import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
+import {Direction} from '@angular/cdk/bidi';
+import {ComponentPortal, Portal, PortalOutlet, TemplatePortal} from '@angular/cdk/portal';
+import {ComponentRef, EmbeddedViewRef, NgZone} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
 import {take} from 'rxjs/operators/take';
+import {Subject} from 'rxjs/Subject';
+import {OverlayKeyboardDispatcher} from './keyboard/overlay-keyboard-dispatcher';
+import {OverlayConfig} from './overlay-config';
+
 
+/** An object where all of its properties cannot be written. */
+export type ImmutableObject<T> = {
+  readonly [P in keyof T]: T[P];
+};
 
 /**
  * Reference to an overlay that has been created with the Overlay service.
@@ -31,7 +37,7 @@ export class OverlayRef implements PortalOutlet {
   constructor(
       private _portalOutlet: PortalOutlet,
       private _pane: HTMLElement,
-      private _config: OverlayConfig,
+      private _config: ImmutableObject<OverlayConfig>,
       private _ngZone: NgZone,
       private _keyboardDispatcher: OverlayKeyboardDispatcher) {
 
@@ -45,8 +51,14 @@ export class OverlayRef implements PortalOutlet {
     return this._pane;
   }
 
+  attach<T>(portal: ComponentPortal<T>): ComponentRef<T>;
+  attach<T>(portal: TemplatePortal<T>): EmbeddedViewRef<T>;
+  attach(portal: any): any;
+
   /**
-   * Attaches the overlay to a portal instance and adds the backdrop.
+   * Attaches content, given via a Portal, to the overlay.
+   * If the overlay is configured to have a backdrop, it will be created.
+   *
    * @param portal Portal instance to which to attach the overlay.
    * @returns The portal attachment result.
    */
@@ -59,8 +71,8 @@ export class OverlayRef implements PortalOutlet {
 
     // Update the pane element with the given configuration.
     this._updateStackingOrder();
-    this.updateSize();
-    this.updateDirection();
+    this._updateElementSize();
+    this._updateElementDirection();
 
     if (this._config.scrollStrategy) {
       this._config.scrollStrategy.enable();
@@ -133,9 +145,7 @@ export class OverlayRef implements PortalOutlet {
     return detachmentResult;
   }
 
-  /**
-   * Cleans up the overlay from the DOM.
-   */
+  /** Cleans up the overlay from the DOM. */
   dispose(): void {
     const isAttached = this.hasAttached();
 
@@ -161,16 +171,12 @@ export class OverlayRef implements PortalOutlet {
     this._detachments.complete();
   }
 
-  /**
-   * Checks whether the overlay has been attached.
-   */
+  /** Whether the overlay has attached content. */
   hasAttached(): boolean {
     return this._portalOutlet.hasAttached();
   }
 
-  /**
-   * Gets an observable that emits when the backdrop has been clicked.
-   */
+  /** Gets an observable that emits when the backdrop has been clicked. */
   backdropClick(): Observable<void> {
     return this._backdropClick.asObservable();
   }
@@ -190,9 +196,7 @@ export class OverlayRef implements PortalOutlet {
     return this._keydownEvents.asObservable();
   }
 
-  /**
-   * Gets the current config of the overlay.
-   */
+  /** Gets the the current overlay configuration, which is immutable. */
   getConfig(): OverlayConfig {
     return this._config;
   }
@@ -204,13 +208,25 @@ export class OverlayRef implements PortalOutlet {
     }
   }
 
+  /** Update the size properties of the overlay. */
+  updateSize(sizeConfig: OverlaySizeConfig) {
+    this._config = {...this._config, ...sizeConfig};
+    this._updateElementSize();
+  }
+
+  /** Sets the LTR/RTL direction for the overlay. */
+  setDirection(dir: Direction) {
+    this._config = {...this._config, direction: dir};
+    this._updateElementDirection();
+  }
+
   /** Updates the text direction of the overlay panel. */
-  private updateDirection() {
+  private _updateElementDirection() {
     this._pane.setAttribute('dir', this._config.direction!);
   }
 
-  /** Updates the size of the overlay based on the overlay config. */
-  updateSize() {
+  /** Updates the size of the overlay element based on the overlay config. */
+  private _updateElementSize() {
     if (this._config.width || this._config.width === 0) {
       this._pane.style.width = formatCssUnit(this._config.width);
     }
@@ -259,10 +275,12 @@ export class OverlayRef implements PortalOutlet {
     this._backdropElement.addEventListener('click', () => this._backdropClick.next(null));
 
     // Add class to fade-in the backdrop after one frame.
-    requestAnimationFrame(() => {
-      if (this._backdropElement) {
-        this._backdropElement.classList.add('cdk-overlay-backdrop-showing');
-      }
+    this._ngZone.runOutsideAngular(() => {
+      requestAnimationFrame(() => {
+        if (this._backdropElement) {
+          this._backdropElement.classList.add('cdk-overlay-backdrop-showing');
+        }
+      });
     });
   }
 
@@ -323,3 +341,14 @@ export class OverlayRef implements PortalOutlet {
 function formatCssUnit(value: number | string) {
   return typeof value === 'string' ? value as string : `${value}px`;
 }
+
+
+/** Size properties for an overlay. */
+export interface OverlaySizeConfig {
+  width?: number | string;
+  height?: number | string;
+  minWidth?: number | string;
+  minHeight?: number | string;
+  maxWidth?: number | string;
+  maxHeight?: number | string;
+}
diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts
index 911d01a6484c..981f12f562e1 100644
--- a/src/cdk/portal/portal.ts
+++ b/src/cdk/portal/portal.ts
@@ -181,6 +181,10 @@ export abstract class BasePortalOutlet implements PortalOutlet {
     return !!this._attachedPortal;
   }
 
+  attach<T>(portal: ComponentPortal<T>): ComponentRef<T>;
+  attach<T>(portal: TemplatePortal<T>): EmbeddedViewRef<T>;
+  attach(portal: any): any;
+
   /** Attaches a portal. */
   attach(portal: Portal<any>): any {
     if (!portal) {
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index f848074a695b..2503da3e2d09 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -458,8 +458,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
       this._overlayRef = this._overlay.create(this._getOverlayConfig());
     } else {
       /** Update the panel width, in case the host width has changed */
-      this._overlayRef.getConfig().width = this._getHostWidth();
-      this._overlayRef.updateSize();
+      this._overlayRef.updateSize({width: this._getHostWidth()});
     }
 
     if (this._overlayRef && !this._overlayRef.hasAttached()) {

From 55a9f9a7f1cff2ba9935e6ea0146b8ae6e874118 Mon Sep 17 00:00:00 2001
From: mmalerba <mmalerba@google.com>
Date: Tue, 28 Nov 2017 10:42:51 -0800
Subject: [PATCH 556/575] fix(sidenav): remove min-width (#7748)

* fix(sidenav): remove min-width

* fixed tests
---
 src/lib/sidenav/drawer.scss    | 1 -
 src/lib/sidenav/drawer.spec.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index f4b945c28ee6..2c9ffcf1c8e5 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -106,7 +106,6 @@ $mat-drawer-over-drawer-z-index: 4;
   top: 0;
   bottom: 0;
   z-index: 3;
-  min-width: 5vw;
   outline: 0;
   box-sizing: border-box;
   overflow-y: auto; // TODO(kara): revisit scrolling behavior for drawers
diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
index a6ac276b7227..c56504787d32 100644
--- a/src/lib/sidenav/drawer.spec.ts
+++ b/src/lib/sidenav/drawer.spec.ts
@@ -665,7 +665,7 @@ class DrawerDelayed {
 @Component({
   template: `
     <mat-drawer-container>
-      <mat-drawer *ngIf="renderDrawer" [mode]="mode"></mat-drawer>
+      <mat-drawer *ngIf="renderDrawer" [mode]="mode" style="width:100px"></mat-drawer>
     </mat-drawer-container>`,
 })
 class DrawerContainerStateChangesTestApp {

From d2c11ca50be5d0e0a9391014b1a7af2ac8eb08b7 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Tue, 28 Nov 2017 11:48:28 -0800
Subject: [PATCH 557/575] fix(chip-list): fix error state changes in chip list
 (#8425)

---
 src/lib/chips/chip-list.spec.ts              | 203 ++++++++++++++++---
 src/lib/chips/chip-list.ts                   |  57 ++++--
 src/lib/chips/chips-module.ts                |   4 +-
 src/lib/core/common-behaviors/error-state.ts |  65 ++++++
 src/lib/core/common-behaviors/index.ts       |   1 +
 src/lib/core/common-behaviors/tabindex.ts    |   1 -
 src/lib/input/input.ts                       |  42 ++--
 src/lib/select/select.ts                     |  48 ++---
 8 files changed, 312 insertions(+), 109 deletions(-)
 create mode 100644 src/lib/core/common-behaviors/error-state.ts

diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 5f006e427acc..ab2fa74c7cec 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -4,7 +4,7 @@ import {BACKSPACE, DELETE, ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE, TAB} from '@an
 import {createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
-import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {FormControl, FormsModule, NgForm, ReactiveFormsModule, Validators} from '@angular/forms';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -35,6 +35,7 @@ describe('MatChipList', () => {
         NoopAnimationsModule
       ],
       declarations: [
+        ChipListWithFormErrorMessages,
         StandardChipList,
         FormFieldChipList,
         BasicChipList,
@@ -864,6 +865,121 @@ describe('MatChipList', () => {
     });
   });
 
+  describe('error messages', () => {
+    let errorTestComponent: ChipListWithFormErrorMessages;
+    let containerEl: HTMLElement;
+    let chipListEl: HTMLElement;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ChipListWithFormErrorMessages);
+      fixture.detectChanges();
+      errorTestComponent = fixture.componentInstance;
+      containerEl = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
+      chipListEl = fixture.debugElement.query(By.css('mat-chip-list')).nativeElement;
+    });
+
+    it('should not show any errors if the user has not interacted', () => {
+      expect(errorTestComponent.formControl.untouched)
+        .toBe(true, 'Expected untouched form control');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
+      expect(chipListEl.getAttribute('aria-invalid'))
+        .toBe('false', 'Expected aria-invalid to be set to "false".');
+    });
+
+    it('should display an error message when the chip list is touched and invalid', async(() => {
+      expect(errorTestComponent.formControl.invalid)
+        .toBe(true, 'Expected form control to be invalid');
+      expect(containerEl.querySelectorAll('mat-error').length)
+        .toBe(0, 'Expected no error message');
+
+      errorTestComponent.formControl.markAsTouched();
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        expect(containerEl.classList)
+          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+        expect(containerEl.querySelectorAll('mat-error').length)
+          .toBe(1, 'Expected one error message to have been rendered.');
+        expect(chipListEl.getAttribute('aria-invalid'))
+          .toBe('true', 'Expected aria-invalid to be set to "true".');
+      });
+    }));
+
+    it('should display an error message when the parent form is submitted', fakeAsync(() => {
+      expect(errorTestComponent.form.submitted)
+        .toBe(false, 'Expected form not to have been submitted');
+      expect(errorTestComponent.formControl.invalid)
+        .toBe(true, 'Expected form control to be invalid');
+      expect(containerEl.querySelectorAll('mat-error').length).toBe(0, 'Expected no error message');
+
+      dispatchFakeEvent(fixture.debugElement.query(By.css('form')).nativeElement, 'submit');
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        expect(errorTestComponent.form.submitted)
+          .toBe(true, 'Expected form to have been submitted');
+        expect(containerEl.classList)
+          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+        expect(containerEl.querySelectorAll('mat-error').length)
+          .toBe(1, 'Expected one error message to have been rendered.');
+        expect(chipListEl.getAttribute('aria-invalid'))
+          .toBe('true', 'Expected aria-invalid to be set to "true".');
+      });
+    }));
+
+    it('should hide the errors and show the hints once the chip list becomes valid',
+        fakeAsync(() => {
+      errorTestComponent.formControl.markAsTouched();
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        expect(containerEl.classList)
+          .toContain('mat-form-field-invalid', 'Expected container to have the invalid CSS class.');
+        expect(containerEl.querySelectorAll('mat-error').length)
+          .toBe(1, 'Expected one error message to have been rendered.');
+        expect(containerEl.querySelectorAll('mat-hint').length)
+          .toBe(0, 'Expected no hints to be shown.');
+
+        errorTestComponent.formControl.setValue('something');
+        fixture.detectChanges();
+
+        fixture.whenStable().then(() => {
+          expect(containerEl.classList).not.toContain('mat-form-field-invalid',
+            'Expected container not to have the invalid class when valid.');
+          expect(containerEl.querySelectorAll('mat-error').length)
+            .toBe(0, 'Expected no error messages when the input is valid.');
+          expect(containerEl.querySelectorAll('mat-hint').length)
+            .toBe(1, 'Expected one hint to be shown once the input is valid.');
+        });
+      });
+    }));
+
+    it('should set the proper role on the error messages', () => {
+      errorTestComponent.formControl.markAsTouched();
+      fixture.detectChanges();
+
+      expect(containerEl.querySelector('mat-error')!.getAttribute('role')).toBe('alert');
+    });
+
+    it('sets the aria-describedby to reference errors when in error state', () => {
+      let hintId = fixture.debugElement.query(By.css('.mat-hint')).nativeElement.getAttribute('id');
+      let describedBy = chipListEl.getAttribute('aria-describedby');
+
+      expect(hintId).toBeTruthy('hint should be shown');
+      expect(describedBy).toBe(hintId);
+
+      fixture.componentInstance.formControl.markAsTouched();
+      fixture.detectChanges();
+
+      let errorIds = fixture.debugElement.queryAll(By.css('.mat-error'))
+        .map(el => el.nativeElement.getAttribute('id')).join(' ');
+      describedBy = chipListEl.getAttribute('aria-describedby');
+
+      expect(errorIds).toBeTruthy('errors should be shown');
+      expect(describedBy).toBe(errorIds);
+    });
+  });
+
   function setupStandardList() {
     fixture = TestBed.createComponent(StandardChipList);
     fixture.detectChanges();
@@ -940,14 +1056,14 @@ class FormFieldChipList {
 })
 class BasicChipList {
   foods: any[] = [
-    { value: 'steak-0', viewValue: 'Steak' },
-    { value: 'pizza-1', viewValue: 'Pizza' },
-    { value: 'tacos-2', viewValue: 'Tacos', disabled: true },
-    { value: 'sandwich-3', viewValue: 'Sandwich' },
-    { value: 'chips-4', viewValue: 'Chips' },
-    { value: 'eggs-5', viewValue: 'Eggs' },
-    { value: 'pasta-6', viewValue: 'Pasta' },
-    { value: 'sushi-7', viewValue: 'Sushi' },
+    {value: 'steak-0', viewValue: 'Steak'},
+    {value: 'pizza-1', viewValue: 'Pizza'},
+    {value: 'tacos-2', viewValue: 'Tacos', disabled: true},
+    {value: 'sandwich-3', viewValue: 'Sandwich'},
+    {value: 'chips-4', viewValue: 'Chips'},
+    {value: 'eggs-5', viewValue: 'Eggs'},
+    {value: 'pasta-6', viewValue: 'Pasta'},
+    {value: 'sushi-7', viewValue: 'Sushi'},
   ];
   control = new FormControl();
   isRequired: boolean;
@@ -975,14 +1091,14 @@ class BasicChipList {
 })
 class MultiSelectionChipList {
   foods: any[] = [
-    { value: 'steak-0', viewValue: 'Steak' },
-    { value: 'pizza-1', viewValue: 'Pizza' },
-    { value: 'tacos-2', viewValue: 'Tacos', disabled: true },
-    { value: 'sandwich-3', viewValue: 'Sandwich' },
-    { value: 'chips-4', viewValue: 'Chips' },
-    { value: 'eggs-5', viewValue: 'Eggs' },
-    { value: 'pasta-6', viewValue: 'Pasta' },
-    { value: 'sushi-7', viewValue: 'Sushi' },
+    {value: 'steak-0', viewValue: 'Steak'},
+    {value: 'pizza-1', viewValue: 'Pizza'},
+    {value: 'tacos-2', viewValue: 'Tacos', disabled: true},
+    {value: 'sandwich-3', viewValue: 'Sandwich'},
+    {value: 'chips-4', viewValue: 'Chips'},
+    {value: 'eggs-5', viewValue: 'Eggs'},
+    {value: 'pasta-6', viewValue: 'Pasta'},
+    {value: 'sushi-7', viewValue: 'Sushi'},
   ];
   control = new FormControl();
   isRequired: boolean;
@@ -1013,14 +1129,14 @@ class MultiSelectionChipList {
 })
 class InputChipList {
   foods: any[] = [
-    { value: 'steak-0', viewValue: 'Steak' },
-    { value: 'pizza-1', viewValue: 'Pizza' },
-    { value: 'tacos-2', viewValue: 'Tacos', disabled: true },
-    { value: 'sandwich-3', viewValue: 'Sandwich' },
-    { value: 'chips-4', viewValue: 'Chips' },
-    { value: 'eggs-5', viewValue: 'Eggs' },
-    { value: 'pasta-6', viewValue: 'Pasta' },
-    { value: 'sushi-7', viewValue: 'Sushi' },
+    {value: 'steak-0', viewValue: 'Steak'},
+    {value: 'pizza-1', viewValue: 'Pizza'},
+    {value: 'tacos-2', viewValue: 'Tacos', disabled: true},
+    {value: 'sandwich-3', viewValue: 'Sandwich'},
+    {value: 'chips-4', viewValue: 'Chips'},
+    {value: 'eggs-5', viewValue: 'Eggs'},
+    {value: 'pasta-6', viewValue: 'Pasta'},
+    {value: 'sushi-7', viewValue: 'Sushi'},
   ];
   control = new FormControl();
 
@@ -1061,8 +1177,8 @@ class InputChipList {
 })
 class FalsyValueChipList {
   foods: any[] = [
-    { value: 0, viewValue: 'Steak' },
-    { value: 1, viewValue: 'Pizza' },
+    {value: 0, viewValue: 'Steak'},
+    {value: 1, viewValue: 'Pizza'},
   ];
   control = new FormControl();
   @ViewChildren(MatChip) chips: QueryList<MatChip>;
@@ -1079,9 +1195,36 @@ class FalsyValueChipList {
 })
 class SelectedChipList {
   foods: any[] = [
-    { value: 0, viewValue: 'Steak', selected: true },
-    { value: 1, viewValue: 'Pizza', selected: false },
-    { value: 2, viewValue: 'Pasta', selected: true },
+    {value: 0, viewValue: 'Steak', selected: true},
+    {value: 1, viewValue: 'Pizza', selected: false},
+    {value: 2, viewValue: 'Pasta', selected: true},
   ];
   @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }
+
+@Component({
+  template: `
+<form #form="ngForm" novalidate>
+  <mat-form-field>
+    <mat-chip-list [formControl]="formControl">
+      <mat-chip *ngFor="let food of foods" [value]="food.value" [selected]="food.selected">
+      {{food.viewValue}}
+      </mat-chip>
+    </mat-chip-list>
+    <mat-hint>Please select a chip, or type to add a new chip</mat-hint>
+    <mat-error>Should have value</mat-error>
+  </mat-form-field>
+</form>
+  `
+})
+class ChipListWithFormErrorMessages {
+  foods: any[] = [
+    {value: 0, viewValue: 'Steak', selected: true},
+    {value: 1, viewValue: 'Pizza', selected: false},
+    {value: 2, viewValue: 'Pasta', selected: true},
+  ];
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
+
+  @ViewChild('form') form: NgForm;
+  formControl = new FormControl('', Validators.required);
+}
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index c5e0451731a0..b9031baadf67 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -18,6 +18,7 @@ import {
   ChangeDetectorRef,
   Component,
   ContentChildren,
+  DoCheck,
   ElementRef,
   EventEmitter,
   Input,
@@ -29,15 +30,31 @@ import {
   Self,
   ViewEncapsulation,
 } from '@angular/core';
-import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {
+  ControlValueAccessor,
+  FormGroupDirective,
+  NgControl,
+  NgForm
+} from '@angular/forms';
+import {ErrorStateMatcher, mixinErrorState, CanUpdateErrorState} from '@angular/material/core';
 import {MatFormFieldControl} from '@angular/material/form-field';
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
-import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
 import {MatChip, MatChipEvent, MatChipSelectionChange} from './chip';
 import {MatChipInput} from './chip-input';
 
+// Boilerplate for applying mixins to MatChipList.
+/** @docs-private */
+export class MatChipListBase {
+  constructor(public _defaultErrorStateMatcher: ErrorStateMatcher,
+              public _parentForm: NgForm,
+              public _parentFormGroup: FormGroupDirective,
+              public ngControl: NgControl) {}
+}
+export const _MatChipListMixinBase = mixinErrorState(MatChipListBase);
+
+
 // Increasing integer for generating unique ids for chip-list components.
 let nextUniqueId = 0;
 
@@ -78,16 +95,10 @@ export class MatChipListChange {
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class MatChipList implements MatFormFieldControl<any>, ControlValueAccessor,
-    AfterContentInit, OnInit, OnDestroy {
+export class MatChipList extends _MatChipListMixinBase implements MatFormFieldControl<any>,
+    ControlValueAccessor, AfterContentInit, DoCheck, OnInit, OnDestroy, CanUpdateErrorState {
   readonly controlType = 'mat-chip-list';
 
-  /**
-   * Stream that emits whenever the state of the input changes such that the wrapping `MatFormField`
-   * needs to run change detection.
-   */
-  stateChanges = new Subject<void>();
-
   /** When a chip is destroyed, we track the index so we can focus the appropriate next chip. */
   protected _lastDestroyedIndex: number|null = null;
 
@@ -173,6 +184,9 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
     return this.empty ? null : 'listbox';
   }
 
+  /** An object used to control when error messages are shown. */
+  @Input() errorStateMatcher: ErrorStateMatcher;
+
   /** Whether the user should be allowed to select multiple chips. */
   @Input()
   get multiple(): boolean { return this._multiple; }
@@ -251,14 +265,6 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   get disabled() { return this.ngControl ? this.ngControl.disabled : this._disabled; }
   set disabled(value: any) { this._disabled = coerceBooleanProperty(value); }
 
-  /** Whether the chip list is in an error state. */
-  get errorState(): boolean {
-    const isInvalid = this.ngControl && this.ngControl.invalid;
-    const isTouched = this.ngControl && this.ngControl.touched;
-    const isSubmitted = (this._parentFormGroup && this._parentFormGroup.submitted) ||
-      (this._parentForm && this._parentForm.submitted);
-    return !!(isInvalid && (isTouched || isSubmitted));
-  }
 
   /** Orientation of the chip list. */
   @Input('aria-orientation') ariaOrientation: 'horizontal' | 'vertical' = 'horizontal';
@@ -313,9 +319,11 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
   constructor(protected _elementRef: ElementRef,
               private _changeDetectorRef: ChangeDetectorRef,
               @Optional() private _dir: Directionality,
-              @Optional() private _parentForm: NgForm,
-              @Optional() private _parentFormGroup: FormGroupDirective,
+              @Optional() _parentForm: NgForm,
+              @Optional() _parentFormGroup: FormGroupDirective,
+              _defaultErrorStateMatcher: ErrorStateMatcher,
               @Optional() @Self() public ngControl: NgControl) {
+    super(_defaultErrorStateMatcher, _parentForm, _parentFormGroup, ngControl);
     if (this.ngControl) {
       this.ngControl.valueAccessor = this;
     }
@@ -352,6 +360,15 @@ export class MatChipList implements MatFormFieldControl<any>, ControlValueAccess
     this.stateChanges.next();
   }
 
+  ngDoCheck() {
+    if (this.ngControl) {
+      // We need to re-evaluate this on every change detection cycle, because there are some
+      // error triggers that we can't subscribe to (e.g. parent form submissions). This means
+      // that whatever logic is in here has to be super lean or we risk destroying the performance.
+      this.updateErrorState();
+    }
+  }
+
   ngOnDestroy(): void {
     this._tabOutSubscription.unsubscribe();
 
diff --git a/src/lib/chips/chips-module.ts b/src/lib/chips/chips-module.ts
index 1d29f093c2e5..3a8ca64e0f81 100644
--- a/src/lib/chips/chips-module.ts
+++ b/src/lib/chips/chips-module.ts
@@ -7,6 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
+import {ErrorStateMatcher} from '@angular/material/core';
 import {MatChipList} from './chip-list';
 import {MatBasicChip, MatChip, MatChipRemove} from './chip';
 import {MatChipInput} from './chip-input';
@@ -15,6 +16,7 @@ import {MatChipInput} from './chip-input';
 @NgModule({
   imports: [],
   exports: [MatChipList, MatChip, MatChipInput, MatChipRemove, MatChipRemove, MatBasicChip],
-  declarations: [MatChipList, MatChip, MatChipInput, MatChipRemove,  MatChipRemove, MatBasicChip]
+  declarations: [MatChipList, MatChip, MatChipInput, MatChipRemove,  MatChipRemove, MatBasicChip],
+  providers: [ErrorStateMatcher]
 })
 export class MatChipsModule {}
diff --git a/src/lib/core/common-behaviors/error-state.ts b/src/lib/core/common-behaviors/error-state.ts
new file mode 100644
index 000000000000..5f0850b2ed3c
--- /dev/null
+++ b/src/lib/core/common-behaviors/error-state.ts
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Constructor} from './constructor';
+import {ErrorStateMatcher} from '../error/error-options';
+import {FormControl, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {Subject} from 'rxjs/Subject';
+
+/** @docs-private */
+export interface CanUpdateErrorState {
+  updateErrorState();
+  stateChanges: Subject<void>;
+  errorState: boolean;
+  errorStateMatcher: ErrorStateMatcher;
+}
+
+/** @docs-private */
+export interface HasErrorState {
+  _parentFormGroup: FormGroupDirective;
+  _parentForm: NgForm;
+  _defaultErrorStateMatcher: ErrorStateMatcher;
+  ngControl: NgControl;
+}
+
+/**
+ * Mixin to augment a directive with updateErrorState method.
+ * For component with `errorState` and need to update `errorState`.
+ */
+export function mixinErrorState<T extends Constructor<HasErrorState>>(base: T)
+: Constructor<CanUpdateErrorState> & T {
+  return class extends base {
+    /** Whether the component is in an error state. */
+    errorState: boolean = false;
+
+    /**
+     * Stream that emits whenever the state of the input changes such that the wrapping
+     * `MatFormField needs to run change detection.
+     */
+    stateChanges = new Subject<void>();
+
+    errorStateMatcher: ErrorStateMatcher;
+
+    updateErrorState() {
+      const oldState = this.errorState;
+      const parent = this._parentFormGroup || this._parentForm;
+      const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
+      const control = this.ngControl ? this.ngControl.control as FormControl : null;
+      const newState = matcher.isErrorState(control, parent);
+
+      if (newState !== oldState) {
+        this.errorState = newState;
+        this.stateChanges.next();
+      }
+    }
+
+    constructor(...args: any[]) {
+      super(...args);
+    }
+  };
+}
diff --git a/src/lib/core/common-behaviors/index.ts b/src/lib/core/common-behaviors/index.ts
index b4f74da4e4ef..bfc3317731b7 100644
--- a/src/lib/core/common-behaviors/index.ts
+++ b/src/lib/core/common-behaviors/index.ts
@@ -11,3 +11,4 @@ export {CanDisable, mixinDisabled} from './disabled';
 export {CanColor, mixinColor, ThemePalette} from './color';
 export {CanDisableRipple, mixinDisableRipple} from './disable-ripple';
 export {HasTabIndex, mixinTabIndex} from './tabindex';
+export {CanUpdateErrorState, mixinErrorState} from './error-state';
diff --git a/src/lib/core/common-behaviors/tabindex.ts b/src/lib/core/common-behaviors/tabindex.ts
index 8ed2c209fdf0..5ea836a1eba8 100644
--- a/src/lib/core/common-behaviors/tabindex.ts
+++ b/src/lib/core/common-behaviors/tabindex.ts
@@ -31,4 +31,3 @@ export function mixinTabIndex<T extends Constructor<CanDisable>>(base: T, defaul
     }
   };
 }
-
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 3491133ab338..94504ca8997b 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -19,8 +19,8 @@ import {
   Optional,
   Self,
 } from '@angular/core';
-import {FormControl, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
-import {ErrorStateMatcher} from '@angular/material/core';
+import {FormGroupDirective, NgControl, NgForm} from '@angular/forms';
+import {ErrorStateMatcher, mixinErrorState, CanUpdateErrorState} from '@angular/material/core';
 import {MatFormFieldControl} from '@angular/material/form-field';
 import {Subject} from 'rxjs/Subject';
 import {getMatInputUnsupportedTypeError} from './input-errors';
@@ -43,6 +43,15 @@ const MAT_INPUT_INVALID_TYPES = [
 
 let nextUniqueId = 0;
 
+// Boilerplate for applying mixins to MatInput.
+/** @docs-private */
+export class MatInputBase {
+  constructor(public _defaultErrorStateMatcher: ErrorStateMatcher,
+              public _parentForm: NgForm,
+              public _parentFormGroup: FormGroupDirective,
+              public ngControl: NgControl) {}
+}
+export const _MatInputMixinBase = mixinErrorState(MatInputBase);
 
 /** Directive that allows a native input to work inside a `MatFormField`. */
 @Directive({
@@ -67,7 +76,8 @@ let nextUniqueId = 0;
   },
   providers: [{provide: MatFormFieldControl, useExisting: MatInput}],
 })
-export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy, DoCheck {
+export class MatInput extends _MatInputMixinBase implements MatFormFieldControl<any>, OnChanges,
+    OnDestroy, DoCheck, CanUpdateErrorState {
   /** Variables used as cache for getters and setters. */
   protected _type = 'text';
   protected _disabled = false;
@@ -81,9 +91,6 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   /** Whether the input is focused. */
   focused = false;
 
-  /** Whether the input is in an error state. */
-  errorState = false;
-
   /** The aria-describedby attribute on the input for improved a11y. */
   _ariaDescribedby: string;
 
@@ -162,10 +169,11 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
   constructor(protected _elementRef: ElementRef,
               protected _platform: Platform,
               @Optional() @Self() public ngControl: NgControl,
-              @Optional() protected _parentForm: NgForm,
-              @Optional() protected _parentFormGroup: FormGroupDirective,
-              private _defaultErrorStateMatcher: ErrorStateMatcher,
+              @Optional() _parentForm: NgForm,
+              @Optional() _parentFormGroup: FormGroupDirective,
+              _defaultErrorStateMatcher: ErrorStateMatcher,
               @Optional() @Self() @Inject(MAT_INPUT_VALUE_ACCESSOR) inputValueAccessor: any) {
+    super(_defaultErrorStateMatcher, _parentForm, _parentFormGroup, ngControl);
     // If no input value accessor was explicitly specified, use the element as the input value
     // accessor.
     this._inputValueAccessor = inputValueAccessor || this._elementRef.nativeElement;
@@ -207,7 +215,7 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
       // We need to re-evaluate this on every change detection cycle, because there are some
       // error triggers that we can't subscribe to (e.g. parent form submissions). This means
       // that whatever logic is in here has to be super lean or we risk destroying the performance.
-      this._updateErrorState();
+      this.updateErrorState();
     } else {
       // When the input isn't used together with `@angular/forms`, we need to check manually for
       // changes to the native `value` property in order to update the floating label.
@@ -235,20 +243,6 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy,
     // FormsModule or ReactiveFormsModule, because Angular forms also listens to input events.
   }
 
-  /** Re-evaluates the error state. This is only relevant with @angular/forms. */
-  protected _updateErrorState() {
-    const oldState = this.errorState;
-    const parent = this._parentFormGroup || this._parentForm;
-    const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
-    const control = this.ngControl ? this.ngControl.control as FormControl : null;
-    const newState = matcher.isErrorState(control, parent);
-
-    if (newState !== oldState) {
-      this.errorState = newState;
-      this.stateChanges.next();
-    }
-  }
-
   /** Does some manual dirty checking on the native input `value` property. */
   protected _dirtyCheckNativeValue() {
     const newValue = this.value;
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index 1e652f7f94e7..bf2cf9dff618 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -53,7 +53,6 @@ import {
 } from '@angular/core';
 import {
   ControlValueAccessor,
-  FormControl,
   FormGroupDirective,
   NgControl,
   NgForm
@@ -61,6 +60,8 @@ import {
 import {
   CanDisable,
   ErrorStateMatcher,
+  CanUpdateErrorState,
+  mixinErrorState,
   HasTabIndex,
   MatOptgroup,
   MatOption,
@@ -142,9 +143,13 @@ export class MatSelectChange {
 // Boilerplate for applying mixins to MatSelect.
 /** @docs-private */
 export class MatSelectBase {
-  constructor(public _elementRef: ElementRef) {}
+  constructor(public _elementRef: ElementRef,
+              public _defaultErrorStateMatcher: ErrorStateMatcher,
+              public _parentForm: NgForm,
+              public _parentFormGroup: FormGroupDirective,
+              public ngControl: NgControl) {}
 }
-export const _MatSelectMixinBase = mixinTabIndex(mixinDisabled(MatSelectBase));
+export const _MatSelectMixinBase = mixinTabIndex(mixinDisabled(mixinErrorState(MatSelectBase)));
 
 
 /**
@@ -198,7 +203,7 @@ export class MatSelectTrigger {}
 })
 export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnChanges,
     OnDestroy, OnInit, DoCheck, ControlValueAccessor, CanDisable, HasTabIndex,
-    MatFormFieldControl<any> {
+    MatFormFieldControl<any>, CanUpdateErrorState {
   /** Whether or not the overlay panel is open. */
   private _panelOpen = false;
 
@@ -284,12 +289,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     },
   ];
 
-  /**
-   * Stream that emits whenever the state of the select changes such that the wrapping
-   * `MatFormField` needs to run change detection.
-   */
-  stateChanges = new Subject<void>();
-
   /** Whether the select is focused. */
   focused = false;
 
@@ -451,17 +450,17 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     private _viewportRuler: ViewportRuler,
     private _changeDetectorRef: ChangeDetectorRef,
     private _ngZone: NgZone,
-    private _defaultErrorStateMatcher: ErrorStateMatcher,
+    _defaultErrorStateMatcher: ErrorStateMatcher,
     elementRef: ElementRef,
     @Optional() private _dir: Directionality,
-    @Optional() private _parentForm: NgForm,
-    @Optional() private _parentFormGroup: FormGroupDirective,
+    @Optional() _parentForm: NgForm,
+    @Optional() _parentFormGroup: FormGroupDirective,
     @Optional() private _parentFormField: MatFormField,
     @Self() @Optional() public ngControl: NgControl,
     @Attribute('tabindex') tabIndex: string,
     @Inject(MAT_SELECT_SCROLL_STRATEGY) private _scrollStrategyFactory) {
-
-    super(elementRef);
+    super(elementRef, _defaultErrorStateMatcher, _parentForm,
+          _parentFormGroup, ngControl);
 
     if (this.ngControl) {
       this.ngControl.valueAccessor = this;
@@ -489,7 +488,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
 
   ngDoCheck() {
     if (this.ngControl) {
-      this._updateErrorState();
+      this.updateErrorState();
     }
   }
 
@@ -729,9 +728,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return !this._selectionModel || this._selectionModel.isEmpty();
   }
 
-  /** Whether the select is in an error state. */
-  errorState: boolean;
-
   private _initializeSelection(): void {
     // Defer setting the value in order to avoid the "Expression
     // has changed after it was checked" errors from Angular.
@@ -1188,20 +1184,6 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
     return this._triggerFontSize * SELECT_ITEM_HEIGHT_EM;
   }
 
-  /** Updates the select's error state. Only relevant when used with @angular/forms. */
-  private _updateErrorState() {
-    const oldState = this.errorState;
-    const parent = this._parentFormGroup || this._parentForm;
-    const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher;
-    const control = this.ngControl ? this.ngControl.control as FormControl : null;
-    const newState = matcher.isErrorState(control, parent);
-
-    if (newState !== oldState) {
-      this.errorState = newState;
-      this.stateChanges.next();
-    }
-  }
-
   // Implemented as part of MatFormFieldControl.
   setDescribedByIds(ids: string[]) {
     this._ariaDescribedby = ids.join(' ');

From d66284dcd373169da61ac625909ef4fd5e2fa1d2 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 28 Nov 2017 20:51:38 +0100
Subject: [PATCH 558/575] fix(tooltip): close tooltip if message is cleared
 while open (#8544)

Closes the tooltip if its message is cleared while it is open. Currently it'll continue showing a small grey rectangle under the trigger.
---
 src/lib/tooltip/tooltip.spec.ts | 12 ++++++++++++
 src/lib/tooltip/tooltip.ts      | 12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 1c2b481eec63..99f38a7d16c9 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -191,6 +191,18 @@ describe('MatTooltip', () => {
       expect(tooltipDirective._isTooltipVisible()).toBe(false);
     }));
 
+    it('should hide if the message is cleared while the tooltip is open', fakeAsync(() => {
+      tooltipDirective.show();
+      fixture.detectChanges();
+      tick(0);
+      expect(tooltipDirective._isTooltipVisible()).toBe(true);
+
+      fixture.componentInstance.message = '';
+      fixture.detectChanges();
+      tick(0);
+      expect(tooltipDirective._isTooltipVisible()).toBe(false);
+    }));
+
     it('should not show if hide is called before delay finishes', async(() => {
       assertTooltipInstance(tooltipDirective, false);
 
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 7c2a1edddf13..5fe91edfe4c3 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -142,14 +142,20 @@ export class MatTooltip implements OnDestroy {
   private _message = '';
 
   /** The message to be displayed in the tooltip */
-  @Input('matTooltip') get message() { return this._message; }
+  @Input('matTooltip')
+  get message() { return this._message; }
   set message(value: string) {
     this._ariaDescriber.removeDescription(this._elementRef.nativeElement, this._message);
 
     // If the message is not a string (e.g. number), convert it to a string and trim it.
     this._message = value != null ? `${value}`.trim() : '';
-    this._updateTooltipMessage();
-    this._ariaDescriber.describe(this._elementRef.nativeElement, this.message);
+
+    if (!this._message && this._isTooltipVisible()) {
+      this.hide(0);
+    } else {
+      this._updateTooltipMessage();
+      this._ariaDescriber.describe(this._elementRef.nativeElement, this.message);
+    }
   }
 
   /** Classes to be passed to the tooltip. Supports the same syntax as `ngClass`. */

From 345a1a35b6e0393388a447a72b78034cb69304d1 Mon Sep 17 00:00:00 2001
From: Abdellatif Ait boudad <a.aitboudad@gmail.com>
Date: Tue, 28 Nov 2017 19:51:53 +0000
Subject: [PATCH 559/575] docs(chips): fix closing tags in mat-chip. (#8551)

---
 src/lib/chips/chips.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/chips/chips.md b/src/lib/chips/chips.md
index 7af77d1a7263..781873a37ac5 100644
--- a/src/lib/chips/chips.md
+++ b/src/lib/chips/chips.md
@@ -43,8 +43,8 @@ An example of chip input placed outside the chip-list element.
 ```html
 <mat-form-field>
   <mat-chip-list #chipList>
-    <mat-chip>Chip 1<mat-chip>
-    <mat-chip>Chip 2<mat-chip>
+    <mat-chip>Chip 1</mat-chip>
+    <mat-chip>Chip 2</mat-chip>
   </mat-chip-list>
   <input matChipInputFor="chipList">
 </mat-form-field>

From 65cd1a1236186033978338cea2317be5f21d7d40 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 21:04:00 +0100
Subject: [PATCH 560/575] feat(ripple): handle touch events (#7927)

* Now handles touch events properly.

Fixes #7062
---
 src/demo-app/ripple/ripple-demo.scss   |  6 +++
 src/lib/core/ripple/ripple-renderer.ts | 54 +++++++++++++++++++-------
 src/lib/core/ripple/ripple.spec.ts     | 30 +++++++++++++-
 3 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/src/demo-app/ripple/ripple-demo.scss b/src/demo-app/ripple/ripple-demo.scss
index b43ebe90cee3..a343e29714f8 100644
--- a/src/demo-app/ripple/ripple-demo.scss
+++ b/src/demo-app/ripple/ripple-demo.scss
@@ -1,3 +1,5 @@
+@import '../../lib/core/style/vendor-prefixes';
+
 .demo-ripple {
   button, a {
     margin: 8px;
@@ -15,6 +17,10 @@
     transition: all 200ms linear;
     width: 200px;
 
+    // Disable the blue overlay on touch. This makes it easier to see ripples fading in.
+    -webkit-tap-highlight-color: transparent;
+    @include user-select(none);
+
     &.demo-ripple-disabled {
       color: rgba(32, 32, 32, 0.4);
     }
diff --git a/src/lib/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
index b9ad40f6883f..f5691f982a5a 100644
--- a/src/lib/core/ripple/ripple-renderer.ts
+++ b/src/lib/core/ripple/ripple-renderer.ts
@@ -17,6 +17,12 @@ export const RIPPLE_FADE_IN_DURATION = 450;
 /** Fade-out duration for the ripples in milliseconds. This can't be modified by the speedFactor. */
 export const RIPPLE_FADE_OUT_DURATION = 400;
 
+/**
+ * Timeout for ignoring mouse events. Mouse events will be temporary ignored after touch
+ * events to avoid synthetic mouse events.
+ */
+const IGNORE_MOUSE_EVENTS_TIMEOUT = 800;
+
 export type RippleConfig = {
   color?: string;
   centered?: boolean;
@@ -40,8 +46,8 @@ export class RippleRenderer {
   /** Element which triggers the ripple elements on mouse events. */
   private _triggerElement: HTMLElement | null;
 
-  /** Whether the mouse is currently down or not. */
-  private _isMousedown: boolean = false;
+  /** Whether the pointer is currently down or not. */
+  private _isPointerDown = false;
 
   /** Events to be registered on the trigger element. */
   private _triggerEvents = new Map<string, any>();
@@ -49,6 +55,9 @@ export class RippleRenderer {
   /** Set of currently active ripple references. */
   private _activeRipples = new Set<RippleRef>();
 
+  /** Time in milliseconds when the last touchstart event happened. */
+  private _lastTouchStartEvent: number;
+
   /** Ripple config for all ripples created by events. */
   rippleConfig: RippleConfig = {};
 
@@ -62,8 +71,11 @@ export class RippleRenderer {
 
       // Specify events which need to be registered on the trigger.
       this._triggerEvents.set('mousedown', this.onMousedown.bind(this));
-      this._triggerEvents.set('mouseup', this.onMouseup.bind(this));
-      this._triggerEvents.set('mouseleave', this.onMouseup.bind(this));
+      this._triggerEvents.set('mouseup', this.onPointerUp.bind(this));
+      this._triggerEvents.set('mouseleave', this.onPointerUp.bind(this));
+
+      this._triggerEvents.set('touchstart', this.onTouchStart.bind(this));
+      this._triggerEvents.set('touchend', this.onPointerUp.bind(this));
 
       // By default use the host element as trigger element.
       this.setTriggerElement(this._containerElement);
@@ -110,7 +122,7 @@ export class RippleRenderer {
     ripple.style.transform = 'scale(1)';
 
     // Exposed reference to the ripple that will be returned.
-    let rippleRef = new RippleRef(this, ripple, config);
+    const rippleRef = new RippleRef(this, ripple, config);
 
     rippleRef.state = RippleState.FADING_IN;
 
@@ -122,7 +134,7 @@ export class RippleRenderer {
     this.runTimeoutOutsideZone(() => {
       rippleRef.state = RippleState.VISIBLE;
 
-      if (!config.persistent && !this._isMousedown) {
+      if (!config.persistent && !this._isPointerDown) {
         rippleRef.fadeOut();
       }
     }, duration);
@@ -137,7 +149,7 @@ export class RippleRenderer {
       return;
     }
 
-    let rippleEl = rippleRef.element;
+    const rippleEl = rippleRef.element;
 
     rippleEl.style.transitionDuration = `${RIPPLE_FADE_OUT_DURATION}ms`;
     rippleEl.style.opacity = '0';
@@ -175,21 +187,37 @@ export class RippleRenderer {
     this._triggerElement = element;
   }
 
-  /** Function being called whenever the trigger is being pressed. */
+  /** Function being called whenever the trigger is being pressed using mouse. */
   private onMousedown(event: MouseEvent) {
-    if (!this.rippleDisabled) {
-      this._isMousedown = true;
+    const isSyntheticEvent = this._lastTouchStartEvent &&
+        Date.now() < this._lastTouchStartEvent + IGNORE_MOUSE_EVENTS_TIMEOUT;
+
+    if (!this.rippleDisabled && !isSyntheticEvent) {
+      this._isPointerDown = true;
       this.fadeInRipple(event.clientX, event.clientY, this.rippleConfig);
     }
   }
 
+  /** Function being called whenever the trigger is being pressed using touch. */
+  private onTouchStart(event: TouchEvent) {
+    if (!this.rippleDisabled) {
+      // Some browsers fire mouse events after a `touchstart` event. Those synthetic mouse
+      // events will launch a second ripple if we don't ignore mouse events for a specific
+      // time after a touchstart event.
+      this._lastTouchStartEvent = Date.now();
+      this._isPointerDown = true;
+
+      this.fadeInRipple(event.touches[0].clientX, event.touches[0].clientY, this.rippleConfig);
+    }
+  }
+
   /** Function being called whenever the trigger is being released. */
-  private onMouseup() {
-    if (!this._isMousedown) {
+  private onPointerUp() {
+    if (!this._isPointerDown) {
       return;
     }
 
-    this._isMousedown = false;
+    this._isPointerDown = false;
 
     // Fade-out all ripples that are completely visible and not persistent.
     this._activeRipples.forEach(ripple => {
diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
index 709569d927b1..09517ba85ffb 100644
--- a/src/lib/core/ripple/ripple.spec.ts
+++ b/src/lib/core/ripple/ripple.spec.ts
@@ -1,7 +1,7 @@
 import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing';
 import {Component, ViewChild} from '@angular/core';
 import {Platform} from '@angular/cdk/platform';
-import {dispatchMouseEvent} from '@angular/cdk/testing';
+import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing';
 import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer';
 import {
   MatRipple, MatRippleModule, MAT_RIPPLE_GLOBAL_OPTIONS, RippleState, RippleGlobalOptions
@@ -104,6 +104,34 @@ describe('MatRipple', () => {
       expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(2);
     });
 
+    it('should launch ripples on touchstart', fakeAsync(() => {
+      dispatchTouchEvent(rippleTarget, 'touchstart');
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
+
+      tick(RIPPLE_FADE_IN_DURATION);
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
+
+      dispatchTouchEvent(rippleTarget, 'touchend');
+
+      tick(RIPPLE_FADE_OUT_DURATION);
+
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
+    }));
+
+    it('should ignore synthetic mouse events after touchstart', () => fakeAsync(() => {
+      dispatchTouchEvent(rippleTarget, 'touchstart');
+      dispatchTouchEvent(rippleTarget, 'mousedown');
+
+      tick(RIPPLE_FADE_IN_DURATION);
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(1);
+
+      dispatchTouchEvent(rippleTarget, 'touchend');
+
+      tick(RIPPLE_FADE_OUT_DURATION);
+
+      expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
+    }));
+
     it('removes ripple after timeout', fakeAsync(() => {
       dispatchMouseEvent(rippleTarget, 'mousedown');
       dispatchMouseEvent(rippleTarget, 'mouseup');

From d6fec3573cbc854d5bf67d920c5b0f8a6eef0c86 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Tue, 28 Nov 2017 21:09:27 +0100
Subject: [PATCH 561/575] feat(form-field): add support for separate label and
 placeholder (#8223)

* feat(form-field): add support for separate label and placeholder

* Adds the ability for the user to specify both a label and placeholder text for a form field.
* Renames all of the "floating placeholder" related terminology to refer to a "floating label" instead.
* Aligns the input placeholder color with the Material spec.

Fixes #6194.

* fix: add transition to placeholder text
---
 .github/CODEOWNERS                            |   1 +
 .../creating-a-custom-form-field-control.md   |   6 +-
 src/demo-app/a11y/input/input-a11y.html       |   8 +-
 .../autocomplete/autocomplete-demo.html       |   2 +-
 src/demo-app/input/input-demo.html            | 105 +++++++++++-
 src/demo-app/input/input-demo.ts              |  11 ++
 src/demo-app/select/select-demo.html          |   4 +-
 src/demo-app/select/select-demo.ts            |   2 +-
 src/lib/autocomplete/autocomplete-trigger.ts  |  38 ++---
 src/lib/autocomplete/autocomplete.spec.ts     |  60 +++----
 src/lib/chips/chip-list.ts                    |   2 +-
 src/lib/core/label/label-options.ts           |  25 +++
 .../core/placeholder/placeholder-options.ts   |  25 ---
 src/lib/core/public-api.ts                    |  11 +-
 src/lib/core/style/_form-common.scss          |  11 ++
 src/lib/form-field/_form-field-theme.scss     |  50 +++---
 src/lib/form-field/form-field-control.ts      |   8 +-
 src/lib/form-field/form-field-module.ts       |   3 +
 src/lib/form-field/form-field.html            |  30 +++-
 src/lib/form-field/form-field.md              |  34 ++--
 src/lib/form-field/form-field.scss            |  33 ++--
 src/lib/form-field/form-field.ts              |  79 +++++----
 src/lib/form-field/label.ts                   |  16 ++
 src/lib/form-field/placeholder.ts             |   2 +-
 src/lib/form-field/public-api.ts              |   2 +-
 src/lib/input/_input-theme.scss               |   7 +
 src/lib/input/input.scss                      |  25 ++-
 src/lib/input/input.spec.ts                   | 152 ++++++++++++------
 src/lib/input/input.ts                        |   2 +-
 src/lib/select/_select-theme.scss             |   4 +
 src/lib/select/select.html                    |  12 +-
 src/lib/select/select.scss                    |  18 ++-
 src/lib/select/select.spec.ts                 |  76 ++++-----
 src/lib/select/select.ts                      |   2 +-
 src/material-examples/example-module.ts       |  10 +-
 .../form-field-custom-control-example.ts      |   4 +-
 .../form-field-label-example.css}             |   0
 .../form-field-label-example.html}            |  13 +-
 .../form-field-label-example.ts               |  19 +++
 .../form-field-placeholder-example.ts         |  19 ---
 40 files changed, 617 insertions(+), 314 deletions(-)
 create mode 100644 src/lib/core/label/label-options.ts
 delete mode 100644 src/lib/core/placeholder/placeholder-options.ts
 create mode 100644 src/lib/form-field/label.ts
 rename src/material-examples/{form-field-placeholder/form-field-placeholder-example.css => form-field-label/form-field-label-example.css} (100%)
 rename src/material-examples/{form-field-placeholder/form-field-placeholder-example.html => form-field-label/form-field-label-example.html} (71%)
 create mode 100644 src/material-examples/form-field-label/form-field-label-example.ts
 delete mode 100644 src/material-examples/form-field-placeholder/form-field-placeholder-example.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 021ad34aef1a..34fcc471d7ec 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -41,6 +41,7 @@
 /src/lib/core/line/**                              @jelbourn
 /src/lib/core/option/**                            @kara @crisbeto
 /src/lib/core/placeholder/**                       @kara @mmalerba
+/src/lib/core/label/**                             @kara @mmalerba
 /src/lib/core/ripple/**                            @devversion
 /src/lib/core/selection/**                         @tinayuangao @jelbourn
 /src/lib/core/selection/pseudo*/**                 @crisbeto @jelbourn
diff --git a/guides/creating-a-custom-form-field-control.md b/guides/creating-a-custom-form-field-control.md
index 479670ec5082..738b24b25d73 100644
--- a/guides/creating-a-custom-form-field-control.md
+++ b/guides/creating-a-custom-form-field-control.md
@@ -211,16 +211,16 @@ get empty() {
 }
 ```
 
-#### `shouldPlaceholderFloat`
+#### `shouldLabelFloat`
 
-This property is used to indicate whether the placeholder should be in the floating position. We'll
+This property is used to indicate whether the label should be in the floating position. We'll
 use the same logic as `matInput` and float the placeholder when the input is focused or non-empty.
 Since the placeholder will be overlapping our control when when it's not floating, we should hide
 the `–` characters when it's not floating.
 
 ```ts
 @HostBinding('class.floating')
-get shouldPlaceholderFloat() {
+get shouldLabelFloat() {
   return this.focused || !this.empty;
 }
 ```
diff --git a/src/demo-app/a11y/input/input-a11y.html b/src/demo-app/a11y/input/input-a11y.html
index 8129ee38d788..cb9d19dfb345 100644
--- a/src/demo-app/a11y/input/input-a11y.html
+++ b/src/demo-app/a11y/input/input-a11y.html
@@ -1,9 +1,9 @@
 <section>
   <h2>Basic input box (e.g. name field)</h2>
-  <mat-form-field floatPlaceholder="never">
+  <mat-form-field floatLabel="never">
     <input matInput placeholder="First name" [(ngModel)]="firstName">
   </mat-form-field>
-  <mat-form-field floatPlaceholder="never">
+  <mat-form-field floatLabel="never">
     <input matInput placeholder="Last name" [(ngModel)]="lastName">
   </mat-form-field>
 </section>
@@ -34,12 +34,12 @@ <h2>Input with error message (e.g. email field)</h2>
 
 <section>
   <h2>Input with prefix & suffix (e.g. currency converter)</h2>
-  <mat-form-field floatPlaceholder="always">
+  <mat-form-field floatLabel="always">
     <input matInput type="number" placeholder="USD" [(ngModel)]="usd">
     <span matPrefix>$</span>
   </mat-form-field>
   =
-  <mat-form-field floatPlaceholder="always">
+  <mat-form-field floatLabel="always">
     <input matInput type="number" placeholder="JPY" [(ngModel)]="jpy">
     <span matPrefix>‎¥‎</span>
   </mat-form-field>
diff --git a/src/demo-app/autocomplete/autocomplete-demo.html b/src/demo-app/autocomplete/autocomplete-demo.html
index ea1486b288a6..04321b056aa5 100644
--- a/src/demo-app/autocomplete/autocomplete-demo.html
+++ b/src/demo-app/autocomplete/autocomplete-demo.html
@@ -6,7 +6,7 @@
     <div>Reactive value: {{ stateCtrl.value | json }}</div>
     <div>Reactive dirty: {{ stateCtrl.dirty }}</div>
 
-    <mat-form-field floatPlaceholder="never">
+    <mat-form-field floatLabel="never">
       <input matInput placeholder="State" [matAutocomplete]="reactiveAuto" [formControl]="stateCtrl">
       <mat-autocomplete #reactiveAuto="matAutocomplete" [displayWith]="displayFn">
         <mat-option *ngFor="let state of reactiveStates | async" [value]="state">
diff --git a/src/demo-app/input/input-demo.html b/src/demo-app/input/input-demo.html
index deeb7cdaf4cd..f78f62e0dd34 100644
--- a/src/demo-app/input/input-demo.html
+++ b/src/demo-app/input/input-demo.html
@@ -384,12 +384,115 @@ <h4>Textarea</h4>
     </button>
     <div>
       <mat-form-field>
-          <input matInput placeholder="delayed value" [formControl]="delayedFormControl">
+        <input matInput placeholder="delayed value" [formControl]="delayedFormControl">
       </mat-form-field>
     </div>
   </mat-card-content>
 </mat-card>
 
+
+<mat-card class="demo-card demo-basic">
+  <mat-toolbar color="primary">Floating labels</mat-toolbar>
+
+  <mat-card-content>
+    <div>
+      <mat-form-field>
+        <input matInput [formControl]="placeholderTestControl">
+      </mat-form-field>
+
+      <mat-form-field>
+        <input matInput [formControl]="placeholderTestControl" placeholder="Only placeholder">
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label>Only label</mat-label>
+        <input matInput [formControl]="placeholderTestControl">
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label>Label and placeholder</mat-label>
+        <input matInput [formControl]="placeholderTestControl" placeholder="This is the placeholder">
+      </mat-form-field>
+
+      <mat-form-field floatLabel="always">
+        <mat-label>Always float</mat-label>
+        <input matInput [formControl]="placeholderTestControl" placeholder="This is the placeholder">
+      </mat-form-field>
+
+      <mat-form-field floatLabel="never">
+        <mat-label>Never float</mat-label>
+        <input matInput [formControl]="placeholderTestControl" placeholder="This is the placeholder">
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label>Label and placeholder element</mat-label>
+        <mat-placeholder>The placeholder element</mat-placeholder>
+        <input matInput [formControl]="placeholderTestControl">
+      </mat-form-field>
+    </div>
+
+    <div>
+      <mat-form-field>
+        <mat-select [formControl]="placeholderTestControl">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-select [formControl]="placeholderTestControl" placeholder="Only placeholder">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label>Only label</mat-label>
+        <mat-select [formControl]="placeholderTestControl">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label>Label and placeholder</mat-label>
+        <mat-select [formControl]="placeholderTestControl" placeholder="This is the placeholder">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field floatLabel="always">
+        <mat-label>Always float</mat-label>
+        <mat-select [formControl]="placeholderTestControl" placeholder="This is the placeholder">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field floatLabel="never">
+        <mat-label>Never float</mat-label>
+        <mat-select [formControl]="placeholderTestControl" placeholder="This is the placeholder">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+
+      <mat-form-field>
+        <mat-label>Label and placeholder element</mat-label>
+        <mat-placeholder>The placeholder element</mat-placeholder>
+        <mat-select [formControl]="placeholderTestControl">
+          <mat-option value="Value">Value</mat-option>
+        </mat-select>
+      </mat-form-field>
+    </div>
+
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="togglePlaceholderTestValue()">Toggle value</button>
+
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="togglePlaceholderTestTouched()">Toggle touched</button>
+  </mat-card-content>
+</mat-card>
+
 <mat-card class="demo-card demo-basic">
   <mat-toolbar color="primary">Textarea Autosize</mat-toolbar>
   <mat-card-content>
diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts
index 8545e3c0c71c..67cc69667381 100644
--- a/src/demo-app/input/input-demo.ts
+++ b/src/demo-app/input/input-demo.ts
@@ -29,6 +29,7 @@ export class InputDemo {
   hideRequiredMarker: boolean;
   ctrlDisabled = false;
   textareaNgModelValue: string;
+  placeholderTestControl = new FormControl('', Validators.required);
 
   name: string;
   errorMessageExample1: string;
@@ -73,4 +74,14 @@ export class InputDemo {
       return false;
     }
   };
+
+  togglePlaceholderTestValue() {
+    this.placeholderTestControl.setValue(this.placeholderTestControl.value === '' ? 'Value' : '');
+  }
+
+  togglePlaceholderTestTouched() {
+    this.placeholderTestControl.touched ?
+      this.placeholderTestControl.markAsUntouched() :
+      this.placeholderTestControl.markAsTouched();
+  }
 }
diff --git a/src/demo-app/select/select-demo.html b/src/demo-app/select/select-demo.html
index 1ce8ef756f15..dd1ca63c25a5 100644
--- a/src/demo-app/select/select-demo.html
+++ b/src/demo-app/select/select-demo.html
@@ -6,7 +6,7 @@
   <mat-card>
     <mat-card-subtitle>ngModel</mat-card-subtitle>
 
-    <mat-form-field [floatPlaceholder]="floatPlaceholder" [color]="drinksTheme">
+    <mat-form-field [floatLabel]="floatLabel" [color]="drinksTheme">
       <mat-select placeholder="Drink" [(ngModel)]="currentDrink" [required]="drinksRequired"
         [disabled]="drinksDisabled" #drinkControl="ngModel">
         <mat-option>None</mat-option>
@@ -24,7 +24,7 @@
     <p> Status: {{ drinkControl.control?.status }} </p>
     <p>
       <label for="floating-placeholder">Floating placeholder:</label>
-      <select [(ngModel)]="floatPlaceholder" id="floating-placeholder">
+      <select [(ngModel)]="floatLabel" id="floating-placeholder">
         <option value="auto">Auto</option>
         <option value="always">Always</option>
         <option value="never">Never</option>
diff --git a/src/demo-app/select/select-demo.ts b/src/demo-app/select/select-demo.ts
index 5ed9b2cd70b4..f97649fdd1cd 100644
--- a/src/demo-app/select/select-demo.ts
+++ b/src/demo-app/select/select-demo.ts
@@ -29,7 +29,7 @@ export class SelectDemo {
   currentPokemonFromGroup: string;
   currentDigimon: string;
   latestChangeEvent: MatSelectChange;
-  floatPlaceholder: string = 'auto';
+  floatLabel: string = 'auto';
   foodControl = new FormControl('pizza-1');
   topHeightCtrl = new FormControl(0);
   drinksTheme = 'primary';
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
index 2503da3e2d09..1e328390e6be 100644
--- a/src/lib/autocomplete/autocomplete-trigger.ts
+++ b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -123,8 +123,8 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   /** Strategy that is used to position the panel. */
   private _positionStrategy: ConnectedPositionStrategy;
 
-  /** Whether or not the placeholder state is being overridden. */
-  private _manuallyFloatingPlaceholder = false;
+  /** Whether or not the label state is being overridden. */
+  private _manuallyFloatingLabel = false;
 
   /** The subscription for closing actions (some are bound to document). */
   private _closingActionsSubscription: Subscription;
@@ -163,7 +163,7 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   /** Opens the autocomplete suggestion panel. */
   openPanel(): void {
     this._attachOverlay();
-    this._floatPlaceholder();
+    this._floatLabel();
   }
 
   /** Closes the autocomplete suggestion panel. */
@@ -173,14 +173,14 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
       this._closingActionsSubscription.unsubscribe();
     }
 
-    this._resetPlaceholder();
+    this._resetLabel();
 
     if (this._panelOpen) {
       this.autocomplete._isOpen = this._panelOpen = false;
 
       // We need to trigger change detection manually, because
       // `fromEvent` doesn't seem to do it at the proper time.
-      // This ensures that the placeholder is reset when the
+      // This ensures that the label is reset when the
       // user clicks outside.
       this._changeDetectorRef.detectChanges();
     }
@@ -307,33 +307,33 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
   _handleFocus(): void {
     if (!this._element.nativeElement.readOnly) {
       this._attachOverlay();
-      this._floatPlaceholder(true);
+      this._floatLabel(true);
     }
   }
 
   /**
-   * In "auto" mode, the placeholder will animate down as soon as focus is lost.
+   * In "auto" mode, the label will animate down as soon as focus is lost.
    * This causes the value to jump when selecting an option with the mouse.
-   * This method manually floats the placeholder until the panel can be closed.
-   * @param shouldAnimate Whether the placeholder should be animated when it is floated.
+   * This method manually floats the label until the panel can be closed.
+   * @param shouldAnimate Whether the label should be animated when it is floated.
    */
-  private _floatPlaceholder(shouldAnimate = false): void {
-    if (this._formField && this._formField.floatPlaceholder === 'auto') {
+  private _floatLabel(shouldAnimate = false): void {
+    if (this._formField && this._formField.floatLabel === 'auto') {
       if (shouldAnimate) {
-        this._formField._animateAndLockPlaceholder();
+        this._formField._animateAndLockLabel();
       } else {
-        this._formField.floatPlaceholder = 'always';
+        this._formField.floatLabel = 'always';
       }
 
-      this._manuallyFloatingPlaceholder = true;
+      this._manuallyFloatingLabel = true;
     }
   }
 
-  /** If the placeholder has been manually elevated, return it to its normal state. */
-  private _resetPlaceholder(): void  {
-    if (this._manuallyFloatingPlaceholder) {
-      this._formField.floatPlaceholder = 'auto';
-      this._manuallyFloatingPlaceholder = false;
+  /** If the label has been manually elevated, return it to its normal state. */
+  private _resetLabel(): void  {
+    if (this._manuallyFloatingLabel) {
+      this._formField.floatLabel = 'auto';
+      this._manuallyFloatingLabel = false;
     }
   }
 
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 7d5bc2abe538..1bdfaf586fd4 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -63,7 +63,7 @@ describe('MatAutocomplete', () => {
         AutocompleteWithOnPushDelay,
         AutocompleteWithNativeInput,
         AutocompleteWithoutPanel,
-        AutocompleteWithFormsAndNonfloatingPlaceholder,
+        AutocompleteWithFormsAndNonfloatingLabel,
         AutocompleteWithGroups,
         AutocompleteWithSelectEvent,
       ],
@@ -284,8 +284,8 @@ describe('MatAutocomplete', () => {
 
     it('should keep the label floating until the panel closes', async(() => {
       fixture.componentInstance.trigger.openPanel();
-      expect(fixture.componentInstance.formField.floatPlaceholder)
-          .toEqual('always', 'Expected placeholder to float as soon as panel opens.');
+      expect(fixture.componentInstance.formField.floatLabel)
+          .toEqual('always', 'Expected label to float as soon as panel opens.');
 
       fixture.whenStable().then(() => {
         fixture.detectChanges();
@@ -295,8 +295,8 @@ describe('MatAutocomplete', () => {
         options[1].click();
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.formField.floatPlaceholder)
-            .toEqual('auto', 'Expected placeholder to return to auto state after panel closes.');
+        expect(fixture.componentInstance.formField.floatLabel)
+            .toEqual('auto', 'Expected label to return to auto state after panel closes.');
       });
     }));
 
@@ -312,13 +312,13 @@ describe('MatAutocomplete', () => {
           .toBe(false, `Expected panel state to stay closed.`);
     });
 
-   it('should not mess with placeholder placement if set to never', async(() => {
-      fixture.componentInstance.placeholder = 'never';
+   it('should not mess with label placement if set to never', async(() => {
+      fixture.componentInstance.floatLabel = 'never';
       fixture.detectChanges();
 
       fixture.componentInstance.trigger.openPanel();
-      expect(fixture.componentInstance.formField.floatPlaceholder)
-          .toEqual('never', 'Expected placeholder to stay static.');
+      expect(fixture.componentInstance.formField.floatLabel)
+          .toEqual('never', 'Expected label to stay static.');
 
       fixture.whenStable().then(() => {
         fixture.detectChanges();
@@ -328,18 +328,18 @@ describe('MatAutocomplete', () => {
         options[1].click();
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.formField.floatPlaceholder)
-            .toEqual('never', 'Expected placeholder to stay in static state after close.');
+        expect(fixture.componentInstance.formField.floatLabel)
+            .toEqual('never', 'Expected label to stay in static state after close.');
       });
     }));
 
-    it('should not mess with placeholder placement if set to always', async(() => {
-      fixture.componentInstance.placeholder = 'always';
+    it('should not mess with label placement if set to always', async(() => {
+      fixture.componentInstance.floatLabel = 'always';
       fixture.detectChanges();
 
       fixture.componentInstance.trigger.openPanel();
-      expect(fixture.componentInstance.formField.floatPlaceholder)
-          .toEqual('always', 'Expected placeholder to stay elevated on open.');
+      expect(fixture.componentInstance.formField.floatLabel)
+          .toEqual('always', 'Expected label to stay elevated on open.');
 
       fixture.whenStable().then(() => {
         fixture.detectChanges();
@@ -349,8 +349,8 @@ describe('MatAutocomplete', () => {
         options[1].click();
         fixture.detectChanges();
 
-        expect(fixture.componentInstance.formField.floatPlaceholder)
-            .toEqual('always', 'Expected placeholder to stay elevated after close.');
+        expect(fixture.componentInstance.formField.floatLabel)
+            .toEqual('always', 'Expected label to stay elevated after close.');
       });
     }));
 
@@ -385,14 +385,14 @@ describe('MatAutocomplete', () => {
           .toContain('mat-autocomplete-visible', 'Expected panel to be visible.');
     }));
 
-    it('should animate the placeholder when the input is focused', () => {
+    it('should animate the label when the input is focused', () => {
       const inputContainer = fixture.componentInstance.formField;
 
-      spyOn(inputContainer, '_animateAndLockPlaceholder');
-      expect(inputContainer._animateAndLockPlaceholder).not.toHaveBeenCalled();
+      spyOn(inputContainer, '_animateAndLockLabel');
+      expect(inputContainer._animateAndLockLabel).not.toHaveBeenCalled();
 
       dispatchFakeEvent(fixture.debugElement.query(By.css('input')).nativeElement, 'focusin');
-      expect(inputContainer._animateAndLockPlaceholder).toHaveBeenCalled();
+      expect(inputContainer._animateAndLockLabel).toHaveBeenCalled();
     });
 
     it('should provide the open state of the panel', async(() => {
@@ -1500,19 +1500,19 @@ describe('MatAutocomplete', () => {
       }).not.toThrow();
     }));
 
-    it('should hide the placeholder with a preselected form control value ' +
-      'and a disabled floating placeholder', fakeAsync(() => {
-        const fixture = TestBed.createComponent(AutocompleteWithFormsAndNonfloatingPlaceholder);
+    it('should hide the label with a preselected form control value ' +
+      'and a disabled floating label', fakeAsync(() => {
+        const fixture = TestBed.createComponent(AutocompleteWithFormsAndNonfloatingLabel);
 
         fixture.detectChanges();
         tick();
         fixture.detectChanges();
 
         const input = fixture.nativeElement.querySelector('input');
-        const placeholder = fixture.nativeElement.querySelector('.mat-form-field-placeholder');
+        const label = fixture.nativeElement.querySelector('.mat-form-field-label');
 
         expect(input.value).toBe('California');
-        expect(placeholder.classList).not.toContain('mat-form-field-empty');
+        expect(label.classList).not.toContain('mat-form-field-empty');
       }));
 
     it('should transfer the mat-autocomplete classes to the panel element', fakeAsync(() => {
@@ -1659,7 +1659,7 @@ describe('MatAutocomplete', () => {
 
 @Component({
   template: `
-    <mat-form-field [floatPlaceholder]="placeholder" [style.width.px]="width">
+    <mat-form-field [floatLabel]="floatLabel" [style.width.px]="width">
       <input matInput placeholder="State" [matAutocomplete]="auto" [formControl]="stateCtrl">
     </mat-form-field>
 
@@ -1674,7 +1674,7 @@ class SimpleAutocomplete implements OnDestroy {
   stateCtrl = new FormControl();
   filteredStates: any[];
   valueSub: Subscription;
-  placeholder = 'auto';
+  floatLabel = 'auto';
   width: number;
 
   @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger;
@@ -1885,7 +1885,7 @@ class AutocompleteWithoutPanel {
 
 @Component({
   template: `
-    <mat-form-field floatPlaceholder="never">
+    <mat-form-field floatLabel="never">
       <input placeholder="State" matInput [matAutocomplete]="auto" [formControl]="formControl">
     </mat-form-field>
 
@@ -1894,7 +1894,7 @@ class AutocompleteWithoutPanel {
     </mat-autocomplete>
   `
 })
-class AutocompleteWithFormsAndNonfloatingPlaceholder {
+class AutocompleteWithFormsAndNonfloatingLabel {
   formControl = new FormControl('California');
 }
 
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index b9031baadf67..804f7ed66e62 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -256,7 +256,7 @@ export class MatChipList extends _MatChipListMixinBase implements MatFormFieldCo
     return (!this._chipInput || this._chipInput.empty) && this.chips.length === 0;
   }
 
-  get shouldPlaceholderFloat(): boolean {
+  get shouldLabelFloat(): boolean {
     return !this.empty || this.focused;
   }
 
diff --git a/src/lib/core/label/label-options.ts b/src/lib/core/label/label-options.ts
new file mode 100644
index 000000000000..67ea0d79f765
--- /dev/null
+++ b/src/lib/core/label/label-options.ts
@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {InjectionToken} from '@angular/core';
+
+/** InjectionToken that can be used to specify the global label options. */
+export const MAT_LABEL_GLOBAL_OPTIONS =
+  new InjectionToken<LabelOptions>('mat-label-global-options');
+
+/** Type for the available floatLabel values. */
+export type FloatLabelType = 'always' | 'never' | 'auto';
+
+/** Configurable options for floating labels. */
+export interface LabelOptions {
+  /**
+   * Whether the label should float `always`, `never`, or `auto` (only when necessary).
+   * Default behavior is assumed to be `auto`.
+   */
+  float?: FloatLabelType;
+}
diff --git a/src/lib/core/placeholder/placeholder-options.ts b/src/lib/core/placeholder/placeholder-options.ts
deleted file mode 100644
index 6808ac43114b..000000000000
--- a/src/lib/core/placeholder/placeholder-options.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 { InjectionToken } from '@angular/core';
-
-/** InjectionToken that can be used to specify the global placeholder options. */
-export const MAT_PLACEHOLDER_GLOBAL_OPTIONS =
-  new InjectionToken<PlaceholderOptions>('mat-placeholder-global-options');
-
-/** Type for the available floatPlaceholder values. */
-export type FloatPlaceholderType = 'always' | 'never' | 'auto';
-
-/** Configurable options for floating placeholders. */
-export interface PlaceholderOptions {
-  /**
-   * Whether the placeholder should float `always`, `never`, or `auto` (only when necessary).
-   * Default behavior is assumed to be `auto`.
-   */
-  float?: FloatPlaceholderType;
-}
diff --git a/src/lib/core/public-api.ts b/src/lib/core/public-api.ts
index 688cf9199f01..c1ef88ff5d92 100644
--- a/src/lib/core/public-api.ts
+++ b/src/lib/core/public-api.ts
@@ -14,10 +14,19 @@ export * from './gestures/gesture-annotations';
 export * from './gestures/gesture-config';
 export * from './line/line';
 export * from './option/index';
-export * from './placeholder/placeholder-options';
+export * from './label/label-options';
 export * from './ripple/index';
 export * from './selection/index';
 export * from './style/index';
 
+/** @deprecated */
+export {MAT_LABEL_GLOBAL_OPTIONS as MAT_PLACEHOLDER_GLOBAL_OPTIONS} from './label/label-options';
+
+/** @deprecated */
+export {FloatLabelType as FloatPlaceholderType} from './label/label-options';
+
+/** @deprecated */
+export {LabelOptions as PlaceholderOptions} from './label/label-options';
+
 // TODO: don't have this
 export * from './testing/month-constants';
diff --git a/src/lib/core/style/_form-common.scss b/src/lib/core/style/_form-common.scss
index 19d0cee24698..a7c0e8db46e1 100644
--- a/src/lib/core/style/_form-common.scss
+++ b/src/lib/core/style/_form-common.scss
@@ -1,3 +1,5 @@
+@import '../theming/theming';
+
 // Renders a gradient for showing the dashed line when the input is disabled.
 // Unlike using a border, a gradient allows us to adjust the spacing of the dotted line
 // to match the Material Design spec.
@@ -6,3 +8,12 @@
   background-size: 4px 1px;
   background-repeat: repeat-x;
 }
+
+// Figures out the color of the placeholder for a form control.
+// Used primarily to prevent the various form controls from
+// becoming out of sync since these colors aren't in a pallette.
+@function _mat-control-placeholder-color($theme) {
+  $foreground: map-get($theme, foreground);
+  $is-dark-theme: map-get($theme, is-dark);
+  @return mat-color($foreground, secondary-text, if($is-dark-theme, 0.5, 0.42));
+}
diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 1f815b4fb2cd..ee21101bc024 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -12,10 +12,10 @@
   $foreground: map-get($theme, foreground);
   $is-dark-theme: map-get($theme, is-dark);
 
-  // Placeholder colors. Required is used for the `*` star shown in the placeholder.
-  $placeholder-color: mat-color($foreground, secondary-text);
-  $focused-placeholder-color: mat-color($primary);
-  $required-placeholder-color: mat-color($accent);
+  // Label colors. Required is used for the `*` star shown in the label.
+  $label-color: mat-color($foreground, secondary-text);
+  $focused-label-color: mat-color($primary);
+  $required-label-color: mat-color($accent);
 
   // Underline colors.
   $underline-color: mat-color($foreground, divider, if($is-dark-theme, 0.7, 0.42));
@@ -23,16 +23,16 @@
   $underline-color-warn: mat-color($warn);
   $underline-focused-color: mat-color($primary);
 
-  .mat-form-field-placeholder {
-    color: $placeholder-color;
+  .mat-form-field-label {
+    color: $label-color;
   }
 
   .mat-hint {
     color: mat-color($foreground, secondary-text);
   }
 
-  .mat-focused .mat-form-field-placeholder {
-    color: $focused-placeholder-color;
+  .mat-focused .mat-form-field-label {
+    color: $focused-label-color;
 
     &.mat-accent {
       color: $underline-color-accent;
@@ -44,7 +44,7 @@
   }
 
   .mat-focused .mat-form-field-required-marker {
-    color: $required-placeholder-color;
+    color: $required-label-color;
   }
 
   .mat-form-field-underline {
@@ -71,7 +71,7 @@
   // achieved with the ng-* classes, we use this approach in order to ensure that the same
   // logic is used to style the error state and to show the error messages.
   .mat-form-field-invalid {
-    .mat-form-field-placeholder {
+    .mat-form-field-label {
       color: $underline-color-warn;
 
       &.mat-accent,
@@ -90,14 +90,14 @@
   }
 }
 
-// Used to make instances of the _mat-form-field-placeholder-floating mixin negligibly different,
+// Used to make instances of the _mat-form-field-label-floating mixin negligibly different,
 // and prevent Google's CSS Optimizer from collapsing the declarations. This is needed because some
 // of the selectors contain pseudo-classes not recognized in all browsers. If a browser encounters
 // an unknown pseudo-class it will discard the entire rule set.
 $dedupe: 0;
 
-// Applies a floating placeholder above the form field control itself.
-@mixin _mat-form-field-placeholder-floating($font-scale, $infix-padding, $infix-margin-top) {
+// Applies a floating label above the form field control itself.
+@mixin _mat-form-field-label-floating($font-scale, $infix-padding, $infix-margin-top) {
   // We use perspective to fix the text blurriness as described here:
   // http://www.useragentman.com/blog/2014/05/04/fixing-typography-inside-of-2-d-css-transforms/
   // This results in a small jitter after the label floats on Firefox, which the
@@ -183,33 +183,33 @@ $dedupe: 0;
   }
 
   .mat-form-field-can-float {
-    &.mat-form-field-should-float .mat-form-field-placeholder,
-    .mat-input-server:focus + .mat-form-field-placeholder-wrapper .mat-form-field-placeholder {
-      @include _mat-form-field-placeholder-floating(
+    &.mat-form-field-should-float .mat-form-field-label,
+    .mat-input-server:focus + .mat-form-field-label-wrapper .mat-form-field-label {
+      @include _mat-form-field-label-floating(
               $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
 
-    .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
-        .mat-form-field-placeholder {
-      @include _mat-form-field-placeholder-floating(
+    .mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-label-wrapper
+        .mat-form-field-label {
+      @include _mat-form-field-label-floating(
               $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
 
-    // Server-side rendered matInput with a placeholder attribute but placeholder not shown
+    // Server-side rendered matInput with a label attribute but label not shown
     // (used as a pure CSS stand-in for mat-form-field-should-float).
-    .mat-input-server[placeholder]:not(:placeholder-shown) + .mat-form-field-placeholder-wrapper
-        .mat-form-field-placeholder {
-      @include _mat-form-field-placeholder-floating(
+    .mat-input-server[label]:not(:label-shown) + .mat-form-field-label-wrapper
+        .mat-form-field-label {
+      @include _mat-form-field-label-floating(
               $subscript-font-scale, $infix-padding, $infix-margin-top);
     }
   }
 
-  .mat-form-field-placeholder-wrapper {
+  .mat-form-field-label-wrapper {
     top: -$infix-margin-top;
     padding-top: $infix-margin-top;
   }
 
-  .mat-form-field-placeholder {
+  .mat-form-field-label {
     top: $infix-margin-top + $infix-padding;
   }
 
diff --git a/src/lib/form-field/form-field-control.ts b/src/lib/form-field/form-field-control.ts
index 7846a0b656c6..8359f9a85c81 100644
--- a/src/lib/form-field/form-field-control.ts
+++ b/src/lib/form-field/form-field-control.ts
@@ -37,7 +37,13 @@ export abstract class MatFormFieldControl<T> {
   readonly empty: boolean;
 
   /** Whether the `MatFormField` label should try to float. */
-  readonly shouldPlaceholderFloat: boolean;
+  readonly shouldLabelFloat?: boolean;
+
+  /**
+   * Whether the `MatFormField` placeholder should try to float.
+   * @deprecated Use `shouldLabelFloat` instead.
+   */
+  readonly shouldPlaceholderFloat?: boolean;
 
   /** Whether the control is required. */
   readonly required: boolean;
diff --git a/src/lib/form-field/form-field-module.ts b/src/lib/form-field/form-field-module.ts
index dd4dff39789a..17bd1dd92e5b 100644
--- a/src/lib/form-field/form-field-module.ts
+++ b/src/lib/form-field/form-field-module.ts
@@ -15,6 +15,7 @@ import {MatHint} from './hint';
 import {MatPlaceholder} from './placeholder';
 import {MatPrefix} from './prefix';
 import {MatSuffix} from './suffix';
+import {MatLabel} from './label';
 
 
 @NgModule({
@@ -25,6 +26,7 @@ import {MatSuffix} from './suffix';
     MatPlaceholder,
     MatPrefix,
     MatSuffix,
+    MatLabel,
   ],
   imports: [
     CommonModule,
@@ -37,6 +39,7 @@ import {MatSuffix} from './suffix';
     MatPlaceholder,
     MatPrefix,
     MatSuffix,
+    MatLabel,
   ],
 })
 export class MatFormFieldModule {}
diff --git a/src/lib/form-field/form-field.html b/src/lib/form-field/form-field.html
index f78d16a64000..9d928b19a5de 100644
--- a/src/lib/form-field/form-field.html
+++ b/src/lib/form-field/form-field.html
@@ -8,24 +8,40 @@
     <div class="mat-input-infix mat-form-field-infix">
       <ng-content></ng-content>
 
-      <span class="mat-input-placeholder-wrapper mat-form-field-placeholder-wrapper">
+      <!--
+        TODO: remove `mat-input-placeholder-wrapper` and `mat-form-field-placeholder-wrapper`
+        next time we do breaking changes.
+      -->
+      <span class="mat-form-field-label-wrapper mat-input-placeholder-wrapper mat-form-field-placeholder-wrapper">
         <!-- We add aria-owns as a workaround for an issue in JAWS & NVDA where the label isn't
              read if it comes before the control in the DOM. -->
-        <label class="mat-input-placeholder mat-form-field-placeholder"
+
+        <!--
+          TODO: remove `mat-input-placeholder` and `mat-form-field-placeholder`
+          next time we do breaking changes.
+        -->
+        <label class="mat-form-field-label mat-input-placeholder mat-form-field-placeholder"
                [attr.for]="_control.id"
                [attr.aria-owns]="_control.id"
                [class.mat-empty]="_control.empty && !_shouldAlwaysFloat"
                [class.mat-form-field-empty]="_control.empty && !_shouldAlwaysFloat"
                [class.mat-accent]="color == 'accent'"
                [class.mat-warn]="color == 'warn'"
-               #placeholder
-               *ngIf="_hasPlaceholder()">
-          <ng-content select="mat-placeholder"></ng-content>
-          {{_control.placeholder}}
+               #label
+               *ngIf="_hasFloatingLabel()"
+               [ngSwitch]="_hasLabel()">
+
+          <ng-container *ngSwitchCase="false">
+            <ng-content select="mat-placeholder"></ng-content>
+            {{_control.placeholder}}
+          </ng-container>
+
+          <ng-content select="mat-label" *ngSwitchCase="true"></ng-content>
+
           <span
             class="mat-placeholder-required mat-form-field-required-marker"
             aria-hidden="true"
-            *ngIf="!hideRequiredMarker && _control.required">*</span>
+            *ngIf="!hideRequiredMarker && _control.required">&nbsp;*</span>
         </label>
       </span>
     </div>
diff --git a/src/lib/form-field/form-field.md b/src/lib/form-field/form-field.md
index 19d954a98e26..c28164137e08 100644
--- a/src/lib/form-field/form-field.md
+++ b/src/lib/form-field/form-field.md
@@ -13,35 +13,39 @@ The following Angular Material components are designed to work inside a `<mat-fo
 
 <!-- example(form-field-overview) -->
 
-### Floating placeholder
+### Floating label
 
-The floating placeholder is a text label displayed on top of the form field control when
-the control does not contain any text. By default, when text is present the floating placeholder
-floats above the form field control.
+The floating label is a text label displayed on top of the form field control when
+the control does not contain any text. By default, when text is present the floating label
+floats above the form field control. The label for a form field can be defined either through a
+`mat-label` element, by setting the `placeholder` attribute on the form control or using the
+`mat-placeholder` element. If there are multiple clashing values (e.g. a `placeholder` and a
+label) the `mat-label` will take precedence and the `placeholder` will be shown only when there is
+no value.
 
 Placeholder text can be specified using the `placeholder` property on the form field control, or
 by adding a `<mat-placeholder>` element inside the form field. Only one of these options should be
 used, specifying both will raise an error.
 
 If the form field control is marked with a `required` attribute, an asterisk will be appended to the
-placeholder to indicate the fact that it is a required field. If unwanted, this can be disabled by
+label to indicate the fact that it is a required field. If unwanted, this can be disabled by
 setting the `hideRequiredMarker` property on `<mat-form-field>`
 
-The `floatPlaceholder` property of `<mat-form-field>` can be used to change this default floating
-behavior. It can set to `never` to hide the placeholder instead of float it when text is present in
-the form field control. It can be set to `always` to float the placeholder even when no text is
+The `floatLabel` property of `<mat-form-field>` can be used to change this default floating
+behavior. It can set to `never` to hide the label instead of float it when text is present in
+the form field control. It can be set to `always` to float the label even when no text is
 present in the form field control. It can also be set to `auto` to restore the default behavior.
 
-<!-- example(form-field-placeholder) -->
+<!-- example(form-field-label) -->
 
-Global default placeholder options can be specified by setting providing a value for
-`MAT_PLACEHOLDER_GLOBAL_OPTIONS` in your application's root module. Like the property, the global
+Global default label options can be specified by setting providing a value for
+`MAT_LABEL_GLOBAL_OPTIONS` in your application's root module. Like the property, the global
 setting can be either `always`, `never`, or `auto`.
 
 ```ts
 @NgModule({
   providers: [
-    {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: {float: 'always'}}
+    {provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: {float: 'always'}}
   ]
 })
 ```
@@ -96,7 +100,7 @@ information on this see the guide on
 ### Theming
 
 `<mat-form-field>` has a `color` property which can be set to `primary`, `accent`, or `warn`. This
-will set the color of the form field underline and floating placeholder based on the theme colors
+will set the color of the form field underline and floating label based on the theme colors
 of your app.
 
 `<mat-form-field>` inherits its `font-size` from its parent element. This can be overridden to an
@@ -112,8 +116,8 @@ mat-form-field.mat-form-field {
 
 ### Accessibility
 
-If a floating placeholder is specified, it will be automatically used as the label for the form
-field control. If no floating placeholder is specified, the user should label the form field control
+If a floating label is specified, it will be automatically used as the label for the form
+field control. If no floating label is specified, the user should label the form field control
 themselves using `aria-label`, `aria-labelledby` or `<label for=...>`.
 
 Any errors and hints added to the form field are automatically added to the form field control's
diff --git a/src/lib/form-field/form-field.scss b/src/lib/form-field/form-field.scss
index 693ec33ea5c3..c0a51303fe03 100644
--- a/src/lib/form-field/form-field.scss
+++ b/src/lib/form-field/form-field.scss
@@ -67,9 +67,9 @@ $mat-form-field-default-infix-width: 180px !default;
   width: $mat-form-field-default-infix-width;
 }
 
-// Used to hide the placeholder overflow on IE, since IE doesn't take transform into account when
+// Used to hide the label overflow on IE, since IE doesn't take transform into account when
 // determining overflow.
-.mat-form-field-placeholder-wrapper {
+.mat-form-field-label-wrapper {
   position: absolute;
   left: 0;
   box-sizing: content-box;
@@ -79,12 +79,11 @@ $mat-form-field-default-infix-width: 180px !default;
   pointer-events: none;  // We shouldn't catch mouse events (let them through).
 }
 
-// The placeholder label. This is invisible unless it is. The logic to show it is
+// The label itself. This is invisible unless it is. The logic to show it is
 // basically `empty || (float && (!empty || focused))`. Float is dependent on the
 // `floatingPlaceholder` property.
-.mat-form-field-placeholder {
-  // The placeholder is after the form field control, but needs to be aligned top-left of the
-  // infix <div>.
+.mat-form-field-label {
+  // The label is after the form field control, but needs to be aligned top-left of the infix <div>.
   position: absolute;
   left: 0;
 
@@ -106,7 +105,7 @@ $mat-form-field-default-infix-width: 180px !default;
   color $swift-ease-out-duration $swift-ease-out-timing-function,
   width $swift-ease-out-duration $swift-ease-out-timing-function;
 
-  // Hide the placeholder initially, and only show it when it's floating or the control is empty.
+  // Hide the label initially, and only show it when it's floating or the control is empty.
   display: none;
 
   [dir='rtl'] & {
@@ -116,18 +115,18 @@ $mat-form-field-default-infix-width: 180px !default;
   }
 }
 
-.mat-form-field-empty.mat-form-field-placeholder,
-.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-placeholder {
+.mat-form-field-empty.mat-form-field-label,
+.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-label {
   display: block;
 }
 
-// Pseudo-class for Chrome and Safari auto-fill to move the placeholder to the floating position.
+// Pseudo-class for Chrome and Safari auto-fill to move the label to the floating position.
 // This is necessary because these browsers do not actually fire any events when a form auto-fill is
 // occurring. Once the autofill is committed, a change event happen and the regular mat-form-field
 // classes take over to fulfill this behaviour.
-.mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-placeholder-wrapper
-    .mat-form-field-placeholder {
-  // The form field will be considered empty if it is autofilled, and therefore the placeholder will
+.mat-form-field-autofill-control:-webkit-autofill + .mat-form-field-label-wrapper
+    .mat-form-field-label {
+  // The form field will be considered empty if it is autofilled, and therefore the label will
   // be shown. Therefore we need to override it to hidden...
   display: none;
 
@@ -150,9 +149,9 @@ $mat-form-field-default-infix-width: 180px !default;
   }
 }
 
-// Disable the placeholder animation when the control is not empty (this prevents placeholder
+// Disable the label animation when the control is not empty (this prevents label
 // animating up when the value is set programmatically).
-.mat-form-field-placeholder:not(.mat-form-field-empty) {
+.mat-form-field-label:not(.mat-form-field-empty) {
   transition: none;
 }
 
@@ -200,9 +199,9 @@ $mat-form-field-default-infix-width: 180px !default;
   overflow: hidden; // prevents multi-line errors from overlapping the control
 }
 
-// Scale down icons in the placeholder and hint to be the same size as the text.
+// Scale down icons in the label and hint to be the same size as the text.
 .mat-form-field-subscript-wrapper,
-.mat-form-field-placeholder-wrapper {
+.mat-form-field-label-wrapper {
   .mat-icon {
     width: 1em;
     height: 1em;
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index c1046cfa3e52..6117e930cc23 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -27,11 +27,7 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-import {
-  FloatPlaceholderType,
-  MAT_PLACEHOLDER_GLOBAL_OPTIONS,
-  PlaceholderOptions,
-} from '@angular/material/core';
+import {FloatLabelType, MAT_LABEL_GLOBAL_OPTIONS, LabelOptions} from '@angular/material/core';
 import {fromEvent} from 'rxjs/observable/fromEvent';
 import {MatError} from './error';
 import {MatFormFieldControl} from './form-field-control';
@@ -42,6 +38,7 @@ import {
 } from './form-field-errors';
 import {MatHint} from './hint';
 import {MatPlaceholder} from './placeholder';
+import {MatLabel} from './label';
 import {MatPrefix} from './prefix';
 import {MatSuffix} from './suffix';
 
@@ -61,7 +58,7 @@ let nextUniqueId = 0;
   // aren't using MatInput.
   styleUrls: ['form-field.css', '../input/input.css'],
   animations: [
-    // TODO(mmalerba): Use angular animations for placeholder animation as well.
+    // TODO(mmalerba): Use angular animations for label animation as well.
     trigger('transitionMessages', [
       state('enter', style({ opacity: 1, transform: 'translateY(0%)' })),
       transition('void => enter', [
@@ -74,8 +71,9 @@ let nextUniqueId = 0;
     'class': 'mat-input-container mat-form-field',
     '[class.mat-input-invalid]': '_control.errorState',
     '[class.mat-form-field-invalid]': '_control.errorState',
-    '[class.mat-form-field-can-float]': '_canPlaceholderFloat',
-    '[class.mat-form-field-should-float]': '_control.shouldPlaceholderFloat || _shouldAlwaysFloat',
+    '[class.mat-form-field-can-float]': '_canLabelFloat',
+    '[class.mat-form-field-should-float]': '_shouldLabelFloat()',
+    '[class.mat-form-field-hide-placeholder]': '_hideControlPlaceholder()',
     '[class.mat-form-field-disabled]': '_control.disabled',
     '[class.mat-focused]': '_control.focused',
     '[class.mat-primary]': 'color == "primary"',
@@ -95,7 +93,7 @@ let nextUniqueId = 0;
 })
 
 export class MatFormField implements AfterViewInit, AfterContentInit, AfterContentChecked {
-  private _placeholderOptions: PlaceholderOptions;
+  private _labelOptions: LabelOptions;
 
   /** Color of the form field underline, based on the theme. */
   @Input() color: 'primary' | 'accent' | 'warn' = 'primary';
@@ -113,16 +111,16 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
   }
   private _hideRequiredMarker: boolean;
 
-  /** Override for the logic that disables the placeholder animation in certain cases. */
+  /** Override for the logic that disables the label animation in certain cases. */
   private _showAlwaysAnimate = false;
 
   /** Whether the floating label should always float or not. */
   get _shouldAlwaysFloat() {
-    return this._floatPlaceholder === 'always' && !this._showAlwaysAnimate;
+    return this._floatLabel === 'always' && !this._showAlwaysAnimate;
   }
 
-  /** Whether the placeholder can float or not. */
-  get _canPlaceholderFloat() { return this._floatPlaceholder !== 'never'; }
+  /** Whether the label can float or not. */
+  get _canLabelFloat() { return this._floatLabel !== 'never'; }
 
   /** State of the mat-hint and mat-error animations. */
   _subscriptAnimationState: string = '';
@@ -139,23 +137,32 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
   // Unique id for the hint label.
   _hintLabelId: string = `mat-hint-${nextUniqueId++}`;
 
-  /** Whether the placeholder should always float, never float or float as the user types. */
+  /**
+   * Whether the placeholder should always float, never float or float as the user types.
+   * @deprecated Use floatLabel instead.
+   */
   @Input()
-  get floatPlaceholder() { return this._floatPlaceholder; }
-  set floatPlaceholder(value: FloatPlaceholderType) {
-    if (value !== this._floatPlaceholder) {
-      this._floatPlaceholder = value || this._placeholderOptions.float || 'auto';
+  get floatPlaceholder() { return this._floatLabel; }
+  set floatPlaceholder(value: FloatLabelType) { this.floatLabel = value; }
+
+  /** Whether the label should always float, never float or float as the user types. */
+  @Input()
+  get floatLabel() { return this._floatLabel; }
+  set floatLabel(value: FloatLabelType) {
+    if (value !== this._floatLabel) {
+      this._floatLabel = value || this._labelOptions.float || 'auto';
       this._changeDetectorRef.markForCheck();
     }
   }
-  private _floatPlaceholder: FloatPlaceholderType;
+  private _floatLabel: FloatLabelType;
 
   /** Reference to the form field's underline element. */
   @ViewChild('underline') underlineRef: ElementRef;
   @ViewChild('connectionContainer') _connectionContainerRef: ElementRef;
-  @ViewChild('placeholder') private _placeholder: ElementRef;
+  @ViewChild('label') private _label: ElementRef;
   @ContentChild(MatFormFieldControl) _control: MatFormFieldControl<any>;
   @ContentChild(MatPlaceholder) _placeholderChild: MatPlaceholder;
+  @ContentChild(MatLabel) _labelChild: MatLabel;
   @ContentChildren(MatError) _errorChildren: QueryList<MatError>;
   @ContentChildren(MatHint) _hintChildren: QueryList<MatHint>;
   @ContentChildren(MatPrefix) _prefixChildren: QueryList<MatPrefix>;
@@ -164,9 +171,9 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
   constructor(
       public _elementRef: ElementRef,
       private _changeDetectorRef: ChangeDetectorRef,
-      @Optional() @Inject(MAT_PLACEHOLDER_GLOBAL_OPTIONS) placeholderOptions: PlaceholderOptions) {
-    this._placeholderOptions = placeholderOptions ? placeholderOptions : {};
-    this.floatPlaceholder = this._placeholderOptions.float || 'auto';
+      @Optional() @Inject(MAT_LABEL_GLOBAL_OPTIONS) labelOptions: LabelOptions) {
+    this._labelOptions = labelOptions ? labelOptions : {};
+    this.floatLabel = this._labelOptions.float || 'auto';
   }
 
   ngAfterContentInit() {
@@ -219,11 +226,27 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
     return ngControl && (ngControl as any)[prop];
   }
 
-  /** Whether the form field has a placeholder. */
   _hasPlaceholder() {
     return !!(this._control.placeholder || this._placeholderChild);
   }
 
+  _hasLabel() {
+    return !!this._labelChild;
+  }
+
+  _shouldLabelFloat() {
+    return this._canLabelFloat && (this._control.shouldLabelFloat ||
+        this._control.shouldPlaceholderFloat || this._shouldAlwaysFloat);
+  }
+
+  _hideControlPlaceholder() {
+    return !this._hasLabel() || !this._shouldLabelFloat();
+  }
+
+  _hasFloatingLabel() {
+    return this._hasLabel() || this._hasPlaceholder();
+  }
+
   /** Determines whether to display hints or errors. */
   _getDisplayedMessages(): 'error' | 'hint' {
     return (this._errorChildren && this._errorChildren.length > 0 &&
@@ -231,12 +254,12 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
   }
 
   /** Animates the placeholder up and locks it in position. */
-  _animateAndLockPlaceholder(): void {
-    if (this._placeholder && this._canPlaceholderFloat) {
+  _animateAndLockLabel(): void {
+    if (this._hasFloatingLabel() && this._canLabelFloat) {
       this._showAlwaysAnimate = true;
-      this._floatPlaceholder = 'always';
+      this._floatLabel = 'always';
 
-      fromEvent(this._placeholder.nativeElement, 'transitionend').pipe(take(1)).subscribe(() => {
+      fromEvent(this._label.nativeElement, 'transitionend').pipe(take(1)).subscribe(() => {
         this._showAlwaysAnimate = false;
       });
 
diff --git a/src/lib/form-field/label.ts b/src/lib/form-field/label.ts
new file mode 100644
index 000000000000..a811a445f2a5
--- /dev/null
+++ b/src/lib/form-field/label.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google LLC 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} from '@angular/core';
+
+
+/** The floating label for a `mat-form-field`. */
+@Directive({
+  selector: 'mat-label'
+})
+export class MatLabel {}
diff --git a/src/lib/form-field/placeholder.ts b/src/lib/form-field/placeholder.ts
index aed894f09022..8c4e6f6cfff5 100644
--- a/src/lib/form-field/placeholder.ts
+++ b/src/lib/form-field/placeholder.ts
@@ -9,7 +9,7 @@
 import {Directive} from '@angular/core';
 
 
-/** The floating placeholder for an `MatFormField`. */
+/** The placeholder text for an `MatFormField`. */
 @Directive({
   selector: 'mat-placeholder'
 })
diff --git a/src/lib/form-field/public-api.ts b/src/lib/form-field/public-api.ts
index 416a3eb17e84..318a140850e1 100644
--- a/src/lib/form-field/public-api.ts
+++ b/src/lib/form-field/public-api.ts
@@ -15,4 +15,4 @@ export * from './hint';
 export * from './placeholder';
 export * from './prefix';
 export * from './suffix';
-
+export * from './label';
diff --git a/src/lib/input/_input-theme.scss b/src/lib/input/_input-theme.scss
index 9cd15260e3c2..206b7449e2f3 100644
--- a/src/lib/input/_input-theme.scss
+++ b/src/lib/input/_input-theme.scss
@@ -2,6 +2,7 @@
 @import '../core/theming/theming';
 @import '../core/style/form-common';
 @import '../core/typography/typography-utils';
+@import '../core/style/vendor-prefixes';
 
 
 @mixin mat-input-theme($theme) {
@@ -11,6 +12,12 @@
   .mat-input-element:disabled {
     color: mat-color($foreground, secondary-text, if($is-dark-theme, 0.7, 0.42));
   }
+
+  .mat-input-element {
+    @include input-placeholder {
+      color: _mat-control-placeholder-color($theme);
+    }
+  }
 }
 
 @mixin mat-input-typography($config) {
diff --git a/src/lib/input/input.scss b/src/lib/input/input.scss
index df6f32feacc0..65992faf949a 100644
--- a/src/lib/input/input.scss
+++ b/src/lib/input/input.scss
@@ -37,13 +37,26 @@
     display: none;
   }
 
-  // Note that we can't use something like visibility: hidden or
-  // display: none, because IE ends up preventing the user from
-  // focusing the input altogether.
   @include input-placeholder {
-    // Needs to be !important, because the placeholder will end up inheriting the
-    // input color in IE, if the consumer overrides it with a higher specificity.
-    color: transparent !important;
+    // Delay the transition until the label has animated about a third of the way through, in
+    // order to prevent the placeholder from overlapping for a split second.
+    transition: color $swift-ease-out-duration $swift-ease-out-duration / 3
+      $swift-ease-out-timing-function;
+  }
+
+  .mat-form-field-hide-placeholder & {
+    // Note that we can't use something like visibility: hidden or
+    // display: none, because IE ends up preventing the user from
+    // focusing the input altogether.
+    @include input-placeholder {
+      // Needs to be !important, because the placeholder will end up inheriting the
+      // input color in IE, if the consumer overrides it with a higher specificity.
+      color: transparent !important;
+
+      // Remove the transition to prevent the placeholder
+      // from overlapping when the label comes back down.
+      transition: none;
+    }
   }
 }
 
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 22d2b4cbba66..0576a067b30d 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -12,9 +12,10 @@ import {
   Validators,
 } from '@angular/forms';
 import {
-  MAT_PLACEHOLDER_GLOBAL_OPTIONS,
+  MAT_LABEL_GLOBAL_OPTIONS,
   ShowOnDirtyErrorStateMatcher,
   ErrorStateMatcher,
+  FloatLabelType,
 } from '@angular/material/core';
 import {
   getMatFormFieldDuplicatedHintError,
@@ -28,7 +29,7 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatInputModule} from './index';
 import {MatInput} from './input';
 
-describe('MatInput without forms', function () {
+describe('MatInput without forms', () => {
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -57,34 +58,35 @@ describe('MatInput without forms', function () {
         MatInputPlaceholderRequiredTestComponent,
         MatInputTextTestController,
         MatInputWithDisabled,
-        MatInputWithDynamicPlaceholder,
+        MatInputWithDynamicLabel,
         MatInputWithId,
         MatInputWithPrefixAndSuffix,
         MatInputWithRequired,
-        MatInputWithStaticPlaceholder,
+        MatInputWithStaticLabel,
         MatInputWithType,
         MatInputWithValueBinding,
         MatInputTextareaWithBindings,
         MatInputWithNgIf,
         MatInputOnPush,
         MatInputWithReadonlyInput,
+        MatInputWithLabelAndPlaceholder,
       ],
     });
 
     TestBed.compileComponents();
   }));
 
-  it('should default to floating placeholders', fakeAsync(() => {
+  it('should default to floating labels', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithId);
     fixture.detectChanges();
 
     let formField = fixture.debugElement.query(By.directive(MatFormField))
         .componentInstance as MatFormField;
-    expect(formField.floatPlaceholder).toBe('auto',
+    expect(formField.floatLabel).toBe('auto',
         'Expected MatInput to set floatingLabel to auto by default.');
   }));
 
-  it('should default to global floating placeholder type', fakeAsync(() => {
+  it('should default to global floating label type', fakeAsync(() => {
     TestBed.resetTestingModule();
     TestBed.configureTestingModule({
       imports: [
@@ -96,7 +98,7 @@ describe('MatInput without forms', function () {
       declarations: [
         MatInputWithId
       ],
-      providers: [{ provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
+      providers: [{ provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
     });
 
     let fixture = TestBed.createComponent(MatInputWithId);
@@ -104,8 +106,8 @@ describe('MatInput without forms', function () {
 
     let formField = fixture.debugElement.query(By.directive(MatFormField))
         .componentInstance as MatFormField;
-    expect(formField.floatPlaceholder).toBe('always',
-        'Expected MatInput to set floatingLabel to always from global option.');
+    expect(formField.floatLabel).toBe('always',
+      'Expected MatInput to set floatingLabel to always from global option.');
   }));
 
   it('should not be treated as empty if type is date',
@@ -179,7 +181,7 @@ describe('MatInput without forms', function () {
   }));
 
   it('should update the placeholder when input entered', fakeAsync(() => {
-    let fixture = TestBed.createComponent(MatInputWithStaticPlaceholder);
+    let fixture = TestBed.createComponent(MatInputWithStaticLabel);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input'));
@@ -201,16 +203,14 @@ describe('MatInput without forms', function () {
   it('should not be empty when the value set before view init', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputWithValueBinding);
     fixture.detectChanges();
+    let labelEl = fixture.debugElement.query(By.css('.mat-form-field-label')).nativeElement;
 
-    let placeholderEl =
-        fixture.debugElement.query(By.css('.mat-form-field-placeholder')).nativeElement;
-
-    expect(placeholderEl.classList).not.toContain('mat-form-field-empty');
+    expect(labelEl.classList).not.toContain('mat-form-field-empty');
 
     fixture.componentInstance.value = '';
     fixture.detectChanges();
 
-    expect(placeholderEl.classList).toContain('mat-form-field-empty');
+    expect(labelEl.classList).toContain('mat-form-field-empty');
   }));
 
   it('should add id', fakeAsync(() => {
@@ -542,8 +542,8 @@ describe('MatInput without forms', function () {
       expect(ariaValue).toBe(`${hintLabel.getAttribute('id')} ${endLabel.getAttribute('id')}`);
     }));
 
-  it('should float when floatPlaceholder is set to default and text is entered', fakeAsync(() => {
-    let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
+  it('should float when floatLabel is set to default and text is entered', fakeAsync(() => {
+    let fixture = TestBed.createComponent(MatInputWithDynamicLabel);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -568,8 +568,8 @@ describe('MatInput without forms', function () {
     expect(formFieldEl.classList).toContain('mat-form-field-should-float');
   }));
 
-  it('should always float the placeholder when floatPlaceholder is set to true', fakeAsync(() => {
-    let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
+  it('should always float the label when floatLabel is set to true', fakeAsync(() => {
+    let fixture = TestBed.createComponent(MatInputWithDynamicLabel);
     fixture.detectChanges();
 
     let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
@@ -591,8 +591,8 @@ describe('MatInput without forms', function () {
   }));
 
 
-  it('should never float the placeholder when floatPlaceholder is set to false', fakeAsync(() => {
-    let fixture = TestBed.createComponent(MatInputWithDynamicPlaceholder);
+  it('should never float the label when floatLabel is set to false', fakeAsync(() => {
+    let fixture = TestBed.createComponent(MatInputWithDynamicLabel);
 
     fixture.componentInstance.shouldFloat = 'never';
     fixture.detectChanges();
@@ -613,23 +613,23 @@ describe('MatInput without forms', function () {
     expect(labelEl.classList).not.toContain('mat-form-field-float');
   }));
 
-  it('should be able to toggle the floating placeholder programmatically', fakeAsync(() => {
+  it('should be able to toggle the floating label programmatically', fakeAsync(() => {
     const fixture = TestBed.createComponent(MatInputWithId);
 
     fixture.detectChanges();
 
     const formField = fixture.debugElement.query(By.directive(MatFormField));
     const containerInstance = formField.componentInstance as MatFormField;
-    const placeholder = formField.nativeElement.querySelector('.mat-form-field-placeholder');
+    const label = formField.nativeElement.querySelector('.mat-form-field-label');
 
-    expect(containerInstance.floatPlaceholder).toBe('auto');
-    expect(placeholder.classList)
+    expect(containerInstance.floatLabel).toBe('auto');
+    expect(label.classList)
         .toContain('mat-form-field-empty', 'Expected input to be considered empty.');
 
-    containerInstance.floatPlaceholder = 'always';
+    containerInstance.floatLabel = 'always';
     fixture.detectChanges();
 
-    expect(placeholder.classList)
+    expect(label.classList)
         .not.toContain('mat-form-field-empty', 'Expected input to be considered not empty.');
   }));
 
@@ -662,15 +662,14 @@ describe('MatInput without forms', function () {
     fixture.detectChanges();
 
     let component = fixture.componentInstance;
-    let placeholder =
-        fixture.debugElement.query(By.css('.mat-form-field-placeholder')).nativeElement;
+    let label = fixture.debugElement.query(By.css('.mat-form-field-label')).nativeElement;
 
-    expect(placeholder.classList).toContain('mat-form-field-empty', 'Input initially empty');
+    expect(label.classList).toContain('mat-form-field-empty', 'Input initially empty');
 
     component.formControl.setValue('something');
     fixture.detectChanges();
 
-    expect(placeholder.classList).not.toContain('mat-form-field-empty', 'Input no longer empty');
+    expect(label.classList).not.toContain('mat-form-field-empty', 'Input no longer empty');
   }));
 
   it('should set the focused class when the input is focused', fakeAsync(() => {
@@ -689,31 +688,29 @@ describe('MatInput without forms', function () {
     expect(container.classList).toContain('mat-focused');
   }));
 
-  it('should be able to animate the placeholder up and lock it in position', fakeAsync(() => {
+  it('should be able to animate the label up and lock it in position', fakeAsync(() => {
     let fixture = TestBed.createComponent(MatInputTextTestController);
     fixture.detectChanges();
 
     let inputContainer = fixture.debugElement.query(By.directive(MatFormField))
         .componentInstance as MatFormField;
-    let placeholder = fixture.debugElement.query(By.css('.mat-input-placeholder')).nativeElement;
+    let label = fixture.debugElement.query(By.css('.mat-form-field-label')).nativeElement;
 
-    expect(inputContainer.floatPlaceholder).toBe('auto');
+    expect(inputContainer.floatLabel).toBe('auto');
 
-    inputContainer._animateAndLockPlaceholder();
+    inputContainer._animateAndLockLabel();
     fixture.detectChanges();
 
     expect(inputContainer._shouldAlwaysFloat).toBe(false);
-    expect(inputContainer.floatPlaceholder).toBe('always');
+    expect(inputContainer.floatLabel).toBe('always');
 
-    const fakeEvent = Object.assign(createFakeEvent('transitionend'), {
-      propertyName: 'transform'
-    });
+    const fakeEvent = Object.assign(createFakeEvent('transitionend'), {propertyName: 'transform'});
 
-    placeholder.dispatchEvent(fakeEvent);
+    label.dispatchEvent(fakeEvent);
     fixture.detectChanges();
 
     expect(inputContainer._shouldAlwaysFloat).toBe(true);
-    expect(inputContainer.floatPlaceholder).toBe('always');
+    expect(inputContainer.floatLabel).toBe('always');
   }));
 
   it('should not highlight when focusing a readonly input', fakeAsync(() => {
@@ -731,6 +728,57 @@ describe('MatInput without forms', function () {
     expect(input.focused).toBe(false);
     expect(container.classList).not.toContain('mat-focused');
   }));
+
+  it('should only show the native placeholder, when there is a label, on focus', () => {
+    const fixture = TestBed.createComponent(MatInputWithLabelAndPlaceholder);
+    fixture.detectChanges();
+
+    const container = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
+    const label = fixture.debugElement.query(By.css('.mat-form-field-label')).nativeElement;
+    const input = fixture.debugElement.query(By.css('input')).nativeElement;
+
+    expect(container.classList).toContain('mat-form-field-hide-placeholder');
+    expect(container.classList).not.toContain('mat-form-field-should-float');
+    expect(label.textContent.trim()).toBe('Label');
+    expect(input.getAttribute('placeholder')).toBe('Placeholder');
+
+    input.value = 'Value';
+    fixture.detectChanges();
+
+    expect(container.classList).not.toContain('mat-form-field-hide-placeholder');
+    expect(container.classList).toContain('mat-form-field-should-float');
+  });
+
+  it('should always show the native placeholder when floatLabel is set to "always"', () => {
+    const fixture = TestBed.createComponent(MatInputWithLabelAndPlaceholder);
+
+    fixture.componentInstance.floatLabel = 'always';
+    fixture.detectChanges();
+
+    const container = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
+
+    expect(container.classList).not.toContain('mat-form-field-hide-placeholder');
+  });
+
+  it('should not show the native placeholder when floatLabel is set to "never"', () => {
+    const fixture = TestBed.createComponent(MatInputWithLabelAndPlaceholder);
+
+    fixture.componentInstance.floatLabel = 'never';
+    fixture.detectChanges();
+
+    const container = fixture.debugElement.query(By.css('mat-form-field')).nativeElement;
+    const input = fixture.debugElement.query(By.css('input')).nativeElement;
+
+    expect(container.classList).toContain('mat-form-field-hide-placeholder');
+    expect(container.classList).not.toContain('mat-form-field-should-float');
+
+    input.value = 'Value';
+    fixture.detectChanges();
+
+    expect(container.classList).toContain('mat-form-field-hide-placeholder');
+    expect(container.classList).not.toContain('mat-form-field-should-float');
+  });
+
 });
 
 describe('MatInput with forms', () => {
@@ -1237,20 +1285,20 @@ class MatInputWithValueBinding {
 
 @Component({
   template: `
-    <mat-form-field floatPlaceholder="never">
+    <mat-form-field floatLabel="never">
       <input matInput placeholder="Label">
     </mat-form-field>
   `
 })
-class MatInputWithStaticPlaceholder {}
+class MatInputWithStaticLabel {}
 
 @Component({
   template: `
-    <mat-form-field [floatPlaceholder]="shouldFloat">
+    <mat-form-field [floatLabel]="shouldFloat">
       <input matInput placeholder="Label">
     </mat-form-field>`
 })
-class MatInputWithDynamicPlaceholder {
+class MatInputWithDynamicLabel {
   shouldFloat: string = 'always';
 }
 
@@ -1373,3 +1421,15 @@ class MatInputOnPush {
   `
 })
 class MatInputWithReadonlyInput {}
+
+@Component({
+  template: `
+    <mat-form-field [floatLabel]="floatLabel">
+      <mat-label>Label</mat-label>
+      <input matInput placeholder="Placeholder">
+    </mat-form-field>
+  `
+})
+class MatInputWithLabelAndPlaceholder {
+  floatLabel: FloatLabelType;
+}
diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
index 94504ca8997b..9adf81827219 100644
--- a/src/lib/input/input.ts
+++ b/src/lib/input/input.ts
@@ -294,7 +294,7 @@ export class MatInput extends _MatInputMixinBase implements MatFormFieldControl<
   }
 
   // Implemented as part of MatFormFieldControl.
-  get shouldPlaceholderFloat(): boolean { return this.focused || !this.empty; }
+  get shouldLabelFloat(): boolean { return this.focused || !this.empty; }
 
   // Implemented as part of MatFormFieldControl.
   setDescribedByIds(ids: string[]) { this._ariaDescribedby = ids.join(' '); }
diff --git a/src/lib/select/_select-theme.scss b/src/lib/select/_select-theme.scss
index 685f8f2b82a1..cf0d9b13d0d5 100644
--- a/src/lib/select/_select-theme.scss
+++ b/src/lib/select/_select-theme.scss
@@ -58,6 +58,10 @@
   .mat-select.mat-select-disabled .mat-select-arrow {
     color: mat-color($warn);
   }
+
+  .mat-select-placeholder {
+    color: _mat-control-placeholder-color($theme);
+  }
 }
 
 @mixin mat-select-typography($config) {
diff --git a/src/lib/select/select.html b/src/lib/select/select.html
index eb42a39aa6d9..ebe94cefc8c1 100644
--- a/src/lib/select/select.html
+++ b/src/lib/select/select.html
@@ -4,14 +4,10 @@
      (click)="toggle()"
      #origin="cdkOverlayOrigin"
      #trigger>
-  <div class="mat-select-value">
-    <!--
-      TODO(mmalerba): &nbsp; is currently broken in components with preserveWhitespace: false, so we
-      evaluate it as a JS string binding instead. Change back to &nbsp; once it works again.
-    -->
-    <ng-container *ngIf="empty">&nbsp;</ng-container>
-    <span class="mat-select-value-text" *ngIf="!empty" [ngSwitch]="!!customTrigger">
-      <span *ngSwitchDefault>{{ triggerValue }}</span>
+  <div class="mat-select-value" [ngSwitch]="empty">
+    <span class="mat-select-placeholder" *ngSwitchCase="true">{{placeholder || '\u00A0'}}</span>
+    <span class="mat-select-value-text" *ngSwitchCase="false" [ngSwitch]="!!customTrigger">
+      <span *ngSwitchDefault>{{triggerValue}}</span>
       <ng-content select="mat-select-trigger" *ngSwitchCase="true"></ng-content>
     </span>
   </div>
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 7f7dd9af7f0e..7939c435dbd7 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -35,6 +35,7 @@ $mat-select-placeholder-arrow-space: 2 * ($mat-select-arrow-size + $mat-select-a
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .mat-select-value-text {
@@ -82,7 +83,22 @@ $mat-select-placeholder-arrow-space: 2 * ($mat-select-arrow-size + $mat-select-a
     cursor: pointer;
   }
 
-  .mat-form-field-placeholder {
+  .mat-form-field-label {
     width: calc(100% - #{$mat-select-placeholder-arrow-space});
   }
 }
+
+.mat-select-placeholder {
+  // Delay the transition until the label has animated about a third of the way through, in
+  // order to prevent the placeholder from overlapping for a split second.
+  transition: color $swift-ease-out-duration $swift-ease-out-duration / 3
+      $swift-ease-out-timing-function;
+
+  .mat-form-field-hide-placeholder & {
+    color: transparent;
+
+    // Remove the transition to prevent the placeholder
+    // from overlapping when the label comes back down.
+    transition: none;
+  }
+}
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index f4b0d8c79114..e77905353d26 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -40,8 +40,8 @@ import {
 } from '@angular/forms';
 import {
   ErrorStateMatcher,
-  FloatPlaceholderType,
-  MAT_PLACEHOLDER_GLOBAL_OPTIONS,
+  FloatLabelType,
+  MAT_LABEL_GLOBAL_OPTIONS,
   MatOption,
 } from '@angular/material/core';
 import {MatFormFieldModule} from '@angular/material/form-field';
@@ -803,9 +803,9 @@ describe('MatSelect', () => {
         formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
       }));
 
-      it('should not float placeholder if no option is selected', fakeAsync(() => {
+      it('should not float label if no option is selected', fakeAsync(() => {
         expect(formField.classList.contains('mat-form-field-should-float'))
-            .toBe(false, 'placeholder should not be floating');
+            .toBe(false, 'Label should not be floating');
       }));
 
       it('should focus the first option if no option is selected', fakeAsync(() => {
@@ -936,7 +936,7 @@ describe('MatSelect', () => {
         const value = fixture.debugElement.query(By.css('.mat-select-value')).nativeElement;
 
         expect(formField.classList.contains('mat-form-field-should-float'))
-            .toBe(true, 'placeholder should be floating');
+            .toBe(true, 'Label should be floating');
         expect(value.textContent).toContain('Steak');
       }));
 
@@ -1043,7 +1043,7 @@ describe('MatSelect', () => {
 
       it('should set the view value from the form', fakeAsync(() => {
         let value = fixture.debugElement.query(By.css('.mat-select-value'));
-        expect(value.nativeElement.textContent.trim()).toBe('');
+        expect(value.nativeElement.textContent.trim()).toBe('Food');
 
         fixture.componentInstance.control.setValue('pizza-1');
         fixture.detectChanges();
@@ -1088,7 +1088,7 @@ describe('MatSelect', () => {
 
         const value = fixture.debugElement.query(By.css('.mat-select-value'));
         expect(value.nativeElement.textContent.trim())
-            .toBe('', `Expected trigger to be cleared when option value is not found.`);
+            .toBe('Food', `Expected trigger to show the placeholder.`);
         expect(trigger.textContent)
             .not.toContain('Pizza', `Expected trigger is cleared when option value is not found.`);
 
@@ -1112,7 +1112,7 @@ describe('MatSelect', () => {
 
         const value = fixture.debugElement.query(By.css('.mat-select-value'));
         expect(value.nativeElement.textContent.trim())
-            .toBe('', `Expected trigger to be cleared when option value is not found.`);
+            .toBe('Food', `Expected trigger to show the placeholder.`);
         expect(trigger.textContent)
             .not.toContain('Pizza', `Expected trigger is cleared when option value is not found.`);
 
@@ -1188,17 +1188,17 @@ describe('MatSelect', () => {
                 .toEqual(false, `Expected control to stay pristine after programmatic change.`);
           }));
 
-      it('should set an asterisk after the placeholder if control is required', fakeAsync(() => {
+      it('should set an asterisk after the label if control is required', fakeAsync(() => {
         let requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
         expect(requiredMarker)
-            .toBeNull(`Expected placeholder not to have an asterisk, as control was not required.`);
+            .toBeNull(`Expected label not to have an asterisk, as control was not required.`);
 
         fixture.componentInstance.isRequired = true;
         fixture.detectChanges();
 
         requiredMarker = fixture.debugElement.query(By.css('.mat-form-field-required-marker'));
         expect(requiredMarker)
-            .not.toBeNull(`Expected placeholder to have an asterisk, as control was required.`);
+            .not.toBeNull(`Expected label to have an asterisk, as control was required.`);
       }));
     });
 
@@ -1250,16 +1250,16 @@ describe('MatSelect', () => {
         formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
       }));
 
-      it('should float the placeholder when the panel is open and unselected', fakeAsync(() => {
+      it('should float the label when the panel is open and unselected', fakeAsync(() => {
         expect(formField.classList.contains('mat-form-field-should-float'))
-            .toBe(false, 'Expected placeholder to initially have a normal position.');
+            .toBe(false, 'Expected label to initially have a normal position.');
 
         fixture.componentInstance.select.open();
         fixture.detectChanges();
         flush();
 
         expect(formField.classList).toContain('mat-form-field-should-float',
-            'Expected placeholder to animate up to floating position.');
+            'Expected label to animate up to floating position.');
 
         fixture.componentInstance.select.close();
         fixture.detectChanges();
@@ -1611,45 +1611,45 @@ describe('MatSelect', () => {
       }));
   });
 
-  describe('with floatPlaceholder', () => {
-    beforeEach(async(() => configureMatSelectTestingModule([FloatPlaceholderSelect])));
+  describe('with floatLabel', () => {
+    beforeEach(async(() => configureMatSelectTestingModule([FloatLabelSelect])));
 
-    let fixture: ComponentFixture<FloatPlaceholderSelect>;
+    let fixture: ComponentFixture<FloatLabelSelect>;
     let formField: HTMLElement;
 
     beforeEach(fakeAsync(() => {
-      fixture = TestBed.createComponent(FloatPlaceholderSelect);
+      fixture = TestBed.createComponent(FloatLabelSelect);
       fixture.detectChanges();
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
     }));
 
-    it('should be able to disable the floating placeholder', fakeAsync(() => {
-      fixture.componentInstance.floatPlaceholder = 'never';
+    it('should be able to disable the floating label', fakeAsync(() => {
+      fixture.componentInstance.floatLabel = 'never';
       fixture.detectChanges();
 
       expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(false, 'Floating placeholder should be disabled');
+          .toBe(false, 'Floating label should be disabled');
 
       fixture.componentInstance.control.setValue('pizza-1');
       fixture.detectChanges();
 
       expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(false, 'Floating placeholder should be disabled');
+          .toBe(false, 'Floating label should be disabled');
     }));
 
-    it('should be able to always float the placeholder', fakeAsync(() => {
+    it('should be able to always float the label', fakeAsync(() => {
       expect(fixture.componentInstance.control.value).toBeFalsy();
 
-      fixture.componentInstance.floatPlaceholder = 'always';
+      fixture.componentInstance.floatLabel = 'always';
       fixture.detectChanges();
 
       expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(true, 'Placeholder should be able to float');
+          .toBe(true, 'Label should be able to float');
       expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(true, 'Placeholder should be floating');
+          .toBe(true, 'Label should be floating');
     }));
 
-    it ('should default to global floating placeholder type', fakeAsync(() => {
+    it ('should default to global floating label type', fakeAsync(() => {
       fixture.destroy();
 
       TestBed.resetTestingModule();
@@ -1662,20 +1662,20 @@ describe('MatSelect', () => {
           NoopAnimationsModule
         ],
         declarations: [
-          FloatPlaceholderSelect
+          FloatLabelSelect
         ],
-        providers: [{ provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
+        providers: [{ provide: MAT_LABEL_GLOBAL_OPTIONS, useValue: { float: 'always' } }]
       });
 
-      fixture = TestBed.createComponent(FloatPlaceholderSelect);
-      fixture.componentInstance.floatPlaceholder = null;
+      fixture = TestBed.createComponent(FloatLabelSelect);
+      fixture.componentInstance.floatLabel = null;
       fixture.detectChanges();
       formField = fixture.debugElement.query(By.css('.mat-form-field')).nativeElement;
 
       expect(formField.classList.contains('mat-form-field-can-float'))
-          .toBe(true, 'Placeholder should be able to float');
+          .toBe(true, 'Label should be able to float');
       expect(formField.classList.contains('mat-form-field-should-float'))
-          .toBe(true, 'Placeholder should be floating');
+          .toBe(true, 'Label should be floating');
     }));
   });
 
@@ -2231,7 +2231,7 @@ describe('MatSelect', () => {
       expect(fixture.componentInstance.select.value).toBe('sandwich-2');
     }));
 
-    it('should reset the placeholder when a null value is set', fakeAsync(() => {
+    it('should reset the label when a null value is set', fakeAsync(() => {
       const fixture = TestBed.createComponent(BasicSelectWithoutForms);
 
       fixture.detectChanges();
@@ -3610,9 +3610,9 @@ class BasicSelectOnPushPreselected {
 }
 
 @Component({
-  selector: 'floating-placeholder-select',
+  selector: 'floating-label-select',
   template: `
-    <mat-form-field [floatPlaceholder]="floatPlaceholder">
+    <mat-form-field [floatLabel]="floatLabel">
       <mat-select placeholder="Food I want to eat right now" [formControl]="control">
         <mat-option *ngFor="let food of foods" [value]="food.value">
           {{ food.viewValue }}
@@ -3621,8 +3621,8 @@ class BasicSelectOnPushPreselected {
     </mat-form-field>
     `,
 })
-class FloatPlaceholderSelect {
-  floatPlaceholder: FloatPlaceholderType | null = 'auto';
+class FloatLabelSelect {
+  floatLabel: FloatLabelType | null = 'auto';
   control = new FormControl();
   foods: any[] = [
     { value: 'steak-0', viewValue: 'Steak' },
diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts
index bf2cf9dff618..5785e6459ecb 100644
--- a/src/lib/select/select.ts
+++ b/src/lib/select/select.ts
@@ -1196,7 +1196,7 @@ export class MatSelect extends _MatSelectMixinBase implements AfterContentInit,
   }
 
   // Implemented as part of MatFormFieldControl.
-  get shouldPlaceholderFloat(): boolean {
+  get shouldLabelFloat(): boolean {
     return this._panelOpen || !this.empty;
   }
 }
diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts
index 868749123e63..1bb2111e59e8 100644
--- a/src/material-examples/example-module.ts
+++ b/src/material-examples/example-module.ts
@@ -52,7 +52,7 @@ import {MyTelInput,FormFieldCustomControlExample} from './form-field-custom-cont
 import {FormFieldErrorExample} from './form-field-error/form-field-error-example';
 import {FormFieldHintExample} from './form-field-hint/form-field-hint-example';
 import {FormFieldOverviewExample} from './form-field-overview/form-field-overview-example';
-import {FormFieldPlaceholderExample} from './form-field-placeholder/form-field-placeholder-example';
+import {FormFieldLabelExample} from './form-field-label/form-field-label-example';
 import {FormFieldPrefixSuffixExample} from './form-field-prefix-suffix/form-field-prefix-suffix-example';
 import {FormFieldThemingExample} from './form-field-theming/form-field-theming-example';
 import {GridListDynamicExample} from './grid-list-dynamic/grid-list-dynamic-example';
@@ -362,9 +362,9 @@ export const EXAMPLE_COMPONENTS = {
     additionalFiles: null,
     selectorName: null
   },
-  'form-field-placeholder': {
-    title: 'Form field with placeholder ',
-    component: FormFieldPlaceholderExample,
+  'form-field-label': {
+    title: 'Form field with label ',
+    component: FormFieldLabelExample,
     additionalFiles: null,
     selectorName: null
   },
@@ -848,7 +848,7 @@ export const EXAMPLE_LIST = [
   FormFieldErrorExample,
   FormFieldHintExample,
   FormFieldOverviewExample,
-  FormFieldPlaceholderExample,
+  FormFieldLabelExample,
   FormFieldPrefixSuffixExample,
   FormFieldThemingExample,
   GridListDynamicExample,
diff --git a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
index 4a507a8eefe3..4c07a2fadaf7 100644
--- a/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
+++ b/src/material-examples/form-field-custom-control/form-field-custom-control-example.ts
@@ -19,7 +19,7 @@ export class MyTel {
   styleUrls: ['form-field-custom-control-example.css'],
   providers: [{provide: MatFormFieldControl, useExisting: MyTelInput}],
   host: {
-    '[class.floating]': 'shouldPlaceholderFloat',
+    '[class.floating]': 'shouldLabelFloat',
     '[id]': 'id',
     '[attr.aria-describedby]': 'describedBy',
   }
@@ -44,7 +44,7 @@ export class MyTelInput implements MatFormFieldControl<MyTel>, OnDestroy {
     return !n.area && !n.exchange && !n.subscriber;
   }
 
-  get shouldPlaceholderFloat() {
+  get shouldLabelFloat() {
     return this.focused || !this.empty;
   }
 
diff --git a/src/material-examples/form-field-placeholder/form-field-placeholder-example.css b/src/material-examples/form-field-label/form-field-label-example.css
similarity index 100%
rename from src/material-examples/form-field-placeholder/form-field-placeholder-example.css
rename to src/material-examples/form-field-label/form-field-label-example.css
diff --git a/src/material-examples/form-field-placeholder/form-field-placeholder-example.html b/src/material-examples/form-field-label/form-field-label-example.html
similarity index 71%
rename from src/material-examples/form-field-placeholder/form-field-placeholder-example.html
rename to src/material-examples/form-field-label/form-field-label-example.html
index 01ef48d34310..0f7066bbbf0a 100644
--- a/src/material-examples/form-field-placeholder/form-field-placeholder-example.html
+++ b/src/material-examples/form-field-label/form-field-label-example.html
@@ -2,8 +2,8 @@
   <form class="example-container" [formGroup]="options">
     <mat-checkbox formControlName="hideRequired">Hide required marker</mat-checkbox>
     <div>
-      <label>Float placeholder: </label>
-      <mat-radio-group formControlName="floatPlaceholder">
+      <label>Float label: </label>
+      <mat-radio-group formControlName="floatLabel">
         <mat-radio-button value="auto">Auto</mat-radio-button>
         <mat-radio-button value="always">Always</mat-radio-button>
         <mat-radio-button value="never">Never</mat-radio-button>
@@ -13,13 +13,18 @@
 
   <mat-form-field
       [hideRequiredMarker]="options.value.hideRequired"
-      [floatPlaceholder]="options.value.floatPlaceholder">
+      [floatLabel]="options.value.floatLabel">
     <input matInput placeholder="Simple placeholder" required>
   </mat-form-field>
 
+  <mat-form-field [floatLabel]="options.value.floatLabel">
+    <mat-label>Both a label and a placeholder</mat-label>
+    <input matInput placeholder="Simple placeholder">
+  </mat-form-field>
+
   <mat-form-field
       [hideRequiredMarker]="options.value.hideRequired"
-      [floatPlaceholder]="options.value.floatPlaceholder">
+      [floatLabel]="options.value.floatLabel">
     <mat-select required>
       <mat-option>-- None --</mat-option>
       <mat-option value="option">Option</mat-option>
diff --git a/src/material-examples/form-field-label/form-field-label-example.ts b/src/material-examples/form-field-label/form-field-label-example.ts
new file mode 100644
index 000000000000..4ebb56e30908
--- /dev/null
+++ b/src/material-examples/form-field-label/form-field-label-example.ts
@@ -0,0 +1,19 @@
+import {Component} from '@angular/core';
+import {FormBuilder, FormGroup} from '@angular/forms';
+
+/** @title Form field with label */
+@Component({
+  selector: 'form-field-label-example',
+  templateUrl: 'form-field-label-example.html',
+  styleUrls: ['form-field-label-example.css']
+})
+export class FormFieldLabelExample {
+  options: FormGroup;
+
+  constructor(fb: FormBuilder) {
+    this.options = fb.group({
+      hideRequired: false,
+      floatLabel: 'auto',
+    });
+  }
+}
diff --git a/src/material-examples/form-field-placeholder/form-field-placeholder-example.ts b/src/material-examples/form-field-placeholder/form-field-placeholder-example.ts
deleted file mode 100644
index 8d21f1ebb244..000000000000
--- a/src/material-examples/form-field-placeholder/form-field-placeholder-example.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {Component} from '@angular/core';
-import {FormBuilder, FormGroup} from '@angular/forms';
-
-/** @title Form field with placeholder */
-@Component({
-  selector: 'form-field-placeholder-example',
-  templateUrl: 'form-field-placeholder-example.html',
-  styleUrls: ['form-field-placeholder-example.css']
-})
-export class FormFieldPlaceholderExample {
-  options: FormGroup;
-
-  constructor(fb: FormBuilder) {
-    this.options = fb.group({
-      hideRequired: false,
-      floatPlaceholder: 'auto',
-    });
-  }
-}

From 75c665a19d43655522bb79d08739faebe353133a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 29 Nov 2017 19:59:44 +0100
Subject: [PATCH 562/575] fix(tooltip): unable to type in input with tooltip on
 iOS (#8534)

Fixes an issue, caused by HammerJS adding `user-select: none` to the trigger element, that prevents users from being able to type inside inputs on iOS, if they have a tooltip.

Fixes #8331.
---
 src/lib/tooltip/tooltip.spec.ts | 40 ++++++++++++++++++++++++++++++++-
 src/lib/tooltip/tooltip.ts      | 11 ++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index 99f38a7d16c9..a6f25b4e1728 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -43,7 +43,8 @@ describe('MatTooltip', () => {
         BasicTooltipDemo,
         ScrollableTooltipDemo,
         OnPushTooltipDemo,
-        DynamicTooltipsDemo
+        DynamicTooltipsDemo,
+        TooltipOnTextFields
       ],
       providers: [
         {provide: Platform, useValue: {IOS: false, isBrowser: true}},
@@ -679,6 +680,25 @@ describe('MatTooltip', () => {
     }));
   });
 
+  describe('special cases', () => {
+    it('should clear the `user-select` when a tooltip is set on a text field in iOS', () => {
+      TestBed.overrideProvider(Platform, {
+        useValue: {IOS: true, isBrowser: true}
+      });
+
+      const fixture = TestBed.createComponent(TooltipOnTextFields);
+      const instance = fixture.componentInstance;
+
+      fixture.detectChanges();
+
+      expect(instance.input.nativeElement.style.userSelect).toBeFalsy();
+      expect(instance.input.nativeElement.style.webkitUserSelect).toBeFalsy();
+
+      expect(instance.textarea.nativeElement.style.userSelect).toBeFalsy();
+      expect(instance.textarea.nativeElement.style.webkitUserSelect).toBeFalsy();
+    });
+  });
+
 });
 
 @Component({
@@ -764,6 +784,24 @@ class DynamicTooltipsDemo {
   }
 }
 
+@Component({
+  template: `
+    <input
+      #input
+      style="user-select: none; -webkit-user-select: none"
+      matTooltip="Something">
+
+    <textarea
+      #textarea
+      style="user-select: none; -webkit-user-select: none"
+      matTooltip="Another thing"></textarea>
+  `,
+})
+class TooltipOnTextFields {
+  @ViewChild('input') input: ElementRef;
+  @ViewChild('textarea') textarea: ElementRef;
+}
+
 /** Asserts whether a tooltip directive has a tooltip instance. */
 function assertTooltipInstance(tooltip: MatTooltip, shouldExist: boolean): void {
   // Note that we have to cast this to a boolean, because Jasmine will go into an infinite loop
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
index 5fe91edfe4c3..d0cc5c1e6f60 100644
--- a/src/lib/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -182,6 +182,8 @@ export class MatTooltip implements OnDestroy {
     @Inject(MAT_TOOLTIP_SCROLL_STRATEGY) private _scrollStrategy,
     @Optional() private _dir: Directionality) {
 
+    const element: HTMLElement = _elementRef.nativeElement;
+
     // The mouse events shouldn't be bound on iOS devices, because
     // they can prevent the first tap from firing its click event.
     if (!_platform.IOS) {
@@ -190,9 +192,16 @@ export class MatTooltip implements OnDestroy {
 
       this._manualListeners
         .forEach((listener, event) => _elementRef.nativeElement.addEventListener(event, listener));
+    } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
+      // When we bind a gesture event on an element (in this case `longpress`), HammerJS
+      // will add some inline styles by default, including `user-select: none`. This is
+      // problematic on iOS, because it will prevent users from typing in inputs. If
+      // we're on iOS and the tooltip is attached on an input or textarea, we clear
+      // the `user-select` to avoid these issues.
+      element.style.webkitUserSelect = element.style.userSelect = '';
     }
 
-    _focusMonitor.monitor(_elementRef.nativeElement, false).subscribe(origin => {
+    _focusMonitor.monitor(element, false).subscribe(origin => {
       // Note that the focus monitor runs outside the Angular zone.
       if (!origin) {
         _ngZone.run(() => this.hide(0));

From 9e35bf0e21f76ea722b233c28429792858d41025 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 29 Nov 2017 20:00:01 +0100
Subject: [PATCH 563/575] fix(checkbox): don't hide focus indicator on space
 press. (#8539)

No longer hides the focus indicator ripple on click/space. Right now if a keyboard user tabs to the checkbox and presses SPACE to toggle the checkbox, the focus indicator ripple disappears. This makes it hard to see what element is focused or not.

For comparison, native checkboxes also keep the focus effect on keyboard press. Also Polymer follows the same convention with the focus indicator.
---
 src/lib/checkbox/checkbox.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index aabeb801ea63..c36bbd3e5d3a 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -365,8 +365,6 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
     // Preventing bubbling for the second event will solve that issue.
     event.stopPropagation();
 
-    this._removeFocusRipple();
-
     if (!this.disabled) {
       // When user manually click on the checkbox, `indeterminate` is set to false.
       if (this._indeterminate) {

From 2b9bc5769a5e7e3023df2b4111eadbec43a73c51 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 29 Nov 2017 20:17:01 +0100
Subject: [PATCH 564/575] feat(datepicker): add opened input binding (#8098)

* Adds support for the `opened` input binding.

Closes #8094
---
 src/lib/datepicker/datepicker.spec.ts | 79 +++++++++++++++++----------
 src/lib/datepicker/datepicker.ts      | 13 +++--
 2 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/src/lib/datepicker/datepicker.spec.ts b/src/lib/datepicker/datepicker.spec.ts
index 81576b717270..85ce44aae18d 100644
--- a/src/lib/datepicker/datepicker.spec.ts
+++ b/src/lib/datepicker/datepicker.spec.ts
@@ -28,7 +28,6 @@ import {MatDatepickerInput} from './datepicker-input';
 import {MatDatepickerToggle} from './datepicker-toggle';
 import {MatDatepickerIntl, MatDatepickerModule} from './index';
 
-
 describe('MatDatepicker', () => {
   const SUPPORTS_INTL = typeof Intl != 'undefined';
 
@@ -113,6 +112,18 @@ describe('MatDatepicker', () => {
             .not.toBeNull();
       });
 
+      it('should open datepicker if opened input is set to true', () => {
+        testComponent.opened = true;
+        fixture.detectChanges();
+
+        expect(document.querySelector('.mat-datepicker-content')).not.toBeNull();
+
+        testComponent.opened = false;
+        fixture.detectChanges();
+
+        expect(document.querySelector('.mat-datepicker-content')).toBeNull();
+      });
+
       it('open in disabled mode should not open the calendar', () => {
         testComponent.disabled = true;
         fixture.detectChanges();
@@ -151,9 +162,7 @@ describe('MatDatepicker', () => {
         testComponent.datepicker.close();
         fixture.detectChanges();
 
-        fixture.whenStable().then(() => {
-          expect(parseInt(getComputedStyle(popup).height as string)).toBe(0);
-        });
+        expect(parseInt(getComputedStyle(popup).height as string)).toBe(0);
       });
 
       it('should close the popup when pressing ESCAPE', () => {
@@ -177,7 +186,7 @@ describe('MatDatepicker', () => {
             .toBe(true, 'Expected default ESCAPE action to be prevented.');
       });
 
-      it('close should close dialog', () => {
+      it('close should close dialog', async(() => {
         testComponent.touch = true;
         fixture.detectChanges();
 
@@ -192,9 +201,9 @@ describe('MatDatepicker', () => {
         fixture.whenStable().then(() => {
           expect(document.querySelector('mat-dialog-container')).toBeNull();
         });
-      });
+      }));
 
-      it('setting selected should update input and close calendar', () => {
+      it('setting selected should update input and close calendar', async(() => {
         testComponent.touch = true;
         fixture.detectChanges();
 
@@ -212,12 +221,13 @@ describe('MatDatepicker', () => {
           expect(document.querySelector('mat-dialog-container')).toBeNull();
           expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 2));
         });
-      });
+      }));
 
       it('clicking the currently selected date should close the calendar ' +
           'without firing selectedChanged', () => {
         const selectedChangedSpy =
             spyOn(testComponent.datepicker.selectedChanged, 'emit').and.callThrough();
+
         for (let changeCount = 1; changeCount < 3; changeCount++) {
           const currentDay = changeCount;
           testComponent.datepicker.open();
@@ -231,11 +241,9 @@ describe('MatDatepicker', () => {
           fixture.detectChanges();
         }
 
-        fixture.whenStable().then(() => {
-          expect(selectedChangedSpy.calls.count()).toEqual(1);
-          expect(document.querySelector('mat-dialog-container')).toBeNull();
-          expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 2));
-        });
+        expect(selectedChangedSpy.calls.count()).toEqual(1);
+        expect(document.querySelector('mat-dialog-container')).toBeNull();
+        expect(testComponent.datepickerInput.value).toEqual(new Date(2020, JAN, 2));
       });
 
       it('startAt should fallback to input value', () => {
@@ -479,7 +487,7 @@ describe('MatDatepicker', () => {
         expect(inputEl.classList).toContain('ng-touched');
       });
 
-      it('should mark input touched on calendar selection', () => {
+      it('should mark input touched on calendar selection', async(() => {
         let inputEl = fixture.debugElement.query(By.css('input')).nativeElement;
 
         expect(inputEl.classList).toContain('ng-untouched');
@@ -492,7 +500,7 @@ describe('MatDatepicker', () => {
 
           expect(inputEl.classList).toContain('ng-touched');
         });
-      });
+      }));
     });
 
     describe('datepicker with formControl', () => {
@@ -702,7 +710,7 @@ describe('MatDatepicker', () => {
         expect(testComponent.datepicker._maxDate).toEqual(new Date(2020, JAN, 1));
       });
 
-      it('should mark invalid when value is before min', () => {
+      it('should mark invalid when value is before min', async(() => {
         testComponent.date = new Date(2009, DEC, 31);
         fixture.detectChanges();
 
@@ -712,9 +720,9 @@ describe('MatDatepicker', () => {
           expect(fixture.debugElement.query(By.css('input')).nativeElement.classList)
               .toContain('ng-invalid');
         });
-      });
+      }));
 
-      it('should mark invalid when value is after max', () => {
+      it('should mark invalid when value is after max', async(() => {
         testComponent.date = new Date(2020, JAN, 2);
         fixture.detectChanges();
 
@@ -724,9 +732,9 @@ describe('MatDatepicker', () => {
           expect(fixture.debugElement.query(By.css('input')).nativeElement.classList)
               .toContain('ng-invalid');
         });
-      });
+      }));
 
-      it('should not mark invalid when value equals min', () => {
+      it('should not mark invalid when value equals min', async(() => {
         testComponent.date = testComponent.datepicker._minDate;
         fixture.detectChanges();
 
@@ -736,9 +744,9 @@ describe('MatDatepicker', () => {
           expect(fixture.debugElement.query(By.css('input')).nativeElement.classList)
               .not.toContain('ng-invalid');
         });
-      });
+      }));
 
-      it('should not mark invalid when value equals max', () => {
+      it('should not mark invalid when value equals max', async(() => {
         testComponent.date = testComponent.datepicker._maxDate;
         fixture.detectChanges();
 
@@ -748,9 +756,9 @@ describe('MatDatepicker', () => {
           expect(fixture.debugElement.query(By.css('input')).nativeElement.classList)
               .not.toContain('ng-invalid');
         });
-      });
+      }));
 
-      it('should not mark invalid when value is between min and max', () => {
+      it('should not mark invalid when value is between min and max', async(() => {
         testComponent.date = new Date(2010, JAN, 2);
         fixture.detectChanges();
 
@@ -760,7 +768,7 @@ describe('MatDatepicker', () => {
           expect(fixture.debugElement.query(By.css('input')).nativeElement.classList)
               .not.toContain('ng-invalid');
         });
-      });
+      }));
     });
 
     describe('datepicker with filter and validation', () => {
@@ -1078,17 +1086,27 @@ describe('MatDatepicker', () => {
       input = fixture.nativeElement.querySelector('input') as HTMLInputElement;
     }));
 
-    it('should have the correct input value even when inverted date format', () => {
-      let selected = new Date(2017, SEP, 1);
+    it('should have the correct input value even when inverted date format', async(() => {
+      if (typeof Intl === 'undefined') {
+        // Skip this test if the internationalization API is not supported in the current
+        // browser. Browsers like Safari 9 do not support the "Intl" API.
+        return;
+      }
+
+      const selected = new Date(2017, SEP, 1);
       testComponent.date = selected;
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
         fixture.detectChanges();
-        expect(input.value).toBe('01.09.2017');
+
+        // Normally the proper date format would 01.09.2017, but some browsers seem format the
+        // date without the leading zero. (e.g. 1.9.2017).
+        expect(input.value).toMatch(/0?1\.0?9\.2017/);
+
         expect(testComponent.datepickerInput.value).toBe(selected);
       });
-    });
+    }));
   });
 });
 
@@ -1096,10 +1114,11 @@ describe('MatDatepicker', () => {
 @Component({
   template: `
     <input [matDatepicker]="d" [value]="date">
-    <mat-datepicker #d [touchUi]="touch" [disabled]="disabled"></mat-datepicker>
+    <mat-datepicker #d [touchUi]="touch" [disabled]="disabled" [opened]="opened"></mat-datepicker>
   `,
 })
 class StandardDatepicker {
+  opened = false;
   touch = false;
   disabled = false;
   date: Date | null = new Date(2020, JAN, 1);
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index cc3bcbb5ec3b..f9f30ab9d7d4 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -186,7 +186,10 @@ export class MatDatepicker<D> implements OnDestroy {
   @Output('closed') closedStream: EventEmitter<void> = new EventEmitter<void>();
 
   /** Whether the calendar is open. */
-  opened = false;
+  @Input()
+  get opened(): boolean { return this._opened; }
+  set opened(shouldOpen: boolean) { shouldOpen ? this.open() : this.close(); }
+  private _opened = false;
 
   /** The id for the datepicker calendar. */
   id = `mat-datepicker-${datepickerUid++}`;
@@ -277,7 +280,7 @@ export class MatDatepicker<D> implements OnDestroy {
 
   /** Open the calendar. */
   open(): void {
-    if (this.opened || this.disabled) {
+    if (this._opened || this.disabled) {
       return;
     }
     if (!this._datepickerInput) {
@@ -288,13 +291,13 @@ export class MatDatepicker<D> implements OnDestroy {
     }
 
     this.touchUi ? this._openAsDialog() : this._openAsPopup();
-    this.opened = true;
+    this._opened = true;
     this.openedStream.emit();
   }
 
   /** Close the calendar. */
   close(): void {
-    if (!this.opened) {
+    if (!this._opened) {
       return;
     }
     if (this._popupRef && this._popupRef.hasAttached()) {
@@ -314,7 +317,7 @@ export class MatDatepicker<D> implements OnDestroy {
       this._focusedElementBeforeOpen = null;
     }
 
-    this.opened = false;
+    this._opened = false;
     this.closedStream.emit();
   }
 

From 9b68b54cd26a9d2b1a59755aeded2414397eaae2 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 29 Nov 2017 20:18:10 +0100
Subject: [PATCH 565/575] fix(progress-spinner): value not updated while in
 indeterminate mode (#8269)

Fixes updates to a spinner's value not being saved if they happen while the component is indeterminate, causing it to be wrong if it becomes determinate again.
---
 .../progress-spinner/progress-spinner.spec.ts | 30 +++++++++++++++++--
 src/lib/progress-spinner/progress-spinner.ts  |  4 +--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/lib/progress-spinner/progress-spinner.spec.ts b/src/lib/progress-spinner/progress-spinner.spec.ts
index 5c9c758f69ab..2c5bce299b7a 100644
--- a/src/lib/progress-spinner/progress-spinner.spec.ts
+++ b/src/lib/progress-spinner/progress-spinner.spec.ts
@@ -58,6 +58,27 @@ describe('MatProgressSpinner', () => {
     expect(progressElement.componentInstance.value).toBe(0);
   });
 
+  it('should retain the value if it updates while indeterminate', () => {
+    let fixture = TestBed.createComponent(ProgressSpinnerWithValueAndBoundMode);
+    let progressElement = fixture.debugElement.query(By.css('mat-progress-spinner'));
+
+    fixture.componentInstance.mode = 'determinate';
+    fixture.detectChanges();
+    expect(progressElement.componentInstance.value).toBe(50);
+
+    fixture.componentInstance.mode = 'indeterminate';
+    fixture.detectChanges();
+    expect(progressElement.componentInstance.value).toBe(0);
+
+    fixture.componentInstance.value = 75;
+    fixture.detectChanges();
+    expect(progressElement.componentInstance.value).toBe(0);
+
+    fixture.componentInstance.mode = 'determinate';
+    fixture.detectChanges();
+    expect(progressElement.componentInstance.value).toBe(75);
+  });
+
   it('should clamp the value of the progress between 0 and 100', () => {
     let fixture = TestBed.createComponent(BasicProgressSpinner);
     fixture.detectChanges();
@@ -222,8 +243,13 @@ class ProgressSpinnerCustomDiameter {
 @Component({template: '<mat-progress-spinner mode="indeterminate"></mat-progress-spinner>'})
 class IndeterminateProgressSpinner { }
 
-@Component({template: '<mat-progress-spinner value="50" [mode]="mode"></mat-progress-spinner>'})
-class ProgressSpinnerWithValueAndBoundMode { mode = 'indeterminate'; }
+@Component({
+  template: '<mat-progress-spinner [value]="value" [mode]="mode"></mat-progress-spinner>'
+})
+class ProgressSpinnerWithValueAndBoundMode {
+  mode = 'indeterminate';
+  value = 50;
+}
 
 @Component({template: `<mat-spinner [color]="color"></mat-spinner>`})
 class SpinnerWithColor { color: string = 'primary'; }
diff --git a/src/lib/progress-spinner/progress-spinner.ts b/src/lib/progress-spinner/progress-spinner.ts
index f0d3b6fb9f67..c112ac63dd5a 100644
--- a/src/lib/progress-spinner/progress-spinner.ts
+++ b/src/lib/progress-spinner/progress-spinner.ts
@@ -145,9 +145,7 @@ export class MatProgressSpinner extends _MatProgressSpinnerMixinBase implements
     return this.mode === 'determinate' ? this._value : 0;
   }
   set value(newValue: number) {
-    if (newValue != null && this.mode === 'determinate') {
-      this._value = Math.max(0, Math.min(100, coerceNumberProperty(newValue)));
-    }
+    this._value = Math.max(0, Math.min(100, coerceNumberProperty(newValue)));
   }
 
   constructor(public _elementRef: ElementRef,

From 8205cb25db6cd57611b898621f0bf5f4f4fe1be8 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 29 Nov 2017 20:18:59 +0100
Subject: [PATCH 566/575] fix(slide-toggle): height collapsing if component
 doesn't have a label (#8270)

Fixes the slide label component collapsing down to 16px if it doesn't have a label.

Fixes #8264.
---
 src/lib/slide-toggle/slide-toggle.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss
index 8fd0e11da000..d46434e1b09d 100644
--- a/src/lib/slide-toggle/slide-toggle.scss
+++ b/src/lib/slide-toggle/slide-toggle.scss
@@ -48,6 +48,7 @@ $mat-slide-toggle-bar-track-width: $mat-slide-toggle-bar-width - $mat-slide-togg
   flex: 1;
   flex-direction: row;
   align-items: center;
+  height: inherit;
 
   cursor: pointer;
 }

From 8b7a3affba288ba5943d9c99c68f8a9037c820b2 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 29 Nov 2017 20:19:32 +0100
Subject: [PATCH 567/575] fix: blurry ripples for slide-toggle, radio, checkbox
 in MS edge. (#8514)

Fixes blurry ripples in the slide-toggle, radio and checkbox in Microsoft Edge. The ripples have been blurry because the `border-radius` in an absolute position seems to cause render problems for Edge.

Since the ripples are circular by default, the `border-radius` can be removed and the ripple radius just needs to be set to the value that has been set through CSS before this change. This fixes the blurry ripples in MS Edge and might also improve rendering-stability of the ripples.

Fixes #8392
---
 src/lib/checkbox/checkbox.html         |  5 ++++-
 src/lib/checkbox/checkbox.scss         | 11 +++++------
 src/lib/checkbox/checkbox.ts           |  6 +++++-
 src/lib/radio/radio.html               |  5 ++++-
 src/lib/radio/radio.scss               | 11 +++++------
 src/lib/radio/radio.ts                 |  6 +++++-
 src/lib/slide-toggle/slide-toggle.html |  6 ++++--
 src/lib/slide-toggle/slide-toggle.scss |  1 -
 src/lib/slide-toggle/slide-toggle.ts   |  6 +++++-
 9 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/lib/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
index bd0d794a4ab1..be2ddb84df60 100644
--- a/src/lib/checkbox/checkbox.html
+++ b/src/lib/checkbox/checkbox.html
@@ -19,7 +19,10 @@
     <div matRipple class="mat-checkbox-ripple"
          [matRippleTrigger]="label"
          [matRippleDisabled]="_isRippleDisabled()"
-         [matRippleCentered]="true"></div>
+         [matRippleRadius]="_rippleConfig.radius"
+         [matRippleSpeedFactor]="_rippleConfig.speedFactor"
+         [matRippleCentered]="_rippleConfig.centered">
+    </div>
     <div class="mat-checkbox-frame"></div>
     <div class="mat-checkbox-background">
       <svg version="1.1"
diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss
index c591b1be75fe..1b8cc83a0642 100644
--- a/src/lib/checkbox/checkbox.scss
+++ b/src/lib/checkbox/checkbox.scss
@@ -9,7 +9,7 @@ $_mat-checkbox-mark-path-length: 22.910259;
 $_mat-checkbox-indeterminate-checked-easing-function: cubic-bezier(0.14, 0, 0, 1);
 
 // The ripple size of the checkbox
-$_mat-checkbox-ripple-size: 15px;
+$_mat-checkbox-ripple-radius: 25px;
 
 // The amount of spacing between the checkbox and its label.
 $_mat-checkbox-item-spacing: $mat-toggle-padding;
@@ -413,11 +413,10 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
 
 .mat-checkbox-ripple {
   position: absolute;
-  left: -$_mat-checkbox-ripple-size;
-  top: -$_mat-checkbox-ripple-size;
-  right: -$_mat-checkbox-ripple-size;
-  bottom: -$_mat-checkbox-ripple-size;
-  border-radius: 50%;
+  left: $mat-checkbox-size / 2 - $_mat-checkbox-ripple-radius;
+  top: $mat-checkbox-size / 2 - $_mat-checkbox-ripple-radius;
+  height: $_mat-checkbox-ripple-radius * 2;
+  width: $_mat_checkbox-ripple-radius * 2;
   z-index: 1;
   pointer-events: none;
 }
diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
index c36bbd3e5d3a..2fa3dd17daf3 100644
--- a/src/lib/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -34,6 +34,7 @@ import {
   mixinDisabled,
   mixinDisableRipple,
   mixinTabIndex,
+  RippleConfig,
   RippleRef,
 } from '@angular/material/core';
 
@@ -177,6 +178,9 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   /** Called when the checkbox is blurred. Needed to properly implement ControlValueAccessor. */
   @ViewChild(MatRipple) _ripple: MatRipple;
 
+  /** Ripple configuration for the mouse ripples and focus indicators. */
+  _rippleConfig: RippleConfig = {centered: true, radius: 25, speedFactor: 1.5};
+
   /**
    * Called when the checkbox is blurred. Needed to properly implement ControlValueAccessor.
    * @docs-private
@@ -336,7 +340,7 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   /** Function is called whenever the focus changes for the input element. */
   private _onInputFocusChange(focusOrigin: FocusOrigin) {
     if (!this._focusRipple && focusOrigin === 'keyboard') {
-      this._focusRipple = this._ripple.launch(0, 0, {persistent: true, centered: true});
+      this._focusRipple = this._ripple.launch(0, 0, {persistent: true, ...this._rippleConfig});
     } else if (!focusOrigin) {
       this._removeFocusRipple();
       this.onTouched();
diff --git a/src/lib/radio/radio.html b/src/lib/radio/radio.html
index bd68e10b34ff..4c77e164b2a2 100644
--- a/src/lib/radio/radio.html
+++ b/src/lib/radio/radio.html
@@ -8,7 +8,10 @@
     <div mat-ripple class="mat-radio-ripple"
          [matRippleTrigger]="label"
          [matRippleDisabled]="_isRippleDisabled()"
-         [matRippleCentered]="true"></div>
+         [matRippleCentered]="_rippleConfig.centered"
+         [matRippleRadius]="_rippleConfig.radius"
+         [matRippleSpeedFactor]="_rippleConfig.speedFactor">
+    </div>
   </div>
 
   <input #input class="mat-radio-input cdk-visually-hidden" type="radio"
diff --git a/src/lib/radio/radio.scss b/src/lib/radio/radio.scss
index 9ccd2b679c57..81f350899263 100644
--- a/src/lib/radio/radio.scss
+++ b/src/lib/radio/radio.scss
@@ -3,7 +3,7 @@
 
 
 $mat-radio-size: $mat-toggle-size !default;
-$mat-radio-ripple-size: $mat-radio-size * 0.75;
+$mat-radio-ripple-radius: 25px;
 
 // Top-level host container.
 .mat-radio-button {
@@ -101,11 +101,10 @@ $mat-radio-ripple-size: $mat-radio-size * 0.75;
 
 .mat-radio-ripple {
   position: absolute;
-  left: -$mat-radio-ripple-size;
-  top: -$mat-radio-ripple-size;
-  right: -$mat-radio-ripple-size;
-  bottom: -$mat-radio-ripple-size;
-  border-radius: 50%;
+  left: $mat-radio-size / 2 - $mat-radio-ripple-radius;
+  top: $mat-radio-size / 2 - $mat-radio-ripple-radius;
+  height: $mat-radio-ripple-radius * 2;
+  width: $mat-radio-ripple-radius * 2;
   z-index: 1;
   pointer-events: none;
 }
diff --git a/src/lib/radio/radio.ts b/src/lib/radio/radio.ts
index f7e2b72b4c07..06b0d4e454f0 100644
--- a/src/lib/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -38,6 +38,7 @@ import {
   mixinColor,
   mixinDisabled,
   mixinDisableRipple,
+  RippleConfig,
   RippleRef,
 } from '@angular/material/core';
 
@@ -482,6 +483,9 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
   /** The child ripple instance. */
   @ViewChild(MatRipple) _ripple: MatRipple;
 
+  /** Ripple configuration for the mouse ripples and focus indicators. */
+  _rippleConfig: RippleConfig = {centered: true, radius: 23, speedFactor: 1.5};
+
   /** Reference to the current focus ripple. */
   private _focusRipple: RippleRef | null;
 
@@ -595,7 +599,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
   /** Function is called whenever the focus changes for the input element. */
   private _onInputFocusChange(focusOrigin: FocusOrigin) {
     if (!this._focusRipple && focusOrigin === 'keyboard') {
-      this._focusRipple = this._ripple.launch(0, 0, {persistent: true, centered: true});
+      this._focusRipple = this._ripple.launch(0, 0, {persistent: true, ...this._rippleConfig});
     } else if (!focusOrigin) {
       if (this.radioGroup) {
         this.radioGroup._touch();
diff --git a/src/lib/slide-toggle/slide-toggle.html b/src/lib/slide-toggle/slide-toggle.html
index 14060bd6d693..e1c56ad44cde 100644
--- a/src/lib/slide-toggle/slide-toggle.html
+++ b/src/lib/slide-toggle/slide-toggle.html
@@ -24,8 +24,10 @@
 
       <div class="mat-slide-toggle-ripple" mat-ripple
            [matRippleTrigger]="label"
-           [matRippleCentered]="true"
-           [matRippleDisabled]="disableRipple || disabled">
+           [matRippleDisabled]="disableRipple || disabled"
+           [matRippleCentered]="_rippleConfig.centered"
+           [matRippleRadius]="_rippleConfig.radius"
+           [matRippleSpeedFactor]="_rippleConfig.speedFactor">
       </div>
 
     </div>
diff --git a/src/lib/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss
index d46434e1b09d..a43fd0ea542c 100644
--- a/src/lib/slide-toggle/slide-toggle.scss
+++ b/src/lib/slide-toggle/slide-toggle.scss
@@ -161,7 +161,6 @@ $mat-slide-toggle-bar-track-width: $mat-slide-toggle-bar-width - $mat-slide-togg
   left: $mat-slide-toggle-thumb-size / 2 - $mat-slide-toggle-ripple-radius;
   height: $mat-slide-toggle-ripple-radius * 2;
   width: $mat-slide-toggle-ripple-radius * 2;
-  border-radius: 50%;
   z-index: 1;
   pointer-events: none;
 }
diff --git a/src/lib/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
index 3d525f5265e5..a661df7177ad 100644
--- a/src/lib/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -37,6 +37,7 @@ import {
   mixinDisabled,
   mixinDisableRipple,
   mixinTabIndex,
+  RippleConfig,
   RippleRef,
 } from '@angular/material/core';
 
@@ -138,6 +139,9 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
   /** Reference to the ripple directive on the thumb container. */
   @ViewChild(MatRipple) _ripple: MatRipple;
 
+  /** Ripple configuration for the mouse ripples and focus indicators. */
+  _rippleConfig: RippleConfig = {centered: true, radius: 23, speedFactor: 1.5};
+
   constructor(elementRef: ElementRef,
               private _platform: Platform,
               private _focusMonitor: FocusMonitor,
@@ -230,7 +234,7 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
   private _onInputFocusChange(focusOrigin: FocusOrigin) {
     if (!this._focusRipple && focusOrigin === 'keyboard') {
       // For keyboard focus show a persistent ripple as focus indicator.
-      this._focusRipple = this._ripple.launch(0, 0, {persistent: true, centered: true});
+      this._focusRipple = this._ripple.launch(0, 0, {persistent: true, ...this._rippleConfig});
     } else if (!focusOrigin) {
       this.onTouched();
 

From b4ce5ece348c0f378f4fe743e970a7da4d371308 Mon Sep 17 00:00:00 2001
From: tinayuangao <tinagao@google.com>
Date: Wed, 29 Nov 2017 12:05:36 -0800
Subject: [PATCH 568/575] demo(list): Add accessibility demo page for list
 (#7020)

* demo(list): Add accessibility demo page for list

* fix test

* set default role for md-list

* fix test

* Add template file for list
---
 src/demo-app/a11y/a11y-module.ts              |  2 +
 src/demo-app/a11y/a11y.ts                     |  1 +
 src/demo-app/a11y/list/list-a11y.html         | 66 +++++++++++++++++++
 src/demo-app/a11y/list/list-a11y.scss         | 11 ++++
 src/demo-app/a11y/list/list-a11y.ts           | 63 ++++++++++++++++++
 src/demo-app/a11y/routes.ts                   |  2 +
 src/lib/list/list-module.ts                   |  9 +--
 src/lib/list/list.html                        |  2 +
 src/lib/list/list.md                          |  9 +++
 src/lib/list/list.spec.ts                     |  2 +-
 src/lib/list/list.ts                          | 48 +++++++-------
 .../list-overview/list-overview-example.html  |  2 +-
 12 files changed, 183 insertions(+), 34 deletions(-)
 create mode 100644 src/demo-app/a11y/list/list-a11y.html
 create mode 100644 src/demo-app/a11y/list/list-a11y.scss
 create mode 100644 src/demo-app/a11y/list/list-a11y.ts
 create mode 100644 src/lib/list/list.html

diff --git a/src/demo-app/a11y/a11y-module.ts b/src/demo-app/a11y/a11y-module.ts
index b27f2c0f89e6..9911341393ea 100644
--- a/src/demo-app/a11y/a11y-module.ts
+++ b/src/demo-app/a11y/a11y-module.ts
@@ -29,6 +29,7 @@ import {
 } from './dialog/dialog-a11y';
 import {ExpansionPanelAccessibilityDemo} from './expansion/expansion-a11y';
 import {GridListAccessibilityDemo} from './grid-list/grid-list-a11y';
+import {ListAccessibilityDemo} from './list/list-a11y';
 import {RadioAccessibilityDemo} from './radio/radio-a11y';
 import {ToolbarAccessibilityDemo} from './toolbar/toolbar-a11y';
 import {DatepickerAccessibilityDemo} from './datepicker/datepicker-a11y';
@@ -93,6 +94,7 @@ export class AccessibilityRoutingModule {}
     GridListAccessibilityDemo,
     IconAccessibilityDemo,
     InputAccessibilityDemo,
+    ListAccessibilityDemo,
     MenuAccessibilityDemo,
     ProgressBarAccessibilityDemo,
     ProgressSpinnerAccessibilityDemo,
diff --git a/src/demo-app/a11y/a11y.ts b/src/demo-app/a11y/a11y.ts
index 3ac3cd80d39d..9db5dda65aa7 100644
--- a/src/demo-app/a11y/a11y.ts
+++ b/src/demo-app/a11y/a11y.ts
@@ -49,6 +49,7 @@ export class AccessibilityDemo implements OnDestroy {
     {name: 'Grid list', route: 'grid-list'},
     {name: 'Icon', route: 'icon'},
     {name: 'Input', route: 'input'},
+    {name: 'List', route: 'list'},
     {name: 'Menu', route: 'menu'},
     {name: 'Progress bar', route: 'progress-bar'},
     {name: 'Progress spinner', route: 'progress-spinner'},
diff --git a/src/demo-app/a11y/list/list-a11y.html b/src/demo-app/a11y/list/list-a11y.html
new file mode 100644
index 000000000000..70eea8b8410b
--- /dev/null
+++ b/src/demo-app/a11y/list/list-a11y.html
@@ -0,0 +1,66 @@
+<div class="demo-list">
+  <section>
+    <h2> Seasoning </h2>
+    <p>Showing a non-interactive list of seasonings.</p>
+    <mat-list role="list">
+      <mat-list-item *ngFor="let item of items"> {{item}} </mat-list-item>
+    </mat-list>
+  </section>
+
+
+  <section>
+    <h2>Mailbox navigation</h2>
+    <p>Showing a navigation list with links to google search</p>
+    <mat-nav-list>
+      <a mat-list-item *ngFor="let link of links"
+         href="https://www.google.com/search?q={{link.name}}">
+        {{link.name}}
+      </a>
+    </mat-nav-list>
+  </section>
+
+  <section>
+    <h2>Messages</h2>
+    <p>
+      Showing a list of messages, where each message item has sender's name, sender's avatar,
+      message subject, and content of the message.
+    </p>
+    <mat-list role="list">
+      <mat-list-item *ngFor="let message of messages">
+        <img mat-list-avatar [src]="message.image" [alt]="message.from">
+        <h3 mat-line> {{message.from}} </h3>
+        <p mat-line> {{message.subject}} </p>
+        <p mat-line class="demo-secondary-text"> {{message.message}} </p>
+      </mat-list-item>
+    </mat-list>
+
+  </section>
+
+  <section>
+    <h2>Seasoning</h2>
+    <p>Showing a non-interactive list of seasonings with dense style.</p>
+    <mat-list dense>
+      <mat-list-item *ngFor="let item of items"> {{item}} </mat-list-item>
+    </mat-list>
+  </section>
+
+  <section>
+    <h2>Folders and notes for mailbox </h2>
+    <p>Showing a list with two sections, "folders" and "notes".</p>
+    <mat-list role="list">
+      <h3 mat-subheader>Folders</h3>
+      <mat-list-item *ngFor="let folder of folders">
+        <mat-icon mat-list-icon>folder</mat-icon>
+        <h4 mat-line>{{folder.name}}</h4>
+        <p mat-line class="demo-secondary-text"> {{folder.updated}} </p>
+      </mat-list-item>
+      <mat-divider></mat-divider>
+      <h3 mat-subheader>Notes</h3>
+      <mat-list-item *ngFor="let note of notes">
+        <mat-icon mat-list-icgon>note</mat-icon>
+        <h4 mat-line>{{note.name}}</h4>
+        <p mat-line class="demo-secondary-text"> {{note.updated}} </p>
+      </mat-list-item>
+    </mat-list>
+  </section>
+</div>
diff --git a/src/demo-app/a11y/list/list-a11y.scss b/src/demo-app/a11y/list/list-a11y.scss
new file mode 100644
index 000000000000..1d270debe13d
--- /dev/null
+++ b/src/demo-app/a11y/list/list-a11y.scss
@@ -0,0 +1,11 @@
+.demo-list {
+  .mat-list, .mat-nav-list {
+    border: 1px solid rgba(0, 0, 0, 0.12);
+    max-width: 350px;
+    margin: 20px 20px 0 0;
+  }
+
+  .demo-secondary-text {
+    color: rgba(0, 0, 0, 0.54);
+  }
+}
diff --git a/src/demo-app/a11y/list/list-a11y.ts b/src/demo-app/a11y/list/list-a11y.ts
new file mode 100644
index 000000000000..3a033d24cb58
--- /dev/null
+++ b/src/demo-app/a11y/list/list-a11y.ts
@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Component} from '@angular/core';
+
+@Component({
+  moduleId: module.id,
+  selector: 'list-a11y',
+  templateUrl: 'list-a11y.html',
+  styleUrls: ['list-a11y.css']
+})
+export class ListAccessibilityDemo {
+  items: string[] = [
+    'Pepper',
+    'Salt',
+    'Paprika'
+  ];
+
+  messages = [
+    {
+      from: 'Nancy',
+      subject: 'Brunch?',
+      message: 'Did you want to go on Sunday? I was thinking that might work.',
+      image: 'https://angular.io/generated/images/bios/julie-ralph.jpg'
+    },
+    {
+      from: 'Mary',
+      subject: 'Summer BBQ',
+      message: 'Wish I could come, but I have some prior obligations.',
+      image: 'https://angular.io/generated/images/bios/juleskremer.jpg'
+    },
+    {
+      from: 'Bobby',
+      subject: 'Oui oui',
+      message: 'Do you have Paris reservations for the 15th? I just booked!',
+      image: 'https://angular.io/generated/images/bios/jelbourn.jpg'
+    }
+  ];
+
+  links = [
+    {name: 'Inbox'},
+    {name: 'Outbox'},
+    {name: 'Spam'},
+    {name: 'Trash'}
+
+  ];
+
+  folders = [
+    {name: 'Imported', updated: 'Miles'},
+    {name: 'Important', updated: 'Tina'},
+    {name: 'Unread', updated: 'Jeremy'},
+  ];
+
+  notes = [
+    {name: 'Update screenshots', updated: 'Kara'},
+    {name: 'Install new application', updated: 'Andrew'},
+  ];
+}
diff --git a/src/demo-app/a11y/routes.ts b/src/demo-app/a11y/routes.ts
index 6d729336e2c5..8ce0372611af 100644
--- a/src/demo-app/a11y/routes.ts
+++ b/src/demo-app/a11y/routes.ts
@@ -22,6 +22,7 @@ import {ToolbarAccessibilityDemo} from './toolbar/toolbar-a11y';
 import {DatepickerAccessibilityDemo} from './datepicker/datepicker-a11y';
 import {IconAccessibilityDemo} from './icon/icon-a11y';
 import {InputAccessibilityDemo} from './input/input-a11y';
+import {ListAccessibilityDemo} from './list/list-a11y';
 import {MenuAccessibilityDemo} from './menu/menu-a11y';
 import {ProgressBarAccessibilityDemo} from './progress-bar/progress-bar-a11y';
 import {ProgressSpinnerAccessibilityDemo} from './progress-spinner/progress-spinner-a11y';
@@ -52,6 +53,7 @@ export const ACCESSIBILITY_DEMO_ROUTES: Routes = [
   {path: 'grid-list', component: GridListAccessibilityDemo},
   {path: 'icon', component: IconAccessibilityDemo},
   {path: 'input', component: InputAccessibilityDemo},
+  {path: 'list', component: ListAccessibilityDemo},
   {path: 'menu', component: MenuAccessibilityDemo},
   {path: 'progress-bar', component: ProgressBarAccessibilityDemo},
   {path: 'progress-spinner', component: ProgressSpinnerAccessibilityDemo},
diff --git a/src/lib/list/list-module.ts b/src/lib/list/list-module.ts
index dea04202fd89..d29e01c1b0e7 100644
--- a/src/lib/list/list-module.ts
+++ b/src/lib/list/list-module.ts
@@ -17,13 +17,12 @@ import {
 import {
   MatDividerCssMatStyler,
   MatList,
+  MatNavList,
   MatListAvatarCssMatStyler,
-  MatListCssMatStyler,
   MatListDivider,
   MatListIconCssMatStyler,
   MatListItem,
   MatListSubheaderCssMatStyler,
-  MatNavListCssMatStyler,
 } from './list';
 import {MatListOption, MatSelectionList} from './selection-list';
 
@@ -32,14 +31,13 @@ import {MatListOption, MatSelectionList} from './selection-list';
   imports: [MatLineModule, MatRippleModule, MatCommonModule, MatPseudoCheckboxModule, CommonModule],
   exports: [
     MatList,
+    MatNavList,
     MatListItem,
     MatListDivider,
     MatListAvatarCssMatStyler,
     MatLineModule,
     MatCommonModule,
     MatListIconCssMatStyler,
-    MatListCssMatStyler,
-    MatNavListCssMatStyler,
     MatDividerCssMatStyler,
     MatListSubheaderCssMatStyler,
     MatPseudoCheckboxModule,
@@ -48,12 +46,11 @@ import {MatListOption, MatSelectionList} from './selection-list';
   ],
   declarations: [
     MatList,
+    MatNavList,
     MatListItem,
     MatListDivider,
     MatListAvatarCssMatStyler,
     MatListIconCssMatStyler,
-    MatListCssMatStyler,
-    MatNavListCssMatStyler,
     MatDividerCssMatStyler,
     MatListSubheaderCssMatStyler,
     MatSelectionList,
diff --git a/src/lib/list/list.html b/src/lib/list/list.html
new file mode 100644
index 000000000000..9af43669be38
--- /dev/null
+++ b/src/lib/list/list.html
@@ -0,0 +1,2 @@
+<ng-content></ng-content>
+
diff --git a/src/lib/list/list.md b/src/lib/list/list.md
index b26595f5becf..43d5786bf6fc 100644
--- a/src/lib/list/list.md
+++ b/src/lib/list/list.md
@@ -150,3 +150,12 @@ To add a divider, use `<mat-divider>`.
    </mat-list-item>
 </mat-list>
 ```
+
+### Accessibility
+By default, the list assumes that it will be used in a purely decorative fashion and thus sets no
+roles, ARIA attributes, or keyboard shortcuts. This is equivalent to having a sequence of <div>
+elements on the page. Any interactive content within the list should be given an appropriate
+accessibility treatment based on the specific workflow of your application.
+
+If the list is used to present a list of non-interactive content items, then the list element should
+be given `role="list"` and each list item should be given `role="listitem"`.
diff --git a/src/lib/list/list.spec.ts b/src/lib/list/list.spec.ts
index f2b60c500aef..b7644f7e247c 100644
--- a/src/lib/list/list.spec.ts
+++ b/src/lib/list/list.spec.ts
@@ -115,7 +115,7 @@ describe('MatList', () => {
 
     let list = fixture.debugElement.children[0];
     let listItem = fixture.debugElement.children[0].query(By.css('mat-list-item'));
-    expect(list.nativeElement.getAttribute('role')).toBe('list');
+    expect(list.nativeElement.getAttribute('role')).toBeNull();
     expect(listItem.nativeElement.getAttribute('role')).toBe('listitem');
   });
 
diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 6cd9efcd0f9a..ab278121609d 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -44,37 +44,34 @@ export class MatListDivider {}
 /** A Material Design list component. */
 @Component({
   moduleId: module.id,
-  selector: 'mat-list, mat-nav-list',
-  exportAs: 'matList, matNavList',
-  host: {'role': 'list'},
-  template: '<ng-content></ng-content>',
+  selector: 'mat-nav-list',
+  exportAs: 'matNavList',
+  host: {
+    'role': 'navigation',
+    'class': 'mat-nav-list'
+  },
+  templateUrl: 'list.html',
   styleUrls: ['list.css'],
   inputs: ['disableRipple'],
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MatList extends _MatListMixinBase implements CanDisableRipple {}
+export class MatNavList extends _MatListMixinBase implements CanDisableRipple {}
 
-/**
- * Directive whose purpose is to add the mat- CSS styling to this selector.
- * @docs-private
- */
-@Directive({
+@Component({
+  moduleId: module.id,
   selector: 'mat-list',
-  host: {'class': 'mat-list'}
-})
-export class MatListCssMatStyler {}
-
-/**
- * Directive whose purpose is to add the mat- CSS styling to this selector.
- * @docs-private
- */
-@Directive({
-  selector: 'mat-nav-list',
-  host: {'class': 'mat-nav-list'}
+  exportAs: 'matList',
+  templateUrl: 'list.html',
+  host: {'class': 'mat-list'},
+  styleUrls: ['list.css'],
+  inputs: ['disableRipple'],
+  encapsulation: ViewEncapsulation.None,
+  preserveWhitespaces: false,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MatNavListCssMatStyler {}
+export class MatList extends _MatListMixinBase implements CanDisableRipple {}
 
 /**
  * Directive whose purpose is to add the mat- CSS styling to this selector.
@@ -150,10 +147,9 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
   }
 
   constructor(private _element: ElementRef,
-              @Optional() private _list: MatList,
-              @Optional() navList: MatNavListCssMatStyler) {
+              @Optional() private _navList: MatNavList) {
     super();
-    this._isNavList = !!navList;
+    this._isNavList = !!_navList;
   }
 
   ngAfterContentInit() {
@@ -162,7 +158,7 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
 
   /** Whether this list item should show a ripple effect when clicked.  */
   _isRippleDisabled() {
-    return !this._isNavList || this.disableRipple || this._list.disableRipple;
+    return !this._isNavList || this.disableRipple || this._navList.disableRipple;
   }
 
   _handleFocus() {
diff --git a/src/material-examples/list-overview/list-overview-example.html b/src/material-examples/list-overview/list-overview-example.html
index 4c59db7aa84e..9c416b76f0d3 100644
--- a/src/material-examples/list-overview/list-overview-example.html
+++ b/src/material-examples/list-overview/list-overview-example.html
@@ -1,4 +1,4 @@
-<mat-list>
+<mat-list role="list">
   <mat-list-item>Item 1</mat-list-item>
   <mat-list-item>Item 2</mat-list-item>
   <mat-list-item>Item 3</mat-list-item>

From b5e72f25df54894eccc46fa93d124ca3d454209a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Wed, 29 Nov 2017 22:45:54 +0100
Subject: [PATCH 569/575] refactor: remove the OverlayContainer stubs from all
 of the tests (#8674)

Gets rid of all the manual stubs of the `OverlayContainer` in the tests and replaces them with getting the container through DI. This removes some boilerplate and should make things less prone to breaking if we make any changes to the container.
---
 .../overlay-keyboard-dispatcher.spec.ts       |  8 -----
 src/cdk/overlay/overlay.spec.ts               | 18 +++++-----
 .../connected-position-strategy.spec.ts       | 33 +++++++------------
 src/lib/autocomplete/autocomplete.spec.ts     | 22 +++++--------
 src/lib/dialog/dialog.spec.ts                 | 27 +++++++++------
 src/lib/menu/menu.spec.ts                     | 20 +++++------
 src/lib/select/select.spec.ts                 | 22 ++++---------
 src/lib/tooltip/tooltip.spec.ts               | 14 ++++----
 8 files changed, 69 insertions(+), 95 deletions(-)

diff --git a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
index 58e38158ea1b..93fa2a99ec0f 100644
--- a/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
+++ b/src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts
@@ -3,7 +3,6 @@ import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {Component, NgModule} from '@angular/core';
 import {Overlay} from '../overlay';
-import {OverlayContainer} from '../overlay-container';
 import {OverlayModule} from '../index';
 import {OverlayKeyboardDispatcher} from './overlay-keyboard-dispatcher';
 import {ComponentPortal} from '@angular/cdk/portal';
@@ -12,17 +11,10 @@ import {ComponentPortal} from '@angular/cdk/portal';
 describe('OverlayKeyboardDispatcher', () => {
   let keyboardDispatcher: OverlayKeyboardDispatcher;
   let overlay: Overlay;
-  let overlayContainerElement: HTMLElement;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [OverlayModule, TestComponentModule],
-      providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          return {getContainerElement: () => overlayContainerElement};
-        }}
-      ],
     });
   });
 
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index 2ea9ae873fa6..01fc5400ed3a 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -22,23 +22,19 @@ describe('Overlay', () => {
   let componentPortal: ComponentPortal<PizzaMsg>;
   let templatePortal: TemplatePortal<any>;
   let overlayContainerElement: HTMLElement;
+  let overlayContainer: OverlayContainer;
   let viewContainerFixture: ComponentFixture<TestComponentWithTemplatePortals>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [OverlayModule, PortalModule, OverlayTestModule],
-      providers: [{
-        provide: OverlayContainer,
-        useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          return {getContainerElement: () => overlayContainerElement};
-        }
-      }]
+      imports: [OverlayModule, PortalModule, OverlayTestModule]
     }).compileComponents();
   }));
 
-  beforeEach(inject([Overlay], (o: Overlay) => {
+  beforeEach(inject([Overlay, OverlayContainer], (o: Overlay, oc: OverlayContainer) => {
     overlay = o;
+    overlayContainer = oc;
+    overlayContainerElement = oc.getContainerElement();
 
     let fixture = TestBed.createComponent(TestComponentWithTemplatePortals);
     fixture.detectChanges();
@@ -47,6 +43,10 @@ describe('Overlay', () => {
     viewContainerFixture = fixture;
   }));
 
+  afterEach(() => {
+    overlayContainer.ngOnDestroy();
+  });
+
   it('should load a component into an overlay', () => {
     let overlayRef = overlay.create();
     overlayRef.attach(componentPortal);
diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts
index d39924f41ccb..b08b6ea53005 100644
--- a/src/cdk/overlay/position/connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts
@@ -3,10 +3,12 @@ import {TestBed, inject} from '@angular/core/testing';
 import {OverlayPositionBuilder} from './overlay-position-builder';
 import {CdkScrollable} from '@angular/cdk/scrolling';
 import {Subscription} from 'rxjs/Subscription';
+import {ScrollDispatchModule} from '@angular/cdk/scrolling';
 import {
   OverlayModule,
   Overlay,
   OverlayRef,
+  OverlayContainer,
   ConnectedPositionStrategy,
   ConnectedOverlayPositionChange,
 } from '../index';
@@ -22,15 +24,23 @@ const DEFAULT_WIDTH = 60;
 
 describe('ConnectedPositionStrategy', () => {
   let positionBuilder: OverlayPositionBuilder;
+  let overlayContainer: OverlayContainer;
+  let overlayContainerElement: HTMLElement;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({imports: [OverlayModule]});
+    TestBed.configureTestingModule({imports: [ScrollDispatchModule, OverlayModule]});
 
-    inject([Overlay], (overlay: Overlay) => {
+    inject([Overlay, OverlayContainer], (overlay: Overlay, oc: OverlayContainer) => {
       positionBuilder = overlay.position();
+      overlayContainer = oc;
+      overlayContainerElement = oc.getContainerElement();
     })();
   });
 
+  afterEach(() => {
+    overlayContainer.ngOnDestroy();
+  });
+
   describe('with origin on document body', () => {
     const ORIGIN_HEIGHT = DEFAULT_HEIGHT;
     const ORIGIN_WIDTH = DEFAULT_WIDTH;
@@ -39,7 +49,6 @@ describe('ConnectedPositionStrategy', () => {
 
     let originElement: HTMLElement;
     let overlayElement: HTMLElement;
-    let overlayContainerElement: HTMLElement;
     let strategy: ConnectedPositionStrategy;
     let fakeElementRef: ElementRef;
 
@@ -50,17 +59,14 @@ describe('ConnectedPositionStrategy', () => {
     beforeEach(() => {
       // The origin and overlay elements need to be in the document body in order to have geometry.
       originElement = createPositionedBlockElement();
-      overlayContainerElement = createOverlayContainer();
       overlayElement = createPositionedBlockElement();
       document.body.appendChild(originElement);
-      document.body.appendChild(overlayContainerElement);
       overlayContainerElement.appendChild(overlayElement);
       fakeElementRef = new ElementRef(originElement);
     });
 
     afterEach(() => {
       document.body.removeChild(originElement);
-      document.body.removeChild(overlayContainerElement);
 
       // Reset the origin geometry after each test so we don't accidently keep state between tests.
       originRect = null;
@@ -543,7 +549,6 @@ describe('ConnectedPositionStrategy', () => {
 
   describe('onPositionChange with scrollable view properties', () => {
     let overlayElement: HTMLElement;
-    let overlayContainerElement: HTMLElement;
     let strategy: ConnectedPositionStrategy;
 
     let scrollable: HTMLDivElement;
@@ -553,9 +558,7 @@ describe('ConnectedPositionStrategy', () => {
 
     beforeEach(() => {
       // Set up the overlay
-      overlayContainerElement = createOverlayContainer();
       overlayElement = createPositionedBlockElement();
-      document.body.appendChild(overlayContainerElement);
       overlayContainerElement.appendChild(overlayElement);
 
       // Set up the origin
@@ -584,7 +587,6 @@ describe('ConnectedPositionStrategy', () => {
     afterEach(() => {
       onPositionChangeSubscription.unsubscribe();
       document.body.removeChild(scrollable);
-      document.body.removeChild(overlayContainerElement);
     });
 
     it('should not have origin or overlay clipped or out of view without scroll', () => {
@@ -646,24 +648,20 @@ describe('ConnectedPositionStrategy', () => {
   describe('positioning properties', () => {
     let originElement: HTMLElement;
     let overlayElement: HTMLElement;
-    let overlayContainerElement: HTMLElement;
     let strategy: ConnectedPositionStrategy;
     let fakeElementRef: ElementRef;
 
     beforeEach(() => {
       // The origin and overlay elements need to be in the document body in order to have geometry.
       originElement = createPositionedBlockElement();
-      overlayContainerElement = createOverlayContainer();
       overlayElement = createPositionedBlockElement();
       document.body.appendChild(originElement);
-      document.body.appendChild(overlayContainerElement);
       overlayContainerElement.appendChild(overlayElement);
       fakeElementRef = new ElementRef(originElement);
     });
 
     afterEach(() => {
       document.body.removeChild(originElement);
-      document.body.removeChild(overlayContainerElement);
     });
 
     describe('in ltr', () => {
@@ -771,13 +769,6 @@ function createBlockElement() {
   return element;
 }
 
-/** Creates the wrapper for all of the overlays. */
-function createOverlayContainer() {
-  let element = document.createElement('div');
-  element.classList.add('cdk-overlay-container');
-  return element;
-}
-
 /** Creates an overflow container with a set height and width with margin. */
 function createOverflowContainerElement() {
   let element = document.createElement('div');
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 1bdfaf586fd4..ecced8afe523 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -19,7 +19,7 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
-import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {MatOption} from '@angular/material/core';
 import {MatFormField, MatFormFieldModule} from '@angular/material/form-field';
@@ -39,6 +39,7 @@ import {
 
 
 describe('MatAutocomplete', () => {
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
   let dir: Direction;
   let scrolledSubject = new Subject();
@@ -68,18 +69,6 @@ describe('MatAutocomplete', () => {
         AutocompleteWithSelectEvent,
       ],
       providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          overlayContainerElement.classList.add('cdk-overlay-container');
-
-          document.body.appendChild(overlayContainerElement);
-
-          // remove body padding to keep consistent cross-browser
-          document.body.style.padding = '0';
-          document.body.style.margin = '0';
-
-          return {getContainerElement: () => overlayContainerElement};
-        }},
         {provide: Directionality, useFactory: () => ({value: dir})},
         {provide: ScrollDispatcher, useFactory: () => ({
           scrolled: () => scrolledSubject.asObservable()
@@ -88,10 +77,15 @@ describe('MatAutocomplete', () => {
     });
 
     TestBed.compileComponents();
+
+    inject([OverlayContainer], (oc: OverlayContainer) => {
+      overlayContainer = oc;
+      overlayContainerElement = oc.getContainerElement();
+    })();
   }));
 
   afterEach(() => {
-    document.body.removeChild(overlayContainerElement);
+    overlayContainer.ngOnDestroy();
   });
 
   describe('panel toggling', () => {
diff --git a/src/lib/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
index 3027969b375a..100ce79b9417 100644
--- a/src/lib/dialog/dialog.spec.ts
+++ b/src/lib/dialog/dialog.spec.ts
@@ -32,6 +32,7 @@ import {MAT_DIALOG_DATA, MatDialog, MatDialogModule, MatDialogRef} from './index
 
 describe('MatDialog', () => {
   let dialog: MatDialog;
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
 
   let testViewContainerRef: ViewContainerRef;
@@ -42,10 +43,6 @@ describe('MatDialog', () => {
     TestBed.configureTestingModule({
       imports: [MatDialogModule, DialogTestModule],
       providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          return {getContainerElement: () => overlayContainerElement};
-        }},
         {provide: Location, useClass: SpyLocation}
       ],
     });
@@ -53,10 +50,17 @@ describe('MatDialog', () => {
     TestBed.compileComponents();
   }));
 
-  beforeEach(inject([MatDialog, Location], (d: MatDialog, l: Location) => {
-    dialog = d;
-    mockLocation = l as SpyLocation;
-  }));
+  beforeEach(inject([MatDialog, Location, OverlayContainer],
+    (d: MatDialog, l: Location, oc: OverlayContainer) => {
+      dialog = d;
+      mockLocation = l as SpyLocation;
+      overlayContainer = oc;
+      overlayContainerElement = oc.getContainerElement();
+    }));
+
+  afterEach(() => {
+    overlayContainer.ngOnDestroy();
+  });
 
   beforeEach(() => {
     viewContainerFixture = TestBed.createComponent(ComponentWithChildViewContainer);
@@ -181,6 +185,9 @@ describe('MatDialog', () => {
   it('should close a dialog and get back a result before it is closed', fakeAsync(() => {
     const dialogRef = dialog.open(PizzaMsg, {viewContainerRef: testViewContainerRef});
 
+    flush();
+    viewContainerFixture.detectChanges();
+
     // beforeClose should emit before dialog container is destroyed
     const beforeCloseHandler = jasmine.createSpy('beforeClose callback').and.callFake(() => {
       expect(overlayContainerElement.querySelector('mat-dialog-container'))
@@ -188,11 +195,11 @@ describe('MatDialog', () => {
     });
 
     dialogRef.beforeClose().subscribe(beforeCloseHandler);
-    dialogRef.close('Bulbasaurus');
+    dialogRef.close('Bulbasaur');
     viewContainerFixture.detectChanges();
     flush();
 
-    expect(beforeCloseHandler).toHaveBeenCalledWith('Bulbasaurus');
+    expect(beforeCloseHandler).toHaveBeenCalledWith('Bulbasaur');
     expect(overlayContainerElement.querySelector('mat-dialog-container')).toBeNull();
   }));
 
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
index 96ceede4320a..e9918a1edd57 100644
--- a/src/lib/menu/menu.spec.ts
+++ b/src/lib/menu/menu.spec.ts
@@ -1,4 +1,4 @@
-import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {
@@ -38,6 +38,7 @@ import {
 
 
 describe('MatMenu', () => {
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
   let dir: Direction;
 
@@ -57,25 +58,20 @@ describe('MatMenu', () => {
         FakeIcon
       ],
       providers: [
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          overlayContainerElement.classList.add('cdk-overlay-container');
-          document.body.appendChild(overlayContainerElement);
-
-          // remove body padding to keep consistent cross-browser
-          document.body.style.padding = '0';
-          document.body.style.margin = '0';
-          return {getContainerElement: () => overlayContainerElement};
-        }},
         {provide: Directionality, useFactory: () => ({value: dir})}
       ]
     });
 
     TestBed.compileComponents();
+
+    inject([OverlayContainer], (oc: OverlayContainer) => {
+      overlayContainer = oc;
+      overlayContainerElement = oc.getContainerElement();
+    })();
   }));
 
   afterEach(() => {
-    document.body.removeChild(overlayContainerElement);
+    overlayContainer.ngOnDestroy();
   });
 
   it('should open the menu as an idempotent operation', () => {
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index e77905353d26..490ba33ac4fc 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -64,6 +64,7 @@ const platform = new Platform();
 
 
 describe('MatSelect', () => {
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
   let dir: {value: 'ltr'|'rtl'};
   let scrolledSubject = new Subject();
@@ -71,20 +72,6 @@ describe('MatSelect', () => {
 
   // Providers used for all mat-select tests
   const commonProviders = [
-    {
-      provide: OverlayContainer, useFactory: () => {
-        overlayContainerElement = document.createElement('div') as HTMLElement;
-        overlayContainerElement.classList.add('cdk-overlay-container');
-
-        document.body.appendChild(overlayContainerElement);
-
-        // remove body padding to keep consistent cross-browser
-        document.body.style.padding = '0';
-        document.body.style.margin = '0';
-
-        return {getContainerElement: () => overlayContainerElement};
-      },
-    },
     {provide: Directionality, useFactory: () => dir = {value: 'ltr'}},
     {
       provide: ScrollDispatcher, useFactory: () => ({
@@ -114,10 +101,15 @@ describe('MatSelect', () => {
       declarations: declarations,
       providers: commonProviders,
     }).compileComponents();
+
+    inject([OverlayContainer], (oc: OverlayContainer) => {
+      overlayContainer = oc;
+      overlayContainerElement = oc.getContainerElement();
+    })();
   }
 
   afterEach(() => {
-    document.body.removeChild(overlayContainerElement);
+    overlayContainer.ngOnDestroy();
   });
 
   describe('core', () => {
diff --git a/src/lib/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
index a6f25b4e1728..a7032e96deee 100644
--- a/src/lib/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -3,6 +3,7 @@ import {
   ComponentFixture,
   fakeAsync,
   flushMicrotasks,
+  inject,
   TestBed,
   tick
 } from '@angular/core/testing';
@@ -33,6 +34,7 @@ import {
 const initialTooltipMessage = 'initial tooltip message';
 
 describe('MatTooltip', () => {
+  let overlayContainer: OverlayContainer;
   let overlayContainerElement: HTMLElement;
   let dir: {value: Direction};
 
@@ -48,11 +50,6 @@ describe('MatTooltip', () => {
       ],
       providers: [
         {provide: Platform, useValue: {IOS: false, isBrowser: true}},
-        {provide: OverlayContainer, useFactory: () => {
-          overlayContainerElement = document.createElement('div');
-          document.body.appendChild(overlayContainerElement);
-          return {getContainerElement: () => overlayContainerElement};
-        }},
         {provide: Directionality, useFactory: () => {
           return dir = {value: 'ltr'};
         }}
@@ -60,10 +57,15 @@ describe('MatTooltip', () => {
     });
 
     TestBed.compileComponents();
+
+    inject([OverlayContainer], (oc: OverlayContainer) => {
+      overlayContainer = oc;
+      overlayContainerElement = oc.getContainerElement();
+    })();
   }));
 
   afterEach(() => {
-    document.body.removeChild(overlayContainerElement);
+    overlayContainer.ngOnDestroy();
   });
 
   describe('basic usage', () => {

From 71305ce8f64fccd93307614866e00f930e6ad419 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 29 Nov 2017 22:46:04 +0100
Subject: [PATCH 570/575] build: add material experimental package (#8591)

* Adds the material-experimental package.
---
 .github/CODEOWNERS                            |  3 ++
 src/demo-app/system-config.ts                 |  3 +-
 src/demo-app/tsconfig-aot.json                | 20 ++++++----
 src/demo-app/tsconfig-build.json              |  5 ++-
 src/demo-app/tsconfig.json                    |  2 +
 src/e2e-app/system-config.ts                  |  1 +
 src/e2e-app/tsconfig.json                     |  6 ++-
 src/material-experimental/index.ts            |  9 +++++
 src/material-experimental/package.json        | 25 ++++++++++++
 src/material-experimental/public-api.ts       |  9 +++++
 src/material-experimental/tsconfig-build.json | 39 +++++++++++++++++++
 src/material-experimental/tsconfig-tests.json | 21 ++++++++++
 src/material-experimental/tsconfig.json       | 15 +++++++
 src/material-experimental/version.ts          | 12 ++++++
 test/karma-test-shim.js                       |  1 +
 tools/gulp/gulpfile.ts                        | 21 ++++++----
 tools/gulp/packages.ts                        |  1 +
 tools/gulp/tasks/aot.ts                       | 37 ++++++------------
 tools/gulp/tasks/development.ts               | 17 +++++---
 tools/gulp/tasks/e2e.ts                       |  6 ++-
 tools/gulp/tasks/publish.ts                   |  1 +
 tools/gulp/tasks/unit-test.ts                 |  5 ++-
 tools/package-tools/gulp/build-tasks-gulp.ts  |  2 -
 23 files changed, 207 insertions(+), 54 deletions(-)
 create mode 100644 src/material-experimental/index.ts
 create mode 100644 src/material-experimental/package.json
 create mode 100644 src/material-experimental/public-api.ts
 create mode 100644 src/material-experimental/tsconfig-build.json
 create mode 100644 src/material-experimental/tsconfig-tests.json
 create mode 100644 src/material-experimental/tsconfig.json
 create mode 100644 src/material-experimental/version.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 34fcc471d7ec..b727d641bbe5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -72,6 +72,9 @@
 # Moment adapter package
 /src/material-moment-adapter/**                    @mmalerba
 
+# Material experimental package
+/src/material-experimental/**                      @jelbourn
+
 # Docs examples & guides
 /guides/**                                         @amcdnl @jelbourn
 /src/material-examples/**                          @amcdnl @jelbourn
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index c922840c0989..a7d719fb66b7 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -38,7 +38,8 @@ System.config({
 
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
     '@angular/material': 'dist/packages/material/public-api.js',
-    '@angular/material-moment-adapter': 'dist/packages/material-moment-adapter/public-api.js',
+    '@angular/material-experimental': 'dist/packages/material-experimental/index.js',
+    '@angular/material-moment-adapter': 'dist/packages/material-moment-adapter/index.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
diff --git a/src/demo-app/tsconfig-aot.json b/src/demo-app/tsconfig-aot.json
index 761c961b954a..cc296c8e0712 100644
--- a/src/demo-app/tsconfig-aot.json
+++ b/src/demo-app/tsconfig-aot.json
@@ -1,6 +1,5 @@
 // TypeScript config that extends the demo-app tsconfig file. This config compiles the
-// "main-aot.ts" file and also enables templage code generation / AOT. All paths need
-// to be relative to the output directory.
+// "main-aot.ts" file and also enables templage code generation / AOT.
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
@@ -9,12 +8,19 @@
     "experimentalDecorators": true,
     "noUnusedParameters": true,
     "strictNullChecks": true,
-    "outDir": ".",
+    "outDir": "../../dist/packages/demo-app",
+    "rootDirs": [
+      ".",
+      "../../dist/packages/demo-app"
+    ],
     "paths": {
-      "@angular/cdk/*": ["./cdk/*"],
-      "@angular/material": ["./material"],
-      "@angular/material/*": ["./material/*"],
-      "@angular/material-moment-adapter": ["./material-moment-adapter"]
+      "@angular/material/*": ["../../dist/releases/material/*"],
+      "@angular/material": ["../../dist/releases/material"],
+      "@angular/cdk/*": ["../../dist/releases/cdk/*"],
+      "@angular/cdk": ["../../dist/releases/cdk"],
+      "@angular/material-experimental/*": ["../../dist/releases/material-experimental/*"],
+      "@angular/material-experimental": ["../../dist/releases/material-experimental"],
+      "@angular/material-moment-adapter": ["../../dist/releases/material-moment-adapter"]
     }
   },
   "files": [
diff --git a/src/demo-app/tsconfig-build.json b/src/demo-app/tsconfig-build.json
index a21a670730a6..4b169482b0a3 100644
--- a/src/demo-app/tsconfig-build.json
+++ b/src/demo-app/tsconfig-build.json
@@ -24,9 +24,12 @@
     ],
     "baseUrl": ".",
     "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material": ["../../dist/packages/material/public-api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*"],
-      "@angular/material/*": ["../../dist/packages/material/*"],
+      "@angular/cdk": ["../../dist/packages/cdk"],
+      "@angular/material-experimental/*": ["../../dist/packages/material-experimental/*"],
+      "@angular/material-experimental": ["../../dist/packages/material-experimental"],
       "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"]
     }
   },
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index e1156619275c..bf3f81711917 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -10,6 +10,8 @@
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
       "@angular/material": ["../lib/public-api.ts"],
+      "@angular/material-experimental/*": ["../material-experimental/*"],
+      "@angular/material-experimental": ["../material-experimental"],
       "@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"]
     }
   },
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 987755b1e8fe..a75b5518ea5b 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -28,6 +28,7 @@ System.config({
       'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
 
     '@angular/material': 'dist/bundles/material.umd.js',
+    '@angular/material-experimental': 'dist/bundles/material-experimental.umd.js',
     '@angular/material-moment-adapter': 'dist/bundles/material-moment-adapter.umd.js',
     '@angular/cdk': 'dist/bundles/cdk.umd.js',
     '@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
index 411e2992a444..8e0b412887ce 100644
--- a/src/e2e-app/tsconfig.json
+++ b/src/e2e-app/tsconfig.json
@@ -8,8 +8,10 @@
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
       "@angular/material": ["../lib/public-api.ts"],
-      "@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"],
-      "@angular/material-examples": ["../material-examples/public-api.ts"]
+      "@angular/material-experimental/*": ["../material-experimental/*"],
+      "@angular/material-experimental": ["../material-experimental/"],
+      "@angular/material-moment-adapter": ["../material-moment-adapter/"],
+      "@angular/material-examples": ["../material-examples/"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/material-experimental/index.ts b/src/material-experimental/index.ts
new file mode 100644
index 000000000000..676ca90f1ffa
--- /dev/null
+++ b/src/material-experimental/index.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+export * from './public-api';
diff --git a/src/material-experimental/package.json b/src/material-experimental/package.json
new file mode 100644
index 000000000000..8532ac774ca4
--- /dev/null
+++ b/src/material-experimental/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@angular/material-experimental",
+  "version": "0.0.0-PLACEHOLDER",
+  "description": "Experimental components for Angular Material",
+  "main": "./bundles/material-experimental.umd.js",
+  "module": "./esm5/material-experimental.es5.js",
+  "es2015": "./esm2015/material-experimental.js",
+  "typings": "./material-experimental.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/material2.git"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/material2/issues"
+  },
+  "homepage": "https://github.com/angular/material2#readme",
+  "peerDependencies": {
+    "@angular/material": "0.0.0-PLACEHOLDER",
+    "@angular/core": "0.0.0-NG"
+  },
+  "dependencies": {
+    "tslib": "^1.7.1"
+  }
+}
diff --git a/src/material-experimental/public-api.ts b/src/material-experimental/public-api.ts
new file mode 100644
index 000000000000..326c704b094c
--- /dev/null
+++ b/src/material-experimental/public-api.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+
+export * from './version';
diff --git a/src/material-experimental/tsconfig-build.json b/src/material-experimental/tsconfig-build.json
new file mode 100644
index 000000000000..ee192d0d714c
--- /dev/null
+++ b/src/material-experimental/tsconfig-build.json
@@ -0,0 +1,39 @@
+// TypeScript config file that is used to compile the experimental package into ES2015.
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material-experimental",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es2015",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*"],
+      "@angular/cdk": ["../../dist/packages/cdk"]
+    }
+  },
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material-experimental",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/material-experimental/tsconfig-tests.json b/src/material-experimental/tsconfig-tests.json
new file mode 100644
index 000000000000..dfd4fb7afce3
--- /dev/null
+++ b/src/material-experimental/tsconfig-tests.json
@@ -0,0 +1,21 @@
+// TypeScript config file that extends the default build tsconfig file. This config is used to
+// also compile the unit-test files. Since the code will run inside of the browser, the target is
+// set to ES5. Also the format needs to be CommonJS for Karma.
+{
+  "extends": "./tsconfig-build",
+  "compilerOptions": {
+    "importHelpers": false,
+    "module": "commonjs",
+    "target": "es5",
+    "types": ["jasmine"]
+  },
+  "angularCompilerOptions": {
+    "strictMetadataEmit": true,
+    "skipTemplateCodegen": true,
+    "emitDecoratorMetadata": true
+  },
+  "include": [
+    "**/*.spec.ts",
+    "index.ts"
+  ]
+}
diff --git a/src/material-experimental/tsconfig.json b/src/material-experimental/tsconfig.json
new file mode 100644
index 000000000000..7e813547746f
--- /dev/null
+++ b/src/material-experimental/tsconfig.json
@@ -0,0 +1,15 @@
+// Configuration for IDEs only.
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "..",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../cdk/*"],
+      "@angular/cdk": ["../cdk"],
+      "@angular/material/*": ["../lib/*"],
+      "@angular/material": ["../lib/public-api.ts"]
+    }
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/src/material-experimental/version.ts b/src/material-experimental/version.ts
new file mode 100644
index 000000000000..06a4542f36fa
--- /dev/null
+++ b/src/material-experimental/version.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google LLC 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 {Version} from '@angular/core';
+
+/** Current version of the Material experimental package. */
+export const VERSION = new Version('0.0.0-PLACEHOLDER');
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 7b5c0c471e5c..a89cd45ccbcb 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -50,6 +50,7 @@ System.config({
     // Path mappings for local packages that can be imported inside of tests.
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
     '@angular/material': 'dist/packages/material/public-api.js',
+    '@angular/material-experimental': 'dist/packages/material-experimental/index.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
diff --git a/tools/gulp/gulpfile.ts b/tools/gulp/gulpfile.ts
index 37076dc312f2..27b93982e388 100644
--- a/tools/gulp/gulpfile.ts
+++ b/tools/gulp/gulpfile.ts
@@ -1,26 +1,33 @@
 import {createPackageBuildTasks} from 'material2-build-tools';
-import {cdkPackage, examplesPackage, materialPackage, momentAdapterPackage} from './packages';
+import {
+  cdkPackage,
+  examplesPackage,
+  experimentalPackage,
+  materialPackage,
+  momentAdapterPackage
+} from './packages';
 
 createPackageBuildTasks(cdkPackage);
 createPackageBuildTasks(materialPackage);
+createPackageBuildTasks(experimentalPackage);
 createPackageBuildTasks(examplesPackage);
 createPackageBuildTasks(momentAdapterPackage);
 
+import './tasks/aot';
+import './tasks/changelog';
 import './tasks/ci';
 import './tasks/clean';
+import './tasks/coverage';
 import './tasks/default';
 import './tasks/development';
 import './tasks/docs';
 import './tasks/e2e';
+import './tasks/examples';
 import './tasks/lint';
+import './tasks/material-release';
+import './tasks/payload';
 import './tasks/publish';
 import './tasks/screenshots';
-import './tasks/examples';
 import './tasks/unit-test';
-import './tasks/aot';
-import './tasks/payload';
-import './tasks/coverage';
-import './tasks/material-release';
 import './tasks/universal';
 import './tasks/validate-release';
-import './tasks/changelog';
diff --git a/tools/gulp/packages.ts b/tools/gulp/packages.ts
index bfa109c15063..bc07baebdbcd 100644
--- a/tools/gulp/packages.ts
+++ b/tools/gulp/packages.ts
@@ -3,6 +3,7 @@ import {join} from 'path';
 
 export const cdkPackage = new BuildPackage('cdk');
 export const materialPackage = new BuildPackage('material', [cdkPackage]);
+export const experimentalPackage = new BuildPackage('material-experimental', [materialPackage]);
 export const momentAdapterPackage = new BuildPackage('material-moment-adapter', [materialPackage]);
 export const examplesPackage = new BuildPackage('material-examples', [momentAdapterPackage]);
 
diff --git a/tools/gulp/tasks/aot.ts b/tools/gulp/tasks/aot.ts
index aa2bc75c2fba..eaa02813616b 100644
--- a/tools/gulp/tasks/aot.ts
+++ b/tools/gulp/tasks/aot.ts
@@ -1,42 +1,29 @@
 import {task} from 'gulp';
-import {copySync} from 'fs-extra';
 import {execNodeTask} from '../util/task_helpers';
 import {join} from 'path';
 import {buildConfig, sequenceTask} from 'material2-build-tools';
 
-const {outputDir, packagesDir} = buildConfig;
-
-/** Path to the directory where all releases are living. */
-const releasesDir = join(outputDir, 'releases');
+const {packagesDir} = buildConfig;
 
 /** Path to the demo-app source directory. */
 const demoAppSource = join(packagesDir, 'demo-app');
 
-/** Path to the demo-app output directory. */
-const demoAppOut = join(outputDir, 'packages', 'demo-app');
-
 /** Path to the tsconfig file that builds the AOT files. */
-const tsconfigFile = join(demoAppOut, 'tsconfig-aot.json');
+const tsconfigFile = join(demoAppSource, 'tsconfig-aot.json');
 
-/** Builds the demo-app and material. To be able to run NGC, apply the metadata workaround. */
+/** Builds the demo-app assets and builds the required release packages. */
 task('aot:deps', sequenceTask(
-  ['material:build-release', 'cdk:build-release', 'material-moment-adapter:build-release'],
-  [':build:devapp:assets', ':build:devapp:scss', 'aot:copy-devapp', 'aot:copy-release'],
+  [
+    'cdk:build-release',
+    'material:build-release',
+    'material-experimental:build-release',
+    'material-moment-adapter:build-release'
+  ],
+  // Build the assets after the releases have been built, because the demo-app assets import
+  // SCSS files from the release packages.
+  [':build:devapp:assets', ':build:devapp:scss'],
 ));
 
-// As a workaround for https://github.com/angular/angular/issues/12249, we need to
-// copy the Material and CDK ESM output inside of the demo-app output.
-task('aot:copy-release', () => {
-  copySync(join(releasesDir, 'material'), join(demoAppOut, 'material'));
-  copySync(join(releasesDir, 'cdk'), join(demoAppOut, 'cdk'));
-  copySync(
-      join(releasesDir, 'material-moment-adapter'), join(demoAppOut, 'material-moment-adapter'));
-});
-
-// As a workaround for https://github.com/angular/angular/issues/12249, we need to
-// copy the demo-app sources to distribution and run the NGC inside of the dist folder.
-task('aot:copy-devapp', () => copySync(demoAppSource, demoAppOut));
-
 /** Build the demo-app and a release to confirm that the library is AOT-compatible. */
 task('aot:build', sequenceTask('clean', 'aot:deps', 'aot:compiler-cli'));
 
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index 9321112b4c0c..bdf310785f8d 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -4,7 +4,7 @@ import {join} from 'path';
 import {
   buildConfig, copyFiles, buildScssTask, sequenceTask, watchFiles
 } from 'material2-build-tools';
-import {cdkPackage, materialPackage, momentAdapterPackage} from '../packages';
+import {cdkPackage, experimentalPackage, materialPackage, momentAdapterPackage} from '../packages';
 
 // These imports don't have any typings provided.
 const firebaseTools = require('firebase-tools');
@@ -41,13 +41,15 @@ task(':watch:devapp', () => {
   watchFiles(join(appDir, '**/*.scss'), [':build:devapp:scss']);
   watchFiles(join(appDir, '**/*.html'), [':build:devapp:assets']);
 
-  // Custom watchers for the CDK, Material and Moment adapter package. This is necessary because
-  // we only want to build the package as a single entry-point (using the tests task).
+  // Custom watchers for all packages that are used inside of the demo-app. This is necessary
+  // because we only want to build the changed package (using the build-no-bundles task).
   watchFiles(join(cdkPackage.sourceDir, '**/*'), ['cdk:build-no-bundles']);
   watchFiles(join(materialPackage.sourceDir, '**/!(*.scss)'), ['material:build-no-bundles']);
   watchFiles(join(materialPackage.sourceDir, '**/*.scss'), [':build:devapp:material-with-styles']);
   watchFiles(join(momentAdapterPackage.sourceDir, '**/*'),
       ['material-moment-adapter:build-no-bundles']);
+  watchFiles(join(experimentalPackage.sourceDir, '**/*'),
+      ['material-experimental:build-no-bundles']);
 });
 
 /** Path to the demo-app tsconfig file. */
@@ -66,8 +68,11 @@ task(':build:devapp:material-with-styles', sequenceTask(
 ));
 
 task('build:devapp', sequenceTask(
-  ['material-moment-adapter:build-no-bundles', ':build:devapp:assets'],
-  [':build:devapp:scss', ':build:devapp:ts']
+  'cdk:build-no-bundles',
+  'material:build-no-bundles',
+  'material-experimental:build-no-bundles',
+  'material-moment-adapter:build-no-bundles',
+  [':build:devapp:assets', ':build:devapp:scss', ':build:devapp:ts']
 ));
 
 task('serve:devapp', ['build:devapp'], sequenceTask([':serve:devapp', ':watch:devapp']));
@@ -78,6 +83,8 @@ task('stage-deploy:devapp', ['build:devapp'], () => {
   copyFiles(bundlesDir, '*.+(js|map)', join(outDir, 'dist/bundles'));
   copyFiles(cdkPackage.outputDir, '**/*.+(js|map)', join(outDir, 'dist/packages/cdk'));
   copyFiles(materialPackage.outputDir, '**/*.+(js|map)', join(outDir, 'dist/packages/material'));
+  copyFiles(experimentalPackage.outputDir, '**/*.+(js|map)',
+      join(outDir, 'dist/packages/material-experimental'));
   copyFiles(materialPackage.outputDir, '**/prebuilt/*.+(css|map)',
       join(outDir, 'dist/packages/material'));
 });
diff --git a/tools/gulp/tasks/e2e.ts b/tools/gulp/tasks/e2e.ts
index 2b033b4ffa36..c56765a007a5 100644
--- a/tools/gulp/tasks/e2e.ts
+++ b/tools/gulp/tasks/e2e.ts
@@ -35,8 +35,9 @@ task('e2e', sequenceTask(
 task('e2e-app:build', sequenceTask(
   'clean',
   [
-    'material:build-release',
     'cdk:build-release',
+    'material:build-release',
+    'material-experimental:build-release',
     'material-moment-adapter:build-release',
     'material-examples:build-release'
   ],
@@ -79,8 +80,9 @@ task('serve:e2eapp:watch', ['serve:e2eapp', 'material:watch', ':watch:e2eapp']);
 // As a workaround for https://github.com/angular/angular/issues/12249, we need to
 // copy the Material and CDK ESM output inside of the demo-app output.
 task('e2e-app:copy-release', () => {
-  copySync(join(releasesDir, 'material'), join(outDir, 'material'));
   copySync(join(releasesDir, 'cdk'), join(outDir, 'cdk'));
+  copySync(join(releasesDir, 'material'), join(outDir, 'material'));
+  copySync(join(releasesDir, 'material-experimental'), join(outDir, 'material-experimental'));
   copySync(join(releasesDir, 'material-examples'), join(outDir, 'material-examples'));
   copySync(join(releasesDir, 'material-moment-adapter'), join(outDir, 'material-moment-adapter'));
 });
diff --git a/tools/gulp/tasks/publish.ts b/tools/gulp/tasks/publish.ts
index 1951844d0bb7..6e418c0ebc70 100644
--- a/tools/gulp/tasks/publish.ts
+++ b/tools/gulp/tasks/publish.ts
@@ -11,6 +11,7 @@ import * as minimist from 'minimist';
 export const releasePackages = [
   'cdk',
   'material',
+  'material-experimental',
   'material-moment-adapter'
 ];
 
diff --git a/tools/gulp/tasks/unit-test.ts b/tools/gulp/tasks/unit-test.ts
index 96494582ea66..3aa96487e2ed 100644
--- a/tools/gulp/tasks/unit-test.ts
+++ b/tools/gulp/tasks/unit-test.ts
@@ -15,8 +15,9 @@ const defaultOptions = {
 /** Builds everything that is necessary for karma. */
 task(':test:build', sequenceTask(
   'clean',
-  // Build tests for all different packages by just building the tests of the moment-adapter
-  // package. All dependencies of that package (material, cdk) will be built as well.
+  'cdk:build-no-bundles',
+  'material:build-no-bundles',
+  'material-experimental:build-no-bundles',
   'material-moment-adapter:build-no-bundles'
 ));
 
diff --git a/tools/package-tools/gulp/build-tasks-gulp.ts b/tools/package-tools/gulp/build-tasks-gulp.ts
index 2e541ee4ba6c..78a9910ed99f 100644
--- a/tools/package-tools/gulp/build-tasks-gulp.ts
+++ b/tools/package-tools/gulp/build-tasks-gulp.ts
@@ -54,8 +54,6 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
   ));
 
   task(`${taskName}:build-no-bundles`, sequenceTask(
-    // Build all required tests before building.
-    ...dependencyNames.map(pkgName => `${pkgName}:build-no-bundles`),
     // Build the ESM output that includes all test files. Also build assets for the package.
     [`${taskName}:build:esm:tests`, `${taskName}:assets`],
     // Inline assets into ESM output.

From 27dfd159c3c8e15983e45bdcc3e9827a7ac5220a Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Wed, 29 Nov 2017 19:01:36 -0800
Subject: [PATCH 571/575] chore: add webhook notifications for travisCI and
 CircleCI for testing (#8718)

---
 .circleci/config.yml | 4 ++++
 .travis.yml          | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 58094fc3e716..95b6716d2957 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,3 +45,7 @@ workflows:
   default_workflow:
     jobs:
       - build
+
+notify:
+  webhooks:
+    - url: https://us-central1-test-jperrott.cloudfunctions.net/circleCi
diff --git a/.travis.yml b/.travis.yml
index 068c2197309c..fc47e68f03d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,3 +58,8 @@ script:
 cache:
   directories:
     - ./node_modules/
+
+notifications:
+  webhooks:
+    urls:
+      - https://us-central1-test-jperrott.cloudfunctions.net/travisCi

From e5b7afe634367f721ffea4c70a2161c7ed31b5d0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Dec 2017 19:16:42 +0100
Subject: [PATCH 572/575] fix(datepicker): calendar overlapping input when in a
 fallback position (#8099)

* Prevents datepickers that are in a fallback position from overlapping their input by adding an offset.
* Fixes some inconsistent brace spacing.
---
 src/lib/datepicker/datepicker-input.ts |  8 ++++++++
 src/lib/datepicker/datepicker.ts       | 14 ++++++++++----
 src/lib/form-field/form-field.html     |  2 +-
 src/lib/form-field/form-field.ts       |  1 +
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts
index f659cbce5cba..db0cfc8936e0 100644
--- a/src/lib/datepicker/datepicker-input.ts
+++ b/src/lib/datepicker/datepicker-input.ts
@@ -273,6 +273,14 @@ export class MatDatepickerInput<D> implements AfterContentInit, ControlValueAcce
     return this._formField ? this._formField.underlineRef : this._elementRef;
   }
 
+  /**
+   * Determines the offset to be used when the calendar goes into a fallback position.
+   * Primarily used to prevent the calendar from overlapping the input.
+   */
+  _getPopupFallbackOffset(): number {
+    return this._formField ? -this._formField._inputContainerRef.nativeElement.clientHeight : 0;
+  }
+
   // Implemented as part of ControlValueAccessor
   writeValue(value: D): void {
     this.value = value;
diff --git a/src/lib/datepicker/datepicker.ts b/src/lib/datepicker/datepicker.ts
index f9f30ab9d7d4..61d150e5a8be 100644
--- a/src/lib/datepicker/datepicker.ts
+++ b/src/lib/datepicker/datepicker.ts
@@ -372,22 +372,28 @@ export class MatDatepicker<D> implements OnDestroy {
 
   /** Create the popup PositionStrategy. */
   private _createPopupPositionStrategy(): PositionStrategy {
+    const fallbackOffset = this._datepickerInput._getPopupFallbackOffset();
+
     return this._overlay.position()
       .connectedTo(this._datepickerInput.getPopupConnectionElementRef(),
         {originX: 'start', originY: 'bottom'},
         {overlayX: 'start', overlayY: 'top'}
       )
       .withFallbackPosition(
-        { originX: 'start', originY: 'top' },
-        { overlayX: 'start', overlayY: 'bottom' }
+        {originX: 'start', originY: 'top'},
+        {overlayX: 'start', overlayY: 'bottom'},
+        undefined,
+        fallbackOffset
       )
       .withFallbackPosition(
         {originX: 'end', originY: 'bottom'},
         {overlayX: 'end', overlayY: 'top'}
       )
       .withFallbackPosition(
-        { originX: 'end', originY: 'top' },
-        { overlayX: 'end', overlayY: 'bottom' }
+        {originX: 'end', originY: 'top'},
+        {overlayX: 'end', overlayY: 'bottom'},
+        undefined,
+        fallbackOffset
       );
   }
 
diff --git a/src/lib/form-field/form-field.html b/src/lib/form-field/form-field.html
index 9d928b19a5de..f5d6510eb74a 100644
--- a/src/lib/form-field/form-field.html
+++ b/src/lib/form-field/form-field.html
@@ -5,7 +5,7 @@
       <ng-content select="[matPrefix]"></ng-content>
     </div>
 
-    <div class="mat-input-infix mat-form-field-infix">
+    <div class="mat-input-infix mat-form-field-infix" #inputContainer>
       <ng-content></ng-content>
 
       <!--
diff --git a/src/lib/form-field/form-field.ts b/src/lib/form-field/form-field.ts
index 6117e930cc23..5e75603f39ff 100644
--- a/src/lib/form-field/form-field.ts
+++ b/src/lib/form-field/form-field.ts
@@ -159,6 +159,7 @@ export class MatFormField implements AfterViewInit, AfterContentInit, AfterConte
   /** Reference to the form field's underline element. */
   @ViewChild('underline') underlineRef: ElementRef;
   @ViewChild('connectionContainer') _connectionContainerRef: ElementRef;
+  @ViewChild('inputContainer') _inputContainerRef: ElementRef;
   @ViewChild('label') private _label: ElementRef;
   @ContentChild(MatFormFieldControl) _control: MatFormFieldControl<any>;
   @ContentChild(MatPlaceholder) _placeholderChild: MatPlaceholder;

From d04aa1902e7930c9a6d8a28865e9369ee29fe8d0 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Fri, 1 Dec 2017 19:17:06 +0100
Subject: [PATCH 573/575] fix(select): option not truncated correctly in
 multiple mode (#7857)

Currently, when the text of an option is truncated, it ends up removing everything except the ellipsis on Firefox, IE and Edge. These changes fix the truncation and simplify the option view.

Relates to #7211.
---
 src/demo-app/select/select-demo.ts | 4 ++--
 src/lib/core/option/_option.scss   | 8 ++++++++
 src/lib/core/option/option.html    | 6 ++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/demo-app/select/select-demo.ts b/src/demo-app/select/select-demo.ts
index f97649fdd1cd..8fc370550294 100644
--- a/src/demo-app/select/select-demo.ts
+++ b/src/demo-app/select/select-demo.ts
@@ -60,7 +60,7 @@ export class SelectDemo {
     {value: 'charizard-1', viewValue: 'Charizard'},
     {value: 'squirtle-2', viewValue: 'Squirtle'},
     {value: 'pikachu-3', viewValue: 'Pikachu'},
-    {value: 'eevee-4', viewValue: 'Eevee'},
+    {value: 'jigglypuff-4', viewValue: 'Jigglypuff with a really long name that will truncate'},
     {value: 'ditto-5', viewValue: 'Ditto'},
     {value: 'psyduck-6', viewValue: 'Psyduck'},
   ];
@@ -120,7 +120,7 @@ export class SelectDemo {
   }
 
   setPokemonValue() {
-    this.currentPokemon = ['eevee-4', 'psyduck-6'];
+    this.currentPokemon = ['jigglypuff-4', 'psyduck-6'];
   }
 
   reassignDrinkByCopy() {
diff --git a/src/lib/core/option/_option.scss b/src/lib/core/option/_option.scss
index c87b65e598d5..fdb4bf884ddf 100644
--- a/src/lib/core/option/_option.scss
+++ b/src/lib/core/option/_option.scss
@@ -13,6 +13,11 @@
     position: relative;
     cursor: pointer;
     outline: none;
+    display: flex;
+    flex-direction: row;
+    max-width: 100%;
+    box-sizing: border-box;
+    align-items: center;
 
     &[aria-disabled='true'] {
       @include user-select(none);
@@ -35,6 +40,9 @@
   // </mat-option>
   .mat-option-text {
     display: inline-block;
+    flex-grow: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .mat-option-ripple {
diff --git a/src/lib/core/option/option.html b/src/lib/core/option/option.html
index 7bf76128c4aa..c6316b889438 100644
--- a/src/lib/core/option/option.html
+++ b/src/lib/core/option/option.html
@@ -1,7 +1,5 @@
-<span *ngIf="multiple">
-  <mat-pseudo-checkbox class="mat-option-pseudo-checkbox"
-      [state]="selected ? 'checked' : ''" [disabled]="disabled"></mat-pseudo-checkbox>
-</span>
+<mat-pseudo-checkbox *ngIf="multiple" class="mat-option-pseudo-checkbox"
+    [state]="selected ? 'checked' : ''" [disabled]="disabled"></mat-pseudo-checkbox>
 
 <span class="mat-option-text"><ng-content></ng-content></span>
 

From 95d7393c87f6bb43007a6efdb18362da2afc3c5d Mon Sep 17 00:00:00 2001
From: emoralesb05 <eduardo.morales@teradata.com>
Date: Wed, 16 Aug 2017 15:30:30 -0700
Subject: [PATCH 574/575] feat(select): update the trigger width when select is
 opened

---
 src/cdk/overlay/overlay-directives.spec.ts | 36 ++++++++++++++++++++++
 src/cdk/overlay/overlay-directives.ts      | 25 +++++++++++++--
 src/cdk/overlay/overlay-ref.ts             | 21 +++++++++++++
 src/lib/select/select.spec.ts              | 28 +++++++++++++++++
 4 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index 02c5c010d6d4..ae5238af90c5 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -141,6 +141,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.width).toEqual('250px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.width = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.width).toEqual('500px');
     });
 
     it('should set the height', () => {
@@ -150,6 +159,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.height).toEqual('100vh');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.height = '50vh';
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.height).toEqual('50vh');
     });
 
     it('should set the min width', () => {
@@ -159,6 +177,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minWidth).toEqual('250px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.minWidth = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.minWidth).toEqual('500px');
     });
 
     it('should set the min height', () => {
@@ -168,6 +195,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minHeight).toEqual('500px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.minHeight = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.minHeight).toEqual('500px');
     });
 
     it('should create the backdrop if designated', () => {
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 6123df74b630..b4366446d59e 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -275,6 +275,23 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
       hasBackdrop: this.hasBackdrop
     });
 
+    this._configureSize(overlayConfig);
+
+    overlayConfig.hasBackdrop = this.hasBackdrop;
+
+    if (this.backdropClass) {
+      overlayConfig.backdropClass = this.backdropClass;
+    }
+
+    this._position = this._createPositionStrategy() as ConnectedPositionStrategy;
+    overlayConfig.positionStrategy = this._position;
+    overlayConfig.scrollStrategy = this.scrollStrategy;
+
+    return overlayConfig;
+  }
+
+  /** Configure the overlay size based on the directive's inputs */
+  private _configureSize(overlayConfig: OverlayState): void {
     if (this.width || this.width === 0) {
       overlayConfig.width = this.width;
     }
@@ -290,12 +307,9 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
     if (this.minHeight || this.minHeight === 0) {
       overlayConfig.minHeight = this.minHeight;
     }
-
     if (this.backdropClass) {
       overlayConfig.backdropClass = this.backdropClass;
     }
-
-    return overlayConfig;
   }
 
   /** Returns the position strategy of the overlay to be set on the overlay config */
@@ -330,6 +344,11 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
   private _attachOverlay() {
     if (!this._overlayRef) {
       this._createOverlay();
+    } else {
+      // Update the overlay size, in case the directive's inputs have changed
+      const overlayState = new OverlayState();
+      this._configureSize(overlayState);
+      this._overlayRef.updateSize(overlayState);
     }
 
     this._position.withDirection(this.dir);
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index c1be7f8b78b2..1fe06a2db514 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -225,6 +225,27 @@ export class OverlayRef implements PortalOutlet {
     this._pane.setAttribute('dir', this._config.direction!);
   }
 
+  /** Updates the state size of the overlay */
+  updateSize(state: OverlayState) {
+    if (state.width || state.width === 0) {
+      this._config.width = state.width;
+    }
+
+    if (state.height || state.height === 0) {
+      this._config.height = state.height;
+    }
+
+    if (state.minWidth || state.minWidth === 0) {
+      this._config.minWidth = state.minWidth;
+    }
+
+    if (state.minHeight || state.minHeight === 0) {
+      this._config.minHeight = state.minHeight;
+    }
+
+    this._updateElementSize();
+  }
+
   /** Updates the size of the overlay element based on the overlay config. */
   private _updateElementSize() {
     if (this._config.width || this._config.width === 0) {
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 490ba33ac4fc..58b0d4920811 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -607,6 +607,34 @@ describe('MatSelect', () => {
         trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       }));
 
+      it('should set the width of the overlay based on the trigger and resize', async(() => {
+      trigger.style.width = '200px';
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        trigger.click();
+        fixture.detectChanges();
+        const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+        expect(pane.style.minWidth).toBe('200px',
+            'Expected pane minWidth to be 200px initially');
+
+        const backdrop =
+            overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+        backdrop.click();
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+
+          trigger.style.width = '400px';
+          fixture.detectChanges();
+          fixture.whenStable().then(() => {
+            trigger.click();
+            fixture.detectChanges();
+            expect(pane.style.minWidth).toBe('400px',
+                'Expected pane minWidth to be 400px after resize');
+          });
+        });
+      });
+    }));
+
       it('should not throw when attempting to open too early', () => {
         // Create component and then immediately open without running change detection
         fixture = TestBed.createComponent(BasicSelect);

From a4fb45cdf1041d78b0b87aab1ef240c92bd4b247 Mon Sep 17 00:00:00 2001
From: emoralesb05 <eduardo.morales@teradata.com>
Date: Wed, 16 Aug 2017 15:30:30 -0700
Subject: [PATCH 575/575] feat(select): update the trigger width when select is
 opened

---
 src/cdk/overlay/overlay-directives.spec.ts | 36 ++++++++++++++++++++++
 src/cdk/overlay/overlay-directives.ts      | 28 +++++++++++++++--
 src/lib/select/select.spec.ts              | 28 +++++++++++++++++
 3 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index 02c5c010d6d4..ae5238af90c5 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -141,6 +141,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.width).toEqual('250px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.width = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.width).toEqual('500px');
     });
 
     it('should set the height', () => {
@@ -150,6 +159,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.height).toEqual('100vh');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.height = '50vh';
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.height).toEqual('50vh');
     });
 
     it('should set the min width', () => {
@@ -159,6 +177,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minWidth).toEqual('250px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.minWidth = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.minWidth).toEqual('500px');
     });
 
     it('should set the min height', () => {
@@ -168,6 +195,15 @@ describe('Overlay directives', () => {
 
       const pane = overlayContainerElement.children[0] as HTMLElement;
       expect(pane.style.minHeight).toEqual('500px');
+
+      fixture.componentInstance.isOpen = false;
+      fixture.detectChanges();
+
+      fixture.componentInstance.minHeight = 500;
+      fixture.componentInstance.isOpen = true;
+      fixture.detectChanges();
+
+      expect(pane.style.minHeight).toEqual('500px');
     });
 
     it('should create the backdrop if designated', () => {
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index 6123df74b630..ac698541ccb7 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -275,6 +275,25 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
       hasBackdrop: this.hasBackdrop
     });
 
+    this._configureSize(overlayConfig);
+
+    overlayConfig.hasBackdrop = this.hasBackdrop;
+
+    if (this.backdropClass) {
+      overlayConfig.backdropClass = this.backdropClass;
+    }
+
+    this._configureSize(overlayConfig);
+
+    this._position = this._createPositionStrategy() as ConnectedPositionStrategy;
+    overlayConfig.positionStrategy = this._position;
+    overlayConfig.scrollStrategy = this.scrollStrategy;
+
+    return overlayConfig;
+  }
+
+  /** Configure the overlay size based on the directive's inputs */
+  private _configureSize(overlayConfig: OverlayState): void {
     if (this.width || this.width === 0) {
       overlayConfig.width = this.width;
     }
@@ -291,11 +310,11 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
       overlayConfig.minHeight = this.minHeight;
     }
 
+    overlayConfig.hasBackdrop = this.hasBackdrop;
+
     if (this.backdropClass) {
       overlayConfig.backdropClass = this.backdropClass;
     }
-
-    return overlayConfig;
   }
 
   /** Returns the position strategy of the overlay to be set on the overlay config */
@@ -330,6 +349,11 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
   private _attachOverlay() {
     if (!this._overlayRef) {
       this._createOverlay();
+    } else {
+      // Update the overlay size, in case the directive's inputs have changed
+      const overlayState = new OverlayState();
+      this._configureSize(overlayState);
+      this._overlayRef.updateSize(overlayState);
     }
 
     this._position.withDirection(this.dir);
diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
index 490ba33ac4fc..d77502195875 100644
--- a/src/lib/select/select.spec.ts
+++ b/src/lib/select/select.spec.ts
@@ -607,6 +607,34 @@ describe('MatSelect', () => {
         trigger = fixture.debugElement.query(By.css('.mat-select-trigger')).nativeElement;
       }));
 
+      it('should set the width of the overlay based on the trigger and resize', async(() => {
+        trigger.style.width = '200px';
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+          trigger.click();
+          fixture.detectChanges();
+          const pane = overlayContainerElement.querySelector('.cdk-overlay-pane') as HTMLElement;
+          expect(pane.style.minWidth).toBe('200px',
+              'Expected pane minWidth to be 200px initially');
+
+          const backdrop =
+              overlayContainerElement.querySelector('.cdk-overlay-backdrop') as HTMLElement;
+          backdrop.click();
+          fixture.detectChanges();
+          fixture.whenStable().then(() => {
+
+            trigger.style.width = '400px';
+            fixture.detectChanges();
+            fixture.whenStable().then(() => {
+              trigger.click();
+              fixture.detectChanges();
+              expect(pane.style.minWidth).toBe('400px',
+                  'Expected pane minWidth to be 400px after resize');
+            });
+          });
+        });
+      }));
+
       it('should not throw when attempting to open too early', () => {
         // Create component and then immediately open without running change detection
         fixture = TestBed.createComponent(BasicSelect);